diff --git a/bin/.gitignore b/bin/.gitignore new file mode 100644 index 0000000..76b3e7b --- /dev/null +++ b/bin/.gitignore @@ -0,0 +1 @@ +/fi/ diff --git a/bin/fi/oulu/tol/sqat/GildedRose.class b/bin/fi/oulu/tol/sqat/GildedRose.class index f244eba..a865aef 100644 Binary files a/bin/fi/oulu/tol/sqat/GildedRose.class and b/bin/fi/oulu/tol/sqat/GildedRose.class differ diff --git a/bin/fi/oulu/tol/sqat/Item.class b/bin/fi/oulu/tol/sqat/Item.class index 478a739..252be28 100644 Binary files a/bin/fi/oulu/tol/sqat/Item.class and b/bin/fi/oulu/tol/sqat/Item.class differ diff --git a/bin/fi/oulu/tol/sqat/tests/GildedRoseTest.class b/bin/fi/oulu/tol/sqat/tests/GildedRoseTest.class index e44e81c..0a1d97b 100644 Binary files a/bin/fi/oulu/tol/sqat/tests/GildedRoseTest.class and b/bin/fi/oulu/tol/sqat/tests/GildedRoseTest.class differ diff --git a/src/fi/oulu/tol/sqat/GildedRose.java b/src/fi/oulu/tol/sqat/GildedRose.java index 24741c6..fde36b1 100644 --- a/src/fi/oulu/tol/sqat/GildedRose.java +++ b/src/fi/oulu/tol/sqat/GildedRose.java @@ -23,76 +23,67 @@ public static void updateEndOfDay() { for (int i = 0; i < items.size(); i++) { - if ((!"Aged Brie".equals(items.get(i).getName())) && !"Backstage passes to a TAFKAL80ETC concert".equals(items.get(i).getName())) + Item item = items.get(i); + + if (item.isSpecial())/*item string is in 'special item' list*/ { - if (items.get(i).getQuality() > 0) - { - if (!"Sulfuras, Hand of Ragnaros".equals(items.get(i).getName())) - { - items.get(i).setQuality(items.get(i).getQuality() - 1); - } - } - } - else - { - if (items.get(i).getQuality() < 50) - { - items.get(i).setQuality(items.get(i).getQuality() + 1); - - if ("Backstage passes to a TAFKAL80ETC concert".equals(items.get(i).getName())) - { - if (items.get(i).getSellIn() < 11) - { - if (items.get(i).getQuality() < 50) - { - items.get(i).setQuality(items.get(i).getQuality() + 1); - } - } - - if (items.get(i).getSellIn() < 6) - { - if (items.get(i).getQuality() < 50) - { - items.get(i).setQuality(items.get(i).getQuality() + 1); - } - } - } - } - } + if ("Backstage passes to a TAFKAL80ETC concert".equals(item.getName())) + { + if (item.getSellIn() > 10) + { + if (!item.isMaximumQuality()) + { + item.increaseQuality(1); + } + } + else if (item.getSellIn() <= 10 && item.getSellIn() > 5) + { + if (!item.isMaximumQuality()) + { + item.increaseQuality(2); + } + } + else if (item.getSellIn() <= 5 && item.getSellIn() > 0) + { + if (!item.isMaximumQuality()) + { + item.increaseQuality(3); + } + } + else if (item.HasExpired()) + { + item.setQuality(0); + } + } + else if ("Aged Brie".equals(item.getName())) + { + if(!item.isMaximumQuality() && item.getSellIn() > 0){ + item.increaseQuality(1); + }else if (!item.isMaximumQuality() && item.getSellIn() <= 0){ + item.increaseQuality(2); + } + } + + item.decreaseSellIn(); + + if ("Sulfuras, Hand of Ragnaros".equals(item.getName()))/*if item is Sulfuras, ignore everything above, set Sulfuras stats*/ + { + item.setSulfuras(); - if (!"Sulfuras, Hand of Ragnaros".equals(items.get(i).getName())) - { - items.get(i).setSellIn(items.get(i).getSellIn() - 1); - } - - if (items.get(i).getSellIn() < 0) - { - if (!"Aged Brie".equals(items.get(i).getName())) - { - if (!"Backstage passes to a TAFKAL80ETC concert".equals(items.get(i).getName())) - { - if (items.get(i).getQuality() > 0) - { - if (!"Sulfuras, Hand of Ragnaros".equals(items.get(i).getName())) - { - items.get(i).setQuality(items.get(i).getQuality() - 1); - } - } - } - else - { - items.get(i).setQuality(items.get(i).getQuality() - items.get(i).getQuality()); - } - } - else - { - if (items.get(i).getQuality() < 50) - { - items.get(i).setQuality(items.get(i).getQuality() + 1); - } - } + } } - } - } + /*otherwise item is normal*/ + else{ + if (item.getSellIn() > 0){ + item.decreaseQuality(1); + item.decreaseSellIn(); + }else if (item.getSellIn() <= 0){ + item.decreaseQuality(2); + item.decreaseSellIn(); + } + } + } + } + } diff --git a/src/fi/oulu/tol/sqat/Item.java b/src/fi/oulu/tol/sqat/Item.java index 447b7fe..15077f2 100644 --- a/src/fi/oulu/tol/sqat/Item.java +++ b/src/fi/oulu/tol/sqat/Item.java @@ -11,6 +11,49 @@ public Item(String name, int sellIn, int quality) { this.setSellIn(sellIn); this.setQuality(quality); } + public boolean HasExpired (){ + if (sellIn<=0){ + return true;} + else return false; + } + public boolean isMaximumQuality(){ + if (quality >= 50) + { + quality = 50; + return true; + } + else return false; + } + public boolean hasZeroQuality(){ + return true; + } + public boolean isSpecial(){ + /*lists some special items*/ + if (name=="Backstage passes to a TAFKAL80ETC concert" + || name == "Aged Brie" + || name == "Sulfuras, Hand of Ragnaros") + {return true;} + else return false; +} + + + public void decreaseQuality(int x){ + quality = quality - x; + } + + public void increaseQuality(int x){ + quality = quality + x; + } + + public void decreaseSellIn(){ + /*sellIn only ever decreases by 1*/ + sellIn = sellIn - 1; + } + + public void setSulfuras(){ + quality = 80; + sellIn = 0; + } /* Generated getter and setter code */ public String getName() { diff --git a/src/fi/oulu/tol/sqat/tests/GildedRoseTest.java b/src/fi/oulu/tol/sqat/tests/GildedRoseTest.java index 7aceb2e..256d58e 100644 --- a/src/fi/oulu/tol/sqat/tests/GildedRoseTest.java +++ b/src/fi/oulu/tol/sqat/tests/GildedRoseTest.java @@ -1,42 +1,242 @@ package fi.oulu.tol.sqat.tests; - import static org.junit.Assert.*; - import java.util.ArrayList; import java.util.List; - import org.junit.Test; - import fi.oulu.tol.sqat.GildedRose; import fi.oulu.tol.sqat.Item; - public class GildedRoseTest { - -// Example scenarios for testing -// Item("+5 Dexterity Vest", 10, 20)); -// Item("Aged Brie", 2, 0)); -// Item("Elixir of the Mongoose", 5, 7)); -// Item("Sulfuras, Hand of Ragnaros", 0, 80)); -// Item("Backstage passes to a TAFKAL80ETC concert", 15, 20)); -// Item("Conjured Mana Cake", 3, 6)); - - @Test - public void testUpdateEndOfDay_AgedBrie_Quality_10_11() { - // Arrange - GildedRose store = new GildedRose(); - store.addItem(new Item("Aged Brie", 2, 10) ); - - // Act - store.updateEndOfDay(); - - // Assert - List items = store.getItems(); - Item itemBrie = items.get(0); - assertEquals(11, itemBrie.getQuality()); - } - - @Test - public void testUpdateEndOfDay() { - fail("Test not implemented"); - } +GildedRose store = new GildedRose(); +// Test Aged Brie +@Test +public void testUpdateEndOfDay_AgedBrie_Quality_2_10() { +// Arrange +store.addItem(new Item("Aged Brie", 2, 10) ); +// Act +store.updateEndOfDay(); +// Assert +int quality = store.getItems().get(0).getQuality(); +String failMessage = "Quality of Aged Brie increases"; +assertEquals(failMessage, 11,quality); } +@Test +public void testUpdateEndOfDay_AgedBrie_Quality_10_50() { +// Arrange +store.addItem(new Item("Aged Brie", 10, 50) ); +// Act +store.updateEndOfDay(); +// Assert +int quality = store.getItems().get(0).getQuality(); +String failMessage = "The Quality of an item is never more than 50"; +assertEquals(failMessage, 50, quality); +} +@Test +public void testUpdateEndOfDay_AgedBrie_Quality_0_10() { +// Arrange +store.addItem(new Item("Aged Brie", 0, 10) ); +// Act +store.updateEndOfDay(); +// Assert +int quality = store.getItems().get(0).getQuality(); +String failMessage = "The Quality of Aged Brie increases twice after SellIn date has passed"; +assertEquals(failMessage, 12, quality); +} +@Test +public void testUpdateEndOfDay_AgedBrie_Quality_0_50() { +// Arrange +store.addItem(new Item("Aged Brie", 0, 50) ); +// Act +store.updateEndOfDay(); +// Assert +int quality = store.getItems().get(0).getQuality(); +String failMessage = "The Quality of Aged Brie is never more than 50 increases twice after SellIn date has passed"; +assertEquals(failMessage, 50, quality); +} +@Test +public void testUpdateEndOfDay_AgedBrie_Quality_Minus1_20() { +// Arrange +store.addItem(new Item("Aged Brie", -1, 20) ); +// Act +store.updateEndOfDay(); +// Assert +int quality = store.getItems().get(0).getQuality(); +String failMessage = "The Quality of Aged Brie increases twice after SellIn date has passed"; +assertEquals(failMessage, 22, quality); +} +@Test +public void testUpdateEndOfDay_AgedBrie_SellIn_2_10() { +// Arrange +store.addItem(new Item("Aged Brie", 2, 10) ); +// Act +store.updateEndOfDay(); +// Assert +int sellIn = store.getItems().get(0).getSellIn(); +String failMessage = "SellIn date decreases"; +assertEquals(failMessage, 1, sellIn); +} +@Test +public void testUpdateEndOfDay_AgedBrie_SellIn_1_10() { +// Arrange +store.addItem(new Item("Aged Brie", 1, 10) ); +// Act +store.updateEndOfDay(); +// Assert +int sellIn = store.getItems().get(0).getSellIn(); +String failMessage = "SellIn date decreases"; +assertEquals(failMessage, 0, sellIn); +} +@Test +public void testUpdateEndOfDay_AgedBrie_SellIn_0_10() { +// Arrange +store.addItem(new Item("Aged Brie", 0, 10) ); +// Act +store.updateEndOfDay(); +// Assert +int sellIn = store.getItems().get(0).getSellIn(); +String failMessage = "SellIn date decreases"; +assertEquals(failMessage, -1, sellIn); +} +// Test Sulfurasx +@Test +public void testUpdateEndOfDay_Sulfuras_Quality_0_70() { +// Arrange +store.addItem(new Item("Sulfuras, Hand of Ragnaros", 0, 70) ); +// Act +store.updateEndOfDay(); +// Assert +int quality = store.getItems().get(0).getQuality(); +String failMessage = "Quality of Sulfuras is 80 and never alters"; +assertEquals(failMessage, 80, quality); +} +@Test +public void testUpdateEndOfDay_Sulfuras_SellIn_0_80() { +// Arrange +store.addItem(new Item("Sulfuras, Hand of Ragnaros", 0, 80) ); +// Act +store.updateEndOfDay(); +// Assert +int sellIn = store.getItems().get(0).getSellIn(); +String failMessage = "Sulfuras, being a legendary item, never has to be sold"; +assertEquals(failMessage, 0, sellIn); +} +// Test Backstage pass +@Test +public void testUpdateEndOfDay_Backstage_Quality_15_20() { +// Arrange +store.addItem(new Item("Backstage passes to a TAFKAL80ETC concert", +15, 20) ); +// Act +store.updateEndOfDay(); +// Assert +int quality = store.getItems().get(0).getQuality(); +String failMessage = "Quality of Backstage pass increases by 1 when there are more than 10 days"; +assertEquals(failMessage, 21, quality); +} +@Test +public void testUpdateEndOfDay_Backstage_Quality_10_20() { +// Arrange +store.addItem(new Item("Backstage passes to a TAFKAL80ETC concert", +10, 20) ); +// Act +store.updateEndOfDay(); +// Assert +int quality = store.getItems().get(0).getQuality(); +String failMessage = "Quality of Backstage pass increases by 2 when there are 10 or less days"; +assertEquals(failMessage, 22, quality); +} +@Test +public void testUpdateEndOfDay_Backstage_Quality_8_20() { +// Arrange +store.addItem(new Item("Backstage passes to a TAFKAL80ETC concert", +8, 20) ); +// Act +store.updateEndOfDay(); +// Assert +int quality = store.getItems().get(0).getQuality(); +String failMessage = "Quality of Backstage pass increases by 2 when there are 10 or less days"; +assertEquals(failMessage, 22, quality); +} +@Test +public void testUpdateEndOfDay_Backstage_Quality_5_20() { +// Arrange +store.addItem(new Item("Backstage passes to a TAFKAL80ETC concert", +5, 20) ); +// Act +store.updateEndOfDay(); +// Assert +int quality = store.getItems().get(0).getQuality(); +String failMessage = "Quality of Backstage pass increases by 3 when there are 5 or less days"; +assertEquals(failMessage, 23, quality); +} +@Test +public void testUpdateEndOfDay_Backstage_Quality_3_20() { +// Arrange +store.addItem(new Item("Backstage passes to a TAFKAL80ETC concert", +3, 20) ); +// Act +store.updateEndOfDay(); +// Assert +int quality = store.getItems().get(0).getQuality(); +String failMessage = "Quality of Backstage pass increases by 3 when there are 5 or less days"; +assertEquals(failMessage, 23, quality); +} +@Test +public void testUpdateEndOfDay_Backstage_Quality_0_20() { +// Arrange +store.addItem(new Item("Backstage passes to a TAFKAL80ETC concert", +0, 20) ); +// Act +store.updateEndOfDay(); +// Assert +int quality = store.getItems().get(0).getQuality(); +String failMessage = "Quality of Backstage drops to 0 after the concert"; +assertEquals(failMessage, 0, quality); +} +@Test +public void testUpdateEndOfDay_Backstage_Quality_15_50() { +// Arrange +store.addItem(new Item("Backstage passes to a TAFKAL80ETC concert", +15, 50) ); +// Act +store.updateEndOfDay(); +// Assert +int quality = store.getItems().get(0).getQuality(); +String failMessage = "The Quality of an item is never more than 50"; +assertEquals(failMessage, 50, quality); +} +@Test +public void testUpdateEndOfDay_Backstage_SellIn_5_10() { +// Arrange +store.addItem(new Item("Backstage passes to a TAFKAL80ETC concert", +5, 10) ); +// Act +store.updateEndOfDay(); +// Assert +int sellIn = store.getItems().get(0).getSellIn(); +String failMessage = "The SellIn value should decrease by 1"; +assertEquals(failMessage, 4, sellIn); +} +// Test Elixir +@Test +public void testUpdateEndOfDay_Elixir_Quality_2_7() { +// Arrange +store.addItem(new Item("Elixir of the Mongoose", 2, 7) ); +// Act +store.updateEndOfDay(); +// Assert +int quality = store.getItems().get(0).getQuality(); +String failMessage = "Quality decreases by 1"; +assertEquals(failMessage, 6,quality); +} +@Test +public void testUpdateEndOfDay_SellIn_Quality_2_7() { +// Arrange +store.addItem(new Item("Elixir of the Mongoose", 2, 7) ); +// Act +store.updateEndOfDay(); +// Assert +int sellIn = store.getItems().get(0).getSellIn(); +String failMessage = "SelIn decreases by 1"; +assertEquals(failMessage, 1, sellIn); +} +} \ No newline at end of file