refactor

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

@@ -3,6 +3,9 @@ package com.zipcodewilmington.gildedrose;
 
 public class Inventory {
     private Item[] items;
+    private final String brie = "Aged Brie";
+    private final String pass = "Backstage passes to a TAFKAL80ETC concert";
+    private final String hand = "Sulfuras, Hand of Ragnaros";
 
     public Inventory(Item[] items) {
         super();
@@ -12,6 +15,92 @@ public class Inventory {
 
     public void updateQuality() {
         for (int i = 0; i < items.length; i++) {
+            switch (items[i].getName()){
+
+                case brie :
+
+                    increaseQuality5(items[i]);
+                    sellOne(items[i]);
+                    justUnder6(items[i]);
+                    betterWithAge(items[i]);
+                    break;
+
+                case pass :
+
+                    increaseQuality5(items[i]);
+                    sellOne(items[i]);
+                    justUnder11(items[i]);
+                    justUnder6(items[i]);
+                    soldOut(items[i]);
+                    break;
+
+                case hand :
+
+                    increaseQuality5(items[i]);
+                    soldOut(items[i]);
+                    break;
+
+                default :
+
+                    //soldOut(items[i]);
+                    expiring(items[i]);
+
+            }
+
+        }
+    }
+
+
+    public void increaseQuality5(Item item) {
+        if(item.getQuality() < 50 && item.getQuality() > 0){
+            item.setQuality(item.getQuality()+1);
+
+        }
+    }
+
+    public void sellOne(Item item) {
+
+        item.setSellIn(item.getSellIn() - 1);
+    }
+
+    public void betterWithAge(Item item) {
+        if (item.getSellIn() < 0) {
+            item.setQuality(item.getQuality() + 1);
+        }
+    }
+
+    public void justUnder11(Item item) {
+        if (item.getSellIn() < 11 && item.getQuality() < 50) {
+            item.setQuality(item.getQuality() + 1);
+        }
+
+    }
+
+    public void justUnder6(Item item) {
+        if (item.getSellIn() < 6 && item.getQuality() < 50) {
+            item.setQuality(item.getQuality() + 1);
+
+        }
+
+    }
+
+    public void soldOut(Item item) {
+        if (item.getSellIn() < 0) {
+            item.setQuality(item.getQuality() - item.getQuality());
+        }
+
+    }
+
+    public void expiring(Item item) {
+        if (item.getQuality() > 0) {
+            item.setQuality(item.getQuality() - 1);
+
+        }
+
+    }
+
+}
+        /*for (int i = 0; i < items.length; i++) {
             if (!items[i].getName().equals("Aged Brie")
                     && !items[i].getName().equals("Backstage passes to a TAFKAL80ETC concert")) {
                 if (items[i].getQuality() > 0) {
@@ -63,4 +152,4 @@ public class Inventory {
             }
         }
     }
-}
+}*/

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

@@ -100,7 +100,7 @@ public class InventoryTest {
 
     @Test
     public void brieTest01() {
-        Item item = new Item("Aged Brie", 12, 20);
+        Item item = new Item("Aged Brie", 11, 20);
         Item[] items = {item};
         Inventory inv = new Inventory(items);
 
@@ -114,7 +114,7 @@ public class InventoryTest {
 
     @Test
     public void brieTest02() {
-        Item item = new Item("Aged Brie", -1, 20);
+        Item item = new Item("Aged Brie", 6, 20);
         Item[] items = {item};
         Inventory inv = new Inventory(items);
 
@@ -127,6 +127,20 @@ public class InventoryTest {
     }
 
     @Test
+    public void brieTest03() {
+        Item item = new Item("Aged Brie", -1, 20);
+        Item[] items = {item};
+        Inventory inv = new Inventory(items);
+
+        int expected = 23;
+        inv.updateQuality();
+        int actual = item.getQuality();
+
+        Assert.assertEquals(actual, expected);
+
+    }
+
+    @Test
     public void otherTest01() {
         Item item = new Item("Goop", 5, 20);
         Item[] items = {item};
@@ -141,6 +155,20 @@ public class InventoryTest {
     }
 
     @Test
+    public void otherTest02() {
+        Item item = new Item("Goop", -1, 20);
+        Item[] items = {item};
+        Inventory inv = new Inventory(items);
+
+        int expected = 19;
+        inv.updateQuality();
+        int actual = item.getQuality();
+
+        Assert.assertEquals(expected, actual);
+
+    }
+
+    @Test
     public void backStageTest01() {
         Item item = new Item("Backstage passes to a TAFKAL80ETC concert", 12, 20);
         Item[] items = {item};
@@ -198,22 +226,9 @@ public class InventoryTest {
 
     }
 
-    @Test
-    public void otherTest02() {
-        Item item = new Item("Goop", -1, 20);
-        Item[] items = {item};
-        Inventory inv = new Inventory(items);
-
-        int expected = 18;
-        inv.updateQuality();
-        int actual = item.getQuality();
-
-        Assert.assertEquals(expected, actual);
-
-    }
 
     @Test
-    public void sulfurasTest01() {
+    public void backStageTest04() {
         Item item = new Item("Backstage passes to a TAFKAL80ETC concert", -1, 10);
         Item[] items = {item};
         Inventory inv = new Inventory(items);