From 10665d090f4d93c4d494f83a3bc98eb205abd876 Mon Sep 17 00:00:00 2001 From: Ovich Date: Fri, 26 Feb 2021 04:30:55 +0100 Subject: [PATCH 1/9] First Version of RedBull in Product listing --- pom.xml | 71 +++++++------------ .../res/chill/domain/wasadigi/RedBull.java | 21 ++++++ src/main/main.iml | 11 +++ .../chill/domain/wasadigi/RedBullTest.java | 31 ++++++++ src/test/test.iml | 23 ++++++ 5 files changed, 111 insertions(+), 46 deletions(-) create mode 100644 src/main/java/ch/heigvd/res/chill/domain/wasadigi/RedBull.java create mode 100644 src/main/main.iml create mode 100644 src/test/java/ch/heigvd/res/chill/domain/wasadigi/RedBullTest.java create mode 100644 src/test/test.iml diff --git a/pom.xml b/pom.xml index 5078dcae..50924750 100644 --- a/pom.xml +++ b/pom.xml @@ -1,49 +1,28 @@ + + 4.0.0 - - 4.0.0 + org.example + Teaching-HEIGVD-RES-2021-Chill + 1.0-SNAPSHOT + + + org.projectlombok + lombok + 1.18.12 + + + org.junit.jupiter + junit-jupiter-engine + 5.4.0 + test + + - ch.heigvd.res - chill - 1.0-SNAPSHOT - - chill - - - UTF-8 - 1.8 - 1.8 - - - - - org.projectlombok - lombok - 1.18.2 - provided - - - org.junit.jupiter - junit-jupiter-api - 5.4.0 - test - - - org.junit.jupiter - junit-jupiter-engine - 5.4.0 - test - - - - - - - maven-surefire-plugin - 2.22.1 - - - - - + + 1.7 + 1.7 + + \ No newline at end of file diff --git a/src/main/java/ch/heigvd/res/chill/domain/wasadigi/RedBull.java b/src/main/java/ch/heigvd/res/chill/domain/wasadigi/RedBull.java new file mode 100644 index 00000000..296d9141 --- /dev/null +++ b/src/main/java/ch/heigvd/res/chill/domain/wasadigi/RedBull.java @@ -0,0 +1,21 @@ +package ch.heigvd.res.chill.domain.wasadigi; + +import ch.heigvd.res.chill.domain.IProduct; + +import java.math.BigDecimal; + +public class RedBull implements IProduct { + + public final static String NAME = "RedBull"; + public final static BigDecimal PRICE = new BigDecimal(2.0); + + @Override + public String getName() { + return NAME; + } + + @Override + public BigDecimal getPrice() { + return PRICE; + } +} diff --git a/src/main/main.iml b/src/main/main.iml new file mode 100644 index 00000000..908ad4f5 --- /dev/null +++ b/src/main/main.iml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/src/test/java/ch/heigvd/res/chill/domain/wasadigi/RedBullTest.java b/src/test/java/ch/heigvd/res/chill/domain/wasadigi/RedBullTest.java new file mode 100644 index 00000000..d20ad257 --- /dev/null +++ b/src/test/java/ch/heigvd/res/chill/domain/wasadigi/RedBullTest.java @@ -0,0 +1,31 @@ +package ch.heigvd.res.chill.domain.wasadigi; + +import static org.junit.jupiter.api.Assertions.*; + +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 RedBullTest { + @Test + void thePriceAndNameForRedbullShouldBeCorrect(){ + RedBull drink = new RedBull(); + assertEquals(drink.getName(), RedBull.NAME); + assertEquals(drink.getPrice(), RedBull.PRICE); + } + + @Test + void aBartenderShouldAcceptAnOrderForRedbull() { + Bartender jane = new Bartender(); + String productName = "ch.heigvd.res.chill.domain.wasadigi.RedBull"; + OrderRequest request = new OrderRequest(3, productName); + OrderResponse response = jane.order(request); + BigDecimal expectedTotalPrice = RedBull.PRICE.multiply(new BigDecimal(3)); + assertEquals(expectedTotalPrice, response.getTotalPrice()); + } +} \ No newline at end of file diff --git a/src/test/test.iml b/src/test/test.iml new file mode 100644 index 00000000..d041215c --- /dev/null +++ b/src/test/test.iml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 8ce9d4a083724786ccca0c86b67f0defddec69dc Mon Sep 17 00:00:00 2001 From: Ovich Date: Fri, 26 Feb 2021 10:47:13 +0100 Subject: [PATCH 2/9] Move RedBull Class to its own Package --- .../res/chill/domain/{wasadigi => OvichHeigVd}/RedBull.java | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/main/java/ch/heigvd/res/chill/domain/{wasadigi => OvichHeigVd}/RedBull.java (100%) diff --git a/src/main/java/ch/heigvd/res/chill/domain/wasadigi/RedBull.java b/src/main/java/ch/heigvd/res/chill/domain/OvichHeigVd/RedBull.java similarity index 100% rename from src/main/java/ch/heigvd/res/chill/domain/wasadigi/RedBull.java rename to src/main/java/ch/heigvd/res/chill/domain/OvichHeigVd/RedBull.java From 0eb8fbaeef2dcacf1ddf083d56423c96621d7b07 Mon Sep 17 00:00:00 2001 From: Ovich Date: Fri, 26 Feb 2021 04:30:55 +0100 Subject: [PATCH 3/9] First Version of RedBull in Product listing Move RedBull Class to its own Package --- pom.xml | 71 +++++++------------ .../res/chill/domain/OvichHeigVd/RedBull.java | 21 ++++++ src/main/main.iml | 11 +++ .../chill/domain/wasadigi/RedBullTest.java | 31 ++++++++ src/test/test.iml | 23 ++++++ 5 files changed, 111 insertions(+), 46 deletions(-) create mode 100644 src/main/java/ch/heigvd/res/chill/domain/OvichHeigVd/RedBull.java create mode 100644 src/main/main.iml create mode 100644 src/test/java/ch/heigvd/res/chill/domain/wasadigi/RedBullTest.java create mode 100644 src/test/test.iml diff --git a/pom.xml b/pom.xml index 5078dcae..50924750 100644 --- a/pom.xml +++ b/pom.xml @@ -1,49 +1,28 @@ + + 4.0.0 - - 4.0.0 + org.example + Teaching-HEIGVD-RES-2021-Chill + 1.0-SNAPSHOT + + + org.projectlombok + lombok + 1.18.12 + + + org.junit.jupiter + junit-jupiter-engine + 5.4.0 + test + + - ch.heigvd.res - chill - 1.0-SNAPSHOT - - chill - - - UTF-8 - 1.8 - 1.8 - - - - - org.projectlombok - lombok - 1.18.2 - provided - - - org.junit.jupiter - junit-jupiter-api - 5.4.0 - test - - - org.junit.jupiter - junit-jupiter-engine - 5.4.0 - test - - - - - - - maven-surefire-plugin - 2.22.1 - - - - - + + 1.7 + 1.7 + + \ No newline at end of file diff --git a/src/main/java/ch/heigvd/res/chill/domain/OvichHeigVd/RedBull.java b/src/main/java/ch/heigvd/res/chill/domain/OvichHeigVd/RedBull.java new file mode 100644 index 00000000..296d9141 --- /dev/null +++ b/src/main/java/ch/heigvd/res/chill/domain/OvichHeigVd/RedBull.java @@ -0,0 +1,21 @@ +package ch.heigvd.res.chill.domain.wasadigi; + +import ch.heigvd.res.chill.domain.IProduct; + +import java.math.BigDecimal; + +public class RedBull implements IProduct { + + public final static String NAME = "RedBull"; + public final static BigDecimal PRICE = new BigDecimal(2.0); + + @Override + public String getName() { + return NAME; + } + + @Override + public BigDecimal getPrice() { + return PRICE; + } +} diff --git a/src/main/main.iml b/src/main/main.iml new file mode 100644 index 00000000..908ad4f5 --- /dev/null +++ b/src/main/main.iml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/src/test/java/ch/heigvd/res/chill/domain/wasadigi/RedBullTest.java b/src/test/java/ch/heigvd/res/chill/domain/wasadigi/RedBullTest.java new file mode 100644 index 00000000..d20ad257 --- /dev/null +++ b/src/test/java/ch/heigvd/res/chill/domain/wasadigi/RedBullTest.java @@ -0,0 +1,31 @@ +package ch.heigvd.res.chill.domain.wasadigi; + +import static org.junit.jupiter.api.Assertions.*; + +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 RedBullTest { + @Test + void thePriceAndNameForRedbullShouldBeCorrect(){ + RedBull drink = new RedBull(); + assertEquals(drink.getName(), RedBull.NAME); + assertEquals(drink.getPrice(), RedBull.PRICE); + } + + @Test + void aBartenderShouldAcceptAnOrderForRedbull() { + Bartender jane = new Bartender(); + String productName = "ch.heigvd.res.chill.domain.wasadigi.RedBull"; + OrderRequest request = new OrderRequest(3, productName); + OrderResponse response = jane.order(request); + BigDecimal expectedTotalPrice = RedBull.PRICE.multiply(new BigDecimal(3)); + assertEquals(expectedTotalPrice, response.getTotalPrice()); + } +} \ No newline at end of file diff --git a/src/test/test.iml b/src/test/test.iml new file mode 100644 index 00000000..d041215c --- /dev/null +++ b/src/test/test.iml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From bed272b7110f557d5086193ed84804cc6d665bb4 Mon Sep 17 00:00:00 2001 From: Ovich Date: Fri, 26 Feb 2021 10:58:11 +0100 Subject: [PATCH 4/9] Move RedBull test to appropriate package --- .../res/chill/domain/{wasadigi => OvichHeigVd}/RedBullTest.java | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/test/java/ch/heigvd/res/chill/domain/{wasadigi => OvichHeigVd}/RedBullTest.java (100%) diff --git a/src/test/java/ch/heigvd/res/chill/domain/wasadigi/RedBullTest.java b/src/test/java/ch/heigvd/res/chill/domain/OvichHeigVd/RedBullTest.java similarity index 100% rename from src/test/java/ch/heigvd/res/chill/domain/wasadigi/RedBullTest.java rename to src/test/java/ch/heigvd/res/chill/domain/OvichHeigVd/RedBullTest.java From e31d1534bdd589391381cdd58d916af6a0b1bbee Mon Sep 17 00:00:00 2001 From: Ovich Date: Fri, 26 Feb 2021 10:59:20 +0100 Subject: [PATCH 5/9] Move RedBull test to appropriate package --- .../ch/heigvd/res/chill/domain/OvichHeigVd/RedBullTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/ch/heigvd/res/chill/domain/OvichHeigVd/RedBullTest.java b/src/test/java/ch/heigvd/res/chill/domain/OvichHeigVd/RedBullTest.java index d20ad257..139425fd 100644 --- a/src/test/java/ch/heigvd/res/chill/domain/OvichHeigVd/RedBullTest.java +++ b/src/test/java/ch/heigvd/res/chill/domain/OvichHeigVd/RedBullTest.java @@ -1,4 +1,4 @@ -package ch.heigvd.res.chill.domain.wasadigi; +package ch.heigvd.res.chill.domain.OvichHeigVd; import static org.junit.jupiter.api.Assertions.*; From a813081f923418ab95b8ace53c1d9191f678d62a Mon Sep 17 00:00:00 2001 From: Ovich Date: Fri, 26 Feb 2021 10:58:11 +0100 Subject: [PATCH 6/9] First Version of RedBull in Product listing --- .../chill/domain/OvichHeigVd/RedBullTest.java | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 src/test/java/ch/heigvd/res/chill/domain/OvichHeigVd/RedBullTest.java diff --git a/src/test/java/ch/heigvd/res/chill/domain/OvichHeigVd/RedBullTest.java b/src/test/java/ch/heigvd/res/chill/domain/OvichHeigVd/RedBullTest.java new file mode 100644 index 00000000..139425fd --- /dev/null +++ b/src/test/java/ch/heigvd/res/chill/domain/OvichHeigVd/RedBullTest.java @@ -0,0 +1,31 @@ +package ch.heigvd.res.chill.domain.OvichHeigVd; + +import static org.junit.jupiter.api.Assertions.*; + +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 RedBullTest { + @Test + void thePriceAndNameForRedbullShouldBeCorrect(){ + RedBull drink = new RedBull(); + assertEquals(drink.getName(), RedBull.NAME); + assertEquals(drink.getPrice(), RedBull.PRICE); + } + + @Test + void aBartenderShouldAcceptAnOrderForRedbull() { + Bartender jane = new Bartender(); + String productName = "ch.heigvd.res.chill.domain.wasadigi.RedBull"; + OrderRequest request = new OrderRequest(3, productName); + OrderResponse response = jane.order(request); + BigDecimal expectedTotalPrice = RedBull.PRICE.multiply(new BigDecimal(3)); + assertEquals(expectedTotalPrice, response.getTotalPrice()); + } +} \ No newline at end of file From c8842d15af72184fbc4552df7c8836e3c3dbd8d6 Mon Sep 17 00:00:00 2001 From: Ovich Date: Fri, 26 Feb 2021 11:24:20 +0100 Subject: [PATCH 7/9] Include Monster in product list. Fix issues with RedBull test package --- .../res/chill/domain/OvichHeigVd/Monster.java | 21 +++++++++++++++++++ .../res/chill/domain/OvichHeigVd/RedBull.java | 2 +- .../MonsterTest.java} | 19 +++++++++-------- .../chill/domain/OvichHeigVd/RedBullTest.java | 3 ++- 4 files changed, 34 insertions(+), 11 deletions(-) create mode 100644 src/main/java/ch/heigvd/res/chill/domain/OvichHeigVd/Monster.java rename src/test/java/ch/heigvd/res/chill/domain/{wasadigi/RedBullTest.java => OvichHeigVd/MonsterTest.java} (54%) diff --git a/src/main/java/ch/heigvd/res/chill/domain/OvichHeigVd/Monster.java b/src/main/java/ch/heigvd/res/chill/domain/OvichHeigVd/Monster.java new file mode 100644 index 00000000..199474c5 --- /dev/null +++ b/src/main/java/ch/heigvd/res/chill/domain/OvichHeigVd/Monster.java @@ -0,0 +1,21 @@ +package ch.heigvd.res.chill.domain.OvichHeigVd; + +import ch.heigvd.res.chill.domain.IProduct; + +import java.math.BigDecimal; + +public class Monster implements IProduct { + + public final static String NAME = "Monster"; + public final static BigDecimal PRICE = new BigDecimal(3.0); + + @Override + public String getName() { + return NAME; + } + + @Override + public BigDecimal getPrice() { + return PRICE; + } +} diff --git a/src/main/java/ch/heigvd/res/chill/domain/OvichHeigVd/RedBull.java b/src/main/java/ch/heigvd/res/chill/domain/OvichHeigVd/RedBull.java index 296d9141..cd87ef73 100644 --- a/src/main/java/ch/heigvd/res/chill/domain/OvichHeigVd/RedBull.java +++ b/src/main/java/ch/heigvd/res/chill/domain/OvichHeigVd/RedBull.java @@ -1,4 +1,4 @@ -package ch.heigvd.res.chill.domain.wasadigi; +package ch.heigvd.res.chill.domain.OvichHeigVd; import ch.heigvd.res.chill.domain.IProduct; diff --git a/src/test/java/ch/heigvd/res/chill/domain/wasadigi/RedBullTest.java b/src/test/java/ch/heigvd/res/chill/domain/OvichHeigVd/MonsterTest.java similarity index 54% rename from src/test/java/ch/heigvd/res/chill/domain/wasadigi/RedBullTest.java rename to src/test/java/ch/heigvd/res/chill/domain/OvichHeigVd/MonsterTest.java index d20ad257..f2682218 100644 --- a/src/test/java/ch/heigvd/res/chill/domain/wasadigi/RedBullTest.java +++ b/src/test/java/ch/heigvd/res/chill/domain/OvichHeigVd/MonsterTest.java @@ -1,8 +1,9 @@ -package ch.heigvd.res.chill.domain.wasadigi; +package ch.heigvd.res.chill.domain.OvichHeigVd; import static org.junit.jupiter.api.Assertions.*; import ch.heigvd.res.chill.domain.Bartender; +import ch.heigvd.res.chill.domain.OvichHeigVd.*; import ch.heigvd.res.chill.protocol.OrderRequest; import ch.heigvd.res.chill.protocol.OrderResponse; import org.junit.jupiter.api.Test; @@ -11,21 +12,21 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -class RedBullTest { +class MonsterTest { @Test - void thePriceAndNameForRedbullShouldBeCorrect(){ - RedBull drink = new RedBull(); - assertEquals(drink.getName(), RedBull.NAME); - assertEquals(drink.getPrice(), RedBull.PRICE); + void thePriceAndNameForMonsterShouldBeCorrect(){ + Monster drink = new Monster(); + assertEquals(drink.getName(), Monster.NAME); + assertEquals(drink.getPrice(), Monster.PRICE); } @Test - void aBartenderShouldAcceptAnOrderForRedbull() { + void aBartenderShouldAcceptAnOrderForMonster() { Bartender jane = new Bartender(); - String productName = "ch.heigvd.res.chill.domain.wasadigi.RedBull"; + String productName = "ch.heigvd.res.chill.domain.OvichHeigVd.Monster"; OrderRequest request = new OrderRequest(3, productName); OrderResponse response = jane.order(request); - BigDecimal expectedTotalPrice = RedBull.PRICE.multiply(new BigDecimal(3)); + BigDecimal expectedTotalPrice = Monster.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/OvichHeigVd/RedBullTest.java b/src/test/java/ch/heigvd/res/chill/domain/OvichHeigVd/RedBullTest.java index 139425fd..b3612530 100644 --- a/src/test/java/ch/heigvd/res/chill/domain/OvichHeigVd/RedBullTest.java +++ b/src/test/java/ch/heigvd/res/chill/domain/OvichHeigVd/RedBullTest.java @@ -3,6 +3,7 @@ import static org.junit.jupiter.api.Assertions.*; import ch.heigvd.res.chill.domain.Bartender; +import ch.heigvd.res.chill.domain.OvichHeigVd.*; import ch.heigvd.res.chill.protocol.OrderRequest; import ch.heigvd.res.chill.protocol.OrderResponse; import org.junit.jupiter.api.Test; @@ -22,7 +23,7 @@ void thePriceAndNameForRedbullShouldBeCorrect(){ @Test void aBartenderShouldAcceptAnOrderForRedbull() { Bartender jane = new Bartender(); - String productName = "ch.heigvd.res.chill.domain.wasadigi.RedBull"; + String productName = "ch.heigvd.res.chill.domain.OvichHeigVd.RedBull"; OrderRequest request = new OrderRequest(3, productName); OrderResponse response = jane.order(request); BigDecimal expectedTotalPrice = RedBull.PRICE.multiply(new BigDecimal(3)); From 09e1b21aad05ece566a100dc229ce66d4a48849b Mon Sep 17 00:00:00 2001 From: Ovich Date: Fri, 26 Feb 2021 11:44:26 +0100 Subject: [PATCH 8/9] Revert "Include Monster in product list. Fix issues with RedBull test package" This reverts commit c8842d15af72184fbc4552df7c8836e3c3dbd8d6. --- .../res/chill/domain/OvichHeigVd/Monster.java | 21 ------------------- .../res/chill/domain/OvichHeigVd/RedBull.java | 2 +- .../chill/domain/OvichHeigVd/RedBullTest.java | 3 +-- .../RedBullTest.java} | 19 ++++++++--------- 4 files changed, 11 insertions(+), 34 deletions(-) delete mode 100644 src/main/java/ch/heigvd/res/chill/domain/OvichHeigVd/Monster.java rename src/test/java/ch/heigvd/res/chill/domain/{OvichHeigVd/MonsterTest.java => wasadigi/RedBullTest.java} (54%) diff --git a/src/main/java/ch/heigvd/res/chill/domain/OvichHeigVd/Monster.java b/src/main/java/ch/heigvd/res/chill/domain/OvichHeigVd/Monster.java deleted file mode 100644 index 199474c5..00000000 --- a/src/main/java/ch/heigvd/res/chill/domain/OvichHeigVd/Monster.java +++ /dev/null @@ -1,21 +0,0 @@ -package ch.heigvd.res.chill.domain.OvichHeigVd; - -import ch.heigvd.res.chill.domain.IProduct; - -import java.math.BigDecimal; - -public class Monster implements IProduct { - - public final static String NAME = "Monster"; - public final static BigDecimal PRICE = new BigDecimal(3.0); - - @Override - public String getName() { - return NAME; - } - - @Override - public BigDecimal getPrice() { - return PRICE; - } -} diff --git a/src/main/java/ch/heigvd/res/chill/domain/OvichHeigVd/RedBull.java b/src/main/java/ch/heigvd/res/chill/domain/OvichHeigVd/RedBull.java index cd87ef73..296d9141 100644 --- a/src/main/java/ch/heigvd/res/chill/domain/OvichHeigVd/RedBull.java +++ b/src/main/java/ch/heigvd/res/chill/domain/OvichHeigVd/RedBull.java @@ -1,4 +1,4 @@ -package ch.heigvd.res.chill.domain.OvichHeigVd; +package ch.heigvd.res.chill.domain.wasadigi; import ch.heigvd.res.chill.domain.IProduct; diff --git a/src/test/java/ch/heigvd/res/chill/domain/OvichHeigVd/RedBullTest.java b/src/test/java/ch/heigvd/res/chill/domain/OvichHeigVd/RedBullTest.java index b3612530..139425fd 100644 --- a/src/test/java/ch/heigvd/res/chill/domain/OvichHeigVd/RedBullTest.java +++ b/src/test/java/ch/heigvd/res/chill/domain/OvichHeigVd/RedBullTest.java @@ -3,7 +3,6 @@ import static org.junit.jupiter.api.Assertions.*; import ch.heigvd.res.chill.domain.Bartender; -import ch.heigvd.res.chill.domain.OvichHeigVd.*; import ch.heigvd.res.chill.protocol.OrderRequest; import ch.heigvd.res.chill.protocol.OrderResponse; import org.junit.jupiter.api.Test; @@ -23,7 +22,7 @@ void thePriceAndNameForRedbullShouldBeCorrect(){ @Test void aBartenderShouldAcceptAnOrderForRedbull() { Bartender jane = new Bartender(); - String productName = "ch.heigvd.res.chill.domain.OvichHeigVd.RedBull"; + String productName = "ch.heigvd.res.chill.domain.wasadigi.RedBull"; OrderRequest request = new OrderRequest(3, productName); OrderResponse response = jane.order(request); BigDecimal expectedTotalPrice = RedBull.PRICE.multiply(new BigDecimal(3)); diff --git a/src/test/java/ch/heigvd/res/chill/domain/OvichHeigVd/MonsterTest.java b/src/test/java/ch/heigvd/res/chill/domain/wasadigi/RedBullTest.java similarity index 54% rename from src/test/java/ch/heigvd/res/chill/domain/OvichHeigVd/MonsterTest.java rename to src/test/java/ch/heigvd/res/chill/domain/wasadigi/RedBullTest.java index f2682218..d20ad257 100644 --- a/src/test/java/ch/heigvd/res/chill/domain/OvichHeigVd/MonsterTest.java +++ b/src/test/java/ch/heigvd/res/chill/domain/wasadigi/RedBullTest.java @@ -1,9 +1,8 @@ -package ch.heigvd.res.chill.domain.OvichHeigVd; +package ch.heigvd.res.chill.domain.wasadigi; import static org.junit.jupiter.api.Assertions.*; import ch.heigvd.res.chill.domain.Bartender; -import ch.heigvd.res.chill.domain.OvichHeigVd.*; import ch.heigvd.res.chill.protocol.OrderRequest; import ch.heigvd.res.chill.protocol.OrderResponse; import org.junit.jupiter.api.Test; @@ -12,21 +11,21 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -class MonsterTest { +class RedBullTest { @Test - void thePriceAndNameForMonsterShouldBeCorrect(){ - Monster drink = new Monster(); - assertEquals(drink.getName(), Monster.NAME); - assertEquals(drink.getPrice(), Monster.PRICE); + void thePriceAndNameForRedbullShouldBeCorrect(){ + RedBull drink = new RedBull(); + assertEquals(drink.getName(), RedBull.NAME); + assertEquals(drink.getPrice(), RedBull.PRICE); } @Test - void aBartenderShouldAcceptAnOrderForMonster() { + void aBartenderShouldAcceptAnOrderForRedbull() { Bartender jane = new Bartender(); - String productName = "ch.heigvd.res.chill.domain.OvichHeigVd.Monster"; + String productName = "ch.heigvd.res.chill.domain.wasadigi.RedBull"; OrderRequest request = new OrderRequest(3, productName); OrderResponse response = jane.order(request); - BigDecimal expectedTotalPrice = Monster.PRICE.multiply(new BigDecimal(3)); + BigDecimal expectedTotalPrice = RedBull.PRICE.multiply(new BigDecimal(3)); assertEquals(expectedTotalPrice, response.getTotalPrice()); } } \ No newline at end of file From e0b88eede0ed709d790693bfa6421769fc859265 Mon Sep 17 00:00:00 2001 From: Ovich Date: Fri, 26 Feb 2021 11:54:28 +0100 Subject: [PATCH 9/9] Include RedBull into Product list --- .../chill/domain/wasadigi/RedBullTest.java | 31 ------------------- 1 file changed, 31 deletions(-) delete mode 100644 src/test/java/ch/heigvd/res/chill/domain/wasadigi/RedBullTest.java diff --git a/src/test/java/ch/heigvd/res/chill/domain/wasadigi/RedBullTest.java b/src/test/java/ch/heigvd/res/chill/domain/wasadigi/RedBullTest.java deleted file mode 100644 index d20ad257..00000000 --- a/src/test/java/ch/heigvd/res/chill/domain/wasadigi/RedBullTest.java +++ /dev/null @@ -1,31 +0,0 @@ -package ch.heigvd.res.chill.domain.wasadigi; - -import static org.junit.jupiter.api.Assertions.*; - -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 RedBullTest { - @Test - void thePriceAndNameForRedbullShouldBeCorrect(){ - RedBull drink = new RedBull(); - assertEquals(drink.getName(), RedBull.NAME); - assertEquals(drink.getPrice(), RedBull.PRICE); - } - - @Test - void aBartenderShouldAcceptAnOrderForRedbull() { - Bartender jane = new Bartender(); - String productName = "ch.heigvd.res.chill.domain.wasadigi.RedBull"; - OrderRequest request = new OrderRequest(3, productName); - OrderResponse response = jane.order(request); - BigDecimal expectedTotalPrice = RedBull.PRICE.multiply(new BigDecimal(3)); - assertEquals(expectedTotalPrice, response.getTotalPrice()); - } -} \ No newline at end of file