Merge branch 'main' into league-modelleague-model

# Conflicts:
#	src/main/java/design/controller/userinput/menus/MainMenu.java
#	src/main/java/design/model/Golfer.java
#	src/main/java/design/model/ScrambleLeague.java
#	src/test/java/design/model/GolferTest.java
#	test.xml

1 files changed, 27 insertions, 2 deletions

diff --git a/src/test/java/design/model/ClubTest.java b/src/test/java/design/model/ClubTest.java
index 9ac8130..f47405f 100644
--- a/src/test/java/design/model/ClubTest.java
+++ b/src/test/java/design/model/ClubTest.java
@@ -1,6 +1,13 @@
 package design.model;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Modifier;
+
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 
@@ -17,13 +24,23 @@ public class ClubTest {
     {
         Club testClub = new Club("John Doe", "The Slammer", ClubType.DRIVER);
 
-        assertEquals(0, testClub.getId());
+        assertEquals(-1, testClub.getId());
         assertEquals("John Doe", testClub.getManufacture());
         assertEquals("The Slammer", testClub.getNickname());
         assertEquals(ClubType.DRIVER, testClub.getClubType());
     }
 
     @Test
+    void testPrivateConstructor() throws Exception
+    {
+        Constructor<Club> constructor = Club.class.getDeclaredConstructor(int.class, String.class, String.class, ClubType.class);
+        assertTrue(Modifier.isPrivate(constructor.getModifiers()));
+        constructor.setAccessible(true);
+        Club testClub = constructor.newInstance(0, "John Doe", "The Slammer", ClubType.DRIVER);
+        assertNotNull(testClub);
+    }
+
+    @Test
     void testGetClubType()
     {
         Club testClub = new Club("John Doe", "The Slammer", ClubType.DRIVER);
@@ -52,10 +69,18 @@ public class ClubTest {
     }
 
     @Test
+    void testSetId()
+    {
+        Club testClub = new Club("John Doe", "The Slammer", ClubType.DRIVER);
+        testClub.setId(10);
+        assertThrows(AssertionError.class, () -> testClub.setId(5));
+    }
+
+    @Test
     void testToString()
     {
         Club testClub = new Club("John Doe", "The Slammer", ClubType.DRIVER);
-        String expectedString = "#0 The Slammer - John Doe (DRIVER)";
+        String expectedString = "#-1 The Slammer - John Doe (DRIVER)";
         assertEquals(expectedString, testClub.toString());
     }
 }