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

1 files changed, 8 insertions, 7 deletions

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);