[#3] Refactor, remove reference to Dollar&France and remove duplicate…

…d tests
EthanLin-TWer · Jan 14, 2017 · 395503e · 395503e
1 parent 3e76556
commit 395503e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 11 deletions.
diff --git a/src/main/java/org/thoughtworks/linesh/multicurrencymoney/Money.java b/src/main/java/org/thoughtworks/linesh/multicurrencymoney/Money.java
@@ -13,11 +13,11 @@ public int getAmount() {
     }
 
     public static Money dollar(int amount) {
-        return new Dollar(amount, "USD");
+        return new Money(amount, "USD");
     }
 
     public static Money france(int amount) {
-        return new France(amount, "CHF");
+        return new Money(amount, "CHF");
     }
 
     @Override

diff --git a/src/test/java/org/thoughtworks/linesh/multicurrencymoney/FranceTest.java b/src/test/java/org/thoughtworks/linesh/multicurrencymoney/FranceTest.java
@@ -20,14 +20,5 @@ void should_test_france_multiplications() {
             assertEquals(Money.france(10), five.times(2));
             assertEquals(Money.france(15), five.times(3));
         }
-
-        @Tasking @Nested
-        class should_test_equality {
-            @Test
-            void should_test_france_equality() {
-                assertTrue(Money.france(5).equals(Money.france(5)));
-                assertFalse(Money.france(5).equals(Money.france(6)));
-            }
-        }
     }
 }