From 391ee847c81d11a3962f25aa4cf5417fd93c6142 Mon Sep 17 00:00:00 2001 From: uthmel Date: Wed, 14 Aug 2024 12:28:07 +0200 Subject: [PATCH 01/13] check --- src/main/java/com/booleanuk/core/Basket.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/com/booleanuk/core/Basket.java b/src/main/java/com/booleanuk/core/Basket.java index df7a20aa..4aab45ed 100644 --- a/src/main/java/com/booleanuk/core/Basket.java +++ b/src/main/java/com/booleanuk/core/Basket.java @@ -1,5 +1,4 @@ package com.booleanuk.core; public class Basket { - } From 9f9fea84e7b33cd936c8c4fc6f3a7111c655b4bc Mon Sep 17 00:00:00 2001 From: uthmel Date: Wed, 14 Aug 2024 12:29:09 +0200 Subject: [PATCH 02/13] check 2 --- src/main/java/com/booleanuk/core/Basket.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/booleanuk/core/Basket.java b/src/main/java/com/booleanuk/core/Basket.java index 4aab45ed..b2a7d0e1 100644 --- a/src/main/java/com/booleanuk/core/Basket.java +++ b/src/main/java/com/booleanuk/core/Basket.java @@ -1,4 +1,5 @@ package com.booleanuk.core; public class Basket { + int test = 0; } From 4b4ad571b0075f4a0fb91251d0b2053c0e13a17c Mon Sep 17 00:00:00 2001 From: uthmel Date: Wed, 14 Aug 2024 12:31:32 +0200 Subject: [PATCH 03/13] adding domain-model --- domain-model.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 domain-model.md diff --git a/domain-model.md b/domain-model.md new file mode 100644 index 00000000..e69de29b From 87b83ce2419195508836bdfacb7435c7ecb104ab Mon Sep 17 00:00:00 2001 From: uthmel Date: Wed, 14 Aug 2024 12:47:24 +0200 Subject: [PATCH 04/13] finishing domain-model --- domain-model.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/domain-model.md b/domain-model.md index e69de29b..8343c639 100644 --- a/domain-model.md +++ b/domain-model.md @@ -0,0 +1,15 @@ + + +| Classes | Methods | Scenario | Outputs | +|----------|-----------------------------|------------------------------------------------------------------|----------------------------------------| +| `Basket` | `addBagel(String bagel` | `If the begal is not already in the basket` | `true` | +| | | `If the bagel is already in the basket` | `false` | +| | `totalItems()` | `Returns the total number of items in the basket` | `int` | +| | | | | +| | `removeBagel()` | `Removes the bagel from my basket if the bagel is in the basket` | `Removes the Bagel` | +| | | `Removes the bagel from my basket if the bagel is not in basket` | `ErrorMessage: Bagel is not in basket` | +| | | | | +| | `setCapacity(int capacity)` | `Setting the capacity of the basket` | `int` | +| | | | | +| | `checkBasket()` | `If basket is full` | `True` | +| | | `If basket is not full` | `False` | From 615722af070a70d30034ef26b57e25de8288fe4e Mon Sep 17 00:00:00 2001 From: uthmel Date: Wed, 14 Aug 2024 12:51:32 +0200 Subject: [PATCH 05/13] adding first test --- src/test/java/com/booleanuk/core/BasketTest.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/test/java/com/booleanuk/core/BasketTest.java b/src/test/java/com/booleanuk/core/BasketTest.java index e35771b3..9b5ecba7 100644 --- a/src/test/java/com/booleanuk/core/BasketTest.java +++ b/src/test/java/com/booleanuk/core/BasketTest.java @@ -5,4 +5,11 @@ class BasketTest { + @Test + public void testAddBagelToBasket(){ + Basket basket = new Basket(); + boolean result = basket.addBagel("Plain Bagel"); + Assertions.assertTrue(result); + } + } From f6a47aa7b5a38c8f9f6259cd07d34bc5c3384f52 Mon Sep 17 00:00:00 2001 From: uthmel Date: Wed, 14 Aug 2024 13:36:38 +0200 Subject: [PATCH 06/13] adding new test and core source --- src/main/java/com/booleanuk/core/Basket.java | 48 ++++++++++++++++++- .../java/com/booleanuk/core/BasketTest.java | 29 ++++++++++- 2 files changed, 74 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/booleanuk/core/Basket.java b/src/main/java/com/booleanuk/core/Basket.java index b2a7d0e1..9b50f909 100644 --- a/src/main/java/com/booleanuk/core/Basket.java +++ b/src/main/java/com/booleanuk/core/Basket.java @@ -1,5 +1,51 @@ package com.booleanuk.core; +import java.util.ArrayList; + public class Basket { - int test = 0; + private ArrayList items; + private int capacity; + + + public Basket(int capacity) { + this.items = new ArrayList<>(); + this.capacity = capacity; + } + + public Basket(){ + this(10); + } + + + public boolean isFull() { + return items.size() >=capacity; + + } + + public void setCapacity(int capacity) { + this.capacity = capacity; + } + + public boolean addBagel(String bagel){ + if (isFull()) { + return true; + } + + if (items.contains(bagel)){ + return false; + } + + items.add(bagel); + return true; + } + + public boolean removeBagel(String bagel){ + if (items.contains(bagel)) { + items.remove(bagel); + 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 9b5ecba7..7893ccb8 100644 --- a/src/test/java/com/booleanuk/core/BasketTest.java +++ b/src/test/java/com/booleanuk/core/BasketTest.java @@ -3,13 +3,38 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; +import java.util.ArrayList; + class BasketTest { + + @Test - public void testAddBagelToBasket(){ - Basket basket = new Basket(); + public void testAddBagelToBasketIfNotFull(){ + Basket basket = new Basket(10); + boolean result = basket.addBagel("Plain Bagel"); + Assertions.assertTrue(result); + } + + @Test + public void testAddBagelToBasketIfFull(){ + Basket basket = new Basket(15); boolean result = basket.addBagel("Plain Bagel"); Assertions.assertTrue(result); } + @Test + public void testRemoveBagelFromBasket() { + + + } + + @Test + public void testShouldNotAddDuplicateBagel() { + Basket basket = new Basket(); + basket.addBagel("Plain Bagel"); + boolean result = basket.addBagel("Plain Bagel"); + Assertions.assertFalse(result); + } + } From 7f4ff0c5b4fe699cc27681cb741ad947d9b22e21 Mon Sep 17 00:00:00 2001 From: uthmel Date: Wed, 14 Aug 2024 13:58:09 +0200 Subject: [PATCH 07/13] adding new test testRemoveExistingBagelFromBasket --- src/test/java/com/booleanuk/core/BasketTest.java | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/test/java/com/booleanuk/core/BasketTest.java b/src/test/java/com/booleanuk/core/BasketTest.java index 7893ccb8..e86384fc 100644 --- a/src/test/java/com/booleanuk/core/BasketTest.java +++ b/src/test/java/com/booleanuk/core/BasketTest.java @@ -16,16 +16,22 @@ public void testAddBagelToBasketIfNotFull(){ Assertions.assertTrue(result); } + @Test public void testAddBagelToBasketIfFull(){ - Basket basket = new Basket(15); - boolean result = basket.addBagel("Plain Bagel"); - Assertions.assertTrue(result); + Basket basket = new Basket(1); + basket.addBagel("Plain Bagel"); + boolean result = basket.addBagel("Crispy Bagel"); + Assertions.assertFalse(result); } @Test - public void testRemoveBagelFromBasket() { - + public void testRemoveExistingBagelFromBasket() { + Basket basket = new Basket(5); + basket.addBagel("Plain Bagel"); + basket.addBagel("Crispy Bagel"); + boolean result = basket.removeBagel("Plain Bagel"); + Assertions.assertTrue(result); } From 303730f39da276e8cb8f2d020c4e5332a3e091eb Mon Sep 17 00:00:00 2001 From: uthmel Date: Wed, 14 Aug 2024 14:08:13 +0200 Subject: [PATCH 08/13] adding new testShouldNotAddDuplicateBagel --- .../java/com/booleanuk/core/BasketTest.java | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/src/test/java/com/booleanuk/core/BasketTest.java b/src/test/java/com/booleanuk/core/BasketTest.java index e86384fc..8c33078d 100644 --- a/src/test/java/com/booleanuk/core/BasketTest.java +++ b/src/test/java/com/booleanuk/core/BasketTest.java @@ -36,11 +36,22 @@ public void testRemoveExistingBagelFromBasket() { } @Test - public void testShouldNotAddDuplicateBagel() { - Basket basket = new Basket(); + public void testRemoveNonExistingBagelFromBasket() { + Basket basket = new Basket(5); basket.addBagel("Plain Bagel"); - boolean result = basket.addBagel("Plain Bagel"); + basket.addBagel("Crispy Bagel"); + boolean result = basket.removeBagel("Cheese Bagel"); Assertions.assertFalse(result); + } + @Test + public void testShouldNotAddDuplicateBagel() { + Basket basket = new Basket(10); + basket.addBagel("Plain Bagel"); + boolean result = basket.checkDuplicates("Plain Bagel"); + Assertions.assertTrue(result); + } + + } From a62fb81513e61f0ac4c3ddcc0349002896295d8e Mon Sep 17 00:00:00 2001 From: uthmel Date: Wed, 14 Aug 2024 14:20:25 +0200 Subject: [PATCH 09/13] failing testAddBagelToBasketIfNotFull --- src/test/java/com/booleanuk/core/BasketTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/com/booleanuk/core/BasketTest.java b/src/test/java/com/booleanuk/core/BasketTest.java index 8c33078d..7d6ba6db 100644 --- a/src/test/java/com/booleanuk/core/BasketTest.java +++ b/src/test/java/com/booleanuk/core/BasketTest.java @@ -13,7 +13,7 @@ class BasketTest { public void testAddBagelToBasketIfNotFull(){ Basket basket = new Basket(10); boolean result = basket.addBagel("Plain Bagel"); - Assertions.assertTrue(result); + Assertions.assertFalse(result); } From 4a9c7639300f7504c5493e54c2bb8609e0d37d8a Mon Sep 17 00:00:00 2001 From: uthmel Date: Wed, 14 Aug 2024 14:20:49 +0200 Subject: [PATCH 10/13] fixing testAddBagelToBasketIfNotFull --- src/test/java/com/booleanuk/core/BasketTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/com/booleanuk/core/BasketTest.java b/src/test/java/com/booleanuk/core/BasketTest.java index 7d6ba6db..8c33078d 100644 --- a/src/test/java/com/booleanuk/core/BasketTest.java +++ b/src/test/java/com/booleanuk/core/BasketTest.java @@ -13,7 +13,7 @@ class BasketTest { public void testAddBagelToBasketIfNotFull(){ Basket basket = new Basket(10); boolean result = basket.addBagel("Plain Bagel"); - Assertions.assertFalse(result); + Assertions.assertTrue(result); } From ca13f3a510638bad5f411d3b3936446031fd11aa Mon Sep 17 00:00:00 2001 From: uthmel Date: Wed, 14 Aug 2024 14:26:24 +0200 Subject: [PATCH 11/13] soruce code for basket --- src/main/java/com/booleanuk/core/Basket.java | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/booleanuk/core/Basket.java b/src/main/java/com/booleanuk/core/Basket.java index 9b50f909..875e7c94 100644 --- a/src/main/java/com/booleanuk/core/Basket.java +++ b/src/main/java/com/booleanuk/core/Basket.java @@ -28,7 +28,7 @@ public void setCapacity(int capacity) { public boolean addBagel(String bagel){ if (isFull()) { - return true; + return false; } if (items.contains(bagel)){ @@ -39,13 +39,6 @@ public boolean addBagel(String bagel){ return true; } - public boolean removeBagel(String bagel){ - if (items.contains(bagel)) { - items.remove(bagel); - return true; - } - return false; - } -} + From 83e8c93e58cf8812b9dd8a4b0c37ec21ab5bee80 Mon Sep 17 00:00:00 2001 From: uthmel Date: Wed, 14 Aug 2024 14:43:27 +0200 Subject: [PATCH 12/13] Source code removebagel --- src/main/java/com/booleanuk/core/Basket.java | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/main/java/com/booleanuk/core/Basket.java b/src/main/java/com/booleanuk/core/Basket.java index 875e7c94..822525d0 100644 --- a/src/main/java/com/booleanuk/core/Basket.java +++ b/src/main/java/com/booleanuk/core/Basket.java @@ -39,6 +39,26 @@ public boolean addBagel(String bagel){ return true; } + public boolean removeBagel(String bagel){ + if (items.contains(bagel)) { + items.remove(bagel); + return true; + } + + return false; + } + + + public boolean checkDuplicates(String bagel) { + if (items.contains(bagel)) { + return true; + + } + + return false; + } + +} From 554088228cedcdbe119c3ac56bb9104401a8b412 Mon Sep 17 00:00:00 2001 From: uthmel Date: Wed, 14 Aug 2024 15:17:20 +0200 Subject: [PATCH 13/13] Everything finished --- domain-model.md | 29 ++++++++++--------- src/main/java/com/booleanuk/core/Basket.java | 14 +-------- .../java/com/booleanuk/core/BasketTest.java | 5 ++-- 3 files changed, 19 insertions(+), 29 deletions(-) diff --git a/domain-model.md b/domain-model.md index 8343c639..3e0bfaa3 100644 --- a/domain-model.md +++ b/domain-model.md @@ -1,15 +1,18 @@ -| Classes | Methods | Scenario | Outputs | -|----------|-----------------------------|------------------------------------------------------------------|----------------------------------------| -| `Basket` | `addBagel(String bagel` | `If the begal is not already in the basket` | `true` | -| | | `If the bagel is already in the basket` | `false` | -| | `totalItems()` | `Returns the total number of items in the basket` | `int` | -| | | | | -| | `removeBagel()` | `Removes the bagel from my basket if the bagel is in the basket` | `Removes the Bagel` | -| | | `Removes the bagel from my basket if the bagel is not in basket` | `ErrorMessage: Bagel is not in basket` | -| | | | | -| | `setCapacity(int capacity)` | `Setting the capacity of the basket` | `int` | -| | | | | -| | `checkBasket()` | `If basket is full` | `True` | -| | | `If basket is not full` | `False` | +| Classes | Methods | Scenario | Outputs | +|----------|-------------------------|------------------------------------------------------------------|---------| +| `Basket` | `addBagel(String bagel` | `If the begal is not already in the basket` | `true` | +| | | `If the bagel is already in the basket` | `false` | +| | | `If the basket is full` | `false` | +| | | | | +| | `removeBagel()` | `Removes the bagel from my basket if the bagel is in the basket` | `True` | +| | | `Removes the bagel from my basket if the bagel is not in basket` | `False` | +| | | | | +| | `Basket(int capacity)` | `Setting the capacity of the basket` | `int` | +| | | | | +| | `CheckDuplicates` | `If bagel is in already in the basket` | `True` | +| | | `If basket is not in the basket` | `False` | +| | | | | +| | `isFull()` | `If the basket is full` | `True` | +| | | `If the basket is not full` | `False` | diff --git a/src/main/java/com/booleanuk/core/Basket.java b/src/main/java/com/booleanuk/core/Basket.java index 822525d0..d02687bd 100644 --- a/src/main/java/com/booleanuk/core/Basket.java +++ b/src/main/java/com/booleanuk/core/Basket.java @@ -12,19 +12,12 @@ public Basket(int capacity) { this.capacity = capacity; } - public Basket(){ - this(10); - } - public boolean isFull() { return items.size() >=capacity; } - public void setCapacity(int capacity) { - this.capacity = capacity; - } public boolean addBagel(String bagel){ if (isFull()) { @@ -50,12 +43,7 @@ public boolean removeBagel(String bagel){ public boolean checkDuplicates(String bagel) { - if (items.contains(bagel)) { - return true; - - } - - return false; + return items.contains(bagel); } diff --git a/src/test/java/com/booleanuk/core/BasketTest.java b/src/test/java/com/booleanuk/core/BasketTest.java index 8c33078d..165f68b0 100644 --- a/src/test/java/com/booleanuk/core/BasketTest.java +++ b/src/test/java/com/booleanuk/core/BasketTest.java @@ -8,15 +8,14 @@ class BasketTest { - @Test public void testAddBagelToBasketIfNotFull(){ Basket basket = new Basket(10); - boolean result = basket.addBagel("Plain Bagel"); - Assertions.assertTrue(result); + Assertions.assertTrue(basket.addBagel("Crispy Bagel")); } + @Test public void testAddBagelToBasketIfFull(){ Basket basket = new Basket(1);