Merge branch 'main' into import-exportimport-export

# Conflicts:
#	data/personaldb.json
#	src/main/java/design/controller/userinput/menus/MainMenu.java
#	src/main/java/design/persistence/JSONLeagueDatabase.java
#	src/main/java/design/persistence/JSONPersonalDatabase.java
#	src/test/java/design/model/ClubTest.java
#	src/test/java/design/model/GolferTest.java

1 files changed, 34 insertions, 29 deletions

diff --git a/src/test/java/design/model/GolferTest.java b/src/test/java/design/model/GolferTest.java
index 64ac9ac..a73997a 100644
--- a/src/test/java/design/model/GolferTest.java
+++ b/src/test/java/design/model/GolferTest.java
@@ -32,15 +32,15 @@ public class GolferTest {
         assertTrue(testGolfer.checkPassword("weback4321"));
     }
 
-    // @Test
-    // void testPrivateConstructor() throws Exception 
-    // {
-    //     Constructor<Golfer> constructor = Golfer.class.getDeclaredConstructor(String.class, int.class, String.class, List.class, List.class, List.class);
-    //     assertTrue(Modifier.isPrivate(constructor.getModifiers()));
-    //     constructor.setAccessible(true);
-    //     Golfer testGolfer = constructor.newInstance("testUser", 12345, "Test Golfer", new ArrayList<>(), new ArrayList<>(), new ArrayList<>());
-    //     assertNotNull(testGolfer);
-    // }
+    @Test
+    void testPrivateConstructor() throws Exception
+    {
+        Constructor<Golfer> constructor = Golfer.class.getDeclaredConstructor(String.class, int.class, String.class, List.class, List.class, List.class);
+        assertTrue(Modifier.isPrivate(constructor.getModifiers()));
+        constructor.setAccessible(true);
+        Golfer testGolfer = constructor.newInstance("testUser", 12345, "Test Golfer", new ArrayList<>(), new ArrayList<>(), new ArrayList<>());
+        assertNotNull(testGolfer);
+    }
 
     @Test
     void testSetUserName()
@@ -103,26 +103,31 @@ public class GolferTest {
         assertEquals(exampleRound, testGolfer.getRounds()[0]);
     }
 
-    // @Test
-    // void testAddClub()
-    // {
-    //     Golfer testGolfer = new Golfer("John Doe", "jdoesgolf2", "weback4321");
-    //     testGolfer.addClub("John Doe", "The Slammer", ClubType.DRIVER);
-    //     Club addedClub = testGolfer.getClubs()[0];
-    //     assertTrue(testGolfer.hasClub(addedClub));
-    //     assertTrue(testGolfer.hasClubs());
-    // }
-
-    // @Test
-    // void testRemoveClub()
-    // {
-    //     Golfer testGolfer = new Golfer("John Doe", "jdoesgolf2", "weback4321");
-    //     testGolfer.addClub("John Doe", "The Slammer", ClubType.DRIVER);
-    //     Club addedClub = testGolfer.getClubs()[0];
-    //     testGolfer.removeClub(addedClub);
-    //     assertFalse(testGolfer.hasClub(addedClub));
-    //     assertFalse(testGolfer.hasClubs());
-    // }
+    @Test
+    void testAddClub()
+    {
+        Golfer testGolfer = new Golfer("John Doe", "jdoesgolf2", "weback4321");
+
+        Club c = new Club("John Doe", "The Slammer", ClubType.DRIVER);
+        testGolfer.addClub(c);
+        Club addedClub = testGolfer.getClubs()[0];
+        assertTrue(testGolfer.hasClub(addedClub));
+        assertTrue(testGolfer.hasClubs());
+    }
+
+    @Test
+    void testRemoveClub()
+    {
+        Golfer testGolfer = new Golfer("John Doe", "jdoesgolf2", "weback4321");
+
+        Club c = new Club("John Doe", "The Slammer", ClubType.DRIVER);
+        testGolfer.addClub(c);
+        Club addedClub = testGolfer.getClubs()[0];
+        testGolfer.removeClub(addedClub);
+        assertFalse(testGolfer.hasClub(addedClub));
+        assertFalse(testGolfer.hasClubs());
+
+    }
 
     @Test
     void testToString()