From 6cbbc65f024de6b023eeb24cb7d170b06cff4a1a Mon Sep 17 00:00:00 2001 From: Ateeb Date: Mon, 15 Jan 2024 14:09:12 +0100 Subject: [PATCH 1/6] Ateeb Salam 1.Member class --- domain-model.md | 45 +++++++++++++++++++ .../java/com/booleanuk/core/BasketTest.java | 20 ++++++++- 2 files changed, 64 insertions(+), 1 deletion(-) create mode 100644 domain-model.md 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/test/java/com/booleanuk/core/BasketTest.java b/src/test/java/com/booleanuk/core/BasketTest.java index e35771b3..d795ad16 100644 --- a/src/test/java/com/booleanuk/core/BasketTest.java +++ b/src/test/java/com/booleanuk/core/BasketTest.java @@ -3,6 +3,24 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -class BasketTest { + +public class BasketTest { + + @Test + public void addSpecificBagel() { + Basket basket = new Basket(); + + boolean result = basket.add("bagel1"); + Assertions.assertTrue(result); + } + + @Test + public void addSpecificBagel(){ + Basket basket = new Basket(); + basket.add("bagel1"); + boolean result = basket.add("bagel1"); + Assertions.assertFalse(result); + } + } From 0d4bceeae8076b22d4d327f3e05a3e805ff279dc Mon Sep 17 00:00:00 2001 From: Ateeb Date: Mon, 15 Jan 2024 14:21:29 +0100 Subject: [PATCH 2/6] Ateeb Salam 1.Member class --- src/main/java/com/booleanuk/core/Basket.java | 17 +++++++++++++++++ .../java/com/booleanuk/core/BasketTest.java | 9 ++++----- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/booleanuk/core/Basket.java b/src/main/java/com/booleanuk/core/Basket.java index df7a20aa..26b9dc0f 100644 --- a/src/main/java/com/booleanuk/core/Basket.java +++ b/src/main/java/com/booleanuk/core/Basket.java @@ -1,5 +1,22 @@ package com.booleanuk.core; +import java.util.ArrayList; + public class Basket { + ArrayList bagels; + + public Basket(){ + this.bagels = new ArrayList<>(); + this.bagels.add("bagel2"); + } + + public boolean addBagel(String bagel){ + + if (bagels.contains(bagel)){ + return false; + } + return true; + } + } diff --git a/src/test/java/com/booleanuk/core/BasketTest.java b/src/test/java/com/booleanuk/core/BasketTest.java index d795ad16..1603f282 100644 --- a/src/test/java/com/booleanuk/core/BasketTest.java +++ b/src/test/java/com/booleanuk/core/BasketTest.java @@ -7,18 +7,17 @@ public class BasketTest { @Test - public void addSpecificBagel() { + public void addSpecificBagelReturnTrue() { Basket basket = new Basket(); - boolean result = basket.add("bagel1"); + boolean result = basket.addBagel("bagel1"); Assertions.assertTrue(result); } @Test - public void addSpecificBagel(){ + public void addSpecificBagelReturnFalse(){ Basket basket = new Basket(); - basket.add("bagel1"); - boolean result = basket.add("bagel1"); + boolean result = basket.addBagel("bagel2"); Assertions.assertFalse(result); } From 71b2ecf7440d932dd14ba0f29c53dce5bcc4b0d9 Mon Sep 17 00:00:00 2001 From: Ateeb Date: Mon, 15 Jan 2024 14:22:59 +0100 Subject: [PATCH 3/6] Ateeb Salam 2.Member class --- src/main/java/com/booleanuk/core/Basket.java | 1 + src/test/java/com/booleanuk/core/BasketTest.java | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/src/main/java/com/booleanuk/core/Basket.java b/src/main/java/com/booleanuk/core/Basket.java index 26b9dc0f..afb345b7 100644 --- a/src/main/java/com/booleanuk/core/Basket.java +++ b/src/main/java/com/booleanuk/core/Basket.java @@ -19,4 +19,5 @@ public boolean addBagel(String bagel){ } + } diff --git a/src/test/java/com/booleanuk/core/BasketTest.java b/src/test/java/com/booleanuk/core/BasketTest.java index 1603f282..e76810d8 100644 --- a/src/test/java/com/booleanuk/core/BasketTest.java +++ b/src/test/java/com/booleanuk/core/BasketTest.java @@ -21,5 +21,12 @@ public void addSpecificBagelReturnFalse(){ Assertions.assertFalse(result); } + @Test + public void removeSpecificBagelReturnTrue(){ + Basket basket = new Basket(); + boolean result = basket.removeBagel("bagel2"); + Assertions.assertTrue(result); + } + } From 6b8445531838d51e0e6cf8921a72c0148faa6a34 Mon Sep 17 00:00:00 2001 From: Ateeb Date: Mon, 15 Jan 2024 14:27:21 +0100 Subject: [PATCH 4/6] Ateeb Salam 2.Member class --- src/main/java/com/booleanuk/core/Basket.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/main/java/com/booleanuk/core/Basket.java b/src/main/java/com/booleanuk/core/Basket.java index afb345b7..cf5b14fb 100644 --- a/src/main/java/com/booleanuk/core/Basket.java +++ b/src/main/java/com/booleanuk/core/Basket.java @@ -17,6 +17,14 @@ public boolean addBagel(String bagel){ } return true; } + public boolean removeBagel(String bagel){ + + if (bagels.contains(bagel)){ + bagels.remove(bagel); + return true; + } + return false; + } From 751aebc894b021e859f55741c24107edfdc16e2d Mon Sep 17 00:00:00 2001 From: Ateeb Date: Mon, 15 Jan 2024 14:51:32 +0100 Subject: [PATCH 5/6] Ateeb Salam 3.Member class --- src/main/java/com/booleanuk/core/Basket.java | 16 ++++++++++------ src/test/java/com/booleanuk/core/BasketTest.java | 13 +++++++++++++ 2 files changed, 23 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/booleanuk/core/Basket.java b/src/main/java/com/booleanuk/core/Basket.java index cf5b14fb..eaac586a 100644 --- a/src/main/java/com/booleanuk/core/Basket.java +++ b/src/main/java/com/booleanuk/core/Basket.java @@ -4,10 +4,10 @@ public class Basket { ArrayList bagels; - + int capacity = 2; public Basket(){ - this.bagels = new ArrayList<>(); - this.bagels.add("bagel2"); + this.bagels = new ArrayList<>(capacity); + bagels.add("bagel2"); } public boolean addBagel(String bagel){ @@ -15,17 +15,21 @@ 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; + } } diff --git a/src/test/java/com/booleanuk/core/BasketTest.java b/src/test/java/com/booleanuk/core/BasketTest.java index e76810d8..e582723b 100644 --- a/src/test/java/com/booleanuk/core/BasketTest.java +++ b/src/test/java/com/booleanuk/core/BasketTest.java @@ -28,5 +28,18 @@ public void removeSpecificBagelReturnTrue(){ 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); + } + + + } From 5ca77feaf57fbfdd8259e080c0571d0cdbf69201 Mon Sep 17 00:00:00 2001 From: Ateeb Date: Tue, 16 Jan 2024 09:33:47 +0100 Subject: [PATCH 6/6] Ateeb Salam 5.Member class --- src/main/java/com/booleanuk/core/Basket.java | 13 +++++++++++++ src/test/java/com/booleanuk/core/BasketTest.java | 9 +++++++++ 2 files changed, 22 insertions(+) diff --git a/src/main/java/com/booleanuk/core/Basket.java b/src/main/java/com/booleanuk/core/Basket.java index eaac586a..4620734a 100644 --- a/src/main/java/com/booleanuk/core/Basket.java +++ b/src/main/java/com/booleanuk/core/Basket.java @@ -32,4 +32,17 @@ public boolean checkCapacity(){ 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 e582723b..549d3a39 100644 --- a/src/test/java/com/booleanuk/core/BasketTest.java +++ b/src/test/java/com/booleanuk/core/BasketTest.java @@ -38,6 +38,15 @@ public void checkCapacityListReturnTrue(){ 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); + } + +