tdd-java-demo

commit bef9897a2a81d538a6b0094f04d67cd4757676ce
parent e968ffe2e038f51e5f93383bcd669a22b38dbc33
Author: Jul <jul@9o.is>
Date:   Wed, 31 Mar 2021 23:21:22 +0800

rename amounts to items in Basket

Diffstat:
M
src/main/java/takehome/Basket.java
 | 
12
++++++------
M
src/main/java/takehome/Discount.java
 | 
3
+--
M
src/test/java/takehome/BasketTest.java
 | 
2
+-

3 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/src/main/java/takehome/Basket.java b/src/main/java/takehome/Basket.java
@@ -6,19 +6,19 @@ import com.google.common.collect.Multiset;
 import java.util.Map;
 
 public class Basket {
-    private final Multiset<Item> amounts;
+    private final Multiset<Item> items;
 
     public Basket(Map<Item, Integer> amounts) {
-        this.amounts = toMultiset(amounts);
+        this.items = toMultiset(amounts);
     }
 
-    public Multiset<Item> getAmounts() {
-        return amounts;
+    public Multiset<Item> getItems() {
+        return items;
     }
 
     double getTotal() {
         double total = 0;
-        for (Item item : amounts.elementSet()) {
+        for (Item item : items.elementSet()) {
             int amount = getAmount(item);
             total += item.getTotal(amount);
         }
@@ -26,7 +26,7 @@ public class Basket {
     }
 
     Integer getAmount(Item item) {
-        return amounts.count(item);
+        return items.count(item);
     }
 
     double getTotal(Discount[] discounts) {
diff --git a/src/main/java/takehome/Discount.java b/src/main/java/takehome/Discount.java
@@ -5,7 +5,6 @@ import com.google.common.collect.Multiset;
 import com.google.common.collect.Multisets;
 
 import java.util.Arrays;
-import java.util.Map;
 
 public class Discount {
     private final Multiset<Item> items;
@@ -28,7 +27,7 @@ public class Discount {
 
     @SuppressWarnings("UnstableApiUsage")
     double getDiscount(Basket basket) {
-        Multiset<Item> basketSet = basket.getAmounts();
+        Multiset<Item> basketSet = basket.getItems();
 
         int occurrences = 0;
         boolean occurrence = Multisets.containsOccurrences(basketSet, items);
diff --git a/src/test/java/takehome/BasketTest.java b/src/test/java/takehome/BasketTest.java
@@ -20,7 +20,7 @@ class BasketTest {
     public void getAmounts() {
         Map<Item, Integer> amounts = getItemAmounts();
         Basket basket = new Basket(amounts);
-        assertThat(basket.getAmounts(), is(items()));
+        assertThat(basket.getItems(), is(items()));
     }
 
     @Test