From bf39b59c6be57547ef58f00bf71d9c8c33064d1f Mon Sep 17 00:00:00 2001 From: Gabriel Chulim Date: Fri, 5 May 2023 15:34:39 -0500 Subject: [PATCH] Multi Currency Money [#23. Compare Francs with Dollars] --- src/test/java/guru/springframework/Money.java | 3 ++- src/test/java/guru/springframework/MoneyTest.java | 10 ++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/test/java/guru/springframework/Money.java b/src/test/java/guru/springframework/Money.java index 43200a7f..fa9e59bc 100644 --- a/src/test/java/guru/springframework/Money.java +++ b/src/test/java/guru/springframework/Money.java @@ -5,7 +5,8 @@ public class Money { public boolean equals(Object o) { Money money = (Money) o; - return amount == money.amount; + return amount == money.amount + && this.getClass() == money.getClass(); } diff --git a/src/test/java/guru/springframework/MoneyTest.java b/src/test/java/guru/springframework/MoneyTest.java index 85d039b0..5a0c4ade 100644 --- a/src/test/java/guru/springframework/MoneyTest.java +++ b/src/test/java/guru/springframework/MoneyTest.java @@ -17,8 +17,9 @@ void testMultiplicationDollar() { @Test void testEqualityDollar() { - assertEquals(new Dollar(6), new Dollar(6)); - assertNotEquals(new Dollar(6), new Dollar(8)); + assertEquals(new Dollar(5), new Dollar(5)); + assertNotEquals(new Dollar(5), new Dollar(8)); + assertNotEquals(new Dollar(5), new Franc(5)); } @Test @@ -32,7 +33,8 @@ void testMultiplicationFranc() { @Test void testEqualityFranc() { - assertEquals(new Franc(6), new Franc(6)); - assertNotEquals(new Franc(6), new Franc(8)); + assertEquals(new Franc(5), new Franc(5)); + assertNotEquals(new Franc(5), new Franc(8)); + assertNotEquals(new Franc(5), new Dollar(5)); } }