Sample solution

wakaleo · wakaleo · commit de3b82d183da · 2020-04-30T14:51:54.000+01:00
diff --git a/src/main/java/com/serenitydojo/model/Feeder.java b/src/main/java/com/serenitydojo/model/Feeder.java
@@ -1,17 +1,17 @@
 package com.serenitydojo.model;
 
 public class Feeder {
-    public String feeds(AnimalType animal, boolean isPremium) {
+    public FoodType feeds(AnimalType animal, boolean isPremium) {
 
         switch (animal) {
             case CAT:
-                return (isPremium) ? "Salmon" : "Tuna";
+                return (isPremium) ? FoodType.SALMON : FoodType.TUNA;
             case DOG:
-                return  (isPremium) ? "Deluxe Dog Food" : "Dog Food";
+                return  (isPremium) ? FoodType.DELUXE_DOG_FOOD : FoodType.DOG_FOOD;
             case HAMSTER:
-                return (isPremium) ? "Lettuce" : "Cabbage";
+                return (isPremium) ? FoodType.LETTUCE : FoodType.CABBAGE;
             default:
-                return  "Don't know this animal - don't know the food";
+                return  FoodType.UNKNOWN;
         }
     }
 }
diff --git a/src/main/java/com/serenitydojo/model/FoodType.java b/src/main/java/com/serenitydojo/model/FoodType.java
@@ -0,0 +1,5 @@
+package com.serenitydojo.model;
+
+public enum FoodType {
+    TUNA, CABBAGE, LETTUCE, SALMON, DOG_FOOD, DELUXE_DOG_FOOD, UNKNOWN
+}
diff --git a/src/test/java/com/serenitydojo/WhenFeedingTheAnimals.java b/src/test/java/com/serenitydojo/WhenFeedingTheAnimals.java
@@ -2,6 +2,7 @@
 
 import com.serenitydojo.model.AnimalType;
 import com.serenitydojo.model.Feeder;
+import com.serenitydojo.model.FoodType;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -13,54 +14,54 @@ public class WhenFeedingTheAnimals {
     public void shouldFeedCatsTuna() {
         Feeder feeder = new Feeder();
 
-        String food = feeder.feeds(CAT, false);
+        FoodType food = feeder.feeds(CAT, false);
 
-        Assert.assertEquals("Tuna", food);
+        Assert.assertEquals(FoodType.TUNA, food);
     }
 
     @Test
     public void shouldFeedHamstersCabbage() {
         Feeder feeder = new Feeder();
 
-        String food = feeder.feeds(HAMSTER, false);
+        FoodType food = feeder.feeds(HAMSTER, false);
 
-        Assert.assertEquals("Cabbage", food);
+        Assert.assertEquals(FoodType.CABBAGE, food);
     }
 
     @Test
     public void shouldFeedDogsDogFood() {
         Feeder feeder = new Feeder();
 
-        String food = feeder.feeds(DOG, false);
+        FoodType food = feeder.feeds(DOG, false);
 
-        Assert.assertEquals("Dog Food", food);
+        Assert.assertEquals(FoodType.DOG_FOOD, food);
     }
 
     @Test
     public void shouldFeedPremiumCatsPremiumFood() {
         Feeder feeder = new Feeder();
 
-        String food = feeder.feeds(CAT, true);
+        FoodType food = feeder.feeds(CAT, true);
 
-        Assert.assertEquals("Salmon", food);
+        Assert.assertEquals(FoodType.SALMON, food);
     }
 
     @Test
     public void shouldFeedPremiumDogsDeluxeDogFood() {
         Feeder feeder = new Feeder();
 
-        String food = feeder.feeds(DOG, true);
+        FoodType food = feeder.feeds(DOG, true);
 
-        Assert.assertEquals("Deluxe Dog Food", food);
+        Assert.assertEquals(FoodType.DELUXE_DOG_FOOD, food);
     }
 
     @Test
     public void shouldFeedPremiumHamstersLettuce() {
         Feeder feeder = new Feeder();
 
-        String food = feeder.feeds(HAMSTER, true);
+        FoodType food = feeder.feeds(HAMSTER, true);
 
-        Assert.assertEquals("Lettuce", food);
+        Assert.assertEquals(FoodType.LETTUCE, food);
     }
 
 }
