yay

Inventory.java

@@ -9,31 +9,42 @@ public class Inventory {
 
     public void updateQuality() {
         for (int i = 0; i < items.length; i++) {  
-            if (!items[i].getName().equals("Aged Brie")) {  //if item is not "Age Brie"
-                if (items[i].getQuality() > 0) {  //if item price >0
-                    if (!items[i].getName().equals("Sulfuras, Hand of Ragnaros")) { //if item is not Sulfuras
-                        items[i].setQuality(items[i].getQuality() - 1); //item quality -1
-                    }
-                }
-            } else {
-                if (items[i].getQuality() < 50) { //if item quality <50
-                    items[i].setQuality(items[i].getQuality() + 1); //  quality = getQuality +1
-                }
+            String name = items[i].getName();
+            int quality = items[i].getQuality();
+            int sellIn = items[i].getSellIn();
+            if (quality >0 && quality < 50){
+                setQuality(name, quality,items[i], setSellIn(sellIn,items[i],name));
             }
+            
+        }
+        //cant be sulfuras
+    }
 
-            if (!items[i].getName().equals("Sulfuras, Hand of Ragnaros")) { // if item is not Sulfuras
-                items[i].setSellIn(items[i].getSellIn() - 1);  //sellin = sellin -1
+    public int setSellIn(int sellIn, Item items, String name){
+        sellIn = sellIn - 1;
+        items.setSellIn(sellIn);
+        int x = 0;
+        if (name.equals("conjured")|| sellIn <= 0){
+             x = 2;   //quality decrease by 1 when it hasn't passed the sellIn day;
+        } else if(sellIn > 0){ 
+             x = 1;  //quality decrease by 2 when it passed or on the pass day;
             }
+        return x;
+    }    // this is everything else
+   
 
-            if (items[i].getSellIn() < 0) {     //if sellin < 0 
-                if (!items[i].getName().equals("Aged Brie")) {  //if item is not "Age Brie"
-                  items[i].setQuality(items[i].getQuality() - 1); //item quality -1
-                } else {
-                    if (items[i].getQuality() < 50) {   
-                        items[i].setQuality(items[i].getQuality() + 1);
-                    }    // it is "Age Brie", quality = quality +1
-                }
-            }
+    public void setQuality(String name, int quality, Item items,int decrease){
+        if (name.equals("Aged Brie")){
+            quality =quality + decrease;
+            items.setQuality(quality);
         }
-}
-}
+        else{
+            quality = quality -decrease;
+            items.setQuality(quality);
+        }
+    }  // if this is Aged Brie
+
+
+    }
+
+

InventoryTest.java

@@ -119,4 +119,17 @@ public class InventoryTest {
 
         assertEquals(expectedQuality, agedBrie.getQuality());
     }
+    
+    @Test
+    public void testUpdate_ForConjured() throws Exception {
+        
+        Item conjured = new Item("conjured", 4, 25);
+        int expectedQuality = conjured.getQuality() - 2;
+        Item[] items = {conjured};
+        Inventory sut = new Inventory(items);
+
+        sut.updateQuality();
+
+        assertEquals(expectedQuality, conjured.getQuality());
 }
+}

Item.java

@@ -33,4 +33,6 @@ public class Item {
     public void setQuality(int quality) {
         this.quality = quality;
     }
+    
+    
 }

package.bluej

@@ -5,21 +5,24 @@ dependency1.type=UsesDependency
 dependency2.from=InventoryTest
 dependency2.to=Inventory
 dependency2.type=UsesDependency
-editor.fx.0.height=709
-editor.fx.0.width=1175
-editor.fx.0.x=4
+dependency3.from=Inventory
+dependency3.to=Item
+dependency3.type=UsesDependency
+editor.fx.0.height=708
+editor.fx.0.width=1141
+editor.fx.0.x=260
 editor.fx.0.y=23
 objectbench.height=164
 objectbench.width=776
 package.divider.horizontal=0.6
 package.divider.vertical=0.6845018450184502
 package.editor.height=364
-package.editor.width=675
-package.editor.x=237
-package.editor.y=65
+package.editor.width=674
+package.editor.x=120
+package.editor.y=56
 package.frame.height=600
 package.frame.width=800
-package.numDependencies=2
+package.numDependencies=3
 package.numTargets=3
 package.showExtends=true
 package.showUses=true