completed

Inventory.java

@@ -7,6 +7,7 @@ public class Inventory {
         this.items = items;
     }
 
+    
     public void updateQuality() {
         for (int i = 0; i < items.length; i++) {
             //handles Sulfuras
@@ -15,30 +16,40 @@ public class Inventory {
 
             if(items[i].getName().equals("Aged Brie")){
                 agedBrieUpdate(i);
-            } else{regularItemUpdate(i);}
-         
-            if (items[i].getQuality() < 80) {
-                items[i].setSellIn(items[i].getSellIn() - 1);
-            }
+            } else if (items[i].getName().equals("Conjured Mage Water")){
+              conjuredItemUpdate(i);
+            }else{regularItemUpdate(i);}
 
+        if (items[i].getQuality() < 80) {
+            items[i].setSellIn(items[i].getSellIn() - 1);
         }
-    }
 
-    public void agedBrieUpdate(int i){
-        if(items[i].getSellIn() > 0 && items[i].getQuality() <= 49){
-            items[i].setQuality(items[i].getQuality() + 1);
-        } else if(items[i].getSellIn() < 0 && items[i].getQuality() <= 48){
-            items[i].setQuality(items[i].getQuality() + 2);
-        } 
     }
 
-    public void regularItemUpdate(int i){
-        if(items[i].getSellIn() > 0 && items[i].getQuality() > 0){
-            items[i].setQuality(items[i].getQuality() - 1);
-        } else if(items[i].getSellIn() < 0 && items[i].getQuality() > 1){
-            items[i].setQuality(items[i].getQuality() - 2);
-        } 
-    }
 }
 
+public void agedBrieUpdate(int i){
+if(items[i].getSellIn() > 0 && items[i].getQuality() <= 49){
+items[i].setQuality(items[i].getQuality() + 1);
+} else if(items[i].getSellIn() < 0 && items[i].getQuality() <= 48){
+items[i].setQuality(items[i].getQuality() + 2);
+} 
+}
+
+public void regularItemUpdate(int i){
+if(items[i].getSellIn() > 0 && items[i].getQuality() > 0){
+items[i].setQuality(items[i].getQuality() - 1);
+} else if(items[i].getSellIn() < 0 && items[i].getQuality() > 1){
+items[i].setQuality(items[i].getQuality() - 2);
+} 
+}
+
+public void conjuredItemUpdate(int i){
+if(items[i].getSellIn() > 0 && items[i].getQuality() > 0){
+items[i].setQuality(items[i].getQuality() - 2);
+} else if(items[i].getSellIn() < 0 && items[i].getQuality() > 1){
+items[i].setQuality(items[i].getQuality() - 4);
+} 
+}
+}
 

InventoryTest.java

@@ -8,7 +8,7 @@ public class InventoryTest {
     private static final String AGED_BRIE_NAME = "Aged Brie";
     private static final String BACKSTAGE_PASS_NAME = "Backstage passes to a TAFKAL80ETC concert";
     private static final String NORMAL_ITEM_NAME = "+5 Dexterity Vest";
-
+    private static final String CONJURED_ITEM_NAME = "Conjured Mage Water";
     private Item sulfuras;
     private Item normalItem;
 
@@ -105,7 +105,7 @@ public class InventoryTest {
 
         sut.updateQuality();
 
-        assertEquals(MAX_QUALITY, agedBrie.getQuality());
+        assertEquals(MAX_QUALITY , agedBrie.getQuality());
     }
 
     @Test
@@ -119,4 +119,39 @@ public class InventoryTest {
 
         assertEquals(expectedQuality, agedBrie.getQuality());
     }
+    
+        @Test
+    public void testUpdate_ConjuredItem() throws Exception {
+        Item conjuredMageWater = new Item(CONJURED_ITEM_NAME, 10, 25);
+        int expectedQuality = conjuredMageWater.getQuality() -2 ;
+        Item[] items = {conjuredMageWater};
+        Inventory sut = new Inventory(items);
+
+        sut.updateQuality();
+
+        assertEquals(expectedQuality, conjuredMageWater.getQuality());
+    }
+
+    @Test
+    public void testUpdate_WhenConjuredItemIsAtMaxQuality() throws Exception {
+        Item conjuredMageWater = new Item(CONJURED_ITEM_NAME, 10, MAX_QUALITY);
+        Item[] items = {conjuredMageWater};
+        Inventory sut = new Inventory(items);
+
+        sut.updateQuality();
+
+        assertEquals(MAX_QUALITY - 2, conjuredMageWater.getQuality());
+    }
+
+    @Test
+    public void testUpdate_WhenConjuredItemOnceTheSellInDatePassed() throws Exception {
+        Item conjuredMageWater = new Item(CONJURED_ITEM_NAME, -1, 20);
+        int expectedQuality = conjuredMageWater.getQuality() - 4;
+        Item[] items = {conjuredMageWater};
+        Inventory sut = new Inventory(items);
+
+        sut.updateQuality();
+
+        assertEquals(expectedQuality, conjuredMageWater.getQuality());
+    }
 }

package.bluej

@@ -5,10 +5,10 @@ dependency1.type=UsesDependency
 dependency2.from=InventoryTest
 dependency2.to=Inventory
 dependency2.type=UsesDependency
-editor.fx.0.height=1080
-editor.fx.0.width=1920
-editor.fx.0.x=-335
-editor.fx.0.y=-1080
+editor.fx.0.height=722
+editor.fx.0.width=800
+editor.fx.0.x=240
+editor.fx.0.y=41
 objectbench.height=164
 objectbench.width=776
 package.divider.horizontal=0.6