refactor: improving the if/else decision to avoid Logical NOT operator and ease the code comprehension

This commit is contained in:
pierre 2023-02-19 14:46:19 +01:00
parent 15f4d079a6
commit 7473f39aec
2 changed files with 18 additions and 10 deletions

View File

@ -9,10 +9,9 @@ class GildedRose {
public void updateQuality() { public void updateQuality() {
for (int i = 0; i < items.length; i++) { for (int i = 0; i < items.length; i++) {
if (!items[i].name.equals("Aged Brie") // first if defnie what should decrease and what should increase
&& !items[i].name.equals("Backstage passes to a TAFKAL80ETC concert")) { if (items[i].name.equals("Backstage passes to a TAFKAL80ETC concert") |
updateItem(items[i]); items[i].name.equals("Aged Brie")) {
} else {
if (items[i].quality < 50) { if (items[i].quality < 50) {
items[i].quality = items[i].quality + 1; items[i].quality = items[i].quality + 1;
@ -25,6 +24,14 @@ class GildedRose {
} }
} }
} }
} else {
if (items[i].quality > 0 & !items[i].name.equals("Sulfuras, Hand of Ragnaros")) {
items[i].quality = items[i].quality - 1;
if (items[i].name.equals("Conjured Mana Cake") & items[i].quality > 0) {
items[i].quality = items[i].quality - 1;
}
}
} }
if (!items[i].name.equals("Sulfuras, Hand of Ragnaros")) { if (!items[i].name.equals("Sulfuras, Hand of Ragnaros")) {
@ -48,12 +55,12 @@ class GildedRose {
} }
public void updateItem(Item item) { public void updateItem(Item item) {
if (item.quality > 0 & !item.name.equals("Sulfuras, Hand of Ragnaros")) { if (item.quality > 0 & !item.name.equals("Sulfuras, Hand of Ragnaros")) {
item.quality = item.quality - 1; item.quality = item.quality - 1;
if (item.name.equals("Conjured Mana Cake") && item.quality > 0) { if (item.name.equals("Conjured Mana Cake") && item.quality > 0) {
item.quality = item.quality - 1; item.quality = item.quality - 1;
} }
} }
} }

View File

@ -54,7 +54,7 @@ class UpdateQualityTest {
} }
@Test @Test
void qualityItemNeverNegatif() { void qualityItemNeverNegative() {
System.out.println("The Quality of an item is never negative"); System.out.println("The Quality of an item is never negative");
Item[] items = new Item[]{ Item[] items = new Item[]{
new Item("+5 Dexterity Vest", 10, 1), new Item("+5 Dexterity Vest", 10, 1),
@ -63,6 +63,7 @@ class UpdateQualityTest {
GildedRose app = new GildedRose(items); GildedRose app = new GildedRose(items);
app.updateQuality(); app.updateQuality();
app.updateQuality(); app.updateQuality();
System.out.println(app.items[0].quality);
assertEquals(0, app.items[0].quality); assertEquals(0, app.items[0].quality);
assertEquals(0, app.items[1].quality); assertEquals(0, app.items[1].quality);
} }