Wrote cleaner code and had 100% test coverage for the inventory class.

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

@@ -13,6 +13,8 @@ public class Inventory {
         agedBrie();
         sulfuras();
         backstagePasses();
+        conjured();
+        normalItem();
     }
 
     public void agedBrie(){
@@ -46,4 +48,28 @@ public class Inventory {
             }
         }
     }
+
+    public void conjured(){
+        for(int i = 0; i < items.length; i++){
+            if(items[i].getName().equals("conjured")){
+                if(items[i].getSellIn() <= 0 && items[i].getQuality() >= 4){
+                    items[i].setQuality(items[i].getQuality() - 4);
+                } else if(items[i].getSellIn() > 0 && items[i].getQuality() >= 2){
+                    items[i].setQuality(items[i].getQuality() - 2);
+                }
+            }
+        }
+    }
+
+    public void normalItem(){
+        for(int i = 0; i < items.length; i++){
+            if(items[i].getName().equals("normal")){
+                if(items[i].getSellIn() <= 0 && items[i].getQuality() >= 2){
+                    items[i].setQuality(items[i].getQuality() - 2);
+                } else if(items[i].getSellIn() > 0 && items[i].getQuality() >= 1){
+                    items[i].setQuality(items[i].getQuality() - 1);
+                }
+            }
+        }
+    }
 }

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

@@ -8,7 +8,7 @@ import java.util.ArrayList;
 public class InventoryTest {
 
     @Test
-    public void testAgedBrie1() {
+    public void testAgedBrieIncreaseTo11() {
         Item agedBrie = new Item("Aged Brie", 10, 10);
         Item[] item = {agedBrie};
         Inventory inventory = new Inventory(item);
@@ -19,7 +19,7 @@ public class InventoryTest {
     }
 
     @Test
-    public void testAgedBrie2() {
+    public void testAgedBrieIncreaseTo50() {
         Item agedBrie = new Item("Aged Brie", 10, 49);
         Item[] item = {agedBrie};
         Inventory inventory = new Inventory(item);
@@ -30,7 +30,7 @@ public class InventoryTest {
     }
 
     @Test
-    public void testAgedBrie3() {
+    public void testAgedBrieOver50() {
         Item agedBrie = new Item("Aged Brie", 10, 50);
         Item[] item = {agedBrie};
         Inventory inventory = new Inventory(item);
@@ -41,7 +41,7 @@ public class InventoryTest {
     }
 
     @Test
-    public void testBackstagePass1() {
+    public void testBackstagePass10BeforeSellDay() {
         Item backstage = new Item("Backstage passes to a TAFKAL80ETC concert", 11, 40);
         Item[] item = {backstage};
         Inventory inventory = new Inventory(item);
@@ -52,7 +52,7 @@ public class InventoryTest {
     }
 
     @Test
-    public void testBackstagePass2() {
+    public void testBackstagePass7BeforeSellDay() {
         Item backstage = new Item("Backstage passes to a TAFKAL80ETC concert", 7, 40);
         Item[] item = {backstage};
         Inventory inventory = new Inventory(item);
@@ -63,7 +63,7 @@ public class InventoryTest {
     }
 
     @Test
-    public void testBackstagePass3() {
+    public void testBackstagePass3BeforeSellDay() {
         Item backstage = new Item("Backstage passes to a TAFKAL80ETC concert", 3, 40);
         Item[] item = {backstage};
         Inventory inventory = new Inventory(item);
@@ -74,7 +74,7 @@ public class InventoryTest {
     }
 
     @Test
-    public void testBackstagePass4() {
+    public void testBackstagePassOnSellDay() {
         Item backstage = new Item("Backstage passes to a TAFKAL80ETC concert", 0, 40);
         Item[] item = {backstage};
         Inventory inventory = new Inventory(item);
@@ -85,7 +85,7 @@ public class InventoryTest {
     }
 
     @Test
-    public void testBackstagePass5() {
+    public void testBackstagePassAfterSellDay() {
         Item backstage = new Item("Backstage passes to a TAFKAL80ETC concert", -1, 40);
         Item[] item = {backstage};
         Inventory inventory = new Inventory(item);
@@ -96,7 +96,7 @@ public class InventoryTest {
     }
 
     @Test
-    public void testSulfurasPass1() {
+    public void testSulfuras() {
         Item sulfuras = new Item("Sulfuras, Hand of Ragnaros", 10, 40);
         Item[] item = {sulfuras};
         Inventory inventory = new Inventory(item);
@@ -106,5 +106,93 @@ public class InventoryTest {
         Assert.assertEquals(expected, actual);
     }
 
+    @Test
+    public void testConjuredBeforeSellDay() {
+        Item conjured = new Item("conjured", 5, 40);
+        Item[] item = {conjured};
+        Inventory inventory = new Inventory(item);
+        inventory.updateQuality();
+        int expected = 38;
+        int actual = conjured.getQuality();
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void testConjuredAfterSellDay() {
+        Item conjured = new Item("conjured", -1, 40);
+        Item[] item = {conjured};
+        Inventory inventory = new Inventory(item);
+        inventory.updateQuality();
+        int expected = 36;
+        int actual = conjured.getQuality();
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void testConjuredQualityZero1() {
+        Item conjured = new Item("conjured", 5, 0);
+        Item[] item = {conjured};
+        Inventory inventory = new Inventory(item);
+        inventory.updateQuality();
+        int expected = 0;
+        int actual = conjured.getQuality();
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void testConjuredQualityZero2() {
+        Item conjured = new Item("conjured", -1, 0);
+        Item[] item = {conjured};
+        Inventory inventory = new Inventory(item);
+        inventory.updateQuality();
+        int expected = 0;
+        int actual = conjured.getQuality();
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void testNormal1() {
+        Item normal = new Item("normal", 5, 40);
+        Item[] item = {normal};
+        Inventory inventory = new Inventory(item);
+        inventory.updateQuality();
+        int expected = 39;
+        int actual = normal.getQuality();
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void testNormal2() {
+        Item normal = new Item("normal", -1, 40);
+        Item[] item = {normal};
+        Inventory inventory = new Inventory(item);
+        inventory.updateQuality();
+        int expected = 38;
+        int actual = normal.getQuality();
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void testNormal3() {
+        Item normal = new Item("normal", -1, 0);
+        Item[] item = {normal};
+        Inventory inventory = new Inventory(item);
+        inventory.updateQuality();
+        int expected = 0;
+        int actual = normal.getQuality();
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void testNormal4() {
+        Item normal = new Item("normal", 20, 0);
+        Item[] item = {normal};
+        Inventory inventory = new Inventory(item);
+        inventory.updateQuality();
+        int expected = 0;
+        int actual = normal.getQuality();
+        Assert.assertEquals(expected, actual);
+    }
+
 }