diff --git a/Java/src/main/java/com/gildedrose/Item.java b/Java/src/main/java/com/gildedrose/Item.java index 9463e334..2a95f92a 100644 --- a/Java/src/main/java/com/gildedrose/Item.java +++ b/Java/src/main/java/com/gildedrose/Item.java @@ -19,31 +19,4 @@ public class Item { return this.name + ", " + this.sellIn + ", " + this.quality; } - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - - Item item = (Item) o; - - if (sellIn != item.sellIn) { - return false; - } - if (quality != item.quality) { - return false; - } - return name != null ? name.equals(item.name) : item.name == null; - } - - @Override - public int hashCode() { - int result = name != null ? name.hashCode() : 0; - result = 31 * result + sellIn; - result = 31 * result + quality; - return result; - } } diff --git a/Java/src/test/java/com/gildedrose/GildedRoseTest.java b/Java/src/test/java/com/gildedrose/GildedRoseTest.java index ffd0ec0e..856be07a 100644 --- a/Java/src/test/java/com/gildedrose/GildedRoseTest.java +++ b/Java/src/test/java/com/gildedrose/GildedRoseTest.java @@ -13,7 +13,8 @@ class GildedRoseTest { GildedRose app = new GildedRose(items); app.updateQuality(); Item updatedItem = app.items[0]; - assertEquals(new Item("test_item", 2, 9), updatedItem); + assertEquals(2, updatedItem.sellIn); + assertEquals(9, updatedItem.quality); } @Test @@ -23,7 +24,8 @@ class GildedRoseTest { GildedRose app = new GildedRose(items); app.updateQuality(); Item updatedItem = app.items[0]; - assertEquals(new Item("test_item", -1, 8), updatedItem); + assertEquals(-1, updatedItem.sellIn); + assertEquals(8, updatedItem.quality); } @Test @@ -43,7 +45,8 @@ class GildedRoseTest { GildedRose app = new GildedRose(items); app.updateQuality(); Item updatedItem = app.items[0]; - assertEquals(new Item("Aged Brie", 4, 11), updatedItem); + assertEquals(4, updatedItem.sellIn); + assertEquals(11, updatedItem.quality); } @Test