From 5af2b1f7603036ec0f603ccdc54f707cdea52e19 Mon Sep 17 00:00:00 2001
From: Guillaume Vetter <guillaume.vetter@epfl.ch>
Date: Mon, 25 Feb 2019 13:26:29 +0100
Subject: [PATCH 1/2] Adding the Valaisanne beer

---
 .../res/chill/domain/gvetter/Valaisanne.java  | 21 +++++++++++++
 .../chill/domain/gvetter/ValaisanneTest.java  | 31 +++++++++++++++++++
 2 files changed, 52 insertions(+)
 create mode 100644 src/main/java/ch/heigvd/res/chill/domain/gvetter/Valaisanne.java
 create mode 100644 src/test/java/ch/heigvd/res/chill/domain/gvetter/ValaisanneTest.java

diff --git a/src/main/java/ch/heigvd/res/chill/domain/gvetter/Valaisanne.java b/src/main/java/ch/heigvd/res/chill/domain/gvetter/Valaisanne.java
new file mode 100644
index 000000000..7213c0b3d
--- /dev/null
+++ b/src/main/java/ch/heigvd/res/chill/domain/gvetter/Valaisanne.java
@@ -0,0 +1,21 @@
+package ch.heigvd.res.chill.domain.gvetter;
+
+import ch.heigvd.res.chill.domain.IProduct;
+
+import java.math.BigDecimal;
+
+public class Valaisanne implements IProduct {
+
+    public final static String NAME = "Valaisanne";
+    public final static BigDecimal PRICE = new BigDecimal(2.8);
+
+    @Override
+    public String getName() {
+        return NAME;
+    }
+
+    @Override
+    public BigDecimal getPrice() {
+        return PRICE;
+    }
+}
diff --git a/src/test/java/ch/heigvd/res/chill/domain/gvetter/ValaisanneTest.java b/src/test/java/ch/heigvd/res/chill/domain/gvetter/ValaisanneTest.java
new file mode 100644
index 000000000..352330f38
--- /dev/null
+++ b/src/test/java/ch/heigvd/res/chill/domain/gvetter/ValaisanneTest.java
@@ -0,0 +1,31 @@
+package ch.heigvd.res.chill.domain.gvetter;
+
+import ch.heigvd.res.chill.domain.Bartender;
+import ch.heigvd.res.chill.protocol.OrderRequest;
+import ch.heigvd.res.chill.protocol.OrderResponse;
+import org.junit.jupiter.api.Test;
+
+import java.math.BigDecimal;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+class ValaisanneTest {
+
+  @Test
+  void thePriceAndNameForValaisanneShouldBeCorrect() {
+    Valaisanne beer = new Valaisanne();
+    assertEquals(beer.getName(), Valaisanne.NAME);
+    assertEquals(beer.getPrice(), Valaisanne.PRICE);
+  }
+
+  @Test
+  void aBartenderShouldAcceptAnOrderForValaisanne() {
+    Bartender jane = new Bartender();
+    String productName = "ch.heigvd.res.chill.domain.gvetter.Valaisanne";
+    OrderRequest request = new OrderRequest(3, productName);
+    OrderResponse response = jane.order(request);
+    BigDecimal expectedTotalPrice = Valaisanne.PRICE.multiply(new BigDecimal(3));
+    assertEquals(expectedTotalPrice, response.getTotalPrice());
+  }
+
+}
\ No newline at end of file

From b6bdf8e8e9fa1df5706737c445840134e3380601 Mon Sep 17 00:00:00 2001
From: Guillaume Vetter <guillaume.vetter@epfl.ch>
Date: Sun, 3 Mar 2019 20:03:51 +0100
Subject: [PATCH 2/2] Adding cardinal

---
 .../res/chill/domain/gvetter/Cardinal.java    | 21 +++++++++++++
 .../chill/domain/gvetter/CardinalTest.java    | 31 +++++++++++++++++++
 2 files changed, 52 insertions(+)
 create mode 100644 src/main/java/ch/heigvd/res/chill/domain/gvetter/Cardinal.java
 create mode 100644 src/test/java/ch/heigvd/res/chill/domain/gvetter/CardinalTest.java

diff --git a/src/main/java/ch/heigvd/res/chill/domain/gvetter/Cardinal.java b/src/main/java/ch/heigvd/res/chill/domain/gvetter/Cardinal.java
new file mode 100644
index 000000000..16b69564a
--- /dev/null
+++ b/src/main/java/ch/heigvd/res/chill/domain/gvetter/Cardinal.java
@@ -0,0 +1,21 @@
+package ch.heigvd.res.chill.domain.gvetter;
+
+import ch.heigvd.res.chill.domain.IProduct;
+
+import java.math.BigDecimal;
+
+public class Cardinal implements IProduct {
+
+    public final static String NAME = "Cardinal";
+    public final static BigDecimal PRICE = new BigDecimal(2.3);
+
+    @Override
+    public String getName() {
+        return NAME;
+    }
+
+    @Override
+    public BigDecimal getPrice() {
+        return PRICE;
+    }
+}
diff --git a/src/test/java/ch/heigvd/res/chill/domain/gvetter/CardinalTest.java b/src/test/java/ch/heigvd/res/chill/domain/gvetter/CardinalTest.java
new file mode 100644
index 000000000..9ff6e372b
--- /dev/null
+++ b/src/test/java/ch/heigvd/res/chill/domain/gvetter/CardinalTest.java
@@ -0,0 +1,31 @@
+package ch.heigvd.res.chill.domain.gvetter;
+
+import ch.heigvd.res.chill.domain.Bartender;
+import ch.heigvd.res.chill.protocol.OrderRequest;
+import ch.heigvd.res.chill.protocol.OrderResponse;
+import org.junit.jupiter.api.Test;
+
+import java.math.BigDecimal;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+class CardinalTest {
+
+  @Test
+  void thePriceAndNameForCardinalShouldBeCorrect() {
+    Cardinal beer = new Cardinal();
+    assertEquals(beer.getName(), Cardinal.NAME);
+    assertEquals(beer.getPrice(), Cardinal.PRICE);
+  }
+
+  @Test
+  void aBartenderShouldAcceptAnOrderForCardinal() {
+    Bartender jane = new Bartender();
+    String productName = "ch.heigvd.res.chill.domain.gvetter.Cardinal";
+    OrderRequest request = new OrderRequest(3, productName);
+    OrderResponse response = jane.order(request);
+    BigDecimal expectedTotalPrice = Cardinal.PRICE.multiply(new BigDecimal(3));
+    assertEquals(expectedTotalPrice, response.getTotalPrice());
+  }
+
+}
\ No newline at end of file