diff --git a/src/test/java/rocks/zipcodewilmington/AnimalFactoryTest.java b/src/test/java/rocks/zipcodewilmington/AnimalFactoryTest.java index 7522ce3..47b47ec 100644 --- a/src/test/java/rocks/zipcodewilmington/AnimalFactoryTest.java +++ b/src/test/java/rocks/zipcodewilmington/AnimalFactoryTest.java @@ -1,9 +1,48 @@ 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.Calendar; +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, Calendar.MAY,4); + //should this be type animal? + //when + Dog newDog = AnimalFactory.createDog(expectedName,expectedBirthDate); + 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, Calendar.APRIL,8); + //when + Cat newCat = AnimalFactory.createCat(expectedName,expectedBirthDate); + 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..a6d9baa 100644 --- a/src/test/java/rocks/zipcodewilmington/CatHouseTest.java +++ b/src/test/java/rocks/zipcodewilmington/CatHouseTest.java @@ -1,12 +1,145 @@ package rocks.zipcodewilmington; +import org.junit.Assert; +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; + /** * @author leon on 4/19/18. */ public class CatHouseTest { // TODO - Create tests for `void add(Cat cat)` + @Test + public void testAddCat(){ + //given + Cat newCat = new Cat("Mckayla",new Date(2019, Calendar.JANUARY,1),1); + CatHouse.clear(); + //when + CatHouse.add(newCat); + Cat actualCat = CatHouse.getCatById(1); + //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(){ + //given + Cat newCat = new Cat("Roberto",new Date(2019, Calendar.JANUARY,1),1); + CatHouse.clear(); + CatHouse.add(newCat); + Cat expected = null; + //when + CatHouse.remove(1); + 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 + 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 + CatHouse.remove(newCat); + 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 + 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); + //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(){ + //given + Cat newCat = new Cat("Archimedes",new Date(2019, Calendar.JANUARY,1),1); + CatHouse.clear(); + CatHouse.add(newCat); + Integer expected = 1; + //when + Integer actual = CatHouse.getNumberOfCats(); + //then + 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 4bd465f..3964054 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,134 @@ */ 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); + } + @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(){ + //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); + } + @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(){ + //given + Cat originalCat = AnimalFactory.createCat("Penelope",new Date(2009, Calendar.FEBRUARY,3)); + Date expected = new Date(1919, Calendar.SEPTEMBER,14); + //when + originalCat.setBirthDate(expected); + Date actual = originalCat.getBirthDate(); + //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(){ + //given + Cat originalCat = AnimalFactory.createCat("Ichabod",new Date(2005, Calendar.AUGUST,3)); + int expected = 1; + //when + originalCat.eat(new Food()); + int actual = originalCat.getNumberOfMealsEaten(); + //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(){ + //given + Cat originalCat = new Cat("Horatio",new Date(1945, Calendar.AUGUST,3),3); + int expected = 3; + //when + int actual = originalCat.getId(); + //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(){ + //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("Chrysanthemum",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..1a9f42e 100644 --- a/src/test/java/rocks/zipcodewilmington/DogHouseTest.java +++ b/src/test/java/rocks/zipcodewilmington/DogHouseTest.java @@ -1,10 +1,12 @@ package rocks.zipcodewilmington; +import org.junit.Assert; import org.junit.Test; import rocks.zipcodewilmington.animals.Dog; import rocks.zipcodewilmington.animals.animal_creation.AnimalFactory; import rocks.zipcodewilmington.animals.animal_storage.DogHouse; +import java.util.Calendar; import java.util.Date; /** @@ -12,11 +14,110 @@ */ public class DogHouseTest { // TODO - Create tests for `void add(Dog dog)` + @Test + public void testAddDog(){ + //given + Dog expected = new Dog("Eleanor",new Date(),1); + DogHouse.clear(); + //when + DogHouse.add(expected); + Dog actual = DogHouse.getDogById(1); + //then + 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("Elizabeth",new Date(),1); + DogHouse.clear(); + DogHouse.add(newDog); + //when + DogHouse.remove(1); + Dog actual = DogHouse.getDogById(1); + //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(){ + //given + Dog expected = null; + Dog newDog = new Dog("Ulysses",new Date(),1); + DogHouse.clear(); + DogHouse.add(newDog); + //when + DogHouse.remove(newDog); + Dog actual = DogHouse.getDogById(1); + //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(){ + //given + Dog expected = new Dog("Anthony",new Date(),1); + DogHouse.clear(); + DogHouse.add(expected); + //when + Dog actual = DogHouse.getDogById(1); + //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() { // Given (some @@ -24,11 +125,29 @@ public void testGetNumberOfDogs() { Date birthDate = new Date(); Dog animal = AnimalFactory.createDog(name, birthDate); DogHouse.clear(); - + int expected = 1; + DogHouse.add(animal); // When + int actual = DogHouse.getNumberOfDogs(); + //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); - - // Then - DogHouse.getNumberOfDogs(); + 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 34a15bd..605d519 100644 --- a/src/test/java/rocks/zipcodewilmington/DogTest.java +++ b/src/test/java/rocks/zipcodewilmington/DogTest.java @@ -2,20 +2,162 @@ 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. */ public class DogTest { // TODO - Create tests for `new Dog(String name, Date birthDate, Integer id)` + @Test + public void testDogConstructor3Parameters(){ + //given + String givenName = "Harrison"; + Date givenDate = new Date(); + int givenId = 1; + //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); + } + @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(){ + //given + Dog dog = new Dog ("Maryanne",new Date(),2); + String givenSound = "bark!"; + //when + String actualSound = dog.speak(); + //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 + 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); + + } + @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 + 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); + } + @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(){ + //given + Dog dog = new Dog ("Magdalene",new Date(),5); + int expected = 5; + //when + int actual = dog.getId(); + //then + Assert.assertEquals(expected,actual); + + } + @Test + 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 + 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() { // Given (a name exists and a dog exists) Dog dog = new Dog(null, null, null);