From f0c030c0cb6b94bb35ba88efcd548d8794713fb6 Mon Sep 17 00:00:00 2001 From: Eric Douglas Date: Fri, 18 Dec 2020 16:31:54 +0100 Subject: [PATCH] Adds some changes. --- README.mkd | 2 +- .../drinkautomat}/common/Automat.java | 6 +- .../drinkautomat}/common/CoinValue.java | 2 +- .../drinkautomat}/common/Drink.java | 2 +- .../drinkautomat}/common/ProductType.java | 2 +- .../drinkautomat}/model/Coin.java | 4 +- .../drinkautomat}/model/CoinAndQuantity.java | 4 +- .../drinkautomat}/model/Compartment.java | 4 +- .../drinkautomat}/model/DrinkAndChange.java | 6 +- .../drinkautomat/model/DrinkMachine.java} | 14 ++--- .../drinkautomatTest}/testDrinkAutomat.java | 58 +++++++++---------- 11 files changed, 52 insertions(+), 52 deletions(-) rename src/{drinkAutomat => main/drinkautomat}/common/Automat.java (75%) rename src/{drinkAutomat => main/drinkautomat}/common/CoinValue.java (90%) rename src/{drinkAutomat => main/drinkautomat}/common/Drink.java (78%) rename src/{drinkAutomat => main/drinkautomat}/common/ProductType.java (94%) rename src/{drinkAutomat => main/drinkautomat}/model/Coin.java (82%) rename src/{drinkAutomat => main/drinkautomat}/model/CoinAndQuantity.java (92%) rename src/{drinkAutomat => main/drinkautomat}/model/Compartment.java (89%) rename src/{drinkAutomat => main/drinkautomat}/model/DrinkAndChange.java (88%) rename src/{drinkAutomat/model/DrinkAutomat.java => main/drinkautomat/model/DrinkMachine.java} (95%) rename src/{drinkAutomatTest => main/drinkautomatTest}/testDrinkAutomat.java (73%) diff --git a/README.mkd b/README.mkd index 6cf34a3..1beb2ca 100644 --- a/README.mkd +++ b/README.mkd @@ -7,5 +7,5 @@ All tools with which you can execute Java code. ## How to test the Project - The entire tests can be found in the class testDrinkAutomat in folder ../drinkAutomat/src/drinkAutomatTest/testDrinkAutomat.java. + The entire tests can be found in the class testDrinkAutomat in folder ../main.drinkautomat/src/main.drinkautomatTest/testDrinkAutomat.java. When you run this class, all tests are run automatically. Explanations for each test can be found in the test itself. diff --git a/src/drinkAutomat/common/Automat.java b/src/main/drinkautomat/common/Automat.java similarity index 75% rename from src/drinkAutomat/common/Automat.java rename to src/main/drinkautomat/common/Automat.java index 8442a38..7c3c44f 100644 --- a/src/drinkAutomat/common/Automat.java +++ b/src/main/drinkautomat/common/Automat.java @@ -1,7 +1,7 @@ -package drinkAutomat.common; +package main.drinkautomat.common; -import drinkAutomat.model.Coin; -import drinkAutomat.model.CoinAndQuantity; +import main.drinkautomat.model.Coin; +import main.drinkautomat.model.CoinAndQuantity; import java.util.List; diff --git a/src/drinkAutomat/common/CoinValue.java b/src/main/drinkautomat/common/CoinValue.java similarity index 90% rename from src/drinkAutomat/common/CoinValue.java rename to src/main/drinkautomat/common/CoinValue.java index ef16e7c..2220773 100644 --- a/src/drinkAutomat/common/CoinValue.java +++ b/src/main/drinkautomat/common/CoinValue.java @@ -1,4 +1,4 @@ -package drinkAutomat.common; +package main.drinkautomat.common; /** * The coin is initialised in cents. diff --git a/src/drinkAutomat/common/Drink.java b/src/main/drinkautomat/common/Drink.java similarity index 78% rename from src/drinkAutomat/common/Drink.java rename to src/main/drinkautomat/common/Drink.java index ff8bafa..bde533e 100644 --- a/src/drinkAutomat/common/Drink.java +++ b/src/main/drinkautomat/common/Drink.java @@ -1,4 +1,4 @@ -package drinkAutomat.common; +package main.drinkautomat.common; public class Drink extends ProductType { public Drink(String name, double price) { diff --git a/src/drinkAutomat/common/ProductType.java b/src/main/drinkautomat/common/ProductType.java similarity index 94% rename from src/drinkAutomat/common/ProductType.java rename to src/main/drinkautomat/common/ProductType.java index dac3c4d..7a6200e 100644 --- a/src/drinkAutomat/common/ProductType.java +++ b/src/main/drinkautomat/common/ProductType.java @@ -1,4 +1,4 @@ -package drinkAutomat.common; +package main.drinkautomat.common; public abstract class ProductType { protected String name; diff --git a/src/drinkAutomat/model/Coin.java b/src/main/drinkautomat/model/Coin.java similarity index 82% rename from src/drinkAutomat/model/Coin.java rename to src/main/drinkautomat/model/Coin.java index 2a334d2..d4a36d5 100644 --- a/src/drinkAutomat/model/Coin.java +++ b/src/main/drinkautomat/model/Coin.java @@ -1,6 +1,6 @@ -package drinkAutomat.model; +package main.drinkautomat.model; -import drinkAutomat.common.CoinValue; +import main.drinkautomat.common.CoinValue; public class Coin { diff --git a/src/drinkAutomat/model/CoinAndQuantity.java b/src/main/drinkautomat/model/CoinAndQuantity.java similarity index 92% rename from src/drinkAutomat/model/CoinAndQuantity.java rename to src/main/drinkautomat/model/CoinAndQuantity.java index ea3dd27..e10ad5e 100644 --- a/src/drinkAutomat/model/CoinAndQuantity.java +++ b/src/main/drinkautomat/model/CoinAndQuantity.java @@ -1,6 +1,6 @@ -package drinkAutomat.model; +package main.drinkautomat.model; -import drinkAutomat.common.CoinValue; +import main.drinkautomat.common.CoinValue; /** * This class is used to store change coins. diff --git a/src/drinkAutomat/model/Compartment.java b/src/main/drinkautomat/model/Compartment.java similarity index 89% rename from src/drinkAutomat/model/Compartment.java rename to src/main/drinkautomat/model/Compartment.java index 693d416..13247e8 100644 --- a/src/drinkAutomat/model/Compartment.java +++ b/src/main/drinkautomat/model/Compartment.java @@ -1,6 +1,6 @@ -package drinkAutomat.model; +package main.drinkautomat.model; -import drinkAutomat.common.ProductType; +import main.drinkautomat.common.ProductType; /** * Generic class for compartment in the drink machine. diff --git a/src/drinkAutomat/model/DrinkAndChange.java b/src/main/drinkautomat/model/DrinkAndChange.java similarity index 88% rename from src/drinkAutomat/model/DrinkAndChange.java rename to src/main/drinkautomat/model/DrinkAndChange.java index f26580e..7241a34 100644 --- a/src/drinkAutomat/model/DrinkAndChange.java +++ b/src/main/drinkautomat/model/DrinkAndChange.java @@ -1,7 +1,7 @@ -package drinkAutomat.model; +package main.drinkautomat.model; -import drinkAutomat.common.CoinValue; -import drinkAutomat.common.Drink; +import main.drinkautomat.common.CoinValue; +import main.drinkautomat.common.Drink; import java.util.HashMap; import java.util.List; diff --git a/src/drinkAutomat/model/DrinkAutomat.java b/src/main/drinkautomat/model/DrinkMachine.java similarity index 95% rename from src/drinkAutomat/model/DrinkAutomat.java rename to src/main/drinkautomat/model/DrinkMachine.java index f8f51c7..33dfd73 100644 --- a/src/drinkAutomat/model/DrinkAutomat.java +++ b/src/main/drinkautomat/model/DrinkMachine.java @@ -1,8 +1,8 @@ -package drinkAutomat.model; +package main.drinkautomat.model; -import drinkAutomat.common.Automat; -import drinkAutomat.common.CoinValue; -import drinkAutomat.common.Drink; +import main.drinkautomat.common.Automat; +import main.drinkautomat.common.CoinValue; +import main.drinkautomat.common.Drink; import java.util.ArrayList; import java.util.Collections; @@ -13,9 +13,9 @@ /** * This class is an implementation of a drink machine, with the principal procedure. */ -public class DrinkAutomat extends Automat { +public class DrinkMachine extends Automat { public static final String NOT_MORE_AVAILABLE = "The drink name you choose is not more available"; - public static final String NOT_ENOUGH_MONEY = "You do not given enough coins for the drink you need."; + public static final String NOT_ENOUGH_MONEY = "You have not given enough coins for the drink you need."; public static final String NOT_ENOUGH_COINS_FOR_CHANGE = "Not enough coins for change"; HashMap compartments; @@ -25,7 +25,7 @@ public class DrinkAutomat extends Automat { /** * @param compartments: Each compartment contents only one drink type. */ - public DrinkAutomat(HashMap compartments) { + public DrinkMachine(HashMap compartments) { this.returnMoney = new ArrayList<>(); this.availableCoinForChange = new ArrayList<>(); this.compartments = compartments; diff --git a/src/drinkAutomatTest/testDrinkAutomat.java b/src/main/drinkautomatTest/testDrinkAutomat.java similarity index 73% rename from src/drinkAutomatTest/testDrinkAutomat.java rename to src/main/drinkautomatTest/testDrinkAutomat.java index 01d6eec..79ba4fc 100644 --- a/src/drinkAutomatTest/testDrinkAutomat.java +++ b/src/main/drinkautomatTest/testDrinkAutomat.java @@ -1,8 +1,8 @@ -package drinkAutomatTest; +package main.drinkautomatTest; -import drinkAutomat.common.CoinValue; -import drinkAutomat.common.Drink; -import drinkAutomat.model.*; +import main.drinkautomat.common.CoinValue; +import main.drinkautomat.common.Drink; +import main.drinkautomat.model.*; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -15,11 +15,11 @@ public class testDrinkAutomat { public static final String COLA = "Cola"; - public static final String BIER = "Bier"; + public static final String BEER = "Beer"; Drink cola; - Drink bier; + Drink beer; Compartment colaCompartment; - Compartment bierCompartment; + Compartment beerCompartment; HashMap compartments; @@ -30,12 +30,12 @@ public class testDrinkAutomat { @BeforeEach private void init() { cola = new Drink(COLA, 1.20); - bier = new Drink(BIER, 2); + beer = new Drink(BEER, 2); colaCompartment = new Compartment<>(cola, 2); - bierCompartment = new Compartment<>(bier, 2); + beerCompartment = new Compartment<>(beer, 2); compartments = new HashMap<>(); compartments.put(cola.getName(), colaCompartment); - compartments.put(bier.getName(), bierCompartment); + compartments.put(beer.getName(), beerCompartment); } /** @@ -44,7 +44,7 @@ private void init() { */ @Test public void testReturnDrink() { - DrinkAutomat drinkAutomat = new DrinkAutomat(compartments); + DrinkMachine drinkAutomat = new DrinkMachine(compartments); List inputCoins = new ArrayList<>(); inputCoins.add(new Coin(CoinValue.FIFTY_CENT)); inputCoins.add(new Coin(CoinValue.FIFTY_CENT)); @@ -57,9 +57,9 @@ public void testReturnDrink() { drinkAutomat.addAvailableCoinForChange(coin_20); drinkAutomat.addAvailableCoinForChange(coin_50); - DrinkAndChange drinkAndChange = drinkAutomat.buy(bier, inputCoins); + DrinkAndChange drinkAndChange = drinkAutomat.buy(beer, inputCoins); - assertEquals(bier.getName(), drinkAndChange.getDrinkName()); + assertEquals(beer.getName(), drinkAndChange.getDrinkName()); assertEquals(0, drinkAndChange.getChange().size()); @@ -76,7 +76,7 @@ public void testReturnChange() { List inputCoins = new ArrayList<>(); inputCoins.add(new Coin(CoinValue.TWO_EURO)); - DrinkAutomat drinkAutomat = new DrinkAutomat(compartments); + DrinkMachine drinkMachine = new DrinkMachine(compartments); /** * Set coins for change @@ -84,20 +84,20 @@ public void testReturnChange() { CoinAndQuantity coin_50 = new CoinAndQuantity(CoinValue.FIFTY_CENT, 1); CoinAndQuantity coin_20 = new CoinAndQuantity(CoinValue.TWENTY_CENT, 4); CoinAndQuantity coin_10 = new CoinAndQuantity(CoinValue.TEN_CENT, 8); - drinkAutomat.addAvailableCoinForChange(coin_10); - drinkAutomat.addAvailableCoinForChange(coin_20); - drinkAutomat.addAvailableCoinForChange(coin_50); + drinkMachine.addAvailableCoinForChange(coin_10); + drinkMachine.addAvailableCoinForChange(coin_20); + drinkMachine.addAvailableCoinForChange(coin_50); - DrinkAndChange drinkAndChange = drinkAutomat.buy(cola, inputCoins); + DrinkAndChange drinkAndChange = drinkMachine.buy(cola, inputCoins); assertEquals(cola.getName(), drinkAndChange.getDrinkName()); assertEquals(1, drinkAndChange.getChange().get(CoinValue.FIFTY_CENT)); assertEquals(1, drinkAndChange.getChange().get(CoinValue.TWENTY_CENT)); assertEquals(1, drinkAndChange.getChange().get(CoinValue.TEN_CENT)); - assertEquals(3, drinkAutomat.getAvailableCoinForChange().size()); + assertEquals(3, drinkMachine.getAvailableCoinForChange().size()); - for (CoinAndQuantity coinAndQuantity : drinkAutomat.getAvailableCoinForChange()) { + for (CoinAndQuantity coinAndQuantity : drinkMachine.getAvailableCoinForChange()) { assertNotEquals(CoinValue.FIFTY_CENT, coinAndQuantity.getType()); } } @@ -114,9 +114,9 @@ public void testNoExistingDrink() { List inputCoins = new ArrayList<>(); inputCoins.add(new Coin(CoinValue.TWO_EURO)); - DrinkAutomat drinkAutomat = new DrinkAutomat(compartments); + DrinkMachine drinkMachine = new DrinkMachine(compartments); - DrinkAndChange drinkAndChange = drinkAutomat.buy(cola, inputCoins); + DrinkAndChange drinkAndChange = drinkMachine.buy(cola, inputCoins); assertNull(drinkAndChange); } @@ -129,9 +129,9 @@ public void testNotEnoughCoinForDrink() { List inputCoins = new ArrayList<>(); inputCoins.add(new Coin(CoinValue.ONE_EURO)); - DrinkAutomat drinkAutomat = new DrinkAutomat(compartments); + DrinkMachine drinkMachine = new DrinkMachine(compartments); - DrinkAndChange result = drinkAutomat.buy(cola, inputCoins); + DrinkAndChange result = drinkMachine.buy(cola, inputCoins); assertNull(result); } @@ -147,14 +147,14 @@ public void testFillInChangeCoins() { inputCoins.add(new Coin(CoinValue.TEN_CENT)); - DrinkAutomat drinkAutomat = new DrinkAutomat(compartments); + DrinkMachine drinkMachine = new DrinkMachine(compartments); - assertEquals(0, drinkAutomat.getAvailableCoinForChange().size()); + assertEquals(0, drinkMachine.getAvailableCoinForChange().size()); - drinkAutomat.fillInWithCoin(inputCoins); + drinkMachine.fillInWithCoin(inputCoins); - assertEquals(1, drinkAutomat.getAvailableCoinForChange().size()); + assertEquals(1, drinkMachine.getAvailableCoinForChange().size()); - assertEquals(CoinValue.TEN_CENT, drinkAutomat.getAvailableCoinForChange().get(0).getType()); + assertEquals(CoinValue.TEN_CENT, drinkMachine.getAvailableCoinForChange().get(0).getType()); } } \ No newline at end of file