diff --git a/domain-model.md b/domain-model.md new file mode 100644 index 00000000..4468eb75 --- /dev/null +++ b/domain-model.md @@ -0,0 +1,45 @@ +# 1. Member class + + +| Methods | Member variables | Scenario | Outputs/Results/Return values | +|-----------------|------------------|--------------------|-------------------------------| +| addBagel(bagel) | String[] bagels | if bagel add | True | +| | | if bagel add exist | False | +| | | | | +| | | | + +# 2. Member class + +| Methods | Member variables | Scenario | Outputs/Results/Return values | +|------------------------------------|----------------------|------------------------|-------------------------------| +| removeBagel(bagels ,bagelBasket[]) | String[] bagelBasket | if bagel exists | True | +| | | if bagel doesn't exist | False | +| | | | | +| | | | + +# 3. Member class + +| Methods | Member variables | Scenario | Outputs/Results/Return values | +|---------------------------------------|-----------------------|-------------------|-------------------------------| +| basketCapacity(bagels ,bagelBasket[]) | String[] bagelsBasket | if basket full | True | +| | | if bagel not full | False | +| | | | | +| | | | + +# 4. Member class + +| Methods | Member variables | Scenario | Outputs/Results/Return values | +|---------------------------------------|-----------------------|-------------------|-------------------------------| +| basketCapacity(bagels ,bagelBasket[]) | String[] bagelsBasket | if basket full | increaseCapacity(); | +| increaseCapacity() | int capacity = 0; | if bagel not full | False | +| | | | | +| | | | + +# 5. Member class + +| Methods | Member variables | Scenario | Outputs/Results/Return values | +|------------------------------------|-----------------------|-------------------------|-------------------------------| +| removeBagel(bagels ,bagelBasket[]) | String[] bagelsBasket | if bagels exist | true | +| message() | | if bagel does not exist | False | +| | | | | +| | | | diff --git a/src/main/java/com/booleanuk/core/Basket.java b/src/main/java/com/booleanuk/core/Basket.java index df7a20aa..4620734a 100644 --- a/src/main/java/com/booleanuk/core/Basket.java +++ b/src/main/java/com/booleanuk/core/Basket.java @@ -1,5 +1,48 @@ package com.booleanuk.core; +import java.util.ArrayList; + public class Basket { + ArrayList bagels; + int capacity = 2; + public Basket(){ + this.bagels = new ArrayList<>(capacity); + bagels.add("bagel2"); + } + + public boolean addBagel(String bagel){ + + if (bagels.contains(bagel)){ + return false; + } + bagels.add(bagel); + return true; + } + public boolean removeBagel(String bagel){ + if (bagels.contains(bagel)){ + bagels.remove(bagel); + return true; + } + return false; + } + public boolean checkCapacity(){ + if (bagels.size() >capacity ){ + return true; + } + return false; + } + + public int updateCapacity(int newCap){ + this.capacity = newCap; + return this.capacity; + } + public String removeBagelString(String bagel){ + String ut="The bagel " + bagel + " doesn't exist"; + if (bagels.contains(bagel)){ + bagels.remove(bagel); + ut= "The bagel " + bagel + " is removed"; + } + return ut; + } } diff --git a/src/test/java/com/booleanuk/core/BasketTest.java b/src/test/java/com/booleanuk/core/BasketTest.java index e35771b3..549d3a39 100644 --- a/src/test/java/com/booleanuk/core/BasketTest.java +++ b/src/test/java/com/booleanuk/core/BasketTest.java @@ -3,6 +3,52 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -class BasketTest { + +public class BasketTest { + + @Test + public void addSpecificBagelReturnTrue() { + Basket basket = new Basket(); + + boolean result = basket.addBagel("bagel1"); + Assertions.assertTrue(result); + } + + @Test + public void addSpecificBagelReturnFalse(){ + Basket basket = new Basket(); + boolean result = basket.addBagel("bagel2"); + Assertions.assertFalse(result); + } + + @Test + public void removeSpecificBagelReturnTrue(){ + Basket basket = new Basket(); + boolean result = basket.removeBagel("bagel2"); + Assertions.assertTrue(result); + } + + @Test + public void checkCapacityListReturnTrue(){ + Basket basket = new Basket(); + basket.addBagel("bagel3"); + basket.addBagel("bagel4"); + basket.addBagel("bagel5"); + basket.addBagel("bagel6"); + boolean result = basket.checkCapacity(); + Assertions.assertTrue(result); + } + @Test + public void updateCapacityReturnString(){ + Basket basket = new Basket(); + int updateCap=10; + String returnV = basket.removeBagelString("bagel10"); + Assertions.assertEquals("The bagel " + "bagel10" + " doesn't exist",returnV); + } + + + + + }