Skip to content

Exercise 5 done #62

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tsalmela wants to merge 2 commits into
base: testing
Choose a base branch
from
Open

Exercise 5 done #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5977342
Project finished
Sep 9, 2016
f74088f
Exercise 5 done
tsalmela Oct 19, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions bin/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/fi/
Binary file modified bin/fi/oulu/tol/sqat/GildedRose.class
View file
Open in desktop
Binary file not shown.
Binary file modified bin/fi/oulu/tol/sqat/Item.class
View file
Open in desktop
Binary file not shown.
Binary file modified bin/fi/oulu/tol/sqat/tests/GildedRoseTest.class
View file
Open in desktop
Binary file not shown.
56 changes: 30 additions & 26 deletions src/fi/oulu/tol/sqat/GildedRose.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,78 +21,82 @@ public GildedRose() {
}
public static void updateEndOfDay()
{
for (int i = 0; i < items.size(); i++)
for (Item item : items)
{
if ((!"Aged Brie".equals(items.get(i).getName())) && !"Backstage passes to a TAFKAL80ETC concert".equals(items.get(i).getName()))
String itemName = item.getName();
int itemSellIn = item.getSellIn();
int itemQuality = item.getQuality();


if ((!"Aged Brie".equals(itemName)) && !"Backstage passes to a TAFKAL80ETC concert".equals(itemName))
{
if (items.get(i).getQuality() > 0)
if (itemQuality > 0)
{
if (!"Sulfuras, Hand of Ragnaros".equals(items.get(i).getName()))
if (!"Sulfuras, Hand of Ragnaros".equals(itemName))
{
items.get(i).setQuality(items.get(i).getQuality() - 1);
item.decreaseQuality();
}
}
}
else
{
if (items.get(i).getQuality() < 50)
if (itemQuality < 50)
{
items.get(i).setQuality(items.get(i).getQuality() + 1);
item.increaseQuality();

if ("Backstage passes to a TAFKAL80ETC concert".equals(items.get(i).getName()))
if ("Backstage passes to a TAFKAL80ETC concert".equals(itemName))
{
if (items.get(i).getSellIn() < 11)
if (itemSellIn < 11)
{
if (items.get(i).getQuality() < 50)
if (itemQuality < 50)
{
items.get(i).setQuality(items.get(i).getQuality() + 1);
item.increaseQuality();
}
}

if (items.get(i).getSellIn() < 6)
if (itemSellIn < 6)
{
if (items.get(i).getQuality() < 50)
if (itemQuality < 50)
{
items.get(i).setQuality(items.get(i).getQuality() + 1);
item.increaseQuality();
}
}
}
}
}

if (!"Sulfuras, Hand of Ragnaros".equals(items.get(i).getName()))
if (!"Sulfuras, Hand of Ragnaros".equals(itemName))
{
items.get(i).setSellIn(items.get(i).getSellIn() - 1);
item.decreaseSellIn();
}

if (items.get(i).getSellIn() < 0)
if (item.getSellIn() < 0)
{
if (!"Aged Brie".equals(items.get(i).getName()))
if (!"Aged Brie".equals(itemName))
{
if (!"Backstage passes to a TAFKAL80ETC concert".equals(items.get(i).getName()))
if (!"Backstage passes to a TAFKAL80ETC concert".equals(itemName))
{
if (items.get(i).getQuality() > 0)
if (itemQuality > 0)
{
if (!"Sulfuras, Hand of Ragnaros".equals(items.get(i).getName()))
if (!"Sulfuras, Hand of Ragnaros".equals(itemName))
{
items.get(i).setQuality(items.get(i).getQuality() - 1);
item.decreaseQuality();
}
}
}
else
{
items.get(i).setQuality(items.get(i).getQuality() - items.get(i).getQuality());
item.setQuality(0);
}
}
else
{
if (items.get(i).getQuality() < 50)
if (itemQuality < 50)
{
items.get(i).setQuality(items.get(i).getQuality() + 1);
item.increaseQuality();
}
}
}
}
}

}
12 changes: 12 additions & 0 deletions src/fi/oulu/tol/sqat/Item.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,17 @@ public int getQuality() {
public void setQuality(int quality) {
this.quality = quality;
}
public void increaseQuality(){
this.quality = this.quality +1;
}
public void decreaseQuality(){
this.quality = this.quality -1;
}
public void increaseSellIn(){
this.sellIn = this.sellIn +1;
}
public void decreaseSellIn(){
this.sellIn = this.sellIn -1;
}
}

159 changes: 157 additions & 2 deletions src/fi/oulu/tol/sqat/tests/GildedRoseTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,164 @@ public void testUpdateEndOfDay_AgedBrie_Quality_10_11() {
Item itemBrie = items.get(0);
assertEquals(11, itemBrie.getQuality());
}

@Test
public void testUpdateEndOfDay_AgedBrie_SellIn_2_10() {
// Arrange
GildedRose store = new GildedRose();
store.addItem(new Item("Aged Brie", 2, 10) );

// Act
store.updateEndOfDay();

// Assert
List<Item> items = store.getItems();
Item itemBrie = items.get(0);
assertEquals(1, itemBrie.getSellIn());
}


@Test
public void testUpdateEndOfDay_Conjured_mana_cake_Quality_3_6() {
//Arrange
GildedRose store = new GildedRose();
store.addItem(new Item("Conjured Mana Cake", 3, 6));

//Act
store.updateEndOfDay();

//Assert
List<Item> items = store.getItems();
Item itemCake = items.get(0);
assertEquals(5, itemCake.getQuality());
assertEquals(2, itemCake.getSellIn());
}

@Test
public void testUpdateEndOfDay_Dexterity_vest_10_20_selling_after_6_days() {
//Arrange
GildedRose store = new GildedRose();
store.addItem(new Item("Dexterity vest", 10, 20));

//Act
store.updateEndOfDay();
store.updateEndOfDay();
store.updateEndOfDay();
store.updateEndOfDay();
store.updateEndOfDay();
store.updateEndOfDay();


//Assert
List<Item> items = store.getItems();
Item itemDexVest = items.get(0);
assertEquals(14, itemDexVest.getQuality());
assertEquals(4, itemDexVest.getSellIn());
}

@Test
public void testUpdateEndOfDay_Sulfuras_Hand_of_Ragnaros_0_80() {
//Arrange
GildedRose store = new GildedRose();
store.addItem(new Item("Sulfuras, Hand of Ragnaros", 0, 80));

//Act
store.updateEndOfDay();

//Assert
List<Item> items = store.getItems();
Item itemSulfuras = items.get(0);
assertEquals(80, itemSulfuras.getQuality());
}

@Test
public void testUpdateEndOfDay_AgedBrie_quality_double_degrade() {
// Arrange
GildedRose store = new GildedRose();
store.addItem(new Item("Aged Brie", 2, 10) );

// Act
store.updateEndOfDay();
store.updateEndOfDay();
store.updateEndOfDay();
store.updateEndOfDay();


// Assert
List<Item> items = store.getItems();
Item itemBrie = items.get(0);
assertEquals(16, itemBrie.getQuality());
}

@Test
public void testUpdateEndOfDay() {
fail("Test not implemented");
public void testUpdateEndOfDay_AgedBrie_quality_over_50() {
// Arrange
GildedRose store = new GildedRose();
store.addItem(new Item("Aged Brie", 2, 50) );

// Act
store.updateEndOfDay();
store.updateEndOfDay();
store.updateEndOfDay();


// Assert
List<Item> items = store.getItems();
Item itemBrie = items.get(0);
assertEquals(50, itemBrie.getQuality());
}

@Test
public void testUpdateEndOfDay_Conjured_mana_cake_Quality_negative() {
//Arrange
GildedRose store = new GildedRose();
store.addItem(new Item("Conjured Mana Cake", 3, 1));

//Act
store.updateEndOfDay();
store.updateEndOfDay();

//Assert
List<Item> items = store.getItems();
Item itemCake = items.get(0);
assertEquals(0, itemCake.getQuality());
}


@Test
public void testUpdateEndOfDay_Backstage_passes_quality_5_11() {
//Arrange
GildedRose store = new GildedRose();
store.addItem(new Item("Backstage passes to a TAFKAL80ETC concert", 5, 11));

//Act
store.updateEndOfDay();
store.updateEndOfDay();

//Assert
List<Item> items = store.getItems();
Item itemPass = items.get(0);
assertEquals(17, itemPass.getQuality());
}

@Test
public void testUpdateEndOfDay_Backstage_passes_quality_12_11() {
//Arrange
GildedRose store = new GildedRose();
store.addItem(new Item("Backstage passes to a TAFKAL80ETC concert", 12, 11));

//Act
store.updateEndOfDay();
store.updateEndOfDay();

//Assert
List<Item> items = store.getItems();
Item itemPass = items.get(0);
assertEquals(13, itemPass.getQuality());
}





}