Updated Inventory Methods

src/main/java/com/zipcodewilmington/gildedrose/Inventory.java

@@ -22,93 +22,90 @@ public class Inventory {
             switch (item.getName()){
 
             case BRIE:
-                if (!checkQuality(item, 1)) {
-                    adjustItemQuality(item, 1);
-                } else {
-                    setQualityMax(item);
-                }
 
-                decreaseSellIn(item);
+                adjustItemQuality(item, 1);
 
+                decreaseSellIn(item);
                 break;
 
             case BACK_PASS:
-                if (item.getSellIn() < 0) {
-                    setQualityZero(item);
 
-                } else if (item.getSellIn() <= 5) {
-                    if (!checkQuality(item, 2)) {
-                        adjustItemQuality(item, 2);
-                    } else {
-                        setQualityMax(item);
-                    }
-
-                } else if (item.getSellIn() <= 10) {
-                    if (!checkQuality(item, 3)) {
-                        adjustItemQuality(item, 3);
-                    } else {
-                        setQualityMax(item);
-                    }
-                }
+                // Check sell in because the sell in value dictates the quality modifier
+
+                if (checkPassSellIn5(item)) {
+                    adjustItemQuality(item, 3);
+
+                } else if (checkPassSellIn10(item)) {
+                    adjustItemQuality(item, 2);
 
+                } else if (checkPassSellInNegative(item)) {
+                    setQualityZero(item);
+                } else {
+                    adjustItemQuality(item, 1);
+                }
                 decreaseSellIn(item);
 
                 break;
 
-
             case SULFURAS:
                 item.setQuality(80);
                 item.setSellIn(item.getSellIn());
 
-
-
-            };
+                break;
+            }
         }
     }
 
+
     public void decreaseSellIn(Item name) {
         name.setSellIn(name.getSellIn() - 1);
 
     }
 
-    public boolean checkQuality(Item name, int addQuality) {
-        boolean isQuality50 = false;
+    public boolean checkPassSellIn5(Item item) {
 
-        if (name.getQuality() + addQuality < 50) {
-            isQuality50 = false;
-        } else {
-            isQuality50 = true;
+        if (item.getSellIn() <= 5 && item.getSellIn() >= 0) {
+            return true;
         }
 
-        return isQuality50;
+        return false;
     }
 
-    public void setQualityMax(Item item) {
-        item.setQuality(50);
-    }
+    public boolean checkPassSellIn10(Item item) {
 
-    public void setQualityZero(Item item) {
-        item.setQuality(0);
+        if (item.getSellIn() <= 10 && item.getSellIn() > 5) {
+            return true;
+        }
+
+        return false;
     }
 
+    public boolean checkPassSellInNegative(Item item) {
 
-    public void adjustItemQuality(Item name, int qualityIncrement) {
+        if (item.getSellIn() < 0) {
+            return true;
+        }
 
+        return false;
     }
 
+    public void setQualityMax(Item item) {
+        item.setQuality(50);
+    }
 
+    public void setQualityZero(Item item) {
+        item.setQuality(0);
+    }
 
+    public void adjustItemQuality(Item name, int qualityIncrement) {
 
+        if (name.getQuality() + qualityIncrement < 50) {
+            name.setQuality(name.getQuality() + qualityIncrement);
+        } else {
+            setQualityMax(name);
+        }
 
-//    public void increaseQuality(int i){
-//
-//        int quality = item.getQuality() + i;
-//        if (quality > 50) {
-//            quality = 50;
-//        }
-//
-//        item.setQuality(quality);
-//    }
+    }
 
     public Item[] getItems(){
         return this.items;

src/test/java/com/zipcodewilmington/gildedrose/InventoryTest.java

@@ -34,7 +34,7 @@ public class InventoryTest {
         String itemName = "agedBrie";
 
         // When
-        agedBrie.setQuality(agedBrie.getQuality() + 1);
+        inventory.adjustItemQuality(agedBrie, 1);
         int actualBrieQuality = agedBrie.getQuality();
 
         // Then