From f5d911b725fc377c3b3f9da91007a276fb415bf3 Mon Sep 17 00:00:00 2001
From: Quatrani Paul <quatranipaul@zipcodes-MacBook-Pro-9.local>
Date: Thu, 4 Nov 2021 13:14:11 -0400
Subject: [PATCH 1/6] Completed all test classes of CatTest and
 animalFactorytest

---
 .../zipcodewilmington/AnimalFactoryTest.java  | 38 ++++++++++
 .../rocks/zipcodewilmington/CatHouseTest.java | 29 ++++++++
 .../java/rocks/zipcodewilmington/CatTest.java | 71 +++++++++++++++++++
 .../rocks/zipcodewilmington/DogHouseTest.java | 17 ++++-
 .../java/rocks/zipcodewilmington/DogTest.java | 28 ++++++++
 5 files changed, 182 insertions(+), 1 deletion(-)

diff --git a/src/test/java/rocks/zipcodewilmington/AnimalFactoryTest.java b/src/test/java/rocks/zipcodewilmington/AnimalFactoryTest.java
index 7522ce3..f7a1936 100644
--- a/src/test/java/rocks/zipcodewilmington/AnimalFactoryTest.java
+++ b/src/test/java/rocks/zipcodewilmington/AnimalFactoryTest.java
@@ -1,9 +1,47 @@
 package rocks.zipcodewilmington;
 
+import org.junit.Assert;
+import org.junit.Test;
+import rocks.zipcodewilmington.animals.Animal;
+import rocks.zipcodewilmington.animals.Cat;
+import rocks.zipcodewilmington.animals.Dog;
+import rocks.zipcodewilmington.animals.animal_creation.AnimalFactory;
+
+import java.util.Date;
+
 /**
  * @author leon on 4/19/18.
  */
 public class AnimalFactoryTest {
     //TODO - Create Test for `Animal createDog(String name, Date birthDate)`
+    @Test
+    public void testCreateDog(){
+        //given
+        String expectedName = "Samantha";
+        Date expectedBirthDate = new Date(2000,4,4);
+        //should this be type animal?
+        Dog newDog = AnimalFactory.createDog(expectedName,expectedBirthDate);
+        //when
+        String actualName = newDog.getName();
+        Date actualBirthDate = newDog.getBirthDate();
+        //then
+        Assert.assertEquals(expectedBirthDate,actualBirthDate);
+        Assert.assertEquals(expectedName,actualName);
+
+    }
     //TODO - Create Test for `Animal createCat(String name, Date birthDate)`
+    @Test
+    public void testCreateCat(){
+        //given
+        String expectedName = "Rutherford";
+        Date expectedBirthDate = new Date(2019,3,8);
+        Cat newCat =  AnimalFactory.createCat(expectedName,expectedBirthDate);
+        //when
+        String actualName = newCat.getName();
+        Date actualBirthDate = newCat.getBirthDate();
+        //then
+        Assert.assertEquals(expectedBirthDate,actualBirthDate);
+        Assert.assertEquals(expectedName,actualName);
+
+    }
 }
diff --git a/src/test/java/rocks/zipcodewilmington/CatHouseTest.java b/src/test/java/rocks/zipcodewilmington/CatHouseTest.java
index f756b34..d162696 100644
--- a/src/test/java/rocks/zipcodewilmington/CatHouseTest.java
+++ b/src/test/java/rocks/zipcodewilmington/CatHouseTest.java
@@ -1,12 +1,41 @@
 package rocks.zipcodewilmington;
 
+import org.junit.Test;
+import rocks.zipcodewilmington.animals.Cat;
+import rocks.zipcodewilmington.animals.animal_creation.AnimalFactory;
+
+import java.util.Date;
+
 /**
  * @author leon on 4/19/18.
  */
 public class CatHouseTest {
     // TODO - Create tests for `void add(Cat cat)`
+    @Test
+    public void testAddCat(){
+        String expectedName = "McKayla";
+        Date expectedBirthDate = new Date();
+        Cat newCat =  AnimalFactory.createCat(expectedName,expectedBirthDate);
+
+    }
     // TODO - Create tests for `void remove(Integer id)`
+    @Test
+    public void testRemoveByID(){
+
+    }
     // TODO - Create tests for `void remove(Cat cat)`
+    @Test
+    public void testRemoveByCat(){
+
+    }
     // TODO - Create tests for `Cat getCatById(Integer id)`
+    @Test
+    public void testGetCatById(){
+
+    }
     // TODO - Create tests for `Integer getNumberOfCats()`
+    @Test
+    public void testGetNumberOfCats(){
+
+    }
 }
diff --git a/src/test/java/rocks/zipcodewilmington/CatTest.java b/src/test/java/rocks/zipcodewilmington/CatTest.java
index 4bd465f..e47cfc4 100644
--- a/src/test/java/rocks/zipcodewilmington/CatTest.java
+++ b/src/test/java/rocks/zipcodewilmington/CatTest.java
@@ -2,8 +2,12 @@
 
 import org.junit.Assert;
 import org.junit.Test;
+import rocks.zipcodewilmington.animals.Animal;
 import rocks.zipcodewilmington.animals.Cat;
+import rocks.zipcodewilmington.animals.Mammal;
+import rocks.zipcodewilmington.animals.animal_creation.AnimalFactory;
 
+import java.util.Calendar;
 import java.util.Date;
 
 /**
@@ -11,12 +15,79 @@
  */
 public class CatTest {
     // TODO - Create tests for `void setName(String name)`
+    @Test
+    public void testSetName(){
+        //given
+        Cat originalCat = AnimalFactory.createCat("Benjamin",new Date(2017, Calendar.OCTOBER,4));
+        String expectedName = "Jonathon";
+        //when
+        originalCat.setName("Jonathon");
+        String actualName = originalCat.getName();
+        //then
+        Assert.assertEquals(expectedName, actualName);
+    }
     // TODO - Create tests for `speak`
+    @Test
+    public void testSpeak(){
+        //given
+        Cat originalCat = AnimalFactory.createCat("Jeremiah",new Date(2016, Calendar.JUNE,2));
+        String expectedSound = "meow!";
+        //when
+        String actualSound = originalCat.speak();
+        //then
+        Assert.assertEquals(expectedSound, actualSound);
+    }
     // TODO - Create tests for `setBirthDate(Date birthDate)`
+    @Test
+    public void testSetBirthDate(){
+        //given
+        Cat originalCat = AnimalFactory.createCat("Penelope",new Date(2009, Calendar.FEBRUARY,3));
+        Date expected = new Date(1919, 8,14);
+        //when
+        originalCat.setBirthDate(expected);
+        Date actual = originalCat.getBirthDate();
+        //then
+        Assert.assertEquals(expected, actual);
+    }
     // TODO - Create tests for `void eat(Food food)`
+    @Test
+    public void testEat(){
+        //given
+        Cat originalCat = AnimalFactory.createCat("Olivia",new Date(2005, Calendar.AUGUST,3));
+        int expected = 1;
+        //when
+        originalCat.eat(new Food());
+        //then
+        int actual = originalCat.getNumberOfMealsEaten();
+        Assert.assertEquals(expected, actual);
+    }
     // TODO - Create tests for `Integer getId()`
+    @Test
+    public void testGetId(){
+        //given
+        Cat originalCat = new Cat("Angela",new Date(1945, Calendar.AUGUST,3),3);
+        int expected = 3;
+        //when
+        int actual = originalCat.getId();
+        //then
+        Assert.assertEquals(expected, actual);
+    }
     // TODO - Create test to check Animal inheritance; google search `java instanceof keyword`
+    @Test
+    public void testAnimalInheritance(){
+        //given //when
+        Cat originalCat = new Cat("Jameson",new Date(1975, Calendar.AUGUST,3),3);
+        //then
+        Assert.assertTrue(originalCat instanceof Animal);
+    }
     // TODO - Create test to check Mammal inheritance; google search `java instanceof keyword`
+    @Test
+    public void testMammalInheritance(){
+        //given //when
+        Cat originalCat = new Cat("Angelo",new Date(1975, Calendar.AUGUST,3),3);
+        //then
+        Assert.assertTrue(originalCat instanceof Mammal);
+    }
 
 
     @Test
diff --git a/src/test/java/rocks/zipcodewilmington/DogHouseTest.java b/src/test/java/rocks/zipcodewilmington/DogHouseTest.java
index b88b30b..3c11be6 100644
--- a/src/test/java/rocks/zipcodewilmington/DogHouseTest.java
+++ b/src/test/java/rocks/zipcodewilmington/DogHouseTest.java
@@ -12,11 +12,26 @@
  */
 public class DogHouseTest {
     // TODO - Create tests for `void add(Dog dog)`
+    @Test
+    public void testAddDog(){
+
+    }
     // TODO - Create tests for `void remove(Integer id)`
+    @Test
+    public void testRemoveById(){
+
+    }
     // TODO - Create tests for `void remove(Dog dog)`
+    @Test
+    public void testRemoveByDog(){
+
+    }
     // TODO - Create tests for `Dog getDogById(Integer id)`
-    // TODO - Create tests for `Integer getNumberOfDogs()`
+    @Test
+    public void testGetDogById(){
 
+    }
+    // TODO - Create tests for `Integer getNumberOfDogs()`
     @Test
     public void testGetNumberOfDogs() {
         // Given (some
diff --git a/src/test/java/rocks/zipcodewilmington/DogTest.java b/src/test/java/rocks/zipcodewilmington/DogTest.java
index 34a15bd..a6123b1 100644
--- a/src/test/java/rocks/zipcodewilmington/DogTest.java
+++ b/src/test/java/rocks/zipcodewilmington/DogTest.java
@@ -9,13 +9,41 @@
  */
 public class DogTest {
     // TODO - Create tests for `new Dog(String name, Date birthDate, Integer id)`
+    @Test
+    public void testCreateCat3Parameters(){
+
+    }
     // TODO - Create tests for `speak`
+    @Test
+    public void testSpeak(){
+
+    }
     // TODO - Create tests for `setBirthDate(Date birthDate)`
+    @Test
+    public void testSetBirthDate(){
+
+    }
     // TODO - Create tests for `void eat(Food food)`
+    @Test
+    public void testEat(){
+
+    }
     // TODO - Create tests for `Integer getId()`
+    @Test
+    public void testGetId(){
+
+    }
     // TODO - Create test to check Animal inheritance; google search `java instanceof keyword`
+    @Test
+    public void testAnimalInheritance(){
+
+    }
     // TODO - Create test to check Mammal inheritance; google search `java instanceof keyword`
     @Test
+    public void testMammalInheritance(){
+
+    }
+    @Test
     public void setNameTest() {
         // Given (a name exists and a dog exists)
         Dog dog = new Dog(null, null, null);

From 1dc8cd08f7ccb2613d548fb3da5e271a80d67d83 Mon Sep 17 00:00:00 2001
From: Quatrani Paul <quatranipaul@zipcodes-MacBook-Pro-9.local>
Date: Fri, 5 Nov 2021 11:09:09 -0400
Subject: [PATCH 2/6] Completed all test methods for DogTest

---
 .../rocks/zipcodewilmington/CatHouseTest.java | 11 ++--
 .../java/rocks/zipcodewilmington/DogTest.java | 62 +++++++++++++++++--
 2 files changed, 64 insertions(+), 9 deletions(-)

diff --git a/src/test/java/rocks/zipcodewilmington/CatHouseTest.java b/src/test/java/rocks/zipcodewilmington/CatHouseTest.java
index d162696..0ea53fc 100644
--- a/src/test/java/rocks/zipcodewilmington/CatHouseTest.java
+++ b/src/test/java/rocks/zipcodewilmington/CatHouseTest.java
@@ -3,7 +3,9 @@
 import org.junit.Test;
 import rocks.zipcodewilmington.animals.Cat;
 import rocks.zipcodewilmington.animals.animal_creation.AnimalFactory;
+import rocks.zipcodewilmington.animals.animal_storage.CatHouse;
 
+import java.util.Calendar;
 import java.util.Date;
 
 /**
@@ -13,10 +15,11 @@ public class CatHouseTest {
     // TODO - Create tests for `void add(Cat cat)`
     @Test
     public void testAddCat(){
-        String expectedName = "McKayla";
-        Date expectedBirthDate = new Date();
-        Cat newCat =  AnimalFactory.createCat(expectedName,expectedBirthDate);
-
+        //given
+        Cat newCat =  AnimalFactory.createCat("Mckayla",new Date(2019, Calendar.JANUARY,1),1);
+        CatHouse.clear();
+        //then
+        CatHouse.addCat(newCat);
     }
     // TODO - Create tests for `void remove(Integer id)`
     @Test
diff --git a/src/test/java/rocks/zipcodewilmington/DogTest.java b/src/test/java/rocks/zipcodewilmington/DogTest.java
index a6123b1..5c6d621 100644
--- a/src/test/java/rocks/zipcodewilmington/DogTest.java
+++ b/src/test/java/rocks/zipcodewilmington/DogTest.java
@@ -2,7 +2,12 @@
 
 import org.junit.Assert;
 import org.junit.Test;
+import rocks.zipcodewilmington.animals.Animal;
 import rocks.zipcodewilmington.animals.Dog;
+import rocks.zipcodewilmington.animals.Mammal;
+
+import java.util.Calendar;
+import java.util.Date;
 
 /**
  * @author leon on 4/19/18.
@@ -10,38 +15,85 @@
 public class DogTest {
     // TODO - Create tests for `new Dog(String name, Date birthDate, Integer id)`
     @Test
-    public void testCreateCat3Parameters(){
-
+    public void testDogConstructor3Parameters(){
+        //given
+        String givenName = "Harrison";
+        Date givenDate = new Date();
+        int givenId = 1;
+        Dog dog = new Dog (givenName,givenDate,givenId);
+        //when
+        String actualName = dog.getName();
+        Date actualDate = dog.getBirthDate();
+        int actualId = dog.getId();
+        //then
+        Assert.assertEquals(givenName,actualName);
+        Assert.assertEquals(givenDate,actualDate);
+        Assert.assertEquals(givenId,actualId);
     }
     // TODO - Create tests for `speak`
     @Test
     public void testSpeak(){
+        //given
+        Dog dog = new Dog ("Maryanne",new Date(),2);
+        String givenSound = "bark!";
+        //when
+        String actualSound = dog.speak();
+        //then
+        Assert.assertEquals(givenSound,actualSound);
 
     }
     // TODO - Create tests for `setBirthDate(Date birthDate)`
     @Test
     public void testSetBirthDate(){
+        //given
+        Dog dog = new Dog ("Angelina",new Date(),2);
+        Date givenDate = new Date(2008, Calendar.JUNE,10);
+        //when
+        dog.setBirthDate(givenDate);
+        Date actualDate = dog.getBirthDate();
+        //then
+        Assert.assertEquals(givenDate,actualDate);
 
     }
     // TODO - Create tests for `void eat(Food food)`
     @Test
     public void testEat(){
-
+        //given
+        Dog dog = new Dog ("Bartholomew",new Date(),2);
+        int expected = 1;
+        //when
+        dog.eat(new Food());
+        int actual = dog.getNumberOfMealsEaten();
+        //then
+        Assert.assertEquals(expected,actual);
     }
     // TODO - Create tests for `Integer getId()`
     @Test
     public void testGetId(){
+        //given
+        Dog dog = new Dog ("Magdalene",new Date(),5);
+        int expected = 5;
+        //when
+        int actual = dog.getId();
+        //then
+        Assert.assertEquals(expected,actual);
 
     }
     // TODO - Create test to check Animal inheritance; google search `java instanceof keyword`
     @Test
     public void testAnimalInheritance(){
-
+        //given/when
+        Dog dog = new Dog ("Mercurio",new Date(),5);
+        //then
+        Assert.assertTrue(dog instanceof Animal);
     }
     // TODO - Create test to check Mammal inheritance; google search `java instanceof keyword`
     @Test
     public void testMammalInheritance(){
-
+        //given/when
+        Dog dog = new Dog ("Alexandria",new Date(),5);
+        //then
+        Assert.assertTrue(dog instanceof Mammal);
     }
     @Test
     public void setNameTest() {

From 7114cd21e3777bc284ef189e3e499c4499866d49 Mon Sep 17 00:00:00 2001
From: Quatrani Paul <quatranipaul@zipcodes-MacBook-Pro-9.local>
Date: Fri, 5 Nov 2021 12:38:30 -0400
Subject: [PATCH 3/6] Finished all tests; waiting for confirmation on when/
 then clause areas

---
 .../zipcodewilmington/AnimalFactoryTest.java  |  9 ++--
 .../rocks/zipcodewilmington/CatHouseTest.java | 43 +++++++++++++++--
 .../java/rocks/zipcodewilmington/CatTest.java | 10 ++--
 .../rocks/zipcodewilmington/DogHouseTest.java | 48 +++++++++++++++----
 .../java/rocks/zipcodewilmington/DogTest.java |  6 +--
 5 files changed, 93 insertions(+), 23 deletions(-)

diff --git a/src/test/java/rocks/zipcodewilmington/AnimalFactoryTest.java b/src/test/java/rocks/zipcodewilmington/AnimalFactoryTest.java
index f7a1936..47b47ec 100644
--- a/src/test/java/rocks/zipcodewilmington/AnimalFactoryTest.java
+++ b/src/test/java/rocks/zipcodewilmington/AnimalFactoryTest.java
@@ -7,6 +7,7 @@
 import rocks.zipcodewilmington.animals.Dog;
 import rocks.zipcodewilmington.animals.animal_creation.AnimalFactory;
 
+import java.util.Calendar;
 import java.util.Date;
 
 /**
@@ -18,10 +19,10 @@ public class AnimalFactoryTest {
     public void testCreateDog(){
         //given
         String expectedName = "Samantha";
-        Date expectedBirthDate = new Date(2000,4,4);
+        Date expectedBirthDate = new Date(2000, Calendar.MAY,4);
         //should this be type animal?
-        Dog newDog = AnimalFactory.createDog(expectedName,expectedBirthDate);
         //when
+        Dog newDog = AnimalFactory.createDog(expectedName,expectedBirthDate);
         String actualName = newDog.getName();
         Date actualBirthDate = newDog.getBirthDate();
         //then
@@ -34,9 +35,9 @@ public void testCreateDog(){
     public void testCreateCat(){
         //given
         String expectedName = "Rutherford";
-        Date expectedBirthDate = new Date(2019,3,8);
-        Cat newCat =  AnimalFactory.createCat(expectedName,expectedBirthDate);
+        Date expectedBirthDate = new Date(2019, Calendar.APRIL,8);
         //when
+        Cat newCat =  AnimalFactory.createCat(expectedName,expectedBirthDate);
         String actualName = newCat.getName();
         Date actualBirthDate = newCat.getBirthDate();
         //then
diff --git a/src/test/java/rocks/zipcodewilmington/CatHouseTest.java b/src/test/java/rocks/zipcodewilmington/CatHouseTest.java
index 0ea53fc..be3f6eb 100644
--- a/src/test/java/rocks/zipcodewilmington/CatHouseTest.java
+++ b/src/test/java/rocks/zipcodewilmington/CatHouseTest.java
@@ -1,5 +1,6 @@
 package rocks.zipcodewilmington;
 
+import org.junit.Assert;
 import org.junit.Test;
 import rocks.zipcodewilmington.animals.Cat;
 import rocks.zipcodewilmington.animals.animal_creation.AnimalFactory;
@@ -16,29 +17,65 @@ public class CatHouseTest {
     @Test
     public void testAddCat(){
         //given
-        Cat newCat =  AnimalFactory.createCat("Mckayla",new Date(2019, Calendar.JANUARY,1),1);
+        Cat newCat =  new Cat("Mckayla",new Date(2019, Calendar.JANUARY,1),1);
         CatHouse.clear();
+        //when
+        CatHouse.add(newCat);
+        Cat actualCat = CatHouse.getCatById(1);
         //then
-        CatHouse.addCat(newCat);
+        Assert.assertEquals(newCat,actualCat);
     }
     // TODO - Create tests for `void remove(Integer id)`
     @Test
     public void testRemoveByID(){
+        //given
+        Cat newCat =  new Cat("Roberto",new Date(2019, Calendar.JANUARY,1),1);
+        CatHouse.add(newCat);
+        Cat expected = null;
+        //when
+        CatHouse.remove(1);
+        Cat actual = CatHouse.getCatById(1);
+        //then
+        Assert.assertEquals(expected,actual);
+
 
     }
     // TODO - Create tests for `void remove(Cat cat)`
     @Test
     public void testRemoveByCat(){
+        //given
+        Cat newCat = new Cat("Elijah",new Date(2019, Calendar.JANUARY,1),1);
+        CatHouse.add(newCat);
+        Cat expected = null;
+        //when
+        CatHouse.remove(newCat);
+        Cat actual = CatHouse.getCatById(1);
+        //then
+        Assert.assertEquals(expected,actual);
 
     }
     // TODO - Create tests for `Cat getCatById(Integer id)`
     @Test
     public void testGetCatById(){
-
+        //given
+        Cat expected = new Cat("Yolanda",new Date(2019, Calendar.JANUARY,1),1);
+        CatHouse.add(expected);
+        //when
+        Cat actual = CatHouse.getCatById(1);
+        //then
+        Assert.assertEquals(expected,actual);
     }
     // TODO - Create tests for `Integer getNumberOfCats()`
     @Test
     public void testGetNumberOfCats(){
+        //given
+        Cat newCat = new Cat("Archimedes",new Date(2019, Calendar.JANUARY,1),1);
+        CatHouse.add(newCat);
+        Integer expected = 1;
+        //when
+        Integer actual = CatHouse.getNumberOfCats();
+        //then
+        Assert.assertEquals(expected,actual);
 
     }
 }
diff --git a/src/test/java/rocks/zipcodewilmington/CatTest.java b/src/test/java/rocks/zipcodewilmington/CatTest.java
index e47cfc4..206e3f3 100644
--- a/src/test/java/rocks/zipcodewilmington/CatTest.java
+++ b/src/test/java/rocks/zipcodewilmington/CatTest.java
@@ -42,7 +42,7 @@ public void testSpeak(){
     public void testSetBirthDate(){
         //given
         Cat originalCat = AnimalFactory.createCat("Penelope",new Date(2009, Calendar.FEBRUARY,3));
-        Date expected = new Date(1919, 8,14);
+        Date expected = new Date(1919, Calendar.SEPTEMBER,14);
         //when
         originalCat.setBirthDate(expected);
         Date actual = originalCat.getBirthDate();
@@ -53,19 +53,19 @@ public void testSetBirthDate(){
     @Test
     public void testEat(){
         //given
-        Cat originalCat = AnimalFactory.createCat("Olivia",new Date(2005, Calendar.AUGUST,3));
+        Cat originalCat = AnimalFactory.createCat("Ichabod",new Date(2005, Calendar.AUGUST,3));
         int expected = 1;
         //when
         originalCat.eat(new Food());
-        //then
         int actual = originalCat.getNumberOfMealsEaten();
+        //then
         Assert.assertEquals(expected, actual);
     }
     // TODO - Create tests for `Integer getId()`
     @Test
     public void testGetId(){
         //given
-        Cat originalCat = new Cat("Angela",new Date(1945, Calendar.AUGUST,3),3);
+        Cat originalCat = new Cat("Horatio",new Date(1945, Calendar.AUGUST,3),3);
         int expected = 3;
         //when
         int actual = originalCat.getId();
@@ -84,7 +84,7 @@ public void testAnimalInheritance(){
     @Test
     public void testMammalInheritance(){
         //given //when
-        Cat originalCat = new Cat("Angelo",new Date(1975, Calendar.AUGUST,3),3);
+        Cat originalCat = new Cat("Chrysanthemum",new Date(1975, Calendar.AUGUST,3),3);
         //then
         Assert.assertTrue(originalCat instanceof Mammal);
     }
diff --git a/src/test/java/rocks/zipcodewilmington/DogHouseTest.java b/src/test/java/rocks/zipcodewilmington/DogHouseTest.java
index 3c11be6..b4155ab 100644
--- a/src/test/java/rocks/zipcodewilmington/DogHouseTest.java
+++ b/src/test/java/rocks/zipcodewilmington/DogHouseTest.java
@@ -1,5 +1,6 @@
 package rocks.zipcodewilmington;
 
+import org.junit.Assert;
 import org.junit.Test;
 import rocks.zipcodewilmington.animals.Dog;
 import rocks.zipcodewilmington.animals.animal_creation.AnimalFactory;
@@ -13,23 +14,54 @@
 public class DogHouseTest {
     // TODO - Create tests for `void add(Dog dog)`
     @Test
+    //
     public void testAddDog(){
+        //given
+        Dog expected = new Dog("Eleanor",new Date(),1);
+        //when
+        DogHouse.add(expected);
+        Dog actual = DogHouse.getDogById(1);
+        //then
+        Assert.assertEquals(expected,actual);
+
 
     }
     // TODO - Create tests for `void remove(Integer id)`
     @Test
     public void testRemoveById(){
-
+        //given
+        Dog expected = null;
+        Dog newDog = new Dog("Eleanor",new Date(),1);
+        DogHouse.add(newDog);
+        //when
+        DogHouse.remove(1);
+        Dog actual = DogHouse.getDogById(1);
+        //then
+        Assert.assertEquals(expected,actual);
     }
     // TODO - Create tests for `void remove(Dog dog)`
     @Test
     public void testRemoveByDog(){
-
+        //given
+        Dog expected = null;
+        Dog newDog = new Dog("Ulysses",new Date(),1);
+        DogHouse.add(newDog);
+        //when
+        DogHouse.remove(newDog);
+        Dog actual = DogHouse.getDogById(1);
+        //then
+        Assert.assertEquals(expected,actual);
     }
     // TODO - Create tests for `Dog getDogById(Integer id)`
     @Test
     public void testGetDogById(){
-
+        //given
+        Dog expected = new Dog("Anthony",new Date(),1);
+        DogHouse.add(expected);
+        //when
+        Dog actual = DogHouse.getDogById(1);
+        //then
+        Assert.assertEquals(expected,actual);
     }
     // TODO - Create tests for `Integer getNumberOfDogs()`
     @Test
@@ -39,11 +71,11 @@ public void testGetNumberOfDogs() {
         Date birthDate = new Date();
         Dog animal = AnimalFactory.createDog(name, birthDate);
         DogHouse.clear();
-
-        // When
+        int expected = 1;
         DogHouse.add(animal);
-
-        // Then
-        DogHouse.getNumberOfDogs();
+        // When
+        int actual = DogHouse.getNumberOfDogs();
+        //Then
+        Assert.assertEquals(expected,actual);
     }
 }
diff --git a/src/test/java/rocks/zipcodewilmington/DogTest.java b/src/test/java/rocks/zipcodewilmington/DogTest.java
index 5c6d621..452a349 100644
--- a/src/test/java/rocks/zipcodewilmington/DogTest.java
+++ b/src/test/java/rocks/zipcodewilmington/DogTest.java
@@ -20,8 +20,8 @@ public void testDogConstructor3Parameters(){
         String givenName = "Harrison";
         Date givenDate = new Date();
         int givenId = 1;
-        Dog dog = new Dog (givenName,givenDate,givenId);
         //when
+        Dog dog = new Dog (givenName,givenDate,givenId);
         String actualName = dog.getName();
         Date actualDate = dog.getBirthDate();
         int actualId = dog.getId();
@@ -82,7 +82,7 @@ public void testGetId(){
     // TODO - Create test to check Animal inheritance; google search `java instanceof keyword`
     @Test
     public void testAnimalInheritance(){
-        //given/when
+        //given //when
         Dog dog = new Dog ("Mercurio",new Date(),5);
         //then
         Assert.assertTrue(dog instanceof Animal);
@@ -90,7 +90,7 @@ public void testAnimalInheritance(){
     // TODO - Create test to check Mammal inheritance; google search `java instanceof keyword`
     @Test
     public void testMammalInheritance(){
-        //given/when
+        //given //when
         Dog dog = new Dog ("Alexandria",new Date(),5);
         //then
         Assert.assertTrue(dog instanceof Mammal);

From 8789433e8a65b07a143121f24d2934bc36d269b9 Mon Sep 17 00:00:00 2001
From: Quatrani Paul <quatranipaul@zipcodes-MacBook-Pro-9.local>
Date: Fri, 5 Nov 2021 12:47:26 -0400
Subject: [PATCH 4/6] Added some clear statements; code passes all tests

---
 src/test/java/rocks/zipcodewilmington/CatHouseTest.java | 4 ++++
 src/test/java/rocks/zipcodewilmington/DogHouseTest.java | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/src/test/java/rocks/zipcodewilmington/CatHouseTest.java b/src/test/java/rocks/zipcodewilmington/CatHouseTest.java
index be3f6eb..533404f 100644
--- a/src/test/java/rocks/zipcodewilmington/CatHouseTest.java
+++ b/src/test/java/rocks/zipcodewilmington/CatHouseTest.java
@@ -30,6 +30,7 @@ public void testAddCat(){
     public void testRemoveByID(){
         //given
         Cat newCat =  new Cat("Roberto",new Date(2019, Calendar.JANUARY,1),1);
+        CatHouse.clear();
         CatHouse.add(newCat);
         Cat expected = null;
         //when
@@ -45,6 +46,7 @@ public void testRemoveByID(){
     public void testRemoveByCat(){
         //given
         Cat newCat = new Cat("Elijah",new Date(2019, Calendar.JANUARY,1),1);
+        CatHouse.clear();
         CatHouse.add(newCat);
         Cat expected = null;
         //when
@@ -59,6 +61,7 @@ public void testRemoveByCat(){
     public void testGetCatById(){
         //given
         Cat expected = new Cat("Yolanda",new Date(2019, Calendar.JANUARY,1),1);
+        CatHouse.clear();
         CatHouse.add(expected);
         //when
         Cat actual = CatHouse.getCatById(1);
@@ -70,6 +73,7 @@ public void testGetCatById(){
     public void testGetNumberOfCats(){
         //given
         Cat newCat = new Cat("Archimedes",new Date(2019, Calendar.JANUARY,1),1);
+        CatHouse.clear();
         CatHouse.add(newCat);
         Integer expected = 1;
         //when
diff --git a/src/test/java/rocks/zipcodewilmington/DogHouseTest.java b/src/test/java/rocks/zipcodewilmington/DogHouseTest.java
index b4155ab..b4a0b1b 100644
--- a/src/test/java/rocks/zipcodewilmington/DogHouseTest.java
+++ b/src/test/java/rocks/zipcodewilmington/DogHouseTest.java
@@ -18,6 +18,7 @@ public class DogHouseTest {
     public void testAddDog(){
         //given
         Dog expected = new Dog("Eleanor",new Date(),1);
+        DogHouse.clear();
         //when
         DogHouse.add(expected);
         Dog actual = DogHouse.getDogById(1);
@@ -32,6 +33,7 @@ public void testRemoveById(){
         //given
         Dog expected = null;
         Dog newDog = new Dog("Eleanor",new Date(),1);
+        DogHouse.clear();
         DogHouse.add(newDog);
         //when
         DogHouse.remove(1);
@@ -45,6 +47,7 @@ public void testRemoveByDog(){
         //given
         Dog expected = null;
         Dog newDog = new Dog("Ulysses",new Date(),1);
+        DogHouse.clear();
         DogHouse.add(newDog);
         //when
         DogHouse.remove(newDog);
@@ -57,6 +60,7 @@ public void testRemoveByDog(){
     public void testGetDogById(){
         //given
         Dog expected = new Dog("Anthony",new Date(),1);
+        DogHouse.clear();
         DogHouse.add(expected);
         //when
         Dog actual = DogHouse.getDogById(1);

From 81fc077fa946417f62137f5f00f2ff40e89ef3d4 Mon Sep 17 00:00:00 2001
From: Quatrani Paul <quatranipaul@zipcodes-MacBook-Pro-9.local>
Date: Fri, 5 Nov 2021 13:11:08 -0400
Subject: [PATCH 5/6] added multiple test methods where needed

---
 .../rocks/zipcodewilmington/CatHouseTest.java | 66 ++++++++++++++++-
 .../java/rocks/zipcodewilmington/CatTest.java | 55 ++++++++++++++
 .../rocks/zipcodewilmington/DogHouseTest.java | 72 ++++++++++++++++++-
 .../java/rocks/zipcodewilmington/DogTest.java | 61 ++++++++++++++++
 4 files changed, 249 insertions(+), 5 deletions(-)

diff --git a/src/test/java/rocks/zipcodewilmington/CatHouseTest.java b/src/test/java/rocks/zipcodewilmington/CatHouseTest.java
index 533404f..a6d9baa 100644
--- a/src/test/java/rocks/zipcodewilmington/CatHouseTest.java
+++ b/src/test/java/rocks/zipcodewilmington/CatHouseTest.java
@@ -25,6 +25,17 @@ public void testAddCat(){
         //then
         Assert.assertEquals(newCat,actualCat);
     }
+    @Test
+    public void testAddCat2(){
+        //given
+        Cat newCat =  new Cat("Ckayla",new Date(209, Calendar.JANUARY,1),8);
+        CatHouse.clear();
+        //when
+        CatHouse.add(newCat);
+        Cat actualCat = CatHouse.getCatById(8);
+        //then
+        Assert.assertEquals(newCat,actualCat);
+    }
     // TODO - Create tests for `void remove(Integer id)`
     @Test
     public void testRemoveByID(){
@@ -38,8 +49,19 @@ public void testRemoveByID(){
         Cat actual = CatHouse.getCatById(1);
         //then
         Assert.assertEquals(expected,actual);
-
-
+    }
+    @Test
+    public void testRemoveByID2(){
+        //given
+        Cat newCat =  new Cat("Oberto",new Date(19, Calendar.JANUARY,9),222);
+        CatHouse.clear();
+        CatHouse.add(newCat);
+        Cat expected = null;
+        //when
+        CatHouse.remove(222);
+        Cat actual = CatHouse.getCatById(222);
+        //then
+        Assert.assertEquals(expected,actual);
     }
     // TODO - Create tests for `void remove(Cat cat)`
     @Test
@@ -54,7 +76,19 @@ public void testRemoveByCat(){
         Cat actual = CatHouse.getCatById(1);
         //then
         Assert.assertEquals(expected,actual);
-
+    }
+    @Test
+    public void testRemoveByCat2(){
+        //given
+        Cat newCat = new Cat("Lijah",new Date(20199, Calendar.JANUARY,3),33);
+        CatHouse.clear();
+        CatHouse.add(newCat);
+        Cat expected = null;
+        //when
+        CatHouse.remove(newCat);
+        Cat actual = CatHouse.getCatById(33);
+        //then
+        Assert.assertEquals(expected,actual);
     }
     // TODO - Create tests for `Cat getCatById(Integer id)`
     @Test
@@ -68,6 +102,17 @@ public void testGetCatById(){
         //then
         Assert.assertEquals(expected,actual);
     }
+    @Test
+    public void testGetCatById2(){
+        //given
+        Cat expected = new Cat("Olanda",new Date(20219, Calendar.JANUARY,12),10923);
+        CatHouse.clear();
+        CatHouse.add(expected);
+        //when
+        Cat actual = CatHouse.getCatById(10923);
+        //then
+        Assert.assertEquals(expected,actual);
+    }
     // TODO - Create tests for `Integer getNumberOfCats()`
     @Test
     public void testGetNumberOfCats(){
@@ -82,4 +127,19 @@ public void testGetNumberOfCats(){
         Assert.assertEquals(expected,actual);
 
     }
+    @Test
+    public void testGetNumberOfCats2(){
+        //given
+        Cat newCat2 = new Cat("Rchimedes",new Date(20139, Calendar.JANUARY,23),53);
+        CatHouse.clear();
+        CatHouse.add(newCat2);
+        Integer expected = 2;
+        Cat newCat = new Cat("Archimedes",new Date(2019, Calendar.JANUARY,1),1);
+        CatHouse.add(newCat);
+        //when
+        Integer actual = CatHouse.getNumberOfCats();
+        //then
+        Assert.assertEquals(expected,actual);
+
+    }
 }
diff --git a/src/test/java/rocks/zipcodewilmington/CatTest.java b/src/test/java/rocks/zipcodewilmington/CatTest.java
index 206e3f3..3964054 100644
--- a/src/test/java/rocks/zipcodewilmington/CatTest.java
+++ b/src/test/java/rocks/zipcodewilmington/CatTest.java
@@ -26,6 +26,17 @@ public void testSetName(){
         //then
         Assert.assertEquals(expectedName, actualName);
     }
+    @Test
+    public void testSetName2(){
+        //given
+        Cat originalCat = AnimalFactory.createCat("Enjamin",new Date(217, Calendar.OCTOBER,4));
+        String expectedName = "Onathon";
+        //when
+        originalCat.setName("Onathon");
+        String actualName = originalCat.getName();
+        //then
+        Assert.assertEquals(expectedName, actualName);
+    }
     // TODO - Create tests for `speak`
     @Test
     public void testSpeak(){
@@ -37,6 +48,16 @@ public void testSpeak(){
         //then
         Assert.assertEquals(expectedSound, actualSound);
     }
+    @Test
+    public void testSpeak2(){
+        //given
+        Cat originalCat = AnimalFactory.createCat("Eremiah",new Date(20, Calendar.JUNE,2));
+        String expectedSound = "meow!";
+        //when
+        String actualSound = originalCat.speak();
+        //then
+        Assert.assertEquals(expectedSound, actualSound);
+    }
     // TODO - Create tests for `setBirthDate(Date birthDate)`
     @Test
     public void testSetBirthDate(){
@@ -49,6 +70,17 @@ public void testSetBirthDate(){
         //then
         Assert.assertEquals(expected, actual);
     }
+    @Test
+    public void testSetBirthDate2(){
+        //given
+        Cat originalCat = AnimalFactory.createCat("Enelope",new Date(29, Calendar.FEBRUARY,9));
+        Date expected = new Date(1800, Calendar.NOVEMBER,29);
+        //when
+        originalCat.setBirthDate(expected);
+        Date actual = originalCat.getBirthDate();
+        //then
+        Assert.assertEquals(expected, actual);
+    }
     // TODO - Create tests for `void eat(Food food)`
     @Test
     public void testEat(){
@@ -61,6 +93,19 @@ public void testEat(){
         //then
         Assert.assertEquals(expected, actual);
     }
+    @Test
+    public void testEat2(){
+        //given
+        Cat originalCat = AnimalFactory.createCat("Chabod",new Date(205, Calendar.AUGUST,4));
+        int expected = 2;
+        //when
+        originalCat.eat(new Food());
+        originalCat.eat(new Food());
+        int actual = originalCat.getNumberOfMealsEaten();
+        //then
+        Assert.assertEquals(expected, actual);
+    }
+
     // TODO - Create tests for `Integer getId()`
     @Test
     public void testGetId(){
@@ -72,6 +117,16 @@ public void testGetId(){
         //then
         Assert.assertEquals(expected, actual);
     }
+    @Test
+    public void testGetId2(){
+        //given
+        Cat originalCat = new Cat("Oratio",new Date(195, Calendar.AUGUST,3),93);
+        int expected = 93;
+        //when
+        int actual = originalCat.getId();
+        //then
+        Assert.assertEquals(expected, actual);
+    }
     // TODO - Create test to check Animal inheritance; google search `java instanceof keyword`
     @Test
     public void testAnimalInheritance(){
diff --git a/src/test/java/rocks/zipcodewilmington/DogHouseTest.java b/src/test/java/rocks/zipcodewilmington/DogHouseTest.java
index b4a0b1b..1a9f42e 100644
--- a/src/test/java/rocks/zipcodewilmington/DogHouseTest.java
+++ b/src/test/java/rocks/zipcodewilmington/DogHouseTest.java
@@ -6,6 +6,7 @@
 import rocks.zipcodewilmington.animals.animal_creation.AnimalFactory;
 import rocks.zipcodewilmington.animals.animal_storage.DogHouse;
 
+import java.util.Calendar;
 import java.util.Date;
 
 /**
@@ -14,7 +15,6 @@
 public class DogHouseTest {
     // TODO - Create tests for `void add(Dog dog)`
     @Test
-    //
     public void testAddDog(){
         //given
         Dog expected = new Dog("Eleanor",new Date(),1);
@@ -26,13 +26,26 @@ public void testAddDog(){
         Assert.assertEquals(expected,actual);
 
 
+    }
+    @Test
+    public void testAddDog2(){
+        //given
+        Dog expected = new Dog("Leanor",new Date(2011, Calendar.FEBRUARY,1),50);
+        DogHouse.clear();
+        //when
+        DogHouse.add(expected);
+        Dog actual = DogHouse.getDogById(50);
+        //then
+        Assert.assertEquals(expected,actual);
+
+
     }
     // TODO - Create tests for `void remove(Integer id)`
     @Test
     public void testRemoveById(){
         //given
         Dog expected = null;
-        Dog newDog = new Dog("Eleanor",new Date(),1);
+        Dog newDog = new Dog("Elizabeth",new Date(),1);
         DogHouse.clear();
         DogHouse.add(newDog);
         //when
@@ -41,6 +54,19 @@ public void testRemoveById(){
         //then
         Assert.assertEquals(expected,actual);
     }
+    @Test
+    public void testRemoveById2(){
+        //given
+        Dog expected = null;
+        Dog newDog = new Dog("Lizabeth",new Date(1, Calendar.JUNE,2),8);
+        DogHouse.clear();
+        DogHouse.add(newDog);
+        //when
+        DogHouse.remove(8);
+        Dog actual = DogHouse.getDogById(8);
+        //then
+        Assert.assertEquals(expected,actual);
+    }
     // TODO - Create tests for `void remove(Dog dog)`
     @Test
     public void testRemoveByDog(){
@@ -55,6 +81,19 @@ public void testRemoveByDog(){
         //then
         Assert.assertEquals(expected,actual);
     }
+    @Test
+    public void testRemoveByDog2(){
+        //given
+        Dog expected = null;
+        Dog newDog = new Dog("Lysses",new Date(2, Calendar.JULY,8),2);
+        DogHouse.clear();
+        DogHouse.add(newDog);
+        //when
+        DogHouse.remove(newDog);
+        Dog actual = DogHouse.getDogById(2);
+        //then
+        Assert.assertEquals(expected,actual);
+    }
     // TODO - Create tests for `Dog getDogById(Integer id)`
     @Test
     public void testGetDogById(){
@@ -67,6 +106,17 @@ public void testGetDogById(){
         //then
         Assert.assertEquals(expected,actual);
     }
+    @Test
+    public void testGetDogById2(){
+        //given
+        Dog expected = new Dog("Nthony",new Date(45, Calendar.MAY,15),14);
+        DogHouse.clear();
+        DogHouse.add(expected);
+        //when
+        Dog actual = DogHouse.getDogById(14);
+        //then
+        Assert.assertEquals(expected,actual);
+    }
     // TODO - Create tests for `Integer getNumberOfDogs()`
     @Test
     public void testGetNumberOfDogs() {
@@ -82,4 +132,22 @@ public void testGetNumberOfDogs() {
         //Then
         Assert.assertEquals(expected,actual);
     }
+    @Test
+    public void testGetNumberOfDogs2() {
+        // Given (some
+        String name1 = "Milo";
+        Date birthDate1 = new Date();
+        Dog animal = AnimalFactory.createDog(name1, birthDate1);
+        DogHouse.clear();
+        DogHouse.add(animal);
+        String name = "Ilo";
+        Date birthDate = new Date(1, Calendar.MARCH,3);
+        Dog animal2 = AnimalFactory.createDog(name, birthDate);
+        int expected = 2;
+        DogHouse.add(animal2);
+        // When
+        int actual = DogHouse.getNumberOfDogs();
+        //Then
+        Assert.assertEquals(expected,actual);
+    }
 }
diff --git a/src/test/java/rocks/zipcodewilmington/DogTest.java b/src/test/java/rocks/zipcodewilmington/DogTest.java
index 452a349..94e91d4 100644
--- a/src/test/java/rocks/zipcodewilmington/DogTest.java
+++ b/src/test/java/rocks/zipcodewilmington/DogTest.java
@@ -30,6 +30,22 @@ public void testDogConstructor3Parameters(){
         Assert.assertEquals(givenDate,actualDate);
         Assert.assertEquals(givenId,actualId);
     }
+    @Test
+    public void testDogConstructor3Parameters2(){
+        //given
+        String givenName = "Arrison";
+        Date givenDate = new Date(1, Calendar.JUNE,6);
+        int givenId = 2;
+        //when
+        Dog dog = new Dog (givenName,givenDate,givenId);
+        String actualName = dog.getName();
+        Date actualDate = dog.getBirthDate();
+        int actualId = dog.getId();
+        //then
+        Assert.assertEquals(givenName,actualName);
+        Assert.assertEquals(givenDate,actualDate);
+        Assert.assertEquals(givenId,actualId);
+    }
     // TODO - Create tests for `speak`
     @Test
     public void testSpeak(){
@@ -41,6 +57,17 @@ public void testSpeak(){
         //then
         Assert.assertEquals(givenSound,actualSound);
 
+    }
+    @Test
+    public void testSpeak2(){
+        //given
+        Dog dog = new Dog ("Aryanne",new Date(1, Calendar.APRIL,2),5);
+        String givenSound = "bark!";
+        //when
+        String actualSound = dog.speak();
+        //then
+        Assert.assertEquals(givenSound,actualSound);
+
     }
     // TODO - Create tests for `setBirthDate(Date birthDate)`
     @Test
@@ -54,6 +81,18 @@ public void testSetBirthDate(){
         //then
         Assert.assertEquals(givenDate,actualDate);
 
+    }
+    @Test
+    public void testSetBirthDate2(){
+        //given
+        Dog dog = new Dog ("Ngelina",new Date(2, Calendar.APRIL,4),2);
+        Date givenDate = new Date(2012, Calendar.DECEMBER,1);
+        //when
+        dog.setBirthDate(givenDate);
+        Date actualDate = dog.getBirthDate();
+        //then
+        Assert.assertEquals(givenDate,actualDate);
+
     }
     // TODO - Create tests for `void eat(Food food)`
     @Test
@@ -67,6 +106,18 @@ public void testEat(){
         //then
         Assert.assertEquals(expected,actual);
     }
+    @Test
+    public void testEat2(){
+        //given
+        Dog dog = new Dog ("Artholomew",new Date(2, Calendar.APRIL,6),8);
+        int expected = 2;
+        //when
+        dog.eat(new Food());
+        dog.eat(new Food());
+        int actual = dog.getNumberOfMealsEaten();
+        //then
+        Assert.assertEquals(expected,actual);
+    }
     // TODO - Create tests for `Integer getId()`
     @Test
     public void testGetId(){
@@ -78,6 +129,16 @@ public void testGetId(){
         //then
         Assert.assertEquals(expected,actual);
 
+    }
+    public void testGetId2(){
+        //given
+        Dog dog = new Dog ("Agdalene",new Date(2, Calendar.APRIL,5),99);
+        int expected = 99;
+        //when
+        int actual = dog.getId();
+        //then
+        Assert.assertEquals(expected,actual);
+
     }
     // TODO - Create test to check Animal inheritance; google search `java instanceof keyword`
     @Test

From 44a24bb071c7d0ad2bdcd23a90cb7cf338a48e45 Mon Sep 17 00:00:00 2001
From: Quatrani Paul <quatranipaul@zipcodes-MacBook-Pro-9.local>
Date: Fri, 5 Nov 2021 13:14:39 -0400
Subject: [PATCH 6/6] added a @Test annotation

---
 src/test/java/rocks/zipcodewilmington/DogTest.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/test/java/rocks/zipcodewilmington/DogTest.java b/src/test/java/rocks/zipcodewilmington/DogTest.java
index 94e91d4..605d519 100644
--- a/src/test/java/rocks/zipcodewilmington/DogTest.java
+++ b/src/test/java/rocks/zipcodewilmington/DogTest.java
@@ -130,6 +130,7 @@ public void testGetId(){
         Assert.assertEquals(expected,actual);
 
     }
+    @Test
     public void testGetId2(){
         //given
         Dog dog = new Dog ("Agdalene",new Date(2, Calendar.APRIL,5),99);