Sample code

wakaleo · wakaleo · commit 504d38355cae · 2020-04-24T08:22:08.000+01:00
diff --git a/src/main/java/com/serenitydojo/Cat.java b/src/main/java/com/serenitydojo/Cat.java
@@ -39,8 +39,9 @@ public int getAge() {
         return age;
     }
 
-    public void makeNoise() {
-        System.out.println(CAT_NOISE);
+    @Override
+    public String makeNoise() {
+        return CAT_NOISE;
     }
 
     public void feed(String food) {
diff --git a/src/main/java/com/serenitydojo/Dog.java b/src/main/java/com/serenitydojo/Dog.java
@@ -17,4 +17,8 @@ public String getFavoriteToy() {
     public int getAge() {
         return age;
     }
+
+    public String makeNoise() {
+        return "Woof";
+    }
 }
diff --git a/src/main/java/com/serenitydojo/Hampster.java b/src/main/java/com/serenitydojo/Hampster.java
@@ -17,4 +17,9 @@ public String getFavoriteGame() {
     public int getAge() {
         return age;
     }
+
+    @Override
+    public String makeNoise() {
+        return "Squeak";
+    }
 }
diff --git a/src/main/java/com/serenitydojo/Pet.java b/src/main/java/com/serenitydojo/Pet.java
@@ -1,6 +1,6 @@
 package com.serenitydojo;
 
-public class Pet {
+public abstract class Pet {
     private String name;
 
     public Pet(String name) {
@@ -9,4 +9,7 @@ public Pet(String name) {
     public String getName() {
         return name;
     }
+
+    public String goForWalks() { return "walk walk walk"; }
+    public abstract String makeNoise();
 }
diff --git a/src/test/java/com/serenitydojo/WhenCreatingObjects.java b/src/test/java/com/serenitydojo/WhenCreatingObjects.java
@@ -2,7 +2,8 @@
 
 import org.junit.Assert;
 import org.junit.Test;
-import static com.serenitydojo.Cat.usualFood;
+
+import static org.junit.Assert.assertEquals;
 
 public class WhenCreatingObjects {
 
@@ -11,18 +12,18 @@ public void creating_a_cat() {
 
         Cat felix = new Cat("Felix","Tuna", 4);
 
-        Assert.assertEquals(felix.getName(), "Felix");
-        Assert.assertEquals(felix.getFavoriteFood(), "Tuna");
-        Assert.assertEquals(felix.getAge(), 4);
+        assertEquals(felix.getName(), "Felix");
+        assertEquals(felix.getFavoriteFood(), "Tuna");
+        assertEquals(felix.getAge(), 4);
     }
 
     @Test
     public void creating_a_dog() {
 
         Dog fido = new Dog("Fido","Bone", 5);
-        Assert.assertEquals(fido.getName(), "Fido");
-        Assert.assertEquals(fido.getFavoriteToy(), "Bone");
-        Assert.assertEquals(fido.getAge(), 5);
+        assertEquals(fido.getName(), "Fido");
+        assertEquals(fido.getFavoriteToy(), "Bone");
+        assertEquals(fido.getAge(), 5);
 
     }
 
@@ -31,17 +32,47 @@ public void creating_a_hampster() {
 
         Hampster rusty = new Hampster("Rusty","Wheel",1);
 
-        Assert.assertEquals(rusty.getName(),"Rusty");
-        Assert.assertEquals(rusty.getFavoriteGame(),"Wheel");
-        Assert.assertEquals(rusty.getAge(),1);
+        assertEquals(rusty.getName(),"Rusty");
+        assertEquals(rusty.getFavoriteGame(),"Wheel");
+        assertEquals(rusty.getAge(),1);
     }
 
 
     @Test
     public void cat_makes_noise() {
         Cat felix = new Cat("Felix", 4);
-        Cat spot = new Cat("Spot","Salmon", 3);
 
-        System.out.println("Cats like " + usualFood());
+        System.out.println("Felix goes " + felix.makeNoise());
+    }
+
+    @Test
+    public void dog_makes_noise() {
+        Dog fido = new Dog("Fido","bone", 5);
+
+        System.out.println("Fido goes " + fido.makeNoise());
     }
+
+    @Test
+    public void pets_make_noise() {
+        Pet felix = new Cat("Felix",4);
+        Pet fido = new Dog("Fido", "bone", 5);
+        Pet rusty = new Hampster("Rusty", "wheels", 1);
+
+        System.out.println("Felix goes " + felix.makeNoise());
+        System.out.println("Fido goes " + fido.makeNoise());
+        System.out.println("Rusty goes " + rusty.makeNoise());
+    }
+
+    @Test
+    public void pets_can_play() {
+        Pet felix = new Cat("Felix",4);
+        Pet fido = new Dog("Fido", "bone", 5);
+        Pet rusty = new Hampster("Rusty", "wheels", 1);
+
+//        assertEquals(felix.play(), "plays with string");
+//        assertEquals(fido.play(), "plays with bone");
+//        assertEquals(rusty.play(), "runs in wheel");
+
+    }
+
 }

Original file line number	Diff line number	Diff line change
`@@ -39,8 +39,9 @@ public int getAge() {`
`39`	`39`	`return age;`
`40`	`40`	`}`
`41`	`41`
`42`		`- public void makeNoise() {`
`43`		`- System.out.println(CAT_NOISE);`
	`42`	`+ @Override`
	`43`	`+ public String makeNoise() {`
	`44`	`+ return CAT_NOISE;`
`44`	`45`	`}`
`45`	`46`
`46`	`47`	`public void feed(String food) {`
Original file line number	Diff line number	Diff line change
`@@ -17,4 +17,8 @@ public String getFavoriteToy() {`
`17`	`17`	`public int getAge() {`
`18`	`18`	`return age;`
`19`	`19`	`}`
	`20`	`+`
	`21`	`+ public String makeNoise() {`
	`22`	`+ return "Woof";`
	`23`	`+ }`
`20`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,4 +17,9 @@ public String getFavoriteGame() {`
`17`	`17`	`public int getAge() {`
`18`	`18`	`return age;`
`19`	`19`	`}`
	`20`	`+`
	`21`	`+ @Override`
	`22`	`+ public String makeNoise() {`
	`23`	`+ return "Squeak";`
	`24`	`+ }`
`20`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`package com.serenitydojo;`
`2`	`2`
`3`		`-public class Pet {`
	`3`	`+public abstract class Pet {`
`4`	`4`	`private String name;`
`5`	`5`
`6`	`6`	`public Pet(String name) {`
`@@ -9,4 +9,7 @@ public Pet(String name) {`
`9`	`9`	`public String getName() {`
`10`	`10`	`return name;`
`11`	`11`	`}`
	`12`	`+`
	`13`	`+ public String goForWalks() { return "walk walk walk"; }`
	`14`	`+ public abstract String makeNoise();`
`12`	`15`	`}`