finished lab

Inventory.java

@@ -8,32 +8,24 @@ public class Inventory {
     }
 
     public void updateQuality() {
-        for (int i = 0; i < items.length; i++) {
-            if (!items[i].getName().equals("Aged Brie")) {
-                if (items[i].getQuality() > 0) {
-                    if (!items[i].getName().equals("Sulfuras, Hand of Ragnaros")) {
-                        items[i].setQuality(items[i].getQuality() - 1);
-                    }
-                }
-            } else {
-                if (items[i].getQuality() < 50) {
-                    items[i].setQuality(items[i].getQuality() + 1);
-                }
-            }
-
-            if (!items[i].getName().equals("Sulfuras, Hand of Ragnaros")) {
-                items[i].setSellIn(items[i].getSellIn() - 1);
-            }
-
-            if (items[i].getSellIn() < 0) {
-                if (!items[i].getName().equals("Aged Brie")) {
-                  items[i].setQuality(items[i].getQuality() - 1);
-                } else {
-                    if (items[i].getQuality() < 50) {
-                        items[i].setQuality(items[i].getQuality() + 1);
-                    }
-                }
-            }
+        for (Item item : items) {
+            String name = item.getName();
+            int currentQ = item.getQuality();
+            int currentS = item.getSellIn();
+            if(currentQ >0 && currentQ<50)
+                setQuality(name, item, currentQ, setSellIn(item, currentS, name));
         }
-}
+    }
+    public int setSellIn(Item item, int previousS, String name){
+        int newS = previousS -1;
+        item.setSellIn(newS);
+        int adjustment = (newS <= 0 || name.equals("Conjured"))? 2 : 1;
+        return adjustment;
+    }
+    public void setQuality(String name,Item item, int previousQ, int SellInAdjustment){
+        if(name.equals("Aged Brie"))
+            item.setQuality(previousQ + SellInAdjustment);
+        else
+            item.setQuality(previousQ - SellInAdjustment);
+    }
 }

InventoryTest.java

@@ -11,11 +11,13 @@ public class InventoryTest {
 
     private Item sulfuras;
     private Item normalItem;
+    private Item conjuredItem;
 
     @Before
     public void setup(){
         sulfuras = new Item("Sulfuras, Hand of Ragnaros", 0, 80);
         normalItem = new Item(NORMAL_ITEM_NAME, 10, 20);
+        conjuredItem = new Item("Conjured", 10, 20);
     }
 
     @Test
@@ -49,6 +51,16 @@ public class InventoryTest {
 
         assertEquals(expectedSellIn, normalItem.getSellIn());
     }
+    @Test
+    public void testUpdate_ForConjuredItemQuantity() throws Exception {
+        int expectedQuality = conjuredItem.getQuality() - 2;
+        Item[] items = {conjuredItem};
+        Inventory sut = new Inventory(items);
+
+        sut.updateQuality();
+
+        assertEquals(expectedQuality, conjuredItem.getQuality());
+    }
 
     @Test
     public void testUpdate_ForNormalItemQuantity() throws Exception {
@@ -60,6 +72,8 @@ public class InventoryTest {
 
         assertEquals(expectedQuality, normalItem.getQuality());
     }
+    
+    
 
     @Test
     public void testUpdate_ForSoldOutItem() throws Exception {

package.bluej

@@ -7,15 +7,15 @@ dependency2.to=Inventory
 dependency2.type=UsesDependency
 editor.fx.0.height=722
 editor.fx.0.width=800
-editor.fx.0.x=320
-editor.fx.0.y=50
+editor.fx.0.x=34
+editor.fx.0.y=32
 objectbench.height=164
 objectbench.width=776
 package.divider.horizontal=0.6
 package.divider.vertical=0.6845018450184502
 package.editor.height=364
 package.editor.width=674
-package.editor.x=577
+package.editor.x=480
 package.editor.y=61
 package.frame.height=600
 package.frame.width=800
@@ -41,13 +41,13 @@ target2.name=InventoryTest
 target2.showInterface=false
 target2.type=UnitTestTargetJunit4
 target2.width=80
-target2.x=40
-target2.y=160
+target2.x=90
+target2.y=180
 target3.association=InventoryTest
 target3.height=50
 target3.name=Inventory
 target3.showInterface=false
 target3.type=ClassTarget
 target3.width=80
-target3.x=10
-target3.y=190
+target3.x=60
+target3.y=210