Added conjured items

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

@@ -9,58 +9,143 @@ public class Inventory {
         this.items = items;
     }
 
+//    public void updateQuality() {
+//        //for each item in the inventory
+//        for (int i = 0; i < items.length; i++) {
+//
+//            //if the items name not equal aged brie and the items name does not equal Backstage passes to a TAFKAL80ETC concert and the items quality is greater than 0, and the items name does not equal Sulfuras, Hand of Ragnaros
+//            if (!items[i].getName().equals("Aged Brie") && !items[i].getName().equals("Backstage passes to a TAFKAL80ETC concert") && items[i].getQuality() > 0 && !items[i].getName().equals("Sulfuras, Hand of Ragnaros")) {
+//                //decrease quality by one
+//                items[i].setQuality(items[i].getQuality() - 1);
+//                //if the items name is "Aged Brie", "Backstage passes to a TAFKAL80ETC concert" or "Sulfuras, Hand of Ragnaros", and the quality is between 0 and 50
+//            } else if(items[i].getQuality() < 50){
+//                //increase item quality by one
+//                items[i].setQuality(items[i].getQuality() + 1);
+//                //if the item is "Backstage passes to a TAFKAL80ETC concert" and the item sells in less than 11 days
+//                if (items[i].getName().equals("Backstage passes to a TAFKAL80ETC concert") && items[i].getSellIn() < 11) {
+//                    //increase item quality by one
+//                    items[i].setQuality(items[i].getQuality() + 1);
+//                    //if the item sells in less than 6 days
+//                    if (items[i].getSellIn() < 6) {
+//                        //increase item quality by another one
+//                        items[i].setQuality(items[i].getQuality() + 1);
+//                    }
+//                }
+//            }
+//            //if the item is past its expiration date
+//            if (items[i].getSellIn() < 0 ) {
+//                //and it is not aged brie
+//                if (!items[i].getName().equals("Aged Brie")) {
+//                    //if the item name is not "Backstage passes to a TAFKAL80ETC concert" and the quality is greater than 0
+//                    if (!items[i].getName().equals("Backstage passes to a TAFKAL80ETC concert") && items[i].getQuality() > 0) {
+//                        //if the item name is "Sulfuras, Hand of Ragnaros"
+//                        if (!items[i].getName().equals("Sulfuras, Hand of Ragnaros")) {
+//                            //decrease the item quality by one
+//                            items[i].setQuality(items[i].getQuality() - 1);
+//                        }
+//                        //if the item is not "Backstage passes to a TAFKAL80ETC concert" and the quality is greater than 0
+//                    } else {
+//                        //set item quality to 0
+//                        items[i].setQuality(0);
+//                    }
+//                    //if the item is not named aged brie
+//                } else {
+//                    //and it is less than 50 quality
+//                    if (items[i].getQuality() < 50) {
+//                        //increase the quality by one
+//                        items[i].setQuality(items[i].getQuality() + 1);
+//                    }
+//                }
+//            }
+//        }
+//    }
 
-    public void updateQuality() {
-        for (int i = 0; i < items.length; i++) {
-            if (!items[i].getName().equals("Aged Brie")
-                    && !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 {
-                if (items[i].getQuality() < 50) {
-                    items[i].setQuality(items[i].getQuality() + 1);
-
-                    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);
-                            }
-                        }
-
-                        if (items[i].getSellIn() < 6) {
-                            if (items[i].getQuality() < 50) {
-                                items[i].setQuality(items[i].getQuality() + 1);
-                            }
-                        }
-                    }
-                }
+    public void updateQuality02() {
+
+        for(int i = 0; i < items.length; i ++){
+
+            switch(items[i].getName()){
+
+                case "Aged Brie":
+                    increaseQuality(items[i]);
+                    passedSellin(items[i]);
+                    break;
+
+                case "Backstage passes to a TAFKAL80ETC concert":
+                    increaseQuality(items[i]);
+                    checkSellinTickets(items[i]);
+                    passedSellin(items[i]);
+                    break;
+
+                case "Sulfuras, Hand of Ragnaros":
+                    break;
+
+                case "Conjured Item":
+                    decreaseQuality(items[i]);
+                    decreaseQuality(items[i]);
+                    passedSellin(items[i]);
+                    break;
+
+                default:
+                    decreaseQuality(items[i]);
+                    passedSellin(items[i]);
+                    break;
             }
+        }
+    }
+
+    private static void increaseQuality(Item item){
+        if(item.getQuality() < 50){
+            item.setQuality(item.getQuality() + 1);
+        }
+    }
 
-            if (!items[i].getName().equals("Sulfuras, Hand of Ragnaros")) {
-                items[i].setSellIn(items[i].getSellIn() - 1);
+    private static void decreaseQuality(Item item){
+        if(item.getQuality() > 0){
+            item.setQuality(item.getQuality() -1);
+        }
+    }
+
+    private static void checkSellinTickets(Item item){
+        //if the items sell in is less then 11
+        if(item.getSellIn() < 11){
+            //decrease quality
+            increaseQuality(item);
+            //if it is also less then 6
+            if(item.getSellIn() < 6){
+                //decrease quality
+                increaseQuality(item);
             }
+        }
+    }
+
+    private static void passedSellin(Item item){
+        switch(item.getName()) {
+            case "Aged Brie":
+                increaseQuality(item);
+                break;
 
-            if (items[i].getSellIn() < 0) {
-                if (!items[i].getName().equals("Aged Brie")) {
-                    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 {
-                        items[i].setQuality(items[i].getQuality()
-                                - items[i].getQuality());
-                    }
-                } else {
-                    if (items[i].getQuality() < 50) {
-                        items[i].setQuality(items[i].getQuality() + 1);
-                    }
+            case "Backstage passes to a TAFKAL80ETC concert":
+                if(item.getSellIn() < 0) {
+                    item.setQuality(0);
                 }
-            }
+                break;
+
+            case "Conjured Item":
+                checkPassedDate(item);
+                checkPassedDate(item);
+                break;
+
+            default:
+                checkPassedDate(item);
+                break;
+        }
+    }
+
+    private static void checkPassedDate(Item item){
+        if(item.getSellIn() < 0){
+            decreaseQuality(item);
         }
     }
+
 }

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

@@ -4,9 +4,95 @@ import org.junit.Assert;
 import org.junit.Test;
 
 public class InventoryTest {
+
     @Test
     public void updateQuantityTest(){
-        Assert.assertEquals(1, 1);
+        //test item that should go down 1 quality in 1 day
+        Item item = new Item("A book", 12, 20);
+        Item[] items = {item};
+
+        Inventory inv = new Inventory(items);
+        inv.updateQuality02();
+        Assert.assertEquals(19, item.getQuality());
+    }
+
+    @Test
+    public void updateQuantityTest02(){
+        //test item that should go down two quality in 1 day
+        Item item = new Item("A book", -1, 20);
+        Item[] items = {item};
+
+        Inventory inv = new Inventory(items);
+        inv.updateQuality02();
+        System.out.println(item.getQuality());
+        Assert.assertEquals(18, item.getQuality());
+    }
+
+    @Test
+    public void updateQuantityTest03(){
+        //test aged brie that should increase in quality twice
+        Item item = new Item("Aged Brie", -1, 15);
+        Item[] items = {item};
+
+        Inventory inv = new Inventory(items);
+        inv.updateQuality02();
+        Assert.assertEquals(17, item.getQuality());
+    }
+
+    @Test
+    public void updateQuantityTest04() {
+        //test that tickets for TAFKAL80ETC goes up three times
+        Item item = new Item("Backstage passes to a TAFKAL80ETC concert", 5, 15);
+        Item[] items = {item};
+
+        Inventory inv = new Inventory(items);
+        inv.updateQuality02();
+        Assert.assertEquals(18, item.getQuality());
     }
-}
 
+    @Test
+    public void updateQuantityTest05() {
+        //test that tickets for TAFKAL80ETC goes up three times
+        Item item = new Item("Aged Brie", 0, 15);
+        item.setName("A book");
+        item.setSellIn(50);
+        Item[] items = {item};
+
+        Inventory inv = new Inventory(items);
+        inv.updateQuality02();
+        Assert.assertEquals(14, item.getQuality());
+    }
+
+    @Test
+    public void updateQuantityTest06() {
+        //test that tickets for TAFKAL80ETC goes up three times
+        Item item = new Item("Backstage passes to a TAFKAL80ETC concert", -3, 15);
+        Item[] items = {item};
+
+        Inventory inv = new Inventory(items);
+        inv.updateQuality02();
+        Assert.assertEquals(0, item.getQuality());
+    }
+
+    @Test
+    public void updateQuantityTest07() {
+        //test that tickets for TAFKAL80ETC goes up three times
+        Item item = new Item("Sulfuras, Hand of Ragnaros", 0, 15);
+        Item[] items = {item};
+
+        Inventory inv = new Inventory(items);
+        inv.updateQuality02();
+        Assert.assertEquals(15, item.getQuality());
+    }
+
+    @Test
+    public void updateQuantityTest08() {
+        //test that tickets for TAFKAL80ETC goes up three times
+        Item item = new Item("Conjured Item", -1, 15);
+        Item[] items = {item};
+
+        Inventory inv = new Inventory(items);
+        inv.updateQuality02();
+        Assert.assertEquals(11, item.getQuality());
+    }
+}