refactored code

This commit is contained in:
Viktor 2023-05-30 14:45:53 +03:00
parent 34a1fba37b
commit 77f8ebcdd0
3 changed files with 70 additions and 57 deletions

View File

@ -7,56 +7,71 @@ class GildedRose {
this.items = items;
}
public void updateQuality() {
for (int i = 0; i < items.length; i++) {
if (!items[i].name.equals("Aged Brie")
&& !items[i].name.equals("Backstage passes to a TAFKAL80ETC concert")) {
if (items[i].quality > 0) {
if (!items[i].name.equals("Sulfuras, Hand of Ragnaros")) {
items[i].quality = items[i].quality - 1;
}
}
} else {
if (items[i].quality < 50) {
items[i].quality = items[i].quality + 1;
if (items[i].name.equals("Backstage passes to a TAFKAL80ETC concert")) {
if (items[i].sellIn < 11) {
if (items[i].quality < 50) {
items[i].quality = items[i].quality + 1;
}
}
if (items[i].sellIn < 6) {
if (items[i].quality < 50) {
items[i].quality = items[i].quality + 1;
}
}
}
}
}
if (!items[i].name.equals("Sulfuras, Hand of Ragnaros")) {
items[i].sellIn = items[i].sellIn - 1;
}
if (items[i].sellIn < 0) {
if (!items[i].name.equals("Aged Brie")) {
if (!items[i].name.equals("Backstage passes to a TAFKAL80ETC concert")) {
if (items[i].quality > 0) {
if (!items[i].name.equals("Sulfuras, Hand of Ragnaros")) {
items[i].quality = items[i].quality - 1;
}
}
} else {
items[i].quality = items[i].quality - items[i].quality;
}
} else {
if (items[i].quality < 50) {
items[i].quality = items[i].quality + 1;
}
}
}
public void updateInventory() {
for (Item item : items) {
itemUpgrade(item);
}
}
}
private static void itemUpgrade(Item item) {
updateQuality(item);
updateExpiration(item);
if (isExpired(item)) {
processExpired(item);
}
}
private static void updateQuality(Item item) {
if (item.name.equals("Aged Brie")) {
increaseQuality(item);
} else if (item.name.equals("Backstage passes to a TAFKAL80ETC concert")) {
increaseQuality(item);
if (item.sellIn < 11) {
increaseQuality(item);
}
if (item.sellIn < 6) {
increaseQuality(item);
}
} else if (item.name.equals("Sulfuras, Hand of Ragnaros")) {
return;
} else decreaseQuality(item);
}
private static void updateExpiration(Item item) {
if (item.name.equals("Sulfuras, Hand of Ragnaros")) {
return;
}
item.sellIn--;
}
private static boolean isExpired(Item item) {
return item.sellIn < 0;
}
private static void processExpired(Item item) {
if (item.name.equals("Aged Brie")) {
increaseQuality(item);
} else if (item.name.equals("Backstage passes to a TAFKAL80ETC concert")) {
item.quality = 0;
} else if (item.name.equals("Sulfuras, Hand of Ragnaros")) {
return;
} else {
decreaseQuality(item);
}
}
private static void increaseQuality(Item item) {
if (item.quality < 50) {
item.quality = item.quality + 1;
}
}
private static void decreaseQuality(Item item) {
if (item.quality > 0) {
item.quality = item.quality - 1;
}
}
}

View File

@ -7,11 +7,10 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
class GildedRoseTest {
@Test
void foo() {
void testUpdateQuality() {
Item[] items = new Item[] { new Item("foo", 0, 0) };
GildedRose app = new GildedRose(items);
app.updateQuality();
assertEquals("fixme", app.items[0].name);
app.updateInventory();
assertEquals("foo", app.items[0].name);
}
}

View File

@ -30,8 +30,7 @@ public class TexttestFixture {
System.out.println(item);
}
System.out.println();
app.updateQuality();
app.updateInventory();
}
}
}