From 910c14e2f4c1d692bf0ab83f3f583d2807efa06b Mon Sep 17 00:00:00 2001 From: Sdunsmore2006 Date: Fri, 1 Nov 2024 18:38:00 +0000 Subject: [PATCH 01/16] Feat: Adds Shawn Dunsmore Jr lesson 16 SlotMachine.java and SlotMachineTest.java --- .../lesson16/ShawnDunsmore/BuyType.java | 8 ++ .../InvalidPayAmountException.java | 10 ++ .../lesson16/ShawnDunsmore/SlotMachine.java | 96 +++++++++++++++++++ .../ShawnDunsmore/SlotMachineTest.java | 76 +++++++++++++++ 4 files changed, 190 insertions(+) create mode 100644 lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/ShawnDunsmore/BuyType.java create mode 100644 lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/ShawnDunsmore/InvalidPayAmountException.java create mode 100644 lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/ShawnDunsmore/SlotMachine.java create mode 100644 lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/ShawnDunsmore/SlotMachineTest.java diff --git a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/ShawnDunsmore/BuyType.java b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/ShawnDunsmore/BuyType.java new file mode 100644 index 000000000..4d1e19a72 --- /dev/null +++ b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/ShawnDunsmore/BuyType.java @@ -0,0 +1,8 @@ +package com.codedifferently.lesson16.ShawnDunsmore; + + +public enum BuyType { + BONUS_BUY, + DOUBLE_CHANCE, + NORMAL_BUY, +} diff --git a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/ShawnDunsmore/InvalidPayAmountException.java b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/ShawnDunsmore/InvalidPayAmountException.java new file mode 100644 index 000000000..9bc095fee --- /dev/null +++ b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/ShawnDunsmore/InvalidPayAmountException.java @@ -0,0 +1,10 @@ +package com.codedifferently.lesson16.ShawnDunsmore; + + +public class InvalidPayAmountException extends Exception { + + + public InvalidPayAmountException(String message) { + super(message); + } +} diff --git a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/ShawnDunsmore/SlotMachine.java b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/ShawnDunsmore/SlotMachine.java new file mode 100644 index 000000000..298f627f4 --- /dev/null +++ b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/ShawnDunsmore/SlotMachine.java @@ -0,0 +1,96 @@ +package com.codedifferently.lesson16.ShawnDunsmore; + + +import java.util.ArrayList; +import java.util.Collections; + + +public class SlotMachine { + private int numOfSlots; + private int payAmount; + private String name; + private BuyType buyType; + private ArrayList iconList; + private int moneyNeeded; + + + public SlotMachine( + int numOfSlots, + int payAmount, + String name, + BuyType buyType, + ArrayList iconList, + int moneyNeeded) { + this.numOfSlots = numOfSlots; + this.payAmount = payAmount; + this.name = name; + this.buyType = buyType; + this.iconList = iconList; + this.moneyNeeded = moneyNeeded; + } + + + public int getNumOfSlots() { + return numOfSlots; + } + + + public int getPayAmount() { + return payAmount; + } + public String getName() { + return name; + } + + + public BuyType getBuyType() { + return buyType; + } + + + public ArrayList getIconList() { + return iconList; + } + + + + + public int payOut() { + if (buyType.equals(BuyType.DOUBLE_CHANCE)) { + return payAmount * 2; + } + + + if (buyType.equals(BuyType.BONUS_BUY)) { + return payAmount * 3; + } + return payAmount; + } + + + public ArrayList spin(int money) throws InvalidPayAmountException { + if (money < moneyNeeded) { + throw new InvalidPayAmountException("Amount inavalid"); + } + Collections.shuffle(iconList); + return iconList; + } + + + public ArrayList spin(int money, int numOfSpins) throws InvalidPayAmountException { + if (money < moneyNeeded) { + throw new InvalidPayAmountException("Amount inavalid"); + } + for (int i = 0; i < numOfSpins; i++) { + Collections.shuffle(iconList); + } + + + return iconList; + } + + + public int getMoneyNeeded() { + return moneyNeeded; + } +} diff --git a/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/ShawnDunsmore/SlotMachineTest.java b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/ShawnDunsmore/SlotMachineTest.java new file mode 100644 index 000000000..253605cee --- /dev/null +++ b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/ShawnDunsmore/SlotMachineTest.java @@ -0,0 +1,76 @@ +package com.codedifferently.lesson16.ShawnDunsmore; + + +import static org.junit.jupiter.api.Assertions.assertEquals; + + +import java.util.ArrayList; +import org.junit.jupiter.api.Test; + + +public class SlotMachineTest { + @Test + public void testMoney_Exists() { + SlotMachine slot = new SlotMachine(0, 0, null, null, null, 10); + assertEquals(10, slot.getMoneyNeeded()); + } + + + @Test + public void testNumOfSlots_Exists() { + SlotMachine slot = new SlotMachine(1, 0, null, null, null, 10); + assertEquals(1, slot.getNumOfSlots()); + } + + + @Test + public void testNameOfSlot_Exists() { + SlotMachine slot = new SlotMachine(1, 0, "Goldie", null, null, 10); + assertEquals("Goldie", slot.getName()); + } + + + @Test + public void testPayAmount_Exists() { + SlotMachine slot = new SlotMachine(1, 10, "Goldie", null, null, 10); + assertEquals(10, slot.getPayAmount()); + } + + + @Test + public void testBuyType_Exists() { + SlotMachine slot = new SlotMachine(1, 10, "Goldie", null, null, 10); + assertEquals(null, slot.getBuyType()); + } + + + @Test + public void testUseDoubleSlots() { + SlotMachine slottwo = new SlotMachine(1, 10, "Goldie", null, null, 10); + SlotMachine slotone = new SlotMachine(1, 10, "Diamond", null, null, 10); + assertEquals(1, slotone.getNumOfSlots()); + assertEquals(1, slottwo.getNumOfSlots()); + } + + + @Test + public void testSlotSpin() { + SlotMachine slot = new SlotMachine(1, 10, "Goldie", null, null, 10); + assertEquals(null, slot.getIconList()); + } + + + @Test + public void testPayOut() { + + + ArrayList icons = new ArrayList<>(); + SlotMachine slotMachine1 = + new SlotMachine(1, 10, "Test Slot 1", BuyType.DOUBLE_CHANCE, icons, 10); + assertEquals(20, slotMachine1.payOut(), "Expected payout for DOUBLE_CHANCE to be 20"); + + + SlotMachine slotMachine2 = new SlotMachine(1, 10, "Test Slot 2", BuyType.BONUS_BUY, icons, 10); + assertEquals(30, slotMachine2.payOut(), "Expected payout for BONUS_BUY to be 30"); + } +} From 24359c0c5283b0925698bbcd9875e4e9e90563c6 Mon Sep 17 00:00:00 2001 From: Sdunsmore2006 Date: Fri, 1 Nov 2024 18:49:19 +0000 Subject: [PATCH 02/16] Added Spotless --- .../lesson16/ShawnDunsmore/BuyType.java | 7 +- .../InvalidPayAmountException.java | 8 +- .../lesson16/ShawnDunsmore/SlotMachine.java | 164 ++++++++---------- .../ShawnDunsmore/SlotMachineTest.java | 122 ++++++------- 4 files changed, 136 insertions(+), 165 deletions(-) diff --git a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/ShawnDunsmore/BuyType.java b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/ShawnDunsmore/BuyType.java index 4d1e19a72..aab8be64a 100644 --- a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/ShawnDunsmore/BuyType.java +++ b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/ShawnDunsmore/BuyType.java @@ -1,8 +1,7 @@ package com.codedifferently.lesson16.ShawnDunsmore; - public enum BuyType { - BONUS_BUY, - DOUBLE_CHANCE, - NORMAL_BUY, + BONUS_BUY, + DOUBLE_CHANCE, + NORMAL_BUY, } diff --git a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/ShawnDunsmore/InvalidPayAmountException.java b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/ShawnDunsmore/InvalidPayAmountException.java index 9bc095fee..dd4ce371e 100644 --- a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/ShawnDunsmore/InvalidPayAmountException.java +++ b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/ShawnDunsmore/InvalidPayAmountException.java @@ -1,10 +1,8 @@ package com.codedifferently.lesson16.ShawnDunsmore; - public class InvalidPayAmountException extends Exception { - - public InvalidPayAmountException(String message) { - super(message); - } + public InvalidPayAmountException(String message) { + super(message); + } } diff --git a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/ShawnDunsmore/SlotMachine.java b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/ShawnDunsmore/SlotMachine.java index 298f627f4..0dcff6b96 100644 --- a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/ShawnDunsmore/SlotMachine.java +++ b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/ShawnDunsmore/SlotMachine.java @@ -1,96 +1,82 @@ package com.codedifferently.lesson16.ShawnDunsmore; - import java.util.ArrayList; import java.util.Collections; - public class SlotMachine { - private int numOfSlots; - private int payAmount; - private String name; - private BuyType buyType; - private ArrayList iconList; - private int moneyNeeded; - - - public SlotMachine( - int numOfSlots, - int payAmount, - String name, - BuyType buyType, - ArrayList iconList, - int moneyNeeded) { - this.numOfSlots = numOfSlots; - this.payAmount = payAmount; - this.name = name; - this.buyType = buyType; - this.iconList = iconList; - this.moneyNeeded = moneyNeeded; - } - - - public int getNumOfSlots() { - return numOfSlots; - } - - - public int getPayAmount() { - return payAmount; - } - public String getName() { - return name; - } - - - public BuyType getBuyType() { - return buyType; - } - - - public ArrayList getIconList() { - return iconList; - } - - - - - public int payOut() { - if (buyType.equals(BuyType.DOUBLE_CHANCE)) { - return payAmount * 2; - } - - - if (buyType.equals(BuyType.BONUS_BUY)) { - return payAmount * 3; - } - return payAmount; - } - - - public ArrayList spin(int money) throws InvalidPayAmountException { - if (money < moneyNeeded) { - throw new InvalidPayAmountException("Amount inavalid"); - } - Collections.shuffle(iconList); - return iconList; - } - - - public ArrayList spin(int money, int numOfSpins) throws InvalidPayAmountException { - if (money < moneyNeeded) { - throw new InvalidPayAmountException("Amount inavalid"); - } - for (int i = 0; i < numOfSpins; i++) { - Collections.shuffle(iconList); - } - - - return iconList; - } - - - public int getMoneyNeeded() { - return moneyNeeded; - } + private int numOfSlots; + private int payAmount; + private String name; + private BuyType buyType; + private ArrayList iconList; + private int moneyNeeded; + + public SlotMachine( + int numOfSlots, + int payAmount, + String name, + BuyType buyType, + ArrayList iconList, + int moneyNeeded) { + this.numOfSlots = numOfSlots; + this.payAmount = payAmount; + this.name = name; + this.buyType = buyType; + this.iconList = iconList; + this.moneyNeeded = moneyNeeded; + } + + public int getNumOfSlots() { + return numOfSlots; + } + + public int getPayAmount() { + return payAmount; + } + + public String getName() { + return name; + } + + public BuyType getBuyType() { + return buyType; + } + + public ArrayList getIconList() { + return iconList; + } + + public int payOut() { + if (buyType.equals(BuyType.DOUBLE_CHANCE)) { + return payAmount * 2; + } + + if (buyType.equals(BuyType.BONUS_BUY)) { + return payAmount * 3; + } + return payAmount; + } + + public ArrayList spin(int money) throws InvalidPayAmountException { + if (money < moneyNeeded) { + throw new InvalidPayAmountException("Amount inavalid"); + } + Collections.shuffle(iconList); + return iconList; + } + + public ArrayList spin(int money, int numOfSpins) throws InvalidPayAmountException { + if (money < moneyNeeded) { + throw new InvalidPayAmountException("Amount inavalid"); + } + for (int i = 0; i < numOfSpins; i++) { + Collections.shuffle(iconList); + } + + return iconList; + } + + public int getMoneyNeeded() { + return moneyNeeded; + } } diff --git a/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/ShawnDunsmore/SlotMachineTest.java b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/ShawnDunsmore/SlotMachineTest.java index 253605cee..d63761125 100644 --- a/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/ShawnDunsmore/SlotMachineTest.java +++ b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/ShawnDunsmore/SlotMachineTest.java @@ -1,76 +1,64 @@ package com.codedifferently.lesson16.ShawnDunsmore; - import static org.junit.jupiter.api.Assertions.assertEquals; - import java.util.ArrayList; import org.junit.jupiter.api.Test; - public class SlotMachineTest { - @Test - public void testMoney_Exists() { - SlotMachine slot = new SlotMachine(0, 0, null, null, null, 10); - assertEquals(10, slot.getMoneyNeeded()); - } - - - @Test - public void testNumOfSlots_Exists() { - SlotMachine slot = new SlotMachine(1, 0, null, null, null, 10); - assertEquals(1, slot.getNumOfSlots()); - } - - - @Test - public void testNameOfSlot_Exists() { - SlotMachine slot = new SlotMachine(1, 0, "Goldie", null, null, 10); - assertEquals("Goldie", slot.getName()); - } - - - @Test - public void testPayAmount_Exists() { - SlotMachine slot = new SlotMachine(1, 10, "Goldie", null, null, 10); - assertEquals(10, slot.getPayAmount()); - } - - - @Test - public void testBuyType_Exists() { - SlotMachine slot = new SlotMachine(1, 10, "Goldie", null, null, 10); - assertEquals(null, slot.getBuyType()); - } - - - @Test - public void testUseDoubleSlots() { - SlotMachine slottwo = new SlotMachine(1, 10, "Goldie", null, null, 10); - SlotMachine slotone = new SlotMachine(1, 10, "Diamond", null, null, 10); - assertEquals(1, slotone.getNumOfSlots()); - assertEquals(1, slottwo.getNumOfSlots()); - } - - - @Test - public void testSlotSpin() { - SlotMachine slot = new SlotMachine(1, 10, "Goldie", null, null, 10); - assertEquals(null, slot.getIconList()); - } - - - @Test - public void testPayOut() { - - - ArrayList icons = new ArrayList<>(); - SlotMachine slotMachine1 = - new SlotMachine(1, 10, "Test Slot 1", BuyType.DOUBLE_CHANCE, icons, 10); - assertEquals(20, slotMachine1.payOut(), "Expected payout for DOUBLE_CHANCE to be 20"); - - - SlotMachine slotMachine2 = new SlotMachine(1, 10, "Test Slot 2", BuyType.BONUS_BUY, icons, 10); - assertEquals(30, slotMachine2.payOut(), "Expected payout for BONUS_BUY to be 30"); - } + @Test + public void testMoney_Exists() { + SlotMachine slot = new SlotMachine(0, 0, null, null, null, 10); + assertEquals(10, slot.getMoneyNeeded()); + } + + @Test + public void testNumOfSlots_Exists() { + SlotMachine slot = new SlotMachine(1, 0, null, null, null, 10); + assertEquals(1, slot.getNumOfSlots()); + } + + @Test + public void testNameOfSlot_Exists() { + SlotMachine slot = new SlotMachine(1, 0, "Goldie", null, null, 10); + assertEquals("Goldie", slot.getName()); + } + + @Test + public void testPayAmount_Exists() { + SlotMachine slot = new SlotMachine(1, 10, "Goldie", null, null, 10); + assertEquals(10, slot.getPayAmount()); + } + + @Test + public void testBuyType_Exists() { + SlotMachine slot = new SlotMachine(1, 10, "Goldie", null, null, 10); + assertEquals(null, slot.getBuyType()); + } + + @Test + public void testUseDoubleSlots() { + SlotMachine slottwo = new SlotMachine(1, 10, "Goldie", null, null, 10); + SlotMachine slotone = new SlotMachine(1, 10, "Diamond", null, null, 10); + assertEquals(1, slotone.getNumOfSlots()); + assertEquals(1, slottwo.getNumOfSlots()); + } + + @Test + public void testSlotSpin() { + SlotMachine slot = new SlotMachine(1, 10, "Goldie", null, null, 10); + assertEquals(null, slot.getIconList()); + } + + @Test + public void testPayOut() { + + ArrayList icons = new ArrayList<>(); + SlotMachine slotMachine1 = + new SlotMachine(1, 10, "Test Slot 1", BuyType.DOUBLE_CHANCE, icons, 10); + assertEquals(20, slotMachine1.payOut(), "Expected payout for DOUBLE_CHANCE to be 20"); + + SlotMachine slotMachine2 = new SlotMachine(1, 10, "Test Slot 2", BuyType.BONUS_BUY, icons, 10); + assertEquals(30, slotMachine2.payOut(), "Expected payout for BONUS_BUY to be 30"); + } } From 531ea2a6bea8ea3db424b36e7925fba261d900e9 Mon Sep 17 00:00:00 2001 From: Sdunsmore2006 Date: Fri, 1 Nov 2024 20:03:51 +0000 Subject: [PATCH 03/16] Feat: Adds Shawn Dunsmore Jr lesson 16 91 Percent Coverage --- .../objects/objects_app/build.gradle.kts | 3 ++- .../lesson16/ShawnDunsmore/SlotMachine.java | 19 ------------------- 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/lesson_16/objects/objects_app/build.gradle.kts b/lesson_16/objects/objects_app/build.gradle.kts index 3c9abdd3c..239f79a89 100644 --- a/lesson_16/objects/objects_app/build.gradle.kts +++ b/lesson_16/objects/objects_app/build.gradle.kts @@ -43,7 +43,8 @@ tasks.named("test") { tasks.jacocoTestReport { dependsOn(tasks.test) reports { - xml.required = true +xml.required.set(true) + } } diff --git a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/ShawnDunsmore/SlotMachine.java b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/ShawnDunsmore/SlotMachine.java index 0dcff6b96..8d8739709 100644 --- a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/ShawnDunsmore/SlotMachine.java +++ b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/ShawnDunsmore/SlotMachine.java @@ -1,7 +1,6 @@ package com.codedifferently.lesson16.ShawnDunsmore; import java.util.ArrayList; -import java.util.Collections; public class SlotMachine { private int numOfSlots; @@ -57,24 +56,6 @@ public int payOut() { return payAmount; } - public ArrayList spin(int money) throws InvalidPayAmountException { - if (money < moneyNeeded) { - throw new InvalidPayAmountException("Amount inavalid"); - } - Collections.shuffle(iconList); - return iconList; - } - - public ArrayList spin(int money, int numOfSpins) throws InvalidPayAmountException { - if (money < moneyNeeded) { - throw new InvalidPayAmountException("Amount inavalid"); - } - for (int i = 0; i < numOfSpins; i++) { - Collections.shuffle(iconList); - } - - return iconList; - } public int getMoneyNeeded() { return moneyNeeded; From c7713a4b0d3d38b3d54387efd8aaac54e599c796 Mon Sep 17 00:00:00 2001 From: Sdunsmore2006 Date: Fri, 1 Nov 2024 20:05:49 +0000 Subject: [PATCH 04/16] Feat: Adds Shawn Dunsmore Jr Added Spotless --- .../com/codedifferently/lesson16/ShawnDunsmore/SlotMachine.java | 1 - 1 file changed, 1 deletion(-) diff --git a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/ShawnDunsmore/SlotMachine.java b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/ShawnDunsmore/SlotMachine.java index 8d8739709..d1d7c7316 100644 --- a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/ShawnDunsmore/SlotMachine.java +++ b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/ShawnDunsmore/SlotMachine.java @@ -56,7 +56,6 @@ public int payOut() { return payAmount; } - public int getMoneyNeeded() { return moneyNeeded; } From e776a625fa243d9ecc5ffe2b48671e75879d8550 Mon Sep 17 00:00:00 2001 From: Sdunsmore2006 Date: Fri, 1 Nov 2024 20:52:43 +0000 Subject: [PATCH 05/16] Feat: Adds Shawn Dunsmore Jr lesson 16 Added For Loop and Test --- .../lesson16/ShawnDunsmore/SlotMachine.java | 45 +++++++++ .../ShawnDunsmore/SlotMachineTest.java | 98 ++++++++++++++++++- 2 files changed, 142 insertions(+), 1 deletion(-) diff --git a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/ShawnDunsmore/SlotMachine.java b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/ShawnDunsmore/SlotMachine.java index d1d7c7316..74dfbcb6c 100644 --- a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/ShawnDunsmore/SlotMachine.java +++ b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/ShawnDunsmore/SlotMachine.java @@ -1,6 +1,7 @@ package com.codedifferently.lesson16.ShawnDunsmore; import java.util.ArrayList; +import java.util.Collections; public class SlotMachine { private int numOfSlots; @@ -56,7 +57,51 @@ public int payOut() { return payAmount; } + public ArrayList spin(int money) throws InvalidPayAmountException { + if (money < moneyNeeded) { + throw new InvalidPayAmountException("Amount inavalid"); + } + Collections.shuffle(iconList); + return iconList; + } + + public ArrayList spin(int money, int numOfSpins) throws InvalidPayAmountException { + if (money < moneyNeeded) { + throw new InvalidPayAmountException("Amount inavalid"); + } + for (int i = 0; i < numOfSpins; i++) { + Collections.shuffle(iconList); + } + + return iconList; + } + public int getMoneyNeeded() { return moneyNeeded; } + + public void setNumOfSlots(int numOfSlots) { + this.numOfSlots = numOfSlots; + } + + public void setPayAmount(int payAmount) { + this.payAmount = payAmount; + } + + public void setName(String name) { + this.name = name; + } + + public void setBuyType(BuyType buyType) { + this.buyType = buyType; + } + + public void setIconList(ArrayList iconList) { + this.iconList = iconList; + } + + public void setMoneyNeeded(int moneyNeeded) { + this.moneyNeeded = moneyNeeded; + } + } diff --git a/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/ShawnDunsmore/SlotMachineTest.java b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/ShawnDunsmore/SlotMachineTest.java index d63761125..08e156ffd 100644 --- a/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/ShawnDunsmore/SlotMachineTest.java +++ b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/ShawnDunsmore/SlotMachineTest.java @@ -1,7 +1,8 @@ package com.codedifferently.lesson16.ShawnDunsmore; import static org.junit.jupiter.api.Assertions.assertEquals; - +import static org.junit.jupiter.api.Assertions.assertThrows; +import java.util.Collections; import java.util.ArrayList; import org.junit.jupiter.api.Test; @@ -61,4 +62,99 @@ public void testPayOut() { SlotMachine slotMachine2 = new SlotMachine(1, 10, "Test Slot 2", BuyType.BONUS_BUY, icons, 10); assertEquals(30, slotMachine2.payOut(), "Expected payout for BONUS_BUY to be 30"); } + @Test + public void testSetNumOfSlots() { + SlotMachine slotMachine = new SlotMachine(3, 10, "Test Slot", BuyType.NORMAL_BUY, new ArrayList<>(), 10); + + slotMachine.setNumOfSlots(5); + + assertEquals(5, slotMachine.getNumOfSlots(), "The number of slots should be updated to 5"); + } + @Test + public void testSetPayAmount() { + SlotMachine slotMachine = new SlotMachine(3, 10, "Test Slot", BuyType.NORMAL_BUY, new ArrayList<>(), 10); + + slotMachine.setPayAmount(20); + + assertEquals(20, slotMachine.getPayAmount(), "The pay amount should be updated to 20"); + } + + @Test + public void testSetName() { + SlotMachine slotMachine = new SlotMachine(3, 10, "Test Slot", BuyType.NORMAL_BUY, new ArrayList<>(), 10); + + slotMachine.setName("Lucky Slot"); + + assertEquals("Lucky Slot", slotMachine.getName(), "The name should be updated to 'Lucky Slot'"); + } + + @Test + public void testSetBuyType() { + SlotMachine slotMachine = new SlotMachine(3, 10, "Test Slot", BuyType.NORMAL_BUY, new ArrayList<>(), 10); + + slotMachine.setBuyType(BuyType.BONUS_BUY); + + assertEquals(BuyType.BONUS_BUY, slotMachine.getBuyType(), "The buy type should be updated to BONUS_BUY"); + } + @Test + public void testSetIconList() { + SlotMachine slotMachine = new SlotMachine(3, 10, "Test Slot", BuyType.NORMAL_BUY, new ArrayList<>(), 10); + + ArrayList newIcons = new ArrayList<>(); + newIcons.add("🍒"); + newIcons.add("🍋"); + newIcons.add("🍊"); + + slotMachine.setIconList(newIcons); + + assertEquals(newIcons, slotMachine.getIconList(), "The icon list should be updated with the new icons"); + } + + @Test + public void testSetMoneyNeeded() { + SlotMachine slotMachine = new SlotMachine(3, 10, "Test Slot", BuyType.NORMAL_BUY, new ArrayList<>(), 10); + + slotMachine.setMoneyNeeded(15); + + assertEquals(15, slotMachine.getMoneyNeeded(), "The money needed should be updated to 15"); + } + @Test + public void testSpinThrowsExceptionWhenMoneyIsInsufficient() { + ArrayList icons = new ArrayList<>(); + icons.add("🍒"); + icons.add("🍋"); + icons.add("🍊"); + + SlotMachine slotMachine = new SlotMachine(3, 10, "Test Slot", BuyType.NORMAL_BUY, icons, 10); + + Exception exception = assertThrows(InvalidPayAmountException.class, () -> { + slotMachine.spin(5); + }); + + assertEquals("Amount inavalid", exception.getMessage()); + } + + @Test + public void testSpinShufflesIconList() throws InvalidPayAmountException { + ArrayList icons = new ArrayList<>(); + icons.add("🍒"); + icons.add("🍋"); + icons.add("🍊"); + + SlotMachine slotMachine = new SlotMachine(3, 10, "Test Slot", BuyType.NORMAL_BUY, icons, 10); + + ArrayList originalIcons = new ArrayList<>(slotMachine.getIconList()); + + slotMachine.spin(10); + + ArrayList shuffledIcons = slotMachine.getIconList(); + + Collections.sort(originalIcons); + Collections.sort(shuffledIcons); + + assertEquals(originalIcons, shuffledIcons, "The icon list should have the same contents after spinning"); + } } + + + From 5bdc97aa0758fb0c3a397a66365ea505934426d8 Mon Sep 17 00:00:00 2001 From: Sdunsmore2006 Date: Fri, 1 Nov 2024 21:01:18 +0000 Subject: [PATCH 06/16] Feat: Adds Shawn Dunsmore Jr Added Spotless --- .../lesson16/ShawnDunsmore/SlotMachine.java | 1 - .../ShawnDunsmore/SlotMachineTest.java | 150 ++++++++++-------- 2 files changed, 82 insertions(+), 69 deletions(-) diff --git a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/ShawnDunsmore/SlotMachine.java b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/ShawnDunsmore/SlotMachine.java index 74dfbcb6c..aad7cb997 100644 --- a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/ShawnDunsmore/SlotMachine.java +++ b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/ShawnDunsmore/SlotMachine.java @@ -103,5 +103,4 @@ public void setIconList(ArrayList iconList) { public void setMoneyNeeded(int moneyNeeded) { this.moneyNeeded = moneyNeeded; } - } diff --git a/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/ShawnDunsmore/SlotMachineTest.java b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/ShawnDunsmore/SlotMachineTest.java index 08e156ffd..99c555ebd 100644 --- a/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/ShawnDunsmore/SlotMachineTest.java +++ b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/ShawnDunsmore/SlotMachineTest.java @@ -2,8 +2,9 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; -import java.util.Collections; + import java.util.ArrayList; +import java.util.Collections; import org.junit.jupiter.api.Test; public class SlotMachineTest { @@ -62,99 +63,112 @@ public void testPayOut() { SlotMachine slotMachine2 = new SlotMachine(1, 10, "Test Slot 2", BuyType.BONUS_BUY, icons, 10); assertEquals(30, slotMachine2.payOut(), "Expected payout for BONUS_BUY to be 30"); } + @Test - public void testSetNumOfSlots() { - SlotMachine slotMachine = new SlotMachine(3, 10, "Test Slot", BuyType.NORMAL_BUY, new ArrayList<>(), 10); + public void testSetNumOfSlots() { + SlotMachine slotMachine = + new SlotMachine(3, 10, "Test Slot", BuyType.NORMAL_BUY, new ArrayList<>(), 10); - slotMachine.setNumOfSlots(5); + slotMachine.setNumOfSlots(5); - assertEquals(5, slotMachine.getNumOfSlots(), "The number of slots should be updated to 5"); - } - @Test - public void testSetPayAmount() { - SlotMachine slotMachine = new SlotMachine(3, 10, "Test Slot", BuyType.NORMAL_BUY, new ArrayList<>(), 10); + assertEquals(5, slotMachine.getNumOfSlots(), "The number of slots should be updated to 5"); + } - slotMachine.setPayAmount(20); + @Test + public void testSetPayAmount() { + SlotMachine slotMachine = + new SlotMachine(3, 10, "Test Slot", BuyType.NORMAL_BUY, new ArrayList<>(), 10); - assertEquals(20, slotMachine.getPayAmount(), "The pay amount should be updated to 20"); - } + slotMachine.setPayAmount(20); - @Test - public void testSetName() { - SlotMachine slotMachine = new SlotMachine(3, 10, "Test Slot", BuyType.NORMAL_BUY, new ArrayList<>(), 10); + assertEquals(20, slotMachine.getPayAmount(), "The pay amount should be updated to 20"); + } - slotMachine.setName("Lucky Slot"); + @Test + public void testSetName() { + SlotMachine slotMachine = + new SlotMachine(3, 10, "Test Slot", BuyType.NORMAL_BUY, new ArrayList<>(), 10); - assertEquals("Lucky Slot", slotMachine.getName(), "The name should be updated to 'Lucky Slot'"); - } + slotMachine.setName("Lucky Slot"); - @Test - public void testSetBuyType() { - SlotMachine slotMachine = new SlotMachine(3, 10, "Test Slot", BuyType.NORMAL_BUY, new ArrayList<>(), 10); + assertEquals("Lucky Slot", slotMachine.getName(), "The name should be updated to 'Lucky Slot'"); + } - slotMachine.setBuyType(BuyType.BONUS_BUY); + @Test + public void testSetBuyType() { + SlotMachine slotMachine = + new SlotMachine(3, 10, "Test Slot", BuyType.NORMAL_BUY, new ArrayList<>(), 10); - assertEquals(BuyType.BONUS_BUY, slotMachine.getBuyType(), "The buy type should be updated to BONUS_BUY"); - } - @Test - public void testSetIconList() { - SlotMachine slotMachine = new SlotMachine(3, 10, "Test Slot", BuyType.NORMAL_BUY, new ArrayList<>(), 10); + slotMachine.setBuyType(BuyType.BONUS_BUY); - ArrayList newIcons = new ArrayList<>(); - newIcons.add("🍒"); - newIcons.add("🍋"); - newIcons.add("🍊"); + assertEquals( + BuyType.BONUS_BUY, slotMachine.getBuyType(), "The buy type should be updated to BONUS_BUY"); + } + + @Test + public void testSetIconList() { + SlotMachine slotMachine = + new SlotMachine(3, 10, "Test Slot", BuyType.NORMAL_BUY, new ArrayList<>(), 10); - slotMachine.setIconList(newIcons); + ArrayList newIcons = new ArrayList<>(); + newIcons.add("🍒"); + newIcons.add("🍋"); + newIcons.add("🍊"); - assertEquals(newIcons, slotMachine.getIconList(), "The icon list should be updated with the new icons"); - } + slotMachine.setIconList(newIcons); - @Test - public void testSetMoneyNeeded() { - SlotMachine slotMachine = new SlotMachine(3, 10, "Test Slot", BuyType.NORMAL_BUY, new ArrayList<>(), 10); + assertEquals( + newIcons, slotMachine.getIconList(), "The icon list should be updated with the new icons"); + } - slotMachine.setMoneyNeeded(15); + @Test + public void testSetMoneyNeeded() { + SlotMachine slotMachine = + new SlotMachine(3, 10, "Test Slot", BuyType.NORMAL_BUY, new ArrayList<>(), 10); - assertEquals(15, slotMachine.getMoneyNeeded(), "The money needed should be updated to 15"); - } - @Test - public void testSpinThrowsExceptionWhenMoneyIsInsufficient() { - ArrayList icons = new ArrayList<>(); - icons.add("🍒"); - icons.add("🍋"); - icons.add("🍊"); + slotMachine.setMoneyNeeded(15); - SlotMachine slotMachine = new SlotMachine(3, 10, "Test Slot", BuyType.NORMAL_BUY, icons, 10); + assertEquals(15, slotMachine.getMoneyNeeded(), "The money needed should be updated to 15"); + } - Exception exception = assertThrows(InvalidPayAmountException.class, () -> { - slotMachine.spin(5); - }); + @Test + public void testSpinThrowsExceptionWhenMoneyIsInsufficient() { + ArrayList icons = new ArrayList<>(); + icons.add("🍒"); + icons.add("🍋"); + icons.add("🍊"); - assertEquals("Amount inavalid", exception.getMessage()); - } + SlotMachine slotMachine = new SlotMachine(3, 10, "Test Slot", BuyType.NORMAL_BUY, icons, 10); - @Test - public void testSpinShufflesIconList() throws InvalidPayAmountException { - ArrayList icons = new ArrayList<>(); - icons.add("🍒"); - icons.add("🍋"); - icons.add("🍊"); + Exception exception = + assertThrows( + InvalidPayAmountException.class, + () -> { + slotMachine.spin(5); + }); - SlotMachine slotMachine = new SlotMachine(3, 10, "Test Slot", BuyType.NORMAL_BUY, icons, 10); + assertEquals("Amount inavalid", exception.getMessage()); + } - ArrayList originalIcons = new ArrayList<>(slotMachine.getIconList()); + @Test + public void testSpinShufflesIconList() throws InvalidPayAmountException { + ArrayList icons = new ArrayList<>(); + icons.add("🍒"); + icons.add("🍋"); + icons.add("🍊"); - slotMachine.spin(10); + SlotMachine slotMachine = new SlotMachine(3, 10, "Test Slot", BuyType.NORMAL_BUY, icons, 10); - ArrayList shuffledIcons = slotMachine.getIconList(); + ArrayList originalIcons = new ArrayList<>(slotMachine.getIconList()); - Collections.sort(originalIcons); - Collections.sort(shuffledIcons); + slotMachine.spin(10); - assertEquals(originalIcons, shuffledIcons, "The icon list should have the same contents after spinning"); - } -} - + ArrayList shuffledIcons = slotMachine.getIconList(); + Collections.sort(originalIcons); + Collections.sort(shuffledIcons); + assertEquals( + originalIcons, shuffledIcons, "The icon list should have the same contents after spinning"); + } +} From 7859007fceae81d3320cbce133cea7f7f0448521 Mon Sep 17 00:00:00 2001 From: Sdunsmore2006 Date: Wed, 13 Nov 2024 14:29:03 -0500 Subject: [PATCH 07/16] Adds Fixed Changed --- lesson_16/objects/objects_app/build.gradle.kts | 4 ++-- .../code-differently-24-q4.code-workspace | 15 +++++++++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/ShawnDunsmore/code-differently-24-q4.code-workspace diff --git a/lesson_16/objects/objects_app/build.gradle.kts b/lesson_16/objects/objects_app/build.gradle.kts index 239f79a89..fe443c400 100644 --- a/lesson_16/objects/objects_app/build.gradle.kts +++ b/lesson_16/objects/objects_app/build.gradle.kts @@ -43,8 +43,8 @@ tasks.named("test") { tasks.jacocoTestReport { dependsOn(tasks.test) reports { -xml.required.set(true) - + xml.required = true + } } diff --git a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/ShawnDunsmore/code-differently-24-q4.code-workspace b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/ShawnDunsmore/code-differently-24-q4.code-workspace new file mode 100644 index 000000000..b66c12449 --- /dev/null +++ b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/ShawnDunsmore/code-differently-24-q4.code-workspace @@ -0,0 +1,15 @@ +{ + "folders": [ + { + "path": "../../../../../../../../../.." + }, + { + "path": "../../../../../../../../.." + } + ], + "settings": { + "java.configuration.updateBuildConfiguration": "automatic", + "java.compile.nullAnalysis.mode": "automatic", + "liveServer.settings.multiRootWorkspaceName": "code-differently-24-q4" + } +} \ No newline at end of file From 6a7cf15b0a93eb9f166d7c550f420596119b4f38 Mon Sep 17 00:00:00 2001 From: Sdunsmore2006 Date: Wed, 13 Nov 2024 15:18:21 -0500 Subject: [PATCH 08/16] refactor: proper casing --- .../com/codedifferently/lesson16/ShawnDunsmore/BuyType.java | 2 +- .../lesson16/ShawnDunsmore/InvalidPayAmountException.java | 2 +- .../codedifferently/lesson16/ShawnDunsmore/SlotMachine.java | 2 +- .../lesson16/ShawnDunsmore/SlotMachineTest.java | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/ShawnDunsmore/BuyType.java b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/ShawnDunsmore/BuyType.java index aab8be64a..f29599cd1 100644 --- a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/ShawnDunsmore/BuyType.java +++ b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/ShawnDunsmore/BuyType.java @@ -1,4 +1,4 @@ -package com.codedifferently.lesson16.ShawnDunsmore; +package com.codedifferently.lesson16.shawndunsmore; public enum BuyType { BONUS_BUY, diff --git a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/ShawnDunsmore/InvalidPayAmountException.java b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/ShawnDunsmore/InvalidPayAmountException.java index dd4ce371e..df082503a 100644 --- a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/ShawnDunsmore/InvalidPayAmountException.java +++ b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/ShawnDunsmore/InvalidPayAmountException.java @@ -1,4 +1,4 @@ -package com.codedifferently.lesson16.ShawnDunsmore; +package com.codedifferently.lesson16.shawndunsmore; public class InvalidPayAmountException extends Exception { diff --git a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/ShawnDunsmore/SlotMachine.java b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/ShawnDunsmore/SlotMachine.java index aad7cb997..1dbc998bd 100644 --- a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/ShawnDunsmore/SlotMachine.java +++ b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/ShawnDunsmore/SlotMachine.java @@ -1,4 +1,4 @@ -package com.codedifferently.lesson16.ShawnDunsmore; +package com.codedifferently.lesson16.shawndunsmore; import java.util.ArrayList; import java.util.Collections; diff --git a/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/ShawnDunsmore/SlotMachineTest.java b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/ShawnDunsmore/SlotMachineTest.java index 99c555ebd..63f309465 100644 --- a/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/ShawnDunsmore/SlotMachineTest.java +++ b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/ShawnDunsmore/SlotMachineTest.java @@ -1,10 +1,11 @@ -package com.codedifferently.lesson16.ShawnDunsmore; +package com.codedifferently.lesson16.shawndunsmore; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; import java.util.ArrayList; import java.util.Collections; + import org.junit.jupiter.api.Test; public class SlotMachineTest { From 168048285ac2af388dae3fc113a0081597521aa6 Mon Sep 17 00:00:00 2001 From: Sdunsmore2006 Date: Wed, 13 Nov 2024 15:19:36 -0500 Subject: [PATCH 09/16] refactor: tab --- lesson_16/objects/objects_app/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lesson_16/objects/objects_app/build.gradle.kts b/lesson_16/objects/objects_app/build.gradle.kts index fe443c400..56b74a292 100644 --- a/lesson_16/objects/objects_app/build.gradle.kts +++ b/lesson_16/objects/objects_app/build.gradle.kts @@ -43,7 +43,7 @@ tasks.named("test") { tasks.jacocoTestReport { dependsOn(tasks.test) reports { - xml.required = true + xml.required = true } } From 8febffe2abe420df009e137ff983e32ead28bdc1 Mon Sep 17 00:00:00 2001 From: Sdunsmore2006 Date: Wed, 13 Nov 2024 15:23:21 -0500 Subject: [PATCH 10/16] Removes File Live Server --- .../code-differently-24-q4.code-workspace | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/ShawnDunsmore/code-differently-24-q4.code-workspace diff --git a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/ShawnDunsmore/code-differently-24-q4.code-workspace b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/ShawnDunsmore/code-differently-24-q4.code-workspace deleted file mode 100644 index b66c12449..000000000 --- a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/ShawnDunsmore/code-differently-24-q4.code-workspace +++ /dev/null @@ -1,15 +0,0 @@ -{ - "folders": [ - { - "path": "../../../../../../../../../.." - }, - { - "path": "../../../../../../../../.." - } - ], - "settings": { - "java.configuration.updateBuildConfiguration": "automatic", - "java.compile.nullAnalysis.mode": "automatic", - "liveServer.settings.multiRootWorkspaceName": "code-differently-24-q4" - } -} \ No newline at end of file From cd338d3369e3adc3443caf4755b8d314b6ef86bc Mon Sep 17 00:00:00 2001 From: Sdunsmore2006 Date: Wed, 13 Nov 2024 20:55:08 +0000 Subject: [PATCH 11/16] feat: removed files --- .../objects/objects_app/build.gradle.kts | 2 +- .../lesson16/ShawnDunsmore/BuyType.java | 7 -- .../InvalidPayAmountException.java | 8 -- .../lesson16/ShawnDunsmore/SlotMachine.java | 106 ------------------ 4 files changed, 1 insertion(+), 122 deletions(-) delete mode 100644 lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/ShawnDunsmore/BuyType.java delete mode 100644 lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/ShawnDunsmore/InvalidPayAmountException.java delete mode 100644 lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/ShawnDunsmore/SlotMachine.java diff --git a/lesson_16/objects/objects_app/build.gradle.kts b/lesson_16/objects/objects_app/build.gradle.kts index 56b74a292..4d40fd4c4 100644 --- a/lesson_16/objects/objects_app/build.gradle.kts +++ b/lesson_16/objects/objects_app/build.gradle.kts @@ -43,7 +43,7 @@ tasks.named("test") { tasks.jacocoTestReport { dependsOn(tasks.test) reports { - xml.required = true + xml.required = true } } diff --git a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/ShawnDunsmore/BuyType.java b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/ShawnDunsmore/BuyType.java deleted file mode 100644 index f29599cd1..000000000 --- a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/ShawnDunsmore/BuyType.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.codedifferently.lesson16.shawndunsmore; - -public enum BuyType { - BONUS_BUY, - DOUBLE_CHANCE, - NORMAL_BUY, -} diff --git a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/ShawnDunsmore/InvalidPayAmountException.java b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/ShawnDunsmore/InvalidPayAmountException.java deleted file mode 100644 index df082503a..000000000 --- a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/ShawnDunsmore/InvalidPayAmountException.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.codedifferently.lesson16.shawndunsmore; - -public class InvalidPayAmountException extends Exception { - - public InvalidPayAmountException(String message) { - super(message); - } -} diff --git a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/ShawnDunsmore/SlotMachine.java b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/ShawnDunsmore/SlotMachine.java deleted file mode 100644 index 1dbc998bd..000000000 --- a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/ShawnDunsmore/SlotMachine.java +++ /dev/null @@ -1,106 +0,0 @@ -package com.codedifferently.lesson16.shawndunsmore; - -import java.util.ArrayList; -import java.util.Collections; - -public class SlotMachine { - private int numOfSlots; - private int payAmount; - private String name; - private BuyType buyType; - private ArrayList iconList; - private int moneyNeeded; - - public SlotMachine( - int numOfSlots, - int payAmount, - String name, - BuyType buyType, - ArrayList iconList, - int moneyNeeded) { - this.numOfSlots = numOfSlots; - this.payAmount = payAmount; - this.name = name; - this.buyType = buyType; - this.iconList = iconList; - this.moneyNeeded = moneyNeeded; - } - - public int getNumOfSlots() { - return numOfSlots; - } - - public int getPayAmount() { - return payAmount; - } - - public String getName() { - return name; - } - - public BuyType getBuyType() { - return buyType; - } - - public ArrayList getIconList() { - return iconList; - } - - public int payOut() { - if (buyType.equals(BuyType.DOUBLE_CHANCE)) { - return payAmount * 2; - } - - if (buyType.equals(BuyType.BONUS_BUY)) { - return payAmount * 3; - } - return payAmount; - } - - public ArrayList spin(int money) throws InvalidPayAmountException { - if (money < moneyNeeded) { - throw new InvalidPayAmountException("Amount inavalid"); - } - Collections.shuffle(iconList); - return iconList; - } - - public ArrayList spin(int money, int numOfSpins) throws InvalidPayAmountException { - if (money < moneyNeeded) { - throw new InvalidPayAmountException("Amount inavalid"); - } - for (int i = 0; i < numOfSpins; i++) { - Collections.shuffle(iconList); - } - - return iconList; - } - - public int getMoneyNeeded() { - return moneyNeeded; - } - - public void setNumOfSlots(int numOfSlots) { - this.numOfSlots = numOfSlots; - } - - public void setPayAmount(int payAmount) { - this.payAmount = payAmount; - } - - public void setName(String name) { - this.name = name; - } - - public void setBuyType(BuyType buyType) { - this.buyType = buyType; - } - - public void setIconList(ArrayList iconList) { - this.iconList = iconList; - } - - public void setMoneyNeeded(int moneyNeeded) { - this.moneyNeeded = moneyNeeded; - } -} From f3bb8603c4b250a1372c4bd1a64d3b15228cfc39 Mon Sep 17 00:00:00 2001 From: Sdunsmore2006 Date: Wed, 13 Nov 2024 20:57:07 +0000 Subject: [PATCH 12/16] refactor: lowercase --- .../lesson16/shawndunsmore/BuyType.java | 7 ++ .../InvalidPayAmountException.java | 9 ++ .../lesson16/shawndunsmore/SlotMachine.java | 106 ++++++++++++++++++ 3 files changed, 122 insertions(+) create mode 100644 lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/shawndunsmore/BuyType.java create mode 100644 lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/shawndunsmore/InvalidPayAmountException.java create mode 100644 lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/shawndunsmore/SlotMachine.java diff --git a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/shawndunsmore/BuyType.java b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/shawndunsmore/BuyType.java new file mode 100644 index 000000000..acd051186 --- /dev/null +++ b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/shawndunsmore/BuyType.java @@ -0,0 +1,7 @@ +package com.codedifferently.lesson16.shawndunsmore; + +public enum BuyType { + BONUS_BUY, + DOUBLE_CHANCE, + NORMAL_BUY, +} \ No newline at end of file diff --git a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/shawndunsmore/InvalidPayAmountException.java b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/shawndunsmore/InvalidPayAmountException.java new file mode 100644 index 000000000..ac6260252 --- /dev/null +++ b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/shawndunsmore/InvalidPayAmountException.java @@ -0,0 +1,9 @@ +package com.codedifferently.lesson16.shawndunsmore; + +public class InvalidPayAmountException extends Exception { + + public InvalidPayAmountException(String message) { + super(message); + } +} + diff --git a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/shawndunsmore/SlotMachine.java b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/shawndunsmore/SlotMachine.java new file mode 100644 index 000000000..bf496c571 --- /dev/null +++ b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/shawndunsmore/SlotMachine.java @@ -0,0 +1,106 @@ +package com.codedifferently.lesson16.shawndunsmore; + +import java.util.ArrayList; +import java.util.Collections; + +public class SlotMachine { + private int numOfSlots; + private int payAmount; + private String name; + private BuyType buyType; + private ArrayList iconList; + private int moneyNeeded; + + public SlotMachine( + int numOfSlots, + int payAmount, + String name, + BuyType buyType, + ArrayList iconList, + int moneyNeeded) { + this.numOfSlots = numOfSlots; + this.payAmount = payAmount; + this.name = name; + this.buyType = buyType; + this.iconList = iconList; + this.moneyNeeded = moneyNeeded; + } + + public int getNumOfSlots() { + return numOfSlots; + } + + public int getPayAmount() { + return payAmount; + } + + public String getName() { + return name; + } + + public BuyType getBuyType() { + return buyType; + } + + public ArrayList getIconList() { + return iconList; + } + + public int payOut() { + if (buyType.equals(BuyType.DOUBLE_CHANCE)) { + return payAmount * 2; + } + + if (buyType.equals(BuyType.BONUS_BUY)) { + return payAmount * 3; + } + return payAmount; + } + + public ArrayList spin(int money) throws InvalidPayAmountException { + if (money < moneyNeeded) { + throw new InvalidPayAmountException("Amount inavalid"); + } + Collections.shuffle(iconList); + return iconList; + } + + public ArrayList spin(int money, int numOfSpins) throws InvalidPayAmountException { + if (money < moneyNeeded) { + throw new InvalidPayAmountException("Amount inavalid"); + } + for (int i = 0; i < numOfSpins; i++) { + Collections.shuffle(iconList); + } + + return iconList; + } + + public int getMoneyNeeded() { + return moneyNeeded; + } + + public void setNumOfSlots(int numOfSlots) { + this.numOfSlots = numOfSlots; + } + + public void setPayAmount(int payAmount) { + this.payAmount = payAmount; + } + + public void setName(String name) { + this.name = name; + } + + public void setBuyType(BuyType buyType) { + this.buyType = buyType; + } + + public void setIconList(ArrayList iconList) { + this.iconList = iconList; + } + + public void setMoneyNeeded(int moneyNeeded) { + this.moneyNeeded = moneyNeeded; + } +} \ No newline at end of file From 7afa9a714c83477dd5161e8931545b5d8f9fd590 Mon Sep 17 00:00:00 2001 From: Sdunsmore2006 Date: Wed, 13 Nov 2024 21:03:10 +0000 Subject: [PATCH 13/16] refactor: spacing --- lesson_16/objects/objects_app/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lesson_16/objects/objects_app/build.gradle.kts b/lesson_16/objects/objects_app/build.gradle.kts index 4d40fd4c4..56b74a292 100644 --- a/lesson_16/objects/objects_app/build.gradle.kts +++ b/lesson_16/objects/objects_app/build.gradle.kts @@ -43,7 +43,7 @@ tasks.named("test") { tasks.jacocoTestReport { dependsOn(tasks.test) reports { - xml.required = true + xml.required = true } } From ccded0cc2965712f603388531665b07ba612f2db Mon Sep 17 00:00:00 2001 From: Sdunsmore2006 Date: Wed, 13 Nov 2024 21:07:15 +0000 Subject: [PATCH 14/16] Adds fixed changes --- .../com/codedifferently/lesson16/shawndunsmore/BuyType.java | 2 +- .../lesson16/shawndunsmore/InvalidPayAmountException.java | 1 - .../com/codedifferently/lesson16/shawndunsmore/SlotMachine.java | 2 +- .../codedifferently/lesson16/ShawnDunsmore/SlotMachineTest.java | 1 - 4 files changed, 2 insertions(+), 4 deletions(-) diff --git a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/shawndunsmore/BuyType.java b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/shawndunsmore/BuyType.java index acd051186..f29599cd1 100644 --- a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/shawndunsmore/BuyType.java +++ b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/shawndunsmore/BuyType.java @@ -4,4 +4,4 @@ public enum BuyType { BONUS_BUY, DOUBLE_CHANCE, NORMAL_BUY, -} \ No newline at end of file +} diff --git a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/shawndunsmore/InvalidPayAmountException.java b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/shawndunsmore/InvalidPayAmountException.java index ac6260252..df082503a 100644 --- a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/shawndunsmore/InvalidPayAmountException.java +++ b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/shawndunsmore/InvalidPayAmountException.java @@ -6,4 +6,3 @@ public InvalidPayAmountException(String message) { super(message); } } - diff --git a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/shawndunsmore/SlotMachine.java b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/shawndunsmore/SlotMachine.java index bf496c571..1dbc998bd 100644 --- a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/shawndunsmore/SlotMachine.java +++ b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/shawndunsmore/SlotMachine.java @@ -103,4 +103,4 @@ public void setIconList(ArrayList iconList) { public void setMoneyNeeded(int moneyNeeded) { this.moneyNeeded = moneyNeeded; } -} \ No newline at end of file +} diff --git a/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/ShawnDunsmore/SlotMachineTest.java b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/ShawnDunsmore/SlotMachineTest.java index 63f309465..be5cc64b5 100644 --- a/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/ShawnDunsmore/SlotMachineTest.java +++ b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/ShawnDunsmore/SlotMachineTest.java @@ -5,7 +5,6 @@ import java.util.ArrayList; import java.util.Collections; - import org.junit.jupiter.api.Test; public class SlotMachineTest { From 12354746200ab5e7646b543497b082b46bbce735 Mon Sep 17 00:00:00 2001 From: Sdunsmore2006 Date: Wed, 13 Nov 2024 16:10:28 -0500 Subject: [PATCH 15/16] Update build.gradle.kts --- lesson_16/objects/objects_app/build.gradle.kts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lesson_16/objects/objects_app/build.gradle.kts b/lesson_16/objects/objects_app/build.gradle.kts index 56b74a292..f13484376 100644 --- a/lesson_16/objects/objects_app/build.gradle.kts +++ b/lesson_16/objects/objects_app/build.gradle.kts @@ -43,8 +43,7 @@ tasks.named("test") { tasks.jacocoTestReport { dependsOn(tasks.test) reports { - xml.required = true - + xml.required = true } } From d50f3304976768683ec61c9811bea55d51042b02 Mon Sep 17 00:00:00 2001 From: Sdunsmore2006 Date: Wed, 13 Nov 2024 16:12:52 -0500 Subject: [PATCH 16/16] Update build.gradle.kts --- lesson_16/objects/objects_app/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lesson_16/objects/objects_app/build.gradle.kts b/lesson_16/objects/objects_app/build.gradle.kts index f13484376..3c9abdd3c 100644 --- a/lesson_16/objects/objects_app/build.gradle.kts +++ b/lesson_16/objects/objects_app/build.gradle.kts @@ -43,7 +43,7 @@ tasks.named("test") { tasks.jacocoTestReport { dependsOn(tasks.test) reports { - xml.required = true + xml.required = true } }