Finished Part 2: Refactor the code

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

@@ -9,58 +9,107 @@ public class Inventory {
         this.items = items;
     }
 
+    private void updateSellIn(Item item) {
+        item.setSellIn(item.getSellIn() - 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);
+    private void changeQuality(Item item, int change) {
+        item.setQuality(item.getQuality() + change);
+    }
 
-                    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 updateQuality() {
+        for (Item item : items) {
+            if (item.getQuality() < 50) {
+                switch (item.getName()) {
+                    case "Aged Brie":
+                        changeQuality(item, 1);
+                        break;
+                    case "Backstage passes to a TAFKAL80ETC concert":
+                        if (item.getSellIn() < 6) {
+                            changeQuality(item, 3);
+                        } else if (item.getSellIn() < 11) {
+                            changeQuality(item, 2);
+                        } else {
+                            changeQuality(item, 1);
                         }
-
-                        if (items[i].getSellIn() < 6) {
-                            if (items[i].getQuality() < 50) {
-                                items[i].setQuality(items[i].getQuality() + 1);
-                            }
+                        break;
+                    case "Sulfuras, Hand of Ragnaros":
+                        continue;
+                    default:
+                        if (item.getSellIn() < 1) {
+                            changeQuality(item, -2);
+                        } else {
+                            changeQuality(item, -1);
                         }
-                    }
+                        break;
                 }
             }
-
-            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")) {
-                    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);
-                    }
-                }
+            if (item.getQuality() < 0) {
+                item.setQuality(0);
             }
+//                    default:
+//                        if (item.getQuality() > 0)
+//                            if (item.getSellIn() < 0 && item.getQuality() > 1))
+//                                changeQuality(item, -1);
+//                            if (item.getSellIn() < 0 && item.getQuality() > 1)
+//                                changeQuality(item, -2);
+//                        break;
+//                }
+//            }
+            updateSellIn(item);
         }
+
+
+//        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].getName().equals("Backstage passes to a TAFKAL80ETC concert")) {
+//                    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);
+////                            }
+////                        }
+////                    }
+//                }
+//            }
+//
+//            if (!items[i].getName().equals("Sulfuras, Hand of Ragnaros") && !items[i].getName().equals("Backstage passes to a TAFKAL80ETC concert")) {
+//                items[i].setSellIn(items[i].getSellIn() - 1);
+//            }
+//
+//            if (items[i].getSellIn() < 0 && !items[i].getName().equals("Backstage passes to a TAFKAL80ETC concert")) {
+//                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);
+//////                    }
+////                }
+//            }
+//        }
     }
 }

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

@@ -20,8 +20,8 @@ public class InventoryTest {
         inventory.updateQuality();
         int after = items[0].getQuality();
 
-        System.out.println(before);
-        System.out.println(after);
+//        System.out.println(before);
+//        System.out.println(after);
 
         Assert.assertTrue(before > after);
     }
@@ -37,7 +37,7 @@ public class InventoryTest {
         }
         int after = items[0].getQuality();
 
-        System.out.println(after);
+//        System.out.println(after);
 
         Assert.assertTrue(after >= 0);
     }
@@ -51,8 +51,8 @@ public class InventoryTest {
         inventory.updateQuality();
         int after = items[1].getQuality();
 
-        System.out.println(before);
-        System.out.println(after);
+//        System.out.println(before);
+//        System.out.println(after);
 
         Assert.assertTrue(before < after);
     }
@@ -64,11 +64,13 @@ public class InventoryTest {
         // test that quality degrades 2x fast after sellIn expires
         for (int i = 0; i < 8; i++) {
             inventory.updateQuality();
+            System.out.println(items[0].getQuality());
         }
 
         int expectedValue = 25 - 7 - 2;
         int actualValue = items[0].getQuality();
 
+
         Assert.assertTrue(expectedValue == actualValue);
     }
 
@@ -116,6 +118,9 @@ public class InventoryTest {
         int expectedValue = 10 + 1*4 + 2;
         int actualValue = items[3].getQuality();
 
+        System.out.println(actualValue);
+        System.out.println(expectedValue);
+
         Assert.assertTrue(actualValue == expectedValue);
     }
 
@@ -131,6 +136,9 @@ public class InventoryTest {
         int expectedValue = 10 + 1*4 + 2*5 + 3;
         int actualValue = items[3].getQuality();
 
+        System.out.println(actualValue);
+        System.out.println(expectedValue);
+
         Assert.assertTrue(actualValue == expectedValue);
     }