completed farm and started tests

pom.xml

@@ -7,6 +7,14 @@
     <groupId>com.zipcodewilmington</groupId>
     <artifactId>froilans-farm</artifactId>
     <version>1.0-SNAPSHOT</version>
+    <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>RELEASE</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
 
 
 </project>

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

@@ -3,7 +3,6 @@ package com.zipcodewilmington.froilansfarm.Animals;
 import com.zipcodewilmington.froilansfarm.Eater;
 import com.zipcodewilmington.froilansfarm.Edible;
 import com.zipcodewilmington.froilansfarm.NoiseMaker;
-import com.zipcodewilmington.froilansfarm.Storeable;
 
 public class Amimal implements NoiseMaker, Eater {
 
@@ -13,8 +12,6 @@ public class Amimal implements NoiseMaker, Eater {
     }
 
     public void eat(Edible food, int numberEaten) {
-        if (food.isEdible()) {
             food.foodIsEaten(numberEaten);
-        }
     }
 }

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

@@ -1,24 +1,19 @@
 package com.zipcodewilmington.froilansfarm.Animals;
 
-import com.zipcodewilmington.froilansfarm.Animals.Amimal;
-import com.zipcodewilmington.froilansfarm.Edible;
-import com.zipcodewilmington.froilansfarm.Holders.ChickenCoop;
-import com.zipcodewilmington.froilansfarm.Produce;
+public class Chicken extends Amimal {
 
-public class Chicken extends Amimal implements Produce {
-
-    ChickenCoop coop = new ChickenCoop();
-    Egg egg = new Egg();
+    //ChickenCoop coop = new ChickenCoop();
+   // Egg egg = new Egg();
 
     public String makeNoise(){
         return "CLUCK CLUCK!!";
     }
 
     //producing eggs
-    public void yeild(){
-        if (coop.getIsRooster()== true){ egg.setIsFertilized(true); } else {
-            egg.foodIsAdded(1);
-        }
-    }
+//    public void yeild(){
+//        if (!coop.getIsRooster()) {
+//            egg.foodIsAdded(1);
+//        }
+//    }
 
 }

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

@@ -6,7 +6,7 @@ import com.zipcodewilmington.froilansfarm.Fertilizable;
 public class Egg implements Edible, Fertilizable {
 
 
-    private int eggCount = 0;
+    private static int eggCount = 30;
     private boolean isFertilized = false;
 
 
@@ -27,6 +27,10 @@ public class Egg implements Edible, Fertilizable {
     };
 
     public void foodIsAdded(int foodAdded){
-        eggCount += foodAdded;
+        if(isEdible()){eggCount += foodAdded;}
+    }
+
+    public int getFoodCount() {
+        return eggCount;
     }
 }

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

@@ -1,14 +0,0 @@
-package com.zipcodewilmington.froilansfarm.Animals;
-
-import com.zipcodewilmington.froilansfarm.Animals.Person;
-import com.zipcodewilmington.froilansfarm.Harvests;
-import com.zipcodewilmington.froilansfarm.Holders.Storer;
-import com.zipcodewilmington.froilansfarm.PlantsAndCrops.Botanist;
-import com.zipcodewilmington.froilansfarm.Storeable;
-
-interface Farmer extends Harvests, Botanist {
-
-    public void collectYeild(int numToStore, Storer storeBuilding);
-
-
-}

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

@@ -1,5 +1,6 @@
 package com.zipcodewilmington.froilansfarm.Animals;
 
+import com.zipcodewilmington.froilansfarm.Edible;
 import com.zipcodewilmington.froilansfarm.Holders.CropRow;
 import com.zipcodewilmington.froilansfarm.Holders.Field;
 import com.zipcodewilmington.froilansfarm.PlantsAndCrops.Botanist;
@@ -7,14 +8,15 @@ import com.zipcodewilmington.froilansfarm.PlantsAndCrops.CornStalk;
 import com.zipcodewilmington.froilansfarm.PlantsAndCrops.Crop;
 import com.zipcodewilmington.froilansfarm.PlantsAndCrops.TomatoPlant;
 
-public class Freelan extends Person implements Farmer, Botanist {
-
-
+public class Freelan extends Person implements Botanist {
 
     public void plant(Crop type, int numToPlant){
         Field field = new Field();
         CropRow row = new CropRow(type, numToPlant);
         field.addToField(row);
+    }
 
+    public void collectYeild(int numToStore, Edible foodType) {
+        foodType.foodIsAdded(numToStore);
     }
 }

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

@@ -1,10 +1,20 @@
 package com.zipcodewilmington.froilansfarm.Animals;
 
+import com.zipcodewilmington.froilansfarm.Edible;
+import com.zipcodewilmington.froilansfarm.Holders.CropRow;
+import com.zipcodewilmington.froilansfarm.Holders.Field;
 import com.zipcodewilmington.froilansfarm.PlantsAndCrops.Botanist;
+import com.zipcodewilmington.froilansfarm.PlantsAndCrops.Crop;
 
-public class Froilan extends Person implements Farmer {
+public class Froilan extends Person implements Botanist {
 
-    public plant(){
+    public void plant(Crop type, int numToPlant){
+        Field field = new Field();
+        CropRow row = new CropRow(type, numToPlant);
+        field.addToField(row);
+    }
 
+    public void collectYeild(int numToStore, Edible foodType) {
+        foodType.foodIsAdded(numToStore);
     }
 }

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

@@ -1,7 +0,0 @@
-package com.zipcodewilmington.froilansfarm.Animals;
-
-import com.zipcodewilmington.froilansfarm.Animals.Chicken;
-import com.zipcodewilmington.froilansfarm.Produce;
-
-public class Hen extends Chicken implements Produce {
-}

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

@@ -8,22 +8,22 @@ import com.zipcodewilmington.froilansfarm.Rider;
 
 public class Horse extends Amimal implements Ridable {
 
-    Stable stable = new Stable(9);
-    Rider rider = new Person();
+    Stable stable = new Stable(0);
+
 
     public String makeNoise() {
         return "NEIGH!";
     }
 
-    public boolean getIsRideable(){
+    public boolean getIsRideable(Person rider){
         return rider.getIsMounted();
     }
 
-    public String ride() {
+    public String ride(Person rider) {
         String result = "No riding today";
-        if (getIsRideable()) {
+        if (getIsRideable(rider)) {
             result = "";
-            for (int i = 0; i < stable.getHorses(); i++) {
+            for (int i = 1; i <= stable.getHorses(); i++) {
                 result += "Horse number " + i + " has been ridden today. \n";
             }
         }

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

@@ -1,7 +0,0 @@
-package com.zipcodewilmington.froilansfarm.Animals;
-
-import com.zipcodewilmington.froilansfarm.Animals.Chicken;
-import com.zipcodewilmington.froilansfarm.Fertilizer;
-
-public class Rooster extends Chicken implements Fertilizer {
-}

src/main/java/com/zipcodewilmington/froilansfarm/Edible.java

@@ -6,4 +6,6 @@ public interface Edible {
     public void foodIsEaten(int numberEaten);
 
     public void foodIsAdded(int foodAdded);
+
+    public int getFoodCount();
 }

src/main/java/com/zipcodewilmington/froilansfarm/Fertilizer.java

@@ -1,4 +1,7 @@
 package com.zipcodewilmington.froilansfarm;
 
+import com.zipcodewilmington.froilansfarm.Animals.Person;
+
 public interface Fertilizer {
+    void fertilize(Person person);
 }

src/main/java/com/zipcodewilmington/froilansfarm/Harvests.java

@@ -1,9 +1,9 @@
 package com.zipcodewilmington.froilansfarm;
 
-import com.zipcodewilmington.froilansfarm.Holders.Storer;
+import com.zipcodewilmington.froilansfarm.Holders.CropRow;
 
 public interface Harvests {
 
-    void collectYeild(int numToStore, Storer storeBuilding);
+    void collectYeild(int numToStore, Edible foodType, CropRow rowNum);
 
 }

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

@@ -1,26 +0,0 @@
-package com.zipcodewilmington.froilansfarm.Holders;
-
-import com.zipcodewilmington.froilansfarm.Edible;
-import com.zipcodewilmington.froilansfarm.PlantsAndCrops.CornEar;
-import com.zipcodewilmington.froilansfarm.PlantsAndCrops.Crop;
-import com.zipcodewilmington.froilansfarm.PlantsAndCrops.Tomato;
-
-public class Barn extends Storer {
-
-    private int corn = 0;
-    private int tomato = 0;
-
-    public void addToStore(int numToStore) {
-        setFarmInventory(numToStore);
-    }
-
-    public void addToStore(int numToStore, Edible cropType) {
-        if (cropType instanceof CornEar) {
-            corn += numToStore;
-        } else if (cropType instanceof Tomato) {
-                tomato += numToStore;
-            } else {addToStore(numToStore);}
-        }
-
-    }
-

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

@@ -1,8 +1,20 @@
 package com.zipcodewilmington.froilansfarm.Holders;
 
-public class ChickenCoop extends Farm {
+import com.zipcodewilmington.froilansfarm.Animals.Chicken;
 
-    public boolean rooster = false;
+import java.util.ArrayList;
+
+public class ChickenCoop {
+
+    private boolean rooster = false;
+    private int coopCount = 0;
+
+    public ChickenCoop(int numOfChickens) {
+        this.rooster = getIsRooster();
+        this.coopCount = numOfChickens;
+    }
+
+    //public void addToCoop(int numOfChickens){ coopCount += numOfChickens;}
 
     public boolean getIsRooster() {
         return rooster;

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

@@ -1,23 +1,33 @@
 package com.zipcodewilmington.froilansfarm.Holders;
 
+import com.zipcodewilmington.froilansfarm.PlantsAndCrops.ArbitraryCrop;
 import com.zipcodewilmington.froilansfarm.PlantsAndCrops.Crop;
 
 public class CropRow {
 
     private int numberPlanted;
     private Crop cropType;
-    private boolean isFertilized = false;
+    private Crop arbitrary = new ArbitraryCrop();
 
     public CropRow(Crop cropType, int numberPlanted) {
         this.cropType=cropType;
         this.numberPlanted=numberPlanted;
     }
 
-    public boolean getIsFertilized() {
-        return isFertilized;
+    public CropRow( int numberPlanted) {
+        this.cropType= arbitrary;
+        this.numberPlanted=numberPlanted;
+    }
+
+    public Crop getCropType() {
+        return cropType;
+    }
+
+    public int getNumberPlanted() {
+        return numberPlanted;
     }
 
-    public void setFertilized(boolean fertilized) {
-        isFertilized = fertilized;
+    public void setNumberPlanted(int numberPlanted) {
+        this.numberPlanted = numberPlanted;
     }
 }

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

@@ -1,4 +1,88 @@
 package com.zipcodewilmington.froilansfarm.Holders;
 
+import com.zipcodewilmington.froilansfarm.Animals.*;
+import com.zipcodewilmington.froilansfarm.PlantsAndCrops.CornEar;
+import com.zipcodewilmington.froilansfarm.PlantsAndCrops.CornStalk;
+import com.zipcodewilmington.froilansfarm.PlantsAndCrops.Tomato;
+import com.zipcodewilmington.froilansfarm.PlantsAndCrops.TomatoPlant;
+import com.zipcodewilmington.froilansfarm.Vehicle.CropDuster;
+import com.zipcodewilmington.froilansfarm.Vehicle.Tractor;
+
+
 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 FarmHouse house = new FarmHouse();
+    private Person froilan = new Froilan();
+    private Person freelan = new Freelan();
+    private Person froilanda = new Froilanda();
+    private ChickenCoop coop1 = new ChickenCoop(4);
+    private ChickenCoop coop2 = new ChickenCoop(4);
+    private ChickenCoop coop3 = new ChickenCoop(4);
+    private ChickenCoop coop4 = new ChickenCoop(4);
+    private Stable stable1 = new Stable(0);
+    private Stable stable2 = new Stable(0);
+    private Stable stable3 = new Stable(0);
+    private Tractor tractor1 = new Tractor();
+    private Tractor tractor2 = new Tractor();
+    private CropDuster cropDuster = new CropDuster();
+    private Horse horse = new Horse();
+    private CornEar corn = new CornEar();
+    private Tomato tomato = new Tomato();
+    private Egg egg = new Egg();
+
+    public Horse getHorse() {
+        return horse;
+    }
+    public Person getFroilan(){
+        return froilan;
+    }
+
+    public CornEar getCorn() {
+        return corn;
+    }
+
+    public Tomato getTomato() {
+        return tomato;
+    }
+
+    public void populateFarm(){
+        house.addToFarmHpuse(froilan);
+        house.addToFarmHpuse(froilanda);
+        house.addToFarmHpuse(freelan);
+        field.addToField(row1);
+        field.addToField(row2);
+        field.addToField(row3);
+        field.addToField(row4);
+        field.addToField(row5);
+        stable1.setHorses(3);
+        stable2.setHorses(3);
+        stable3.setHorses(3);
+    }
+
+    public void morningRoutine(){
+        froilan.setIsMounted();
+        horse.ride(froilan);
+        for(int i=0; i<stable3.getHorses(); i++) {
+            horse.eat(corn, 3);
+        }
+        froilan.eat(corn, 1);
+        froilan.eat(tomato, 2);
+        froilan.eat(egg, 5);
+        froilanda.eat(corn, 2);
+        froilanda.eat(tomato, 1);
+        froilanda.eat(egg, 2);
+        froilan.eat(tomato, 3);
+        froilan.eat(egg, 2);
+
+    }
+
+
 }

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

@@ -1,4 +1,20 @@
 package com.zipcodewilmington.froilansfarm.Holders;
 
-public class FarmHouse extends Farm {
+import com.zipcodewilmington.froilansfarm.Animals.Person;
+
+import java.util.ArrayList;
+
+public class FarmHouse {
+
+    static private ArrayList farmHouse;
+
+    public FarmHouse() {
+
+        farmHouse = new ArrayList();
+
+    }
+
+    public void addToFarmHpuse(Person person){
+        farmHouse.add(person);
+    }
 }

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

@@ -8,7 +8,15 @@ public class Field {
 
     static private Map<Integer, CropRow> fieldMap;
     private int rowNumber=1;
+    private static boolean isFertilized = false;
 
+    public void setFertilized(boolean fertilized) {
+        isFertilized = fertilized;
+    }
+
+    public boolean getIsFertilized() {
+        return isFertilized;
+    }
 
     public Field() {
 

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

@@ -1,11 +1,11 @@
 package com.zipcodewilmington.froilansfarm.Holders;
 
-public class Stable extends Farm {
+public class Stable {
 
-    private int horses = 0;
+    private static int horses = 0;
 
     public Stable(int horses) {
-        this.horses = horses;
+        this.horses += horses;
     }
 
     public int getHorses() {
@@ -13,6 +13,6 @@ public class Stable extends Farm {
     }
 
     public void setHorses(int horses) {
-        this.horses = horses;
+        this.horses += horses;
     }
 }

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

@@ -1,14 +0,0 @@
-package com.zipcodewilmington.froilansfarm.Holders;
-
-import com.zipcodewilmington.froilansfarm.Storeable;
-
-abstract public class Storer {
-
-    private int unstoredItemsonFarm=0;
-
-    public void setFarmInventory(int numberToAdd){
-        unstoredItemsonFarm += numberToAdd;
-    }
-
-    abstract void addToStore(int numToStore);
-}

src/main/java/com/zipcodewilmington/froilansfarm/MainApplication.java

@@ -5,4 +5,6 @@ package com.zipcodewilmington.froilansfarm;
  */
 public class MainApplication {
 
+
+
 }

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

@@ -0,0 +1,7 @@
+package com.zipcodewilmington.froilansfarm.PlantsAndCrops;
+
+public class ArbitraryCrop extends Crop {
+
+    public ArbitraryCrop() {
+    }
+}

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

@@ -2,6 +2,6 @@ package com.zipcodewilmington.froilansfarm.PlantsAndCrops;
 
 public interface Botanist {
 
-    void plant();
+    void plant(Crop type, int numToPlant);
 
 }

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

@@ -1,6 +1,27 @@
 package com.zipcodewilmington.froilansfarm.PlantsAndCrops;
 
 import com.zipcodewilmington.froilansfarm.Edible;
+import com.zipcodewilmington.froilansfarm.Holders.Field;
 
 public class CornEar implements Edible {
+
+    private static int cornCount = 70;
+    Field field = new Field();
+
+    public boolean isEdible() {
+        if (field.getIsFertilized()){return true;}
+        else {return false;}
+    }
+
+    public void foodIsAdded(int foodAdded) {
+        if(isEdible()){cornCount+=foodAdded;}
+    }
+
+    public void foodIsEaten(int numberEaten) {
+        cornCount -= numberEaten;
+    }
+
+    public int getFoodCount() {
+        return cornCount;
+    }
 }

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

@@ -1,8 +1,8 @@
 package com.zipcodewilmington.froilansfarm.PlantsAndCrops;
 
 import com.zipcodewilmington.froilansfarm.Fertilizable;
-import com.zipcodewilmington.froilansfarm.Holders.CropRow;
-import com.zipcodewilmington.froilansfarm.Produce;
 
-public class Crop extends CropRow implements Produce, Fertilizable {
+public class Crop{
+
+
 }

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

@@ -1,6 +1,26 @@
 package com.zipcodewilmington.froilansfarm.PlantsAndCrops;
 
 import com.zipcodewilmington.froilansfarm.Edible;
+import com.zipcodewilmington.froilansfarm.Holders.Field;
 
 public class Tomato implements Edible {
+    private static int tomatoCount = 20;
+    Field field = new Field();
+
+    public boolean isEdible() {
+        if (field.getIsFertilized()){return true;}
+        else {return false;}
+    }
+
+    public void foodIsAdded(int foodAdded) {
+        if(isEdible()){tomatoCount+=foodAdded;}
+    }
+
+    public void foodIsEaten(int numberEaten) {
+        tomatoCount -= numberEaten;
+    }
+
+    public int getFoodCount() {
+        return tomatoCount;
+    }
 }

src/main/java/com/zipcodewilmington/froilansfarm/Produce.java

@@ -1,7 +0,0 @@
-package com.zipcodewilmington.froilansfarm;
-
-public interface Produce {
-
-    //adds or subtracts from field yield in classes
-    void yeild();
-}

src/main/java/com/zipcodewilmington/froilansfarm/Ridable.java

@@ -1,10 +1,12 @@
 package com.zipcodewilmington.froilansfarm;
 
+import com.zipcodewilmington.froilansfarm.Animals.Person;
+
 public interface Ridable {
 
-    boolean getIsRideable();
+    boolean getIsRideable(Person person);
 
-    String ride();
+    String ride(Person rider);
 
 
 

src/main/java/com/zipcodewilmington/froilansfarm/Storeable.java

@@ -1,8 +0,0 @@
-package com.zipcodewilmington.froilansfarm;
-
-import com.zipcodewilmington.froilansfarm.Holders.Storer;
-
-public interface Storeable {
-
-    void addToStore(Storeable storeType, Storer storeBuilding);
-}

src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/Aircraft.java

@@ -1,13 +1,14 @@
 package com.zipcodewilmington.froilansfarm.Vehicle;
 
+import com.zipcodewilmington.froilansfarm.Animals.Person;
 import com.zipcodewilmington.froilansfarm.Vehicle.Vehicle;
 
 public class Aircraft extends Vehicle {
 
-    @Override
-    public String ride(){
+
+    public String ride(Person person){
         String result = "No transportation today";
-        if(getIsRideable()){
+        if(getIsRideable(person)){
             result = "We're flying!";
         }
 

src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/CropDuster.java

@@ -1,7 +1,25 @@
 package com.zipcodewilmington.froilansfarm.Vehicle;
 
 
+import com.zipcodewilmington.froilansfarm.Animals.Person;
 import com.zipcodewilmington.froilansfarm.Fertilizer;
+import com.zipcodewilmington.froilansfarm.Holders.Field;
 
-public class CropDuster extends Aircraft implements FarmVehicle, Fertilizer, Flyable {
+public class CropDuster extends Aircraft implements FarmVehicle, Fertilizer {
+
+    Field field = new Field();
+    public boolean isOnAFarm() {
+        return true;
+    }
+
+    @Override
+    public boolean getIsRideable(Person person){
+        return person.getIsMounted() && person instanceof Flyer;
+    }
+
+
+    public void fertilize(Person person){
+        if(getIsRideable(person)){
+        field.setFertilized(true);}
+    }
 }

src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/Flyable.java

@@ -1,4 +0,0 @@
-package com.zipcodewilmington.froilansfarm.Vehicle;
-
-public interface Flyable {
-}

src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/Flyer.java

@@ -1,4 +1,5 @@
 package com.zipcodewilmington.froilansfarm.Vehicle;
 
 public interface Flyer {
+
 }

src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/Tractor.java

@@ -1,26 +1,42 @@
 package com.zipcodewilmington.froilansfarm.Vehicle;
 
+import com.zipcodewilmington.froilansfarm.Animals.Person;
+import com.zipcodewilmington.froilansfarm.Edible;
 import com.zipcodewilmington.froilansfarm.Harvests;
-import com.zipcodewilmington.froilansfarm.Holders.Storer;
+import com.zipcodewilmington.froilansfarm.Holders.CropRow;
+import com.zipcodewilmington.froilansfarm.PlantsAndCrops.Botanist;
 
 public class Tractor extends Vehicle implements Harvests, FarmVehicle {
 
-    public boolean isOnAFarm(){
+    private boolean isRiding = false;
+
+
+    public boolean isOnAFarm() {
         return true;
     }
 
-    public void collectYeild(int numToStore, Storer storeBuilding) {
-
-        addToStore(numToStore);
+    @Override
+    public boolean getIsRideable(Person person){
+        return person.getIsMounted() && person instanceof Botanist;
+    }
 
+    public void setRiding(boolean riding) {
+        isRiding = riding;
     }
 
-    public String ride(){
+    public String ride(Person person){
         String result = "No transportation today";
-        if(getIsRideable()){
+        if(getIsRideable(person) && isOnAFarm()){
             result = "Driving in the field today";
+            setRiding(true);
         }
 
         return result;
     }
+
+    public void collectYeild(int numToStore, Edible foodType, CropRow rowNum) {
+        if(isRiding){
+            foodType.foodIsAdded(numToStore);
+            rowNum.setNumberPlanted(0);}
+    }
 }

src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/Vehicle.java

@@ -6,21 +6,21 @@ import com.zipcodewilmington.froilansfarm.Ridable;
 
 public class Vehicle implements Ridable, NoiseMaker {
 
-    Person person = new Person();
+
 
     public String makeNoise(){
         return "VROOM VROOM!";
     }
 
 
-    public boolean getIsRideable(){
+    public boolean getIsRideable(Person person){
         return person.getIsMounted();
     }
 
 
-    public String ride(){
+    public String ride(Person person){
      String result = "No transportation today";
-     if(getIsRideable()){
+     if(getIsRideable(person)){
          result = "Moving around on a vehicle";
      }
 

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

@@ -4,4 +4,6 @@ package com.zipcodewilmington.froilansfarm;
  * Created by leon on 2/26/18.
  */
 public class MainApplicationTest {
+
+
 }

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

@@ -0,0 +1,51 @@
+package com.zipcodewilmington.froilansfarm;
+
+import com.zipcodewilmington.froilansfarm.Animals.Horse;
+import com.zipcodewilmington.froilansfarm.Holders.Farm;
+import com.zipcodewilmington.froilansfarm.PlantsAndCrops.CornEar;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+public class SundayTest {
+
+    Farm farm;
+
+    @Before
+    public void setup(){
+        farm = new Farm();
+
+    }
+
+    @Test
+    public void cornEatTest(){
+    int firstCount = farm.getCorn().getFoodCount();
+    farm.populateFarm();
+    farm.morningRoutine();
+    int secondCount = farm.getCorn().getFoodCount();
+    int expected = 30;
+    int actual = firstCount-secondCount;
+    Assert.assertEquals(expected, actual);
+    }
+
+    @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";
+        farm.getFroilan().setIsMounted();
+        String actual = farm.getHorse().ride(farm.getFroilan());
+        Assert.assertEquals(expected, actual);
+    }
+    @Test
+    public void tomatoEatTest(){
+        int firstCount = farm.getTomato().getFoodCount();
+       // farm.populateFarm();
+        //farm.morningRoutine();
+        int secondCount = farm.getTomato().getFoodCount();
+        int expected = 6;
+        int actual = firstCount-secondCount;
+        Assert.assertEquals(expected, actual);
+    }
+
+}