From 799b9f26d6f635fb7f9c676d4f29f6c65e6de925 Mon Sep 17 00:00:00 2001 From: Remus Decea Date: Fri, 10 Nov 2023 13:40:44 +0200 Subject: [PATCH] Extract names in columns --- .../main/java/com/gildedrose/GildedRose.java | 19 +++++++++++-------- .../java/com/gildedrose/GildedRoseTest.java | 4 ++-- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/Java/src/main/java/com/gildedrose/GildedRose.java b/Java/src/main/java/com/gildedrose/GildedRose.java index 6300bb84..367778f9 100644 --- a/Java/src/main/java/com/gildedrose/GildedRose.java +++ b/Java/src/main/java/com/gildedrose/GildedRose.java @@ -3,16 +3,19 @@ package com.gildedrose; class GildedRose { Item[] items; + public static String backStagePasses = "Backstage passes to a TAFKAL80ETC concert"; + public static String sulfuras = "Sulfuras, Hand of Ragnaros"; + public static String agedBrie = "Aged Brie"; + public GildedRose(Item[] items) { this.items = items; } public void updateQuality() { for (Item item : items) { - if (!item.name.equals("Aged Brie") - && !item.name.equals("Backstage passes to a TAFKAL80ETC concert")) { + if (!item.name.equals(agedBrie) && !item.name.equals(backStagePasses)) { if (item.quality > 0) { - if (!item.name.equals("Sulfuras, Hand of Ragnaros")) { + if (!item.name.equals(sulfuras)) { item.quality = item.quality - 1; } } @@ -20,7 +23,7 @@ class GildedRose { if (item.quality < 50) { item.quality = item.quality + 1; - if (item.name.equals("Backstage passes to a TAFKAL80ETC concert")) { + if (item.name.equals(backStagePasses)) { if (item.sellIn < 11) { if (item.quality < 50) { item.quality = item.quality + 1; @@ -36,15 +39,15 @@ class GildedRose { } } - if (!item.name.equals("Sulfuras, Hand of Ragnaros")) { + if (!item.name.equals(sulfuras)) { item.sellIn = item.sellIn - 1; } if (item.sellIn < 0) { - if (!item.name.equals("Aged Brie")) { - if (!item.name.equals("Backstage passes to a TAFKAL80ETC concert")) { + if (!item.name.equals(agedBrie)) { + if (!item.name.equals(backStagePasses)) { if (item.quality > 0) { - if (!item.name.equals("Sulfuras, Hand of Ragnaros")) { + if (!item.name.equals(sulfuras)) { item.quality = item.quality - 1; } } diff --git a/Java/src/test/java/com/gildedrose/GildedRoseTest.java b/Java/src/test/java/com/gildedrose/GildedRoseTest.java index 53a7c9ec..408d910e 100644 --- a/Java/src/test/java/com/gildedrose/GildedRoseTest.java +++ b/Java/src/test/java/com/gildedrose/GildedRoseTest.java @@ -80,7 +80,7 @@ class GildedRoseTest { void sulfurasNeverDecreases(){ //TODO: Sulfuras should be protected against instantiation with quality != 80 Item[] items = new Item[]{ - new Item("Sulfuras, Hand of Ragnaros", 100, 80) + new Item(GildedRose.sulfuras, 100, 80) }; GildedRose app = new GildedRose(items); app.updateQuality(); @@ -90,7 +90,7 @@ class GildedRoseTest { @Test void backStagePassesIncrease() { - String backstage = "Backstage passes to a TAFKAL80ETC concert"; + String backstage = GildedRose.backStagePasses; Item[] items = new Item[]{ new Item(backstage, 100, 0), new Item(backstage, 11, 0),