xtenzQ
diff --git a/‎.gitignore‎
Lines changed: 1 addition & 0 deletions b/‎.gitignore‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎ivy.xml‎
Lines changed: 1 addition & 0 deletions b/‎ivy.xml‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎src/main/java/ru/rusetskii/cashmachine/CashMachine.java‎
Lines changed: 0 additions & 1 deletion b/‎src/main/java/ru/rusetskii/cashmachine/CashMachine.java‎
Lines changed: 0 additions & 1 deletion
diff --git a/‎src/main/java/ru/rusetskii/cashmachine/cash_operation/CashStorage.java‎
Lines changed: 3 additions & 3 deletions b/‎src/main/java/ru/rusetskii/cashmachine/cash_operation/CashStorage.java‎
Lines changed: 3 additions & 3 deletions
diff --git a/‎src/main/java/ru/rusetskii/cashmachine/cash_operation/DenominationStorage.java‎
Lines changed: 0 additions & 1 deletion b/‎src/main/java/ru/rusetskii/cashmachine/cash_operation/DenominationStorage.java‎
Lines changed: 0 additions & 1 deletion
diff --git a/‎src/main/java/ru/rusetskii/cashmachine/command/Command.java‎
Lines changed: 1 addition & 1 deletion b/‎src/main/java/ru/rusetskii/cashmachine/command/Command.java‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/main/java/ru/rusetskii/cashmachine/command/implementation/AddNotesCommand.java‎
Lines changed: 1 addition & 1 deletion b/‎src/main/java/ru/rusetskii/cashmachine/command/implementation/AddNotesCommand.java‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/test/java/ru/rusetskii/cashmachine/command/CommandTest.java‎
Lines changed: 4 additions & 0 deletions b/‎src/test/java/ru/rusetskii/cashmachine/command/CommandTest.java‎
Lines changed: 4 additions & 0 deletions
@@ -18,6 +18,7 @@
 *.zip
 *.tar.gz
 *.rar
+ivysettings.xml
 
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
 
@@ -10,6 +10,7 @@
     <dependencies>
         <dependency org="org.apache.logging.log4j" name="log4j-api" rev="2.16.0" conf="compile->default"/>
         <dependency org="org.apache.logging.log4j" name="log4j-core" rev="2.16.0" conf="runtime->default"/>
+        <dependency org="org.mockito" name="mockito-core" rev="4.2.0" conf="runtime->default"/>
         <dependency org="junit" name="junit" rev="4.12" conf="test->default"/>
     </dependencies>
 
 
@@ -7,7 +7,6 @@
 import ru.rusetskii.cashmachine.command.Command;
 import ru.rusetskii.cashmachine.command.CommandReader;
 import ru.rusetskii.cashmachine.command.exception.CommandExecutionException;
-import ru.rusetskii.cashmachine.command.exception.InvalidCommandException;
 import ru.rusetskii.cashmachine.command.exception.ParametersMismatchException;
 import ru.rusetskii.cashmachine.command.implementation.AddNotesCommand;
 import ru.rusetskii.cashmachine.command.implementation.GetCashCommand;
 
@@ -69,10 +69,10 @@ public DenominationStorage withdraw(String currency, int amount) {
         }
 
         if (amount == 0) {
-            if (!denominationStorage.isEmpty()) {
-                cashStorage.put(currency, denominationStorage);
-            } else {
+            if (denominationStorage.isEmpty()) {
                 cashStorage.remove(currency);
+            } else {
+                cashStorage.put(currency, denominationStorage);
             }
             return withdrawnDenominationStorage;
         } else {
 
@@ -1,7 +1,6 @@
 package ru.rusetskii.cashmachine.cash_operation;
 
 import java.util.*;
-import java.util.concurrent.atomic.AtomicMarkableReference;
 
 /**
  * Represents banknotes of the specific currency stored by its denomination
 
@@ -81,7 +81,7 @@ public void setParams(List<String> params) {
      * @see Validator
      */
     public boolean validate() throws ParametersMismatchException {
-        if (validators.size() == 0) return true;
+        if (validators == null) return true;
         if (params.size() == validators.size()) {
             for (int i = 0; i < validators.size(); i++) {
                 if (!validators.get(i).isValid(params.get(i))) {
 
@@ -18,7 +18,7 @@ public class AddNotesCommand extends Command {
     public AddNotesCommand() {
         super(new RegexValidator("[A-Z]{3}"),
                 new SubsetValidator("1","5","10","50","100","500","1000","5000"),
-              new RegexValidator("[1-9][0-9]*"));
+                new RegexValidator("[1-9][0-9]*"));
     }
 
     /**
 
@@ -18,6 +18,10 @@
 public class CommandTest {
 
     private class SomeCommand extends Command {
+        public SomeCommand() {
+
+        }
+
         public SomeCommand(Validator...validators) {
             super(validators);
         }
Original file line number	Diff line number	Diff line change
`@@ -69,10 +69,10 @@ public DenominationStorage withdraw(String currency, int amount) {`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`if (amount == 0) {`
`72`		`- if (!denominationStorage.isEmpty()) {`
`73`		`- cashStorage.put(currency, denominationStorage);`
`74`		`- } else {`
	`72`	`+ if (denominationStorage.isEmpty()) {`
`75`	`73`	`cashStorage.remove(currency);`
	`74`	`+ } else {`
	`75`	`+ cashStorage.put(currency, denominationStorage);`
`76`	`76`	`}`
`77`	`77`	`return withdrawnDenominationStorage;`
`78`	`78`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ public class AddNotesCommand extends Command {`
`18`	`18`	`public AddNotesCommand() {`
`19`	`19`	`super(new RegexValidator("[A-Z]{3}"),`
`20`	`20`	`new SubsetValidator("1","5","10","50","100","500","1000","5000"),`
`21`		`- new RegexValidator("[1-9][0-9]*"));`
	`21`	`+ new RegexValidator("[1-9][0-9]*"));`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`/**`