finished assignment

Inventory.java

@@ -7,58 +7,55 @@ public class Inventory {
         this.items = items;
     }
 
-
     public void updateQuality() {
         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) {
-                    if (!items[i].getName().equals("Sulfuras, Hand of Ragnaros")) {
-                        items[i].setQuality(items[i].getQuality() - 1);
-                    }
+            if(items[i].getName().equals("Sulfuras, Hand of Ragnaros")){
+
+            } else if (items[i].getName().equals("Aged Brie")) {
+                if (items[i].getQuality() < 50) {
+                    items[i].setQuality(items[i].getQuality() + 1);
                 }
-            } else {
+                items[i].setSellIn(items[i].getSellIn() - 1); 
+            } else if(items[i].getName().equals("Backstage passes to a TAFKAL80ETC concert")){
                 if (items[i].getQuality() < 50) {
                     items[i].setQuality(items[i].getQuality() + 1);
-
-                    if (items[i].getName() == "Backstage passes to a TAFKAL80ETC concert") {
-                        if (items[i].getSellIn() < 11) {
-                            if (items[i].getQuality() < 50) {
-                                items[i].setQuality(items[i].getQuality() + 1);
-                            }
-                        }
-
-                        if (items[i].getSellIn() < 6) {
-                            if (items[i].getQuality() < 50) {
-                                items[i].setQuality(items[i].getQuality() + 1);
-                            }
-                        }
-                    }
                 }
-            }
-
-            if (!items[i].getName().equals("Sulfuras, Hand of Ragnaros")) {
+                if (items[i].getSellIn() < 11 && items[i].getQuality() < 50) {
+                    items[i].setQuality(items[i].getQuality() + 1);
+                }
+                if (items[i].getSellIn() < 6 && (items[i].getQuality() < 50)) {
+                    items[i].setQuality(items[i].getQuality() + 1);
+                }
                 items[i].setSellIn(items[i].getSellIn() - 1);
+            }else if(items[i].getName().equals("Conjured")){
+                if (items[i].getQuality() > 0) {
+                    items[i].setQuality(items[i].getQuality() - 2);
+                    items[i].setSellIn(items[i].getSellIn() - 1);
+                }
+            }else {
+                if (items[i].getQuality() > 0){
+                    items[i].setQuality(items[i].getQuality() - 1);
+                    items[i].setSellIn(items[i].getSellIn() - 1);
+                }
             }
 
-            if (items[i].getSellIn() < 0) {
-                if (!items[i].getName().equals("Aged Brie")) {
-                    if (!items[i].getName().equals("Backstage passes to a TAFKAL80ETC concert")) {
-                        if (items[i].getQuality() > 0) {
-                            if (!items[i].getName().equals("Sulfuras, Hand of Ragnaros")) {
-                                items[i].setQuality(items[i].getQuality() - 1);
-                            }
-                        }
-                    } else {
-                        items[i].setQuality(items[i].getQuality()
-                                - items[i].getQuality());
-                    }
-                } else {
-                    if (items[i].getQuality() < 50) {
-                        items[i].setQuality(items[i].getQuality() + 1);
-                    }
+            if(items[i].getName().equals("Sulfuras, Hand of Ragnaros")){
+
+            } else if (items[i].getSellIn() < 0) {
+                if (items[i].getName().equals("Aged Brie") 
+                && items[i].getQuality() < 50) {
+                    items[i].setQuality(items[i].getQuality() + 1);
+                } else if (items[i].getName().equals("Backstage passes to a TAFKAL80ETC concert")) {
+                    items[i].setQuality(items[i].getQuality()
+                        - items[i].getQuality());
+                }else if (items[i].getName().equals("Conjured")){
+                    items[i].setQuality(items[i].getQuality() - 2);  
+                } else if (items[i].getQuality() > 0) {
+                    items[i].setQuality(items[i].getQuality() - 1);
                 }
             }
+
         }
+    }
 }
-}
+

InventoryTest.java

@@ -11,11 +11,36 @@ public class InventoryTest {
 
     private Item sulfuras;
     private Item normalItem;
+    private Item conjured;
 
     @Before
     public void setup(){
         sulfuras = new Item("Sulfuras, Hand of Ragnaros", 0, 80);
         normalItem = new Item(NORMAL_ITEM_NAME, 10, 20);
+        conjured = new Item("Conjured",10,20);
+    }
+
+    @Test
+    public void testUpdate_ForConjuredQuality() throws Exception {
+        int expectedQuality = conjured.getQuality()-2;
+        Item[] items = {conjured};
+        Inventory sut = new Inventory(items);
+
+        sut.updateQuality();
+
+        assertEquals(expectedQuality, conjured.getQuality());
+    }
+    
+
+    @Test
+    public void testUpdate_ForConjuredSellIn() throws Exception {
+        int expectedSellIn = conjured.getSellIn()-1;
+        Item[] items = {conjured};
+        Inventory sut = new Inventory(items);
+
+        sut.updateQuality();
+
+        assertEquals(expectedSellIn, conjured.getSellIn());
     }
 
     @Test
@@ -28,6 +53,7 @@ public class InventoryTest {
 
         assertEquals(expectedQuality, sulfuras.getQuality());
     }
+
     @Test
     public void testUpdate_ForSulfurasSellIn() throws Exception {
         int expectedSellIn = sulfuras.getSellIn();