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

2 files changed, 20 insertions, 11 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());
     }
diff --git a/src/test/java/design/model/GolferTest.java b/src/test/java/design/model/GolferTest.java
index 52e6271..65229f3 100644
--- a/src/test/java/design/model/GolferTest.java
+++ b/src/test/java/design/model/GolferTest.java
@@ -33,7 +33,7 @@ public class GolferTest {
     }
 
     @Test
-    void testPrivateConstructor() throws Exception 
+    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()));
@@ -107,7 +107,9 @@ public class GolferTest {
     void testAddClub()
     {
         Golfer testGolfer = new Golfer("John Doe", "jdoesgolf2", "weback4321");
-        testGolfer.addClub("John Doe", "The Slammer", ClubType.DRIVER);
+
+        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());
@@ -117,7 +119,9 @@ public class GolferTest {
     void testRemoveClub()
     {
         Golfer testGolfer = new Golfer("John Doe", "jdoesgolf2", "weback4321");
-        testGolfer.addClub("John Doe", "The Slammer", ClubType.DRIVER);
+
+        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));
@@ -132,4 +136,8 @@ public class GolferTest {
         String expectedString = "John Doe (@jdoesgolf2)";
         assertEquals(expectedString, testGolfer.toString());
     }
-}
\ No newline at end of file
+
+
+
+}
+