Completed tests and methods

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

@@ -6,6 +6,7 @@ public class Inventory {
     static final String BRIE = "Aged Brie";
     static final String BACK_PASS = "Backstage passes to a TAFKAL80ETC concert";
     static final String SULFURAS = "Sulfuras, Hand of Ragnaros";
+    static final String CONJURED = "Conjured items by the magnificent wizard";
 
 
     public Inventory(Item[] items) {
@@ -13,50 +14,62 @@ public class Inventory {
         this.items = items;
     }
 
-    // Updates the quality for 1 day
     public void updateQuality() {
 
-        for (Item item: items) {
-            // make a switch statement
+        for (Item item : items) {
 
-            switch (item.getName()){
+            switch (item.getName()) {
 
-            case BRIE:
+                case BRIE:
+                    if (!checkSellInNegative(item)) {
+                        adjustItemQuality(item, 1);
+                    } else {
+                        adjustItemQuality(item, 2);
+                    }
+                    decreaseSellIn(item);
+                    break;
 
-                adjustItemQuality(item, 1);
+                case BACK_PASS:
 
-                decreaseSellIn(item);
-                break;
+                    if (checkPassSellIn5(item)) {
+                        adjustItemQuality(item, 3);
 
-            case BACK_PASS:
+                    } else if (checkPassSellIn10(item)) {
+                        adjustItemQuality(item, 2);
 
-                // Check sell in because the sell in value dictates the quality modifier
+                    } else if (checkSellInNegative(item)) {
+                        setQualityZero(item);
 
-                if (checkPassSellIn5(item)) {
-                    adjustItemQuality(item, 3);
+                    } else {
+                        adjustItemQuality(item, 1);
+                    }
 
-                } else if (checkPassSellIn10(item)) {
-                    adjustItemQuality(item, 2);
+                    decreaseSellIn(item);
 
-                } else if (checkPassSellInNegative(item)) {
-                    setQualityZero(item);
-                } else {
-                    adjustItemQuality(item, 1);
-                }
-                decreaseSellIn(item);
+                    break;
 
-                break;
+                case SULFURAS:
+                    item.setQuality(80);
+                    item.setSellIn(item.getSellIn());
 
-            case SULFURAS:
-                item.setQuality(80);
-                item.setSellIn(item.getSellIn());
+                    break;
 
-                break;
+                case CONJURED:
+                    if (!checkSellInNegative(item)) {
+                        adjustItemQuality(item, -2);
+                    } else {
+                        adjustItemQuality(item, -4);
+                    }
+
+                    decreaseSellIn(item);
+                    break;
+
+                default:
+                    break;
             }
         }
     }
 
-
     public void decreaseSellIn(Item name) {
         name.setSellIn(name.getSellIn() - 1);
 
@@ -80,7 +93,7 @@ public class Inventory {
         return false;
     }
 
-    public boolean checkPassSellInNegative(Item item) {
+    public boolean checkSellInNegative(Item item) {
 
         if (item.getSellIn() < 0) {
             return true;
@@ -99,126 +112,15 @@ public class Inventory {
 
     public void adjustItemQuality(Item name, int qualityIncrement) {
 
-        if (name.getQuality() + qualityIncrement < 50) {
+        if (name.getQuality() + qualityIncrement < 0) {
+            setQualityZero(name);
+
+        } else if ((name.getQuality() + qualityIncrement < 50) && (name.getQuality() + qualityIncrement >= 0)) {
             name.setQuality(name.getQuality() + qualityIncrement);
+
         } else {
             setQualityMax(name);
         }
 
     }
-
-    public Item[] getItems(){
-        return this.items;
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-//    // Old Code
-//    public void updateQuality() {
-//        // Giant for loop representing the "day" each day, the quality's of items change.
-//
-//        for (int i = 0; i < items.length; i++) {
-//
-//            // This if statement checks if it is NOT aged brie and NOT backstage passes
-//            if (!items[i].getName().equals("Aged Brie")
-//                    && !items[i].getName().equals("Backstage passes to a TAFKAL80ETC concert")) {
-//                // if it's not brie and bspasses
-//                if (items[i].getQuality() > 0) {
-//                    // checks if the quality is over 0
-//                    if (!items[i].getName().equals("Sulfuras, Hand of Ragnaros")) {
-//                        // as long as it's not surlfuras...
-//                        // quantity is decreased by 1
-//                        items[i].setQuality(items[i].getQuality() - 1);
-//                    }
-//                }
-//
-//
-//
-//            } else {
-//
-//                // Next leg of IF statement quality < 50 then increase quality by 1
-//
-//                if (items[i].getQuality() < 50) {
-//                    // if the quality is below 50
-//                    items[i].setQuality(items[i].getQuality() + 1);
-//                    // the quality is increased by 1
-//
-//                    // stuff about backstage passes
-//                    if (items[i].getName() == "Backstage passes to a TAFKAL80ETC concert") {
-//                        // if the item is a backstagepass
-//
-//                        if (items[i].getSellIn() < 11) {
-//                            // and if the backstage pass has to sell in 11 days
-//                            if (items[i].getQuality() < 50) {
-//                                // and the quality is below 50
-//                                items[i].setQuality(items[i].getQuality() + 1);
-//                                // then add 1 to the quality
-//                            }
-//                        }
-//
-//                        if (items[i].getSellIn() < 6) {
-//                            // if the bspass has to sell in 6 days
-//                            if (items[i].getQuality() < 50) {
-//                                // and the quality is less than 50
-//                                items[i].setQuality(items[i].getQuality() + 1);
-//                                // then add 1 to the quality
-//                            }
-//                        }
-//                    }
-//                }
-//            }
-//
-//            // another if the item IS NOT SULFURAS
-//
-//            if (!items[i].getName().equals("Sulfuras, Hand of Ragnaros")) {
-//                items[i].setSellIn(items[i].getSellIn() - 1);
-//            }
-//            // then decrease the sellin day by 1
-//
-//
-//            // checks the items sell in
-//            // if the items sell in is less than 0 (no sellin is negative)
-//            if (items[i].getSellIn() < 0) {
-//
-//                if (!items[i].getName().equals("Aged Brie")) {
-//                    // and the item IS NOT Brie
-//                    if (!items[i].getName().equals("Backstage passes to a TAFKAL80ETC concert")) {
-//                        // and the item IS NOT BSPASSES
-//                        if (items[i].getQuality() > 0) {
-//                            // if the item quality is greater than 0,
-//
-//                            if (!items[i].getName().equals("Sulfuras, Hand of Ragnaros")) {
-//                                // and the item is NOT SULFURAS,
-//                                items[i].setQuality(items[i].getQuality() - 1);
-//                                // the item quality -1
-//                            }
-//                        }
-//                    } else { // if the item IS a backstage pass
-//                        items[i].setQuality(items[i].getQuality() - items[i].getQuality());
-//                    }
-//                } else { // if the item IS BRIE
-//                    if (items[i].getQuality() < 50) {
-//                        // BRIE QUALITY is LESS THAN 50
-//                        items[i].setQuality(items[i].getQuality() + 1);
-//                        // Increase Brie's quality by 1
-//                    }
-//                }
-//            }
-//        }
-//    }
-}
+}

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

@@ -3,8 +3,6 @@ package com.zipcodewilmington.gildedrose;
 import org.junit.Assert;
 import org.junit.Test;
 
-import java.util.Arrays;
-
 /**
  * Creating tests for the Inventory Class
  * The Inventory class will keep track of SellIn & Quality
@@ -18,8 +16,9 @@ public class InventoryTest {
     Item agedBrie = new Item("Aged Brie", 1, 45);
     Item passes = new Item("Backstage passes to a TAFKAL80ETC concert", 11, 25);
     Item sulfuras = new Item("Sulfuras, Hand of Ragnaros", 10, 80 );
+    Item conjured = new Item("Conjured items by the magnificent wizard", 5, 4);
 
-    Item[] items = {wine, agedBrie, passes, sulfuras};
+    Item[] items = {wine, agedBrie, passes, sulfuras, conjured};
 
     public InventoryTest() {
         inventory = new Inventory(items);
@@ -27,23 +26,173 @@ public class InventoryTest {
 
     @Test
     public void testBrieQuality() {
-        // Brie quality increases as sell in decreases
-        // Given
 
         int expectedBrieQuality = 46;
         String itemName = "agedBrie";
 
-        // When
         inventory.adjustItemQuality(agedBrie, 1);
         int actualBrieQuality = agedBrie.getQuality();
 
-        // Then
         Assert.assertEquals(expectedBrieQuality,actualBrieQuality);
     }
 
+
     @Test
     public void testPassQuality() {
 
+        int expectedQuality = 26;
+
+        inventory.updateQuality();
+        int actualQuality = passes.getQuality();
+
+        Assert.assertEquals(expectedQuality, actualQuality);
+
+    }
+
+    @Test
+    public void testSulfurasQuality() {
+
+        int expectedQuality = 80;
+
+        inventory.updateQuality();
+        int actualQuality = sulfuras.getQuality();
+
+        Assert.assertEquals(expectedQuality, actualQuality);
+
+    }
+
+    @Test
+    public void testConjuredQuality() {
+
+    }
+
+    @Test
+    public void testReachMaxQuality(){
+
+        int expectedQuality = 50;
+
+        inventory.adjustItemQuality(wine, 45);
+
+        int actualQuality = wine.getQuality();
+
+        Assert.assertEquals(expectedQuality, actualQuality);
+    }
+
+    @Test
+    public void testDecreaseSellIn() {
+
+        int expectedSellin= 0;
+
+        inventory.decreaseSellIn(agedBrie);
+        int actualSellIn = agedBrie.getSellIn();
+
+        Assert.assertEquals(expectedSellin, actualSellIn);
+
+    }
+
+    @Test
+    public void testSellIn5() {
+
+        boolean actualSell = inventory.checkPassSellIn5(passes);
+
+        Assert.assertFalse(actualSell);
+
+    }
+
+    @Test
+    public void adjustPassQuality5() {
+
+        int expectedQuality = 39;
+
+        for (int i = 0; i < 7; i++) {
+            inventory.updateQuality();
+        }
+        int actualQuality = passes.getQuality();
+
+        Assert.assertEquals(expectedQuality,actualQuality);
+
+    }
+
+    @Test
+    public void adjustPassQualityNegative() {
+
+        int expectedQuality = 0;
+
+        for (int i = 0; i < 15; i++) {
+            inventory.updateQuality();
+        }
+
+        int actualQuality = passes.getQuality();
+
+        Assert.assertEquals(expectedQuality,actualQuality);
+    }
+
+    @Test
+    public void testSellIn10() {
+
+        inventory.decreaseSellIn(passes);
+        inventory.decreaseSellIn(passes);
+        boolean actualSell = inventory.checkPassSellIn10(passes);
+
+        Assert.assertTrue(actualSell);
+
+    }
+
+    @Test
+    public void testSellIn0() {
+
+        boolean actualSell = inventory.checkSellInNegative(passes);
+        Assert.assertFalse(actualSell);
+
+    }
+
+    @Test
+    public void testSetMaxQuality() {
+
+        int expectedMaxQuality = 50;
+
+        inventory.setQualityMax(wine);
+        int actualQuality = wine.getQuality();
+
+        Assert.assertEquals(expectedMaxQuality, actualQuality);
+
+    }
+
+    @Test
+    public void testSetQualityZero() {
+
+        int expectedQuality = 0;
+
+        inventory.setQualityZero(wine);
+        int actualQuality = wine.getQuality();
+
+        Assert.assertEquals(expectedQuality, actualQuality);
+    }
+
+    @Test
+    public void testNegativeQualityisZero() {
+
+        int expectedQuality = 0;
+
+        for (int i = 0; i < 5; i++) {
+            inventory.updateQuality();
+        }
+
+        int actualQuality = conjured.getQuality();
+
+        Assert.assertEquals(expectedQuality, actualQuality);
+    }
+
+    @Test
+    public void testGetName() {
+
+        String expectedName = "Conjured items by wizard";
+
+        conjured.setName(expectedName);
+        String actualName = conjured.getName();
+
+        Assert.assertEquals(expectedName, actualName);
+
     }
 
 }