From 2aaba462fb388a82be9ea748f3ed8293c61cc667 Mon Sep 17 00:00:00 2001 From: laura Date: Sat, 10 Jul 2021 16:09:55 -0400 Subject: [PATCH] more test --- .../java/rocks/zipcodewilmington/Food.java | 3 + .../rocks/zipcodewilmington/animals/Cat.java | 4 + .../zipcodewilmington/animals/Mammal.java | 5 + .../zipcodewilmington/AnimalFactoryTest.java | 42 ++++++ .../rocks/zipcodewilmington/CatHouseTest.java | 113 +++++++++++++- .../java/rocks/zipcodewilmington/CatTest.java | 120 +++++++++++++++ .../rocks/zipcodewilmington/DogHouseTest.java | 85 +++++++++++ .../java/rocks/zipcodewilmington/DogTest.java | 142 ++++++++++++++++-- 8 files changed, 498 insertions(+), 16 deletions(-) diff --git a/src/main/java/rocks/zipcodewilmington/Food.java b/src/main/java/rocks/zipcodewilmington/Food.java index 2e5056b..e2b2ce1 100644 --- a/src/main/java/rocks/zipcodewilmington/Food.java +++ b/src/main/java/rocks/zipcodewilmington/Food.java @@ -4,4 +4,7 @@ * @author leon on 4/19/18. */ public class Food { + + //private String + } diff --git a/src/main/java/rocks/zipcodewilmington/animals/Cat.java b/src/main/java/rocks/zipcodewilmington/animals/Cat.java index e703c36..084e75e 100644 --- a/src/main/java/rocks/zipcodewilmington/animals/Cat.java +++ b/src/main/java/rocks/zipcodewilmington/animals/Cat.java @@ -10,6 +10,10 @@ public Cat(String name, Date birthDate, Integer id) { super(name, birthDate, id); } + public Cat(String name){ + super(name); + } + 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..97a0c90 100644 --- a/src/main/java/rocks/zipcodewilmington/animals/Mammal.java +++ b/src/main/java/rocks/zipcodewilmington/animals/Mammal.java @@ -20,6 +20,11 @@ public Mammal(String name, Date birthDate, Integer id) { this.eatenMeals = new ArrayList<>(); this.id = id; } + public Mammal(String name){ + this.name = name; + this.birthDate = null; + this.id = 0; + } 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..0e4d580 100644 --- a/src/test/java/rocks/zipcodewilmington/AnimalFactoryTest.java +++ b/src/test/java/rocks/zipcodewilmington/AnimalFactoryTest.java @@ -1,9 +1,51 @@ 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.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)` + + + + @Test + public void createCat(){ + //GIVEN + String nombre = "carlos"; + Date givenBirthDate = new Date(); + Integer id = 0; + DogHouse.clear(); + //WHEN + Cat cat = AnimalFactory.createCat(nombre, givenBirthDate); + //THEN + Assert.assertEquals(nombre, cat.getName()); + } + + @Test + public void creatDog(){ + //GIVEN + String nombre = "mikey"; + Date givenBirthDate = new Date(); + Integer id = 0; + DogHouse.clear(); + //WHEN + + Dog dog = AnimalFactory.createDog("mikey", null); + + //THEN + Assert.assertEquals(nombre, dog.getName()); + } + + } + diff --git a/src/test/java/rocks/zipcodewilmington/CatHouseTest.java b/src/test/java/rocks/zipcodewilmington/CatHouseTest.java index f756b34..306adb7 100644 --- a/src/test/java/rocks/zipcodewilmington/CatHouseTest.java +++ b/src/test/java/rocks/zipcodewilmington/CatHouseTest.java @@ -1,12 +1,117 @@ 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 rocks.zipcodewilmington.animals.animal_storage.DogHouse; + +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)` - // TODO - Create tests for `void remove(Cat cat)` + // 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()` + // TODO - Create tests for `Integer getNumberOfCats()` ////// + + + + + @Test + public void catAddTest (){ + //GIVEN + CatHouse.clear(); + + //WHEN + Cat gatito = AnimalFactory.createCat("ggg", null); + CatHouse.add(gatito); + int expected = 1; + + int actual = CatHouse.getNumberOfCats(); + //THEN + Assert.assertEquals(1 ,actual); + + + } + + @Test + public void catRemoveTest(){ + //GIVEN + CatHouse.clear(); + + + //WHEN + Cat noGato = new Cat(null, null, null); + CatHouse.add(noGato); + CatHouse.remove(noGato); + + int actual = CatHouse.getNumberOfCats(); + + //THEN + Assert.assertEquals(0 , actual); + + } + + @Test + public void removebyId(){ + //GIVEN + CatHouse.clear(); + + //WHEN + Cat cat = new Cat(null, null, 0); + CatHouse.add(cat); + CatHouse.remove(cat.getId()); + int actual = cat.getId(); + //int expected = 0; + //int actual = CatHouse.getNumberOfCats(); + + //THEN + Assert.assertEquals(0 , actual); + + } + + @Test + public void getNumberOfCats (){ + //GIVEN + String givenName = "kitty"; + Date givenBirthDate = new Date(); + Integer givenId = 6; + Cat cat = new Cat("Kitty", null, 6); //tambien works w/ givenName, givenBirthDate... + CatHouse.add(cat); + + //WHEN + Cat actual = CatHouse.getCatById(givenId); + + + //THEN + Assert.assertEquals(cat, actual); + +} + +/*@Test + public void NumberOfCats(){ + + //GIVEN + String givenName = "kitty"; + Date givenBirthDate = new Date(); + Integer givenId = 6; + Cat cat = new Cat("Kitty", null, 6); //tambien works w/ givenName, givenBirthDate... + CatHouse.add(cat); + + //WHEN + ; + + + //THEN + Assert.assertEquals(cat, actual);*/ + } + + + + diff --git a/src/test/java/rocks/zipcodewilmington/CatTest.java b/src/test/java/rocks/zipcodewilmington/CatTest.java index 4bd465f..0ac3a07 100644 --- a/src/test/java/rocks/zipcodewilmington/CatTest.java +++ b/src/test/java/rocks/zipcodewilmington/CatTest.java @@ -2,7 +2,10 @@ 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; @@ -40,4 +43,121 @@ public void constructorTest() { Assert.assertEquals(givenId, retrievedId); } + + @Test + public void setNameTest(){ + + String expected = "Gatito"; + + Cat cat = new Cat("Gatito"); + //cat.setName(expected); + String actual = cat.getName(); + + Assert.assertEquals(expected,actual); //actual es el given + } + + + + + @Test + public void speakTest() { + String expected = "meow!"; + + Cat cat = new Cat(null, null, null); + cat.speak(); + + String actual = cat.speak(); + //THEN + Assert.assertEquals(expected, actual); + } + + @Test +public void setBirthDate(){ + Date expBirthDate = new Date(21-2-2001); // still pass if nada adentro en los parameters. + + Cat cat = new Cat("gato", expBirthDate, 0); // still pass if pu null for all 3. + cat.setBirthDate(expBirthDate); + + Date actualBirthDate = cat.getBirthDate(); + Assert.assertEquals(expBirthDate, actualBirthDate); + +} + +@Test // es igual q set name test +public void setNamesTest(){ +//GIVEN + String givenName = "Zula"; + Date givenBirthDate = new Date(); + Integer givenId = 0; + + //WHEN + String expected = "cheese"; + Cat cat = new Cat(null, null,null); + cat.setName(expected); + String actual = cat.getName(); + + //THEN + Assert.assertEquals(expected, actual); +} + + @Test + public void eatTest() { + int expected = 0; + + + Cat cat = new Cat(null, null, null); + Food food = new Food(); + int actual = cat.getNumberOfMealsEaten(); + cat.eat(food); + + Assert.assertEquals(expected, actual); + } + + +@Test +public void getId() { + int expected = 0; + + Cat cat = new Cat(null, null, 0); + int actual = cat.getId(); + + Assert.assertEquals(expected, actual); + } + + +@Test +public void animalInheritanceTest (){ + //given + String givenName = "CARROTS"; + Date givenBirthDate = new Date(); + Integer givenId = 0; + + //when + Cat cat = new Cat(null, null, 0); + boolean expected = true; + boolean actual = cat instanceof Animal; + //then + Assert.assertEquals(expected, actual); +} + +@Test + public void mammalInheritanceTest(){ + String givenName = "CARROTS"; + Date givenBirthDate = new Date(); + Integer givenId = 0; + + //when + Cat cat = new Cat(null, null, 0); + boolean expected = true; + boolean actual = cat instanceof Mammal; + //then + Assert.assertEquals(expected, actual); +} + +} + + + + + diff --git a/src/test/java/rocks/zipcodewilmington/DogHouseTest.java b/src/test/java/rocks/zipcodewilmington/DogHouseTest.java index b88b30b..0fc640b 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; @@ -30,5 +33,87 @@ public void testGetNumberOfDogs() { // Then DogHouse.getNumberOfDogs(); + //System.out.println(DogHouse.getNumberOfDogs()); + } + + + @Test + public void DogAddTest() { + //GIVEN + DogHouse.clear(); + + //WHEN + Dog doggo = AnimalFactory.createDog("ggg", null); + DogHouse.add(doggo); + int expected = 1; + + int actual = DogHouse.getNumberOfDogs(); + //THEN + Assert.assertEquals(1, actual); + + + } + + @Test + public void DogRemoveTest() { + //GIVEN + DogHouse.clear(); + + + //WHEN + Dog nodog = new Dog(null, null, null); + DogHouse.add(nodog); + DogHouse.remove(nodog); + + int actual = DogHouse.getNumberOfDogs(); + + //THEN + Assert.assertEquals(0, actual); + + } + + @Test + public void removebyId() { + //GIVEN + DogHouse.clear(); + + //WHEN + Dog dog = new Dog(null, null, 0); + DogHouse.add(dog); + DogHouse.remove(dog.getId()); + int actual = dog.getId(); + //int expected = 0; + + //THEN + Assert.assertEquals(0, actual); + + } + + @Test + public void getNumberOfCats() { + //GIVEN + String givenName = "perro"; + Date givenBirthDate = new Date(); + Integer givenId = 6; + Dog dog = new Dog("perro", null, 6); //tambien works w/ givenName, givenBirthDate... + DogHouse.add(dog); + + //WHEN + Dog actual = DogHouse.getDogById(givenId); + + + //THEN + Assert.assertEquals(dog, actual); + + } } + + + + + + + + + diff --git a/src/test/java/rocks/zipcodewilmington/DogTest.java b/src/test/java/rocks/zipcodewilmington/DogTest.java index 34a15bd..14e0411 100644 --- a/src/test/java/rocks/zipcodewilmington/DogTest.java +++ b/src/test/java/rocks/zipcodewilmington/DogTest.java @@ -2,30 +2,148 @@ 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)` - // 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 tests for `new Dog(String name, Date birthDate, Integer id)` // + // 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 setNameTest() { + /* @Test + public void setname() { // Given (a name exists and a dog exists) - Dog dog = new Dog(null, null, null); - String givenName = "Milo"; // When (a dog's name is set to the given name) - dog.setName(givenName); // Then (we expect to get the given name from the dog) - String dogName = dog.getName(); - Assert.assertEquals(dogName, givenName); + + }*/ + + @Test + public void constructor (){ + + // Given (cat data) + String givenName = "CARROTS"; + Date givenBirthDate = new Date(); + Integer givenId = 0; + + // When (a cat is constructed) + Dog dog = new Dog(givenName, givenBirthDate, givenId); + + // When (we retrieve data from the cat) + String retrievedName = dog.getName(); + Date retrievedBirthDate = dog.getBirthDate(); + Integer retrievedId = dog.getId(); + + // Then (we expect the given data, to match the retrieved data) + Assert.assertEquals(givenName, retrievedName); + Assert.assertEquals(givenBirthDate, retrievedBirthDate); + Assert.assertEquals(givenId, retrievedId); + + } + + + @Test + public void setNameTest() { + + String expected = "Firulais"; + + Dog dog = new Dog("Firulais", null, 0); + //cat.setName(expected); + String actual = dog.getName(); + + Assert.assertEquals(expected, actual); //actual es el given + } + + + @Test + public void speakTest() { + String expected = "bark!"; + + Dog dog = new Dog(null, null, null); + dog.speak(); + + String actual = dog.speak(); + //THEN + Assert.assertEquals(expected, actual); + } + + @Test + public void setBirthDate() { + Date expBirthDate = new Date(21 - 2 - 2001); // still pass if nada adentro en los parameters. + + Dog dog = new Dog("doggo", expBirthDate, 0); // still pass if pu null for all 3. + dog.setBirthDate(expBirthDate); + + Date actualBirthDate = dog.getBirthDate(); + Assert.assertEquals(expBirthDate, actualBirthDate); + + + } + + + @Test + public void eatTest() { + int expected = 0; + + + Dog dog = new Dog(null, null, null); + Food food = new Food(); + int actual = dog.getNumberOfMealsEaten(); + dog.eat(food); + + Assert.assertEquals(expected, actual); + } + + + @Test + public void getIntegerId() { + int expected = 0; + + Dog dog = new Dog(null, null, 0); + int actual = dog.getId(); + + Assert.assertEquals(expected, actual); + + } + + @Test + public void animalInheritanceTest (){ + //given + String givenName = "CARROTS"; + Date givenBirthDate = new Date(); + Integer givenId = 0; + + //when + Dog dog = new Dog(null, null, 0); + boolean expected = true; + boolean actual = dog instanceof Animal; + //then + Assert.assertEquals(expected, actual); + } + + @Test + public void mammalInheritanceTest(){ + String givenName = "CARROTS"; + Date givenBirthDate = new Date(); + Integer givenId = 0; + + //when + Cat cat = new Cat(null, null, 0); + boolean expected = true; + boolean actual = cat instanceof Mammal; + //then + Assert.assertEquals(expected, actual); } }