From fc92fbb550e0ba6565a07c14a5b250475999eed3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CTezz03=E2=80=9D?= <“mmbradley@gmail.com”> Date: Tue, 25 Mar 2025 20:33:39 +0000 Subject: [PATCH 1/7] feat:mbLesson_09 --- .../dataprovider/montezBProviderProvider.java | 25 +++++ .../src/main/resources/data/montezb.json | 92 +++++++++++++++++++ 2 files changed, 117 insertions(+) create mode 100644 lesson_09/types/types_app/src/main/java/com/codedifferently/lesson9/dataprovider/montezBProviderProvider.java create mode 100644 lesson_09/types/types_app/src/main/resources/data/montezb.json diff --git a/lesson_09/types/types_app/src/main/java/com/codedifferently/lesson9/dataprovider/montezBProviderProvider.java b/lesson_09/types/types_app/src/main/java/com/codedifferently/lesson9/dataprovider/montezBProviderProvider.java new file mode 100644 index 000000000..266650d40 --- /dev/null +++ b/lesson_09/types/types_app/src/main/java/com/codedifferently/lesson9/dataprovider/montezBProviderProvider.java @@ -0,0 +1,25 @@ +package com.codedifferently.lesson9.dataprovider; + +import java.util.Map; + +import org.springframework.stereotype.Service; + +@Service +public class montezBProviderProvider extends DataProvider { + public String getProviderName() { + return "montezBProvider"; + } + + public Map getColumnTypeByName() { + return Map.of( + "column1", Boolean.class, + "column2", Float.class, + "column3", Double.class, + "column4", Short.class, + "column5", Integer.class, + "column6", String.class, + "column7", Long.class); + } +} + + diff --git a/lesson_09/types/types_app/src/main/resources/data/montezb.json b/lesson_09/types/types_app/src/main/resources/data/montezb.json new file mode 100644 index 000000000..1d8cbf9a5 --- /dev/null +++ b/lesson_09/types/types_app/src/main/resources/data/montezb.json @@ -0,0 +1,92 @@ +[ + { + "column1": "false", + "column2": "2.0165133E38", + "column3": "2.7989049813330837E307", + "column4": "416", + "column5": "435833166", + "column6": "3cuw2", + "column7": "3530240046379697664" + }, + { + "column1": "true", + "column2": "1.460264E37", + "column3": "2.9225361274287315E307", + "column4": "17516", + "column5": "260615671", + "column6": "8j52s4aq6d", + "column7": "65341810874192888" + }, + { + "column1": "true", + "column2": "2.776658E38", + "column3": "2.0826943783702183E307", + "column4": "31533", + "column5": "161572734", + "column6": "s8yavhue1", + "column7": "4903929290600323072" + }, + { + "column1": "true", + "column2": "1.3027212E38", + "column3": "1.1914573950682302E308", + "column4": "29377", + "column5": "451167147", + "column6": "2at5p9weyni", + "column7": "1756929147146946048" + }, + { + "column1": "true", + "column2": "1.6506819E38", + "column3": "3.7690907310588337E307", + "column4": "23676", + "column5": "405162496", + "column6": "migsey8lk", + "column7": "5227682372169227264" + }, + { + "column1": "true", + "column2": "6.687427E37", + "column3": "1.7507811122323619E308", + "column4": "763", + "column5": "385548066", + "column6": "ni6d58js04u", + "column7": "814327769818061056" + }, + { + "column1": "false", + "column2": "2.6281565E38", + "column3": "3.3046191712251996E307", + "column4": "29441", + "column5": "497419740", + "column6": "7ypumj83a", + "column7": "6639371891920120832" + }, + { + "column1": "false", + "column2": "9.816115E37", + "column3": "1.3824553928097414E308", + "column4": "3537", + "column5": "753736722", + "column6": "68aglu4", + "column7": "1905184695820989696" + }, + { + "column1": "false", + "column2": "2.674275E38", + "column3": "1.562287548934654E308", + "column4": "25482", + "column5": "2121817019", + "column6": "2plvf", + "column7": "8721696529208318976" + }, + { + "column1": "true", + "column2": "7.985794E37", + "column3": "1.377992454751497E308", + "column4": "29060", + "column5": "1516947099", + "column6": "c4685r9", + "column7": "5859838884205409280" + } +] \ No newline at end of file From c57408a27f530a49c41e68e9e8fa1f979efef61e Mon Sep 17 00:00:00 2001 From: Tezz03 <105926982+Tezz03@users.noreply.github.com> Date: Fri, 28 Mar 2025 11:05:16 -0400 Subject: [PATCH 2/7] Delete lesson_09/types/types_app/src/main/java/com/codedifferently/lesson9/dataprovider/montezBProviderProvider.java --- .../dataprovider/montezBProviderProvider.java | 25 ------------------- 1 file changed, 25 deletions(-) delete mode 100644 lesson_09/types/types_app/src/main/java/com/codedifferently/lesson9/dataprovider/montezBProviderProvider.java diff --git a/lesson_09/types/types_app/src/main/java/com/codedifferently/lesson9/dataprovider/montezBProviderProvider.java b/lesson_09/types/types_app/src/main/java/com/codedifferently/lesson9/dataprovider/montezBProviderProvider.java deleted file mode 100644 index 266650d40..000000000 --- a/lesson_09/types/types_app/src/main/java/com/codedifferently/lesson9/dataprovider/montezBProviderProvider.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.codedifferently.lesson9.dataprovider; - -import java.util.Map; - -import org.springframework.stereotype.Service; - -@Service -public class montezBProviderProvider extends DataProvider { - public String getProviderName() { - return "montezBProvider"; - } - - public Map getColumnTypeByName() { - return Map.of( - "column1", Boolean.class, - "column2", Float.class, - "column3", Double.class, - "column4", Short.class, - "column5", Integer.class, - "column6", String.class, - "column7", Long.class); - } -} - - From af8eef31ed00826ff3c0769c2d4651a28a43233e Mon Sep 17 00:00:00 2001 From: Tezz03 <105926982+Tezz03@users.noreply.github.com> Date: Fri, 28 Mar 2025 11:06:34 -0400 Subject: [PATCH 3/7] Delete lesson_09/types/types_app/src/main/resources/data/montezb.json --- .../src/main/resources/data/montezb.json | 92 ------------------- 1 file changed, 92 deletions(-) delete mode 100644 lesson_09/types/types_app/src/main/resources/data/montezb.json diff --git a/lesson_09/types/types_app/src/main/resources/data/montezb.json b/lesson_09/types/types_app/src/main/resources/data/montezb.json deleted file mode 100644 index 1d8cbf9a5..000000000 --- a/lesson_09/types/types_app/src/main/resources/data/montezb.json +++ /dev/null @@ -1,92 +0,0 @@ -[ - { - "column1": "false", - "column2": "2.0165133E38", - "column3": "2.7989049813330837E307", - "column4": "416", - "column5": "435833166", - "column6": "3cuw2", - "column7": "3530240046379697664" - }, - { - "column1": "true", - "column2": "1.460264E37", - "column3": "2.9225361274287315E307", - "column4": "17516", - "column5": "260615671", - "column6": "8j52s4aq6d", - "column7": "65341810874192888" - }, - { - "column1": "true", - "column2": "2.776658E38", - "column3": "2.0826943783702183E307", - "column4": "31533", - "column5": "161572734", - "column6": "s8yavhue1", - "column7": "4903929290600323072" - }, - { - "column1": "true", - "column2": "1.3027212E38", - "column3": "1.1914573950682302E308", - "column4": "29377", - "column5": "451167147", - "column6": "2at5p9weyni", - "column7": "1756929147146946048" - }, - { - "column1": "true", - "column2": "1.6506819E38", - "column3": "3.7690907310588337E307", - "column4": "23676", - "column5": "405162496", - "column6": "migsey8lk", - "column7": "5227682372169227264" - }, - { - "column1": "true", - "column2": "6.687427E37", - "column3": "1.7507811122323619E308", - "column4": "763", - "column5": "385548066", - "column6": "ni6d58js04u", - "column7": "814327769818061056" - }, - { - "column1": "false", - "column2": "2.6281565E38", - "column3": "3.3046191712251996E307", - "column4": "29441", - "column5": "497419740", - "column6": "7ypumj83a", - "column7": "6639371891920120832" - }, - { - "column1": "false", - "column2": "9.816115E37", - "column3": "1.3824553928097414E308", - "column4": "3537", - "column5": "753736722", - "column6": "68aglu4", - "column7": "1905184695820989696" - }, - { - "column1": "false", - "column2": "2.674275E38", - "column3": "1.562287548934654E308", - "column4": "25482", - "column5": "2121817019", - "column6": "2plvf", - "column7": "8721696529208318976" - }, - { - "column1": "true", - "column2": "7.985794E37", - "column3": "1.377992454751497E308", - "column4": "29060", - "column5": "1516947099", - "column6": "c4685r9", - "column7": "5859838884205409280" - } -] \ No newline at end of file From 5991273ad6327cb4b1ac6701e24fcee97ceca0dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CTezz03=E2=80=9D?= <“mmbradley@gmail.com”> Date: Fri, 11 Apr 2025 16:08:42 +0000 Subject: [PATCH 4/7] feat:create java file and test file --- .../lesson16/playerleveling/Player.java | 96 +++++++++++++++++++ 1 file changed, 96 insertions(+) create mode 100644 lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/playerleveling/Player.java diff --git a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/playerleveling/Player.java b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/playerleveling/Player.java new file mode 100644 index 000000000..452cd2bdb --- /dev/null +++ b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/playerleveling/Player.java @@ -0,0 +1,96 @@ +package com.codedifferently.lesson16.playerleveling; + + +public class Player { + private String name; + private Type type; + private int level; + private double currentExperience; + private int expPerFight; + private boolean isAlive; + + public enum Type { + HUMAN, + ELF, + ORC, + DRAGONIOD + } + + public Player ( String name, Type type, int level, double currentExperience, int expPerFight, boolean isAlive) { + this.name = name; + this.type = type; + this.level = level; + this.currentExperience = currentExperience; + this.expPerFight = expPerFight; + this.isAlive = isAlive; + } + + // Getters and Setters + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public Type getType() { + return type; + } + + public void setType(Type characterType) { + this.type = characterType; + } + public int getLevel() { + return level; +} + + public void setLevel(int level) { + this.level = level; +} + + public double getCurrentExperience() { + return currentExperience; + } + + public void setCurrentExperiience (double currentExperience) { + this.currentExperience = currentExperience; + } + + public int getExpPerFight() { + return expPerFight; + } + + public void setExpPerFight ( int expPerFight) { + this.expPerFight = expPerFight; + + } + + public boolean getIsAlive() { + return isAlive; + } + + + public void gainExperience(int fights) { + for (int i = 0; i < fights; i++) { + currentExperience += expPerFight; + + double requiredExp = 100 * Math.pow(2, level - 1); // Level 1: 100 XP, Level 2: 200 XP, etc. + + while (currentExperience >= requiredExp) { + currentExperience -= requiredExp; // carry over any extra XP + level++; + System.out.println(name + " leveled up to level " + level + "!"); + requiredExp = 100 * Math.pow(2, level - 1); // Update the required XP for the new level + } + } + // used ai for lines between 85 and 97 + } +} + + + + + + //int level = 1; int experience = 0; for(int i = 1; i <= 100; i++) { From 604f2c9d2010a7dcee12dee0497342a5e0050064 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CTezz03=E2=80=9D?= <“mmbradley@gmail.com”> Date: Fri, 11 Apr 2025 20:31:28 +0000 Subject: [PATCH 5/7] fix:upload more tests --- .../lesson16/playertest/PlayerTest.java | 106 ++++++++++++++++++ 1 file changed, 106 insertions(+) create mode 100644 lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/playertest/PlayerTest.java diff --git a/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/playertest/PlayerTest.java b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/playertest/PlayerTest.java new file mode 100644 index 000000000..cb29a06ec --- /dev/null +++ b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/playertest/PlayerTest.java @@ -0,0 +1,106 @@ +package com.codedifferently.lesson16.playertest; +import java.util.ArrayList; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import org.junit.jupiter.api.Test; + +import com.codedifferently.lesson16.playerleveling.Player; +import com.codedifferently.lesson16.playerleveling.Player.Type; + + public class PlayerTest { + + @Test + public void getName() { + var expectedName = "JinWhoo"; + + Player player1 = new Player("JinWhoo", null, 0, 0, 0, true); + + var actual = player1.getName(); + + assertEquals(expectedName, actual); + } + + @Test + public void setName() { + var expectedName = "Montez"; + + Player player = new Player("JinWhoo", null, 0, 0, 0, true); + + player.setName(expectedName); + + assertEquals(expectedName, player.getName()); + } + + @Test + public void getType() { + Player player1 = new Player(null, Player.Type.DRAGONIOD, 0, 0, 0, true); + Type expected = Type.DRAGONIOD; + assertEquals(expected, player1.getType()); + } + + @Test + public void setType() { + Player player = new Player(null, Player.Type.HUMAN, 0, 0, 0, true); + player.setType(Player.Type.ELF); + assertEquals(Player.Type.ELF, player.getType()); + } + + @Test + public void getLevel() { + Player player = new Player(null, null, 5, 0, 0, true); + assertEquals(5, player.getLevel()); + } + + @Test + public void setLevel() { + Player player = new Player(null, null, 1, 0, 0, true); + player.setLevel(10); + assertEquals(10, player.getLevel()); + } + + @Test + public void getCurrentExperience() { + Player player = new Player(null, null, 0, 150.5, 0, true); + assertEquals(150.5, player.getCurrentExperience()); + } + + @Test + public void setCurrentExperience() { + Player player = new Player(null, null, 0, 0, 0, true); + player.setCurrentExperiience(200.75); + assertEquals(200.75, player.getCurrentExperience()); + } + + @Test + public void getExpPerFight() { + Player player = new Player(null, null, 0, 0, 50, true); + assertEquals(50, player.getExpPerFight()); + } + + @Test + public void setExpPerFight() { + Player player = new Player(null, null, 0, 0, 0, true); + player.setExpPerFight(100); + assertEquals(100, player.getExpPerFight()); + } + + @Test + public void getIsAlive() { + Player player = new Player(null, null, 0, 0, 0, true); + assertTrue(player.getIsAlive()); + } + + @Test +public void testLevelUpOnce() { + ArrayList abilities = new ArrayList<>(); + Player player1 = new Player("Jordan", Player.Type.HUMAN, 1, 0, 100, true); + + player1.gainExperience(1); // 1 fight = 100 XP + + assertEquals(2, player1.getLevel()); // Should now be level 2 + assertEquals(0, player1.getCurrentExperience()); // XP resets after exact level up + } + } + +// String name, Type type, int level, double currentExperience, int expPerFight, ArrayList unlockedAbilities, boolean isAlive \ No newline at end of file From 7fe4780a6665f1911e24c2c5369ee600f410e145 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CTezz03=E2=80=9D?= <“mmbradley@gmail.com”> Date: Fri, 11 Apr 2025 21:04:51 +0000 Subject: [PATCH 6/7] fix: to upload --- .../lesson16/playerleveling/Player.java | 95 +++++----- .../lesson16/playertest/PlayerTest.java | 179 +++++++++--------- 2 files changed, 139 insertions(+), 135 deletions(-) diff --git a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/playerleveling/Player.java b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/playerleveling/Player.java index 452cd2bdb..6de83c2c8 100644 --- a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/playerleveling/Player.java +++ b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/playerleveling/Player.java @@ -1,33 +1,38 @@ package com.codedifferently.lesson16.playerleveling; - public class Player { - private String name; - private Type type; - private int level; - private double currentExperience; - private int expPerFight; - private boolean isAlive; - - public enum Type { - HUMAN, - ELF, - ORC, - DRAGONIOD - } + private String name; + private Type type; + private int level; + private double currentExperience; + private int expPerFight; + private boolean isAlive; + + public enum Type { + HUMAN, + ELF, + ORC, + DRAGONIOD + } - public Player ( String name, Type type, int level, double currentExperience, int expPerFight, boolean isAlive) { - this.name = name; - this.type = type; - this.level = level; - this.currentExperience = currentExperience; - this.expPerFight = expPerFight; - this.isAlive = isAlive; - } + public Player( + String name, + Type type, + int level, + double currentExperience, + int expPerFight, + boolean isAlive) { + this.name = name; + this.type = type; + this.level = level; + this.currentExperience = currentExperience; + this.expPerFight = expPerFight; + this.isAlive = isAlive; + } - // Getters and Setters + // Getters and Setters - public String getName() { + public String getName() { return name; } @@ -42,55 +47,53 @@ public Type getType() { public void setType(Type characterType) { this.type = characterType; } + public int getLevel() { - return level; -} + return level; + } public void setLevel(int level) { this.level = level; -} + } public double getCurrentExperience() { return currentExperience; } - public void setCurrentExperiience (double currentExperience) { + public void setCurrentExperiience(double currentExperience) { this.currentExperience = currentExperience; } public int getExpPerFight() { + if (expPerFight <= 0) { + throw new IllegalStateException("Experience per fight must be greater than 0."); + } return expPerFight; } - public void setExpPerFight ( int expPerFight) { + public void setExpPerFight(int expPerFight) { this.expPerFight = expPerFight; - } public boolean getIsAlive() { return isAlive; } - public void gainExperience(int fights) { - for (int i = 0; i < fights; i++) { - currentExperience += expPerFight; + for (int i = 0; i < fights; i++) { + currentExperience += expPerFight; - double requiredExp = 100 * Math.pow(2, level - 1); // Level 1: 100 XP, Level 2: 200 XP, etc. + double requiredExp = 100 * Math.pow(2, level - 1); // Level 1: 100 XP, Level 2: 200 XP, etc. - while (currentExperience >= requiredExp) { - currentExperience -= requiredExp; // carry over any extra XP - level++; - System.out.println(name + " leveled up to level " + level + "!"); - requiredExp = 100 * Math.pow(2, level - 1); // Update the required XP for the new level - } + while (currentExperience >= requiredExp) { + currentExperience -= requiredExp; // carry over any extra XP + level++; + System.out.println(name + " leveled up to level " + level + "!"); + requiredExp = 100 * Math.pow(2, level - 1); // Update the required XP for the new level } - // used ai for lines between 85 and 97 + } + // used ai for lines between 85 and 97 } } - - - - - //int level = 1; int experience = 0; for(int i = 1; i <= 100; i++) { + // int level = 1; int experience = 0; for(int i = 1; i <= 100; i++) { diff --git a/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/playertest/PlayerTest.java b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/playertest/PlayerTest.java index cb29a06ec..9c8daea14 100644 --- a/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/playertest/PlayerTest.java +++ b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/playertest/PlayerTest.java @@ -1,98 +1,98 @@ package com.codedifferently.lesson16.playertest; -import java.util.ArrayList; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.jupiter.api.Test; import com.codedifferently.lesson16.playerleveling.Player; import com.codedifferently.lesson16.playerleveling.Player.Type; +import java.util.ArrayList; +import org.junit.jupiter.api.Test; + +public class PlayerTest { + + @Test + public void getName() { + var expectedName = "JinWhoo"; + + Player player1 = new Player("JinWhoo", null, 0, 0, 0, true); + + var actual = player1.getName(); + + assertEquals(expectedName, actual); + } + + @Test + public void setName() { + var expectedName = "Montez"; + + Player player = new Player("JinWhoo", null, 0, 0, 0, true); + + player.setName(expectedName); + + assertEquals(expectedName, player.getName()); + } + + @Test + public void getType() { + Player player1 = new Player(null, Player.Type.DRAGONIOD, 0, 0, 0, true); + Type expected = Type.DRAGONIOD; + assertEquals(expected, player1.getType()); + } + + @Test + public void setType() { + Player player = new Player(null, Player.Type.HUMAN, 0, 0, 0, true); + player.setType(Player.Type.ELF); + assertEquals(Player.Type.ELF, player.getType()); + } + + @Test + public void getLevel() { + Player player = new Player(null, null, 5, 0, 0, true); + assertEquals(5, player.getLevel()); + } + + @Test + public void setLevel() { + Player player = new Player(null, null, 1, 0, 0, true); + player.setLevel(10); + assertEquals(10, player.getLevel()); + } + + @Test + public void getCurrentExperience() { + Player player = new Player(null, null, 0, 150.5, 0, true); + assertEquals(150.5, player.getCurrentExperience()); + } + + @Test + public void setCurrentExperience() { + Player player = new Player(null, null, 0, 0, 0, true); + player.setCurrentExperiience(200.75); + assertEquals(200.75, player.getCurrentExperience()); + } + + @Test + public void getExpPerFight() { + Player player = new Player(null, null, 0, 0, 50, true); + assertEquals(50, player.getExpPerFight()); + } + + @Test + public void setExpPerFight() { + Player player = new Player(null, null, 0, 0, 0, true); + player.setExpPerFight(100); + assertEquals(100, player.getExpPerFight()); + } + + @Test + public void getIsAlive() { + Player player = new Player(null, null, 0, 0, 0, true); + assertTrue(player.getIsAlive()); + } - public class PlayerTest { - - @Test - public void getName() { - var expectedName = "JinWhoo"; - - Player player1 = new Player("JinWhoo", null, 0, 0, 0, true); - - var actual = player1.getName(); - - assertEquals(expectedName, actual); - } - - @Test - public void setName() { - var expectedName = "Montez"; - - Player player = new Player("JinWhoo", null, 0, 0, 0, true); - - player.setName(expectedName); - - assertEquals(expectedName, player.getName()); - } - - @Test - public void getType() { - Player player1 = new Player(null, Player.Type.DRAGONIOD, 0, 0, 0, true); - Type expected = Type.DRAGONIOD; - assertEquals(expected, player1.getType()); - } - - @Test - public void setType() { - Player player = new Player(null, Player.Type.HUMAN, 0, 0, 0, true); - player.setType(Player.Type.ELF); - assertEquals(Player.Type.ELF, player.getType()); - } - - @Test - public void getLevel() { - Player player = new Player(null, null, 5, 0, 0, true); - assertEquals(5, player.getLevel()); - } - - @Test - public void setLevel() { - Player player = new Player(null, null, 1, 0, 0, true); - player.setLevel(10); - assertEquals(10, player.getLevel()); - } - - @Test - public void getCurrentExperience() { - Player player = new Player(null, null, 0, 150.5, 0, true); - assertEquals(150.5, player.getCurrentExperience()); - } - - @Test - public void setCurrentExperience() { - Player player = new Player(null, null, 0, 0, 0, true); - player.setCurrentExperiience(200.75); - assertEquals(200.75, player.getCurrentExperience()); - } - - @Test - public void getExpPerFight() { - Player player = new Player(null, null, 0, 0, 50, true); - assertEquals(50, player.getExpPerFight()); - } - - @Test - public void setExpPerFight() { - Player player = new Player(null, null, 0, 0, 0, true); - player.setExpPerFight(100); - assertEquals(100, player.getExpPerFight()); - } - - @Test - public void getIsAlive() { - Player player = new Player(null, null, 0, 0, 0, true); - assertTrue(player.getIsAlive()); - } - - @Test -public void testLevelUpOnce() { + @Test + public void testLevelUpOnce() { ArrayList abilities = new ArrayList<>(); Player player1 = new Player("Jordan", Player.Type.HUMAN, 1, 0, 100, true); @@ -100,7 +100,8 @@ public void testLevelUpOnce() { assertEquals(2, player1.getLevel()); // Should now be level 2 assertEquals(0, player1.getCurrentExperience()); // XP resets after exact level up - } } +} -// String name, Type type, int level, double currentExperience, int expPerFight, ArrayList unlockedAbilities, boolean isAlive \ No newline at end of file +// String name, Type type, int level, double currentExperience, int expPerFight, ArrayList +// unlockedAbilities, boolean isAlive From abb3215b89d388228311307acae5c426fdb549d6 Mon Sep 17 00:00:00 2001 From: "Anthony D. Mays" Date: Wed, 23 Apr 2025 23:38:58 +0000 Subject: [PATCH 7/7] chore: fixes namespaces Signed-off-by: Anthony D. Mays --- .../lesson16/{playerleveling => player}/Player.java | 4 ++-- .../lesson16/{playertest => player}/PlayerTest.java | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) rename lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/{playerleveling => player}/Player.java (97%) rename lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/{playertest => player}/PlayerTest.java (94%) diff --git a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/playerleveling/Player.java b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/player/Player.java similarity index 97% rename from lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/playerleveling/Player.java rename to lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/player/Player.java index 6de83c2c8..2941a2f4d 100644 --- a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/playerleveling/Player.java +++ b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/player/Player.java @@ -1,6 +1,7 @@ -package com.codedifferently.lesson16.playerleveling; +package com.codedifferently.lesson16.player; public class Player { + private String name; private Type type; private int level; @@ -31,7 +32,6 @@ public Player( } // Getters and Setters - public String getName() { return name; } diff --git a/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/playertest/PlayerTest.java b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/player/PlayerTest.java similarity index 94% rename from lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/playertest/PlayerTest.java rename to lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/player/PlayerTest.java index 9c8daea14..b396f5dbc 100644 --- a/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/playertest/PlayerTest.java +++ b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/player/PlayerTest.java @@ -1,10 +1,9 @@ -package com.codedifferently.lesson16.playertest; +package com.codedifferently.lesson16.player; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import com.codedifferently.lesson16.playerleveling.Player; -import com.codedifferently.lesson16.playerleveling.Player.Type; +import com.codedifferently.lesson16.player.Player.Type; import java.util.ArrayList; import org.junit.jupiter.api.Test;