Skip to content

completed lab #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/main/java/rocks/zipcodewilmington/animals/Cat.java
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/rocks/zipcodewilmington/animals/Mammal.java
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,16 @@ 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;
this.eatenMeals = new ArrayList<>();
this.id = id;
}


public String getName() {
return name;
}
Expand Down
40 changes: 40 additions & 0 deletions src/test/java/rocks/zipcodewilmington/AnimalFactoryTest.java
Original file line number Diff line number Diff line change
@@ -1,9 +1,49 @@
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.
*/
public class AnimalFactoryTest {
//TODO - Create Test for `Animal createDog(String name, Date birthDate)`
@Test
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);


}

}
91 changes: 91 additions & 0 deletions src/test/java/rocks/zipcodewilmington/CatHouseTest.java
Original file line number Diff line number Diff line change
@@ -1,12 +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)`
@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()`

@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);
}


}
87 changes: 87 additions & 0 deletions src/test/java/rocks/zipcodewilmington/CatTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +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.beans.Transient;
import java.util.Date;

/**
* @author leon on 4/19/18.
*/
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() {
Expand Down
63 changes: 63 additions & 0 deletions src/test/java/rocks/zipcodewilmington/DogHouseTest.java
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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.remove(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
Expand Down
Loading