From 1229fbec94bef3a6a6b58fd56c5d2bca2af32d38 Mon Sep 17 00:00:00 2001 From: Dag Andreas Date: Wed, 14 Aug 2024 13:07:04 +0200 Subject: [PATCH 01/17] completed the domain model --- domain-model.md | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 domain-model.md diff --git a/domain-model.md b/domain-model.md new file mode 100644 index 00000000..95f309d6 --- /dev/null +++ b/domain-model.md @@ -0,0 +1,47 @@ + +## User Stories + +``` +1. +As a member of the public, +So I can order a bagel before work, +I'd like to add a specific type of bagel to my basket. +``` + +``` +2. +As a member of the public, +So I can change my order, +I'd like to remove a bagel from my basket. +``` + +``` +3. +As a member of the public, +So that I can not overfill my small bagel basket +I'd like to know when my basket is full when I try adding an item beyond my basket capacity. +``` + +``` +4. +As a Bob's Bagels manager, +So that I can expand my business, +I’d like to change the capacity of baskets. +``` + +``` +5. +As a member of the public +So that I can maintain my sanity +I'd like to know if I try to remove an item that doesn't exist in my basket. +``` + +| Class | Variables | Methods | Scenario | Outcome | Notes | +|--------|------------------------------------------|--------------------------|----------------------------------------------|-------------------------------------------------------------------------------------------------------------|------------------------------------| +| `Basket` | `static HashMap bagelTypes` | | | | map of all valid bagels and prices | +| | `static int basketSize` | | | | max size of new baskets | +| | `private ArrayList basket `| | | | list containing the bagels added | +| | | `addBagel(String type) `| User want to add a specific bagel | If the basket has space, then add the bagel.
If the basket is full, then print a message to the user. | | +| | | `removeBagel(String type) `| User removes a specific bagel | If basket is not empty, then remove the bagel.
If the basket is empty, print an error message to user. | | +| | | `getMaxSize() `| Manager wants to know the max size of basket | int basketSize is returned. | | +| | | | | | | From bb63b65cb7cbc9a47df8ddf886239d025b7745ef Mon Sep 17 00:00:00 2001 From: Dag Andreas Date: Wed, 14 Aug 2024 13:11:35 +0200 Subject: [PATCH 02/17] addbagel red --- domain-model.md | 18 +++++++++--------- .../java/com/booleanuk/core/BasketTest.java | 11 +++++++++++ 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/domain-model.md b/domain-model.md index 95f309d6..4a6048be 100644 --- a/domain-model.md +++ b/domain-model.md @@ -36,12 +36,12 @@ So that I can maintain my sanity I'd like to know if I try to remove an item that doesn't exist in my basket. ``` -| Class | Variables | Methods | Scenario | Outcome | Notes | -|--------|------------------------------------------|--------------------------|----------------------------------------------|-------------------------------------------------------------------------------------------------------------|------------------------------------| -| `Basket` | `static HashMap bagelTypes` | | | | map of all valid bagels and prices | -| | `static int basketSize` | | | | max size of new baskets | -| | `private ArrayList basket `| | | | list containing the bagels added | -| | | `addBagel(String type) `| User want to add a specific bagel | If the basket has space, then add the bagel.
If the basket is full, then print a message to the user. | | -| | | `removeBagel(String type) `| User removes a specific bagel | If basket is not empty, then remove the bagel.
If the basket is empty, print an error message to user. | | -| | | `getMaxSize() `| Manager wants to know the max size of basket | int basketSize is returned. | | -| | | | | | | +| Class | Variables | Methods | Scenario | Outcome | Notes | +|--------|------------------------------------------|-----------------------------|---------------------------------------------|------------------------------------------------------------------------------------------------------------|------------------------------------| +| `Basket` | `static HashMap bagelTypes` | | | | map of all valid bagels and prices | +| | `static int basketSize` | | | | max size of new baskets | +| | `private ArrayList basket `| | | | list containing the bagels added | +| | | `addBagel(String type) ` | User want to add a specific bagel | If the basket has space, then add the bagel.
If the basket is full, then print a message to the user. | | +| | | `removeBagel(String type) ` | User removes a specific bagel | If basket is not empty, then remove the bagel.
If the basket is empty, print an error message to user. | | +| | | `getMaxSize() ` | Manager wants to know the max size of basket | int basketSize is returned. | | +| | | `setMaxSize(int newSize)` | Manager sets the max size of basket | basketSize is changed | | diff --git a/src/test/java/com/booleanuk/core/BasketTest.java b/src/test/java/com/booleanuk/core/BasketTest.java index e35771b3..d45d828d 100644 --- a/src/test/java/com/booleanuk/core/BasketTest.java +++ b/src/test/java/com/booleanuk/core/BasketTest.java @@ -5,4 +5,15 @@ class BasketTest { + @Test + void testConstructor(){ + Basket basket = new Basket(); + } + + + @Test + void testAddBagel(){ + Basket basket = new Basket(); + basket.add("Whole wheat"); + } } From 1caee08c90e4b30d2238bd9262749f5b20abbc8d Mon Sep 17 00:00:00 2001 From: Dag Andreas Date: Wed, 14 Aug 2024 13:16:54 +0200 Subject: [PATCH 03/17] addbagel base works. Refactoring addBagel. --- src/main/java/com/booleanuk/core/Basket.java | 9 +++++++++ src/test/java/com/booleanuk/core/BasketTest.java | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/booleanuk/core/Basket.java b/src/main/java/com/booleanuk/core/Basket.java index df7a20aa..b2ebe890 100644 --- a/src/main/java/com/booleanuk/core/Basket.java +++ b/src/main/java/com/booleanuk/core/Basket.java @@ -1,5 +1,14 @@ package com.booleanuk.core; +import java.util.ArrayList; + public class Basket { + //public static HashMap + static int maxBasketSize = 5; // default value + private ArrayList basket = new ArrayList<>(); + + public boolean addBagel(String type){ + return true; + } } diff --git a/src/test/java/com/booleanuk/core/BasketTest.java b/src/test/java/com/booleanuk/core/BasketTest.java index d45d828d..48a4fdc1 100644 --- a/src/test/java/com/booleanuk/core/BasketTest.java +++ b/src/test/java/com/booleanuk/core/BasketTest.java @@ -14,6 +14,6 @@ void testConstructor(){ @Test void testAddBagel(){ Basket basket = new Basket(); - basket.add("Whole wheat"); + Assertions.assertTrue(basket.addBagel("Whole wheat")); } } From 4b2afa70b1126ae17db2da441ecaf05665c148d1 Mon Sep 17 00:00:00 2001 From: Dag Andreas Date: Wed, 14 Aug 2024 13:17:46 +0200 Subject: [PATCH 04/17] addBagel works as intended. Adding more tests. --- src/main/java/com/booleanuk/core/Basket.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/booleanuk/core/Basket.java b/src/main/java/com/booleanuk/core/Basket.java index b2ebe890..5f48433e 100644 --- a/src/main/java/com/booleanuk/core/Basket.java +++ b/src/main/java/com/booleanuk/core/Basket.java @@ -8,7 +8,12 @@ public class Basket { private ArrayList basket = new ArrayList<>(); public boolean addBagel(String type){ - return true; + if (basket.size() < maxBasketSize){ + basket.add(type); + return true; + } + System.out.println("Basket is full. Can't add " + type); + return false; } } From 66e0b0a6ce0013e99d7d6c33fea90fd1c6e76e14 Mon Sep 17 00:00:00 2001 From: Dag Andreas Date: Wed, 14 Aug 2024 13:19:02 +0200 Subject: [PATCH 05/17] Add bagel completed. --- src/test/java/com/booleanuk/core/BasketTest.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/test/java/com/booleanuk/core/BasketTest.java b/src/test/java/com/booleanuk/core/BasketTest.java index 48a4fdc1..e82bd705 100644 --- a/src/test/java/com/booleanuk/core/BasketTest.java +++ b/src/test/java/com/booleanuk/core/BasketTest.java @@ -15,5 +15,10 @@ void testConstructor(){ void testAddBagel(){ Basket basket = new Basket(); Assertions.assertTrue(basket.addBagel("Whole wheat")); + Assertions.assertTrue(basket.addBagel("Whole wheat")); + Assertions.assertTrue(basket.addBagel("Whole wheat")); + Assertions.assertTrue(basket.addBagel("Whole wheat")); + Assertions.assertTrue(basket.addBagel("Whole wheat")); + Assertions.assertFalse(basket.addBagel("Whole wheat")); } } From 96ab1a8de405850835a77c2d36c3186210fc5c8f Mon Sep 17 00:00:00 2001 From: Dag Andreas Date: Wed, 14 Aug 2024 13:21:54 +0200 Subject: [PATCH 06/17] new test RemoveBagel added --- src/main/java/com/booleanuk/core/Basket.java | 4 ++++ src/test/java/com/booleanuk/core/BasketTest.java | 9 +++++++++ 2 files changed, 13 insertions(+) diff --git a/src/main/java/com/booleanuk/core/Basket.java b/src/main/java/com/booleanuk/core/Basket.java index 5f48433e..82543119 100644 --- a/src/main/java/com/booleanuk/core/Basket.java +++ b/src/main/java/com/booleanuk/core/Basket.java @@ -16,4 +16,8 @@ public boolean addBagel(String type){ return false; } + public boolean removeBagel(String type){ + return true; + } + } diff --git a/src/test/java/com/booleanuk/core/BasketTest.java b/src/test/java/com/booleanuk/core/BasketTest.java index e82bd705..a8dd39c6 100644 --- a/src/test/java/com/booleanuk/core/BasketTest.java +++ b/src/test/java/com/booleanuk/core/BasketTest.java @@ -21,4 +21,13 @@ void testAddBagel(){ Assertions.assertTrue(basket.addBagel("Whole wheat")); Assertions.assertFalse(basket.addBagel("Whole wheat")); } + + @Test + void testRemoveBagel(){ + Basket basket = new Basket(); + basket.addBagel("Italian"); + Assertions.assertTrue(basket.removeBagel("Italian")); + Assertions.assertFalse(basket.removeBagel("Whole wheat")); + + } } From fbcbd938ec109681b83f04005bcd28b6bb5c3583 Mon Sep 17 00:00:00 2001 From: Dag Andreas Date: Wed, 14 Aug 2024 13:24:11 +0200 Subject: [PATCH 07/17] removeBagel refactored and working. --- src/main/java/com/booleanuk/core/Basket.java | 13 ++++++++++++- src/test/java/com/booleanuk/core/BasketTest.java | 2 +- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/booleanuk/core/Basket.java b/src/main/java/com/booleanuk/core/Basket.java index 82543119..702db56d 100644 --- a/src/main/java/com/booleanuk/core/Basket.java +++ b/src/main/java/com/booleanuk/core/Basket.java @@ -17,7 +17,18 @@ public boolean addBagel(String type){ } public boolean removeBagel(String type){ - return true; + if(basket.contains(type)){ + basket.remove(type); + return true; + } + + if(basket.isEmpty()) { + System.out.println("Basket is empty."); + } + else { + System.out.println(type + " is not in basket."); + } + return false; } } diff --git a/src/test/java/com/booleanuk/core/BasketTest.java b/src/test/java/com/booleanuk/core/BasketTest.java index a8dd39c6..634eeba0 100644 --- a/src/test/java/com/booleanuk/core/BasketTest.java +++ b/src/test/java/com/booleanuk/core/BasketTest.java @@ -28,6 +28,6 @@ void testRemoveBagel(){ basket.addBagel("Italian"); Assertions.assertTrue(basket.removeBagel("Italian")); Assertions.assertFalse(basket.removeBagel("Whole wheat")); - + Assertions.assertFalse(basket.removeBagel("Italian")); } } From 1b24a00c43fe0ca12f48fcb20be7ef74808a10b0 Mon Sep 17 00:00:00 2001 From: Dag Andreas Date: Wed, 14 Aug 2024 13:27:50 +0200 Subject: [PATCH 08/17] Added testmaxsize red --- src/main/java/com/booleanuk/core/Basket.java | 4 ++++ src/test/java/com/booleanuk/core/BasketTest.java | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/src/main/java/com/booleanuk/core/Basket.java b/src/main/java/com/booleanuk/core/Basket.java index 702db56d..f5bc0d85 100644 --- a/src/main/java/com/booleanuk/core/Basket.java +++ b/src/main/java/com/booleanuk/core/Basket.java @@ -31,4 +31,8 @@ public boolean removeBagel(String type){ return false; } + public int getMaxSize(){ + return 0; + } + } diff --git a/src/test/java/com/booleanuk/core/BasketTest.java b/src/test/java/com/booleanuk/core/BasketTest.java index 634eeba0..607d9833 100644 --- a/src/test/java/com/booleanuk/core/BasketTest.java +++ b/src/test/java/com/booleanuk/core/BasketTest.java @@ -30,4 +30,10 @@ void testRemoveBagel(){ Assertions.assertFalse(basket.removeBagel("Whole wheat")); Assertions.assertFalse(basket.removeBagel("Italian")); } + + @Test + void testGetMaxSize(){ + Basket basket = new Basket(); + Assertions.assertEquals(basket.getMaxSize(), 5); + } } From 90184b21cd046a56dde53afc5e3067233e10f0d0 Mon Sep 17 00:00:00 2001 From: Dag Andreas Date: Wed, 14 Aug 2024 13:29:25 +0200 Subject: [PATCH 09/17] tested setmaxsize green --- src/main/java/com/booleanuk/core/Basket.java | 6 +++++- src/test/java/com/booleanuk/core/BasketTest.java | 9 +++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/booleanuk/core/Basket.java b/src/main/java/com/booleanuk/core/Basket.java index f5bc0d85..2d7d1ac3 100644 --- a/src/main/java/com/booleanuk/core/Basket.java +++ b/src/main/java/com/booleanuk/core/Basket.java @@ -32,7 +32,11 @@ public boolean removeBagel(String type){ } public int getMaxSize(){ - return 0; + return maxBasketSize; + } + + public void setMaxSize(int newSize){ + maxBasketSize = newSize; } } diff --git a/src/test/java/com/booleanuk/core/BasketTest.java b/src/test/java/com/booleanuk/core/BasketTest.java index 607d9833..a948e472 100644 --- a/src/test/java/com/booleanuk/core/BasketTest.java +++ b/src/test/java/com/booleanuk/core/BasketTest.java @@ -36,4 +36,13 @@ void testGetMaxSize(){ Basket basket = new Basket(); Assertions.assertEquals(basket.getMaxSize(), 5); } + + @Test + void testSetMaxSize(){ + Basket basket = new Basket(); + Assertions.assertEquals(basket.getMaxSize(), 5); + + basket.setMaxSize(10); + Assertions.assertEquals(basket.getMaxSize(), 10); + } } From df5987e9c7805eec64dd93168e84074e13cb8978 Mon Sep 17 00:00:00 2001 From: Dag Andreas Date: Wed, 14 Aug 2024 13:32:47 +0200 Subject: [PATCH 10/17] fixed test --- src/main/java/com/booleanuk/core/Basket.java | 2 +- src/test/java/com/booleanuk/core/BasketTest.java | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/src/main/java/com/booleanuk/core/Basket.java b/src/main/java/com/booleanuk/core/Basket.java index 2d7d1ac3..bbb06270 100644 --- a/src/main/java/com/booleanuk/core/Basket.java +++ b/src/main/java/com/booleanuk/core/Basket.java @@ -4,7 +4,7 @@ public class Basket { //public static HashMap - static int maxBasketSize = 5; // default value + private int maxBasketSize = 5; // default value private ArrayList basket = new ArrayList<>(); public boolean addBagel(String type){ diff --git a/src/test/java/com/booleanuk/core/BasketTest.java b/src/test/java/com/booleanuk/core/BasketTest.java index a948e472..586b20f3 100644 --- a/src/test/java/com/booleanuk/core/BasketTest.java +++ b/src/test/java/com/booleanuk/core/BasketTest.java @@ -5,12 +5,6 @@ class BasketTest { - @Test - void testConstructor(){ - Basket basket = new Basket(); - } - - @Test void testAddBagel(){ Basket basket = new Basket(); From 077e973dbaa6c4fd910757c874b9556cf1aa7d46 Mon Sep 17 00:00:00 2001 From: Dag Andreas Date: Wed, 14 Aug 2024 13:44:45 +0200 Subject: [PATCH 11/17] fixed test --- domain-model.md | 17 ++++++++--------- src/main/java/com/booleanuk/core/Basket.java | 1 - 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/domain-model.md b/domain-model.md index 4a6048be..2463236b 100644 --- a/domain-model.md +++ b/domain-model.md @@ -36,12 +36,11 @@ So that I can maintain my sanity I'd like to know if I try to remove an item that doesn't exist in my basket. ``` -| Class | Variables | Methods | Scenario | Outcome | Notes | -|--------|------------------------------------------|-----------------------------|---------------------------------------------|------------------------------------------------------------------------------------------------------------|------------------------------------| -| `Basket` | `static HashMap bagelTypes` | | | | map of all valid bagels and prices | -| | `static int basketSize` | | | | max size of new baskets | -| | `private ArrayList basket `| | | | list containing the bagels added | -| | | `addBagel(String type) ` | User want to add a specific bagel | If the basket has space, then add the bagel.
If the basket is full, then print a message to the user. | | -| | | `removeBagel(String type) ` | User removes a specific bagel | If basket is not empty, then remove the bagel.
If the basket is empty, print an error message to user. | | -| | | `getMaxSize() ` | Manager wants to know the max size of basket | int basketSize is returned. | | -| | | `setMaxSize(int newSize)` | Manager sets the max size of basket | basketSize is changed | | +| Class | Variables | Methods | Scenario | Outcome | Notes | +|------|------------------------------------------|-------------------------------------|---------------------------------------------|------------------------------------------------------------------------------------------------------------|------------------------------------| +|`Basket` | `int basketSize` | | | | max size of new baskets | +| | `private ArrayList basket `| | | | list containing the bagels added | +| | | `boolean addBagel(String type) ` | User want to add a specific bagel | If the basket has space, then add the bagel.
If the basket is full, then print a message to the user. | | +| | | `boolean removeBagel(String type) ` | User removes a specific bagel | If basket is not empty, then remove the bagel.
If the basket is empty, print an error message to user. | | +| | | `int getMaxSize() ` | Manager wants to know the max size of basket | int basketSize is returned. | | +| | | `void setMaxSize(int newSize)` | Manager sets the max size of basket | basketSize is changed | | diff --git a/src/main/java/com/booleanuk/core/Basket.java b/src/main/java/com/booleanuk/core/Basket.java index bbb06270..032dfecb 100644 --- a/src/main/java/com/booleanuk/core/Basket.java +++ b/src/main/java/com/booleanuk/core/Basket.java @@ -3,7 +3,6 @@ import java.util.ArrayList; public class Basket { - //public static HashMap private int maxBasketSize = 5; // default value private ArrayList basket = new ArrayList<>(); From c3a21213a29333cc9dfc8c9b43ca12faf16d6214 Mon Sep 17 00:00:00 2001 From: Dag Andreas Date: Wed, 14 Aug 2024 13:54:03 +0200 Subject: [PATCH 12/17] new test for removing added --- src/test/java/com/booleanuk/core/BasketTest.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/test/java/com/booleanuk/core/BasketTest.java b/src/test/java/com/booleanuk/core/BasketTest.java index 586b20f3..903ca07e 100644 --- a/src/test/java/com/booleanuk/core/BasketTest.java +++ b/src/test/java/com/booleanuk/core/BasketTest.java @@ -17,7 +17,7 @@ void testAddBagel(){ } @Test - void testRemoveBagel(){ + void testRemoveBagel() { Basket basket = new Basket(); basket.addBagel("Italian"); Assertions.assertTrue(basket.removeBagel("Italian")); @@ -25,6 +25,16 @@ void testRemoveBagel(){ Assertions.assertFalse(basket.removeBagel("Italian")); } + + @Test + void testRemoveBagelOverloaded(){ + Basket basket = new Basket(); + basket.addBagel("Italian"); + Assertions.assertTrue(basket.removeBagel()); + } + + + @Test void testGetMaxSize(){ Basket basket = new Basket(); From 042058adc55e175246cf46ef43cb859eee5e0024 Mon Sep 17 00:00:00 2001 From: Dag Andreas Date: Wed, 14 Aug 2024 13:56:44 +0200 Subject: [PATCH 13/17] removeBagel func added. now to refactor. --- 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 032dfecb..ae055be7 100644 --- a/src/main/java/com/booleanuk/core/Basket.java +++ b/src/main/java/com/booleanuk/core/Basket.java @@ -30,6 +30,14 @@ public boolean removeBagel(String type){ return false; } + /** + * Removes the last bagel + * @return boolean + */ + public boolean removeBagel(){ + return true; + } + public int getMaxSize(){ return maxBasketSize; } From 73db8a7c23aec6720171ade32549122583d9251b Mon Sep 17 00:00:00 2001 From: Dag Andreas Date: Wed, 14 Aug 2024 13:58:27 +0200 Subject: [PATCH 14/17] more tests for removebagel --- src/main/java/com/booleanuk/core/Basket.java | 6 ++++++ src/test/java/com/booleanuk/core/BasketTest.java | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/src/main/java/com/booleanuk/core/Basket.java b/src/main/java/com/booleanuk/core/Basket.java index ae055be7..fd88498d 100644 --- a/src/main/java/com/booleanuk/core/Basket.java +++ b/src/main/java/com/booleanuk/core/Basket.java @@ -35,7 +35,13 @@ public boolean removeBagel(String type){ * @return boolean */ public boolean removeBagel(){ + if(basket.isEmpty()){ + System.out.println("Basket is empty."); + return false; + } + basket.removeLast(); return true; + } public int getMaxSize(){ diff --git a/src/test/java/com/booleanuk/core/BasketTest.java b/src/test/java/com/booleanuk/core/BasketTest.java index 903ca07e..7ab7c86b 100644 --- a/src/test/java/com/booleanuk/core/BasketTest.java +++ b/src/test/java/com/booleanuk/core/BasketTest.java @@ -31,6 +31,12 @@ void testRemoveBagelOverloaded(){ Basket basket = new Basket(); basket.addBagel("Italian"); Assertions.assertTrue(basket.removeBagel()); + Assertions.assertFalse(basket.removeBagel()); + + basket.addBagel("a round one"); + Assertions.assertTrue(basket.removeBagel()); + Assertions.assertFalse(basket.removeBagel()); + Assertions.assertFalse(basket.removeBagel()); } From 81e125dba9d9aa7d6d11ee2da6c603a10a798761 Mon Sep 17 00:00:00 2001 From: Dag Andreas Date: Wed, 14 Aug 2024 14:22:15 +0200 Subject: [PATCH 15/17] more tests for setMaxSize --- src/test/java/com/booleanuk/core/BasketTest.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/test/java/com/booleanuk/core/BasketTest.java b/src/test/java/com/booleanuk/core/BasketTest.java index 7ab7c86b..634b2168 100644 --- a/src/test/java/com/booleanuk/core/BasketTest.java +++ b/src/test/java/com/booleanuk/core/BasketTest.java @@ -54,5 +54,16 @@ void testSetMaxSize(){ basket.setMaxSize(10); Assertions.assertEquals(basket.getMaxSize(), 10); + + basket.setMaxSize(15); + Assertions.assertNotEquals(basket.getMaxSize(), 10); + Assertions.assertEquals(basket.getMaxSize(), 15); + + basket.setMaxSize(3); + Assertions.assertNotEquals(basket.getMaxSize(), 10); + Assertions.assertNotEquals(basket.getMaxSize(), 15); + Assertions.assertEquals(basket.getMaxSize(), 3); + + } } From db2155de29ba034b6a6b19d945433eab234918cb Mon Sep 17 00:00:00 2001 From: Dag Andreas Date: Wed, 14 Aug 2024 14:22:47 +0200 Subject: [PATCH 16/17] prettier --- src/test/java/com/booleanuk/core/BasketTest.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/test/java/com/booleanuk/core/BasketTest.java b/src/test/java/com/booleanuk/core/BasketTest.java index 634b2168..94a72fde 100644 --- a/src/test/java/com/booleanuk/core/BasketTest.java +++ b/src/test/java/com/booleanuk/core/BasketTest.java @@ -40,7 +40,6 @@ void testRemoveBagelOverloaded(){ } - @Test void testGetMaxSize(){ Basket basket = new Basket(); @@ -63,7 +62,5 @@ void testSetMaxSize(){ Assertions.assertNotEquals(basket.getMaxSize(), 10); Assertions.assertNotEquals(basket.getMaxSize(), 15); Assertions.assertEquals(basket.getMaxSize(), 3); - - } } From 157c6777516b4836a0ca86c73eef3de39a00e14b Mon Sep 17 00:00:00 2001 From: Dag Andreas Date: Wed, 14 Aug 2024 15:01:12 +0200 Subject: [PATCH 17/17] cleaned --- src/test/java/com/booleanuk/core/BasketTest.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/test/java/com/booleanuk/core/BasketTest.java b/src/test/java/com/booleanuk/core/BasketTest.java index 94a72fde..e6da8c2e 100644 --- a/src/test/java/com/booleanuk/core/BasketTest.java +++ b/src/test/java/com/booleanuk/core/BasketTest.java @@ -8,12 +8,12 @@ class BasketTest { @Test void testAddBagel(){ Basket basket = new Basket(); - Assertions.assertTrue(basket.addBagel("Whole wheat")); - Assertions.assertTrue(basket.addBagel("Whole wheat")); - Assertions.assertTrue(basket.addBagel("Whole wheat")); - Assertions.assertTrue(basket.addBagel("Whole wheat")); - Assertions.assertTrue(basket.addBagel("Whole wheat")); + + // max size = 5; + for (int i = 0; i < 5; i++) + Assertions.assertTrue(basket.addBagel("Whole wheat")); Assertions.assertFalse(basket.addBagel("Whole wheat")); + } @Test