All tests passed

src/main/java/rocks/zipcodewilmington/animals/Cat.java

@@ -10,6 +10,11 @@ public Cat(String name, Date birthDate, Integer id) {
         super(name, birthDate, id);
     }
 
+    public Cat(String givenName) {
+        super(givenName);
+    }
+
+
     public String speak() {
         return "meow!";
     }

src/main/java/rocks/zipcodewilmington/animals/Mammal.java

@@ -21,6 +21,14 @@ public Mammal(String name, Date birthDate, Integer id) {
         this.id = id;
     }
 
+    public Mammal(String givenName) {
+        this.name = givenName;
+        this.birthDate = null;
+        this.id = null;
+
+
+    }
+
     public String getName() {
         return name;
     }

src/test/java/rocks/zipcodewilmington/AnimalFactoryTest.java

@@ -1,9 +1,55 @@
 package rocks.zipcodewilmington;
 
+import org.junit.Assert;
+import org.junit.Test;
+import rocks.zipcodewilmington.animals.Cat;
+import rocks.zipcodewilmington.animals.Dog;
+import rocks.zipcodewilmington.animals.animal_creation.AnimalFactory;
+import rocks.zipcodewilmington.animals.animal_storage.CatHouse;
+import rocks.zipcodewilmington.animals.animal_storage.DogHouse;
+
+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 createDogTest() {
+        //Given
+        String givenName = "Slinky";
+        Date givenBirthDate = new Date();
+
+        //When
+        Dog dogTest = AnimalFactory.createDog(givenName, givenBirthDate);
+        DogHouse.add((Dog) dogTest);
+
+        //Then
+        int actual = DogHouse.getNumberOfDogs();
+        Assert.assertEquals(1, actual);
+    }
+
+
+
+
+
+
+
     //TODO - Create Test for `Animal createCat(String name, Date birthDate)`
+    @Test
+    public void createCatTest() {
+        //Given
+        String givenName = "Tom";
+        Date givenBirthDate = new Date();
+
+        //When
+        Cat catTest = AnimalFactory.createCat(givenName, givenBirthDate);
+        CatHouse.add((Cat) catTest);
+
+        //Then
+        int actual = CatHouse.getNumberOfCats();
+        Assert.assertEquals(1, actual);
+
+    }
 }

src/test/java/rocks/zipcodewilmington/CatHouseTest.java

@@ -1,12 +1,100 @@
 package rocks.zipcodewilmington;
 
+import org.junit.Assert;
+import org.junit.Test;
+import rocks.zipcodewilmington.animals.Cat;
+import rocks.zipcodewilmington.animals.Dog;
+import rocks.zipcodewilmington.animals.animal_creation.AnimalFactory;
+import rocks.zipcodewilmington.animals.animal_storage.CatHouse;
+import rocks.zipcodewilmington.animals.animal_storage.CatHouse;
+
+import java.util.Date;
+
 /**
  * @author leon on 4/19/18.
  */
 public class CatHouseTest {
+
     // TODO - Create tests for `void add(Cat cat)`
-    // TODO - Create tests for `void remove(Integer id)`
+
+    @Test
+    public void addCatTest() {
+        //Given
+        Cat addCat = AnimalFactory.createCat("Mr.Bigglesworth", null);
+
+        //When
+        CatHouse.add(addCat);
+        int actual = CatHouse.getNumberOfCats();
+
+        //Then
+        Assert.assertEquals(2, actual);
+    }
+
     // TODO - Create tests for `void remove(Cat cat)`
+
+    @Test
+    public void removeCatTest(){
+        //Given
+        Cat catToBeRemoved = new Cat("Luna", null, 1);
+
+        //When
+        CatHouse.remove(catToBeRemoved);
+
+
+        //Then
+        int actual = CatHouse.getNumberOfCats();
+        Assert.assertEquals(1, actual);
+    }
+
+    // TODO - Create tests for `void remove(Integer id)`
+
+    @Test
+    public void removeIntegerCatTest(){
+        //Given
+        CatHouse catHouse = new CatHouse();
+
+        //When
+        catHouse.remove(1);
+
+
+        //Then
+        int actual = CatHouse.getNumberOfCats();
+        Assert.assertEquals(1, actual);
+    }
+
     // TODO - Create tests for `Cat getCatById(Integer id)`
+
+    @Test
+    public void getCatByIdTest() {
+        //Given
+        Cat catId = new Cat ("Chaco", null, 0);
+
+        //When
+        Integer actual = catId.getId();
+        Integer expected = 0;
+
+        //Then
+        Assert.assertEquals(expected, actual);
+    }
+
     // TODO - Create tests for `Integer getNumberOfCats()`
-}
+
+    @Test
+    public void testGetNumberOfCats() {
+        // Given (some
+        String name = "Fluffy";
+        Date birthDate = new Date();
+        Cat animal = AnimalFactory.createCat(name, birthDate);
+        CatHouse.clear();
+
+        // When
+        CatHouse.add(animal);
+
+        // Then
+        CatHouse.getNumberOfCats();
+    }
+
+
+
+
+} // final brace

src/test/java/rocks/zipcodewilmington/CatTest.java

@@ -2,22 +2,16 @@
 
 import org.junit.Assert;
 import org.junit.Test;
+import rocks.zipcodewilmington.animals.Animal;
 import rocks.zipcodewilmington.animals.Cat;
+import rocks.zipcodewilmington.animals.Mammal;
 
 import java.util.Date;
 
 /**
  * @author leon on 4/19/18.
  */
 public class CatTest {
-    // TODO - Create tests for `void setName(String name)`
-    // TODO - Create tests for `speak`
-    // TODO - Create tests for `setBirthDate(Date birthDate)`
-    // TODO - Create tests for `void eat(Food food)`
-    // TODO - Create tests for `Integer getId()`
-    // TODO - Create test to check Animal inheritance; google search `java instanceof keyword`
-    // TODO - Create test to check Mammal inheritance; google search `java instanceof keyword`
-
 
     @Test
     public void constructorTest() {
@@ -38,6 +32,121 @@ public void constructorTest() {
         Assert.assertEquals(givenName, retrievedName);
         Assert.assertEquals(givenBirthDate, retrievedBirthDate);
         Assert.assertEquals(givenId, retrievedId);
+    } // end of constructorTest
+
+    // TODO - Create tests for `void setName(String name)`
+
+    @Test
+    public void setNameTest() {
+        //Given
+        String givenName = "Zula";
+        String expectedName = "Binx";
+
+        //When
+        Cat catTest = new Cat(givenName);
+        catTest.setName(expectedName);
+
+        //Then
+        String actualName = catTest.getName();
+        Assert.assertEquals(expectedName, actualName);
+
+    } // end of setNameTest
+
+    // TODO - Create tests for `speak`
+    @Test
+    public void speakTest() {
+        //Given
+        String givenName = "Zula";
+        Date givenBirthDate = new Date ();
+        Integer givenId = 0;
+        String expectedSpeak = "meow!";
+
+        //When
+        Cat catTest = new Cat(givenName, givenBirthDate, givenId);
+        String actualSpeak = catTest.speak();
+
+        //Then
+        Assert.assertEquals(expectedSpeak, actualSpeak);
+
+    } // end of speakTest
+
+    // TODO - Create tests for `setBirthDate(Date birthDate)`
+
+    @Test
+    public void setBirthDateTest() {
+        //Given
+        String givenName = "Zula";
+        Date givenBirthDate = new Date ();
+        Date expectedDate = new Date(27-0-1992);
+        Integer givenId = 0;
+
+        //When
+        Cat catTest = new Cat(givenName, givenBirthDate,givenId);
+        catTest.setBirthDate(expectedDate);
+
+        //Then
+        Date actualBirthDate = catTest.getBirthDate();
+        Assert.assertEquals(expectedDate, actualBirthDate);
+    } //end of birthdate test
+
+    // TODO - Create tests for `void eat(Food food)`
+
+    @Test
+    public void eatTest () {
+        //Given
+        String givenName = "Zula";
+        Date givenBirthDate = new Date ();
+        Integer givenId = 0;
+        Integer expected = 1;
+        Food food = new Food ();
+
+        //When
+        Cat catTest = new Cat(givenName, givenBirthDate, givenId);
+        catTest.eat(food);
+
+        //Then
+        Integer actual = catTest.getNumberOfMealsEaten();
+        Assert.assertEquals(expected, actual);
+    }
+
+    // TODO - Create tests for `Integer getId()`
+
+    @Test
+    public void getIdTest() {
+        //Given
+        String givenName = "Zula";
+        Date givenBirthDate = new Date ();
+        Integer expected = 7;
+
+        //When
+        Cat catTest = new Cat(givenName, givenBirthDate, 7);
+        Integer actual = catTest.getId();
+
+        //Then
+        Assert.assertEquals(expected, actual);
+    }
+
+    // TODO - Create test to check Animal inheritance; google search `java instanceof keyword`
+
+    @Test
+    public void animalInheritanceTest() {
+        Animal cat = new Cat ("Salem");
+        Assert.assertTrue(cat instanceof Animal);
+    }
+
+    // TODO - Create test to check Mammal inheritance; google search `java instanceof keyword`
+
+    @Test
+    public void mammalInheritanceTest() {
+        Mammal cat = new Cat ("Fluffy");
+        Assert.assertTrue(cat instanceof Mammal);
     }
 
-}
+
+
+
+
+
+
+
+} //final brace