From 01eed829c703de87a9728a462fd0e030db8bd5d4 Mon Sep 17 00:00:00 2001
From: Peter McCormick <petermccormick@zipcoders-MacBook-Pro-109.local>
Date: Mon, 26 Feb 2018 14:35:33 -0500
Subject: [PATCH 1/7] Test imported

---
 src/main/java/io/zipcoder/Cat.java       | 4 ++++
 src/main/java/io/zipcoder/Dog.java       | 4 ++++
 src/main/java/io/zipcoder/Pets.java      | 4 ++++
 src/main/java/io/zipcoder/Snake.java     | 4 ++++
 src/test/java/io/zipcoder/CatTest.java   | 8 ++++++++
 src/test/java/io/zipcoder/DogTest.java   | 8 ++++++++
 src/test/java/io/zipcoder/PetsTest.java  | 8 ++++++++
 src/test/java/io/zipcoder/SnakeTest.java | 8 ++++++++
 8 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/Pets.java
 create mode 100644 src/main/java/io/zipcoder/Snake.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/PetsTest.java
 create mode 100644 src/test/java/io/zipcoder/SnakeTest.java

diff --git a/src/main/java/io/zipcoder/Cat.java b/src/main/java/io/zipcoder/Cat.java
new file mode 100644
index 0000000..78d9224
--- /dev/null
+++ b/src/main/java/io/zipcoder/Cat.java
@@ -0,0 +1,4 @@
+package io.zipcoder;
+
+public class Cat extends Pets{
+}
diff --git a/src/main/java/io/zipcoder/Dog.java b/src/main/java/io/zipcoder/Dog.java
new file mode 100644
index 0000000..bf8846c
--- /dev/null
+++ b/src/main/java/io/zipcoder/Dog.java
@@ -0,0 +1,4 @@
+package io.zipcoder;
+
+public class Dog extends Pets {
+}
diff --git a/src/main/java/io/zipcoder/Pets.java b/src/main/java/io/zipcoder/Pets.java
new file mode 100644
index 0000000..9ccfd89
--- /dev/null
+++ b/src/main/java/io/zipcoder/Pets.java
@@ -0,0 +1,4 @@
+package io.zipcoder;
+
+public class Pets {
+}
diff --git a/src/main/java/io/zipcoder/Snake.java b/src/main/java/io/zipcoder/Snake.java
new file mode 100644
index 0000000..0d9485b
--- /dev/null
+++ b/src/main/java/io/zipcoder/Snake.java
@@ -0,0 +1,4 @@
+package io.zipcoder;
+
+public class Snake extends Pets {
+}
diff --git a/src/test/java/io/zipcoder/CatTest.java b/src/test/java/io/zipcoder/CatTest.java
new file mode 100644
index 0000000..40d5b42
--- /dev/null
+++ b/src/test/java/io/zipcoder/CatTest.java
@@ -0,0 +1,8 @@
+package io.zipcoder;
+
+import org.junit.Test;
+
+public class CatTest {
+
+    //@Test
+}
diff --git a/src/test/java/io/zipcoder/DogTest.java b/src/test/java/io/zipcoder/DogTest.java
new file mode 100644
index 0000000..6e4f9d4
--- /dev/null
+++ b/src/test/java/io/zipcoder/DogTest.java
@@ -0,0 +1,8 @@
+package io.zipcoder;
+
+import org.junit.Test;
+
+public class DogTest {
+
+    //@Test
+}
diff --git a/src/test/java/io/zipcoder/PetsTest.java b/src/test/java/io/zipcoder/PetsTest.java
new file mode 100644
index 0000000..83f4d67
--- /dev/null
+++ b/src/test/java/io/zipcoder/PetsTest.java
@@ -0,0 +1,8 @@
+package io.zipcoder;
+
+import org.junit.Test;
+
+public class PetsTest {
+
+    //@Test
+}
diff --git a/src/test/java/io/zipcoder/SnakeTest.java b/src/test/java/io/zipcoder/SnakeTest.java
new file mode 100644
index 0000000..90df056
--- /dev/null
+++ b/src/test/java/io/zipcoder/SnakeTest.java
@@ -0,0 +1,8 @@
+package io.zipcoder;
+
+import org.junit.Test;
+
+public class SnakeTest {
+
+    //@Test
+}

From a3e0180bfc3890a88bc8e673423a46560e5527c3 Mon Sep 17 00:00:00 2001
From: Peter McCormick <petermccormick@zipcoders-MacBook-Pro-109.local>
Date: Mon, 26 Feb 2018 16:00:12 -0500
Subject: [PATCH 2/7] Testing

---
 src/main/java/io/zipcoder/Pets.java           |  1 +
 src/main/java/io/zipcoder/Snake.java          |  1 +
 .../java/io/zipcoder/ApplicationTest.java     |  1 +
 src/test/java/io/zipcoder/CatTest.java        | 21 +++++++++++-
 src/test/java/io/zipcoder/DogTest.java        | 18 +++++++++-
 src/test/java/io/zipcoder/PetsTest.java       | 15 ++++++++-
 src/test/java/io/zipcoder/SnakeTest.java      | 33 ++++++++++++++++++-
 7 files changed, 86 insertions(+), 4 deletions(-)

diff --git a/src/main/java/io/zipcoder/Pets.java b/src/main/java/io/zipcoder/Pets.java
index 9ccfd89..36e97bf 100644
--- a/src/main/java/io/zipcoder/Pets.java
+++ b/src/main/java/io/zipcoder/Pets.java
@@ -1,4 +1,5 @@
 package io.zipcoder;
 
 public class Pets {
+
 }
diff --git a/src/main/java/io/zipcoder/Snake.java b/src/main/java/io/zipcoder/Snake.java
index 0d9485b..e1d66c4 100644
--- a/src/main/java/io/zipcoder/Snake.java
+++ b/src/main/java/io/zipcoder/Snake.java
@@ -1,4 +1,5 @@
 package io.zipcoder;
 
 public class Snake extends Pets {
+
 }
diff --git a/src/test/java/io/zipcoder/ApplicationTest.java b/src/test/java/io/zipcoder/ApplicationTest.java
index b744df5..5726536 100644
--- a/src/test/java/io/zipcoder/ApplicationTest.java
+++ b/src/test/java/io/zipcoder/ApplicationTest.java
@@ -2,4 +2,5 @@
 
 
 public class ApplicationTest {
+    
 }
diff --git a/src/test/java/io/zipcoder/CatTest.java b/src/test/java/io/zipcoder/CatTest.java
index 40d5b42..01a438f 100644
--- a/src/test/java/io/zipcoder/CatTest.java
+++ b/src/test/java/io/zipcoder/CatTest.java
@@ -1,8 +1,27 @@
 package io.zipcoder;
 
+import org.junit.Assert;
 import org.junit.Test;
 
 public class CatTest {
 
-    //@Test
+    @Test
+    public void getNamesOfCats() {
+        Cat cat = new Cat();
+        cat.setName("Tom");
+        String expected = "Tom";
+        String actual = cat.getName();
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void catSpeakTest() {
+        Cat cat = new Cat();
+        cat.setName("Tom");
+        String expected = "Hang in there.";
+        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 6e4f9d4..f09c17c 100644
--- a/src/test/java/io/zipcoder/DogTest.java
+++ b/src/test/java/io/zipcoder/DogTest.java
@@ -1,8 +1,24 @@
 package io.zipcoder;
 
+import org.junit.Assert;
 import org.junit.Test;
 
 public class DogTest {
 
-    //@Test
+    @Test
+    public void getNamesOfDog() {
+        Dog dog = new Dog();
+        dog.setName("Chance");
+        String expected = "Chance";
+        String actual = dog.getName();
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void dogSpeakTest() {
+        Dog dog = new Dog();
+        String expected = "I'm such a wimp! I'm running from a cat!";
+        String actual = dog.speak();
+        Assert.assertEquals(expected, actual);
+    }
 }
diff --git a/src/test/java/io/zipcoder/PetsTest.java b/src/test/java/io/zipcoder/PetsTest.java
index 83f4d67..739c01f 100644
--- a/src/test/java/io/zipcoder/PetsTest.java
+++ b/src/test/java/io/zipcoder/PetsTest.java
@@ -1,8 +1,21 @@
 package io.zipcoder;
 
+import org.junit.Assert;
 import org.junit.Test;
 
 public class PetsTest {
 
-    //@Test
+    @Test
+    public void getName() {
+
+    }
+
+    @Test
+    public void speakTest() {
+        Dog dog = new Dog();
+        dog.setName();
+        String expected = "Animal Sounds";
+        String actual = (Pet)
+        Assert.assertEquals(expected, actual);
+    }
 }
diff --git a/src/test/java/io/zipcoder/SnakeTest.java b/src/test/java/io/zipcoder/SnakeTest.java
index 90df056..c15c18a 100644
--- a/src/test/java/io/zipcoder/SnakeTest.java
+++ b/src/test/java/io/zipcoder/SnakeTest.java
@@ -1,8 +1,39 @@
 package io.zipcoder;
 
+import org.junit.Assert;
+import org.junit.Before;
 import org.junit.Test;
 
+import javax.print.attribute.standard.RequestingUserName;
+
 public class SnakeTest {
 
-    //@Test
+    @Before
+    public void setup() {
+        Snake snake = new Snake();
+        Snake snake1 = new Snake();
+
+    }
+
+    @Test
+    public void getNamesOfSnake() {
+        Snake snake = new Snake();
+        snake.setName("Kaa");
+        String expected = "Kaa";
+        String actual = snake.getName();
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void snakeSpeakTest() {
+        Snake snake = new Snake();
+        String expected = "I have seen all the dead seasons, and the great trees and the old elephants, " +
+                "and the rocks that were bare and sharp-pointed ere the moss grew.  Art thou still alive, Manling?";
+        String actual = snake.speak();
+        Assert.assertEquals(expected, actual);
+    }
+/*
+    @Test
+    public void ge
+    */
 }

From 590092ead24784329b3953ffd094c60df5298b94 Mon Sep 17 00:00:00 2001
From: Peter McCormick <petermccormick@zipcoders-MacBook-Pro-109.local>
Date: Mon, 26 Feb 2018 16:40:19 -0500
Subject: [PATCH 3/7] Testing

---
 src/main/java/io/zipcoder/Cat.java             |  4 ++++
 src/main/java/io/zipcoder/Dog.java             |  4 ++++
 src/main/java/io/zipcoder/Pets.java            | 13 ++++++++++++-
 src/main/java/io/zipcoder/Snake.java           |  3 +++
 src/test/java/io/zipcoder/ApplicationTest.java |  2 +-
 src/test/java/io/zipcoder/PetsTest.java        | 13 ++++---------
 6 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/src/main/java/io/zipcoder/Cat.java b/src/main/java/io/zipcoder/Cat.java
index 78d9224..5eb153f 100644
--- a/src/main/java/io/zipcoder/Cat.java
+++ b/src/main/java/io/zipcoder/Cat.java
@@ -1,4 +1,8 @@
 package io.zipcoder;
 
 public class Cat extends Pets{
+
+    public String speak() {
+        return null;
+    }
 }
diff --git a/src/main/java/io/zipcoder/Dog.java b/src/main/java/io/zipcoder/Dog.java
index bf8846c..eb5498c 100644
--- a/src/main/java/io/zipcoder/Dog.java
+++ b/src/main/java/io/zipcoder/Dog.java
@@ -1,4 +1,8 @@
 package io.zipcoder;
 
 public class Dog extends Pets {
+
+    public String speak() {
+        return null;
+    }
 }
diff --git a/src/main/java/io/zipcoder/Pets.java b/src/main/java/io/zipcoder/Pets.java
index 36e97bf..9873ac3 100644
--- a/src/main/java/io/zipcoder/Pets.java
+++ b/src/main/java/io/zipcoder/Pets.java
@@ -1,5 +1,16 @@
 package io.zipcoder;
 
-public class Pets {
+public abstract class Pets {
 
+
+    public void setName(String name) {
+
+    }
+
+    public String getName() {
+
+        return null;
+    }
+
+    public abstract String speak();
 }
diff --git a/src/main/java/io/zipcoder/Snake.java b/src/main/java/io/zipcoder/Snake.java
index e1d66c4..75a5165 100644
--- a/src/main/java/io/zipcoder/Snake.java
+++ b/src/main/java/io/zipcoder/Snake.java
@@ -2,4 +2,7 @@
 
 public class Snake extends Pets {
 
+    public String speak() {
+        return null;
+    }
 }
diff --git a/src/test/java/io/zipcoder/ApplicationTest.java b/src/test/java/io/zipcoder/ApplicationTest.java
index 5726536..35525f7 100644
--- a/src/test/java/io/zipcoder/ApplicationTest.java
+++ b/src/test/java/io/zipcoder/ApplicationTest.java
@@ -2,5 +2,5 @@
 
 
 public class ApplicationTest {
-    
+
 }
diff --git a/src/test/java/io/zipcoder/PetsTest.java b/src/test/java/io/zipcoder/PetsTest.java
index 739c01f..0e6943a 100644
--- a/src/test/java/io/zipcoder/PetsTest.java
+++ b/src/test/java/io/zipcoder/PetsTest.java
@@ -7,15 +7,10 @@ public class PetsTest {
 
     @Test
     public void getName() {
-
-    }
-
-    @Test
-    public void speakTest() {
-        Dog dog = new Dog();
-        dog.setName();
-        String expected = "Animal Sounds";
-        String actual = (Pet)
+        String expected = "Spot";
+        Pets pet = new Dog();
+        pet.setName(expected);
+        String actual = pet.getName();
         Assert.assertEquals(expected, actual);
     }
 }

From 7eefda589e4742dadb529f1f4ec33f627dfcb726 Mon Sep 17 00:00:00 2001
From: Peter McCormick <petermccormick@zipcoders-MacBook-Pro-109.local>
Date: Mon, 26 Feb 2018 17:18:14 -0500
Subject: [PATCH 4/7] Testing

---
 src/main/java/io/zipcoder/Cat.java       |  7 +++++--
 src/main/java/io/zipcoder/Dog.java       |  6 +++++-
 src/main/java/io/zipcoder/Pets.java      |  6 ++++++
 src/main/java/io/zipcoder/Snake.java     |  7 ++++++-
 src/test/java/io/zipcoder/CatTest.java   |  6 ++----
 src/test/java/io/zipcoder/DogTest.java   |  5 ++---
 src/test/java/io/zipcoder/PetsTest.java  |  2 +-
 src/test/java/io/zipcoder/SnakeTest.java | 15 ++-------------
 8 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/src/main/java/io/zipcoder/Cat.java b/src/main/java/io/zipcoder/Cat.java
index 5eb153f..d64268b 100644
--- a/src/main/java/io/zipcoder/Cat.java
+++ b/src/main/java/io/zipcoder/Cat.java
@@ -1,8 +1,11 @@
 package io.zipcoder;
 
-public class Cat extends Pets{
+public class Cat extends Pets {
 
+    public Cat(String name) {
+        super();
+    }
     public String speak() {
-        return null;
+        return "Hang in there.";
     }
 }
diff --git a/src/main/java/io/zipcoder/Dog.java b/src/main/java/io/zipcoder/Dog.java
index eb5498c..de711c6 100644
--- a/src/main/java/io/zipcoder/Dog.java
+++ b/src/main/java/io/zipcoder/Dog.java
@@ -2,7 +2,11 @@
 
 public class Dog extends Pets {
 
+    public Dog(String name) {
+        super();
+    }
+
     public String speak() {
-        return null;
+        return "I'm such a wimp! I'm running from a cat!";
     }
 }
diff --git a/src/main/java/io/zipcoder/Pets.java b/src/main/java/io/zipcoder/Pets.java
index 9873ac3..214d57e 100644
--- a/src/main/java/io/zipcoder/Pets.java
+++ b/src/main/java/io/zipcoder/Pets.java
@@ -2,6 +2,12 @@
 
 public abstract class Pets {
 
+    protected String name = "";
+
+    protected Pets() {
+        this.name = name;
+    }
+
 
     public void setName(String name) {
 
diff --git a/src/main/java/io/zipcoder/Snake.java b/src/main/java/io/zipcoder/Snake.java
index 75a5165..2e07b2c 100644
--- a/src/main/java/io/zipcoder/Snake.java
+++ b/src/main/java/io/zipcoder/Snake.java
@@ -2,7 +2,12 @@
 
 public class Snake extends Pets {
 
+    public Snake(String name) {
+        super();
+    }
+
     public String speak() {
-        return null;
+        return "I have seen all the dead seasons, and the great trees and the old elephants, and the rocks that were "
+                + "bare and sharp-pointed ere the moss grew.  Art thou still alive, Manling?";
     }
 }
diff --git a/src/test/java/io/zipcoder/CatTest.java b/src/test/java/io/zipcoder/CatTest.java
index 01a438f..9660a11 100644
--- a/src/test/java/io/zipcoder/CatTest.java
+++ b/src/test/java/io/zipcoder/CatTest.java
@@ -7,8 +7,7 @@ public class CatTest {
 
     @Test
     public void getNamesOfCats() {
-        Cat cat = new Cat();
-        cat.setName("Tom");
+        Cat cat = new Cat("Tom");
         String expected = "Tom";
         String actual = cat.getName();
         Assert.assertEquals(expected, actual);
@@ -16,8 +15,7 @@ public void getNamesOfCats() {
 
     @Test
     public void catSpeakTest() {
-        Cat cat = new Cat();
-        cat.setName("Tom");
+        Cat cat = new Cat("Tom");
         String expected = "Hang in there.";
         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 f09c17c..a9b1be4 100644
--- a/src/test/java/io/zipcoder/DogTest.java
+++ b/src/test/java/io/zipcoder/DogTest.java
@@ -7,8 +7,7 @@ public class DogTest {
 
     @Test
     public void getNamesOfDog() {
-        Dog dog = new Dog();
-        dog.setName("Chance");
+        Dog dog = new Dog("Chance");
         String expected = "Chance";
         String actual = dog.getName();
         Assert.assertEquals(expected, actual);
@@ -16,7 +15,7 @@ public void getNamesOfDog() {
 
     @Test
     public void dogSpeakTest() {
-        Dog dog = new Dog();
+        Dog dog = new Dog("Chance");
         String expected = "I'm such a wimp! I'm running from a cat!";
         String actual = dog.speak();
         Assert.assertEquals(expected, actual);
diff --git a/src/test/java/io/zipcoder/PetsTest.java b/src/test/java/io/zipcoder/PetsTest.java
index 0e6943a..cf83e29 100644
--- a/src/test/java/io/zipcoder/PetsTest.java
+++ b/src/test/java/io/zipcoder/PetsTest.java
@@ -8,7 +8,7 @@ public class PetsTest {
     @Test
     public void getName() {
         String expected = "Spot";
-        Pets pet = new Dog();
+        Pets pet = new Dog("Spot");
         pet.setName(expected);
         String actual = pet.getName();
         Assert.assertEquals(expected, actual);
diff --git a/src/test/java/io/zipcoder/SnakeTest.java b/src/test/java/io/zipcoder/SnakeTest.java
index c15c18a..defcbbf 100644
--- a/src/test/java/io/zipcoder/SnakeTest.java
+++ b/src/test/java/io/zipcoder/SnakeTest.java
@@ -1,24 +1,13 @@
 package io.zipcoder;
 
 import org.junit.Assert;
-import org.junit.Before;
 import org.junit.Test;
 
-import javax.print.attribute.standard.RequestingUserName;
-
 public class SnakeTest {
 
-    @Before
-    public void setup() {
-        Snake snake = new Snake();
-        Snake snake1 = new Snake();
-
-    }
-
     @Test
     public void getNamesOfSnake() {
-        Snake snake = new Snake();
-        snake.setName("Kaa");
+        Snake snake = new Snake("Kaa");
         String expected = "Kaa";
         String actual = snake.getName();
         Assert.assertEquals(expected, actual);
@@ -26,7 +15,7 @@ public void getNamesOfSnake() {
 
     @Test
     public void snakeSpeakTest() {
-        Snake snake = new Snake();
+        Snake snake = new Snake("Kaa");
         String expected = "I have seen all the dead seasons, and the great trees and the old elephants, " +
                 "and the rocks that were bare and sharp-pointed ere the moss grew.  Art thou still alive, Manling?";
         String actual = snake.speak();

From c6f7334d4d4899b93d9a9a855095bf7b9a22e414 Mon Sep 17 00:00:00 2001
From: ahsonali <ahsonac@gmail.com>
Date: Mon, 26 Feb 2018 17:40:48 -0500
Subject: [PATCH 5/7] initial commit

---
 .DS_Store                                     | Bin 0 -> 6148 bytes
 src/.DS_Store                                 | Bin 0 -> 6148 bytes
 src/main/.DS_Store                            | Bin 0 -> 6148 bytes
 src/main/java/.DS_Store                       | Bin 0 -> 6148 bytes
 src/main/java/io/.DS_Store                    | Bin 0 -> 6148 bytes
 src/main/java/io/zipcoder/Application.java    |   6 +++-
 src/main/java/io/zipcoder/Bird.java           |  20 ++++++++++++
 src/main/java/io/zipcoder/Cat.java            |  16 ++++++++++
 src/main/java/io/zipcoder/Dog.java            |  18 +++++++++++
 src/main/java/io/zipcoder/Pets.java           |   4 +++
 .../java/io/zipcoder/ApplicationTest.java     |   4 ++-
 src/test/java/io/zipcoder/BirdTest.java       |  27 ++++++++++++++++
 src/test/java/io/zipcoder/CatTest.java        |  29 ++++++++++++++++++
 src/test/java/io/zipcoder/DogTest.java        |  28 +++++++++++++++++
 14 files changed, 150 insertions(+), 2 deletions(-)
 create mode 100644 .DS_Store
 create mode 100644 src/.DS_Store
 create mode 100644 src/main/.DS_Store
 create mode 100644 src/main/java/.DS_Store
 create mode 100644 src/main/java/io/.DS_Store
 create mode 100644 src/main/java/io/zipcoder/Bird.java
 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/Pets.java
 create mode 100644 src/test/java/io/zipcoder/BirdTest.java
 create mode 100644 src/test/java/io/zipcoder/CatTest.java
 create mode 100644 src/test/java/io/zipcoder/DogTest.java

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..9a874b5768f336915163bb88cd434575b859f936
GIT binary patch
literal 6148
zcmeH~Jr2S!425ml0g0s}V-^m;4I%_5-~tF3k&vj^b9A16778<}(6eNJu~Vz<8=6`~
zboab&MFtUB!i}=AFfm2m$tVxGT*u4pe81nU<hDp!0Y1oNKeq`gKn17(6`%rCU`7h$
zLB3qg=$ZH^RDcT1Ljn6f6u7Y_ThKop2tERUJ<4ua`z!$#D}XiGf~deWTES>lA49C}
z?O@64YO)2RT{MRe%{!}2F))pG(Sih~)xkgosK7*lF7m<7{{#Hn{6A@7N(HFEpDCdI
z{<z=arSfe3cs;A1vTExF2mNw{x1Rtcb`-DSZrCrj0Bf=ZQGxMCz-3^d0zXyY1+O9z
AbpQYW

literal 0
HcmV?d00001

diff --git a/src/.DS_Store b/src/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..7b0d36729e2ee777a660f9e8c6709dd97bc2fb68
GIT binary patch
literal 6148
zcmeH~F>V4u3`M`g7D#EfOgRk)$PGpaPQV2S&>%r5BKkQx-ySzvsH0W%E!l7ES!;KH
zv9ktX>-*^w7y&HlPOLmk%$N_j;tOYdpMH*)!|itQBJHgMp3+B5_H$d10#ZN<NC7Dz
z1!kl`9^=dR89kF8MG8oPc_`rDheCJOWb2Gi2Sbbi<iK(m*D*_w#S3IjwoX=PmeYe}
ztHl`N^=KzcURRT?v$w-?_^`aQ`4mI5-VQ5FXjTIXQa}n!6j=0p^z(m9e>MM4T9irw
zDe%t}uwk>?toc%Twm!X{*Y{cVb)%DUIm54?049DEf6&9YUwlE<Wb0&wrXPWjK|u=q
GsR9o}DiW#y

literal 0
HcmV?d00001

diff --git a/src/main/.DS_Store b/src/main/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..55c1fcbeb4ba2bef02771ea2748f3e4b0ea5c07d
GIT binary patch
literal 6148
zcmeH~J&wXa427SU6iC~oq@0EW><vZ;POul?uR=%^tEHZ!^Xzf6fqE68XUYD?o>)m<
zk%<A==J)&si~yE&C)OS&X3Pg%aKIgh^Uvveyxp!|q<wV2Q~HR>er^j=Knh3!DIf);
zz>E~gV|@8Jqi52iNC7D@4+Z@DQ0UH@Y@PAxV2BZb99RzHI%Wy7c!8|R*2xOZa(b|A
zwHQOZ9_?hw>uR!f_I6kfAC`AEpJHg%+hK(X&1yhF3P^#80*juHe*W+1ujc<ri&7~d
z1>Q^n8@Auu4PPqH)~DC=`aY|^Zges(XZZ6Iz{HQ@6+Mjm#TR5vwoX=P`Vj~j6r{kv
GD)0dNyb`AX

literal 0
HcmV?d00001

diff --git a/src/main/java/.DS_Store b/src/main/java/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..b7618decc8fbb22e6bd7aff7d056a6f0b9fdfac5
GIT binary patch
literal 6148
zcmeH~Jr2S!425lAKw|00n1usyg9yP1xB!AKNJt$JdydZY4+Di6Rp?o=zu1k{_6<!f
zBD#C@TaivgmT;qNER0N%&*UmYf4|($!*H`g+AL`$cqgOluYDvHpaN8Y3Qz$mFdYT*
zC||Co^GJLWDnJD$qJVuL3fx$eE$E*P1Rnvw1<Gz%`z!$#D}XiGf~deWTES>lA49C}
z?O@4$HQ9pEE}FxK=AG517??)8Xh8zg>R_M(RA8jQJo3)Y{{#Hn{6A`8N(HFEpDCb=
z{c*p;OXb=6@p@K2W!2UV4*GV4x1Rtcb`-DSZn$1-0oG&-q5|WOfXl!@1%9f)6A?5J
AH2?qr

literal 0
HcmV?d00001

diff --git a/src/main/java/io/.DS_Store b/src/main/java/io/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..552b8ff50a423d258deeef87b6c9d2386c611656
GIT binary patch
literal 6148
zcmeHKyG{c!5S)b+C()#&^e^xSRusN~A3)?%AVoR^qM^Eq@5-k!`zVNxbfJl6rS;hB
z9b2B__7;F`KF0@O4Pc-<;@gL%`M&$YZYp9#I?tFeVvqOnV|Q3&{~d7dfG@n_4ZGj`
zmuWiqrc4S*0VyB_q<|E-r~*}9hr5fOs>7s!6u1Tj{QJ=8j=gYBj86xLXaR^ThQm0I
zUV_*>K<tHcA|o_QDlw^6ErunX@m6`ga867*teOw2o2@z&i`#jAi*#5|)F=g{z^MYa
zxm<hwf25!3|4&I;NdYNvRSMW@`?THgNmW}HkMmmF=+AV|Inv!Y4+@7U$HXYdTzEOY
dkEG0NKIeWfoD+l2c+iRZ8E{=>QsBQ8_yNp;6`244

literal 0
HcmV?d00001

diff --git a/src/main/java/io/zipcoder/Application.java b/src/main/java/io/zipcoder/Application.java
index 3a257cb..593dfae 100644
--- a/src/main/java/io/zipcoder/Application.java
+++ b/src/main/java/io/zipcoder/Application.java
@@ -1,5 +1,9 @@
 package io.zipcoder;
 
+public class Application
+{
+
+
+
 
-public class Application {
 }
diff --git a/src/main/java/io/zipcoder/Bird.java b/src/main/java/io/zipcoder/Bird.java
new file mode 100644
index 0000000..6f0f4f8
--- /dev/null
+++ b/src/main/java/io/zipcoder/Bird.java
@@ -0,0 +1,20 @@
+package io.zipcoder;
+
+public class Bird {
+
+    public Bird()
+    {
+
+    }
+
+    public String speak() {
+        return null;
+    }
+
+    public void setName(String name) {
+    }
+
+    public String getName() {
+        return null;
+    }
+}
diff --git a/src/main/java/io/zipcoder/Cat.java b/src/main/java/io/zipcoder/Cat.java
new file mode 100644
index 0000000..fd29287
--- /dev/null
+++ b/src/main/java/io/zipcoder/Cat.java
@@ -0,0 +1,16 @@
+package io.zipcoder;
+
+public class Cat {
+
+    public String speak() {
+        return null;
+    }
+
+    public void setName(String name) {
+
+    }
+
+    public String getName() {
+        return null;
+    }
+}
diff --git a/src/main/java/io/zipcoder/Dog.java b/src/main/java/io/zipcoder/Dog.java
new file mode 100644
index 0000000..a4fee4f
--- /dev/null
+++ b/src/main/java/io/zipcoder/Dog.java
@@ -0,0 +1,18 @@
+package io.zipcoder;
+
+public class Dog {
+
+    private String name;
+
+    public String speak() {
+        return null;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getName() {
+        return name;
+    }
+}
diff --git a/src/main/java/io/zipcoder/Pets.java b/src/main/java/io/zipcoder/Pets.java
new file mode 100644
index 0000000..9ccfd89
--- /dev/null
+++ b/src/main/java/io/zipcoder/Pets.java
@@ -0,0 +1,4 @@
+package io.zipcoder;
+
+public class Pets {
+}
diff --git a/src/test/java/io/zipcoder/ApplicationTest.java b/src/test/java/io/zipcoder/ApplicationTest.java
index b744df5..8925e91 100644
--- a/src/test/java/io/zipcoder/ApplicationTest.java
+++ b/src/test/java/io/zipcoder/ApplicationTest.java
@@ -1,5 +1,7 @@
 package io.zipcoder;
 
 
-public class ApplicationTest {
+public class ApplicationTest
+{
+
 }
diff --git a/src/test/java/io/zipcoder/BirdTest.java b/src/test/java/io/zipcoder/BirdTest.java
new file mode 100644
index 0000000..48fa5f8
--- /dev/null
+++ b/src/test/java/io/zipcoder/BirdTest.java
@@ -0,0 +1,27 @@
+package io.zipcoder;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class BirdTest {
+
+    @Test
+    public void testSpeakBird()
+    {
+        Bird bird = new Bird();
+        String actual = bird.speak();
+        String expected = "chirp";
+        Assert.assertEquals(expected,actual);
+
+    }
+
+    @Test
+    public void testSetBirdName()
+    {
+        Bird bird = new Bird();
+
+        bird.setName("Robin");
+        String expected = "Robin";
+        String actual = bird.getName();
+    }
+}
diff --git a/src/test/java/io/zipcoder/CatTest.java b/src/test/java/io/zipcoder/CatTest.java
new file mode 100644
index 0000000..dee333b
--- /dev/null
+++ b/src/test/java/io/zipcoder/CatTest.java
@@ -0,0 +1,29 @@
+package io.zipcoder;
+
+import org.junit.Test;
+import org.junit.Assert;
+
+public class CatTest {
+
+    @Test
+    public void testSpeakCat()
+    {
+        Cat cat = new Cat();
+        String actual = cat.speak();
+        String expected = "meow";
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void testSetCatName()
+    {
+        Cat cat = new Cat();
+
+        cat.setName("Felix");
+        String expected = "Felix";
+        String actual = cat.getName();
+
+        Assert.assertEquals(expected, actual);
+    }
+
+}
diff --git a/src/test/java/io/zipcoder/DogTest.java b/src/test/java/io/zipcoder/DogTest.java
new file mode 100644
index 0000000..7f73390
--- /dev/null
+++ b/src/test/java/io/zipcoder/DogTest.java
@@ -0,0 +1,28 @@
+package io.zipcoder;
+
+import org.junit.Test;
+import org.junit.Assert;
+
+public class DogTest {
+
+    @Test
+    public void testSpeakDog()
+    {
+        Dog dog = new Dog();
+        String actual = dog.speak();
+        String expected = "woof";
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void testSetDogName()
+    {
+        Dog dog = new Dog();
+
+        dog.setName("Spot");
+        String expected = "Spot";
+        String actual = dog.getName();
+
+        Assert.assertEquals(expected, actual);
+    }
+}

From 054aa32633fdb33cbda8f0973c563d05724336a8 Mon Sep 17 00:00:00 2001
From: ahsonali <ahsonac@gmail.com>
Date: Mon, 26 Feb 2018 20:21:27 -0500
Subject: [PATCH 6/7] Have to use comparator and comparable

---
 src/main/java/io/zipcoder/Application.java | 93 ++++++++++++++++++++++
 src/main/java/io/zipcoder/Bird.java        | 21 +++--
 src/main/java/io/zipcoder/Cat.java         | 14 ++--
 src/main/java/io/zipcoder/Dog.java         | 10 ++-
 src/main/java/io/zipcoder/Pets.java        | 12 ++-
 src/main/java/io/zipcoder/Snake.java       | 14 +++-
 src/test/java/io/zipcoder/BirdTest.java    | 17 +++-
 src/test/java/io/zipcoder/DogTest.java     |  2 +
 8 files changed, 162 insertions(+), 21 deletions(-)

diff --git a/src/main/java/io/zipcoder/Application.java b/src/main/java/io/zipcoder/Application.java
index 593dfae..dea6cdc 100644
--- a/src/main/java/io/zipcoder/Application.java
+++ b/src/main/java/io/zipcoder/Application.java
@@ -1,9 +1,102 @@
 package io.zipcoder;
 
+import java.util.ArrayList;
+import java.util.Scanner;
+
+
+import com.sun.tools.doclets.formats.html.SourceToHTMLConverter;
+
 public class Application
 {
 
+    public static void main(String [] args)
+    {
+
+        //ArrayList Declaration
+        ArrayList<Pets> pets = new ArrayList<Pets>();
+
+        Scanner sn = new Scanner(System.in);
+        System.out.print("How many pets do you own?: ");
+        String nAsAString = sn.nextLine();
+        int n = Integer.parseInt(nAsAString);
+
+        //Iterate through number of pets
+        for (int i = 0; i < n; i++)
+        {
+            System.out.println("What type of pet is this? ");
+            String reply = sn.nextLine();
+
+            if (reply.equalsIgnoreCase("dog"))
+            {
+                System.out.println("Cool! What is this dog's name? ");
+                String replyName = sn.nextLine();
+
+                Dog dog = new Dog(replyName);
+
+                pets.add(dog);
+
+            }
+
+            else if (reply.equalsIgnoreCase("cat"))
+            {
+                System.out.println("Cool! What is this cat's name? ");
+                String replyName = sn.nextLine();
+
+                Cat cat = new Cat(replyName);
+
+                pets.add(cat);
+            }
+
+            else if (reply.equalsIgnoreCase("bird"))
+            {
+                System.out.println("Cool! What is this bird's name? ");
+                String replyName = sn.nextLine();
+
+                Bird bird = new Bird(replyName);
+
+                pets.add(bird);
+
+            }
+
+            else if (reply.equalsIgnoreCase("snake"))
+            {
+                System.out.println("Cool! What is this snake's name? ");
+                String replyName = sn.nextLine();
+
+                Snake snake = new Snake(replyName);
+
+                pets.add(snake);
+            }
+
+
+        }
+
+        System.out.println(printList(pets));
+
+
+
+
+
+
+    }
+
+
+    public static String printList(ArrayList<Pets> pets)
+    {
+        StringBuilder sb = new StringBuilder();
+
+        for(int i = 0; i < pets.size(); i++)
+        {
+            sb.append(pets.get(i).getName());
+            sb.append(" is a ");
+            sb.append(pets.get(i).getClass().getSimpleName()+"\n");
+        }
+
+        return sb.toString();
+    }
 
+    //TODO:
+    //Implementing Comparator Interface and Comparabale Interface
 
 
 }
diff --git a/src/main/java/io/zipcoder/Bird.java b/src/main/java/io/zipcoder/Bird.java
index 6f0f4f8..c96668a 100644
--- a/src/main/java/io/zipcoder/Bird.java
+++ b/src/main/java/io/zipcoder/Bird.java
@@ -1,20 +1,29 @@
 package io.zipcoder;
 
-public class Bird {
+public class Bird extends Pets {
 
     public Bird()
     {
 
     }
 
-    public String speak() {
-        return null;
+    public Bird(String name)
+    {
+        super(name);
+    }
+
+    public String speak()
+    {
+        return "chirp";
     }
 
-    public void setName(String name) {
+    public void setName(String name)
+    {
+        this.name = name;
     }
 
-    public String getName() {
-        return null;
+    public String getName()
+    {
+        return this.name;
     }
 }
diff --git a/src/main/java/io/zipcoder/Cat.java b/src/main/java/io/zipcoder/Cat.java
index db400f2..4cad7e3 100644
--- a/src/main/java/io/zipcoder/Cat.java
+++ b/src/main/java/io/zipcoder/Cat.java
@@ -1,18 +1,22 @@
 package io.zipcoder;
 
-public class Cat {
+public class Cat extends Pets {
+
     public Cat(){}
 
     public Cat(String name) {
-        super();
+        super(name);
     }
 
-    public void setName(String name) {
+    public void setName(String name)
+    {
+        this.name = name;
 
     }
 
-    public String getName() {
-        return null;
+    public String getName()
+    {
+        return this.name;
     }
 
     public String speak() {
diff --git a/src/main/java/io/zipcoder/Dog.java b/src/main/java/io/zipcoder/Dog.java
index e0521f9..17372b7 100644
--- a/src/main/java/io/zipcoder/Dog.java
+++ b/src/main/java/io/zipcoder/Dog.java
@@ -1,12 +1,14 @@
 package io.zipcoder;
 
-public class Dog {
+public class Dog extends Pets{
 
-    private String name;
-    public Dog(){}
+
+    public Dog() {
+
+    }
 
     public Dog(String name) {
-        super();
+        super(name);
     }
 
     public void setName(String name) {
diff --git a/src/main/java/io/zipcoder/Pets.java b/src/main/java/io/zipcoder/Pets.java
index 214d57e..d3c9f67 100644
--- a/src/main/java/io/zipcoder/Pets.java
+++ b/src/main/java/io/zipcoder/Pets.java
@@ -1,10 +1,14 @@
 package io.zipcoder;
 
-public abstract class Pets {
+public abstract class Pets{
 
-    protected String name = "";
+    protected String name;
 
-    protected Pets() {
+    //Constructors
+    protected Pets(){}
+
+    protected Pets(String name)
+    {
         this.name = name;
     }
 
@@ -15,7 +19,7 @@ public void setName(String name) {
 
     public String getName() {
 
-        return null;
+        return this.name;
     }
 
     public abstract String speak();
diff --git a/src/main/java/io/zipcoder/Snake.java b/src/main/java/io/zipcoder/Snake.java
index 2e07b2c..531cef2 100644
--- a/src/main/java/io/zipcoder/Snake.java
+++ b/src/main/java/io/zipcoder/Snake.java
@@ -2,8 +2,20 @@
 
 public class Snake extends Pets {
 
+
+
     public Snake(String name) {
-        super();
+        super(name);
+    }
+
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name)
+    {
+        this.name = name;
     }
 
     public String speak() {
diff --git a/src/test/java/io/zipcoder/BirdTest.java b/src/test/java/io/zipcoder/BirdTest.java
index 48fa5f8..e212a1d 100644
--- a/src/test/java/io/zipcoder/BirdTest.java
+++ b/src/test/java/io/zipcoder/BirdTest.java
@@ -5,6 +5,21 @@
 
 public class BirdTest {
 
+    @Test
+    public void testBirdConstructor()
+    {
+        Bird bird = new Bird("Jacob");
+
+        String actual = bird.getName();
+
+        String expected = "Jacob";
+
+        Assert.assertEquals(expected, actual);
+
+
+    }
+
+
     @Test
     public void testSpeakBird()
     {
@@ -19,9 +34,9 @@ public void testSpeakBird()
     public void testSetBirdName()
     {
         Bird bird = new Bird();
-
         bird.setName("Robin");
         String expected = "Robin";
         String actual = bird.getName();
+        Assert.assertEquals(expected,actual);
     }
 }
diff --git a/src/test/java/io/zipcoder/DogTest.java b/src/test/java/io/zipcoder/DogTest.java
index 786193f..b14995b 100644
--- a/src/test/java/io/zipcoder/DogTest.java
+++ b/src/test/java/io/zipcoder/DogTest.java
@@ -12,6 +12,7 @@ public void testSpeakDog() {
         String expected = "woof";
     }
 
+    @Test
     public void getNamesOfDog() {
         Dog dog = new Dog("Chance");
         String expected = "Chance";
@@ -28,6 +29,7 @@ public void testSetDogName() {
         String actual = dog.getName();
     }
 
+    @Test
     public void dogSpeakTest() {
         Dog dog = new Dog("Chance");
         String expected = "I'm such a wimp! I'm running from a cat!";

From 40c306b4eca246168adafc3f1354bf520029483d Mon Sep 17 00:00:00 2001
From: ahsonali <ahsonac@gmail.com>
Date: Tue, 27 Feb 2018 17:57:34 -0500
Subject: [PATCH 7/7] Finished with leon's help thank God

---
 src/main/java/io/zipcoder/Application.java    | 137 ++++++++----------
 src/main/java/io/zipcoder/Bird.java           |   2 +-
 src/main/java/io/zipcoder/Cat.java            |   2 +-
 src/main/java/io/zipcoder/Compare.java        |  32 ++++
 src/main/java/io/zipcoder/Dog.java            |   2 +-
 .../java/io/zipcoder/{Pets.java => Pet.java}  |   8 +-
 src/main/java/io/zipcoder/Snake.java          |   7 +-
 .../java/io/zipcoder/ApplicationTest.java     |  62 +++++++-
 src/test/java/io/zipcoder/PetsTest.java       |   2 +-
 9 files changed, 164 insertions(+), 90 deletions(-)
 create mode 100644 src/main/java/io/zipcoder/Compare.java
 rename src/main/java/io/zipcoder/{Pets.java => Pet.java} (70%)

diff --git a/src/main/java/io/zipcoder/Application.java b/src/main/java/io/zipcoder/Application.java
index dea6cdc..d324889 100644
--- a/src/main/java/io/zipcoder/Application.java
+++ b/src/main/java/io/zipcoder/Application.java
@@ -1,102 +1,83 @@
 package io.zipcoder;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Scanner;
 
+public class Application {
+    private ArrayList<Pet> pets = new ArrayList<>();
+    private Scanner scanner = new Scanner(System.in);
 
-import com.sun.tools.doclets.formats.html.SourceToHTMLConverter;
-
-public class Application
-{
-
-    public static void main(String [] args)
-    {
-
-        //ArrayList Declaration
-        ArrayList<Pets> pets = new ArrayList<Pets>();
-
-        Scanner sn = new Scanner(System.in);
-        System.out.print("How many pets do you own?: ");
-        String nAsAString = sn.nextLine();
-        int n = Integer.parseInt(nAsAString);
-
-        //Iterate through number of pets
-        for (int i = 0; i < n; i++)
-        {
-            System.out.println("What type of pet is this? ");
-            String reply = sn.nextLine();
-
-            if (reply.equalsIgnoreCase("dog"))
-            {
-                System.out.println("Cool! What is this dog's name? ");
-                String replyName = sn.nextLine();
-
-                Dog dog = new Dog(replyName);
-
-                pets.add(dog);
-
-            }
-
-            else if (reply.equalsIgnoreCase("cat"))
-            {
-                System.out.println("Cool! What is this cat's name? ");
-                String replyName = sn.nextLine();
-
-                Cat cat = new Cat(replyName);
-
-                pets.add(cat);
-            }
-
-            else if (reply.equalsIgnoreCase("bird"))
-            {
-                System.out.println("Cool! What is this bird's name? ");
-                String replyName = sn.nextLine();
-
-                Bird bird = new Bird(replyName);
-
-                pets.add(bird);
-
-            }
+    public static void main(String[] args) {
+        Application application = new Application();
+        application.start();
+    }
 
-            else if (reply.equalsIgnoreCase("snake"))
-            {
-                System.out.println("Cool! What is this snake's name? ");
-                String replyName = sn.nextLine();
 
-                Snake snake = new Snake(replyName);
+    public void start() {
+        System.out.println("How many pets do you have?");
+        String numberOfPetsString = scanner.nextLine();
+        int numberOfPets = Integer.parseInt(numberOfPetsString);
 
-                pets.add(snake);
-            }
+        for(int i=0;i<numberOfPets; i++) {
+            System.out.println("What is the type of pet?");
+            String typeOfPet = scanner.nextLine();
 
+            System.out.println("What is the name of the pet?");
+            String petName = scanner.nextLine();
 
+            Pet pet = createPet(typeOfPet, petName);
+            this.add(pet);
         }
+        printPets();
+    }
 
-        System.out.println(printList(pets));
-
-
-
+    public void printPets() {
+        for(Pet pet : pets) {
+            String petName = pet.getName();
+            String petType = pet.getClass().getSimpleName();
+            System.out.println("Pet name = " + petName);
+            System.out.println("Pet type = " + petType);
+        }
+    }
 
+    //method stubs do not return logic
+    public Pet[] getPets() {
+        int size = pets.size();
+        Pet[] petArray = new Pet[size];
+        for(int i=0; i<pets.size(); i++) {
+            Pet currentPet = pets.get(i);
+            petArray[i] = currentPet;
+        }
+        return petArray;
+    }
 
 
+    public void add(Pet pet) {
+        pets.add(pet);
     }
 
+    public Pet createPet(String petType, String petName) {
+        Pet pet = null;
+        switch (petType.toLowerCase()) {
+            case "bird":
+                pet = new Bird(petName);
+                break;
 
-    public static String printList(ArrayList<Pets> pets)
-    {
-        StringBuilder sb = new StringBuilder();
+            case "dog":
+                pet = new Dog(petName);
+                break;
 
-        for(int i = 0; i < pets.size(); i++)
-        {
-            sb.append(pets.get(i).getName());
-            sb.append(" is a ");
-            sb.append(pets.get(i).getClass().getSimpleName()+"\n");
-        }
+            case "snake":
+                pet = new Snake(petName);
+                break;
 
-        return sb.toString();
+            case "cat":
+                pet = new Cat(petName);
+                break;
+        }
+        return pet;
     }
 
-    //TODO:
-    //Implementing Comparator Interface and Comparabale Interface
-
-
 }
+
diff --git a/src/main/java/io/zipcoder/Bird.java b/src/main/java/io/zipcoder/Bird.java
index c96668a..c3cc904 100644
--- a/src/main/java/io/zipcoder/Bird.java
+++ b/src/main/java/io/zipcoder/Bird.java
@@ -1,6 +1,6 @@
 package io.zipcoder;
 
-public class Bird extends Pets {
+public class Bird extends Pet {
 
     public Bird()
     {
diff --git a/src/main/java/io/zipcoder/Cat.java b/src/main/java/io/zipcoder/Cat.java
index 4cad7e3..ef6e43d 100644
--- a/src/main/java/io/zipcoder/Cat.java
+++ b/src/main/java/io/zipcoder/Cat.java
@@ -1,6 +1,6 @@
 package io.zipcoder;
 
-public class Cat extends Pets {
+public class Cat extends Pet {
 
     public Cat(){}
 
diff --git a/src/main/java/io/zipcoder/Compare.java b/src/main/java/io/zipcoder/Compare.java
new file mode 100644
index 0000000..077636c
--- /dev/null
+++ b/src/main/java/io/zipcoder/Compare.java
@@ -0,0 +1,32 @@
+package io.zipcoder;
+
+import java.util.Comparator;
+import java.util.Date;
+
+public class Compare implements Comparator<Pet> {
+
+    public int compare(Pet pet1, Pet pet2) {
+        Integer result = null;
+
+        String pet1Name = pet1.getName();
+        String pet2Name = pet2.getName();
+
+        int nameComparison = pet1Name.compareTo(pet2Name);
+        result = nameComparison;
+
+        boolean sameName = (nameComparison == 0);
+
+        if (sameName) {
+            Class pet1Class = pet1.getClass();
+            Class pet2Class = pet2.getClass();
+
+            String pet1ClassSimpleName = pet1Class.getSimpleName();
+            String pet2ClassSimpleName = pet2Class.getSimpleName();
+
+            int classComparison = pet1ClassSimpleName.compareTo(pet2ClassSimpleName);
+            result = classComparison;
+        }
+
+        return result;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/io/zipcoder/Dog.java b/src/main/java/io/zipcoder/Dog.java
index 17372b7..9fc0ff1 100644
--- a/src/main/java/io/zipcoder/Dog.java
+++ b/src/main/java/io/zipcoder/Dog.java
@@ -1,6 +1,6 @@
 package io.zipcoder;
 
-public class Dog extends Pets{
+public class Dog extends Pet {
 
 
     public Dog() {
diff --git a/src/main/java/io/zipcoder/Pets.java b/src/main/java/io/zipcoder/Pet.java
similarity index 70%
rename from src/main/java/io/zipcoder/Pets.java
rename to src/main/java/io/zipcoder/Pet.java
index d3c9f67..6937d6a 100644
--- a/src/main/java/io/zipcoder/Pets.java
+++ b/src/main/java/io/zipcoder/Pet.java
@@ -1,13 +1,15 @@
 package io.zipcoder;
 
-public abstract class Pets{
+import java.lang.Comparable;
+
+public abstract class Pet {
 
     protected String name;
 
     //Constructors
-    protected Pets(){}
+    protected Pet(){}
 
-    protected Pets(String name)
+    protected Pet(String name)
     {
         this.name = name;
     }
diff --git a/src/main/java/io/zipcoder/Snake.java b/src/main/java/io/zipcoder/Snake.java
index 531cef2..45dcbe0 100644
--- a/src/main/java/io/zipcoder/Snake.java
+++ b/src/main/java/io/zipcoder/Snake.java
@@ -1,8 +1,10 @@
 package io.zipcoder;
 
-public class Snake extends Pets {
+public class Snake extends Pet {
 
 
+    public Snake() {
+    }
 
     public Snake(String name) {
         super(name);
@@ -13,8 +15,7 @@ public String getName() {
         return name;
     }
 
-    public void setName(String name)
-    {
+    public void setName(String name) {
         this.name = name;
     }
 
diff --git a/src/test/java/io/zipcoder/ApplicationTest.java b/src/test/java/io/zipcoder/ApplicationTest.java
index 8925e91..3ff86cb 100644
--- a/src/test/java/io/zipcoder/ApplicationTest.java
+++ b/src/test/java/io/zipcoder/ApplicationTest.java
@@ -1,7 +1,65 @@
 package io.zipcoder;
 
+import org.junit.Test;
+import org.junit.Assert;
+
+public class ApplicationTest {
+
+    @Test
+    public void testAddPets() {
+        //Given
+        Application application = new Application();
+        Pet pet1 = new Cat();
+
+        //When
+        application.add(pet1);
+        Pet[] petArray = application.getPets();
+
+
+        //Then
+        Pet firstPet = petArray[0];
+        Assert.assertEquals(pet1, firstPet);
+    }
+
+    @Test
+    public void testGetPets() {
+        // Given
+        Application application = new Application();
+        Pet pet1 = new Dog();
+        Pet pet2 = new Cat();
+        Pet pet3 = new Snake();
+        Pet[] expectedPets = new Pet[]{pet1, pet2, pet3};
+
+        application.add(pet1);
+        application.add(pet2);
+        application.add(pet3);
+
+        // When
+        Pet[] actualPets = application.getPets();
+
+        // Then
+        Assert.assertEquals(expectedPets, actualPets);
+    }
+
+
+    @Test
+    public void testCreatePet() {
+        //Given
+        Application application = new Application();
+        String petType = "Dog";
+        String petName = "Milo";
+
+        // When
+        Pet pet = application.createPet(petType, petName);
+
+        //Then
+        Assert.assertTrue(pet instanceof Dog);
+    }
+
+    @Test
+    public void testSomething2() {
+
+    }
 
-public class ApplicationTest
-{
 
 }
diff --git a/src/test/java/io/zipcoder/PetsTest.java b/src/test/java/io/zipcoder/PetsTest.java
index cf83e29..d6e247c 100644
--- a/src/test/java/io/zipcoder/PetsTest.java
+++ b/src/test/java/io/zipcoder/PetsTest.java
@@ -8,7 +8,7 @@ public class PetsTest {
     @Test
     public void getName() {
         String expected = "Spot";
-        Pets pet = new Dog("Spot");
+        Pet pet = new Dog("Spot");
         pet.setName(expected);
         String actual = pet.getName();
         Assert.assertEquals(expected, actual);