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

4 files changed, 158 insertions, 36 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());
+    }
 }
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()
diff --git a/src/test/java/design/model/coursesearch/CourseListTest.java b/src/test/java/design/model/coursesearch/CourseListTest.java
new file mode 100644
index 0000000..7538ba5
--- /dev/null
+++ b/src/test/java/design/model/coursesearch/CourseListTest.java
@@ -0,0 +1,27 @@
+package design.model.coursesearch;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import java.util.ArrayList;
+
+import design.model.course_search.*;
+import design.model.Course;
+
+
+/** Unit Tests for the Club class.
+ * @author Willem Dalton
+ **/
+@Tag("Model-tier")
+public class CourseListTest {
+
+    @Test
+    void testConstructor()
+    {
+        CourseList testList = new CourseList();
+
+    }
+}
diff --git a/src/test/java/design/model/coursesearch/sortStrategyTest.java b/src/test/java/design/model/coursesearch/sortStrategyTest.java
new file mode 100644
index 0000000..aecbeff
--- /dev/null
+++ b/src/test/java/design/model/coursesearch/sortStrategyTest.java
@@ -0,0 +1,88 @@
+package design.model.coursesearch;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import java.util.ArrayList;
+
+import design.model.course_search.*;
+import design.model.Course;
+
+/** Unit Tests for the Difficulty Sorter class
+ * @author Willem Dalton
+ **/
+public class sortStrategyTest {
+
+    Course test1 = new Course(0, "Rolling Waves", 67, "Rochester, NY", 9, 30, null);
+    Course test2 = new Course(1, "Balls in the Rough", 60, "Buffalo, NY", 18, 60, null);
+    Course test3 = new Course(2, "The Last Green Valley", 67, "Rome, NY", 9, 47, null);
+    Course test4 = new Course(2, "Rolling Waves", 67, "Rome, NY", 9, 30, null);
+
+    @Test
+    void testDifficultySort()
+    {
+        SortByDifficulty sorter = new SortByDifficulty();
+        ArrayList<ICourse> courses = new ArrayList();
+        courses.add(test1);
+        courses.add(test2);
+        sorter.sortCourses(courses);
+        assertTrue(sorter.isEqual(test1, test3));
+        assertFalse(sorter.isEqual(test1, test2));
+        assertEquals("Difficulty", sorter.toString());
+    }
+
+    @Test
+    void testNameSort()
+    {
+        SortByName sorter = new SortByName();
+        ArrayList<ICourse> courses = new ArrayList();
+        courses.add(test1);
+        courses.add(test4);
+        sorter.sortCourses(courses);
+        assertTrue(sorter.isEqual(test1, test4));
+        assertFalse(sorter.isEqual(test1, test2));
+        assertEquals("Name", sorter.toString());
+    }
+
+    @Test
+    void testLocationSort()
+    {
+        SortByLocation sorter = new SortByLocation();
+        ArrayList<ICourse> courses = new ArrayList();
+        courses.add(test1);
+        courses.add(test4);
+        sorter.sortCourses(courses);
+        assertTrue(sorter.isEqual(test3, test4));
+        assertFalse(sorter.isEqual(test1, test2));
+        assertEquals("Location", sorter.toString());
+    }
+
+    @Test
+    void testParSort()
+    {
+        SortByPar sorter = new SortByPar();
+        ArrayList<ICourse> courses = new ArrayList();
+        courses.add(test1);
+        courses.add(test4);
+        sorter.sortCourses(courses);
+        assertTrue(sorter.isEqual(test1, test4));
+        assertFalse(sorter.isEqual(test1, test2));
+        assertEquals("Total Par", sorter.toString());
+    }
+
+    @Test
+    void testHoleSort()
+    {
+        SortByHoles sorter = new SortByHoles();
+        ArrayList<ICourse> courses = new ArrayList();
+        courses.add(test1);
+        courses.add(test4);
+        sorter.sortCourses(courses);
+        assertTrue(sorter.isEqual(test1, test4));
+        assertFalse(sorter.isEqual(test1, test2));
+        assertEquals("Hole Count", sorter.toString());
+    } 
+}