Skip to content

refactoring #53

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
pasilack wants to merge 2 commits into
base: testing
Choose a base branch
from
Open

refactoring #53

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
79c93df
Assignment Finished
Sep 8, 2016
f33d1bb
refactoring
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.
111 changes: 47 additions & 64 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 @@ -19,79 +19,62 @@ public void addItem(Item item) {
public GildedRose() {
items = new ArrayList<Item>();
}

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()))
if("Sulfuras, Hand of Ragnaros".equals(item.getName()))
{
//do nothing about quality
}

else if ("Backstage passes to a TAFKAL80ETC concert".equals(item.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);
}
if (item.isExpired())
{
item.setQuality(0);
}
else if(item.getSellIn() < 6)
{
item.increaseQuality(3);
}
else if(item.getSellIn() < 11)
{
item.increaseQuality(2);
}
else
{
item.increaseQuality(1);
}
}
else

else if("Aged Brie".equals(item.getName()))
{
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 (item.isExpired())
{
item.increaseQuality(2);
}
else
{
item.increaseQuality(1);
}
}

else
{
if(item.isExpired())
{
item.decreaseQuality(2);
}
else
{
item.decreaseQuality(1);
}
}

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);
}
}
}
item.decreaseSellIn(1);
}
}

Expand Down
33 changes: 33 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,38 @@ public int getQuality() {
public void setQuality(int quality) {
this.quality = quality;
}

public void decreaseQuality(int decrease) {
if(this.quality - decrease > 0) {
this.quality -= decrease;
}
else {
this.quality = 0;
}
}

public void increaseQuality(int increase) {
if(this.quality + increase <= 50) {
this.quality += increase;
}
else {
this.quality = 50;
}
}

public void decreaseSellIn(int decrease) {
if (!"Sulfuras, Hand of Ragnaros".equals(getName())) {
this.sellIn -= decrease;
}
}

public boolean isExpired() {
if(getSellIn()<=0) {
return true;
}
else {
return false;
}
}
}

224 changes: 222 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 @@ -36,7 +36,227 @@ public void testUpdateEndOfDay_AgedBrie_Quality_10_11() {
}

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

// Act
store.updateEndOfDay();

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

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

// Act
store.updateEndOfDay();

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

@Test
public void testUpdateEndOfDay_AgedBrie_QualityStopsIncreasingAfter50() {
// Arrange
GildedRose store = new GildedRose();
store.addItem(new Item("Aged Brie", 9, 50) );

// Act
store.updateEndOfDay();

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

@Test
public void testUpdateEndOfDay_AgedBrie_SellIn0_Quality49_QualityStopsIncreasingAfter50() {
// Arrange
GildedRose store = new GildedRose();
store.addItem(new Item("Aged Brie", 0, 49) );

// Act
store.updateEndOfDay();

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

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

// Act
store.updateEndOfDay();

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

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

// Act
store.updateEndOfDay();

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

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

// Act
store.updateEndOfDay();

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

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

// Act
store.updateEndOfDay();

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

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

// Act
store.updateEndOfDay();

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

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

// Act
store.updateEndOfDay();

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

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

// Act
store.updateEndOfDay();

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

@Test
public void testUpdateEndOfDay_ConjuredManaCake_SellIn0_Quality_10_8() {
// Arrange
GildedRose store = new GildedRose();
store.addItem(new Item("Conjured Mana Cake", 0, 10));

// Act
store.updateEndOfDay();

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

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

// Act
store.updateEndOfDay();

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

@Test
public void testUpdateEndOfDay_SulfurasQuality80() {
// 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_SulfurasSellIn0() {
// 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(0, itemSulfuras.getSellIn());
}
}