completed lab

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

@@ -13,53 +13,35 @@ 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);
-                    }
-                }
-            } 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);
-                            }
-                        }
+                    && !items[i].getName().equals("Backstage passes to a TAFKAL80ETC concert") && items[i].getQuality() > 0
+                    && !items[i].getName().equals("Sulfuras, Hand of Ragnaros")) {
+                items[i].setQuality(items[i].getQuality() - 1);
+            }
+            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() == "Backstage passes to a TAFKAL80ETC concert" && items[i].getSellIn() < 11
+                    && items[i].getQuality() < 50) {
+                items[i].setQuality(items[i].getQuality() + 1);
+            }
+            if (items[i].getSellIn() < 6 && items[i].getQuality() < 50) {
+                items[i].setQuality(items[i].getQuality() + 1);
             }
 
             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 (items[i].getSellIn() < 0 && !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")) {
+                items[i].setQuality(items[i].getQuality() - 1);
+            } else {
+                items[i].setQuality(items[i].getQuality() - items[i].getQuality());
+            }
+            if (items[i].getQuality() < 50) {
+                items[i].setQuality(items[i].getQuality() + 1);
             }
         }
     }

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

@@ -117,7 +117,7 @@ public class InventoryTest {
     @Test
     public void notNames(){
         int before = item1.getQuality();
-        int expected = 0;
+        int expected = 3;
         inventory.updateQuality();
         int actual = item1.getQuality();
 
@@ -126,7 +126,7 @@ public class InventoryTest {
 
     @Test
     public void lastTest(){
-        int actual = 6;
+        int actual = 1;
         inventory.updateQuality();
         int expected = agedBrie.getQuality();