Merge remote-tracking branch 'origin/league-model'

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

1 files changed, 8 insertions, 7 deletions

diff --git a/src/test/java/design/model/ClubTest.java b/src/test/java/design/model/ClubTest.java
index 68f87bc..9ac8130 100644
--- a/src/test/java/design/model/ClubTest.java
+++ b/src/test/java/design/model/ClubTest.java
@@ -15,7 +15,8 @@ public class ClubTest {
     @Test
     void testConstructor()
     {
-        Club testClub = new Club(0, "John Doe", "The Slammer", ClubType.DRIVER);
+        Club testClub = new Club("John Doe", "The Slammer", ClubType.DRIVER);
+
         assertEquals(0, testClub.getId());
         assertEquals("John Doe", testClub.getManufacture());
         assertEquals("The Slammer", testClub.getNickname());
@@ -25,35 +26,35 @@ public class ClubTest {
     @Test
     void testGetClubType()
     {
-        Club testClub = new Club(0, "John Doe", "The Slammer", ClubType.DRIVER);
+        Club testClub = new Club("John Doe", "The Slammer", ClubType.DRIVER);
         assertEquals(ClubType.DRIVER, testClub.getClubType());
     }
 
     @Test
     void testGetNickname()
     {
-        Club testClub = new Club(0, "John Doe", "The Slammer", ClubType.DRIVER);
+        Club testClub = new Club("John Doe", "The Slammer", ClubType.DRIVER);
         assertEquals("The Slammer", testClub.getNickname());
     }
 
     @Test
     void testGetManufacture()
     {
-        Club testClub = new Club(0, "John Doe", "The Slammer", ClubType.DRIVER);
+        Club testClub = new Club("John Doe", "The Slammer", ClubType.DRIVER);
         assertEquals("John Doe", testClub.getManufacture());
     }
 
     @Test
     void testGetId()
     {
-        Club testClub = new Club(0, "John Doe", "The Slammer", ClubType.DRIVER);
-        assertEquals(0, testClub.getId());
+        Club testClub = new Club("John Doe", "The Slammer", ClubType.DRIVER);
+        assertEquals(-1, testClub.getId());
     }
 
     @Test
     void testToString()
     {
-        Club testClub = new Club(0, "John Doe", "The Slammer", ClubType.DRIVER);
+        Club testClub = new Club("John Doe", "The Slammer", ClubType.DRIVER);
         String expectedString = "#0 The Slammer - John Doe (DRIVER)";
         assertEquals(expectedString, testClub.toString());
     }