From 85da95e7127fbf747ea30c03b0a962437af2a614 Mon Sep 17 00:00:00 2001 From: Thorkal Date: Thu, 28 Feb 2019 08:54:00 +0100 Subject: [PATCH 1/2] Added Botebeer --- .../res/chill/domain/Thorkal/Botebeer.java | 21 +++++++++++++ .../chill/domain/Thorkal/BotebeerTest.java | 31 +++++++++++++++++++ .../res/chill/domain/wasadigi/DuvelTest.java | 10 +++--- 3 files changed, 57 insertions(+), 5 deletions(-) create mode 100644 src/main/java/ch/heigvd/res/chill/domain/Thorkal/Botebeer.java create mode 100644 src/test/java/ch/heigvd/res/chill/domain/Thorkal/BotebeerTest.java diff --git a/src/main/java/ch/heigvd/res/chill/domain/Thorkal/Botebeer.java b/src/main/java/ch/heigvd/res/chill/domain/Thorkal/Botebeer.java new file mode 100644 index 000000000..afb257074 --- /dev/null +++ b/src/main/java/ch/heigvd/res/chill/domain/Thorkal/Botebeer.java @@ -0,0 +1,21 @@ +package ch.heigvd.res.chill.domain.Thorkal; + +import ch.heigvd.res.chill.domain.IProduct; + +import java.math.BigDecimal; + +public class Botebeer implements IProduct { + + public final static String NAME = "Botebeer"; + public final static BigDecimal PRICE = new BigDecimal(9.7); + + @Override + public String getName() { + return NAME; + } + + @Override + public BigDecimal getPrice() { + return PRICE; + } +} diff --git a/src/test/java/ch/heigvd/res/chill/domain/Thorkal/BotebeerTest.java b/src/test/java/ch/heigvd/res/chill/domain/Thorkal/BotebeerTest.java new file mode 100644 index 000000000..e71a6997f --- /dev/null +++ b/src/test/java/ch/heigvd/res/chill/domain/Thorkal/BotebeerTest.java @@ -0,0 +1,31 @@ +package ch.heigvd.res.chill.domain.Thorkal; + +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 BotebeerTest { + + @Test + void thePriceAndNameForPunkIPAShouldBeCorrect() { + Botebeer beer = new Botebeer(); + assertEquals(beer.getName(), Botebeer.NAME); + assertEquals(beer.getPrice(), Botebeer.PRICE); + } + + @Test + void aBartenderShouldAcceptAnOrderForPunkIPA() { + Bartender jane = new Bartender(); + String productName = "ch.heigvd.res.chill.domain.Thorkal.Botebeer"; + OrderRequest request = new OrderRequest(3, productName); + OrderResponse response = jane.order(request); + BigDecimal expectedTotalPrice = Botebeer.PRICE.multiply(new BigDecimal(3)); + assertEquals(expectedTotalPrice, response.getTotalPrice()); + } + +} \ No newline at end of file diff --git a/src/test/java/ch/heigvd/res/chill/domain/wasadigi/DuvelTest.java b/src/test/java/ch/heigvd/res/chill/domain/wasadigi/DuvelTest.java index 2901e9082..d4999b52a 100644 --- a/src/test/java/ch/heigvd/res/chill/domain/wasadigi/DuvelTest.java +++ b/src/test/java/ch/heigvd/res/chill/domain/wasadigi/DuvelTest.java @@ -1,13 +1,13 @@ package ch.heigvd.res.chill.domain.wasadigi; 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 ch.heigvd.res.chill.protocol.OrderRequest; + import ch.heigvd.res.chill.protocol.OrderResponse; + import org.junit.jupiter.api.Test; -import java.math.BigDecimal; + import java.math.BigDecimal; -import static org.junit.jupiter.api.Assertions.assertEquals; + import static org.junit.jupiter.api.Assertions.assertEquals; class DuvelTest { From a78b18351854062f168a7c14796f22436a86c7fd Mon Sep 17 00:00:00 2001 From: Thorkal Date: Tue, 5 Mar 2019 09:12:37 +0100 Subject: [PATCH 2/2] Corrected DuvelTest --- .../ch/heigvd/res/chill/domain/wasadigi/DuvelTest.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/test/java/ch/heigvd/res/chill/domain/wasadigi/DuvelTest.java b/src/test/java/ch/heigvd/res/chill/domain/wasadigi/DuvelTest.java index d4999b52a..2901e9082 100644 --- a/src/test/java/ch/heigvd/res/chill/domain/wasadigi/DuvelTest.java +++ b/src/test/java/ch/heigvd/res/chill/domain/wasadigi/DuvelTest.java @@ -1,13 +1,13 @@ package ch.heigvd.res.chill.domain.wasadigi; 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 ch.heigvd.res.chill.protocol.OrderRequest; +import ch.heigvd.res.chill.protocol.OrderResponse; +import org.junit.jupiter.api.Test; - import java.math.BigDecimal; +import java.math.BigDecimal; - import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; class DuvelTest {