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, 9 insertions, 7 deletions

diff --git a/src/test/java/design/model/ClubTest.java b/src/test/java/design/model/ClubTest.java
index 0b515ac..9ac8130 100644
--- a/src/test/java/design/model/ClubTest.java
+++ b/src/test/java/design/model/ClubTest.java
@@ -16,6 +16,8 @@ public class ClubTest {
     void testConstructor()
     {
         Club testClub = new Club("John Doe", "The Slammer", ClubType.DRIVER);
+
+        assertEquals(0, testClub.getId());
         assertEquals("John Doe", testClub.getManufacture());
         assertEquals("The Slammer", testClub.getNickname());
         assertEquals(ClubType.DRIVER, testClub.getClubType());
@@ -49,11 +51,11 @@ public class ClubTest {
         assertEquals(-1, testClub.getId());
     }
 
-    // @Test
-    // void testToString()
-    // {
-    //     Club testClub = new Club("John Doe", "The Slammer", ClubType.DRIVER);
-    //     String expectedString = "#0 The Slammer - John Doe (DRIVER)";
-    //     assertEquals(expectedString, testClub.toString());
-    // }
+    @Test
+    void testToString()
+    {
+        Club testClub = new Club("John Doe", "The Slammer", ClubType.DRIVER);
+        String expectedString = "#0 The Slammer - John Doe (DRIVER)";
+        assertEquals(expectedString, testClub.toString());
+    }
 }