From a0529249583bccd7b5ac2c796bc6269c85217823 Mon Sep 17 00:00:00 2001 From: junior Date: Thu, 4 Nov 2021 12:22:18 -0400 Subject: [PATCH 1/3] finished CatTest and DogTest --- .../rocks/zipcodewilmington/animals/Cat.java | 1 + .../zipcodewilmington/animals/Mammal.java | 3 + .../zipcodewilmington/AnimalFactoryTest.java | 12 +++ .../java/rocks/zipcodewilmington/CatTest.java | 87 ++++++++++++++++++ .../java/rocks/zipcodewilmington/DogTest.java | 91 +++++++++++++++++++ 5 files changed, 194 insertions(+) diff --git a/src/main/java/rocks/zipcodewilmington/animals/Cat.java b/src/main/java/rocks/zipcodewilmington/animals/Cat.java index e703c36..c3be6c4 100644 --- a/src/main/java/rocks/zipcodewilmington/animals/Cat.java +++ b/src/main/java/rocks/zipcodewilmington/animals/Cat.java @@ -6,6 +6,7 @@ * @author leon on 4/19/18. */ public class Cat extends Mammal { + public Cat(String name, Date birthDate, Integer id) { super(name, birthDate, id); } diff --git a/src/main/java/rocks/zipcodewilmington/animals/Mammal.java b/src/main/java/rocks/zipcodewilmington/animals/Mammal.java index eec2aaa..95787f9 100644 --- a/src/main/java/rocks/zipcodewilmington/animals/Mammal.java +++ b/src/main/java/rocks/zipcodewilmington/animals/Mammal.java @@ -14,6 +14,8 @@ public abstract class Mammal implements Animal { private String name; private Date birthDate; + + public Mammal(String name, Date birthDate, Integer id) { this.name = name; this.birthDate = birthDate; @@ -21,6 +23,7 @@ public Mammal(String name, Date birthDate, Integer id) { this.id = id; } + public String getName() { return name; } diff --git a/src/test/java/rocks/zipcodewilmington/AnimalFactoryTest.java b/src/test/java/rocks/zipcodewilmington/AnimalFactoryTest.java index 7522ce3..08bc5bd 100644 --- a/src/test/java/rocks/zipcodewilmington/AnimalFactoryTest.java +++ b/src/test/java/rocks/zipcodewilmington/AnimalFactoryTest.java @@ -1,9 +1,21 @@ package rocks.zipcodewilmington; +import org.junit.Test; +import rocks.zipcodewilmington.animals.Animal; + /** * @author leon on 4/19/18. */ public class AnimalFactoryTest { //TODO - Create Test for `Animal createDog(String name, Date birthDate)` + @Test + public void createDog(){ + //Given + + + //When + + //Then + } //TODO - Create Test for `Animal createCat(String name, Date birthDate)` } diff --git a/src/test/java/rocks/zipcodewilmington/CatTest.java b/src/test/java/rocks/zipcodewilmington/CatTest.java index 4bd465f..ca5e666 100644 --- a/src/test/java/rocks/zipcodewilmington/CatTest.java +++ b/src/test/java/rocks/zipcodewilmington/CatTest.java @@ -2,8 +2,11 @@ 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.beans.Transient; import java.util.Date; /** @@ -11,13 +14,97 @@ */ public class CatTest { // TODO - Create tests for `void setName(String name)` + @Test + public void testSetName(){ + //Given + Cat cat = new Cat("Milo",new Date(), 123); + String expectedName = "JR"; + cat.setName(expectedName); + //When + String actual = cat.getName(); + //Then + Assert.assertEquals(expectedName, actual); + + } // TODO - Create tests for `speak` + @Test + public void testSpeak(){ + //Given + Cat cat = new Cat("Milo",new Date(), 123); + String expected = "meow!"; + //When + String actual = cat.speak(); + //Then + Assert.assertEquals(expected, actual); + + } + + // TODO - Create tests for `setBirthDate(Date birthDate)` + @Test + public void testSetBirthDate(){ + //Given + Cat cat = new Cat("Milo",new Date(), 123); + Date expected = new Date(10-25-2021); + cat.setBirthDate(expected); + //When + Date actual = cat.getBirthDate(); + //Then + Assert.assertEquals(expected, actual); + } + + // TODO - Create tests for `void eat(Food food)` + @Test + public void testEat(){ + //Given + Cat cat = new Cat("Milo",new Date(), 123); + Food food = new Food(); + cat.eat(food); + Integer expected = 1; + + //When + Integer actual = cat.getNumberOfMealsEaten(); + + //Then + Assert.assertEquals(expected, actual); + } + // TODO - Create tests for `Integer getId()` + @Test + public void testGetId(){ + //Given + Cat cat = new Cat("Milo",new Date(), 123); + Integer expected = 123; + //When + Integer actual = cat.getId(); + //Then + Assert.assertEquals(expected, actual); + } + // TODO - Create test to check Animal inheritance; google search `java instanceof keyword` + @Test + public void testAnimalInheritance(){ + //Given + Cat cat = new Cat("Milo",new Date(), 123); + + //Then + Assert.assertTrue(cat instanceof Animal); + + + } + // TODO - Create test to check Mammal inheritance; google search `java instanceof keyword` + @Test + public void testMammalInheritance(){ + //Given + Cat cat = new Cat("Milo",new Date(), 123); + //Then + Assert.assertTrue(cat instanceof Mammal); + + + } @Test public void constructorTest() { diff --git a/src/test/java/rocks/zipcodewilmington/DogTest.java b/src/test/java/rocks/zipcodewilmington/DogTest.java index 34a15bd..cb18c21 100644 --- a/src/test/java/rocks/zipcodewilmington/DogTest.java +++ b/src/test/java/rocks/zipcodewilmington/DogTest.java @@ -2,19 +2,110 @@ 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.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 testNewDog(){ + //Given + String expectedName = "Fluffy"; + Date expectedBirthDate = new Date(05-05-2020); + Integer expectedId = 456; + + //When Dog is constructed + Dog dog = new Dog(expectedName, expectedBirthDate, expectedId); + //When data from dog is retrieved + String actualName = dog.getName(); + Date actualBirthDate = dog.getBirthDate(); + Integer actualId = dog.getId(); + //Then + Assert.assertEquals(expectedName, actualName); + Assert.assertEquals(expectedBirthDate, actualBirthDate); + Assert.assertEquals(expectedId, actualId); + + } // TODO - Create tests for `speak` + @Test + public void testSpeak(){ + //Given + Dog dog = new Dog("Fluffy", new Date(05-05-2020), 456); + String expected = "bark!" ; + //When + String actual = dog.speak(); + + //Then + Assert.assertEquals(expected, actual); + + } // TODO - Create tests for `setBirthDate(Date birthDate)` + @Test + public void testBirthDate(){ + //Given + Dog dog = new Dog("Fluffy", new Date(05-05-2020), 456); + Date expectedDate = new Date(05-02-2019); + dog.setBirthDate(expectedDate); + //When + Date actualDate = dog.getBirthDate(); + //Then + Assert.assertEquals(expectedDate, actualDate); + } + // TODO - Create tests for `void eat(Food food)` + @Test + public void testEat(){ + //Given + Dog dog = new Dog("Fluffy", new Date(05-05-2020), 456); + Food food = new Food(); + dog.eat(food); + Integer expected = 1; + //When + Integer actual = dog.getNumberOfMealsEaten(); + //Then + Assert.assertEquals(expected, actual); + } + // TODO - Create tests for `Integer getId()` + @Test + public void testGetId(){ + //Given + Dog dog = new Dog("Fluffy", new Date(05-05-2020), 456); + Integer expected = 456; + //When + Integer 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 + Dog dog = new Dog("Fluffy", new Date(05-05-2020), 456); + + //Then + Assert.assertTrue(dog instanceof Animal); + } + // TODO - Create test to check Mammal inheritance; google search `java instanceof keyword` + @Test + public void testMammalInheritance(){ + //Given + Dog dog = new Dog("Fluffy", new Date(05-05-2020), 456); + + //Then + Assert.assertTrue(dog instanceof Mammal); + + } + @Test public void setNameTest() { // Given (a name exists and a dog exists) From 45338ab3e8de065c1a51335c60652342b34ce004 Mon Sep 17 00:00:00 2001 From: junior Date: Fri, 5 Nov 2021 08:36:40 -0400 Subject: [PATCH 2/3] completed DogHouseTest --- .../animals/animal_storage/DogHouse.java | 2 +- .../zipcodewilmington/AnimalFactoryTest.java | 36 +++++++++-- .../rocks/zipcodewilmington/CatHouseTest.java | 21 +++++++ .../rocks/zipcodewilmington/DogHouseTest.java | 63 +++++++++++++++++++ 4 files changed, 117 insertions(+), 5 deletions(-) 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..2c8f043 100644 --- a/src/main/java/rocks/zipcodewilmington/animals/animal_storage/DogHouse.java +++ b/src/main/java/rocks/zipcodewilmington/animals/animal_storage/DogHouse.java @@ -12,7 +12,7 @@ public static void add(Dog dog) { dogHouse.add(dog); } - public static void remove(Integer id) { + public static void removeId(Integer id) { dogHouse.removeAnimalById(id); } diff --git a/src/test/java/rocks/zipcodewilmington/AnimalFactoryTest.java b/src/test/java/rocks/zipcodewilmington/AnimalFactoryTest.java index 08bc5bd..642071b 100644 --- a/src/test/java/rocks/zipcodewilmington/AnimalFactoryTest.java +++ b/src/test/java/rocks/zipcodewilmington/AnimalFactoryTest.java @@ -1,7 +1,14 @@ 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. @@ -9,13 +16,34 @@ public class AnimalFactoryTest { //TODO - Create Test for `Animal createDog(String name, Date birthDate)` @Test - public void createDog(){ + public void testCreateDog(){ //Given - - + Dog dog = AnimalFactory.createDog("Fluffy", new Date(05-05-2021)); + String expectedName = "Fluffy"; + Date expectedBirthDate = new Date(05-05-2021); //When - + String actualName = dog.getName(); + Date actualBirthDate = dog.getBirthDate(); //Then + Assert.assertEquals(expectedName, actualName); + Assert.assertEquals(expectedBirthDate, actualBirthDate); + } //TODO - Create Test for `Animal createCat(String name, Date birthDate)` + @Test + public void testCreateCat(){ + //Given + Cat cat = AnimalFactory.createCat("Milo", new Date(01-01-2019)); + String expectedName = "Milo"; + Date expectedDate = new Date(01-01-2019); + //When + String actualName = cat.getName(); + Date actualDate = cat.getBirthDate(); + //Then + Assert.assertEquals(expectedName, actualName); + Assert.assertEquals(expectedDate, actualDate); + + + } + } diff --git a/src/test/java/rocks/zipcodewilmington/CatHouseTest.java b/src/test/java/rocks/zipcodewilmington/CatHouseTest.java index f756b34..e15bb37 100644 --- a/src/test/java/rocks/zipcodewilmington/CatHouseTest.java +++ b/src/test/java/rocks/zipcodewilmington/CatHouseTest.java @@ -5,8 +5,29 @@ */ public class CatHouseTest { // TODO - Create tests for `void add(Cat cat)` + + + + // TODO - Create tests for `void remove(Integer id)` + + + + + // TODO - Create tests for `void remove(Cat cat)` + + + + // TODO - Create tests for `Cat getCatById(Integer id)` + + + + // TODO - Create tests for `Integer getNumberOfCats()` + + + + } diff --git a/src/test/java/rocks/zipcodewilmington/DogHouseTest.java b/src/test/java/rocks/zipcodewilmington/DogHouseTest.java index b88b30b..36aeba2 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; @@ -12,9 +13,71 @@ */ public class DogHouseTest { // TODO - Create tests for `void add(Dog dog)` + @Test + public void testAddDog() { + //Given + DogHouse.clear(); + Dog dog = new Dog("Fluffy", new Date(05 - 05 - 2021), 123); + DogHouse.add(dog); + Integer expected = 1; + //When + Integer actual = DogHouse.getNumberOfDogs(); + // Then + Assert.assertEquals(expected, actual); + } + + // TODO - Create tests for `void remove(Integer id)` + @Test + public void testRemoveId() { + //Given + DogHouse.clear(); + Dog dog = new Dog("Fluffy", new Date(05 - 05 - 2021), 123); + DogHouse.add(dog); + Integer expected = null; + //When + DogHouse.removeId(123); + Dog actual = DogHouse.getDogById(123); + //Then + Assert.assertEquals(expected, actual); + + } + + // TODO - Create tests for `void remove(Dog dog)` + + @Test + public void testRemoveDog() { + //Given + + Dog dog = new Dog("Fluffy", new Date(05 - 05 - 2021), 123); + Integer expected = 1; + //When + DogHouse.remove(dog); + Integer actual = DogHouse.getNumberOfDogs(); + //Then + Assert.assertEquals(expected, actual); + + } + + // TODO - Create tests for `Dog getDogById(Integer id)` + + + @Test + public void testGetDogById() { +//Given + DogHouse.clear(); + Dog dog = new Dog("Fluffy", new Date(05 - 05 - 2021), 123); + Dog expected = dog; // ID 123 + + //When + DogHouse.add(dog); + Dog actual = DogHouse.getDogById(123); + //The + Assert.assertEquals(expected, actual); + + } // TODO - Create tests for `Integer getNumberOfDogs()` @Test From 0d7996150e4de23bbf07e10b9e690a6875a4b102 Mon Sep 17 00:00:00 2001 From: junior Date: Fri, 5 Nov 2021 12:10:21 -0400 Subject: [PATCH 3/3] completed lab --- .../animals/animal_storage/DogHouse.java | 2 +- .../rocks/zipcodewilmington/CatHouseTest.java | 76 ++++++++++++++++++- .../rocks/zipcodewilmington/DogHouseTest.java | 2 +- 3 files changed, 75 insertions(+), 5 deletions(-) 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 2c8f043..bc1feb0 100644 --- a/src/main/java/rocks/zipcodewilmington/animals/animal_storage/DogHouse.java +++ b/src/main/java/rocks/zipcodewilmington/animals/animal_storage/DogHouse.java @@ -12,7 +12,7 @@ public static void add(Dog dog) { dogHouse.add(dog); } - public static void removeId(Integer id) { + public static void remove(Integer id) { dogHouse.removeAnimalById(id); } diff --git a/src/test/java/rocks/zipcodewilmington/CatHouseTest.java b/src/test/java/rocks/zipcodewilmington/CatHouseTest.java index e15bb37..b63b0b3 100644 --- a/src/test/java/rocks/zipcodewilmington/CatHouseTest.java +++ b/src/test/java/rocks/zipcodewilmington/CatHouseTest.java @@ -1,33 +1,103 @@ package rocks.zipcodewilmington; +import org.junit.Assert; +import org.junit.Test; +import rocks.zipcodewilmington.animals.Cat; +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)` + @Test + public void testAddCat() { + //Given + CatHouse.clear(); + Cat cat = new Cat("Milo", new Date(), 123); + CatHouse.add(cat); + Integer expected = 1; + //When + Integer actual = CatHouse.getNumberOfCats(); + //Then + Assert.assertEquals(expected, actual); + } // TODO - Create tests for `void remove(Integer id)` + @Test + public void testRemoveId() { + //Given + CatHouse.clear(); + Cat cat = new Cat("Milo", new Date(), 123); + CatHouse.add(cat); + Integer expected = null; + //When + CatHouse.remove(123); + Cat actual = CatHouse.getCatById(123); + //Then + Assert.assertEquals(expected, actual); - - // TODO - Create tests for `void remove(Cat cat)` + } + // TODO - Create tests for `void remove(Cat cat)` + @Test + public void testRemoveCat() { + //Given + CatHouse.clear(); + Cat cat = new Cat("Milo", new Date(), 123); + CatHouse.add(cat); // added one + Integer expected = 0; + //When + CatHouse.remove(cat); //removed one + Integer actual = CatHouse.getNumberOfCats(); + //Then + Assert.assertEquals(expected, actual); + } // TODO - Create tests for `Cat getCatById(Integer id)` + @Test + public void testGetCatById() { + //Given + CatHouse.clear(); + Cat cat = new Cat("Milo", new Date(), 123); + Cat expected = cat; + //When + CatHouse.add(cat); // added one + Cat actual = CatHouse.getCatById(123); + //Then + Assert.assertEquals(expected, actual); + } - // TODO - Create tests for `Integer getNumberOfCats()` + // TODO - Create tests for `Integer getNumberOfCats()` + @Test + public void testGetNumberOfCats() { + //Given + CatHouse.clear(); + Cat cat = new Cat("Milo", new Date(), 123); + Cat cat1 = new Cat("Leo", new Date(), 456); + Integer expected = 2; + //When + CatHouse.add(cat); + CatHouse.add(cat1); + Integer actual = CatHouse.getNumberOfCats(); + //Then + Assert.assertEquals(expected, actual); + } } diff --git a/src/test/java/rocks/zipcodewilmington/DogHouseTest.java b/src/test/java/rocks/zipcodewilmington/DogHouseTest.java index 36aeba2..ee199b7 100644 --- a/src/test/java/rocks/zipcodewilmington/DogHouseTest.java +++ b/src/test/java/rocks/zipcodewilmington/DogHouseTest.java @@ -36,7 +36,7 @@ public void testRemoveId() { DogHouse.add(dog); Integer expected = null; //When - DogHouse.removeId(123); + DogHouse.remove(123); Dog actual = DogHouse.getDogById(123); //Then Assert.assertEquals(expected, actual);