From 4928788bb5350a8b63ac33d75b6bf8d621e60c3a Mon Sep 17 00:00:00 2001 From: Eric Cordell Date: Mon, 26 Feb 2018 15:20:14 -0500 Subject: [PATCH 1/4] Ready for tests --- src/main/java/io/zipcoder/Application.java | 6 ++++++ src/main/java/io/zipcoder/Cat.java | 4 ++++ src/main/java/io/zipcoder/Dog.java | 5 +++++ src/main/java/io/zipcoder/Pet.java | 8 ++++++++ src/main/java/io/zipcoder/Rabbit.java | 4 ++++ src/test/java/io/zipcoder/ApplicationTest.java | 9 +++++++++ src/test/java/io/zipcoder/CatTest.java | 4 ++++ src/test/java/io/zipcoder/DogTest.java | 4 ++++ src/test/java/io/zipcoder/RabbitTest.java | 4 ++++ 9 files changed, 48 insertions(+) create mode 100644 src/main/java/io/zipcoder/Cat.java create mode 100644 src/main/java/io/zipcoder/Dog.java create mode 100644 src/main/java/io/zipcoder/Pet.java create mode 100644 src/main/java/io/zipcoder/Rabbit.java create mode 100644 src/test/java/io/zipcoder/CatTest.java create mode 100644 src/test/java/io/zipcoder/DogTest.java create mode 100644 src/test/java/io/zipcoder/RabbitTest.java diff --git a/src/main/java/io/zipcoder/Application.java b/src/main/java/io/zipcoder/Application.java index 3a257cb..5f2c3b7 100644 --- a/src/main/java/io/zipcoder/Application.java +++ b/src/main/java/io/zipcoder/Application.java @@ -2,4 +2,10 @@ public class Application { + + public static void main(String[] args){ + System.out.println("How many pets do you have?"); + + } + } diff --git a/src/main/java/io/zipcoder/Cat.java b/src/main/java/io/zipcoder/Cat.java new file mode 100644 index 0000000..1668b4f --- /dev/null +++ b/src/main/java/io/zipcoder/Cat.java @@ -0,0 +1,4 @@ +package io.zipcoder; + +public class Cat extends Pet { +} diff --git a/src/main/java/io/zipcoder/Dog.java b/src/main/java/io/zipcoder/Dog.java new file mode 100644 index 0000000..86b26f1 --- /dev/null +++ b/src/main/java/io/zipcoder/Dog.java @@ -0,0 +1,5 @@ +package io.zipcoder; + +public class Dog extends Pet { + +} diff --git a/src/main/java/io/zipcoder/Pet.java b/src/main/java/io/zipcoder/Pet.java new file mode 100644 index 0000000..30fa089 --- /dev/null +++ b/src/main/java/io/zipcoder/Pet.java @@ -0,0 +1,8 @@ +package io.zipcoder; + +public class Pet { + + // speak() + // name field w/ setters and getters + +} diff --git a/src/main/java/io/zipcoder/Rabbit.java b/src/main/java/io/zipcoder/Rabbit.java new file mode 100644 index 0000000..6ef4f5d --- /dev/null +++ b/src/main/java/io/zipcoder/Rabbit.java @@ -0,0 +1,4 @@ +package io.zipcoder; + +public class Rabbit extends Pet{ +} diff --git a/src/test/java/io/zipcoder/ApplicationTest.java b/src/test/java/io/zipcoder/ApplicationTest.java index b744df5..a15ec53 100644 --- a/src/test/java/io/zipcoder/ApplicationTest.java +++ b/src/test/java/io/zipcoder/ApplicationTest.java @@ -1,5 +1,14 @@ package io.zipcoder; +import org.junit.Test; + public class ApplicationTest { + Application applicationTest = new Application(); +} + +//@Test +//public void userInput(){ +// // Given + } diff --git a/src/test/java/io/zipcoder/CatTest.java b/src/test/java/io/zipcoder/CatTest.java new file mode 100644 index 0000000..9f6b3bb --- /dev/null +++ b/src/test/java/io/zipcoder/CatTest.java @@ -0,0 +1,4 @@ +package io.zipcoder; + +public class CatTest { +} diff --git a/src/test/java/io/zipcoder/DogTest.java b/src/test/java/io/zipcoder/DogTest.java new file mode 100644 index 0000000..b3a1f51 --- /dev/null +++ b/src/test/java/io/zipcoder/DogTest.java @@ -0,0 +1,4 @@ +package io.zipcoder; + +public class DogTest { +} diff --git a/src/test/java/io/zipcoder/RabbitTest.java b/src/test/java/io/zipcoder/RabbitTest.java new file mode 100644 index 0000000..aa0f96f --- /dev/null +++ b/src/test/java/io/zipcoder/RabbitTest.java @@ -0,0 +1,4 @@ +package io.zipcoder; + +public class RabbitTest { +} From d350fe464a3e333c2d1930bf3baa9672516ceca5 Mon Sep 17 00:00:00 2001 From: vvmk Date: Mon, 26 Feb 2018 20:21:34 -0500 Subject: [PATCH 2/4] Write speak tests for Pet subclasses --- src/test/java/io/zipcoder/ApplicationTest.java | 1 - src/test/java/io/zipcoder/CatTest.java | 12 ++++++++++++ src/test/java/io/zipcoder/DogTest.java | 11 +++++++++++ src/test/java/io/zipcoder/RabbitTest.java | 12 ++++++++++++ 4 files changed, 35 insertions(+), 1 deletion(-) diff --git a/src/test/java/io/zipcoder/ApplicationTest.java b/src/test/java/io/zipcoder/ApplicationTest.java index a15ec53..e057d6e 100644 --- a/src/test/java/io/zipcoder/ApplicationTest.java +++ b/src/test/java/io/zipcoder/ApplicationTest.java @@ -1,7 +1,6 @@ package io.zipcoder; -import org.junit.Test; public class ApplicationTest { Application applicationTest = new Application(); diff --git a/src/test/java/io/zipcoder/CatTest.java b/src/test/java/io/zipcoder/CatTest.java index 9f6b3bb..4c95b88 100644 --- a/src/test/java/io/zipcoder/CatTest.java +++ b/src/test/java/io/zipcoder/CatTest.java @@ -1,4 +1,16 @@ package io.zipcoder; +import org.junit.Assert; +import org.junit.Test; + public class CatTest { + + @Test + public void testMeow() { + Pet cat = new Cat(); + String expected = "Meow"; + String actual = cat.speak(); + + Assert.assertEquals(expected, actual); + } } diff --git a/src/test/java/io/zipcoder/DogTest.java b/src/test/java/io/zipcoder/DogTest.java index b3a1f51..09eb9a0 100644 --- a/src/test/java/io/zipcoder/DogTest.java +++ b/src/test/java/io/zipcoder/DogTest.java @@ -1,4 +1,15 @@ package io.zipcoder; +import org.junit.Assert; +import org.junit.Test; + public class DogTest { + @Test + public void testBark() { + Pet dog = new Dog(); + String expected = "Woof"; + String actual = dog.speak(); + + Assert.assertEquals(expected, actual); + } } diff --git a/src/test/java/io/zipcoder/RabbitTest.java b/src/test/java/io/zipcoder/RabbitTest.java index aa0f96f..a585410 100644 --- a/src/test/java/io/zipcoder/RabbitTest.java +++ b/src/test/java/io/zipcoder/RabbitTest.java @@ -1,4 +1,16 @@ package io.zipcoder; +import org.junit.Assert; +import org.junit.Test; + public class RabbitTest { + @Test + public void testUhhhRabbitSoundsIDK() { + Pet rabbit = new Rabbit(); + rabbit.setName("Bugs"); + String expected = "What's up, Doc?"; + String actual = rabbit.speak(); + + Assert.assertEquals(expected, actual); + } } From 97f336ec8c3cd80ced621bc22ba7c77726c4af57 Mon Sep 17 00:00:00 2001 From: vvmk Date: Mon, 26 Feb 2018 20:26:54 -0500 Subject: [PATCH 3/4] Move pet things into pets package --- src/main/java/io/zipcoder/{ => pets}/Cat.java | 0 src/main/java/io/zipcoder/{ => pets}/Dog.java | 0 src/main/java/io/zipcoder/{ => pets}/Pet.java | 0 src/main/java/io/zipcoder/{ => pets}/Rabbit.java | 0 src/test/java/io/zipcoder/{ => pets}/CatTest.java | 0 src/test/java/io/zipcoder/{ => pets}/DogTest.java | 0 src/test/java/io/zipcoder/{ => pets}/RabbitTest.java | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename src/main/java/io/zipcoder/{ => pets}/Cat.java (100%) rename src/main/java/io/zipcoder/{ => pets}/Dog.java (100%) rename src/main/java/io/zipcoder/{ => pets}/Pet.java (100%) rename src/main/java/io/zipcoder/{ => pets}/Rabbit.java (100%) rename src/test/java/io/zipcoder/{ => pets}/CatTest.java (100%) rename src/test/java/io/zipcoder/{ => pets}/DogTest.java (100%) rename src/test/java/io/zipcoder/{ => pets}/RabbitTest.java (100%) diff --git a/src/main/java/io/zipcoder/Cat.java b/src/main/java/io/zipcoder/pets/Cat.java similarity index 100% rename from src/main/java/io/zipcoder/Cat.java rename to src/main/java/io/zipcoder/pets/Cat.java diff --git a/src/main/java/io/zipcoder/Dog.java b/src/main/java/io/zipcoder/pets/Dog.java similarity index 100% rename from src/main/java/io/zipcoder/Dog.java rename to src/main/java/io/zipcoder/pets/Dog.java diff --git a/src/main/java/io/zipcoder/Pet.java b/src/main/java/io/zipcoder/pets/Pet.java similarity index 100% rename from src/main/java/io/zipcoder/Pet.java rename to src/main/java/io/zipcoder/pets/Pet.java diff --git a/src/main/java/io/zipcoder/Rabbit.java b/src/main/java/io/zipcoder/pets/Rabbit.java similarity index 100% rename from src/main/java/io/zipcoder/Rabbit.java rename to src/main/java/io/zipcoder/pets/Rabbit.java diff --git a/src/test/java/io/zipcoder/CatTest.java b/src/test/java/io/zipcoder/pets/CatTest.java similarity index 100% rename from src/test/java/io/zipcoder/CatTest.java rename to src/test/java/io/zipcoder/pets/CatTest.java diff --git a/src/test/java/io/zipcoder/DogTest.java b/src/test/java/io/zipcoder/pets/DogTest.java similarity index 100% rename from src/test/java/io/zipcoder/DogTest.java rename to src/test/java/io/zipcoder/pets/DogTest.java diff --git a/src/test/java/io/zipcoder/RabbitTest.java b/src/test/java/io/zipcoder/pets/RabbitTest.java similarity index 100% rename from src/test/java/io/zipcoder/RabbitTest.java rename to src/test/java/io/zipcoder/pets/RabbitTest.java From 90710e4fd46c49a3925b26b31618f9ed61e951e9 Mon Sep 17 00:00:00 2001 From: vvmk Date: Mon, 26 Feb 2018 21:22:32 -0500 Subject: [PATCH 4/4] Fix packages and imports, reformat --- src/main/java/io/zipcoder/pets/Cat.java | 2 +- src/main/java/io/zipcoder/pets/Dog.java | 2 +- src/main/java/io/zipcoder/pets/Pet.java | 2 +- src/main/java/io/zipcoder/pets/Rabbit.java | 2 +- .../java/io/zipcoder/ApplicationTest.java | 1 - src/test/java/io/zipcoder/pets/CatTest.java | 2 +- src/test/java/io/zipcoder/pets/DogTest.java | 2 +- src/test/java/io/zipcoder/pets/PetTest.java | 72 +++++++++++++++++++ .../java/io/zipcoder/pets/RabbitTest.java | 2 +- 9 files changed, 79 insertions(+), 8 deletions(-) create mode 100644 src/test/java/io/zipcoder/pets/PetTest.java diff --git a/src/main/java/io/zipcoder/pets/Cat.java b/src/main/java/io/zipcoder/pets/Cat.java index 1668b4f..82095a0 100644 --- a/src/main/java/io/zipcoder/pets/Cat.java +++ b/src/main/java/io/zipcoder/pets/Cat.java @@ -1,4 +1,4 @@ -package io.zipcoder; +package io.zipcoder.pets; public class Cat extends Pet { } diff --git a/src/main/java/io/zipcoder/pets/Dog.java b/src/main/java/io/zipcoder/pets/Dog.java index 86b26f1..c7d6c5e 100644 --- a/src/main/java/io/zipcoder/pets/Dog.java +++ b/src/main/java/io/zipcoder/pets/Dog.java @@ -1,4 +1,4 @@ -package io.zipcoder; +package io.zipcoder.pets; public class Dog extends Pet { diff --git a/src/main/java/io/zipcoder/pets/Pet.java b/src/main/java/io/zipcoder/pets/Pet.java index 30fa089..b010e83 100644 --- a/src/main/java/io/zipcoder/pets/Pet.java +++ b/src/main/java/io/zipcoder/pets/Pet.java @@ -1,4 +1,4 @@ -package io.zipcoder; +package io.zipcoder.pets; public class Pet { diff --git a/src/main/java/io/zipcoder/pets/Rabbit.java b/src/main/java/io/zipcoder/pets/Rabbit.java index 6ef4f5d..084a4aa 100644 --- a/src/main/java/io/zipcoder/pets/Rabbit.java +++ b/src/main/java/io/zipcoder/pets/Rabbit.java @@ -1,4 +1,4 @@ -package io.zipcoder; +package io.zipcoder.pets; public class Rabbit extends Pet{ } diff --git a/src/test/java/io/zipcoder/ApplicationTest.java b/src/test/java/io/zipcoder/ApplicationTest.java index e057d6e..2e5f44e 100644 --- a/src/test/java/io/zipcoder/ApplicationTest.java +++ b/src/test/java/io/zipcoder/ApplicationTest.java @@ -1,7 +1,6 @@ package io.zipcoder; - public class ApplicationTest { Application applicationTest = new Application(); } diff --git a/src/test/java/io/zipcoder/pets/CatTest.java b/src/test/java/io/zipcoder/pets/CatTest.java index 4c95b88..03281cc 100644 --- a/src/test/java/io/zipcoder/pets/CatTest.java +++ b/src/test/java/io/zipcoder/pets/CatTest.java @@ -1,4 +1,4 @@ -package io.zipcoder; +package io.zipcoder.pets; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/io/zipcoder/pets/DogTest.java b/src/test/java/io/zipcoder/pets/DogTest.java index 09eb9a0..d470d0c 100644 --- a/src/test/java/io/zipcoder/pets/DogTest.java +++ b/src/test/java/io/zipcoder/pets/DogTest.java @@ -1,4 +1,4 @@ -package io.zipcoder; +package io.zipcoder.pets; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/io/zipcoder/pets/PetTest.java b/src/test/java/io/zipcoder/pets/PetTest.java new file mode 100644 index 0000000..eccc1a5 --- /dev/null +++ b/src/test/java/io/zipcoder/pets/PetTest.java @@ -0,0 +1,72 @@ +package io.zipcoder.pets; + +import org.junit.Assert; +import org.junit.Test; + +/** + * filename: + * project: Interfaces + * author: https://github.com/vvmk + * date: 2/26/18 + */ +public class PetTest { + @Test + public void testCompareDiffPetTypePositive() { + Pet dog = new Dog(); + Pet cat = new Cat(); + + int expected = 1; + int actual = cat.compareTo(dog); + + Assert.assertEquals(expected, actual); + } + + @Test + public void testCompareDiffPetTypeNegative() { + Pet Bugs = new Rabbit(); + Pet Sylvester = new Cat(); + + int expected = -1; + int actual = Bugs.compareTo(Sylvester); + + Assert.assertEquals(expected, actual); + } + + @Test + public void testCompareSamePetTypeDiffNamePositive() { + Pet first = new Dog("Abbey"); + Pet second = new Dog("Ziggy"); + + int expected = 1; + int actual = first.compareTo(second); + + Assert.assertEquals(expected, actual); + } + + @Test + public void testCompareSamePetTypeDiffNameNegative() { + Pet second = new Dog("Zulu"); + Pet first = new Dog("Arnold"); + + int expected = -1; + int actual = second.compareTo(first); + + Assert.assertEquals(expected, actual); + } + + @Test + public void testCompareSamePetTypeSameName() { + Pet dog1 = new Dog("Dan"); + Pet dog2 = new Dog("Dan"); + + int expected = 0; + int actual = dog1.compareTo(dog2); + + Assert.assertEquals(expected, actual); + } + + @Test + public void testToString() { + + } +} diff --git a/src/test/java/io/zipcoder/pets/RabbitTest.java b/src/test/java/io/zipcoder/pets/RabbitTest.java index a585410..015e5c0 100644 --- a/src/test/java/io/zipcoder/pets/RabbitTest.java +++ b/src/test/java/io/zipcoder/pets/RabbitTest.java @@ -1,4 +1,4 @@ -package io.zipcoder; +package io.zipcoder.pets; import org.junit.Assert; import org.junit.Test;