tests up to friday completed

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

@@ -7,11 +7,15 @@ import com.zipcodewilmington.froilansfarm.PlantsAndCrops.Botanist;
 import com.zipcodewilmington.froilansfarm.PlantsAndCrops.CornStalk;
 import com.zipcodewilmington.froilansfarm.PlantsAndCrops.Crop;
 import com.zipcodewilmington.froilansfarm.PlantsAndCrops.TomatoPlant;
+import com.zipcodewilmington.froilansfarm.Vehicle.Flyer;
 
-public class Freelan extends Person implements Botanist {
+public class Freelan extends Person implements Botanist, Flyer {
 
-    public void plantNewRow(Crop type, int numToPlant){
-        Field field = new Field();
+
+    private Field field;
+
+    public void plantNewRow(Crop type, int numToPlant, Field field){
+        field = field;
         CropRow row = new CropRow(type, numToPlant);
         field.addToField(row);
     }

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

@@ -8,8 +8,10 @@ import com.zipcodewilmington.froilansfarm.PlantsAndCrops.Crop;
 
 public class Froilan extends Person implements Botanist {
 
-    public void plantNewRow(Crop type, int numToPlant){
-        Field field = new Field();
+    protected Field field;
+
+    public void plantNewRow(Crop type, int numToPlant, Field field){
+        field = field;
         CropRow row = new CropRow(type, numToPlant);
         field.addToField(row);
     }

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

@@ -102,6 +102,9 @@ public class Farm  {
     public Tractor getTractor2() {
         return tractor2;
     }
+    public CornStalk getCornStalk(){
+        return cornStalk;
+    }
 
     public void populateFarm(){
         house.addToFarmHpuse(froilan);

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

@@ -6,8 +6,8 @@ import java.util.Map;
 
 public class Field {
 
-    static private Map<Integer, CropRow> fieldMap;
-    private int rowNumber=1;
+    private Map<Integer, CropRow> fieldMap;
+    private int rowNumber=0;
     private static boolean isFertilized = false;
 
     public void setFertilized(boolean fertilized) {
@@ -25,10 +25,14 @@ public class Field {
     }
 
     public void addToField(CropRow cropRow){
-        fieldMap.put(getRowNumber(), cropRow);
+        fieldMap.put(setRowNumber(), cropRow);
+    }
+
+    public int setRowNumber() {
+        return ++rowNumber;
     }
 
     public int getRowNumber() {
-        return rowNumber++;
+        return rowNumber;
     }
 }

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

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

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

@@ -0,0 +1,39 @@
+package com.zipcodewilmington.froilansfarm;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import com.zipcodewilmington.froilansfarm.Holders.Farm;
+
+public class FridayTest {
+
+    Farm farm;
+
+
+    @Before
+    public void setup() {
+        farm = new Farm();
+        farm.populateFarm();
+        farm.morningRoutine();
+        farm.getFroilanda().setIsMounted();
+        farm.getCropDuster().fertilize(farm.getFroilanda());
+        farm.getFreelan().plantNewRow(farm.getCornStalk(), 40, farm.getField());
+    }
+
+    //Freelan plants the 5th row of plants(corn) and fertilizes it
+
+    @Test
+    public void plantTest(){
+        farm.getFreelan().plantNewRow(farm.getCornStalk(), 40, farm.getField());
+        int actual = farm.getField().getRowNumber();
+        int expected = 5;
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void fertilizeFieldTest() {
+        farm.getFreelan().setIsMounted();
+        farm.getCropDuster().fertilize(farm.getFreelan());
+        Assert.assertTrue(farm.getField().getIsFertilized());
+    }
+}

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

@@ -0,0 +1,34 @@
+package com.zipcodewilmington.froilansfarm;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import com.zipcodewilmington.froilansfarm.Holders.Farm;
+
+public class ThursdayTest {
+
+    Farm farm;
+
+    @Before
+    public void setup(){
+        farm = new Farm();
+        farm.populateFarm();
+        farm.morningRoutine();
+    }
+
+    //On thursdays Freelan and Froilanda go for joy rides in the crop duster
+    @Test
+    public void freelanJoyRideTest() {
+        farm.getFreelan().setIsMounted();
+        String actual = farm.getCropDuster().ride(farm.getFreelan());
+        String expected = "We're flying!";
+        Assert.assertEquals(expected, actual);
+    }
+    @Test
+    public void froilandaJoyRideTest() {
+        farm.getFroilanda().setIsMounted();
+        String actual = farm.getCropDuster().ride(farm.getFroilanda());
+        String expected = "We're flying!";
+        Assert.assertEquals(expected, actual);
+    }
+}

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

@@ -1,5 +1,6 @@
 package com.zipcodewilmington.froilansfarm;
 
+
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -30,8 +31,6 @@ public class TuesdayTest {
         String actual = farm.getTractor1().ride(farm.getFroilan());
         String expected = "Driving in the field today";
         Assert.assertEquals(expected, actual);
-        farm.getFroilanda().setIsMounted();
-        farm.getCropDuster().fertilize(farm.getFroilanda());
     }
 
     @Test
@@ -68,4 +67,12 @@ public class TuesdayTest {
         int expected =40;
         Assert.assertEquals(expected, actual);
     }
+
+    @Test
+    public void plantTest(){
+        farm.getFreelan().plantNewRow(farm.getCornStalk(), 40, farm.getField());
+        int actual = farm.getField().getRowNumber();
+        int expected = 4;
+        Assert.assertEquals(expected, actual);
+    }
 }