Cleaned up all tests pass

Inventory.java

@@ -10,55 +10,58 @@ 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);
-                            }
-                        }
-
-                        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")) {
+                switch (items[i].getName()) {
+                    case "Backstage passes to a TAFKAL80ETC concert" :
+                        updateTickets(items[i]);
+                        break;
+                    case "Aged Brie" :
+                        updateBrie(items[i]);
+                        break;
+                    default : 
+                        updateNormalItem(items[i]);
+                        break;
+                }
                 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);
-                    }
-                }
+        }
+    }
+    
+    public void updateTickets(Item ticket) {
+        if (ticket.getSellIn() < 0) {
+            ticket.setQuality(0);
+        }
+        else if (ticket.getQuality() >= 48) {
+            ticket.setQuality(50);
+        }
+        else {
+            if (ticket.getSellIn() >= 11) {
+                ticket.setQuality(ticket.getQuality() + 1);
+            }
+            if (ticket.getSellIn() >= 6 && ticket.getSellIn() < 11) {
+                ticket.setQuality(ticket.getQuality() + 2);
+            }
+            else if (ticket.getSellIn() < 6) {
+                ticket.setQuality(ticket.getQuality() + 3);
             }
         }
-}
+    }
+    
+    public void updateBrie(Item brie) {
+        if (brie.getSellIn() > 0 && brie.getQuality() < 50) {
+            brie.setQuality(brie.getQuality() + 1);
+        }
+        else if (brie.getSellIn() < 0) {
+            brie.setQuality(brie.getQuality() + 2);
+        }
+    }
+    
+    public void updateNormalItem(Item item) {
+        if (item.getQuality() > 0) {
+            item.setQuality(item.getQuality() - 1);
+        }
+        if (item.getSellIn() < 0) {
+            item.setQuality(item.getQuality() - 1);
+        }
+    }
 }

package.bluej

@@ -5,18 +5,18 @@ dependency1.type=UsesDependency
 dependency2.from=InventoryTest
 dependency2.to=Inventory
 dependency2.type=UsesDependency
-editor.fx.0.height=722
-editor.fx.0.width=800
-editor.fx.0.x=320
-editor.fx.0.y=50
+editor.fx.0.height=717
+editor.fx.0.width=1280
+editor.fx.0.x=0
+editor.fx.0.y=23
 objectbench.height=164
-objectbench.width=776
+objectbench.width=461
 package.divider.horizontal=0.6
 package.divider.vertical=0.6845018450184502
 package.editor.height=364
 package.editor.width=674
-package.editor.x=577
-package.editor.y=61
+package.editor.x=79
+package.editor.y=50
 package.frame.height=600
 package.frame.width=800
 package.numDependencies=2
@@ -34,14 +34,14 @@ target1.name=Item
 target1.showInterface=false
 target1.type=ClassTarget
 target1.width=80
-target1.x=10
-target1.y=100
+target1.x=40
+target1.y=110
 target2.height=50
 target2.name=InventoryTest
 target2.showInterface=false
 target2.type=UnitTestTargetJunit4
 target2.width=80
-target2.x=40
+target2.x=220
 target2.y=160
 target3.association=InventoryTest
 target3.height=50
@@ -49,5 +49,5 @@ target3.name=Inventory
 target3.showInterface=false
 target3.type=ClassTarget
 target3.width=80
-target3.x=10
+target3.x=190
 target3.y=190