4 files changed, 113 insertions, 1 deletions
diff --git a/src/test/java/design/model/GolferTest.java b/src/test/java/design/model/GolferTest.java
index 65229f3..5f113ab 100644
--- a/src/test/java/design/model/GolferTest.java
+++ b/src/test/java/design/model/GolferTest.java
@@ -10,6 +10,7 @@ import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 
 import design.model.Club.ClubType;
+import design.model.undo.Memento;
 
 import java.lang.reflect.Constructor;
 import java.time.LocalDateTime;
@@ -137,6 +138,16 @@ public class GolferTest {
         assertEquals(expectedString, testGolfer.toString());
     }
 
+    @Test
+    void testMemento()
+    {
+        Golfer testGolfer = new Golfer("John Doe", "jdoesgolf2", "weback4321");
+        Memento memento = testGolfer.createMemento();
+        testGolfer.setFullName("Joe Doe");
+        assertEquals("Joe Doe", testGolfer.getFullName());
+        testGolfer.restore(memento);
+        assertEquals("John Doe", testGolfer.getFullName());
+    }
 
 
 }
diff --git a/src/test/java/design/model/MatchTest.java b/src/test/java/design/model/MatchTest.java
new file mode 100644
index 0000000..9058218
--- /dev/null
+++ b/src/test/java/design/model/MatchTest.java
@@ -0,0 +1,59 @@
+package design.model;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Modifier;
+import java.util.Date;
+import java.time.LocalDateTime;
+
+/** Unit Tests for the Match class.
+ * @author Willem Dalton
+ **/
+@Tag("Model-tier")
+public class MatchTest {
+    
+    @Test
+    void testConstructor()
+    {
+        Course testCourse = new Course(0, "Rolling Waves", 67, "Rochester. NY", 9, 30, new ArrayList<Hole>());
+        Date testDate = new Date(1234567);
+        LocalDateTime now = LocalDateTime.now();
+        Match testMatch = new Match(testCourse, testDate, now, 9);
+        assertEquals(testCourse, testMatch.getCourse());
+        assertEquals(testDate, testMatch.getDateScheduled());
+        assertEquals(now, testMatch.getStart());
+        assertEquals(9, testMatch.getHoleCount());
+    }
+
+    @Test
+    void testPrivateConstructor() throws Exception
+    {
+        Course testCourse = new Course(0, "Rolling Waves", 67, "Rochester. NY", 9, 30, new ArrayList<Hole>());
+        Constructor<Match> constructor = Match.class.getDeclaredConstructor(Course.class, Date.class, LocalDateTime.class, int.class, List.class);
+        assertTrue(Modifier.isPrivate(constructor.getModifiers()));
+        constructor.setAccessible(true);
+        Match testMatch = constructor.newInstance(testCourse, new Date(1234), LocalDateTime.now(), 0, new ArrayList<>());
+        assertNotNull(testMatch);
+    }
+
+    @Test
+    void testAddRound()
+    {
+        Course testCourse = new Course(0, "Rolling Waves", 67, "Rochester. NY", 9, 30, new ArrayList<Hole>());
+        Date testDate = new Date(1234567);
+        LocalDateTime now = LocalDateTime.now();
+        Match testMatch = new Match(testCourse, testDate, now, 9);
+        Round testRound = new Round(testCourse, now, new Hole(0, 5));
+        testMatch.addRound(testRound);
+        assertEquals(testRound, testMatch.getRounds()[0]);
+        assertEquals(1, testMatch.getRounds().length);
+    }
+}
diff --git a/src/test/java/design/model/TestPlay.java b/src/test/java/design/model/PlayTest.java
index c3282bf..0a27076 100644
--- a/src/test/java/design/model/TestPlay.java
+++ b/src/test/java/design/model/PlayTest.java
@@ -13,7 +13,7 @@ import java.util.ArrayList;
  * @author Willem Dalton
  **/
 @Tag("Model-tier")
-public class TestPlay {
+public class PlayTest {
     @Test
     void testConstructor()
     {
diff --git a/src/test/java/design/model/TeamTest.java b/src/test/java/design/model/TeamTest.java
new file mode 100644
index 0000000..c81aa1e
--- /dev/null
+++ b/src/test/java/design/model/TeamTest.java
@@ -0,0 +1,42 @@
+package design.model;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+
+/** Unit Tests for the Team Class.
+ * @author Willem Dalton
+ **/
+@Tag("Model-tier")
+public class TeamTest {
+    @Test
+    void testConstructor()
+    {
+        Golfer testGolfer = new Golfer("John Doe", "j_doe_golfs", "ilovegolf123");
+        Team testTeam = new Team("A Team", testGolfer);
+        assertEquals("A Team", testTeam.getName());
+        assertEquals(testGolfer, testTeam.getOwner());
+    }
+
+    @Test
+    void testSetName()
+    {
+        Golfer testGolfer = new Golfer("John Doe", "j_doe_golfs", "ilovegolf123");
+        Team testTeam = new Team("A Team", testGolfer);
+        testTeam.setName("B Team");
+        assertEquals("B Team", testTeam.getName());
+    }
+
+    @Test
+    void testRemoveMember()
+    {
+        Golfer testGolfer = new Golfer("John Doe", "j_doe_golfs", "ilovegolf123");
+        Golfer newGolfer = new Golfer("Jane Doe", "j_doe_golfs2", "ilovegolf321");
+        Team testTeam = new Team("A Team", testGolfer);
+        testTeam.addMember(newGolfer);
+        assertEquals(1, testTeam.getMembers().length);
+        testTeam.removeMember(newGolfer);
+        assertEquals(0, testTeam.getMembers().length);
+    }
+}