From 8bba4fb3393776f261213d2adb851460df7b1bf5 Mon Sep 17 00:00:00 2001 From: Joao Esperancinha Date: Mon, 13 Jan 2020 11:45:04 +0100 Subject: [PATCH] Conjured implementation --- .../main/java/com/gildedrose/GildedRose.java | 26 +++++++++++++++---- .../java/com/gildedrose/GildedRoseTest.java | 4 --- 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/Java/src/main/java/com/gildedrose/GildedRose.java b/Java/src/main/java/com/gildedrose/GildedRose.java index e6feb751..7dd779a9 100644 --- a/Java/src/main/java/com/gildedrose/GildedRose.java +++ b/Java/src/main/java/com/gildedrose/GildedRose.java @@ -12,8 +12,16 @@ class GildedRose { 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; + if (items[i].name.equals("Conjured Mana Cake")) { + if (items[i].quality > 1) { + items[i].quality -= 2; + } else { + items[i].quality = 0; + } + } else { + if (!items[i].name.equals("Sulfuras, Hand of Ragnaros")) { + items[i].quality = items[i].quality - 1; + } } } } else { @@ -44,12 +52,20 @@ class GildedRose { 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; + if (items[i].name.equals("Conjured Mana Cake")) { + if (items[i].quality > 1) { + items[i].quality -= 2; + } else { + items[i].quality = 0; + } + } else { + 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; + items[i].quality = 0; } } else { if (items[i].quality < 50) { diff --git a/Java/src/test/java/com/gildedrose/GildedRoseTest.java b/Java/src/test/java/com/gildedrose/GildedRoseTest.java index 87a8b74c..248bb6d6 100644 --- a/Java/src/test/java/com/gildedrose/GildedRoseTest.java +++ b/Java/src/test/java/com/gildedrose/GildedRoseTest.java @@ -1,6 +1,5 @@ package com.gildedrose; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -95,7 +94,6 @@ class GildedRoseTest { * Conjured Quality decreases 2 before expired */ @Test - @Disabled void whenConjuredSale1Quality2_afterUpdate_ThenSale0Quality0() { Item[] items = new Item[]{new Item("Conjured Mana Cake", 1, 2)}; GildedRose app = new GildedRose(items); @@ -110,7 +108,6 @@ class GildedRoseTest { * Conjured Quality decreases 4 after expired */ @Test - @Disabled void whenConjuredSaleM10Quality8_afterUpdate_ThenSaleM11Quality4() { Item[] items = new Item[]{new Item("Conjured Mana Cake", -10, 8)}; GildedRose app = new GildedRose(items); @@ -125,7 +122,6 @@ class GildedRoseTest { * Conjured Quality decreases 4 after expired edge */ @Test - @Disabled void whenConjuredSale0Quality10_afterUpdate_ThenSaleM1Quality6() { Item[] items = new Item[]{new Item("Conjured Mana Cake", 0, 10)}; GildedRose app = new GildedRose(items);