diff --git a/src/main/java/rocks/zipcodewilmington/animals/Cat.java b/src/main/java/rocks/zipcodewilmington/animals/Cat.java index e703c36..7fea52b 100644 --- a/src/main/java/rocks/zipcodewilmington/animals/Cat.java +++ b/src/main/java/rocks/zipcodewilmington/animals/Cat.java @@ -6,6 +6,12 @@ * @author leon on 4/19/18. */ public class Cat extends Mammal { + + + String name; + Integer birthDate; + + public Cat(String name, Date birthDate, Integer id) { super(name, birthDate, id); } @@ -13,4 +19,7 @@ public Cat(String name, Date birthDate, Integer id) { public String speak() { return "meow!"; } -} + + + } + diff --git a/src/main/java/rocks/zipcodewilmington/animals/Mammal.java b/src/main/java/rocks/zipcodewilmington/animals/Mammal.java index eec2aaa..5d629fe 100644 --- a/src/main/java/rocks/zipcodewilmington/animals/Mammal.java +++ b/src/main/java/rocks/zipcodewilmington/animals/Mammal.java @@ -44,6 +44,7 @@ public Integer getNumberOfMealsEaten() { public void eat(Food food) { eatenMeals.add(food); + } @Override diff --git a/src/test/java/rocks/zipcodewilmington/AnimalFactoryTest.java b/src/test/java/rocks/zipcodewilmington/AnimalFactoryTest.java index 7522ce3..f2f4496 100644 --- a/src/test/java/rocks/zipcodewilmington/AnimalFactoryTest.java +++ b/src/test/java/rocks/zipcodewilmington/AnimalFactoryTest.java @@ -1,9 +1,57 @@ package rocks.zipcodewilmington; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import rocks.zipcodewilmington.animals.animal_creation.AnimalFactory; +import rocks.zipcodewilmington.animals.Animal; +import rocks.zipcodewilmington.animals.Cat; +import rocks.zipcodewilmington.animals.Dog; +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)` //TODO - Create Test for `Animal createCat(String name, Date birthDate)` + +@Before + public void setup() { +} + +@After + public void tearDown() { +} + +@Test + public void testCreateDog() { + Dog dog1 = AnimalFactory.createDog("spot", new Date(1)); + String expected1 = "spot"; + Date expected2 = new Date(1); + String actual1 = dog1.getName(); + Date actual2 = dog1.getBirthDate(); + Assert.assertEquals(expected1, actual1); + Assert.assertEquals(expected2, actual2); } + +@Test + public void testCreateCat() { + Cat cat2 = AnimalFactory.createCat("fido", new Date(1)); + String expected1 = "fido"; + Date expected2 = new Date(1); + String actual1 = cat2.getName(); + Date actual2 = cat2.getBirthDate(); + Assert.assertEquals(expected1, actual1); + Assert.assertEquals(expected2, actual2); +} + + + + + +} \ No newline at end of file diff --git a/src/test/java/rocks/zipcodewilmington/CatHouseTest.java b/src/test/java/rocks/zipcodewilmington/CatHouseTest.java index f756b34..4b9c978 100644 --- a/src/test/java/rocks/zipcodewilmington/CatHouseTest.java +++ b/src/test/java/rocks/zipcodewilmington/CatHouseTest.java @@ -1,5 +1,18 @@ package rocks.zipcodewilmington; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +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.ArrayList; +import java.util.Date; + /** * @author leon on 4/19/18. */ @@ -9,4 +22,63 @@ public class CatHouseTest { // TODO - Create tests for `void remove(Cat cat)` // TODO - Create tests for `Cat getCatById(Integer id)` // TODO - Create tests for `Integer getNumberOfCats()` + + + @Before + public void setUp() { + + } + + @After + public void tearDown() { + CatHouse.clear(); + } + + @Test + public void testAddCat() { + Cat cat3 = new Cat("tom", new Date(), 2); + CatHouse.add(cat3); + Cat expected = cat3; + Cat actual = CatHouse.getCatById(2); + Assert.assertEquals(expected, actual); + } + + + @Test + public void testRemoveCat() { + Cat cat1 = new Cat("Sheila", new Date(), 2); + Cat cat2 = new Cat("Bob", new Date(), 4); + CatHouse.add(cat1); + CatHouse.add(cat2); + CatHouse.remove(cat2); + Integer expected = 1; + Integer actual = CatHouse.getNumberOfCats(); + Assert.assertEquals(expected, actual); + } + + @Test + public void testGetCatById() { + Cat cat3 = new Cat("simon", new Date(), 4); + CatHouse.add(cat3); + Cat expected = cat3; + Cat actual = CatHouse.getCatById(4); + Assert.assertEquals(expected, actual); + } + + } + + + + + + + + + + + + + + + diff --git a/src/test/java/rocks/zipcodewilmington/CatTest.java b/src/test/java/rocks/zipcodewilmington/CatTest.java index 4bd465f..bc752a4 100644 --- a/src/test/java/rocks/zipcodewilmington/CatTest.java +++ b/src/test/java/rocks/zipcodewilmington/CatTest.java @@ -1,15 +1,97 @@ package rocks.zipcodewilmington; +import org.junit.After; import org.junit.Assert; +import org.junit.Before; import org.junit.Test; +import rocks.zipcodewilmington.animals.Animal; import rocks.zipcodewilmington.animals.Cat; +import rocks.zipcodewilmington.animals.Mammal; +import java.util.ArrayList; import java.util.Date; /** * @author leon on 4/19/18. */ public class CatTest { + + + @Before + public void setup() { + } + + @After + public void tearDown() { + }; + + @Test + public void testSetName() { + Cat cat = new Cat("Fluffy the Marshmallow", new Date(4), 2); + String expected = "Mr. Cat"; + cat.setName(expected); + String actual = cat.getName(); + Assert.assertEquals(expected,actual); + } + + @Test + public void testSetBirthDate() { + Cat cat = new Cat("Fluffy the Marshmallow", new Date(4), 2); + Date expected = new Date(); + cat.setBirthDate(new Date()); + Date actual = cat.getBirthDate(); + Assert.assertEquals(expected, actual); + } + + @Test + public void testSpeak() { + Cat cat = new Cat("Fluffy the Marshmallow", new Date(4), 2); + String expected = "meow!"; + String actual = cat.speak(); + Assert.assertEquals(expected, actual); + } + + @Test + public void testEat() { + Cat cat = new Cat("Fluffy the Marshmallow", new Date(4), 2); + Food kittyChow = new Food(); + Integer expected = 1; + cat.eat(kittyChow); + Integer actual = cat.getNumberOfMealsEaten(); + Assert.assertEquals(expected, actual); + } + + @Test + public void testGetId() { + Cat cat = new Cat("Maira", new Date(4), 1); + int actual = cat.getId(); + Assert.assertEquals(1, actual); + } + + @Test + public void testIsInstanceOfAnimal() { + Cat cat = new Cat("Maira", new Date(4), 1); + boolean actual = cat instanceof Animal; + Assert.assertEquals(true, actual); + } + + @Test + public void testIsInstanceOfMammal() { + Cat cat = new Cat("Maira", new Date(4), 1); + boolean actual = cat instanceof Mammal; + Assert.assertEquals(true, actual); + } + + + + + /* @Test + public void testEat() { + Cat cat = new Cat() { + Food expected = + }*/ + + // TODO - Create tests for `void setName(String name)` // TODO - Create tests for `speak` // TODO - Create tests for `setBirthDate(Date birthDate)` @@ -40,4 +122,7 @@ public void constructorTest() { Assert.assertEquals(givenId, retrievedId); } -} + + } + + diff --git a/src/test/java/rocks/zipcodewilmington/DogHouseTest.java b/src/test/java/rocks/zipcodewilmington/DogHouseTest.java index b88b30b..017aeef 100644 --- a/src/test/java/rocks/zipcodewilmington/DogHouseTest.java +++ b/src/test/java/rocks/zipcodewilmington/DogHouseTest.java @@ -1,10 +1,16 @@ package rocks.zipcodewilmington; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; 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.ArrayList; import java.util.Date; /** @@ -17,18 +23,65 @@ public class DogHouseTest { // TODO - Create tests for `Dog getDogById(Integer id)` // TODO - Create tests for `Integer getNumberOfDogs()` + @Before + public void setUp() { + + } + + @After + public void tearDown() { + DogHouse.clear(); + } + @Test - public void testGetNumberOfDogs() { - // Given (some - String name = "Milo"; - Date birthDate = new Date(); - Dog animal = AnimalFactory.createDog(name, birthDate); - DogHouse.clear(); - - // When - DogHouse.add(animal); - - // Then - DogHouse.getNumberOfDogs(); + public void testAddDog() { + DogHouse dogHut = new DogHouse(); + Dog cat3 = new Dog("tom", new Date(), 2); + dogHut.add(cat3); + Dog expected = cat3; + Dog actual = dogHut.getDogById(2); + Assert.assertEquals(expected, actual); } + + + @Test + public void testRemoveDog() { + DogHouse dogHut = new DogHouse(); + Dog dog1 = new Dog("Sheila", new Date(), 2); + Dog dog2 = new Dog("Bob", new Date(), 4); + dogHut.add(dog1); + dogHut.add(dog2); + dogHut.remove(dog2); + Integer expected = 1; + Integer actual = dogHut.getNumberOfDogs(); + Assert.assertEquals(expected, actual); + } + + @Test + public void testGetDogById() { + DogHouse dogHut = new DogHouse(); + Dog dog3 = new Dog("simon", new Date(), 4); + dogHut.add(dog3); + Dog expected = dog3; + Dog actual = dogHut.getDogById(4); + Assert.assertEquals(expected, actual); + } + + } + + + + + + + + + + + + + + + + diff --git a/src/test/java/rocks/zipcodewilmington/DogTest.java b/src/test/java/rocks/zipcodewilmington/DogTest.java index 34a15bd..73af622 100644 --- a/src/test/java/rocks/zipcodewilmington/DogTest.java +++ b/src/test/java/rocks/zipcodewilmington/DogTest.java @@ -1,13 +1,87 @@ package rocks.zipcodewilmington; +import org.junit.After; import org.junit.Assert; +import org.junit.Before; import org.junit.Test; +import rocks.zipcodewilmington.animals.Animal; import rocks.zipcodewilmington.animals.Dog; +import rocks.zipcodewilmington.animals.Mammal; + +import java.util.Date; /** * @author leon on 4/19/18. */ public class DogTest { + + @Before + public void setup() { + } + + @After + public void teardown() { + } + @Test + public void testNewDog() { + Dog dog1 = new Dog("Ralph", new Date(), 3); + String expected = "Ralph"; + String actual = dog1.getName(); + Assert.assertEquals(expected, actual); + } + + @Test + public void testSpeak() { + Dog dog1 = new Dog("bob", new Date(), 3); + String expected = "bark!"; + String actual = dog1.speak(); + Assert.assertEquals(expected, actual); + } + + @Test + public void testSetBirthDate() { + Dog dog1 = new Dog("Phil", new Date(), 5); + Date expected = new Date(); + Date actual = new Date(); + Assert.assertEquals(expected, actual); + } + + + @Test + public void testEatFood() { + Dog dog2 = new Dog("Tom", new Date(), 4); + Food dogChow = new Food(); + Integer expected = 1; + dog2.eat(dogChow); + Integer actual = dog2.getNumberOfMealsEaten(); + Assert.assertEquals(expected, actual); + } + + @Test + public void testGetId() { + Dog dog2 = new Dog("ted", new Date(), 0); + Integer expected = 0; + Integer actual = dog2.getId(); + Assert.assertEquals(expected, actual); + } + + @Test + public void testAnimalInheritance() { + Dog hank = new Dog("hank", new Date(), 4); + boolean expected = true; + boolean actual = hank instanceof Animal; + Assert.assertEquals(expected, actual); + } + + @Test + public void testMammalInheritance() { + Dog tim = new Dog("tim", new Date(), 4); + boolean expected = true; + boolean actual = tim instanceof Mammal; + Assert.assertEquals(expected, actual); + } + + // TODO - Create tests for `new Dog(String name, Date birthDate, Integer id)` // TODO - Create tests for `speak` // TODO - Create tests for `setBirthDate(Date birthDate)`