From e387c142a83db5ffe7b9321729bde10788523d43 Mon Sep 17 00:00:00 2001 From: haldanek Date: Thu, 31 Oct 2024 13:25:35 +0000 Subject: [PATCH 01/19] feat: created lesson 16 object files --- .../java/com/codedifferently/lesson16/Phase10/Phase10.java | 4 ++++ .../com/codedifferently/lesson16/Phase10Test/Phase10Test.java | 4 ++++ 2 files changed, 8 insertions(+) create mode 100644 lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/Phase10/Phase10.java create mode 100644 lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/Phase10Test/Phase10Test.java diff --git a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/Phase10/Phase10.java b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/Phase10/Phase10.java new file mode 100644 index 000000000..b9b5fc74e --- /dev/null +++ b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/Phase10/Phase10.java @@ -0,0 +1,4 @@ +package main.java.com.codedifferently.lesson16.Phase10; +public class Phase10 { + +} diff --git a/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/Phase10Test/Phase10Test.java b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/Phase10Test/Phase10Test.java new file mode 100644 index 000000000..f4d3985aa --- /dev/null +++ b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/Phase10Test/Phase10Test.java @@ -0,0 +1,4 @@ +package test.java.com.codedifferently.lesson16.Phase10Test; +public class Phase10Test { + +} From 2d3555af5a25bec71852ca133c5ed48b8851c72a Mon Sep 17 00:00:00 2001 From: haldanek Date: Thu, 31 Oct 2024 18:03:10 +0000 Subject: [PATCH 02/19] fix: fixed created files --- .../com/codedifferently/lesson16/KimberleeObject/Phase10.java | 4 ++++ .../java/com/codedifferently/lesson16/Phase10/Phase10.java | 4 ---- .../lesson16/KimberleeObjectTest/Phase10Test.java | 4 ++++ .../com/codedifferently/lesson16/Phase10Test/Phase10Test.java | 4 ---- 4 files changed, 8 insertions(+), 8 deletions(-) create mode 100644 lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObject/Phase10.java delete mode 100644 lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/Phase10/Phase10.java create mode 100644 lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/KimberleeObjectTest/Phase10Test.java delete mode 100644 lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/Phase10Test/Phase10Test.java diff --git a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObject/Phase10.java b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObject/Phase10.java new file mode 100644 index 000000000..b8e9f3aac --- /dev/null +++ b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObject/Phase10.java @@ -0,0 +1,4 @@ +package main.java.com.codedifferently.lesson16; +public class Phase10 { + +} diff --git a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/Phase10/Phase10.java b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/Phase10/Phase10.java deleted file mode 100644 index b9b5fc74e..000000000 --- a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/Phase10/Phase10.java +++ /dev/null @@ -1,4 +0,0 @@ -package main.java.com.codedifferently.lesson16.Phase10; -public class Phase10 { - -} diff --git a/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/KimberleeObjectTest/Phase10Test.java b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/KimberleeObjectTest/Phase10Test.java new file mode 100644 index 000000000..0aaeb8cc6 --- /dev/null +++ b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/KimberleeObjectTest/Phase10Test.java @@ -0,0 +1,4 @@ +package test.java.com.codedifferently.lesson16; +public class Phase10Test { + +} diff --git a/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/Phase10Test/Phase10Test.java b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/Phase10Test/Phase10Test.java deleted file mode 100644 index f4d3985aa..000000000 --- a/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/Phase10Test/Phase10Test.java +++ /dev/null @@ -1,4 +0,0 @@ -package test.java.com.codedifferently.lesson16.Phase10Test; -public class Phase10Test { - -} From a3adbbe9e44eb6b044e164dba7ef6ef09d54861a Mon Sep 17 00:00:00 2001 From: haldanek Date: Thu, 31 Oct 2024 18:43:55 +0000 Subject: [PATCH 03/19] feat: changed object/created new files --- .../codedifferently/lesson16/KimberleeObject/HeadPhones.java | 5 +++++ .../codedifferently/lesson16/KimberleeObject/Phase10.java | 4 ---- .../lesson16/KimberleeObjectTest/Phase10Test.java | 4 ---- 3 files changed, 5 insertions(+), 8 deletions(-) create mode 100644 lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObject/HeadPhones.java delete mode 100644 lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObject/Phase10.java delete mode 100644 lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/KimberleeObjectTest/Phase10Test.java diff --git a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObject/HeadPhones.java b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObject/HeadPhones.java new file mode 100644 index 000000000..b809a3366 --- /dev/null +++ b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObject/HeadPhones.java @@ -0,0 +1,5 @@ +package main.java.com.codedifferently.lesson16.KimberleeObject; + +public class HeadPhones { + +} diff --git a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObject/Phase10.java b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObject/Phase10.java deleted file mode 100644 index b8e9f3aac..000000000 --- a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObject/Phase10.java +++ /dev/null @@ -1,4 +0,0 @@ -package main.java.com.codedifferently.lesson16; -public class Phase10 { - -} diff --git a/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/KimberleeObjectTest/Phase10Test.java b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/KimberleeObjectTest/Phase10Test.java deleted file mode 100644 index 0aaeb8cc6..000000000 --- a/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/KimberleeObjectTest/Phase10Test.java +++ /dev/null @@ -1,4 +0,0 @@ -package test.java.com.codedifferently.lesson16; -public class Phase10Test { - -} From 7c413ca89fb3618534f552f49add82752cdd05a3 Mon Sep 17 00:00:00 2001 From: haldanek Date: Thu, 31 Oct 2024 18:44:53 +0000 Subject: [PATCH 04/19] feat: new object test file --- .../lesson16/KimberleeObjectTest/HeadPhonesTest.java | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/KimberleeObjectTest/HeadPhonesTest.java diff --git a/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/KimberleeObjectTest/HeadPhonesTest.java b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/KimberleeObjectTest/HeadPhonesTest.java new file mode 100644 index 000000000..2f702a8f3 --- /dev/null +++ b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/KimberleeObjectTest/HeadPhonesTest.java @@ -0,0 +1,5 @@ +package test.java.com.codedifferently.lesson16.KimberleeObjectTest; + +public class HeadPhonesTest { + +} From 33c95fc35eb61230ce0f3344e1437b5364026d6f Mon Sep 17 00:00:00 2001 From: haldanek Date: Fri, 1 Nov 2024 02:06:58 +0000 Subject: [PATCH 05/19] feats: adds object default testing/pass --- .../lesson16/KimberleeObject/HeadPhones.java | 30 ++++++++++- .../KimberleeObjectTest/HeadPhonesTest.java | 50 ++++++++++++++++++- 2 files changed, 76 insertions(+), 4 deletions(-) diff --git a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObject/HeadPhones.java b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObject/HeadPhones.java index b809a3366..8e4dbd569 100644 --- a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObject/HeadPhones.java +++ b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObject/HeadPhones.java @@ -1,5 +1,31 @@ -package main.java.com.codedifferently.lesson16.KimberleeObject; +package com.codedifferently.lesson16.KimberleeObject; public class HeadPhones { - + @SuppressWarnings("unused") + private int volume = 0; + + private boolean isPoweredOn = false; + private String HeadPhoneColor = "BLACK"; + private boolean isWireless = true; + private String brands = "Beats"; + + public int getVolume(int volume) { + return volume; + } + + public String getHeadPhoneColor() { + return HeadPhoneColor; + } + + public boolean isPoweredOn() { + return isPoweredOn; + } + + public boolean isWireless() { + return isWireless; + } + + public String getBrandsArray() { + return brands; + } } diff --git a/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/KimberleeObjectTest/HeadPhonesTest.java b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/KimberleeObjectTest/HeadPhonesTest.java index 2f702a8f3..60dfdf241 100644 --- a/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/KimberleeObjectTest/HeadPhonesTest.java +++ b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/KimberleeObjectTest/HeadPhonesTest.java @@ -1,5 +1,51 @@ -package test.java.com.codedifferently.lesson16.KimberleeObjectTest; +package com.codedifferently.lesson16.KimberleeObjectTest; + +import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; + +import com.codedifferently.lesson16.KimberleeObject.HeadPhones; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class HeadPhonesTest { - + + private HeadPhones headphones; + + @BeforeEach + public void setUp() { + headphones = new HeadPhones(); + } + + public enum HeadPhoneColor { + RED, + BLUE, + ROSEGOLD, + PINK, + WHITE, + BLACK; + } + + public void BrandsArray() { + String[] brands = new String[5]; + brands[0] = "Beats"; + brands[1] = "Sony"; + brands[2] = "Bose"; + brands[3] = "SkullCandy"; + brands[4] = "Juicy"; + } + + @Test + public void testDefaultState() { + assertEquals(0, headphones.getVolume(0), "Volume should be 0 by default."); + assertEquals("BLACK", headphones.getHeadPhoneColor(), "Color should be black by default."); + assertFalse(headphones.isPoweredOn(), "HeadPhones should be off by default."); + assertTrue(headphones.isWireless(), "HeadPhones should be wireless by default."); + assertArrayEquals(new String[] {"Beats"}, new String[] {"Beats"}); + } + // Arrange + + // Act + + // Assert + } From db9a3482b04dbe3f600268df1a4e7ecaba766240 Mon Sep 17 00:00:00 2001 From: haldanek Date: Fri, 1 Nov 2024 03:59:22 +0000 Subject: [PATCH 06/19] feat: added tests turn on and turn off/pass --- .../lesson16/KimberleeObject/HeadPhones.java | 8 ++++++++ .../KimberleeObjectTest/HeadPhonesTest.java | 20 +++++++++++++++---- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObject/HeadPhones.java b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObject/HeadPhones.java index 8e4dbd569..c355fad7d 100644 --- a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObject/HeadPhones.java +++ b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObject/HeadPhones.java @@ -28,4 +28,12 @@ public boolean isWireless() { public String getBrandsArray() { return brands; } + + public void turnOn() { + isPoweredOn = true; + } + + public void turnOff() { + isPoweredOn = false; + } } diff --git a/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/KimberleeObjectTest/HeadPhonesTest.java b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/KimberleeObjectTest/HeadPhonesTest.java index 60dfdf241..3352b167f 100644 --- a/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/KimberleeObjectTest/HeadPhonesTest.java +++ b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/KimberleeObjectTest/HeadPhonesTest.java @@ -42,10 +42,22 @@ public void testDefaultState() { assertTrue(headphones.isWireless(), "HeadPhones should be wireless by default."); assertArrayEquals(new String[] {"Beats"}, new String[] {"Beats"}); } - // Arrange - // Act - - // Assert + @Test + public void testTurnOn() { + // Act + headphones.turnOn(); + // Assert + assertTrue(headphones.isPoweredOn(), "Headphones should turn on after calling turnOn"); + } + @Test + public void testTurnOff() { + // Arrange + headphones.turnOn(); + // Act + headphones.turnOff(); + // Assert + assertFalse(headphones.isPoweredOn(), "Headphones should turn off after calling"); + } } From 3f31a85c06a942b03e71872475fef54cc4c50ecc Mon Sep 17 00:00:00 2001 From: haldanek Date: Fri, 1 Nov 2024 04:35:12 +0000 Subject: [PATCH 07/19] feat: added volume increase and decrease tests/pass --- .../lesson16/KimberleeObject/HeadPhones.java | 22 +++++++++++++--- .../KimberleeObjectTest/HeadPhonesTest.java | 26 +++++++++++++++++++ 2 files changed, 45 insertions(+), 3 deletions(-) diff --git a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObject/HeadPhones.java b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObject/HeadPhones.java index c355fad7d..2802eb76f 100644 --- a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObject/HeadPhones.java +++ b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObject/HeadPhones.java @@ -1,15 +1,13 @@ package com.codedifferently.lesson16.KimberleeObject; public class HeadPhones { - @SuppressWarnings("unused") private int volume = 0; - private boolean isPoweredOn = false; private String HeadPhoneColor = "BLACK"; private boolean isWireless = true; private String brands = "Beats"; - public int getVolume(int volume) { + public int getVolume(int i) { return volume; } @@ -36,4 +34,22 @@ public void turnOn() { public void turnOff() { isPoweredOn = false; } + + public void increaseVolume() { + if (volume < 100) { + volume++; + } + } + + public void setVolume(int volume) { + if (volume >= 0 && volume <= 100) { + this.volume = volume; + } + } + + public void decreaseVolume() { + if (volume > 0) { + volume--; + } + } } diff --git a/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/KimberleeObjectTest/HeadPhonesTest.java b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/KimberleeObjectTest/HeadPhonesTest.java index 3352b167f..a309cc9e0 100644 --- a/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/KimberleeObjectTest/HeadPhonesTest.java +++ b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/KimberleeObjectTest/HeadPhonesTest.java @@ -60,4 +60,30 @@ public void testTurnOff() { // Assert assertFalse(headphones.isPoweredOn(), "Headphones should turn off after calling"); } + + @Test + public void testIncreaseVolume() { + // Arrange + headphones.turnOn(); + headphones.increaseVolume(); + assertEquals(1, headphones.getVolume(0), "Volume should increase by 1"); + // Act + headphones.setVolume(99); + headphones.increaseVolume(); + // Assert + assertEquals(100, headphones.getVolume(0), "Volume should not exceed 100."); + } + + @Test + public void testDecreaseVolume() { + // Arrange + headphones.turnOn(); + headphones.setVolume(1); + headphones.decreaseVolume(); + assertEquals(0, headphones.getVolume(0), "Volume should decrease to 0."); + // Act + headphones.decreaseVolume(); + // Assert + assertEquals(0, headphones.getVolume(0), "Volume should not go lower than 0."); + } } From 9ebe5274d766d1e8c151cddefeda5d7e2dbe034d Mon Sep 17 00:00:00 2001 From: haldanek Date: Fri, 1 Nov 2024 05:28:56 +0000 Subject: [PATCH 08/19] feat: added setcolor test/pass --- .../lesson16/KimberleeObject/HeadPhones.java | 19 ++++++++++++--- .../KimberleeObjectTest/HeadPhonesTest.java | 24 +++++++++++-------- 2 files changed, 30 insertions(+), 13 deletions(-) diff --git a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObject/HeadPhones.java b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObject/HeadPhones.java index 2802eb76f..0da9acd9a 100644 --- a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObject/HeadPhones.java +++ b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObject/HeadPhones.java @@ -3,16 +3,25 @@ public class HeadPhones { private int volume = 0; private boolean isPoweredOn = false; - private String HeadPhoneColor = "BLACK"; + private HeadPhoneColor headPhoneColor = HeadPhoneColor.BLACK; private boolean isWireless = true; private String brands = "Beats"; + public enum HeadPhoneColor { + RED, + BLUE, + ROSEGOLD, + PINK, + WHITE, + BLACK; + } + public int getVolume(int i) { return volume; } - public String getHeadPhoneColor() { - return HeadPhoneColor; + public HeadPhoneColor getHeadPhoneColor() { + return headPhoneColor; } public boolean isPoweredOn() { @@ -52,4 +61,8 @@ public void decreaseVolume() { volume--; } } + + public void setColor(HeadPhoneColor color) { + this.headPhoneColor = color; + } } diff --git a/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/KimberleeObjectTest/HeadPhonesTest.java b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/KimberleeObjectTest/HeadPhonesTest.java index a309cc9e0..5b0110aca 100644 --- a/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/KimberleeObjectTest/HeadPhonesTest.java +++ b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/KimberleeObjectTest/HeadPhonesTest.java @@ -4,6 +4,7 @@ import static org.junit.jupiter.api.Assertions.assertArrayEquals; import com.codedifferently.lesson16.KimberleeObject.HeadPhones; +import com.codedifferently.lesson16.KimberleeObject.HeadPhones.HeadPhoneColor; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -16,15 +17,6 @@ public void setUp() { headphones = new HeadPhones(); } - public enum HeadPhoneColor { - RED, - BLUE, - ROSEGOLD, - PINK, - WHITE, - BLACK; - } - public void BrandsArray() { String[] brands = new String[5]; brands[0] = "Beats"; @@ -37,7 +29,8 @@ public void BrandsArray() { @Test public void testDefaultState() { assertEquals(0, headphones.getVolume(0), "Volume should be 0 by default."); - assertEquals("BLACK", headphones.getHeadPhoneColor(), "Color should be black by default."); + assertEquals( + HeadPhoneColor.BLACK, headphones.getHeadPhoneColor(), "Color should be black by default."); assertFalse(headphones.isPoweredOn(), "HeadPhones should be off by default."); assertTrue(headphones.isWireless(), "HeadPhones should be wireless by default."); assertArrayEquals(new String[] {"Beats"}, new String[] {"Beats"}); @@ -86,4 +79,15 @@ public void testDecreaseVolume() { // Assert assertEquals(0, headphones.getVolume(0), "Volume should not go lower than 0."); } + + @Test + public void testSetColor() { + // Act + headphones.setColor(HeadPhoneColor.ROSEGOLD); + // Assert + assertEquals( + HeadPhoneColor.ROSEGOLD, + headphones.getHeadPhoneColor(), + "Headphone color should be set to Rose Gold."); + } } From 1987b07c001a196c6f21ea7e3619c2fac6804a4e Mon Sep 17 00:00:00 2001 From: haldanek Date: Fri, 1 Nov 2024 14:10:55 +0000 Subject: [PATCH 09/19] feat: added function from a collection member variable --- .../lesson16/KimberleeObject/HeadPhones.java | 24 +++++++++++++++++++ .../KimberleeObjectTest/BrandsArray.java | 11 +++++++++ .../KimberleeObjectTest/HeadPhonesTest.java | 21 ++++++++-------- 3 files changed, 46 insertions(+), 10 deletions(-) create mode 100644 lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/KimberleeObjectTest/BrandsArray.java diff --git a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObject/HeadPhones.java b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObject/HeadPhones.java index 0da9acd9a..2e77e7d60 100644 --- a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObject/HeadPhones.java +++ b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObject/HeadPhones.java @@ -1,6 +1,11 @@ package com.codedifferently.lesson16.KimberleeObject; +import java.util.Arrays; + public class HeadPhones { + @SuppressWarnings("unused") + private static final Object PREFERRED_BRANDS = null; + private int volume = 0; private boolean isPoweredOn = false; private HeadPhoneColor headPhoneColor = HeadPhoneColor.BLACK; @@ -16,6 +21,15 @@ public enum HeadPhoneColor { BLACK; } + public void BrandsArray() { + String[] brands = new String[5]; + brands[0] = "Beats"; + brands[1] = "Sony"; + brands[2] = "Bose"; + brands[3] = "SkullCandy"; + brands[4] = "Juicy"; + } + public int getVolume(int i) { return volume; } @@ -65,4 +79,14 @@ public void decreaseVolume() { public void setColor(HeadPhoneColor color) { this.headPhoneColor = color; } + + public class BrandUtils { + private static final String[] PREFERRED_BRANDS = { + "Beats", "Sony", "Bose", "SkullCandy", "Juicy" + }; + + public static boolean isPreferredBrand(String brand) { + return Arrays.asList(PREFERRED_BRANDS).contains(brand); + } + } } diff --git a/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/KimberleeObjectTest/BrandsArray.java b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/KimberleeObjectTest/BrandsArray.java new file mode 100644 index 000000000..72c62d0be --- /dev/null +++ b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/KimberleeObjectTest/BrandsArray.java @@ -0,0 +1,11 @@ +package com.codedifferently.lesson16.KimberleeObjectTest; + +import java.util.function.BooleanSupplier; + +public class BrandsArray { + + public static BooleanSupplier isPreferredBrand(String string) { + // TODO Auto-generated method stub + throw new UnsupportedOperationException("Unimplemented method 'isPreferredBrand'"); + } +} diff --git a/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/KimberleeObjectTest/HeadPhonesTest.java b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/KimberleeObjectTest/HeadPhonesTest.java index 5b0110aca..3ea707168 100644 --- a/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/KimberleeObjectTest/HeadPhonesTest.java +++ b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/KimberleeObjectTest/HeadPhonesTest.java @@ -1,7 +1,6 @@ package com.codedifferently.lesson16.KimberleeObjectTest; import static org.junit.jupiter.api.Assertions.*; -import static org.junit.jupiter.api.Assertions.assertArrayEquals; import com.codedifferently.lesson16.KimberleeObject.HeadPhones; import com.codedifferently.lesson16.KimberleeObject.HeadPhones.HeadPhoneColor; @@ -17,15 +16,6 @@ public void setUp() { headphones = new HeadPhones(); } - public void BrandsArray() { - String[] brands = new String[5]; - brands[0] = "Beats"; - brands[1] = "Sony"; - brands[2] = "Bose"; - brands[3] = "SkullCandy"; - brands[4] = "Juicy"; - } - @Test public void testDefaultState() { assertEquals(0, headphones.getVolume(0), "Volume should be 0 by default."); @@ -90,4 +80,15 @@ public void testSetColor() { headphones.getHeadPhoneColor(), "Headphone color should be set to Rose Gold."); } + + @Test + public void testPreferredBrand() { + // Assert + assertTrue(BrandsArray.isPreferredBrand("Beats"), "Beats should be a preferred brand."); + assertTrue(BrandsArray.isPreferredBrand("Sony"), "Sony should be a preferred brand."); + assertFalse(BrandsArray.isPreferredBrand("Apple"), "Apple should not be a preferred brand."); + assertTrue( + BrandsArray.isPreferredBrand("SkullCandy"), "SkullCandy should be a preferred brand."); + assertTrue(BrandsArray.isPreferredBrand("Juicy"), "Juicy should be a preferred brand."); + } } From d1e4e5cf0e569aa126ed6692f248cae73c628538 Mon Sep 17 00:00:00 2001 From: haldanek Date: Fri, 1 Nov 2024 15:27:26 +0000 Subject: [PATCH 10/19] feat: added custom exception --- .../ConnectionNotFoundException.java | 7 +++++ .../lesson16/KimberleeObject/HeadPhones.java | 28 +++++++++++++++---- .../KimberleeObject/WirelessConnection.java | 10 +++++++ .../ConnectionNotFoundException.java | 5 ++++ .../KimberleeObjectTest/HeadPhonesTest.java | 21 ++++++++++++++ 5 files changed, 65 insertions(+), 6 deletions(-) create mode 100644 lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObject/ConnectionNotFoundException.java create mode 100644 lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObject/WirelessConnection.java create mode 100644 lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/KimberleeObjectTest/ConnectionNotFoundException.java diff --git a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObject/ConnectionNotFoundException.java b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObject/ConnectionNotFoundException.java new file mode 100644 index 000000000..99b12c6fc --- /dev/null +++ b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObject/ConnectionNotFoundException.java @@ -0,0 +1,7 @@ +package com.codedifferently.lesson16.KimberleeObject; + +public class ConnectionNotFoundException extends Exception { + public ConnectionNotFoundException(String message) { + super(message); + } +} \ No newline at end of file diff --git a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObject/HeadPhones.java b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObject/HeadPhones.java index 2e77e7d60..afd4055dc 100644 --- a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObject/HeadPhones.java +++ b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObject/HeadPhones.java @@ -11,6 +11,7 @@ public class HeadPhones { private HeadPhoneColor headPhoneColor = HeadPhoneColor.BLACK; private boolean isWireless = true; private String brands = "Beats"; + private boolean isConnectedToBluetooth = false; public enum HeadPhoneColor { RED, @@ -81,12 +82,27 @@ public void setColor(HeadPhoneColor color) { } public class BrandUtils { - private static final String[] PREFERRED_BRANDS = { - "Beats", "Sony", "Bose", "SkullCandy", "Juicy" - }; + private static final String[] PREFERRED_BRANDS = {"Beats", "Sony", "Bose", "SkullCandy", "Juicy"}; - public static boolean isPreferredBrand(String brand) { - return Arrays.asList(PREFERRED_BRANDS).contains(brand); - } + public static boolean isPreferredBrand(String brand) { + return Arrays.asList(PREFERRED_BRANDS).contains(brand); } +} + + public void connectToBluetooth() { + if (isPoweredOn && isWireless) { + isConnectedToBluetooth = true; + } +} + + public boolean isConnectedToBluetooth() { + return isConnectedToBluetooth; +} + +public void wirelessConnection() throws ConnectionNotFoundException { + if (!isConnectedToBluetooth) { + throw new ConnectionNotFoundException("Headphones Wireless Connection Not Found."); + } + +} } diff --git a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObject/WirelessConnection.java b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObject/WirelessConnection.java new file mode 100644 index 000000000..d48f74141 --- /dev/null +++ b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObject/WirelessConnection.java @@ -0,0 +1,10 @@ +package com.codedifferently.lesson16.KimberleeObject; + +public class WirelessConnection { + + public WirelessConnection get(boolean isConnectedToBluetooth) { + // TODO Auto-generated method stub + throw new UnsupportedOperationException("Unimplemented method 'get'"); + } + +} diff --git a/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/KimberleeObjectTest/ConnectionNotFoundException.java b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/KimberleeObjectTest/ConnectionNotFoundException.java new file mode 100644 index 000000000..b73c8596b --- /dev/null +++ b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/KimberleeObjectTest/ConnectionNotFoundException.java @@ -0,0 +1,5 @@ +package com.codedifferently.lesson16.KimberleeObjectTest; + +public class ConnectionNotFoundException { + +} diff --git a/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/KimberleeObjectTest/HeadPhonesTest.java b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/KimberleeObjectTest/HeadPhonesTest.java index 3ea707168..c426f4938 100644 --- a/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/KimberleeObjectTest/HeadPhonesTest.java +++ b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/KimberleeObjectTest/HeadPhonesTest.java @@ -2,6 +2,7 @@ import static org.junit.jupiter.api.Assertions.*; +import static org.assertj.core.api.Assertions.assertThatThrownBy; import com.codedifferently.lesson16.KimberleeObject.HeadPhones; import com.codedifferently.lesson16.KimberleeObject.HeadPhones.HeadPhoneColor; import org.junit.jupiter.api.BeforeEach; @@ -91,4 +92,24 @@ public void testPreferredBrand() { BrandsArray.isPreferredBrand("SkullCandy"), "SkullCandy should be a preferred brand."); assertTrue(BrandsArray.isPreferredBrand("Juicy"), "Juicy should be a preferred brand."); } + + @Test + public void testwirelessConnection() throws Exception { + // Arrange + headphones.isPoweredOn(); + headphones.isWireless(); + // Act + headphones.connectToBluetooth(); + // Assert + assertTrue(headphones.isConnectedToBluetooth(), "Headphones should connect to bluetooh when wireless and turned on."); + } + + @Test + public void testwirelessConnection_connectionNotFound() throws Exception { + // Act + assertThatThrownBy(() -> headphones.wirelessConnection()) + .isInstanceOf(ConnectionNotFoundException.class) + .hasMessage("Headphones Wireless Connection Not Found."); + } } + From 959dcce3c6b2892750c3fbebf66b25ba62f3fdd2 Mon Sep 17 00:00:00 2001 From: haldanek Date: Fri, 1 Nov 2024 15:49:41 +0000 Subject: [PATCH 11/19] chore: edit test/ all passed except testwireless connection tests --- .../ConnectionNotFoundException.java | 8 +++--- .../lesson16/KimberleeObject/HeadPhones.java | 25 ++++++++++--------- .../KimberleeObject/WirelessConnection.java | 9 +++---- .../KimberleeObjectTest/BrandsArray.java | 13 +++++++--- .../ConnectionNotFoundException.java | 4 +-- .../KimberleeObjectTest/HeadPhonesTest.java | 15 +++++------ 6 files changed, 39 insertions(+), 35 deletions(-) diff --git a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObject/ConnectionNotFoundException.java b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObject/ConnectionNotFoundException.java index 99b12c6fc..4c0fb30e6 100644 --- a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObject/ConnectionNotFoundException.java +++ b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObject/ConnectionNotFoundException.java @@ -1,7 +1,7 @@ package com.codedifferently.lesson16.KimberleeObject; public class ConnectionNotFoundException extends Exception { - public ConnectionNotFoundException(String message) { - super(message); - } -} \ No newline at end of file + public ConnectionNotFoundException(String message) { + super(message); + } +} diff --git a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObject/HeadPhones.java b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObject/HeadPhones.java index afd4055dc..f72d82401 100644 --- a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObject/HeadPhones.java +++ b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObject/HeadPhones.java @@ -82,27 +82,28 @@ public void setColor(HeadPhoneColor color) { } public class BrandUtils { - private static final String[] PREFERRED_BRANDS = {"Beats", "Sony", "Bose", "SkullCandy", "Juicy"}; + private static final String[] PREFERRED_BRANDS = { + "Beats", "Sony", "Bose", "SkullCandy", "Juicy" + }; - public static boolean isPreferredBrand(String brand) { - return Arrays.asList(PREFERRED_BRANDS).contains(brand); + public static boolean isPreferredBrand(String brand) { + return Arrays.asList(PREFERRED_BRANDS).contains(brand); + } } -} public void connectToBluetooth() { if (isPoweredOn && isWireless) { - isConnectedToBluetooth = true; + isConnectedToBluetooth = true; } -} + } public boolean isConnectedToBluetooth() { - return isConnectedToBluetooth; -} + return isConnectedToBluetooth; + } -public void wirelessConnection() throws ConnectionNotFoundException { + public void wirelessConnection() throws ConnectionNotFoundException { if (!isConnectedToBluetooth) { - throw new ConnectionNotFoundException("Headphones Wireless Connection Not Found."); + throw new ConnectionNotFoundException("Headphones Wireless Connection Not Found."); } - -} + } } diff --git a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObject/WirelessConnection.java b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObject/WirelessConnection.java index d48f74141..ec975bec4 100644 --- a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObject/WirelessConnection.java +++ b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObject/WirelessConnection.java @@ -2,9 +2,8 @@ public class WirelessConnection { - public WirelessConnection get(boolean isConnectedToBluetooth) { - // TODO Auto-generated method stub - throw new UnsupportedOperationException("Unimplemented method 'get'"); - } - + public WirelessConnection get(boolean isConnectedToBluetooth) { + // TODO Auto-generated method stub + throw new UnsupportedOperationException("Unimplemented method 'get'"); + } } diff --git a/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/KimberleeObjectTest/BrandsArray.java b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/KimberleeObjectTest/BrandsArray.java index 72c62d0be..e8d981663 100644 --- a/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/KimberleeObjectTest/BrandsArray.java +++ b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/KimberleeObjectTest/BrandsArray.java @@ -1,11 +1,16 @@ package com.codedifferently.lesson16.KimberleeObjectTest; -import java.util.function.BooleanSupplier; +import java.util.Arrays; +import java.util.List; public class BrandsArray { - public static BooleanSupplier isPreferredBrand(String string) { - // TODO Auto-generated method stub - throw new UnsupportedOperationException("Unimplemented method 'isPreferredBrand'"); + // Preferred brands stored in a List + private static final List PREFERRED_BRANDS = + Arrays.asList("Beats", "Sony", "Bose", "SkullCandy", "Juicy"); + + // Method to check if a brand is preferred + public static Boolean isPreferredBrand(String brand) { + return PREFERRED_BRANDS.contains(brand); } } diff --git a/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/KimberleeObjectTest/ConnectionNotFoundException.java b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/KimberleeObjectTest/ConnectionNotFoundException.java index b73c8596b..e2b845e2e 100644 --- a/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/KimberleeObjectTest/ConnectionNotFoundException.java +++ b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/KimberleeObjectTest/ConnectionNotFoundException.java @@ -1,5 +1,3 @@ package com.codedifferently.lesson16.KimberleeObjectTest; -public class ConnectionNotFoundException { - -} +public class ConnectionNotFoundException {} diff --git a/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/KimberleeObjectTest/HeadPhonesTest.java b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/KimberleeObjectTest/HeadPhonesTest.java index c426f4938..ca6a741e6 100644 --- a/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/KimberleeObjectTest/HeadPhonesTest.java +++ b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/KimberleeObjectTest/HeadPhonesTest.java @@ -1,8 +1,8 @@ package com.codedifferently.lesson16.KimberleeObjectTest; +import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.junit.jupiter.api.Assertions.*; -import static org.assertj.core.api.Assertions.assertThatThrownBy; import com.codedifferently.lesson16.KimberleeObject.HeadPhones; import com.codedifferently.lesson16.KimberleeObject.HeadPhones.HeadPhoneColor; import org.junit.jupiter.api.BeforeEach; @@ -96,20 +96,21 @@ public void testPreferredBrand() { @Test public void testwirelessConnection() throws Exception { // Arrange - headphones.isPoweredOn(); + headphones.isPoweredOn(); headphones.isWireless(); // Act headphones.connectToBluetooth(); // Assert - assertTrue(headphones.isConnectedToBluetooth(), "Headphones should connect to bluetooh when wireless and turned on."); + assertTrue( + headphones.isConnectedToBluetooth(), + "Headphones should connect to bluetooh when wireless and turned on."); } @Test public void testwirelessConnection_connectionNotFound() throws Exception { // Act assertThatThrownBy(() -> headphones.wirelessConnection()) - .isInstanceOf(ConnectionNotFoundException.class) - .hasMessage("Headphones Wireless Connection Not Found."); - } + .isInstanceOf(ConnectionNotFoundException.class) + .hasMessage("Headphones Wireless Connection Not Found."); + } } - From 8c2e099bb2276d75befad63bac503eb579f162ab Mon Sep 17 00:00:00 2001 From: haldanek Date: Fri, 1 Nov 2024 16:11:36 +0000 Subject: [PATCH 12/19] chore: edit attempt --- .../lesson16/KimberleeObject/HeadPhones.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObject/HeadPhones.java b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObject/HeadPhones.java index f72d82401..85ecb39c2 100644 --- a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObject/HeadPhones.java +++ b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObject/HeadPhones.java @@ -12,7 +12,6 @@ public class HeadPhones { private boolean isWireless = true; private String brands = "Beats"; private boolean isConnectedToBluetooth = false; - public enum HeadPhoneColor { RED, BLUE, @@ -91,14 +90,15 @@ public static boolean isPreferredBrand(String brand) { } } - public void connectToBluetooth() { + public boolean connectToBluetooth() { if (isPoweredOn && isWireless) { isConnectedToBluetooth = true; } + return isConnectedToBluetooth; } public boolean isConnectedToBluetooth() { - return isConnectedToBluetooth; + return connectToBluetooth(); } public void wirelessConnection() throws ConnectionNotFoundException { From 3a908a11b5bf62323416eaa47176c7c15b8e902c Mon Sep 17 00:00:00 2001 From: haldanek Date: Fri, 1 Nov 2024 16:55:42 +0000 Subject: [PATCH 13/19] chore: edit test files/ only 1 test failed --- .../lesson16/KimberleeObject}/BrandsArray.java | 2 +- .../lesson16/KimberleeObject/HeadPhones.java | 1 + .../lesson16/KimberleeObject/WirelessConnection.java | 9 --------- .../KimberleeObjectTest/WirelessConnection.java | 11 +++++++++++ .../ConnectionNotFoundException.java | 3 --- .../lesson16/KimberleeObjectTest/HeadPhonesTest.java | 2 ++ 6 files changed, 15 insertions(+), 13 deletions(-) rename lesson_16/objects/objects_app/src/{test/java/com/codedifferently/lesson16/KimberleeObjectTest => main/java/com/codedifferently/lesson16/KimberleeObject}/BrandsArray.java (87%) delete mode 100644 lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObject/WirelessConnection.java create mode 100644 lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObjectTest/WirelessConnection.java delete mode 100644 lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/KimberleeObjectTest/ConnectionNotFoundException.java diff --git a/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/KimberleeObjectTest/BrandsArray.java b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObject/BrandsArray.java similarity index 87% rename from lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/KimberleeObjectTest/BrandsArray.java rename to lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObject/BrandsArray.java index e8d981663..fde6d06bc 100644 --- a/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/KimberleeObjectTest/BrandsArray.java +++ b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObject/BrandsArray.java @@ -1,4 +1,4 @@ -package com.codedifferently.lesson16.KimberleeObjectTest; +package com.codedifferently.lesson16.KimberleeObject; import java.util.Arrays; import java.util.List; diff --git a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObject/HeadPhones.java b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObject/HeadPhones.java index 85ecb39c2..95df4827c 100644 --- a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObject/HeadPhones.java +++ b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObject/HeadPhones.java @@ -12,6 +12,7 @@ public class HeadPhones { private boolean isWireless = true; private String brands = "Beats"; private boolean isConnectedToBluetooth = false; + public enum HeadPhoneColor { RED, BLUE, diff --git a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObject/WirelessConnection.java b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObject/WirelessConnection.java deleted file mode 100644 index ec975bec4..000000000 --- a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObject/WirelessConnection.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.codedifferently.lesson16.KimberleeObject; - -public class WirelessConnection { - - public WirelessConnection get(boolean isConnectedToBluetooth) { - // TODO Auto-generated method stub - throw new UnsupportedOperationException("Unimplemented method 'get'"); - } -} diff --git a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObjectTest/WirelessConnection.java b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObjectTest/WirelessConnection.java new file mode 100644 index 000000000..49e0007fa --- /dev/null +++ b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObjectTest/WirelessConnection.java @@ -0,0 +1,11 @@ +package com.codedifferently.lesson16.KimberleeObjectTest; + +public class WirelessConnection { + WirelessConnection wirelessConnection; + + public void get(boolean isConnectedToBluetooth) { + if (!isConnectedToBluetooth) { + return; + } + } +} diff --git a/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/KimberleeObjectTest/ConnectionNotFoundException.java b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/KimberleeObjectTest/ConnectionNotFoundException.java deleted file mode 100644 index e2b845e2e..000000000 --- a/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/KimberleeObjectTest/ConnectionNotFoundException.java +++ /dev/null @@ -1,3 +0,0 @@ -package com.codedifferently.lesson16.KimberleeObjectTest; - -public class ConnectionNotFoundException {} diff --git a/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/KimberleeObjectTest/HeadPhonesTest.java b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/KimberleeObjectTest/HeadPhonesTest.java index ca6a741e6..73ded90c4 100644 --- a/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/KimberleeObjectTest/HeadPhonesTest.java +++ b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/KimberleeObjectTest/HeadPhonesTest.java @@ -3,6 +3,8 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.junit.jupiter.api.Assertions.*; +import com.codedifferently.lesson16.KimberleeObject.BrandsArray; +import com.codedifferently.lesson16.KimberleeObject.ConnectionNotFoundException; import com.codedifferently.lesson16.KimberleeObject.HeadPhones; import com.codedifferently.lesson16.KimberleeObject.HeadPhones.HeadPhoneColor; import org.junit.jupiter.api.BeforeEach; From c3a6ac0d3be7c810b360d604e50fc1aff307cfe6 Mon Sep 17 00:00:00 2001 From: haldanek Date: Tue, 5 Nov 2024 15:21:54 +0000 Subject: [PATCH 14/19] chore: added a new test making use of the loop function --- .../com/codedifferently/lesson16/Lesson16.java | 0 .../lesson16/KimberleeObject/HeadPhones.java | 6 ++++++ .../WirelessConnection.java | 2 +- .../KimberleeObjectTest/HeadPhonesTest.java | 16 ++++++++++++++++ 4 files changed, 23 insertions(+), 1 deletion(-) rename lesson_16/objects/objects_app/src/main/{java => }/com/codedifferently/lesson16/Lesson16.java (100%) rename lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/{KimberleeObjectTest => KimberleeObject}/WirelessConnection.java (76%) diff --git a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/Lesson16.java b/lesson_16/objects/objects_app/src/main/com/codedifferently/lesson16/Lesson16.java similarity index 100% rename from lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/Lesson16.java rename to lesson_16/objects/objects_app/src/main/com/codedifferently/lesson16/Lesson16.java diff --git a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObject/HeadPhones.java b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObject/HeadPhones.java index 95df4827c..820f913a8 100644 --- a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObject/HeadPhones.java +++ b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObject/HeadPhones.java @@ -31,6 +31,12 @@ public void BrandsArray() { brands[4] = "Juicy"; } + public enum BoostMode { + BASS_BOOST, + VOCAL_BOOST, + TREBLE_BOOST; + } + public int getVolume(int i) { return volume; } diff --git a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObjectTest/WirelessConnection.java b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObject/WirelessConnection.java similarity index 76% rename from lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObjectTest/WirelessConnection.java rename to lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObject/WirelessConnection.java index 49e0007fa..3f97bd4b4 100644 --- a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObjectTest/WirelessConnection.java +++ b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObject/WirelessConnection.java @@ -1,4 +1,4 @@ -package com.codedifferently.lesson16.KimberleeObjectTest; +package com.codedifferently.lesson16.KimberleeObject; public class WirelessConnection { WirelessConnection wirelessConnection; diff --git a/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/KimberleeObjectTest/HeadPhonesTest.java b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/KimberleeObjectTest/HeadPhonesTest.java index 73ded90c4..e9e1660f6 100644 --- a/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/KimberleeObjectTest/HeadPhonesTest.java +++ b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/KimberleeObjectTest/HeadPhonesTest.java @@ -6,6 +6,7 @@ import com.codedifferently.lesson16.KimberleeObject.BrandsArray; import com.codedifferently.lesson16.KimberleeObject.ConnectionNotFoundException; import com.codedifferently.lesson16.KimberleeObject.HeadPhones; +import com.codedifferently.lesson16.KimberleeObject.HeadPhones.BoostMode; import com.codedifferently.lesson16.KimberleeObject.HeadPhones.HeadPhoneColor; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -27,6 +28,7 @@ public void testDefaultState() { assertFalse(headphones.isPoweredOn(), "HeadPhones should be off by default."); assertTrue(headphones.isWireless(), "HeadPhones should be wireless by default."); assertArrayEquals(new String[] {"Beats"}, new String[] {"Beats"}); + assertEquals(BoostMode.BASS_BOOST, headphones.getCurrentBoostMode(), "BASS_BOOST should be the default setting."); } @Test @@ -115,4 +117,18 @@ public void testwirelessConnection_connectionNotFound() throws Exception { .isInstanceOf(ConnectionNotFoundException.class) .hasMessage("Headphones Wireless Connection Not Found."); } + + @Test + public void testBoostMode() { + assertEquals(BoostMode.BASS_BOOST, headphones.getCurrentBoostMode(), "BASS_BOOST should be the default setting."); + + headphones.nextBoostMode(); + assertEquals(BoostMode.VOCAL_BOOST, headphones.getCurrentBoostMode(), "The next Boost setting should be VOCAL."); + + headphones.nextBoostMode(); + assertEquals(BoostMode.TREBLE_BOOST, headphones.getCurrentBoostMode(), "The next Boost setting should be TREBLE."); + + headphones.nextBoostMode(); + assertEquals(BoostMode.BASS_BOOST, headphones.getCurrentBoostMode(), "BoostMode cycle should return to BASS_BOOST."); + } } From c40303a1b864515a28934b6edeabaebdd11ac23c Mon Sep 17 00:00:00 2001 From: haldanek Date: Tue, 5 Nov 2024 16:09:12 +0000 Subject: [PATCH 15/19] chore: debugging --- .../lesson16/KimberleeObject/HeadPhones.java | 18 ++++++++++-- .../KimberleeObjectTest/HeadPhonesTest.java | 29 ++++++++++++++----- 2 files changed, 38 insertions(+), 9 deletions(-) diff --git a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObject/HeadPhones.java b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObject/HeadPhones.java index 820f913a8..e07053c22 100644 --- a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObject/HeadPhones.java +++ b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObject/HeadPhones.java @@ -3,8 +3,6 @@ import java.util.Arrays; public class HeadPhones { - @SuppressWarnings("unused") - private static final Object PREFERRED_BRANDS = null; private int volume = 0; private boolean isPoweredOn = false; @@ -12,6 +10,9 @@ public class HeadPhones { private boolean isWireless = true; private String brands = "Beats"; private boolean isConnectedToBluetooth = false; + private BoostMode currentMode; + private BoostMode[] modes = BoostMode.values(); + private int currentModeIndex = 0; public enum HeadPhoneColor { RED, @@ -37,6 +38,10 @@ public enum BoostMode { TREBLE_BOOST; } + public void headPhones() { + this.currentMode = BoostMode.BASS_BOOST; + } + public int getVolume(int i) { return volume; } @@ -113,4 +118,13 @@ public void wirelessConnection() throws ConnectionNotFoundException { throw new ConnectionNotFoundException("Headphones Wireless Connection Not Found."); } } + + public void nextBoostMode() { + currentModeIndex = (currentModeIndex + 1) % modes.length; + currentMode = modes[currentModeIndex]; + } + + public BoostMode getCurrentMode() { + return currentMode; + } } diff --git a/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/KimberleeObjectTest/HeadPhonesTest.java b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/KimberleeObjectTest/HeadPhonesTest.java index e9e1660f6..907bbc121 100644 --- a/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/KimberleeObjectTest/HeadPhonesTest.java +++ b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/KimberleeObjectTest/HeadPhonesTest.java @@ -28,7 +28,10 @@ public void testDefaultState() { assertFalse(headphones.isPoweredOn(), "HeadPhones should be off by default."); assertTrue(headphones.isWireless(), "HeadPhones should be wireless by default."); assertArrayEquals(new String[] {"Beats"}, new String[] {"Beats"}); - assertEquals(BoostMode.BASS_BOOST, headphones.getCurrentBoostMode(), "BASS_BOOST should be the default setting."); + assertEquals( + BoostMode.BASS_BOOST, + headphones.getCurrentMode(), + "BASS_BOOST should be the default setting."); } @Test @@ -118,17 +121,29 @@ public void testwirelessConnection_connectionNotFound() throws Exception { .hasMessage("Headphones Wireless Connection Not Found."); } - @Test + @Test public void testBoostMode() { - assertEquals(BoostMode.BASS_BOOST, headphones.getCurrentBoostMode(), "BASS_BOOST should be the default setting."); - + assertEquals( + BoostMode.BASS_BOOST, + headphones.getCurrentMode(), + "BASS_BOOST should be the default setting."); + headphones.nextBoostMode(); - assertEquals(BoostMode.VOCAL_BOOST, headphones.getCurrentBoostMode(), "The next Boost setting should be VOCAL."); + assertEquals( + BoostMode.VOCAL_BOOST, + headphones.getCurrentMode(), + "The next Boost setting should be VOCAL."); headphones.nextBoostMode(); - assertEquals(BoostMode.TREBLE_BOOST, headphones.getCurrentBoostMode(), "The next Boost setting should be TREBLE."); + assertEquals( + BoostMode.TREBLE_BOOST, + headphones.getCurrentMode(), + "The next Boost setting should be TREBLE."); headphones.nextBoostMode(); - assertEquals(BoostMode.BASS_BOOST, headphones.getCurrentBoostMode(), "BoostMode cycle should return to BASS_BOOST."); + assertEquals( + BoostMode.BASS_BOOST, + headphones.getCurrentMode(), + "BoostMode cycle should return to BASS_BOOST."); } } From 38c532359548827c2872659213915a9fafcf00c7 Mon Sep 17 00:00:00 2001 From: haldanek Date: Tue, 5 Nov 2024 16:52:10 +0000 Subject: [PATCH 16/19] chore: down to one failing test --- .../lesson16/KimberleeObject/HeadPhones.java | 31 ++++++++++--------- .../KimberleeObjectTest/HeadPhonesTest.java | 28 +++++++++-------- 2 files changed, 32 insertions(+), 27 deletions(-) diff --git a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObject/HeadPhones.java b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObject/HeadPhones.java index e07053c22..ff260193d 100644 --- a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObject/HeadPhones.java +++ b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObject/HeadPhones.java @@ -9,11 +9,27 @@ public class HeadPhones { private HeadPhoneColor headPhoneColor = HeadPhoneColor.BLACK; private boolean isWireless = true; private String brands = "Beats"; + boolean isPreferredBrand = BrandUtils.isPreferredBrand(brands); private boolean isConnectedToBluetooth = false; private BoostMode currentMode; private BoostMode[] modes = BoostMode.values(); private int currentModeIndex = 0; + public void HeadPhones() { + this.currentMode = BoostMode.BASS_BOOST; + System.out.println("Constructor called: currentMode set to " + currentMode); + } + + public void nextBoostMode() { + currentModeIndex = (currentModeIndex + 1) % modes.length; + currentMode = modes[currentModeIndex]; + } + + public BoostMode getCurrentMode() { + System.out.println("getCurrentMode called: currentMode is " + currentMode); + return currentMode; + } + public enum HeadPhoneColor { RED, BLUE, @@ -38,11 +54,7 @@ public enum BoostMode { TREBLE_BOOST; } - public void headPhones() { - this.currentMode = BoostMode.BASS_BOOST; - } - - public int getVolume(int i) { + public int getVolume() { return volume; } @@ -118,13 +130,4 @@ public void wirelessConnection() throws ConnectionNotFoundException { throw new ConnectionNotFoundException("Headphones Wireless Connection Not Found."); } } - - public void nextBoostMode() { - currentModeIndex = (currentModeIndex + 1) % modes.length; - currentMode = modes[currentModeIndex]; - } - - public BoostMode getCurrentMode() { - return currentMode; - } } diff --git a/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/KimberleeObjectTest/HeadPhonesTest.java b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/KimberleeObjectTest/HeadPhonesTest.java index 907bbc121..9b1a71ae5 100644 --- a/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/KimberleeObjectTest/HeadPhonesTest.java +++ b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/KimberleeObjectTest/HeadPhonesTest.java @@ -3,7 +3,6 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.junit.jupiter.api.Assertions.*; -import com.codedifferently.lesson16.KimberleeObject.BrandsArray; import com.codedifferently.lesson16.KimberleeObject.ConnectionNotFoundException; import com.codedifferently.lesson16.KimberleeObject.HeadPhones; import com.codedifferently.lesson16.KimberleeObject.HeadPhones.BoostMode; @@ -22,7 +21,7 @@ public void setUp() { @Test public void testDefaultState() { - assertEquals(0, headphones.getVolume(0), "Volume should be 0 by default."); + assertEquals(0, headphones.getVolume(), "Volume should be 0 by default."); assertEquals( HeadPhoneColor.BLACK, headphones.getHeadPhoneColor(), "Color should be black by default."); assertFalse(headphones.isPoweredOn(), "HeadPhones should be off by default."); @@ -57,12 +56,12 @@ public void testIncreaseVolume() { // Arrange headphones.turnOn(); headphones.increaseVolume(); - assertEquals(1, headphones.getVolume(0), "Volume should increase by 1"); + assertEquals(1, headphones.getVolume(), "Volume should increase by 1"); // Act headphones.setVolume(99); headphones.increaseVolume(); // Assert - assertEquals(100, headphones.getVolume(0), "Volume should not exceed 100."); + assertEquals(100, headphones.getVolume(), "Volume should not exceed 100."); } @Test @@ -71,11 +70,11 @@ public void testDecreaseVolume() { headphones.turnOn(); headphones.setVolume(1); headphones.decreaseVolume(); - assertEquals(0, headphones.getVolume(0), "Volume should decrease to 0."); + assertEquals(0, headphones.getVolume(), "Volume should decrease to 0."); // Act headphones.decreaseVolume(); // Assert - assertEquals(0, headphones.getVolume(0), "Volume should not go lower than 0."); + assertEquals(0, headphones.getVolume(), "Volume should not go lower than 0."); } @Test @@ -92,19 +91,22 @@ public void testSetColor() { @Test public void testPreferredBrand() { // Assert - assertTrue(BrandsArray.isPreferredBrand("Beats"), "Beats should be a preferred brand."); - assertTrue(BrandsArray.isPreferredBrand("Sony"), "Sony should be a preferred brand."); - assertFalse(BrandsArray.isPreferredBrand("Apple"), "Apple should not be a preferred brand."); assertTrue( - BrandsArray.isPreferredBrand("SkullCandy"), "SkullCandy should be a preferred brand."); - assertTrue(BrandsArray.isPreferredBrand("Juicy"), "Juicy should be a preferred brand."); + HeadPhones.BrandUtils.isPreferredBrand("Beats"), "Beats should be a preferred brand."); + assertTrue(HeadPhones.BrandUtils.isPreferredBrand("Sony"), "Sony should be a preferred brand."); + assertFalse( + HeadPhones.BrandUtils.isPreferredBrand("Apple"), "Apple should not be a preferred brand."); + assertTrue( + HeadPhones.BrandUtils.isPreferredBrand("SkullCandy"), + "SkullCandy should be a preferred brand."); + assertTrue( + HeadPhones.BrandUtils.isPreferredBrand("Juicy"), "Juicy should be a preferred brand."); } @Test public void testwirelessConnection() throws Exception { // Arrange - headphones.isPoweredOn(); - headphones.isWireless(); + headphones.turnOn(); // Act headphones.connectToBluetooth(); // Assert From 2431eb57ef84d2145cbbcac8cb63d77b4d8dae0d Mon Sep 17 00:00:00 2001 From: haldanek Date: Tue, 5 Nov 2024 17:10:58 +0000 Subject: [PATCH 17/19] chore: fixed final test --- .../lesson16/KimberleeObject/HeadPhones.java | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObject/HeadPhones.java b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObject/HeadPhones.java index ff260193d..1aec79795 100644 --- a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObject/HeadPhones.java +++ b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObject/HeadPhones.java @@ -11,11 +11,18 @@ public class HeadPhones { private String brands = "Beats"; boolean isPreferredBrand = BrandUtils.isPreferredBrand(brands); private boolean isConnectedToBluetooth = false; + + public enum BoostMode { + BASS_BOOST, + VOCAL_BOOST, + TREBLE_BOOST; + } + private BoostMode currentMode; private BoostMode[] modes = BoostMode.values(); private int currentModeIndex = 0; - public void HeadPhones() { + public HeadPhones() { this.currentMode = BoostMode.BASS_BOOST; System.out.println("Constructor called: currentMode set to " + currentMode); } @@ -48,11 +55,7 @@ public void BrandsArray() { brands[4] = "Juicy"; } - public enum BoostMode { - BASS_BOOST, - VOCAL_BOOST, - TREBLE_BOOST; - } + public int getVolume() { return volume; @@ -70,8 +73,8 @@ public boolean isWireless() { return isWireless; } - public String getBrandsArray() { - return brands; + public String[] getBrandsArray() { + return BrandUtils.PREFERRED_BRANDS; } public void turnOn() { From 83021eda5e2948ac35dd759333f8f27422c36933 Mon Sep 17 00:00:00 2001 From: haldanek Date: Sun, 17 Nov 2024 21:42:14 +0000 Subject: [PATCH 18/19] chore: made requested changes, deleted redundant classes --- .../lesson16/KimberleeObject/BrandsArray.java | 16 ---------------- .../lesson16/KimberleeObject/HeadPhones.java | 6 ++---- .../KimberleeObject/WirelessConnection.java | 11 ----------- 3 files changed, 2 insertions(+), 31 deletions(-) delete mode 100644 lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObject/BrandsArray.java delete mode 100644 lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObject/WirelessConnection.java diff --git a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObject/BrandsArray.java b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObject/BrandsArray.java deleted file mode 100644 index fde6d06bc..000000000 --- a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObject/BrandsArray.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.codedifferently.lesson16.KimberleeObject; - -import java.util.Arrays; -import java.util.List; - -public class BrandsArray { - - // Preferred brands stored in a List - private static final List PREFERRED_BRANDS = - Arrays.asList("Beats", "Sony", "Bose", "SkullCandy", "Juicy"); - - // Method to check if a brand is preferred - public static Boolean isPreferredBrand(String brand) { - return PREFERRED_BRANDS.contains(brand); - } -} diff --git a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObject/HeadPhones.java b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObject/HeadPhones.java index 1aec79795..d507c363b 100644 --- a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObject/HeadPhones.java +++ b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObject/HeadPhones.java @@ -9,9 +9,9 @@ public class HeadPhones { private HeadPhoneColor headPhoneColor = HeadPhoneColor.BLACK; private boolean isWireless = true; private String brands = "Beats"; - boolean isPreferredBrand = BrandUtils.isPreferredBrand(brands); + boolean isPreferredBrand = BrandUtils.isPreferredBrand(brands); private boolean isConnectedToBluetooth = false; - + public enum BoostMode { BASS_BOOST, VOCAL_BOOST, @@ -55,8 +55,6 @@ public void BrandsArray() { brands[4] = "Juicy"; } - - public int getVolume() { return volume; } diff --git a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObject/WirelessConnection.java b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObject/WirelessConnection.java deleted file mode 100644 index 3f97bd4b4..000000000 --- a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/KimberleeObject/WirelessConnection.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.codedifferently.lesson16.KimberleeObject; - -public class WirelessConnection { - WirelessConnection wirelessConnection; - - public void get(boolean isConnectedToBluetooth) { - if (!isConnectedToBluetooth) { - return; - } - } -} From 0e0eb2d58b241d63ca20d3c7442aec3566ce0f5a Mon Sep 17 00:00:00 2001 From: "Anthony D. Mays" Date: Tue, 19 Nov 2024 23:08:33 +0000 Subject: [PATCH 19/19] chore: undo rename Signed-off-by: Anthony D. Mays --- .../main/{ => java}/com/codedifferently/lesson16/Lesson16.java | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename lesson_16/objects/objects_app/src/main/{ => java}/com/codedifferently/lesson16/Lesson16.java (100%) diff --git a/lesson_16/objects/objects_app/src/main/com/codedifferently/lesson16/Lesson16.java b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/Lesson16.java similarity index 100% rename from lesson_16/objects/objects_app/src/main/com/codedifferently/lesson16/Lesson16.java rename to lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/Lesson16.java