finish

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

@@ -1,80 +1,95 @@
 package com.zipcodewilmington.gildedrose;
 
 
+import com.sun.tools.javac.jvm.Items;
+
 public class Inventory {
+
     private static Item[] items;
 
     public Inventory(Item[] items) {
 
         super();
-        this.items = items;
+
+        Inventory.items = items;
     }
 
+    public void updateQuality(Item[] items) {
 
-    public static void updateQuality() {
+        for (Item item : items) {
 
-        for (int i = 0; i < items.length; i++) {
+            String name = item.getName();
 
-            if (!items[i].getName().equals("Aged Brie")
-                    && !items[i].getName().equals("Backstage passes to a TAFKAL80ETC concert")) {
+            int sellin = item.getSellIn();
 
-                if (items[i].getQuality() > 0) {
+            int quality = item.getQuality();
 
-                    if (!items[i].getName().equals("Sulfuras, Hand of Ragnaros")) {
-                        items[i].setQuality(items[i].getQuality() - 1);
-                    }
-                }
-            } else {
+            if (quality >= 0 || quality <= 50) {
 
-                if (items[i].getQuality() < 50) {
-                    items[i].setQuality(items[i].getQuality() + 1);
+                setQuality(name, item, quality, setSellIn(name, sellin, item));
 
-                    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);
-                            }
-                        }
+    public void setQuality(String name, Item item, int quality, int sellinAdjustment) {
 
-                        if (items[i].getSellIn() < 6) {
+        if (name.equals("Aged Brie")) {
 
-                            if (items[i].getQuality() < 50) {
-                                items[i].setQuality(items[i].getQuality() + 1);
-                            }
-                        }
-                    }
-                }
-            }
+            item.setQuality(quality + sellinAdjustment);
 
-            if (!items[i].getName().equals("Sulfuras, Hand of Ragnaros")) {
-                items[i].setSellIn(items[i].getSellIn() - 1);
-            }
+        } else if (name.equals("Backstage passes to a TAFKAL80ETC concert")) {
 
-            if (items[i].getSellIn() < 0) {
+            setQualityForPasses(item,quality);
+        } else {
 
-                if (!items[i].getName().equals("Aged Brie")) {
+            item.setQuality(quality - sellinAdjustment);
+        }
 
-                    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 {
+    public int setSellIn(String name, int sellin, Item item) {
 
-                        items[i].setQuality(0);
-                    }
-                } else {
+        int newSellin = sellin - 1;
+
+        item.setSellIn(newSellin);
+
+        int sellinAdjustment = (newSellin <= 0) ? 2 : 1;
+
+        return sellinAdjustment;
 
-                    if (items[i].getQuality() < 50) {
-                        items[i].setQuality(items[i].getQuality() + 1);
-                    }
-                }
-            }
-        }
     }
-}
+
+    public void setQualityForPasses(Item item, int quality) {
+
+        int sellin = item.getSellIn();
+
+        int newSellin = sellin - 1;
+
+        item.setSellIn(newSellin);
+
+        if(newSellin <= 0) {
+
+            item.setQuality(quality + 2);
+
+        }else if (newSellin <= 5) {
+
+            item.setQuality(quality + 3);
+
+        }else if (newSellin <= 10) {
+
+            item.setQuality(quality + 2);
+
+        }else{
+
+            item.setQuality(quality + 1);
+        }
+
+}
+
+}
+
+
+

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

@@ -5,8 +5,106 @@ import org.junit.Test;
 
 public class InventoryTest {
     @Test
-    public void updateQuantityTest(){
-        Assert.assertEquals(1, 1);
+    public void updateQualityPt1() {
+
+        //Given
+        Item item1 = new Item("food", 2, 1);
+        Item item2 = new Item("food", 2, 1);
+        Item[] items = new Item[]{item1, item2};
+        //System.out.println(items);
+        Inventory unventory = new Inventory(items);
+        // when
+        unventory.updateQuality();
+        //Then
+        int actual = item1.getQuality();
+        int expected = 0;
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void updateQualityPt2() {
+        //Given
+        Item item1 = new Item("Backstage passes to a TAFKAL80ETC concert", 10, 46);
+        Item item2 = new Item("Backstage passes to a TAFKAL80ETC concert", 8, 39);
+        Item item3 = new Item("Backstage passes to a TAFKAL80ETC concert", 5, 30);
+        Item[] items = new Item[]{item1, item2, item3};
+        Inventory newStuff = new Inventory(items);
+        //When
+        newStuff.updateQuality();
+
+        //Then
+        int actual = item1.getQuality();
+        int expected = 48;
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void updateQualityPt3() {
+        //Given
+        Item item1 = new Item("This is new name", -2, 5);
+        Item item2 = new Item("Another name mayne", -6, 10);
+        Item[] items = new Item[]{item1, item2};
+        Inventory otherStuff = new Inventory(items);
+
+        //When
+
+        otherStuff.updateQuality();
+
+        //Then
+        int actual = item1.getQuality();
+        int expected = 3;
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void updateQualityPt4() {
+        //Given
+        Item item1 = new Item("Aged Brie", -1, 41);
+        Item[] items = new Item[]{item1};
+        Inventory differentStuff = new Inventory(items);
+
+        //When
+
+        differentStuff.updateQuality();
+
+        //Then
+
+        int actual = item1.getQuality();
+        int expected = 43;
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void updateQualityPt5() {
+        //Given
+        Item item1 = new Item("Backstage passes to a TAFKAL80ETC concert", -2, 2);
+        Item[] items = new Item[]{item1};
+        Inventory finalVariable = new Inventory(items);
+
+        //When
+        finalVariable.updateQuality();
+        //Then
+        int actual = item1.getQuality();
+        int expected = 0;
+        Assert.assertEquals(expected, actual);
+
+    }
+
+    @Test
+    public void updateQualityPt6() {
+        //Given
+        Item item1 = new Item("Backstage passes to a TAFKAL80ETC concert", -2, 2);
+        Item[] items = new Item[]{item1};
+        Inventory variable = new Inventory(items);
+
+        //When
+        item1.setName("Final Name");
+
+        //Then
+        String expected = "Final Name";
+        String actual = item1.getName();
+        Assert.assertEquals(expected, actual);
+        
     }
 }