Use tables

Author: aslakhellesoy

src/main/java/skeleton/Checkout.java

@@ -4,23 +4,15 @@
 import java.util.Map;
 
 public class Checkout {
-    private final Map<String,Integer> productPrices = new HashMap<String, Integer>();
+    private Map<String,Integer> productPrices = new HashMap<String, Integer>();
     private int total = 0;
 
-    public void setPriceOfEspresso(int priceOfEspresso) {
-        productPrices.put("espresso", priceOfEspresso);
+    public void setProducts(Map<String, Integer> products) {
+        this.productPrices = products;
     }
 
-    public void setPriceOfCroissant(int priceOfCroissant) {
-        productPrices.put("croissant", priceOfCroissant);
-    }
-
-    public void setQuantityOfEspresso(int quantityOfEspresso) {
-        total += quantityOfEspresso * productPrices.get("espresso");
-    }
-
-    public void setQuantityOfCroissant(int quantityOfCroissant) {
-        total += quantityOfCroissant * productPrices.get("croissant");
+    public void setQuantity(int quantityOfCroissant, String product) {
+        total += quantityOfCroissant * productPrices.get(product);
     }
 
     public int getTotal() {

src/test/java/skeleton/Stepdefs.java

@@ -1,33 +1,24 @@
 package skeleton;
 
-import cucumber.api.PendingException;
 import cucumber.api.java.en.Given;
 import cucumber.api.java.en.Then;
 import cucumber.api.java.en.When;
 
+import java.util.Map;
+
 import static org.junit.Assert.assertEquals;
 
 public class Stepdefs {
     Checkout checkout = new Checkout();
 
-    @Given("^an espresso costs £(\\d+)$")
-    public void an_espresso_costs_£(int price) throws Throwable {
-        checkout.setPriceOfEspresso(price);
-    }
-
-    @Given("^a croissant costs £(\\d+)$")
-    public void a_croissant_costs_£(int price) throws Throwable {
-        checkout.setPriceOfCroissant(price);
-    }
-
-    @When("^I sell (\\d+) espresso$")
-    public void i_sell_espresso(int quantity) throws Throwable {
-        checkout.setQuantityOfEspresso(quantity);
+    @Given("^the following products:$")
+    public void the_following_products(Map<String,Integer> products) throws Throwable {
+        checkout.setProducts(products);
     }
 
-    @When("^I sell (\\d+) croissants$")
-    public void i_sell_croissants(int quantity) throws Throwable {
-        checkout.setQuantityOfCroissant(quantity);
+    @When("^I sell (\\d+) (.*)?$")
+    public void i_sell_espresso(int quantity, String product) throws Throwable {
+        checkout.setQuantity(quantity, product);
     }
 
     @Then("^the total should be £(\\d+)$")

src/test/resources/skeleton/checkout.feature

@@ -1,19 +1,17 @@
 Feature: Checkout
 
   Background:
-    Given an espresso costs £2
-    And a croissant costs £1
-#    Given the following products:
-#      | espresso | 2 |
-#      | croissant | 1 |
+    Given the following products:
+      | espresso  | 2     |
+      | croissant | 1     |
 
   Scenario: Sell only espresso
     When I sell 3 espresso
     Then the total should be £6
 
   Scenario: Sell espresso and croissants
     When I sell 2 espresso
-    And I sell 3 croissants
+    And I sell 3 croissant
     Then the total should be £7
 
   #Scenario: Espresso costs 1.80