From a44f531e00468b38cd6fe195f82a820849817880 Mon Sep 17 00:00:00 2001 From: Dipinti Date: Sun, 4 Jul 2021 17:55:44 -0400 Subject: [PATCH] it's raining Cats and Dogs --- .../java/rocks/zipcodewilmington/Food.java | 4 + .../zipcodewilmington/MainApplication.java | 1 + .../rocks/zipcodewilmington/animals/Cat.java | 1 + .../animals/animal_storage/DogHouse.java | 1 + .../zipcodewilmington/AnimalFactoryTest.java | 33 +++++++ .../rocks/zipcodewilmington/CatHouseTest.java | 61 +++++++++++++ .../java/rocks/zipcodewilmington/CatTest.java | 88 +++++++++++++++++++ .../rocks/zipcodewilmington/DogHouseTest.java | 68 +++++++++++--- .../java/rocks/zipcodewilmington/DogTest.java | 83 +++++++++++++++++ 9 files changed, 328 insertions(+), 12 deletions(-) diff --git a/src/main/java/rocks/zipcodewilmington/Food.java b/src/main/java/rocks/zipcodewilmington/Food.java index 2e5056b..4c0794d 100644 --- a/src/main/java/rocks/zipcodewilmington/Food.java +++ b/src/main/java/rocks/zipcodewilmington/Food.java @@ -4,4 +4,8 @@ * @author leon on 4/19/18. */ public class Food { +String food; + public Food(String food) { + this.food=food; + } } diff --git a/src/main/java/rocks/zipcodewilmington/MainApplication.java b/src/main/java/rocks/zipcodewilmington/MainApplication.java index 1a21cb8..fecb914 100644 --- a/src/main/java/rocks/zipcodewilmington/MainApplication.java +++ b/src/main/java/rocks/zipcodewilmington/MainApplication.java @@ -4,4 +4,5 @@ * @author leon on 4/19/18. */ public class MainApplication { + } diff --git a/src/main/java/rocks/zipcodewilmington/animals/Cat.java b/src/main/java/rocks/zipcodewilmington/animals/Cat.java index e703c36..3b6418b 100644 --- a/src/main/java/rocks/zipcodewilmington/animals/Cat.java +++ b/src/main/java/rocks/zipcodewilmington/animals/Cat.java @@ -13,4 +13,5 @@ public Cat(String name, Date birthDate, Integer id) { public String speak() { return "meow!"; } + } diff --git a/src/main/java/rocks/zipcodewilmington/animals/animal_storage/DogHouse.java b/src/main/java/rocks/zipcodewilmington/animals/animal_storage/DogHouse.java index bc1feb0..1108ef4 100644 --- a/src/main/java/rocks/zipcodewilmington/animals/animal_storage/DogHouse.java +++ b/src/main/java/rocks/zipcodewilmington/animals/animal_storage/DogHouse.java @@ -5,6 +5,7 @@ /** * @author leon on 4/19/18. */ + public class DogHouse { private static AnimalWarehouse dogHouse = new AnimalWarehouse<>(); diff --git a/src/test/java/rocks/zipcodewilmington/AnimalFactoryTest.java b/src/test/java/rocks/zipcodewilmington/AnimalFactoryTest.java index 7522ce3..967ca25 100644 --- a/src/test/java/rocks/zipcodewilmington/AnimalFactoryTest.java +++ b/src/test/java/rocks/zipcodewilmington/AnimalFactoryTest.java @@ -1,9 +1,42 @@ 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.Dog; +import rocks.zipcodewilmington.animals.animal_creation.AnimalFactory; +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 testCreateDog(){ + //given + String expectedName="Bingo"; + Date dob=new Date(); + //when + Dog newDog=AnimalFactory.createDog(expectedName,dob); + //then + String actualName=newDog.getName(); + Assert.assertEquals(expectedName,actualName); + } //TODO - Create Test for `Animal createCat(String name, Date birthDate)` + @Test + public void testCreateCat(){ + //given + String expectedName="Phula"; + Date dob=new Date(); + //when + Cat newCat=AnimalFactory.createCat(expectedName,dob); + //then + String actualName=newCat.getName(); + Assert.assertEquals(expectedName,actualName); + } + } diff --git a/src/test/java/rocks/zipcodewilmington/CatHouseTest.java b/src/test/java/rocks/zipcodewilmington/CatHouseTest.java index f756b34..e62b335 100644 --- a/src/test/java/rocks/zipcodewilmington/CatHouseTest.java +++ b/src/test/java/rocks/zipcodewilmington/CatHouseTest.java @@ -1,12 +1,73 @@ package rocks.zipcodewilmington; +import org.junit.Assert; +import org.junit.Test; +import rocks.zipcodewilmington.animals.Cat; +import rocks.zipcodewilmington.animals.animal_storage.CatHouse; + /** * @author leon on 4/19/18. */ public class CatHouseTest { // TODO - Create tests for `void add(Cat cat)` + @Test + public void testAdd(){ + //given + Cat expectedCat=new Cat("Princess",null,15); + //when + CatHouse.add(expectedCat); + //then + Cat actualCat=CatHouse.getCatById(15); + Assert.assertEquals(expectedCat,actualCat); + } // TODO - Create tests for `void remove(Integer id)` + @Test + public void testRemove(){ + //given + Cat expectedCat=null; + Cat myCat=new Cat("Fifa",null,23); + //when + CatHouse.add(myCat); + Cat getCat=CatHouse.getCatById(23); + CatHouse.remove(myCat); + //then + Cat actualCat=CatHouse.getCatById(23); + Assert.assertEquals(expectedCat,actualCat); + } // TODO - Create tests for `void remove(Cat cat)` + @Test + public void testRemoveById(){ + //given + Cat expectedCat=null; + Cat newCat=new Cat("Kitty",null,55); + //when + CatHouse.add(newCat); + CatHouse.remove(55); + //then + Cat actualCat=CatHouse.getCatById(55); + Assert.assertEquals(expectedCat,actualCat); + } // TODO - Create tests for `Cat getCatById(Integer id)` + @Test + public void testGetCatById(){ + //given + Cat expectedCat=new Cat("Kitty",null,55); + //when + CatHouse.add(expectedCat); + //then + Cat actualCat=CatHouse.getCatById(55); + Assert.assertEquals(expectedCat,actualCat); + } // TODO - Create tests for `Integer getNumberOfCats()` + @Test + public void testGetNumberOfCats(){ + //given + Cat newCat=new Cat("Galore",null,44); + Integer expectedValue=1; + //when + CatHouse.add(newCat); + Integer actualValue=CatHouse.getNumberOfCats(); + //then + Assert.assertEquals(expectedValue,actualValue); + } } diff --git a/src/test/java/rocks/zipcodewilmington/CatTest.java b/src/test/java/rocks/zipcodewilmington/CatTest.java index 4bd465f..b4754ea 100644 --- a/src/test/java/rocks/zipcodewilmington/CatTest.java +++ b/src/test/java/rocks/zipcodewilmington/CatTest.java @@ -2,21 +2,109 @@ 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.text.ParseException; +import java.text.SimpleDateFormat; import java.util.Date; +import java.util.GregorianCalendar; /** * @author leon on 4/19/18. */ public class CatTest { // TODO - Create tests for `void setName(String name)` + @Test + public void testSetName() { + //given + String expectedCatName="Phula"; + Date catDateOfBirth=new Date(); + System.out.println(catDateOfBirth); + Integer catId=53; + //when + Cat myCat=new Cat(expectedCatName,catDateOfBirth,catId); + //then + myCat.setName("Phula"); + String actualCatName=myCat.getName(); + Assert.assertEquals(expectedCatName,actualCatName); + } // TODO - Create tests for `speak` + @Test + public void testSpeak(){ + //given + String expectedValue="meow!"; + Date dob=new Date(2020,11,5); + //when + Cat mycat=new Cat("kanaka",dob,23); + //then + String actualValue=mycat.speak(); + Assert.assertEquals(expectedValue,actualValue); + + } // TODO - Create tests for `setBirthDate(Date birthDate)` + @Test + public void testSetBirthDate(){ + //given + Date expectedDOB=new Date(2020,12,31); + Date someDateValue= new Date(2021,07,01); + //when + Cat myCat=new Cat("Tupusi",someDateValue,77); + Date setDOB=new Date(2020,12,31); + myCat.setBirthDate(setDOB); + Date actualValue=myCat.getBirthDate(); + //then + Assert.assertEquals(expectedDOB,actualValue); + } // TODO - Create tests for `void eat(Food food)` + @Test + public void testEat(){ + //given + Integer expectedValue=1; + Date someDateValue= new Date(2021,07,01); + Cat myCat=new Cat("Tupusi",someDateValue,77); + //when + Food catFood =new Food("Fish"); + myCat.eat(catFood); + //then + Integer actualValue=myCat.getNumberOfMealsEaten(); + Assert.assertEquals(expectedValue,actualValue); + } // TODO - Create tests for `Integer getId()` + @Test + public void testGetId(){ + //given + Integer expectedValue=77; + //when + Date someDateValue= new Date(2021,07,01); + Cat myCat=new Cat("Tupusi",someDateValue,77); + Integer actualValue= myCat.getId(); + Assert.assertEquals(expectedValue,actualValue); + + } // TODO - Create test to check Animal inheritance; google search `java instanceof keyword` + @Test + public void testInstanceOfAnimal(){ + //given + Boolean expectedValue=true; + //when + Date someDateValue= new Date(2021,07,01); + Cat myCat=new Cat("Tupusi",someDateValue,77); + Boolean actualValue=myCat instanceof Animal; + Assert.assertEquals(expectedValue,actualValue); + } // TODO - Create test to check Mammal inheritance; google search `java instanceof keyword` + @Test + public void testInstanceOfMammal(){ + //given + Boolean expectedValue=true; + //when + Date someDateValue= new Date(2021,07,01); + Cat myCat=new Cat("Tupusi",someDateValue,77); + Boolean actualValue=myCat instanceof Mammal; + Assert.assertEquals(expectedValue,actualValue); + } @Test diff --git a/src/test/java/rocks/zipcodewilmington/DogHouseTest.java b/src/test/java/rocks/zipcodewilmington/DogHouseTest.java index b88b30b..fc354f3 100644 --- a/src/test/java/rocks/zipcodewilmington/DogHouseTest.java +++ b/src/test/java/rocks/zipcodewilmington/DogHouseTest.java @@ -1,8 +1,11 @@ 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; @@ -12,23 +15,64 @@ */ public class DogHouseTest { // TODO - Create tests for `void add(Dog dog)` + @Test + public void testAdd(){ + //given + Dog expectedDog=new Dog("Rocky",null,7); + //when + DogHouse.add(expectedDog); + //then + Dog actualDog=DogHouse.getDogById(7); + Assert.assertEquals(expectedDog,actualDog); + } // TODO - Create tests for `void remove(Integer id)` - // TODO - Create tests for `void remove(Dog dog)` + @Test + public void testRemove(){ + //given + Dog expectedDog=null; + Dog myDog=new Dog("Fifa",null,23); + //when + DogHouse.add(myDog); + DogHouse.clear(); + //then + Dog actualDog=DogHouse.getDogById(23); + Assert.assertEquals(expectedDog,actualDog); + } + // TODO - Create tests for `void remove(Cat cat)` + @Test + public void testRemoveById(){ + //given + Dog expectedDog=null; + Dog newDog=new Dog("Bruno",null,55); + //when + DogHouse.add(newDog); + DogHouse.clear(); + //then + Dog actualDog=DogHouse.getDogById(55); + Assert.assertEquals(expectedDog,actualDog); + } // TODO - Create tests for `Dog getDogById(Integer id)` + @Test + public void testGetDogById(){ + //given + Dog expectedDog=new Dog("Fifa",null,23); + //when + DogHouse.add(expectedDog); + //then + Dog actualDog=DogHouse.getDogById(23); + Assert.assertEquals(expectedDog,actualDog); + } // TODO - Create tests for `Integer getNumberOfDogs()` @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(); + //given + Dog newDog=new Dog("Bruno",null,44); + Integer expectedValue=2; + //when + DogHouse.add(newDog); + Integer actualValue=DogHouse.getNumberOfDogs(); + //then + Assert.assertEquals(expectedValue,actualValue); } } diff --git a/src/test/java/rocks/zipcodewilmington/DogTest.java b/src/test/java/rocks/zipcodewilmington/DogTest.java index 34a15bd..7e78ebe 100644 --- a/src/test/java/rocks/zipcodewilmington/DogTest.java +++ b/src/test/java/rocks/zipcodewilmington/DogTest.java @@ -2,20 +2,103 @@ 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.Mammal; + +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 newDogTest(){ + //given + String givenName = "Bingo"; + Date dob=new Date(1999,11,5); + Integer expectedId=15; + //when + Dog dog=new Dog(givenName,dob,expectedId); + Integer actualid=dog.getId(); + Assert.assertEquals(expectedId,actualid); + } // TODO - Create tests for `speak` + @Test + public void testSpeak() { + //given + String expectedValue = "bark!"; + Date dob = new Date(2020, 11, 5); + //when + Dog mydog = new Dog("kanaka", dob, 23); + //then + String actualValue = mydog.speak(); + Assert.assertEquals(expectedValue,actualValue); + } // TODO - Create tests for `setBirthDate(Date birthDate)` + @Test + public void testSetBirthDate(){ + //given + Date expectedDOB=new Date(2020,12,31); + Date someDateValue= new Date(2021,07,01); + //when + Dog myDog=new Dog("Tupusi",someDateValue,77); + Date setDOB=new Date(2020,12,31); + myDog.setBirthDate(setDOB); + Date actualValue=myDog.getBirthDate(); + //then + Assert.assertEquals(expectedDOB,actualValue); + } // TODO - Create tests for `void eat(Food food)` + @Test + public void testEat(){ + //given + Integer expectedValue=1; + Date someDateValue= new Date(2021,07,01); + Dog myDog=new Dog("Tupusi",someDateValue,77); + //when + Food catFood =new Food("Fish"); + myDog.eat(catFood); + //then + Integer actualValue=myDog.getNumberOfMealsEaten(); + Assert.assertEquals(expectedValue,actualValue); + } // TODO - Create tests for `Integer getId()` + @Test + public void testGetId(){ + //given + Integer expectedValue=77; + //when + Date someDateValue= new Date(2021,07,01); + Dog myDog=new Dog("Tupusi",someDateValue,77); + Integer actualValue= myDog.getId(); + Assert.assertEquals(expectedValue,actualValue); + + } // TODO - Create test to check Animal inheritance; google search `java instanceof keyword` + @Test + public void testInstanceOfAnimal(){ + //given + Boolean expectedValue=true; + //when + Date someDateValue= new Date(2021,07,01); + Dog myDog=new Dog("Tupusi",someDateValue,77); + Boolean actualValue=myDog instanceof Animal; + Assert.assertEquals(expectedValue,actualValue); + } // TODO - Create test to check Mammal inheritance; google search `java instanceof keyword` @Test + public void testInstanceOfMammal(){ + //given + Boolean expectedValue=true; + //when + Dog myDog = new Dog(null, null, null); + Boolean actualValue=myDog instanceof Mammal; + Assert.assertEquals(expectedValue,actualValue); + } + @Test public void setNameTest() { // Given (a name exists and a dog exists) Dog dog = new Dog(null, null, null);