Merge branch 'main' into league-play-refactoring

# Conflicts:
#	src/main/java/design/persistence/JSONLeagueDatabase.java
#	src/main/java/design/persistence/JSONPersonalDatabase.java
#	src/main/java/design/persistence/Serializers.java

3 files changed, 94 insertions, 10 deletions

diff --git a/src/test/java/design/model/coursesearch/CourseListTest.java b/src/test/java/design/model/coursesearch/CourseListTest.java
index 7538ba5..6bc5529 100644
--- a/src/test/java/design/model/coursesearch/CourseListTest.java
+++ b/src/test/java/design/model/coursesearch/CourseListTest.java
@@ -1,18 +1,19 @@
 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 static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 import java.util.ArrayList;
+import design.model.course_search.ICourse;
 
 import design.model.course_search.*;
 import design.model.Course;
 
 
-/** Unit Tests for the Club class.
+/** Unit Tests for the Course List class.
  * @author Willem Dalton
  **/
 @Tag("Model-tier")
@@ -22,6 +23,61 @@ public class CourseListTest {
     void testConstructor()
     {
         CourseList testList = new CourseList();
+        assertNotNull(testList);
+    }
+
+    @Test
+    void testSetCourses()
+    {
+        CourseList testList = new CourseList();
+        Course testCourse1 = new Course(0, "Rolling Waves", 10, "Rochester, NY", 0, 0, null);
+        Course testCourse2 = new Course(1, "Arcadia Hills", 10, "Rochester, NY", 0, 0, null);
+        ArrayList<ICourse> courses = new ArrayList<ICourse>();
+        courses.add(testCourse1);
+        courses.add(testCourse2);
+        testList.setCourses(courses);
+        assertEquals(courses, testList.getCourses());
+    }
 
+    @Test
+    void testSort()
+    {
+        CourseList testList = new CourseList();
+        Course testCourse1 = new Course(0, "Rolling Waves", 10, "Rochester, NY", 0, 0, null);
+        Course testCourse2 = new Course(1, "Arcadia Hills", 10, "Rochester, NY", 0, 0, null);
+        ArrayList<ICourse> courses = new ArrayList<ICourse>();
+        courses.add(testCourse1);
+        courses.add(testCourse2);
+        testList.setCourses(courses);
+        SortByName sorter = new SortByName();
+        testList.setSorter(sorter);
+        testList.sort();
+        assertEquals(testCourse2, testList.getCourses().get(0));
+        assertEquals(testCourse1, testList.getCourses().get(1));
+    }
+
+    @Test
+    void testAddRemove()
+    {
+        CourseList testList = new CourseList();
+        Course testCourse1 = new Course(0, "Rolling Waves", 10, "Rochester, NY", 0, 0, null);
+        testList.add(testCourse1);
+        assertEquals(testCourse1, testList.getCourses().get(0));
+        assertEquals(1, testList.getCourses().size());
+        testList.remove(testCourse1);
+        assertEquals(0, testList.getCourses().size());
+    }
+
+    @Test
+    void testOverrides()
+    {
+        CourseList testList = new CourseList();
+        assertEquals("Course List", testList.getName());
+        assertEquals("Course List", testList.toString());
+        assertEquals(0, testList.getDifficultyRating());
+        assertEquals("", testList.getLocation());
+        assertEquals(0, testList.getTotalPar());
+        assertEquals(0, testList.getHoleCount());
+        assertNull(testList.getHoles());
     }
 }
diff --git a/src/test/java/design/model/coursesearch/CurrentSearchQueryTest.java b/src/test/java/design/model/coursesearch/CurrentSearchQueryTest.java
new file mode 100644
index 0000000..10f3f87
--- /dev/null
+++ b/src/test/java/design/model/coursesearch/CurrentSearchQueryTest.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 Current Search Query Class
+ * @author Willem Dalton
+ **/
+@Tag("Model-tier")
+public class CurrentSearchQueryTest {
+    
+    // @Test
+    // void testReset()
+    // {
+    //     CurrentSearchQuery query
+    // }
+
+    
+}
diff --git a/src/test/java/design/model/coursesearch/sortStrategyTest.java b/src/test/java/design/model/coursesearch/sortStrategyTest.java
index aecbeff..35fa335 100644
--- a/src/test/java/design/model/coursesearch/sortStrategyTest.java
+++ b/src/test/java/design/model/coursesearch/sortStrategyTest.java
@@ -11,10 +11,11 @@ import java.util.ArrayList;
 import design.model.course_search.*;
 import design.model.Course;
 
-/** Unit Tests for the Difficulty Sorter class
+/** Unit Tests for the Sorter Strategy classes
  * @author Willem Dalton
  **/
-public class sortStrategyTest {
+@Tag("Model-tier")
+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);
@@ -25,7 +26,7 @@ public class sortStrategyTest {
     void testDifficultySort()
     {
         SortByDifficulty sorter = new SortByDifficulty();
-        ArrayList<ICourse> courses = new ArrayList();
+        ArrayList<ICourse> courses = new ArrayList<ICourse>();
         courses.add(test1);
         courses.add(test2);
         sorter.sortCourses(courses);
@@ -38,7 +39,7 @@ public class sortStrategyTest {
     void testNameSort()
     {
         SortByName sorter = new SortByName();
-        ArrayList<ICourse> courses = new ArrayList();
+        ArrayList<ICourse> courses = new ArrayList<ICourse>();
         courses.add(test1);
         courses.add(test4);
         sorter.sortCourses(courses);
@@ -51,7 +52,7 @@ public class sortStrategyTest {
     void testLocationSort()
     {
         SortByLocation sorter = new SortByLocation();
-        ArrayList<ICourse> courses = new ArrayList();
+        ArrayList<ICourse> courses = new ArrayList<ICourse>();
         courses.add(test1);
         courses.add(test4);
         sorter.sortCourses(courses);
@@ -64,7 +65,7 @@ public class sortStrategyTest {
     void testParSort()
     {
         SortByPar sorter = new SortByPar();
-        ArrayList<ICourse> courses = new ArrayList();
+        ArrayList<ICourse> courses = new ArrayList<ICourse>();
         courses.add(test1);
         courses.add(test4);
         sorter.sortCourses(courses);
@@ -77,7 +78,7 @@ public class sortStrategyTest {
     void testHoleSort()
     {
         SortByHoles sorter = new SortByHoles();
-        ArrayList<ICourse> courses = new ArrayList();
+        ArrayList<ICourse> courses = new ArrayList<ICourse>();
         courses.add(test1);
         courses.add(test4);
         sorter.sortCourses(courses);