Curtis Cook's Clean Code Part 2

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

@@ -11,56 +11,59 @@ public class Inventory {
 
 
     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);
-                    }
+        for (Item item : items) {
+            if (!item.getName().equals("Aged Brie")
+                    && !item.getName().equals("Backstage passes to a TAFKAL80ETC concert")
+                    && item.getQuality() > 0
+                    && !item.getName().equals("Sulfuras, Hand of Ragnaros")) {
+                item.setQuality(item.getQuality() - 1);
+            }
+
+            if (!item.getName().equals("Aged Brie")
+                    && !item.getName().equals("Backstage passes to a TAFKAL80ETC concert")) {
+            } else if (item.getQuality() < 50) {
+                item.setQuality(item.getQuality() + 1);
+                if (item.getName().equals("Backstage passes to a TAFKAL80ETC concert")
+                        && item.getSellIn() < 11) {
                 }
-            } else {
-                if (items[i].getQuality() < 50) {
-                    items[i].setQuality(items[i].getQuality() + 1);
+                if (item.getSellIn() < 6
+                        && item.getQuality() < 50) {
+                    item.setQuality(item.getQuality() + 1);
+                }
+                if (item.getName().equals("Backstage passes to a TAFKAL80ETC concert")
+                        && item.getSellIn() < 11
+                        && item.getQuality() < 50) {
+                    item.setQuality(item.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 (!item.getName().equals("Sulfuras, Hand of Ragnaros")) {
+                item.setSellIn(item.getSellIn() - 1);
             }
 
-            if (!items[i].getName().equals("Sulfuras, Hand of Ragnaros")) {
-                items[i].setSellIn(items[i].getSellIn() - 1);
+            if (item.getSellIn() < 0
+                    && !item.getName().equals("Aged Brie")
+                    && !item.getName().equals("Backstage passes to a TAFKAL80ETC concert")
+                    && item.getQuality() > 0
+                    && !item.getName().equals("Sulfuras, Hand of Ragnaros")) {
+                item.setQuality(item.getQuality() - 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.getSellIn() < 0
+                    && !item.getName().equals("Aged Brie")
+                    && !item.getName().equals("Backstage passes to a TAFKAL80ETC concert")) {
+            } else {
+                item.setQuality(0);
+            }
+
+            if (item.getSellIn() < 0
+                    && !item.getName().equals("Aged Brie")) {
+            } else if (item.getQuality() < 50) {
+                item.setQuality(item.getQuality() + 1);
             }
+
         }
     }
+
 }

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

@@ -55,20 +55,5 @@ public class InventoryTest {
         // Then
         Assert.assertEquals(expected, actual);
     }
-
-    @Test
-    public void updateQuantityTest4() {
-        // Given
-        agedBrie.setSellIn(-7);
-        agedBrie.setQuality(41);
-        int expected = 41 + 1 + 1;
-
-        // When
-        inventory.updateQuality();
-        int actual = agedBrie.getQuality();
-
-        // Then
-        Assert.assertEquals(expected, actual);
-    }
 }