From 024504b01066de3a1ffb3be4c9bcbe84c785e64c Mon Sep 17 00:00:00 2001 From: Fredrik Haupt Date: Wed, 14 Aug 2024 13:53:18 +0200 Subject: [PATCH 01/24] Made domain model and started first test --- DomainModel.md | 10 ++++++++++ src/test/java/com/booleanuk/core/BasketTest.java | 6 ++++++ 2 files changed, 16 insertions(+) create mode 100644 DomainModel.md diff --git a/DomainModel.md b/DomainModel.md new file mode 100644 index 00000000..e1f9d65e --- /dev/null +++ b/DomainModel.md @@ -0,0 +1,10 @@ + +| Classes | Variables | Methods | Scenario | Outcomes | +|----------|------------------------------|------------------------|-----------------------------------------|--------------------------------------| +| `Basket` | `List bagels` | `order(String bagel)` | If bagels contains bagel | Increase total price and return true | +| | `List orderedBagels` | | If bagels does not contain bagel | Print error message and return false | +| | `int capacity` | `remove(String bagel)` | If orderedBagels contains bagel | Reduce total price | +| | | | If orderedBagels does not contain bagel | Print error message | +| | | `full()` | If orderedBagels is full | Print basket is full message | +| | | | If orderedBagels is not full | Print basket is not full message | +| | | `capacity(int i)` | | Capacity is changed | \ No newline at end of file diff --git a/src/test/java/com/booleanuk/core/BasketTest.java b/src/test/java/com/booleanuk/core/BasketTest.java index e35771b3..e4c09c68 100644 --- a/src/test/java/com/booleanuk/core/BasketTest.java +++ b/src/test/java/com/booleanuk/core/BasketTest.java @@ -5,4 +5,10 @@ class BasketTest { + Basket basket = new Basket(); + + @Test + public void testOrderExists(){ + Assertions.assertTrue(basket.order("")); + } } From 83a481eb4ef2a3b80d3d68eb021205ced864e52d Mon Sep 17 00:00:00 2001 From: Fredrik Haupt Date: Wed, 14 Aug 2024 13:57:35 +0200 Subject: [PATCH 02/24] Continued with first test --- src/main/java/com/booleanuk/core/Basket.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/com/booleanuk/core/Basket.java b/src/main/java/com/booleanuk/core/Basket.java index df7a20aa..770ba0cf 100644 --- a/src/main/java/com/booleanuk/core/Basket.java +++ b/src/main/java/com/booleanuk/core/Basket.java @@ -2,4 +2,7 @@ public class Basket { + public boolean order(String bagel){ + return true; + } } From 4a05d54b5ecc49cca963a2ecfd60bbbe1374ea28 Mon Sep 17 00:00:00 2001 From: Fredrik Haupt Date: Wed, 14 Aug 2024 14:15:28 +0200 Subject: [PATCH 03/24] New version of previous commits --- DomainModel.md | 18 +++++++++--------- src/main/java/com/booleanuk/core/Basket.java | 7 +++++++ .../java/com/booleanuk/core/BasketTest.java | 8 +++++++- 3 files changed, 23 insertions(+), 10 deletions(-) diff --git a/DomainModel.md b/DomainModel.md index e1f9d65e..3f88c978 100644 --- a/DomainModel.md +++ b/DomainModel.md @@ -1,10 +1,10 @@ -| Classes | Variables | Methods | Scenario | Outcomes | -|----------|------------------------------|------------------------|-----------------------------------------|--------------------------------------| -| `Basket` | `List bagels` | `order(String bagel)` | If bagels contains bagel | Increase total price and return true | -| | `List orderedBagels` | | If bagels does not contain bagel | Print error message and return false | -| | `int capacity` | `remove(String bagel)` | If orderedBagels contains bagel | Reduce total price | -| | | | If orderedBagels does not contain bagel | Print error message | -| | | `full()` | If orderedBagels is full | Print basket is full message | -| | | | If orderedBagels is not full | Print basket is not full message | -| | | `capacity(int i)` | | Capacity is changed | \ No newline at end of file +| Classes | Variables | Methods | Scenario | Outcomes | +|----------|-----------------------------------|------------------------|-----------------------------------------|--------------------------------------| +| `Basket` | `ArrayList bagels` | `order(String bagel)` | If bagels contains bagel | Increase total price and return true | +| | `ArrayList orderedBagels` | | If bagels does not contain bagel | Print error message and return false | +| | `int capacity` | `remove(String bagel)` | If orderedBagels contains bagel | Reduce total price | +| | | | If orderedBagels does not contain bagel | Print error message | +| | | `full()` | If orderedBagels is full | Print basket is full message | +| | | | If orderedBagels is not full | Print basket is not full message | +| | | `capacity(int i)` | | Capacity is changed | \ No newline at end of file diff --git a/src/main/java/com/booleanuk/core/Basket.java b/src/main/java/com/booleanuk/core/Basket.java index 770ba0cf..4f0b6ba2 100644 --- a/src/main/java/com/booleanuk/core/Basket.java +++ b/src/main/java/com/booleanuk/core/Basket.java @@ -1,8 +1,15 @@ package com.booleanuk.core; +import java.util.ArrayList; + public class Basket { + //ArrayList bagels = new ArrayList(); + public boolean order(String bagel){ + if(bagel.isEmpty()){ + 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 e4c09c68..7c815ff3 100644 --- a/src/test/java/com/booleanuk/core/BasketTest.java +++ b/src/test/java/com/booleanuk/core/BasketTest.java @@ -9,6 +9,12 @@ class BasketTest { @Test public void testOrderExists(){ - Assertions.assertTrue(basket.order("")); + Assertions.assertFalse(basket.order("")); } + + /* + @Test + public void testBagelsExist(){ + Assertions.assertTrue(basket.bagels.add(1)); + }*/ } From 79751ba13b702d35fe02efd247479fe7fb14e6a3 Mon Sep 17 00:00:00 2001 From: Fredrik Haupt Date: Wed, 14 Aug 2024 14:21:07 +0200 Subject: [PATCH 04/24] Test if ArrayList bagels exists fails --- src/main/java/com/booleanuk/core/Basket.java | 2 +- src/test/java/com/booleanuk/core/BasketTest.java | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/booleanuk/core/Basket.java b/src/main/java/com/booleanuk/core/Basket.java index 4f0b6ba2..ba896912 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 { - //ArrayList bagels = new ArrayList(); + ArrayList bagels = new ArrayList(); public boolean order(String bagel){ if(bagel.isEmpty()){ diff --git a/src/test/java/com/booleanuk/core/BasketTest.java b/src/test/java/com/booleanuk/core/BasketTest.java index 7c815ff3..42061d60 100644 --- a/src/test/java/com/booleanuk/core/BasketTest.java +++ b/src/test/java/com/booleanuk/core/BasketTest.java @@ -12,9 +12,8 @@ public void testOrderExists(){ Assertions.assertFalse(basket.order("")); } - /* @Test public void testBagelsExist(){ - Assertions.assertTrue(basket.bagels.add(1)); - }*/ + Assertions.assertFalse(basket.bagels.isEmpty()); + } } From 2cdb026973d590c6d16cad2ac3dac562867c1d80 Mon Sep 17 00:00:00 2001 From: Fredrik Haupt Date: Wed, 14 Aug 2024 14:32:37 +0200 Subject: [PATCH 05/24] Test if order() functions correctly fails --- src/main/java/com/booleanuk/core/Basket.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/java/com/booleanuk/core/Basket.java b/src/main/java/com/booleanuk/core/Basket.java index ba896912..83125b9a 100644 --- a/src/main/java/com/booleanuk/core/Basket.java +++ b/src/main/java/com/booleanuk/core/Basket.java @@ -6,6 +6,12 @@ public class Basket { ArrayList bagels = new ArrayList(); + Basket(){ + bagels.add("bagelOne"); + bagels.add("bagelTwo"); + bagels.add("bagelThree"); + } + public boolean order(String bagel){ if(bagel.isEmpty()){ return false; From 9c58ac7ca5078f54082c80b59b670d1e332c177c Mon Sep 17 00:00:00 2001 From: Fredrik Haupt Date: Wed, 14 Aug 2024 14:32:46 +0200 Subject: [PATCH 06/24] Test if order() functions correctly fails --- 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 42061d60..5e6a8ea2 100644 --- a/src/test/java/com/booleanuk/core/BasketTest.java +++ b/src/test/java/com/booleanuk/core/BasketTest.java @@ -16,4 +16,9 @@ public void testOrderExists(){ public void testBagelsExist(){ Assertions.assertFalse(basket.bagels.isEmpty()); } + + @Test + public void testOrderFunction(){ + Assertions.assertFalse(basket.order(("bagelFour"))); + } } From fb4f847e55ede4038cf48788e86bd0d7c7d3a9a0 Mon Sep 17 00:00:00 2001 From: Fredrik Haupt Date: Wed, 14 Aug 2024 14:33:59 +0200 Subject: [PATCH 07/24] Test if order() functions correctly passes --- src/main/java/com/booleanuk/core/Basket.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/booleanuk/core/Basket.java b/src/main/java/com/booleanuk/core/Basket.java index 83125b9a..32268a6d 100644 --- a/src/main/java/com/booleanuk/core/Basket.java +++ b/src/main/java/com/booleanuk/core/Basket.java @@ -13,7 +13,7 @@ public class Basket { } public boolean order(String bagel){ - if(bagel.isEmpty()){ + if(!bagels.contains(bagel)){ return false; } return true; From c414e5f7ee2c2ed09d99f6cb803a7ddbaad7a2e7 Mon Sep 17 00:00:00 2001 From: Fredrik Haupt Date: Wed, 14 Aug 2024 14:39:23 +0200 Subject: [PATCH 08/24] Test if ArratList orderedBagels exists fails --- 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 5e6a8ea2..6a39703b 100644 --- a/src/test/java/com/booleanuk/core/BasketTest.java +++ b/src/test/java/com/booleanuk/core/BasketTest.java @@ -21,4 +21,9 @@ public void testBagelsExist(){ public void testOrderFunction(){ Assertions.assertFalse(basket.order(("bagelFour"))); } + + @Test + public void testOrderedBagelsExist(){ + Assertions.assertTrue(basket.orderedBagles.isEmpty()); + } } From 0d83df68b55847a884317976dd453074c495532a Mon Sep 17 00:00:00 2001 From: Fredrik Haupt Date: Wed, 14 Aug 2024 14:41:11 +0200 Subject: [PATCH 09/24] Test if ArrayList orderedBagels exists passes --- src/main/java/com/booleanuk/core/Basket.java | 1 + src/test/java/com/booleanuk/core/BasketTest.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/booleanuk/core/Basket.java b/src/main/java/com/booleanuk/core/Basket.java index 32268a6d..a642a6c8 100644 --- a/src/main/java/com/booleanuk/core/Basket.java +++ b/src/main/java/com/booleanuk/core/Basket.java @@ -5,6 +5,7 @@ public class Basket { ArrayList bagels = new ArrayList(); + ArrayList orderedBagels = new ArrayList<>(); Basket(){ bagels.add("bagelOne"); diff --git a/src/test/java/com/booleanuk/core/BasketTest.java b/src/test/java/com/booleanuk/core/BasketTest.java index 6a39703b..e50883e7 100644 --- a/src/test/java/com/booleanuk/core/BasketTest.java +++ b/src/test/java/com/booleanuk/core/BasketTest.java @@ -24,6 +24,6 @@ public void testOrderFunction(){ @Test public void testOrderedBagelsExist(){ - Assertions.assertTrue(basket.orderedBagles.isEmpty()); + Assertions.assertTrue(basket.orderedBagels.isEmpty()); } } From 8536a9056daee6fece5daac55fb1ccbe4d6ac01b Mon Sep 17 00:00:00 2001 From: Fredrik Haupt Date: Wed, 14 Aug 2024 14:44:24 +0200 Subject: [PATCH 10/24] Test if ArrayList orderedBagels contains bagelOne fails --- src/test/java/com/booleanuk/core/BasketTest.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/test/java/com/booleanuk/core/BasketTest.java b/src/test/java/com/booleanuk/core/BasketTest.java index e50883e7..93dfe454 100644 --- a/src/test/java/com/booleanuk/core/BasketTest.java +++ b/src/test/java/com/booleanuk/core/BasketTest.java @@ -26,4 +26,10 @@ public void testOrderFunction(){ public void testOrderedBagelsExist(){ Assertions.assertTrue(basket.orderedBagels.isEmpty()); } + + @Test + public void testOrderAddsToOrderedBagels(){ + basket.order("bagelOne"); + Assertions.assertTrue(basket.orderedBagels.contains("bagelOne")); + } } From d8aa7bd337cb391f6565be5be03fac94342fca85 Mon Sep 17 00:00:00 2001 From: Fredrik Haupt Date: Wed, 14 Aug 2024 14:45:08 +0200 Subject: [PATCH 11/24] Test if ArrayList orderedBagels contains bagelOne passes --- 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 a642a6c8..c67ebfaf 100644 --- a/src/main/java/com/booleanuk/core/Basket.java +++ b/src/main/java/com/booleanuk/core/Basket.java @@ -17,6 +17,7 @@ public boolean order(String bagel){ if(!bagels.contains(bagel)){ return false; } + orderedBagels.add(bagel); return true; } } From 831c2e3d52ac3aeef7e57a850d576492c339a800 Mon Sep 17 00:00:00 2001 From: Fredrik Haupt Date: Wed, 14 Aug 2024 14:49:06 +0200 Subject: [PATCH 12/24] Test if remove() exists fails --- DomainModel.md | 18 +++++++++--------- .../java/com/booleanuk/core/BasketTest.java | 5 +++++ 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/DomainModel.md b/DomainModel.md index 3f88c978..19500455 100644 --- a/DomainModel.md +++ b/DomainModel.md @@ -1,10 +1,10 @@ -| Classes | Variables | Methods | Scenario | Outcomes | -|----------|-----------------------------------|------------------------|-----------------------------------------|--------------------------------------| -| `Basket` | `ArrayList bagels` | `order(String bagel)` | If bagels contains bagel | Increase total price and return true | -| | `ArrayList orderedBagels` | | If bagels does not contain bagel | Print error message and return false | -| | `int capacity` | `remove(String bagel)` | If orderedBagels contains bagel | Reduce total price | -| | | | If orderedBagels does not contain bagel | Print error message | -| | | `full()` | If orderedBagels is full | Print basket is full message | -| | | | If orderedBagels is not full | Print basket is not full message | -| | | `capacity(int i)` | | Capacity is changed | \ No newline at end of file +| Classes | Variables | Methods | Scenario | Outcomes | +|----------|-----------------------------------|------------------------|-----------------------------------------|----------------------------------| +| `Basket` | `ArrayList bagels` | `order(String bagel)` | If bagels contains bagel | Return true | +| | `ArrayList orderedBagels` | | If bagels does not contain bagel | Return false | +| | `int capacity` | `remove(String bagel)` | If orderedBagels contains bagel | Return true | +| | | | If orderedBagels does not contain bagel | Return false | +| | | `full()` | If orderedBagels is full | Print basket is full message | +| | | | If orderedBagels is not full | Print basket is not full message | +| | | `capacity(int i)` | | Capacity is changed | \ No newline at end of file diff --git a/src/test/java/com/booleanuk/core/BasketTest.java b/src/test/java/com/booleanuk/core/BasketTest.java index 93dfe454..557d6922 100644 --- a/src/test/java/com/booleanuk/core/BasketTest.java +++ b/src/test/java/com/booleanuk/core/BasketTest.java @@ -32,4 +32,9 @@ public void testOrderAddsToOrderedBagels(){ basket.order("bagelOne"); Assertions.assertTrue(basket.orderedBagels.contains("bagelOne")); } + + @Test + public void testRemoveExists(){ + Assertions.assertTrue(basket.remove("bagelOne")); + } } From 5d57c78d9341936e9c4b92d70b9118d148b716dd Mon Sep 17 00:00:00 2001 From: Fredrik Haupt Date: Wed, 14 Aug 2024 14:52:09 +0200 Subject: [PATCH 13/24] Test if remove() exists passes --- src/main/java/com/booleanuk/core/Basket.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/com/booleanuk/core/Basket.java b/src/main/java/com/booleanuk/core/Basket.java index c67ebfaf..45072927 100644 --- a/src/main/java/com/booleanuk/core/Basket.java +++ b/src/main/java/com/booleanuk/core/Basket.java @@ -20,4 +20,8 @@ public boolean order(String bagel){ orderedBagels.add(bagel); return true; } + + public boolean remove(String bagel){ + return true; + } } From 5b8706f50fa737e5e6e280012057bd836d52fd03 Mon Sep 17 00:00:00 2001 From: Fredrik Haupt Date: Wed, 14 Aug 2024 14:54:39 +0200 Subject: [PATCH 14/24] Test if remove() functions fails --- 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 557d6922..7a916578 100644 --- a/src/test/java/com/booleanuk/core/BasketTest.java +++ b/src/test/java/com/booleanuk/core/BasketTest.java @@ -37,4 +37,9 @@ public void testOrderAddsToOrderedBagels(){ public void testRemoveExists(){ Assertions.assertTrue(basket.remove("bagelOne")); } + + @Test + public void testRemoveFunction(){ + Assertions.assertFalse(basket.remove("bagelTwo")); + } } From 82aed8524e24250d0d0c241bb273261be8dfa752 Mon Sep 17 00:00:00 2001 From: Fredrik Haupt Date: Wed, 14 Aug 2024 14:55:34 +0200 Subject: [PATCH 15/24] Test if remove() functions passes --- src/main/java/com/booleanuk/core/Basket.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/booleanuk/core/Basket.java b/src/main/java/com/booleanuk/core/Basket.java index 45072927..f7e073c8 100644 --- a/src/main/java/com/booleanuk/core/Basket.java +++ b/src/main/java/com/booleanuk/core/Basket.java @@ -22,6 +22,9 @@ public boolean order(String bagel){ } public boolean remove(String bagel){ - return true; + if(orderedBagels.contains(bagel)){ + return true; + } + return false; } } From d8c8dc5605949ddf723afd9e852ced597e764554 Mon Sep 17 00:00:00 2001 From: Fredrik Haupt Date: Wed, 14 Aug 2024 14:58:30 +0200 Subject: [PATCH 16/24] Test if remove() functions passes --- src/main/java/com/booleanuk/core/Basket.java | 1 + src/test/java/com/booleanuk/core/BasketTest.java | 2 ++ 2 files changed, 3 insertions(+) diff --git a/src/main/java/com/booleanuk/core/Basket.java b/src/main/java/com/booleanuk/core/Basket.java index f7e073c8..926c6593 100644 --- a/src/main/java/com/booleanuk/core/Basket.java +++ b/src/main/java/com/booleanuk/core/Basket.java @@ -23,6 +23,7 @@ public boolean order(String bagel){ public boolean remove(String bagel){ if(orderedBagels.contains(bagel)){ + orderedBagels.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 7a916578..2cbba194 100644 --- a/src/test/java/com/booleanuk/core/BasketTest.java +++ b/src/test/java/com/booleanuk/core/BasketTest.java @@ -40,6 +40,8 @@ public void testRemoveExists(){ @Test public void testRemoveFunction(){ + basket.order("bagelOne"); Assertions.assertFalse(basket.remove("bagelTwo")); + Assertions.assertTrue(basket.remove("bagelOne")); } } From 2ff51991b9435d23026fba0e77ba7ae4282b5df3 Mon Sep 17 00:00:00 2001 From: Fredrik Haupt Date: Wed, 14 Aug 2024 15:04:06 +0200 Subject: [PATCH 17/24] Test if full() functions second fail --- DomainModel.md | 18 +++++++++--------- src/main/java/com/booleanuk/core/Basket.java | 6 ++++++ .../java/com/booleanuk/core/BasketTest.java | 5 +++++ 3 files changed, 20 insertions(+), 9 deletions(-) diff --git a/DomainModel.md b/DomainModel.md index 19500455..ce63c8fc 100644 --- a/DomainModel.md +++ b/DomainModel.md @@ -1,10 +1,10 @@ -| Classes | Variables | Methods | Scenario | Outcomes | -|----------|-----------------------------------|------------------------|-----------------------------------------|----------------------------------| -| `Basket` | `ArrayList bagels` | `order(String bagel)` | If bagels contains bagel | Return true | -| | `ArrayList orderedBagels` | | If bagels does not contain bagel | Return false | -| | `int capacity` | `remove(String bagel)` | If orderedBagels contains bagel | Return true | -| | | | If orderedBagels does not contain bagel | Return false | -| | | `full()` | If orderedBagels is full | Print basket is full message | -| | | | If orderedBagels is not full | Print basket is not full message | -| | | `capacity(int i)` | | Capacity is changed | \ No newline at end of file +| Classes | Variables | Methods | Scenario | Outcomes | +|----------|-----------------------------------|------------------------|-----------------------------------------|---------------------| +| `Basket` | `ArrayList bagels` | `order(String bagel)` | If bagels contains bagel | Return true | +| | `ArrayList orderedBagels` | | If bagels does not contain bagel | Return false | +| | `int capacity` | `remove(String bagel)` | If orderedBagels contains bagel | Return true | +| | | | If orderedBagels does not contain bagel | Return false | +| | | `full()` | If orderedBagels is full | Return true | +| | | | If orderedBagels is not full | Return false | +| | | `capacity(int i)` | | Capacity is changed | \ No newline at end of file diff --git a/src/main/java/com/booleanuk/core/Basket.java b/src/main/java/com/booleanuk/core/Basket.java index 926c6593..0e91e7e7 100644 --- a/src/main/java/com/booleanuk/core/Basket.java +++ b/src/main/java/com/booleanuk/core/Basket.java @@ -6,11 +6,13 @@ public class Basket { ArrayList bagels = new ArrayList(); ArrayList orderedBagels = new ArrayList<>(); + int capacity; Basket(){ bagels.add("bagelOne"); bagels.add("bagelTwo"); bagels.add("bagelThree"); + capacity = 5; } public boolean order(String bagel){ @@ -28,4 +30,8 @@ public boolean remove(String bagel){ } return false; } + + public boolean full(){ + return true; + } } diff --git a/src/test/java/com/booleanuk/core/BasketTest.java b/src/test/java/com/booleanuk/core/BasketTest.java index 2cbba194..d3a5f8b4 100644 --- a/src/test/java/com/booleanuk/core/BasketTest.java +++ b/src/test/java/com/booleanuk/core/BasketTest.java @@ -44,4 +44,9 @@ public void testRemoveFunction(){ Assertions.assertFalse(basket.remove("bagelTwo")); Assertions.assertTrue(basket.remove("bagelOne")); } + + @Test + public void testFullFunction(){ + Assertions.assertFalse(basket.full()); + } } From 04de9605293032815f586f6758dac1432edb12e3 Mon Sep 17 00:00:00 2001 From: Fredrik Haupt Date: Wed, 14 Aug 2024 15:05:52 +0200 Subject: [PATCH 18/24] Test if full() functions passes --- src/main/java/com/booleanuk/core/Basket.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/booleanuk/core/Basket.java b/src/main/java/com/booleanuk/core/Basket.java index 0e91e7e7..81b05d13 100644 --- a/src/main/java/com/booleanuk/core/Basket.java +++ b/src/main/java/com/booleanuk/core/Basket.java @@ -32,6 +32,9 @@ public boolean remove(String bagel){ } public boolean full(){ - return true; + if(orderedBagels.size() >= capacity){ + return true; + } + return false; } } From 7b5117350c51178b253e20f4638eef3e1f55f38d Mon Sep 17 00:00:00 2001 From: Fredrik Haupt Date: Wed, 14 Aug 2024 15:10:59 +0200 Subject: [PATCH 19/24] Test if full() functions passes --- DomainModel.md | 2 +- src/main/java/com/booleanuk/core/Basket.java | 4 ++++ src/test/java/com/booleanuk/core/BasketTest.java | 5 +++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/DomainModel.md b/DomainModel.md index ce63c8fc..c087b0c1 100644 --- a/DomainModel.md +++ b/DomainModel.md @@ -7,4 +7,4 @@ | | | | If orderedBagels does not contain bagel | Return false | | | | `full()` | If orderedBagels is full | Return true | | | | | If orderedBagels is not full | Return false | -| | | `capacity(int i)` | | Capacity is changed | \ No newline at end of file +| | | `setCapacity(int i)` | | Capacity is changed | \ No newline at end of file diff --git a/src/main/java/com/booleanuk/core/Basket.java b/src/main/java/com/booleanuk/core/Basket.java index 81b05d13..b7adc8b2 100644 --- a/src/main/java/com/booleanuk/core/Basket.java +++ b/src/main/java/com/booleanuk/core/Basket.java @@ -37,4 +37,8 @@ public boolean full(){ } return false; } + + public boolean setCapacity(int newCap){ + return false; + } } diff --git a/src/test/java/com/booleanuk/core/BasketTest.java b/src/test/java/com/booleanuk/core/BasketTest.java index d3a5f8b4..1c86ce9e 100644 --- a/src/test/java/com/booleanuk/core/BasketTest.java +++ b/src/test/java/com/booleanuk/core/BasketTest.java @@ -49,4 +49,9 @@ public void testRemoveFunction(){ public void testFullFunction(){ Assertions.assertFalse(basket.full()); } + + @Test + public void testSetCapacityFunction(){ + Assertions.assertTrue(basket.setCapacity(15)); + } } From 9cbf28c27488433f19b5e3a5c88a4baf25ea23ff Mon Sep 17 00:00:00 2001 From: Fredrik Haupt Date: Wed, 14 Aug 2024 15:11:57 +0200 Subject: [PATCH 20/24] Test if setCapacity() works fails --- src/test/java/com/booleanuk/core/BasketTest.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/test/java/com/booleanuk/core/BasketTest.java b/src/test/java/com/booleanuk/core/BasketTest.java index 1c86ce9e..8ee8b0ce 100644 --- a/src/test/java/com/booleanuk/core/BasketTest.java +++ b/src/test/java/com/booleanuk/core/BasketTest.java @@ -51,6 +51,7 @@ public void testFullFunction(){ } @Test + //extra commit public void testSetCapacityFunction(){ Assertions.assertTrue(basket.setCapacity(15)); } From 58ab31038998e1fe0dc7c7e456359b4f0d7f8c3f Mon Sep 17 00:00:00 2001 From: Fredrik Haupt Date: Wed, 14 Aug 2024 15:14:23 +0200 Subject: [PATCH 21/24] Test if setCapacity() works passes --- src/main/java/com/booleanuk/core/Basket.java | 3 ++- src/test/java/com/booleanuk/core/BasketTest.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/booleanuk/core/Basket.java b/src/main/java/com/booleanuk/core/Basket.java index b7adc8b2..72f67387 100644 --- a/src/main/java/com/booleanuk/core/Basket.java +++ b/src/main/java/com/booleanuk/core/Basket.java @@ -39,6 +39,7 @@ public boolean full(){ } public boolean setCapacity(int newCap){ - return false; + capacity = newCap; + return true; } } diff --git a/src/test/java/com/booleanuk/core/BasketTest.java b/src/test/java/com/booleanuk/core/BasketTest.java index 8ee8b0ce..d2c97e46 100644 --- a/src/test/java/com/booleanuk/core/BasketTest.java +++ b/src/test/java/com/booleanuk/core/BasketTest.java @@ -51,8 +51,8 @@ public void testFullFunction(){ } @Test - //extra commit public void testSetCapacityFunction(){ Assertions.assertTrue(basket.setCapacity(15)); + Assertions.assertEquals(15, basket.capacity); } } From ddcedccc6c05db3b01b97a4037e60e2f1ae74b60 Mon Sep 17 00:00:00 2001 From: Fredrik Haupt Date: Wed, 14 Aug 2024 15:30:06 +0200 Subject: [PATCH 22/24] Adjustments to domain model and code --- DomainModel.md | 18 +++++++++--------- src/main/java/com/booleanuk/core/Basket.java | 7 +++++++ .../java/com/booleanuk/core/BasketTest.java | 1 + 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/DomainModel.md b/DomainModel.md index c087b0c1..86506e20 100644 --- a/DomainModel.md +++ b/DomainModel.md @@ -1,10 +1,10 @@ -| Classes | Variables | Methods | Scenario | Outcomes | -|----------|-----------------------------------|------------------------|-----------------------------------------|---------------------| -| `Basket` | `ArrayList bagels` | `order(String bagel)` | If bagels contains bagel | Return true | -| | `ArrayList orderedBagels` | | If bagels does not contain bagel | Return false | -| | `int capacity` | `remove(String bagel)` | If orderedBagels contains bagel | Return true | -| | | | If orderedBagels does not contain bagel | Return false | -| | | `full()` | If orderedBagels is full | Return true | -| | | | If orderedBagels is not full | Return false | -| | | `setCapacity(int i)` | | Capacity is changed | \ No newline at end of file +| Classes | Variables | Methods | Scenario | Outcomes | +|----------|-----------------------------------|------------------------|-----------------------------------------|------------------------------------------| +| `Basket` | `ArrayList bagels` | `order(String bagel)` | If bagels contains bagel | Print confirmation and return true | +| | `ArrayList orderedBagels` | | If bagels does not contain bagel | Print error and return false | +| | `int capacity` | `remove(String bagel)` | If orderedBagels contains bagel | Print confirmation and return true | +| | | | If orderedBagels does not contain bagel | Print error and return false | +| | | `full()` | If orderedBagels is full | Print full message and return true | +| | | | If orderedBagels is not full | Return not full message and return false | +| | | `setCapacity(int i)` | | Capacity is changed | \ No newline at end of file diff --git a/src/main/java/com/booleanuk/core/Basket.java b/src/main/java/com/booleanuk/core/Basket.java index 72f67387..ee593d23 100644 --- a/src/main/java/com/booleanuk/core/Basket.java +++ b/src/main/java/com/booleanuk/core/Basket.java @@ -17,24 +17,31 @@ public class Basket { public boolean order(String bagel){ if(!bagels.contains(bagel)){ + full(); + System.out.println("Bagel not found!"); return false; } orderedBagels.add(bagel); + System.out.println("Bagel added."); return true; } public boolean remove(String bagel){ if(orderedBagels.contains(bagel)){ orderedBagels.remove(bagel); + System.out.println("Bagel removed."); return true; } + System.out.println("Bagel not found!"); return false; } public boolean full(){ if(orderedBagels.size() >= capacity){ + System.out.println("Basket is full!"); return true; } + System.out.println("Basket is not full."); return false; } diff --git a/src/test/java/com/booleanuk/core/BasketTest.java b/src/test/java/com/booleanuk/core/BasketTest.java index d2c97e46..b8fe340c 100644 --- a/src/test/java/com/booleanuk/core/BasketTest.java +++ b/src/test/java/com/booleanuk/core/BasketTest.java @@ -35,6 +35,7 @@ public void testOrderAddsToOrderedBagels(){ @Test public void testRemoveExists(){ + basket.order("bagelOne"); Assertions.assertTrue(basket.remove("bagelOne")); } From c95954e81aa2ea1c7d4be3eb806085483aab0736 Mon Sep 17 00:00:00 2001 From: Fredrik Haupt Date: Wed, 14 Aug 2024 15:42:35 +0200 Subject: [PATCH 23/24] Adjustments testRemoveFunction() code --- src/test/java/com/booleanuk/core/BasketTest.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/test/java/com/booleanuk/core/BasketTest.java b/src/test/java/com/booleanuk/core/BasketTest.java index b8fe340c..d9281c07 100644 --- a/src/test/java/com/booleanuk/core/BasketTest.java +++ b/src/test/java/com/booleanuk/core/BasketTest.java @@ -42,8 +42,10 @@ public void testRemoveExists(){ @Test public void testRemoveFunction(){ basket.order("bagelOne"); + Assertions.assertTrue(basket.orderedBagels.contains("bagelOne")); Assertions.assertFalse(basket.remove("bagelTwo")); Assertions.assertTrue(basket.remove("bagelOne")); + Assertions.assertFalse(basket.orderedBagels.contains("bagelOne")); } @Test From 6aaddf321ffabc1fc3cca6d6ebefb8f17a369038 Mon Sep 17 00:00:00 2001 From: Fredrik Haupt Date: Wed, 14 Aug 2024 15:49:04 +0200 Subject: [PATCH 24/24] Adjustments testRemoveFunction() code --- src/test/java/com/booleanuk/core/BasketTest.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/test/java/com/booleanuk/core/BasketTest.java b/src/test/java/com/booleanuk/core/BasketTest.java index d9281c07..7550b5bc 100644 --- a/src/test/java/com/booleanuk/core/BasketTest.java +++ b/src/test/java/com/booleanuk/core/BasketTest.java @@ -45,6 +45,7 @@ public void testRemoveFunction(){ Assertions.assertTrue(basket.orderedBagels.contains("bagelOne")); Assertions.assertFalse(basket.remove("bagelTwo")); Assertions.assertTrue(basket.remove("bagelOne")); + Assertions.assertFalse(basket.remove("bagelOne")); Assertions.assertFalse(basket.orderedBagels.contains("bagelOne")); }