sunday tests complete

src/main/java/com/zipcodewilmington/froilansfarm/Animals/Freelan.java

@@ -10,12 +10,15 @@ import com.zipcodewilmington.froilansfarm.PlantsAndCrops.TomatoPlant;
 
 public class Freelan extends Person implements Botanist {
 
-    public void plant(Crop type, int numToPlant){
+    public void plantNewRow(Crop type, int numToPlant){
         Field field = new Field();
         CropRow row = new CropRow(type, numToPlant);
         field.addToField(row);
     }
 
+    public void plant(CropRow row, int numberPlanted){
+        row.setNumberPlanted(numberPlanted);}
+
     public void collectYeild(int numToStore, Edible foodType) {
         foodType.foodIsAdded(numToStore);
     }

src/main/java/com/zipcodewilmington/froilansfarm/Animals/Froilan.java

@@ -8,12 +8,15 @@ import com.zipcodewilmington.froilansfarm.PlantsAndCrops.Crop;
 
 public class Froilan extends Person implements Botanist {
 
-    public void plant(Crop type, int numToPlant){
+    public void plantNewRow(Crop type, int numToPlant){
         Field field = new Field();
         CropRow row = new CropRow(type, numToPlant);
         field.addToField(row);
     }
 
+    public void plant(CropRow row, int numberPlanted){
+        row.setNumberPlanted(numberPlanted);}
+
     public void collectYeild(int numToStore, Edible foodType) {
         foodType.foodIsAdded(numToStore);
     }

src/main/java/com/zipcodewilmington/froilansfarm/Animals/Horse.java

@@ -30,11 +30,6 @@ public class Horse extends Amimal {
                 result += "Horse number " + i + " has been ridden today. \n";
             }
         }
-
-        return result;
-    }
-
-    public String getRideResult() {
         return result;
     }
 }

src/main/java/com/zipcodewilmington/froilansfarm/Holders/Farm.java

@@ -14,15 +14,15 @@ public class Farm  {
     private Field field = new Field();
     private CornStalk cornStalk = new CornStalk();
     private TomatoPlant tomatoPlant = new TomatoPlant();
-    private CropRow row1 = new CropRow(cornStalk, 35);
-    private CropRow row2 = new CropRow(tomatoPlant, 35);
-    private CropRow row3 = new CropRow(cornStalk, 35);
-    private CropRow row4 = new CropRow(cornStalk,35);
-    private CropRow row5 = new CropRow(35);
+    private CropRow row1 = new CropRow(cornStalk, 0);
+    private CropRow row2 = new CropRow(tomatoPlant, 0);
+    private CropRow row3 = new CropRow(cornStalk, 0);
+    private CropRow row4 = new CropRow(cornStalk,0);
+    private CropRow row5 = new CropRow(0);
     private FarmHouse house = new FarmHouse();
-    private Person froilan = new Froilan();
-    private Person freelan = new Freelan();
-    private Person froilanda = new Froilanda();
+    private Froilan froilan = new Froilan();
+    private Freelan freelan = new Freelan();
+    private Froilanda froilanda = new Froilanda();
     private ChickenCoop coop1 = new ChickenCoop(4);
     private ChickenCoop coop2 = new ChickenCoop(4);
     private ChickenCoop coop3 = new ChickenCoop(4);
@@ -41,10 +41,18 @@ public class Farm  {
     public Horse getHorse() {
         return horse;
     }
-    public Person getFroilan(){
+    public Froilan getFroilan(){
         return froilan;
     }
 
+    public Freelan getFreelan() {
+        return freelan;
+    }
+
+    public Froilanda getFroilanda() {
+        return froilanda;
+    }
+
     public CornEar getCorn() {
         return corn;
     }
@@ -53,6 +61,42 @@ public class Farm  {
         return tomato;
     }
 
+    public Stable getStable1() {
+        return stable1;
+    }
+
+    public Stable getStable2() {
+        return stable2;
+    }
+
+    public Stable getStable3() {
+        return stable3;
+    }
+
+    public Egg getEgg() {
+        return egg;
+    }
+
+    public CropRow getRow5() {
+        return row5;
+    }
+
+    public CropRow getRow4() {
+        return row4;
+    }
+
+    public CropRow getRow3() {
+        return row3;
+    }
+
+    public CropRow getRow2() {
+        return row2;
+    }
+
+    public CropRow getRow1() {
+        return row1;
+    }
+
     public void populateFarm(){
         house.addToFarmHpuse(froilan);
         house.addToFarmHpuse(froilanda);
@@ -60,8 +104,8 @@ public class Farm  {
         field.addToField(row1);
         field.addToField(row2);
         field.addToField(row3);
-        field.addToField(row4);
-        field.addToField(row5);
+      //  field.addToField(row4);
+      //  field.addToField(row5);
     }
 
     public void morningRoutine(){

src/main/java/com/zipcodewilmington/froilansfarm/PlantsAndCrops/Botanist.java

@@ -1,7 +1,11 @@
 package com.zipcodewilmington.froilansfarm.PlantsAndCrops;
 
+import com.zipcodewilmington.froilansfarm.Holders.CropRow;
+
 public interface Botanist {
 
-    void plant(Crop type, int numToPlant);
+    void plantNewRow(Crop type, int numToPlant);
+
+    void plant(CropRow row, int numberPlanted);
 
 }

src/test/java/com/zipcodewilmington/froilansfarm/SundayTest.java

@@ -12,6 +12,7 @@ public class SundayTest {
     Farm farm = new Farm();;
   private int cornFirstCount;
  private int tomatoFirstCount;
+ private int eggFirstCount;
 
 
     @Before
@@ -19,6 +20,7 @@ public class SundayTest {
         farm = new Farm();
        cornFirstCount = farm.getCorn().getFoodCount();
       tomatoFirstCount = farm.getTomato().getFoodCount();
+      eggFirstCount = farm.getEgg().getFoodCount();
         farm.populateFarm();
       farm.morningRoutine();
 
@@ -27,36 +29,60 @@ public class SundayTest {
 
     @Test
     public void horseRidetest(){
-
-       // farm.populateFarm();
-        //farm.morningRoutine();
-        String expected = "Horse number 1 has been ridden today. \nHorse number 2 has been ridden today. \nHorse number 3 has been ridden today. \nHorse number 4 has been ridden today. \nHorse number 5 has been ridden today. \nHorse number 6 has been ridden today. \nHorse number 7 has been ridden today. \nHorse number 8 has been ridden today. \nHorse number 9 has been ridden today. \n";
-        String actual = farm.getHorse().getRideResult();
+        String expected = "Horse number 1 has been ridden today. \nHorse number 2 has been ridden today. \nHorse number 3 has been ridden today. \nHorse number 1 has been ridden today. \nHorse number 2 has been ridden today. \nHorse number 3 has been ridden today. \nHorse number 1 has been ridden today. \nHorse number 2 has been ridden today. \nHorse number 3 has been ridden today. \n";
+        String actual = farm.getHorse().ride(farm.getFroilan(), farm.getStable1())+farm.getHorse().ride(farm.getFroilan(), farm.getStable2()) +farm.getHorse().ride(farm.getFroilan(), farm.getStable3());
         Assert.assertEquals(expected, actual);
     }
-
     @Test
     public void cornEatTest(){
-
-      //  int cornFirstCount = farm.getCorn().getFoodCount();
-       // farm.populateFarm();
-       // farm.morningRoutine();
         int secondCount = farm.getCorn().getFoodCount();
         int expected = 30;
         int actual = cornFirstCount-secondCount;
         Assert.assertEquals(expected, actual);
     }
+
     @Test
-    public void tomatoEatTest(){
+    public void isHorseHappy(){
+        String actual = farm.getHorse().makeNoise();
+        String expected = "NEIGH!";
+        Assert.assertEquals(expected, actual);
 
-      //  int tomatoFirstCount = farm.getTomato().getFoodCount();
-      // farm.populateFarm();
-      //  farm.morningRoutine();
+    }
+    @Test
+    public void tomatoEatTest(){
         int secondCount = farm.getTomato().getFoodCount();
         int expected = 6;
         int actual = tomatoFirstCount-secondCount;
         Assert.assertEquals(expected, actual);
     }
+    @Test
+    public void eggEatTest(){
+        int secondCount = farm.getEgg().getFoodCount();
+        int expected = 9;
+        int actual = eggFirstCount-secondCount;
+        Assert.assertEquals(expected, actual);
+    }
 
+    @Test
+    public void plantRow1Test(){
+        farm.getFroilan().plant(farm.getRow1(),40);
+        int actual = farm.getRow1().getNumberPlanted();
+        int expected = 40;
+        Assert.assertEquals(expected, actual);
+    }
 
+    @Test
+    public void plantRow2Test(){
+        farm.getFreelan().plant(farm.getRow2(),40);
+        int actual = farm.getRow2().getNumberPlanted();
+        int expected = 40;
+        Assert.assertEquals(expected, actual);
+    }
+    @Test
+    public void plantRow3Test(){
+        farm.getFreelan().plant(farm.getRow3(),40);
+        int actual = farm.getRow3().getNumberPlanted();
+        int expected = 40;
+        Assert.assertEquals(expected, actual);
+    }
 }