Skip to content

SQAT Assignment 5 - Refactoring #49

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

SQAT Assignment 5 - Refactoring #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2536c99
Added Some tests to check the requirements of the code
Sep 9, 2016
8574756
Assignment 5 - SQAT
Oct 18, 2016
9822b74
Assignment 5 - SQAT Complete
Oct 18, 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
14 changes: 7 additions & 7 deletions .classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
<classpathentry kind="output" path="bin"/>
</classpath>
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
<classpathentry kind="output" path="bin"/>
</classpath>
22 changes: 11 additions & 11 deletions .settings/org.eclipse.jdt.core.prefs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.7
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=1.7
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=1.6
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.
114 changes: 38 additions & 76 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 @@ -3,96 +3,58 @@
import java.util.ArrayList;
import java.util.List;


public class GildedRose {

private static final String SULFURAS_HAND_OF_RAGNAROS = "Sulfuras, Hand of Ragnaros";
private static final String AGED_BRIE = "Aged Brie";
private static final String BACKSTAGE_PASSES_TO_A_TAFKAL80ETC_CONCERT = "Backstage passes to a TAFKAL80ETC concert";
private static final int SELL_IN_VALUE_6 = 6;
private static final int SELL_IN_VALUE_11 = 11;
private static List<Item> items = null;

public List<Item> getItems() {
return items;
}

public void addItem(Item item) {
items.add(item);
}

public GildedRose() {
items = new ArrayList<Item>();
}
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()))
{
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 (!"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);
}
}
}
}
}
public static void updateEndOfDay() {
for (Item item : items) {
if (!SULFURAS_HAND_OF_RAGNAROS.equals(item.getName())) {
item = changeQuality(item);
item.decreaseSellIn();
if (item.isExpired()) {
item = changeQuality(item);
}
}
}
}
private static Item changeQuality(Item item) {
if (AGED_BRIE.equals(item.getName())) {
item.increaseQuality();
} else if (BACKSTAGE_PASSES_TO_A_TAFKAL80ETC_CONCERT.equals(item
.getName())) {
if (item.isExpired()) {
item.setQuality(item.getQuality() - item.getQuality());
} else {
item.increaseQuality();
if (item.getSellIn() < SELL_IN_VALUE_11) {
item.increaseQuality();
}
if (item.getSellIn() < SELL_IN_VALUE_6) {
item.increaseQuality();
}
}
} else {
item.decreaseQuality();
}
return item;
}

}
61 changes: 52 additions & 9 deletions src/fi/oulu/tol/sqat/Item.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,35 +1,78 @@
package fi.oulu.tol.sqat;


public class Item {
String name;
int sellIn;
int quality;

public Item(String name, int sellIn, int quality) {
private static final int INCREMENT_VALUE = 1;
private static final int DECREMENT_VALUE = 1;
private static final int MINIMUM_SELL_IN = 0;
private static final int MINIMUM_QUALITY = 0;
private static final int MAXIMUM_QUALITY = 50;
String name;
int sellIn;
int quality;

public Item(String name, int sellIn, int quality) {
this.setName(name);
this.setSellIn(sellIn);
this.setQuality(quality);
}

/* Generated getter and setter code */
public String getName() {
public String getName() {
return name;
}

public void setName(String name) {
this.name = name;
}

public int getSellIn() {
return sellIn;
}

public void setSellIn(int sellIn) {
this.sellIn = sellIn;
}

public int getQuality() {
return quality;
}

public void setQuality(int quality) {
this.quality = quality;
}
}

public void increaseQuality() {
if (!hasReachedMaximumQuality()) {
this.quality = this.quality + INCREMENT_VALUE;
}
}

public void decreaseQuality() {
if (!hasZeroQuality()) {
this.quality = this.quality - DECREMENT_VALUE;
}
}

public void decreaseSellIn() {
this.sellIn = this.sellIn - DECREMENT_VALUE;
}

public boolean hasZeroQuality() {
if (this.quality == MINIMUM_QUALITY)
return true;
return false;
}

public boolean hasReachedMaximumQuality() {
if (this.quality == MAXIMUM_QUALITY)
return true;
return false;
}

public boolean isExpired() {
if (this.sellIn < MINIMUM_SELL_IN)
return true;
return false;
}

}
90 changes: 87 additions & 3 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 @@ -2,7 +2,6 @@

import static org.junit.Assert.*;

import java.util.ArrayList;
import java.util.List;

import org.junit.Test;
Expand Down Expand Up @@ -36,7 +35,92 @@ public void testUpdateEndOfDay_AgedBrie_Quality_10_11() {
}

@Test
public void testUpdateEndOfDay() {
fail("Test not implemented");
public void testGildedRose_SellDatePasedQualityDecreasedTwice() {
// Arrange
GildedRose store = new GildedRose();
store.addItem(new Item("Elixir of the Mongoose", 2, 10) );

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

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

// Act
store.updateEndOfDay();

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

@Test
public void testGildedRose_SulfurasQuality() {
// 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 item = items.get(0);
assertEquals(80, item.getQuality());
}

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

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

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

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


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

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

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