From 793a9c6ed517b6503ae30d0d9c05395ea06e58ad Mon Sep 17 00:00:00 2001
From: Daniil Vdovinov <d.y2010@mail.ru>
Date: Fri, 21 Jun 2019 19:05:03 +0300
Subject: [PATCH 1/3] bad -> good

---
 src/main/java/model/Pizza.java | 50 ++++++++++++++++------------------
 1 file changed, 23 insertions(+), 27 deletions(-)

diff --git a/src/main/java/model/Pizza.java b/src/main/java/model/Pizza.java
index 8096217..5d5363e 100644
--- a/src/main/java/model/Pizza.java
+++ b/src/main/java/model/Pizza.java
@@ -45,35 +45,31 @@ public void addIngredient(
                 "Указан некорректный ингредиент или его количество");
     }
 
-    public void removeIngredient(
-        Ingredient ingredient,
-        int count
-    ) throws PizzaException {
-        if (ingredient != null && count > 0) {
-            // Проверка на существование коллекции
-            if (!ingredientsCollectionNotNull())
-                initIngredientsCollection();
-            // Если элемент уже существует
-            if (ingredients.containsKey(ingredient)) {
-                int alreadyExistIngredientCount = ingredients.get(
-                    ingredient);
-                // Если количество уже существующих элементов больше либо
-                // равно количеству удаляемых
-                if (Math.abs(count) >= alreadyExistIngredientCount)
-                    ingredients.remove(ingredient);
-                else
-                    ingredients.put(
-                        ingredient, alreadyExistIngredientCount - count);
-                // Если элемента не сущетсвует
-                } else
-                    throw new PizzaException(
-                        "Вы пытаетесь удалить ингредиент, который не существует в пицце");
-        } else
-            throw new PizzaException(
-                "Указан некорректный ингредиент или его количество");
+    public void removeIngredient(Ingredient ingredient, int count) throws PizzaException {
+        if(ingredient == null || count <=0){
+            throw new PizzaException("Указан некорректный ингредиент или его количество");
+        }
+
+        if (!ingredientsCollectionNotNull()) {
+            initIngredientsCollection();
+        }
+        int alreadyExistIngredientCount;
+
+        try {
+            alreadyExistIngredientCount = ingredients.get(ingredient);
+        } catch (NullPointerException e) {
+            throw new PizzaException("Вы пытаетесь удалить ингредиент, который не существует в пицце");
+        }
+
+        if(count <= alreadyExistIngredientCount){
+            ingredients.put(ingredient, alreadyExistIngredientCount - count);
+        }
+        else {
+            ingredients.put(ingredient, alreadyExistIngredientCount);
+        }
     }
 
-    private boolean ingredientsCollectionNotNull() {
+    private boolean ingredientsCollectionNotNull(){
         return ingredients != null;
     }
 

From 971d41fe08b5182b32de868cd94bdf36709228dd Mon Sep 17 00:00:00 2001
From: Daniil Vdovinov <d.y2010@mail.ru>
Date: Fri, 21 Jun 2019 19:15:00 +0300
Subject: [PATCH 2/3] bad -> good (2)

---
 src/main/java/model/Pizza.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/model/Pizza.java b/src/main/java/model/Pizza.java
index 5d5363e..5606f7b 100644
--- a/src/main/java/model/Pizza.java
+++ b/src/main/java/model/Pizza.java
@@ -61,11 +61,11 @@ public void removeIngredient(Ingredient ingredient, int count) throws PizzaExcep
             throw new PizzaException("Вы пытаетесь удалить ингредиент, который не существует в пицце");
         }
 
-        if(count <= alreadyExistIngredientCount){
+        if(count < alreadyExistIngredientCount){
             ingredients.put(ingredient, alreadyExistIngredientCount - count);
         }
         else {
-            ingredients.put(ingredient, alreadyExistIngredientCount);
+            ingredients.remove(ingredient);
         }
     }
 

From 00f3771ffdeff9b4d43ee1b6187e919b8537f8d3 Mon Sep 17 00:00:00 2001
From: Daniil Vdovinov <d.y2010@mail.ru>
Date: Mon, 24 Jun 2019 19:38:52 +0300
Subject: [PATCH 3/3] add Unit Tests

---
 pom.xml                           | 17 +++++++++++++++
 src/main/java/test/PizzaTest.java | 36 +++++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+)
 create mode 100644 src/main/java/test/PizzaTest.java

diff --git a/pom.xml b/pom.xml
index 3e9851b..411e522 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,5 +20,22 @@
         </plugins>
     </build>
 
+<dependencies>
+    <!-- https://mvnrepository.com/artifact/junit/junit -->
+    <dependency>
+        <groupId>junit</groupId>
+        <artifactId>junit</artifactId>
+        <version>4.12</version>
+        <scope>test</scope>
+    </dependency>
+    <dependency>
+        <groupId>junit</groupId>
+        <artifactId>junit</artifactId>
+        <version>4.12</version>
+        <scope>compile</scope>
+    </dependency>
+
+</dependencies>
+
 
 </project>
\ No newline at end of file
diff --git a/src/main/java/test/PizzaTest.java b/src/main/java/test/PizzaTest.java
new file mode 100644
index 0000000..1f79d4d
--- /dev/null
+++ b/src/main/java/test/PizzaTest.java
@@ -0,0 +1,36 @@
+package test;
+
+
+import model.Ingredient;
+import model.PizzaException;
+import org.junit.*;
+
+import model.Pizza;
+
+public class PizzaTest {
+
+    @Test(expected = PizzaException.class)
+    public void removeIngredientWhenItNull() throws PizzaException {
+        Pizza pizza = new Pizza();
+        pizza.removeIngredient(new Ingredient(""), 1);
+    }
+
+
+    @Test(expected = PizzaException.class)
+    public void addIngredientWhenItExists() throws PizzaException{
+        Ingredient ingredient = null;
+        Pizza pizza = new Pizza();
+
+        pizza.addIngredient(ingredient, 10);
+
+    }
+
+    @Test
+    public void addIngredientShouldIncreaseIngredientCount() throws PizzaException{
+        Pizza pizza = new Pizza();
+
+        pizza.addIngredient(new Ingredient(""), 10);
+        Assert.assertEquals(pizza.getIngredients().size(), 1);
+
+    }
+}