From 99b91407c81ce8dbfc43002f5c6588de84e446ec Mon Sep 17 00:00:00 2001 From: Luciaw1219 Date: Tue, 16 May 2023 16:52:42 -0400 Subject: [PATCH 01/20] add eater, animal, horse, stable (edible params commented out) --- .../java/com/zipcodewilmington/froilansfarm/Animal.java | 5 +++++ .../java/com/zipcodewilmington/froilansfarm/Eater.java | 7 +++++++ .../java/com/zipcodewilmington/froilansfarm/Horse.java | 9 +++++++++ .../java/com/zipcodewilmington/froilansfarm/Stable.java | 9 +++++++++ 4 files changed, 30 insertions(+) create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Animal.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Eater.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Horse.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Stable.java diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Animal.java b/src/main/java/com/zipcodewilmington/froilansfarm/Animal.java new file mode 100644 index 00000000..c510b7f4 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Animal.java @@ -0,0 +1,5 @@ +package com.zipcodewilmington.froilansfarm; + +public abstract class Animal implements Eater { + +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Eater.java b/src/main/java/com/zipcodewilmington/froilansfarm/Eater.java new file mode 100644 index 00000000..9f8cd2b7 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Eater.java @@ -0,0 +1,7 @@ +package com.zipcodewilmington.froilansfarm; + +public interface Eater { + + void eat(/*Edible edible*/); + +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Horse.java b/src/main/java/com/zipcodewilmington/froilansfarm/Horse.java new file mode 100644 index 00000000..a3913fc8 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Horse.java @@ -0,0 +1,9 @@ +package com.zipcodewilmington.froilansfarm; + +public class Horse extends Animal { + + public void eat(/*Edible edible*/) { + System.out.println("munch munch"); + } + +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Stable.java b/src/main/java/com/zipcodewilmington/froilansfarm/Stable.java new file mode 100644 index 00000000..7eba95ad --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Stable.java @@ -0,0 +1,9 @@ +package com.zipcodewilmington.froilansfarm; + +import java.util.List; + +public class Stable { + + private List horses; + +} From 4a455ff22ac30fd8e4c910f67fc5e9232a3bc0fe Mon Sep 17 00:00:00 2001 From: Luciaw1219 Date: Tue, 16 May 2023 16:56:58 -0400 Subject: [PATCH 02/20] add junit to pom.xml and specify java version 19 --- pom.xml | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 69a3b878..ab263c7f 100644 --- a/pom.xml +++ b/pom.xml @@ -8,5 +8,19 @@ froilans-farm 1.0-SNAPSHOT + + 19 + 19 + 19 + - \ No newline at end of file + + + org.junit.jupiter + junit-jupiter-api + 5.9.3 + test + + + + From a50dbe15496e7632f8fe87c952206c57256101fc Mon Sep 17 00:00:00 2001 From: Luciaw1219 Date: Tue, 16 May 2023 17:02:20 -0400 Subject: [PATCH 03/20] add rideable to horse commented out until rideable is created --- src/main/java/com/zipcodewilmington/froilansfarm/Horse.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Horse.java b/src/main/java/com/zipcodewilmington/froilansfarm/Horse.java index a3913fc8..493235b2 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Horse.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Horse.java @@ -1,6 +1,6 @@ package com.zipcodewilmington.froilansfarm; -public class Horse extends Animal { +public class Horse extends Animal /*implements Rideable */{ public void eat(/*Edible edible*/) { System.out.println("munch munch"); From cb88a1e578cf0aa769c319706e34d35e5fca618e Mon Sep 17 00:00:00 2001 From: Mohammed amine ztait Date: Tue, 16 May 2023 22:31:37 -0400 Subject: [PATCH 04/20] Mohammed amine is cool --- pom.xml | 12 ++++++++++ src/main/java/Farm/Crop.java | 23 +++++++++++++++++++ src/main/java/Farm/Edible.java | 7 ++++++ src/main/java/Farm/EdibleEgg.java | 14 +++++++++++ src/main/java/Farm/Produce.java | 9 ++++++++ .../froilansfarm/MainApplication.java | 8 ------- 6 files changed, 65 insertions(+), 8 deletions(-) create mode 100644 src/main/java/Farm/Crop.java create mode 100644 src/main/java/Farm/Edible.java create mode 100644 src/main/java/Farm/EdibleEgg.java create mode 100644 src/main/java/Farm/Produce.java delete mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/MainApplication.java diff --git a/pom.xml b/pom.xml index 69a3b878..2538f79a 100644 --- a/pom.xml +++ b/pom.xml @@ -7,6 +7,18 @@ com.zipcodewilmington froilans-farm 1.0-SNAPSHOT + + + + org.apache.maven.plugins + maven-compiler-plugin + + 6 + 6 + + + + \ No newline at end of file diff --git a/src/main/java/Farm/Crop.java b/src/main/java/Farm/Crop.java new file mode 100644 index 00000000..6579ed50 --- /dev/null +++ b/src/main/java/Farm/Crop.java @@ -0,0 +1,23 @@ +package Farm; + +import java.lang.reflect.Type; + +public abstract class Crop implements Produce { + private boolean hasBeenHarvested; + private boolean hasBeenFertilized; + + public Crop() { + this.hasBeenHarvested = false; + this.hasBeenFertilized = false; + } + + @Override + public void yield(Edible edible) { + + this.hasBeenHarvested = true; + EdibleEgg egg = new EdibleEgg(); + edible.eat(egg); + } + + +} diff --git a/src/main/java/Farm/Edible.java b/src/main/java/Farm/Edible.java new file mode 100644 index 00000000..55307b66 --- /dev/null +++ b/src/main/java/Farm/Edible.java @@ -0,0 +1,7 @@ +package Farm; + + +public interface Edible { + + void eat(EdibleEgg egg); +} \ No newline at end of file diff --git a/src/main/java/Farm/EdibleEgg.java b/src/main/java/Farm/EdibleEgg.java new file mode 100644 index 00000000..a3d562b3 --- /dev/null +++ b/src/main/java/Farm/EdibleEgg.java @@ -0,0 +1,14 @@ +package Farm; + +public class EdibleEgg implements Edible { + + + public EdibleEgg() { + + } + + @Override + public void eat(EdibleEgg egg) { + + } +} diff --git a/src/main/java/Farm/Produce.java b/src/main/java/Farm/Produce.java new file mode 100644 index 00000000..afdaf5fd --- /dev/null +++ b/src/main/java/Farm/Produce.java @@ -0,0 +1,9 @@ +package Farm; + + + +public interface Produce { + void yield(Edible edible); + + +} \ No newline at end of file diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/MainApplication.java b/src/main/java/com/zipcodewilmington/froilansfarm/MainApplication.java deleted file mode 100644 index fd743ffc..00000000 --- a/src/main/java/com/zipcodewilmington/froilansfarm/MainApplication.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.zipcodewilmington.froilansfarm; - -/** - * Created by leon on 2/26/18. - */ -public class MainApplication { - -} From 0ed25cf8c53d20b4dc8be17b6825f5b39cb4d688 Mon Sep 17 00:00:00 2001 From: mouad Date: Wed, 17 May 2023 01:15:36 -0400 Subject: [PATCH 05/20] classes done --- .../froilansfarm/Aircraft.java | 7 +++++++ .../froilansfarm/CropDuster.java | 8 ++++++++ .../froilansfarm/FarmVehicle.java | 20 +++++++++++++++++++ .../froilansfarm/Ridable.java | 9 +++++++++ .../froilansfarm/Tractor.java | 7 +++++++ .../froilansfarm/Vehicle.java | 14 +++++++++++++ 6 files changed, 65 insertions(+) create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Aircraft.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/CropDuster.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/FarmVehicle.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Ridable.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Tractor.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Vehicle.java diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Aircraft.java b/src/main/java/com/zipcodewilmington/froilansfarm/Aircraft.java new file mode 100644 index 00000000..492ff6d8 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Aircraft.java @@ -0,0 +1,7 @@ +package com.zipcodewilmington.froilansfarm; + +public class Aircraft implements Ridable{ + + public void fly(){}; + +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/CropDuster.java b/src/main/java/com/zipcodewilmington/froilansfarm/CropDuster.java new file mode 100644 index 00000000..bf401cc5 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/CropDuster.java @@ -0,0 +1,8 @@ +package com.zipcodewilmington.froilansfarm; + +public class CropDuster extends Aircraft{ + + public void fertilize(CropRow cropRow){} + + +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/FarmVehicle.java b/src/main/java/com/zipcodewilmington/froilansfarm/FarmVehicle.java new file mode 100644 index 00000000..c8d7838d --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/FarmVehicle.java @@ -0,0 +1,20 @@ +package com.zipcodewilmington.froilansfarm; + +public class FarmVehicle extends Vehicle { + + + + + + + + + + + + + + + + +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Ridable.java b/src/main/java/com/zipcodewilmington/froilansfarm/Ridable.java new file mode 100644 index 00000000..45c2bbb1 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Ridable.java @@ -0,0 +1,9 @@ +package com.zipcodewilmington.froilansfarm; + +public interface Ridable { + + + + + +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Tractor.java b/src/main/java/com/zipcodewilmington/froilansfarm/Tractor.java new file mode 100644 index 00000000..3d85cb7e --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Tractor.java @@ -0,0 +1,7 @@ +package com.zipcodewilmington.froilansfarm; + +public class Tractor extends FarmVehicle{ + + + public void harvest(Crop crop){} +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle.java b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle.java new file mode 100644 index 00000000..b55059de --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle.java @@ -0,0 +1,14 @@ +package com.zipcodewilmington.froilansfarm; + +public class Vehicle implements Ridable,NoiseMaker{ + + +@Override + public void makeNoise(){ + System.out.println("Vroom Vroom"); + +} + + + +} From aa247388fb06002609b5795cfed02c0ab0b39f67 Mon Sep 17 00:00:00 2001 From: mouad Date: Wed, 17 May 2023 18:57:18 -0400 Subject: [PATCH 06/20] done --- .../froilansfarm/CropRow.java | 46 +++++++++++++++++++ .../zipcodewilmington/froilansfarm/Field.java | 35 ++++++++++++++ 2 files changed, 81 insertions(+) create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/CropRow.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Field.java diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/CropRow.java b/src/main/java/com/zipcodewilmington/froilansfarm/CropRow.java new file mode 100644 index 00000000..fa4322ff --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/CropRow.java @@ -0,0 +1,46 @@ +package com.zipcodewilmington.froilansfarm; + +import java.util.Arrays; +import java.util.LinkedList; +import java.util.List; + +public class CropRow { + private final List row = new LinkedList(); + + public CropRow() {} + public CropRow(Crop crop) { + this.row.add(crop); + } + public CropRow(Crop[] crops) { + this.row.addAll(Arrays.asList(crops)); + } + public CropRow(List crops) { + this.row.addAll(crops); + } + + public List whichCrops() { + return this.row; + } + + public void store(Crop crop) { + this.row.add(crop); + } + public void store(Crop[] crops) { + this.row.addAll(Arrays.asList(crops)); + } + public void store(List crops) { + this.row.addAll(crops); + } + + public void fertilize() { + for (Crop crop : this.row) { + crop.fertilize(); + } + } + + + + + + +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Field.java b/src/main/java/com/zipcodewilmington/froilansfarm/Field.java new file mode 100644 index 00000000..fd26e142 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Field.java @@ -0,0 +1,35 @@ +package com.zipcodewilmington.froilansfarm; + +import java.util.Arrays; +import java.util.LinkedList; +import java.util.List; + +public class Field { + private final List cropRows = new LinkedList(); + + public Field() {} + public Field(CropRow croprow) { + this.cropRows.add(croprow); + } + public Field(CropRow[] cropRows) { + this.cropRows.addAll(Arrays.asList(cropRows)); + } + public Field(List cropRows) { + this.cropRows.addAll(cropRows); + } + + public List whichCropRows() { + return this.cropRows; + } + + public void store(CropRow cropRow) { + this.cropRows.add(cropRow); + } + public void store(CropRow[] cropRows) { + this.cropRows.addAll(Arrays.asList(cropRows)); + } + public void store(List cropRows) { + this.cropRows.addAll(cropRows); + } + +} From 2a0247846973d6056cdcba6e2bd559d85c4c1d00 Mon Sep 17 00:00:00 2001 From: Mohammed amine ztait Date: Thu, 18 May 2023 14:21:37 -0400 Subject: [PATCH 07/20] Mohammed amine is cool --- src/main/java/Farm/Crop.java | 8 ++++++++ src/main/java/Farm/EdibleEgg.java | 2 ++ 2 files changed, 10 insertions(+) diff --git a/src/main/java/Farm/Crop.java b/src/main/java/Farm/Crop.java index 6579ed50..f22bbe4a 100644 --- a/src/main/java/Farm/Crop.java +++ b/src/main/java/Farm/Crop.java @@ -11,6 +11,14 @@ public Crop() { this.hasBeenFertilized = false; } + + public void fertilize() { + this.hasBeenFertilized = true; + } + public void harvest() { + this.hasBeenHarvested = true; + } + @Override public void yield(Edible edible) { diff --git a/src/main/java/Farm/EdibleEgg.java b/src/main/java/Farm/EdibleEgg.java index a3d562b3..5c339b26 100644 --- a/src/main/java/Farm/EdibleEgg.java +++ b/src/main/java/Farm/EdibleEgg.java @@ -11,4 +11,6 @@ public EdibleEgg() { public void eat(EdibleEgg egg) { } + + } From 7f47c8829e921c3ca5ecbaa08a9633c653648a16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CDarius?= Date: Fri, 19 May 2023 13:13:34 -0400 Subject: [PATCH 08/20] saved --- .DS_Store | Bin 0 -> 6148 bytes .../froilansfarm/Botanist.java | 7 ++++++ .../froilansfarm/Chicken.java | 9 ++++++++ .../froilansfarm/ChickenCoop.java | 8 +++++++ .../zipcodewilmington/froilansfarm/Farm.java | 5 +++++ .../froilansfarm/FarmHouse.java | 8 +++++++ .../froilansfarm/Farmer.java | 20 ++++++++++++++++++ .../froilansfarm/NoiseMaker.java | 8 +++++++ .../froilansfarm/Person.java | 5 +++++ .../zipcodewilmington/froilansfarm/Rider.java | 11 ++++++++++ 10 files changed, 81 insertions(+) create mode 100644 .DS_Store create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Botanist.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Chicken.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/ChickenCoop.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Farm.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/FarmHouse.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Farmer.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/NoiseMaker.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Person.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Rider.java diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..81f867f0257ea0f8074a342d315fda6c2181635f GIT binary patch literal 6148 zcmeHK!A=`75FIC>*%d;{p_RBGt<)<@Q&Lf(UX~CJ9JsJmd!SXCWuvm{vW~JzQz?qH zXZRSddKjxQCDriJ!%Ta3U@u+xO4CBo7brTP>v>3Nqx2jUDt-Yvwb#LAK8lCHDH13Zl zMW;VH<=RKBvv^_m<4@^e+H1T#(D}HZ=7W(*NRt6VzI;yeL{B?0zuC#cc0>fOz fh~=wz6KVwhfDK^iu(SvdM1BMe4N?dL|CE8>%(`tQ literal 0 HcmV?d00001 diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Botanist.java b/src/main/java/com/zipcodewilmington/froilansfarm/Botanist.java new file mode 100644 index 00000000..4a488e9a --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Botanist.java @@ -0,0 +1,7 @@ +package com.zipcodewilmington.froilansfarm; + +public interface Botanist { + + //plant method + public void plant(CropRow, Crop); +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Chicken.java b/src/main/java/com/zipcodewilmington/froilansfarm/Chicken.java new file mode 100644 index 00000000..d7d9a189 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Chicken.java @@ -0,0 +1,9 @@ +package com.zipcodewilmington.froilansfarm; + +public class Chicken { + + public boolean hasBeenFertilized(){ + + return false; + } +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/ChickenCoop.java b/src/main/java/com/zipcodewilmington/froilansfarm/ChickenCoop.java new file mode 100644 index 00000000..a2d1258c --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/ChickenCoop.java @@ -0,0 +1,8 @@ +package com.zipcodewilmington.froilansfarm; + +import java.util.ArrayList; + +public abstract class ChickenCoop { + + ArrayList chickenList = new ArrayList(); +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Farm.java b/src/main/java/com/zipcodewilmington/froilansfarm/Farm.java new file mode 100644 index 00000000..1d21f721 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Farm.java @@ -0,0 +1,5 @@ +package com.zipcodewilmington.froilansfarm; + +public class Farm { + +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/FarmHouse.java b/src/main/java/com/zipcodewilmington/froilansfarm/FarmHouse.java new file mode 100644 index 00000000..a449a303 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/FarmHouse.java @@ -0,0 +1,8 @@ +package com.zipcodewilmington.froilansfarm; + +import java.util.ArrayList; + +public abstract class FarmHouse { + + ArrayList peopleList = new ArrayList(); +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Farmer.java b/src/main/java/com/zipcodewilmington/froilansfarm/Farmer.java new file mode 100644 index 00000000..866dd724 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Farmer.java @@ -0,0 +1,20 @@ +package com.zipcodewilmington.froilansfarm; + +public class Farmer extends Person implements Botanist, Rider, NoiseMaker{ + + public void plant() { + + } + + public void makeNoise() { + System.out.println(""); + } + + public void mount() { + + } + + public void disMount() { + + } +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/NoiseMaker.java b/src/main/java/com/zipcodewilmington/froilansfarm/NoiseMaker.java new file mode 100644 index 00000000..34ba416e --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/NoiseMaker.java @@ -0,0 +1,8 @@ +package com.zipcodewilmington.froilansfarm; + +public interface NoiseMaker { + + //makeNoise METHOD + public void makeNoise(); + +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Person.java b/src/main/java/com/zipcodewilmington/froilansfarm/Person.java new file mode 100644 index 00000000..87d04efc --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Person.java @@ -0,0 +1,5 @@ +package com.zipcodewilmington.froilansfarm; + +public abstract class Person{ + +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Rider.java b/src/main/java/com/zipcodewilmington/froilansfarm/Rider.java new file mode 100644 index 00000000..505125df --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Rider.java @@ -0,0 +1,11 @@ +package com.zipcodewilmington.froilansfarm; + +public interface Rider { + + //mount method + public void mount(); + + //DISMOUNT METHOD + public void disMount(); + +} From 8057a3b16c8d578e03aa6e95cfffbe8ae0e1e0c2 Mon Sep 17 00:00:00 2001 From: Luciaw1219 Date: Sat, 20 May 2023 12:43:45 -0400 Subject: [PATCH 09/20] organize files, resolve dependencies --- .gitignore | 6 +++- pom.xml | 12 -------- src/main/java/Farm/Edible.java | 7 ----- src/main/java/Farm/EdibleEgg.java | 16 ---------- src/main/java/Farm/Produce.java | 9 ------ .../froilansfarm/Animal.java | 5 ---- .../froilansfarm/Botanist.java | 7 ----- .../froilansfarm/Chicken.java | 9 ------ .../froilansfarm/ChickenCoop.java | 8 ----- .../zipcodewilmington/froilansfarm/Eater.java | 7 ----- .../froilansfarm/EdibleEgg.java | 7 +++++ .../froilansfarm/FarmHouse.java | 8 ----- .../froilansfarm/Farmer.java | 24 +++++++++++---- .../zipcodewilmington/froilansfarm/Horse.java | 9 ------ .../froilansfarm/MainApplication.java | 8 +++++ .../froilansfarm/NoiseMaker.java | 8 ----- .../froilansfarm/Person.java | 5 +++- .../zipcodewilmington/froilansfarm/Rider.java | 11 ------- .../froilansfarm/Stable.java | 9 ------ .../froilansfarm/animals/Animal.java | 8 +++++ .../froilansfarm/animals/Chicken.java | 30 +++++++++++++++++++ .../froilansfarm/animals/Horse.java | 17 +++++++++++ .../froilansfarm/buildings/ChickenCoop.java | 11 +++++++ .../froilansfarm/buildings/FarmHouse.java | 11 +++++++ .../froilansfarm/buildings/Stable.java | 11 +++++++ .../froilansfarm/days/EveryMorning.java | 4 +++ .../froilansfarm/days/Monday.java | 4 +++ .../froilansfarm/days/Tuesday.java | 4 +++ .../froilansfarm/interfaces/Botanist.java | 9 ++++++ .../froilansfarm/interfaces/Eater.java | 7 +++++ .../froilansfarm/interfaces/Edible.java | 5 ++++ .../froilansfarm/interfaces/NoiseMaker.java | 7 +++++ .../froilansfarm/interfaces/Produce.java | 7 +++++ .../froilansfarm/interfaces/Rider.java | 9 ++++++ .../froilansfarm/plants}/Crop.java | 16 +++------- 35 files changed, 190 insertions(+), 145 deletions(-) delete mode 100644 src/main/java/Farm/Edible.java delete mode 100644 src/main/java/Farm/EdibleEgg.java delete mode 100644 src/main/java/Farm/Produce.java delete mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Animal.java delete mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Botanist.java delete mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Chicken.java delete mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/ChickenCoop.java delete mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Eater.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/EdibleEgg.java delete mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/FarmHouse.java delete mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Horse.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/MainApplication.java delete mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/NoiseMaker.java delete mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Rider.java delete mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Stable.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/animals/Animal.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/animals/Chicken.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/animals/Horse.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/buildings/ChickenCoop.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/buildings/FarmHouse.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/buildings/Stable.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/days/EveryMorning.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/days/Monday.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/days/Tuesday.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/interfaces/Botanist.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/interfaces/Eater.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/interfaces/Edible.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/interfaces/NoiseMaker.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/interfaces/Produce.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/interfaces/Rider.java rename src/main/java/{Farm => com/zipcodewilmington/froilansfarm/plants}/Crop.java (64%) diff --git a/.gitignore b/.gitignore index 95abee5d..6929df67 100644 --- a/.gitignore +++ b/.gitignore @@ -103,4 +103,8 @@ target/* .project .classpath -.settings \ No newline at end of file +.settings + +# other +.idea +.DS_STORE \ No newline at end of file diff --git a/pom.xml b/pom.xml index 3c58f5d2..ab263c7f 100644 --- a/pom.xml +++ b/pom.xml @@ -7,18 +7,6 @@ com.zipcodewilmington froilans-farm 1.0-SNAPSHOT - - - - org.apache.maven.plugins - maven-compiler-plugin - - 6 - 6 - - - - 19 diff --git a/src/main/java/Farm/Edible.java b/src/main/java/Farm/Edible.java deleted file mode 100644 index 55307b66..00000000 --- a/src/main/java/Farm/Edible.java +++ /dev/null @@ -1,7 +0,0 @@ -package Farm; - - -public interface Edible { - - void eat(EdibleEgg egg); -} \ No newline at end of file diff --git a/src/main/java/Farm/EdibleEgg.java b/src/main/java/Farm/EdibleEgg.java deleted file mode 100644 index 5c339b26..00000000 --- a/src/main/java/Farm/EdibleEgg.java +++ /dev/null @@ -1,16 +0,0 @@ -package Farm; - -public class EdibleEgg implements Edible { - - - public EdibleEgg() { - - } - - @Override - public void eat(EdibleEgg egg) { - - } - - -} diff --git a/src/main/java/Farm/Produce.java b/src/main/java/Farm/Produce.java deleted file mode 100644 index afdaf5fd..00000000 --- a/src/main/java/Farm/Produce.java +++ /dev/null @@ -1,9 +0,0 @@ -package Farm; - - - -public interface Produce { - void yield(Edible edible); - - -} \ No newline at end of file diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Animal.java b/src/main/java/com/zipcodewilmington/froilansfarm/Animal.java deleted file mode 100644 index c510b7f4..00000000 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Animal.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.zipcodewilmington.froilansfarm; - -public abstract class Animal implements Eater { - -} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Botanist.java b/src/main/java/com/zipcodewilmington/froilansfarm/Botanist.java deleted file mode 100644 index 4a488e9a..00000000 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Botanist.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.zipcodewilmington.froilansfarm; - -public interface Botanist { - - //plant method - public void plant(CropRow, Crop); -} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Chicken.java b/src/main/java/com/zipcodewilmington/froilansfarm/Chicken.java deleted file mode 100644 index d7d9a189..00000000 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Chicken.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.zipcodewilmington.froilansfarm; - -public class Chicken { - - public boolean hasBeenFertilized(){ - - return false; - } -} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/ChickenCoop.java b/src/main/java/com/zipcodewilmington/froilansfarm/ChickenCoop.java deleted file mode 100644 index a2d1258c..00000000 --- a/src/main/java/com/zipcodewilmington/froilansfarm/ChickenCoop.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.zipcodewilmington.froilansfarm; - -import java.util.ArrayList; - -public abstract class ChickenCoop { - - ArrayList chickenList = new ArrayList(); -} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Eater.java b/src/main/java/com/zipcodewilmington/froilansfarm/Eater.java deleted file mode 100644 index 9f8cd2b7..00000000 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Eater.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.zipcodewilmington.froilansfarm; - -public interface Eater { - - void eat(/*Edible edible*/); - -} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/EdibleEgg.java b/src/main/java/com/zipcodewilmington/froilansfarm/EdibleEgg.java new file mode 100644 index 00000000..860c6073 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/EdibleEgg.java @@ -0,0 +1,7 @@ +package com.zipcodewilmington.froilansfarm; + +import com.zipcodewilmington.froilansfarm.interfaces.Edible; + +public class EdibleEgg implements Edible { + +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/FarmHouse.java b/src/main/java/com/zipcodewilmington/froilansfarm/FarmHouse.java deleted file mode 100644 index a449a303..00000000 --- a/src/main/java/com/zipcodewilmington/froilansfarm/FarmHouse.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.zipcodewilmington.froilansfarm; - -import java.util.ArrayList; - -public abstract class FarmHouse { - - ArrayList peopleList = new ArrayList(); -} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Farmer.java b/src/main/java/com/zipcodewilmington/froilansfarm/Farmer.java index 866dd724..09a4f09f 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Farmer.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Farmer.java @@ -1,20 +1,32 @@ package com.zipcodewilmington.froilansfarm; -public class Farmer extends Person implements Botanist, Rider, NoiseMaker{ +import com.zipcodewilmington.froilansfarm.interfaces.Botanist; +import com.zipcodewilmington.froilansfarm.interfaces.Edible; +import com.zipcodewilmington.froilansfarm.interfaces.Rider; +import com.zipcodewilmington.froilansfarm.plants.Crop; - public void plant() { +public class Farmer extends Person implements Botanist, Rider { + @Override + public void plant(/*CropRow cropRow, */Crop crop) { } + @Override public void makeNoise() { - System.out.println(""); + System.out.println("howdy"); } - public void mount() { - + @Override + public void mount(/*Rideable rideable*/) { } - public void disMount() { + @Override + public void dismount(/*Rideable rideable*/) { + } + @Override + public void eat(Edible edible) { + System.out.println("yum yum"); } + } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Horse.java b/src/main/java/com/zipcodewilmington/froilansfarm/Horse.java deleted file mode 100644 index 493235b2..00000000 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Horse.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.zipcodewilmington.froilansfarm; - -public class Horse extends Animal /*implements Rideable */{ - - public void eat(/*Edible edible*/) { - System.out.println("munch munch"); - } - -} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/MainApplication.java b/src/main/java/com/zipcodewilmington/froilansfarm/MainApplication.java new file mode 100644 index 00000000..fd743ffc --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/MainApplication.java @@ -0,0 +1,8 @@ +package com.zipcodewilmington.froilansfarm; + +/** + * Created by leon on 2/26/18. + */ +public class MainApplication { + +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/NoiseMaker.java b/src/main/java/com/zipcodewilmington/froilansfarm/NoiseMaker.java deleted file mode 100644 index 34ba416e..00000000 --- a/src/main/java/com/zipcodewilmington/froilansfarm/NoiseMaker.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.zipcodewilmington.froilansfarm; - -public interface NoiseMaker { - - //makeNoise METHOD - public void makeNoise(); - -} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Person.java b/src/main/java/com/zipcodewilmington/froilansfarm/Person.java index 87d04efc..18a79de6 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Person.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Person.java @@ -1,5 +1,8 @@ package com.zipcodewilmington.froilansfarm; -public abstract class Person{ +import com.zipcodewilmington.froilansfarm.interfaces.Eater; +import com.zipcodewilmington.froilansfarm.interfaces.NoiseMaker; + +public abstract class Person implements Eater, NoiseMaker { } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Rider.java b/src/main/java/com/zipcodewilmington/froilansfarm/Rider.java deleted file mode 100644 index 505125df..00000000 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Rider.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.zipcodewilmington.froilansfarm; - -public interface Rider { - - //mount method - public void mount(); - - //DISMOUNT METHOD - public void disMount(); - -} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Stable.java b/src/main/java/com/zipcodewilmington/froilansfarm/Stable.java deleted file mode 100644 index 7eba95ad..00000000 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Stable.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.zipcodewilmington.froilansfarm; - -import java.util.List; - -public class Stable { - - private List horses; - -} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/animals/Animal.java b/src/main/java/com/zipcodewilmington/froilansfarm/animals/Animal.java new file mode 100644 index 00000000..b8854a2d --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/animals/Animal.java @@ -0,0 +1,8 @@ +package com.zipcodewilmington.froilansfarm.animals; + +import com.zipcodewilmington.froilansfarm.interfaces.Eater; +import com.zipcodewilmington.froilansfarm.interfaces.NoiseMaker; + +public abstract class Animal implements Eater, NoiseMaker { + +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/animals/Chicken.java b/src/main/java/com/zipcodewilmington/froilansfarm/animals/Chicken.java new file mode 100644 index 00000000..cb5cf55b --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/animals/Chicken.java @@ -0,0 +1,30 @@ +package com.zipcodewilmington.froilansfarm.animals; + +import com.zipcodewilmington.froilansfarm.EdibleEgg; +import com.zipcodewilmington.froilansfarm.interfaces.Edible; +import com.zipcodewilmington.froilansfarm.interfaces.Produce; + +public class Chicken extends Animal implements Produce { + + public boolean hasBeenFertilized; + + @Override + public Edible yield() { + if(hasBeenFertilized) { + return new EdibleEgg(); + } else { + return null; + } + } + + @Override + public void eat(Edible edible) { + System.out.println("peck peck"); + } + + @Override + public void makeNoise() { + System.out.println("buck buck buckawk"); + } + +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/animals/Horse.java b/src/main/java/com/zipcodewilmington/froilansfarm/animals/Horse.java new file mode 100644 index 00000000..b34b24f3 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/animals/Horse.java @@ -0,0 +1,17 @@ +package com.zipcodewilmington.froilansfarm.animals; + +import com.zipcodewilmington.froilansfarm.interfaces.Edible; + +public class Horse extends Animal /*implements Rideable */{ + + @Override + public void eat(Edible edible) { + System.out.println("munch munch"); + } + + @Override + public void makeNoise() { + System.out.println("neigh"); + } + +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/buildings/ChickenCoop.java b/src/main/java/com/zipcodewilmington/froilansfarm/buildings/ChickenCoop.java new file mode 100644 index 00000000..c3c9688b --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/buildings/ChickenCoop.java @@ -0,0 +1,11 @@ +package com.zipcodewilmington.froilansfarm.buildings; + +import com.zipcodewilmington.froilansfarm.animals.Chicken; + +import java.util.ArrayList; + +public class ChickenCoop { + + ArrayList chickenList = new ArrayList<>(); + +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/buildings/FarmHouse.java b/src/main/java/com/zipcodewilmington/froilansfarm/buildings/FarmHouse.java new file mode 100644 index 00000000..f9e44c93 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/buildings/FarmHouse.java @@ -0,0 +1,11 @@ +package com.zipcodewilmington.froilansfarm.buildings; + +import com.zipcodewilmington.froilansfarm.Person; + +import java.util.ArrayList; + +public class FarmHouse { + + ArrayList peopleList = new ArrayList<>(); + +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/buildings/Stable.java b/src/main/java/com/zipcodewilmington/froilansfarm/buildings/Stable.java new file mode 100644 index 00000000..a95ce583 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/buildings/Stable.java @@ -0,0 +1,11 @@ +package com.zipcodewilmington.froilansfarm.buildings; + +import com.zipcodewilmington.froilansfarm.animals.Horse; + +import java.util.List; + +public class Stable { + + private List horses; + +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/days/EveryMorning.java b/src/main/java/com/zipcodewilmington/froilansfarm/days/EveryMorning.java new file mode 100644 index 00000000..8715f4a9 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/days/EveryMorning.java @@ -0,0 +1,4 @@ +package com.zipcodewilmington.froilansfarm.days; + +public class EveryMorning { +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/days/Monday.java b/src/main/java/com/zipcodewilmington/froilansfarm/days/Monday.java new file mode 100644 index 00000000..b896cc06 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/days/Monday.java @@ -0,0 +1,4 @@ +package com.zipcodewilmington.froilansfarm.days; + +public class Monday { +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/days/Tuesday.java b/src/main/java/com/zipcodewilmington/froilansfarm/days/Tuesday.java new file mode 100644 index 00000000..81ca2046 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/days/Tuesday.java @@ -0,0 +1,4 @@ +package com.zipcodewilmington.froilansfarm.days; + +public class Tuesday { +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/interfaces/Botanist.java b/src/main/java/com/zipcodewilmington/froilansfarm/interfaces/Botanist.java new file mode 100644 index 00000000..e7748f69 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/interfaces/Botanist.java @@ -0,0 +1,9 @@ +package com.zipcodewilmington.froilansfarm.interfaces; + +import com.zipcodewilmington.froilansfarm.plants.Crop; + +public interface Botanist { + + void plant(/*CropRow cropRow, */Crop crop); + +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/interfaces/Eater.java b/src/main/java/com/zipcodewilmington/froilansfarm/interfaces/Eater.java new file mode 100644 index 00000000..a88ed895 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/interfaces/Eater.java @@ -0,0 +1,7 @@ +package com.zipcodewilmington.froilansfarm.interfaces; + +public interface Eater { + + void eat(Edible edible); + +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/interfaces/Edible.java b/src/main/java/com/zipcodewilmington/froilansfarm/interfaces/Edible.java new file mode 100644 index 00000000..96c36393 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/interfaces/Edible.java @@ -0,0 +1,5 @@ +package com.zipcodewilmington.froilansfarm.interfaces; + +public interface Edible { + +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/interfaces/NoiseMaker.java b/src/main/java/com/zipcodewilmington/froilansfarm/interfaces/NoiseMaker.java new file mode 100644 index 00000000..0b174ee9 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/interfaces/NoiseMaker.java @@ -0,0 +1,7 @@ +package com.zipcodewilmington.froilansfarm.interfaces; + +public interface NoiseMaker { + + void makeNoise(); + +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/interfaces/Produce.java b/src/main/java/com/zipcodewilmington/froilansfarm/interfaces/Produce.java new file mode 100644 index 00000000..479da3be --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/interfaces/Produce.java @@ -0,0 +1,7 @@ +package com.zipcodewilmington.froilansfarm.interfaces; + +public interface Produce { + + Edible yield(); + +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/interfaces/Rider.java b/src/main/java/com/zipcodewilmington/froilansfarm/interfaces/Rider.java new file mode 100644 index 00000000..06cf4770 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/interfaces/Rider.java @@ -0,0 +1,9 @@ +package com.zipcodewilmington.froilansfarm.interfaces; + +public interface Rider { + + void mount(/*Rideable rideable*/); + + void dismount(/*Rideable rideable*/); + +} diff --git a/src/main/java/Farm/Crop.java b/src/main/java/com/zipcodewilmington/froilansfarm/plants/Crop.java similarity index 64% rename from src/main/java/Farm/Crop.java rename to src/main/java/com/zipcodewilmington/froilansfarm/plants/Crop.java index f22bbe4a..e591ce17 100644 --- a/src/main/java/Farm/Crop.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/plants/Crop.java @@ -1,8 +1,9 @@ -package Farm; +package com.zipcodewilmington.froilansfarm.plants; -import java.lang.reflect.Type; +import com.zipcodewilmington.froilansfarm.interfaces.Produce; public abstract class Crop implements Produce { + private boolean hasBeenHarvested; private boolean hasBeenFertilized; @@ -11,21 +12,12 @@ public Crop() { this.hasBeenFertilized = false; } - public void fertilize() { this.hasBeenFertilized = true; } - public void harvest() { - this.hasBeenHarvested = true; - } - - @Override - public void yield(Edible edible) { + public void harvest() { this.hasBeenHarvested = true; - EdibleEgg egg = new EdibleEgg(); - edible.eat(egg); } - } From 18a3c79afb37b8ad2ec0d4ab80f617054a1ebecb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CDarius?= Date: Sat, 20 May 2023 19:23:35 -0400 Subject: [PATCH 10/20] save --- src/main/java/Farm/Crop.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/Farm/Crop.java b/src/main/java/Farm/Crop.java index f22bbe4a..e4e5c9a3 100644 --- a/src/main/java/Farm/Crop.java +++ b/src/main/java/Farm/Crop.java @@ -27,5 +27,4 @@ public void yield(Edible edible) { edible.eat(egg); } - } From dcde73b8e6100aff95bfaad3329a461d06b1d413 Mon Sep 17 00:00:00 2001 From: Luciaw1219 Date: Sat, 20 May 2023 20:04:37 -0400 Subject: [PATCH 11/20] remove ds store, move vehicles into vehicles pacage, add test classes for every object, implement rideable on horse --- .DS_Store | Bin 6148 -> 0 bytes .../froilansfarm/Aircraft.java | 7 --- .../froilansfarm/CropDuster.java | 8 ---- .../froilansfarm/FarmVehicle.java | 20 --------- .../froilansfarm/Farmer.java | 10 ++++- .../froilansfarm/MainApplication.java | 4 +- .../froilansfarm/Person.java | 6 +++ .../froilansfarm/Ridable.java | 9 ---- .../froilansfarm/Tractor.java | 7 --- .../froilansfarm/Vehicle.java | 14 ------ .../froilansfarm/animals/Horse.java | 3 +- .../froilansfarm/days/EveryMorning.java | 3 ++ .../froilansfarm/days/Monday.java | 3 ++ .../froilansfarm/days/Tuesday.java | 19 ++++++++ .../froilansfarm/interfaces/Botanist.java | 1 + .../froilansfarm/interfaces/Rideable.java | 5 +++ .../froilansfarm/interfaces/Rider.java | 4 +- .../froilansfarm/vehicles/Aircraft.java | 9 ++++ .../froilansfarm/vehicles/CropDuster.java | 8 ++++ .../froilansfarm/vehicles/FarmVehicle.java | 4 ++ .../froilansfarm/vehicles/Tractor.java | 11 +++++ .../froilansfarm/vehicles/Vehicle.java | 13 ++++++ .../froilansfarm/EdibleEggTest.java | 7 +++ .../froilansfarm/FarmTest.java | 7 +++ .../froilansfarm/FarmerTest.java | 32 ++++++++++++++ .../froilansfarm/animals/AnimalTest.java | 7 +++ .../froilansfarm/animals/HorseTest.java | 34 +++++++++++++++ .../buildings/ChickenCoopTest.java | 7 +++ .../froilansfarm/buildings/FarmHouseTest.java | 7 +++ .../froilansfarm/buildings/StableTest.java | 7 +++ .../froilansfarm/days/EveryMorningTest.java | 12 +++++ .../froilansfarm/days/MondayTest.java | 12 +++++ .../froilansfarm/days/TuesdayTest.java | 41 ++++++++++++++++++ .../froilansfarm/vehicles/AircraftTest.java | 12 +++++ .../froilansfarm/vehicles/CropDusterTest.java | 12 +++++ .../vehicles/FarmVehicleTest.java | 7 +++ .../froilansfarm/vehicles/TractorTest.java | 12 +++++ .../froilansfarm/vehicles/VehicleTest.java | 12 +++++ 38 files changed, 325 insertions(+), 71 deletions(-) delete mode 100644 .DS_Store delete mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Aircraft.java delete mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/CropDuster.java delete mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/FarmVehicle.java delete mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Ridable.java delete mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Tractor.java delete mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Vehicle.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/interfaces/Rideable.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/vehicles/Aircraft.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/vehicles/CropDuster.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/vehicles/FarmVehicle.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/vehicles/Tractor.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/vehicles/Vehicle.java create mode 100644 src/test/java/com/zipcodewilmington/froilansfarm/EdibleEggTest.java create mode 100644 src/test/java/com/zipcodewilmington/froilansfarm/FarmTest.java create mode 100644 src/test/java/com/zipcodewilmington/froilansfarm/FarmerTest.java create mode 100644 src/test/java/com/zipcodewilmington/froilansfarm/animals/AnimalTest.java create mode 100644 src/test/java/com/zipcodewilmington/froilansfarm/animals/HorseTest.java create mode 100644 src/test/java/com/zipcodewilmington/froilansfarm/buildings/ChickenCoopTest.java create mode 100644 src/test/java/com/zipcodewilmington/froilansfarm/buildings/FarmHouseTest.java create mode 100644 src/test/java/com/zipcodewilmington/froilansfarm/buildings/StableTest.java create mode 100644 src/test/java/com/zipcodewilmington/froilansfarm/days/EveryMorningTest.java create mode 100644 src/test/java/com/zipcodewilmington/froilansfarm/days/MondayTest.java create mode 100644 src/test/java/com/zipcodewilmington/froilansfarm/days/TuesdayTest.java create mode 100644 src/test/java/com/zipcodewilmington/froilansfarm/vehicles/AircraftTest.java create mode 100644 src/test/java/com/zipcodewilmington/froilansfarm/vehicles/CropDusterTest.java create mode 100644 src/test/java/com/zipcodewilmington/froilansfarm/vehicles/FarmVehicleTest.java create mode 100644 src/test/java/com/zipcodewilmington/froilansfarm/vehicles/TractorTest.java create mode 100644 src/test/java/com/zipcodewilmington/froilansfarm/vehicles/VehicleTest.java diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index 81f867f0257ea0f8074a342d315fda6c2181635f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHK!A=`75FIC>*%d;{p_RBGt<)<@Q&Lf(UX~CJ9JsJmd!SXCWuvm{vW~JzQz?qH zXZRSddKjxQCDriJ!%Ta3U@u+xO4CBo7brTP>v>3Nqx2jUDt-Yvwb#LAK8lCHDH13Zl zMW;VH<=RKBvv^_m<4@^e+H1T#(D}HZ=7W(*NRt6VzI;yeL{B?0zuC#cc0>fOz fh~=wz6KVwhfDK^iu(SvdM1BMe4N?dL|CE8>%(`tQ diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Aircraft.java b/src/main/java/com/zipcodewilmington/froilansfarm/Aircraft.java deleted file mode 100644 index 492ff6d8..00000000 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Aircraft.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.zipcodewilmington.froilansfarm; - -public class Aircraft implements Ridable{ - - public void fly(){}; - -} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/CropDuster.java b/src/main/java/com/zipcodewilmington/froilansfarm/CropDuster.java deleted file mode 100644 index bf401cc5..00000000 --- a/src/main/java/com/zipcodewilmington/froilansfarm/CropDuster.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.zipcodewilmington.froilansfarm; - -public class CropDuster extends Aircraft{ - - public void fertilize(CropRow cropRow){} - - -} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/FarmVehicle.java b/src/main/java/com/zipcodewilmington/froilansfarm/FarmVehicle.java deleted file mode 100644 index c8d7838d..00000000 --- a/src/main/java/com/zipcodewilmington/froilansfarm/FarmVehicle.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.zipcodewilmington.froilansfarm; - -public class FarmVehicle extends Vehicle { - - - - - - - - - - - - - - - - -} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Farmer.java b/src/main/java/com/zipcodewilmington/froilansfarm/Farmer.java index 09a4f09f..86835f8d 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Farmer.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Farmer.java @@ -2,11 +2,17 @@ import com.zipcodewilmington.froilansfarm.interfaces.Botanist; import com.zipcodewilmington.froilansfarm.interfaces.Edible; +import com.zipcodewilmington.froilansfarm.interfaces.Rideable; import com.zipcodewilmington.froilansfarm.interfaces.Rider; import com.zipcodewilmington.froilansfarm.plants.Crop; public class Farmer extends Person implements Botanist, Rider { + public Farmer(String name) { + super(name); + } + + //TODO @Override public void plant(/*CropRow cropRow, */Crop crop) { } @@ -17,11 +23,11 @@ public void makeNoise() { } @Override - public void mount(/*Rideable rideable*/) { + public void mount(Rideable rideable) { } @Override - public void dismount(/*Rideable rideable*/) { + public void dismount(Rideable rideable) { } @Override diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/MainApplication.java b/src/main/java/com/zipcodewilmington/froilansfarm/MainApplication.java index fd743ffc..27c35334 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/MainApplication.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/MainApplication.java @@ -4,5 +4,7 @@ * Created by leon on 2/26/18. */ public class MainApplication { - + public static void main(String[] args) { + //TODO + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Person.java b/src/main/java/com/zipcodewilmington/froilansfarm/Person.java index 18a79de6..2f823ebb 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Person.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Person.java @@ -5,4 +5,10 @@ public abstract class Person implements Eater, NoiseMaker { + public String name; + + public Person(String name) { + this.name = name; + } + } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Ridable.java b/src/main/java/com/zipcodewilmington/froilansfarm/Ridable.java deleted file mode 100644 index 45c2bbb1..00000000 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Ridable.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.zipcodewilmington.froilansfarm; - -public interface Ridable { - - - - - -} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Tractor.java b/src/main/java/com/zipcodewilmington/froilansfarm/Tractor.java deleted file mode 100644 index 3d85cb7e..00000000 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Tractor.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.zipcodewilmington.froilansfarm; - -public class Tractor extends FarmVehicle{ - - - public void harvest(Crop crop){} -} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle.java b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle.java deleted file mode 100644 index b55059de..00000000 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.zipcodewilmington.froilansfarm; - -public class Vehicle implements Ridable,NoiseMaker{ - - -@Override - public void makeNoise(){ - System.out.println("Vroom Vroom"); - -} - - - -} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/animals/Horse.java b/src/main/java/com/zipcodewilmington/froilansfarm/animals/Horse.java index b34b24f3..7c0add9c 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/animals/Horse.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/animals/Horse.java @@ -1,8 +1,9 @@ package com.zipcodewilmington.froilansfarm.animals; import com.zipcodewilmington.froilansfarm.interfaces.Edible; +import com.zipcodewilmington.froilansfarm.interfaces.Rideable; -public class Horse extends Animal /*implements Rideable */{ +public class Horse extends Animal implements Rideable { @Override public void eat(Edible edible) { diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/days/EveryMorning.java b/src/main/java/com/zipcodewilmington/froilansfarm/days/EveryMorning.java index 8715f4a9..47db8dd0 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/days/EveryMorning.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/days/EveryMorning.java @@ -1,4 +1,7 @@ package com.zipcodewilmington.froilansfarm.days; public class EveryMorning { + public static void everyMorning() { + //TODO + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/days/Monday.java b/src/main/java/com/zipcodewilmington/froilansfarm/days/Monday.java index b896cc06..2b85f1da 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/days/Monday.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/days/Monday.java @@ -1,4 +1,7 @@ package com.zipcodewilmington.froilansfarm.days; public class Monday { + public static void monday() { + //TODO + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/days/Tuesday.java b/src/main/java/com/zipcodewilmington/froilansfarm/days/Tuesday.java index 81ca2046..dc6d9f8d 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/days/Tuesday.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/days/Tuesday.java @@ -1,4 +1,23 @@ package com.zipcodewilmington.froilansfarm.days; +import com.zipcodewilmington.froilansfarm.Farm; +import com.zipcodewilmington.froilansfarm.Farmer; +import com.zipcodewilmington.froilansfarm.plants.Crop; +import com.zipcodewilmington.froilansfarm.vehicles.Tractor; + +import static com.zipcodewilmington.froilansfarm.days.EveryMorning.everyMorning; + public class Tuesday { + public static void tuesday(Farmer farmer, Tractor tractor, Farm farm) { + everyMorning(); + farmer.mount(tractor); + //TODO + /*tractor.operate(farm); + for(CropRow row : farm.getField().getArea()) { + for(Crop crop : row.getRow()) { + tractor.makeNoise(); + crop.harvest(); + } + }*/ + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/interfaces/Botanist.java b/src/main/java/com/zipcodewilmington/froilansfarm/interfaces/Botanist.java index e7748f69..22979f1b 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/interfaces/Botanist.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/interfaces/Botanist.java @@ -4,6 +4,7 @@ public interface Botanist { + //TODO void plant(/*CropRow cropRow, */Crop crop); } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/interfaces/Rideable.java b/src/main/java/com/zipcodewilmington/froilansfarm/interfaces/Rideable.java new file mode 100644 index 00000000..e0428efd --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/interfaces/Rideable.java @@ -0,0 +1,5 @@ +package com.zipcodewilmington.froilansfarm.interfaces; + +public interface Rideable { + +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/interfaces/Rider.java b/src/main/java/com/zipcodewilmington/froilansfarm/interfaces/Rider.java index 06cf4770..fc6f6588 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/interfaces/Rider.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/interfaces/Rider.java @@ -2,8 +2,8 @@ public interface Rider { - void mount(/*Rideable rideable*/); + void mount(Rideable rideable); - void dismount(/*Rideable rideable*/); + void dismount(Rideable rideable); } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/vehicles/Aircraft.java b/src/main/java/com/zipcodewilmington/froilansfarm/vehicles/Aircraft.java new file mode 100644 index 00000000..cf1e13af --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/vehicles/Aircraft.java @@ -0,0 +1,9 @@ +package com.zipcodewilmington.froilansfarm.vehicles; + +import com.zipcodewilmington.froilansfarm.interfaces.Rideable; + +public class Aircraft implements Rideable { + + public void fly() {} + +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/vehicles/CropDuster.java b/src/main/java/com/zipcodewilmington/froilansfarm/vehicles/CropDuster.java new file mode 100644 index 00000000..2edc4be2 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/vehicles/CropDuster.java @@ -0,0 +1,8 @@ +package com.zipcodewilmington.froilansfarm.vehicles; + +public class CropDuster extends Aircraft { + + //TODO + public void fertilize(/*CropRow cropRow*/) {} + +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/vehicles/FarmVehicle.java b/src/main/java/com/zipcodewilmington/froilansfarm/vehicles/FarmVehicle.java new file mode 100644 index 00000000..c7951f8b --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/vehicles/FarmVehicle.java @@ -0,0 +1,4 @@ +package com.zipcodewilmington.froilansfarm.vehicles; + +public class FarmVehicle extends Vehicle { +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/vehicles/Tractor.java b/src/main/java/com/zipcodewilmington/froilansfarm/vehicles/Tractor.java new file mode 100644 index 00000000..5d43ed53 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/vehicles/Tractor.java @@ -0,0 +1,11 @@ +package com.zipcodewilmington.froilansfarm.vehicles; + +import com.zipcodewilmington.froilansfarm.plants.Crop; + +public class Tractor extends FarmVehicle { + + public void harvest(Crop crop) { + crop.harvest(); + } + +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/vehicles/Vehicle.java b/src/main/java/com/zipcodewilmington/froilansfarm/vehicles/Vehicle.java new file mode 100644 index 00000000..56ae2b01 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/vehicles/Vehicle.java @@ -0,0 +1,13 @@ +package com.zipcodewilmington.froilansfarm.vehicles; + +import com.zipcodewilmington.froilansfarm.interfaces.NoiseMaker; +import com.zipcodewilmington.froilansfarm.interfaces.Rideable; + +public class Vehicle implements Rideable, NoiseMaker { + + @Override + public void makeNoise(){ + System.out.println("Vroom Vroom"); + } + +} diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/EdibleEggTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/EdibleEggTest.java new file mode 100644 index 00000000..000b3e17 --- /dev/null +++ b/src/test/java/com/zipcodewilmington/froilansfarm/EdibleEggTest.java @@ -0,0 +1,7 @@ +package com.zipcodewilmington.froilansfarm; + +import org.junit.jupiter.api.Test; + +class EdibleEggTest { + +} diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/FarmTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/FarmTest.java new file mode 100644 index 00000000..2dcc5708 --- /dev/null +++ b/src/test/java/com/zipcodewilmington/froilansfarm/FarmTest.java @@ -0,0 +1,7 @@ +package com.zipcodewilmington.froilansfarm; + +import org.junit.jupiter.api.Test; + +class FarmTest { + +} diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/FarmerTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/FarmerTest.java new file mode 100644 index 00000000..51a76da8 --- /dev/null +++ b/src/test/java/com/zipcodewilmington/froilansfarm/FarmerTest.java @@ -0,0 +1,32 @@ +package com.zipcodewilmington.froilansfarm; + +import org.junit.jupiter.api.Test; + +class FarmerTest { + + @Test + void plant() { + //TODO + } + + @Test + void makeNoise() { + //TODO + } + + @Test + void mount() { + //TODO + } + + @Test + void dismount() { + //TODO + } + + @Test + void eat() { + //TODO + } + +} diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/animals/AnimalTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/animals/AnimalTest.java new file mode 100644 index 00000000..8577486b --- /dev/null +++ b/src/test/java/com/zipcodewilmington/froilansfarm/animals/AnimalTest.java @@ -0,0 +1,7 @@ +package com.zipcodewilmington.froilansfarm.animals; + +import org.junit.jupiter.api.Test; + +class AnimalTest { + +} diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/animals/HorseTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/animals/HorseTest.java new file mode 100644 index 00000000..8424f66d --- /dev/null +++ b/src/test/java/com/zipcodewilmington/froilansfarm/animals/HorseTest.java @@ -0,0 +1,34 @@ +package com.zipcodewilmington.froilansfarm.animals; + +import com.zipcodewilmington.froilansfarm.EdibleEgg; +import org.junit.jupiter.api.Test; + +class HorseTest { + + @Test + void eat() { + //TODO + // GIVEN + Horse horse = new Horse(); + + // WHEN + horse.eat(new EdibleEgg()); + + // THEN + // ???? + } + + @Test + void makeNoise() { + //TODO + // GIVEN + Horse horse = new Horse(); + + // WHEN + horse.makeNoise(); + + // THEN + // ???? + } + +} diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/buildings/ChickenCoopTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/buildings/ChickenCoopTest.java new file mode 100644 index 00000000..cf323b83 --- /dev/null +++ b/src/test/java/com/zipcodewilmington/froilansfarm/buildings/ChickenCoopTest.java @@ -0,0 +1,7 @@ +package com.zipcodewilmington.froilansfarm.buildings; + +import org.junit.jupiter.api.Test; + +class ChickenCoopTest { + +} diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/buildings/FarmHouseTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/buildings/FarmHouseTest.java new file mode 100644 index 00000000..fbaaaab6 --- /dev/null +++ b/src/test/java/com/zipcodewilmington/froilansfarm/buildings/FarmHouseTest.java @@ -0,0 +1,7 @@ +package com.zipcodewilmington.froilansfarm.buildings; + +import org.junit.jupiter.api.Test; + +class FarmHouseTest { + +} \ No newline at end of file diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/buildings/StableTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/buildings/StableTest.java new file mode 100644 index 00000000..7001a6f6 --- /dev/null +++ b/src/test/java/com/zipcodewilmington/froilansfarm/buildings/StableTest.java @@ -0,0 +1,7 @@ +package com.zipcodewilmington.froilansfarm.buildings; + +import org.junit.jupiter.api.Test; + +class StableTest { + +} diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/days/EveryMorningTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/days/EveryMorningTest.java new file mode 100644 index 00000000..d48c0745 --- /dev/null +++ b/src/test/java/com/zipcodewilmington/froilansfarm/days/EveryMorningTest.java @@ -0,0 +1,12 @@ +package com.zipcodewilmington.froilansfarm.days; + +import org.junit.jupiter.api.Test; + +class EveryMorningTest { + + @Test + void everyMorning() { + //TODO + } + +} diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/days/MondayTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/days/MondayTest.java new file mode 100644 index 00000000..755f797d --- /dev/null +++ b/src/test/java/com/zipcodewilmington/froilansfarm/days/MondayTest.java @@ -0,0 +1,12 @@ +package com.zipcodewilmington.froilansfarm.days; + +import org.junit.jupiter.api.Test; + +class MondayTest { + + @Test + void mondayTest() { + //TODO + } + +} diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/days/TuesdayTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/days/TuesdayTest.java new file mode 100644 index 00000000..15cab073 --- /dev/null +++ b/src/test/java/com/zipcodewilmington/froilansfarm/days/TuesdayTest.java @@ -0,0 +1,41 @@ +package com.zipcodewilmington.froilansfarm.days; + +import com.zipcodewilmington.froilansfarm.Farm; +import com.zipcodewilmington.froilansfarm.Farmer; +import com.zipcodewilmington.froilansfarm.plants.Crop; +import com.zipcodewilmington.froilansfarm.vehicles.Tractor; +import org.junit.jupiter.api.Test; + +import java.util.Arrays; + +import static com.zipcodewilmington.froilansfarm.days.Tuesday.tuesday; +import static org.junit.jupiter.api.Assertions.assertTrue; + +class TuesdayTest { + + @Test + void tuesdayTest() { + //GIVEN + Farmer farmer = new Farmer("Froilan"); + Tractor tractor = new Tractor(); + /*Crop corn1 = new Cornstalk(); + Crop corn2 = new Cornstalk(); + Crop corn3 = new Cornstalk(); + Crop corn4 = new Cornstalk(); + CropRow cropRow1 = new CropRow(Arrays.asList(corn1, corn2)); + CropRow cropRow2 = new CropRow(Arrays.asList(corn3, corn4)); + Field field = new Field(Arrays.asList(cropRow1, cropRow2)); + Farm farm = new Farm(field, null, null, null);*/ + Farm farm = new Farm(); + + //WHEN + tuesday(farmer, tractor, farm); + + //THEN + /*assertTrue(corn1.isHarvested()); + assertTrue(corn2.isHarvested()); + assertTrue(corn3.isHarvested()); + assertTrue(corn4.isHarvested());*/ + } + +} diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/vehicles/AircraftTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/vehicles/AircraftTest.java new file mode 100644 index 00000000..217ac499 --- /dev/null +++ b/src/test/java/com/zipcodewilmington/froilansfarm/vehicles/AircraftTest.java @@ -0,0 +1,12 @@ +package com.zipcodewilmington.froilansfarm.vehicles; + +import org.junit.jupiter.api.Test; + +class AircraftTest { + + @Test + void fly() { + //TODO + } + +} diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/vehicles/CropDusterTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/vehicles/CropDusterTest.java new file mode 100644 index 00000000..923470aa --- /dev/null +++ b/src/test/java/com/zipcodewilmington/froilansfarm/vehicles/CropDusterTest.java @@ -0,0 +1,12 @@ +package com.zipcodewilmington.froilansfarm.vehicles; + +import org.junit.jupiter.api.Test; + +class CropDusterTest { + + @Test + void fertilize() { + //TODO + } + +} diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/vehicles/FarmVehicleTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/vehicles/FarmVehicleTest.java new file mode 100644 index 00000000..fe4e1b6a --- /dev/null +++ b/src/test/java/com/zipcodewilmington/froilansfarm/vehicles/FarmVehicleTest.java @@ -0,0 +1,7 @@ +package com.zipcodewilmington.froilansfarm.vehicles; + +import org.junit.jupiter.api.Test; + +class FarmVehicleTest { + +} diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/vehicles/TractorTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/vehicles/TractorTest.java new file mode 100644 index 00000000..da267c39 --- /dev/null +++ b/src/test/java/com/zipcodewilmington/froilansfarm/vehicles/TractorTest.java @@ -0,0 +1,12 @@ +package com.zipcodewilmington.froilansfarm.vehicles; + +import org.junit.jupiter.api.Test; + +class TractorTest { + + @Test + void harvest() { + //TODO + } + +} diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/vehicles/VehicleTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/vehicles/VehicleTest.java new file mode 100644 index 00000000..fca85595 --- /dev/null +++ b/src/test/java/com/zipcodewilmington/froilansfarm/vehicles/VehicleTest.java @@ -0,0 +1,12 @@ +package com.zipcodewilmington.froilansfarm.vehicles; + +import org.junit.jupiter.api.Test; + +class VehicleTest { + + @Test + void makeNoise() { + //TODO + } + +} From fb409fec610347bcd5f445d92eb56bd8b3279b3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CDarius?= Date: Sun, 21 May 2023 11:55:54 -0400 Subject: [PATCH 12/20] saved2 --- .../java/com/zipcodewilmington/froilansfarm/plants/Crop.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/plants/Crop.java b/src/main/java/com/zipcodewilmington/froilansfarm/plants/Crop.java index b5a12b47..b209cdfc 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/plants/Crop.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/plants/Crop.java @@ -20,7 +20,6 @@ public void harvest() { this.hasBeenHarvested = true; } -<<<<<<< HEAD:src/main/java/Farm/Crop.java @Override public void yield(Edible edible) { @@ -28,7 +27,4 @@ public void yield(Edible edible) { EdibleEgg egg = new EdibleEgg(); edible.eat(egg); } - -======= ->>>>>>> 89fef60c05d52d32c7b0308f0d45a4a6d9f1d060:src/main/java/com/zipcodewilmington/froilansfarm/plants/Crop.java } From 52cab5bd058a0da85d5dc9afe6ed98c62ca7171c Mon Sep 17 00:00:00 2001 From: Luciaw1219 Date: Sun, 21 May 2023 12:02:30 -0400 Subject: [PATCH 13/20] add import of crop to croprow, fix stable array, remove yeild method from crop as it should be implemented by subclasses --- .../java/com/zipcodewilmington/froilansfarm/CropRow.java | 2 ++ .../zipcodewilmington/froilansfarm/buildings/Stable.java | 4 +++- .../com/zipcodewilmington/froilansfarm/plants/Crop.java | 7 ------- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/CropRow.java b/src/main/java/com/zipcodewilmington/froilansfarm/CropRow.java index fa4322ff..9479f8b9 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/CropRow.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/CropRow.java @@ -1,5 +1,7 @@ package com.zipcodewilmington.froilansfarm; +import com.zipcodewilmington.froilansfarm.plants.Crop; + import java.util.Arrays; import java.util.LinkedList; import java.util.List; diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/buildings/Stable.java b/src/main/java/com/zipcodewilmington/froilansfarm/buildings/Stable.java index 79b481a3..33d706e4 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/buildings/Stable.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/buildings/Stable.java @@ -2,10 +2,12 @@ import com.zipcodewilmington.froilansfarm.animals.Horse; +import java.util.ArrayList; import java.util.List; public class Stable { - private List horses; + + private List horses = new ArrayList<>(); //additional add horse method public void addHorse(Horse horse) { diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/plants/Crop.java b/src/main/java/com/zipcodewilmington/froilansfarm/plants/Crop.java index b209cdfc..e591ce17 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/plants/Crop.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/plants/Crop.java @@ -20,11 +20,4 @@ public void harvest() { this.hasBeenHarvested = true; } - @Override - public void yield(Edible edible) { - - this.hasBeenHarvested = true; - EdibleEgg egg = new EdibleEgg(); - edible.eat(egg); - } } From de1839082e7381fb9131b93d31f9fe9ab5302597 Mon Sep 17 00:00:00 2001 From: Luciaw1219 Date: Sun, 21 May 2023 14:50:51 -0400 Subject: [PATCH 14/20] create plants and food packages --- .../froilansfarm/CropRow.java | 15 +++++---- .../zipcodewilmington/froilansfarm/Farm.java | 21 ++++++++++++ .../zipcodewilmington/froilansfarm/Field.java | 10 ++++-- .../froilansfarm/animals/Chicken.java | 2 +- .../froilansfarm/buildings/Stable.java | 1 - .../froilansfarm/days/Tuesday.java | 21 ++++++++---- .../froilansfarm/food/Corn.java | 6 ++++ .../froilansfarm/{ => food}/EdibleEgg.java | 2 +- .../froilansfarm/food/Tomato.java | 6 ++++ .../froilansfarm/plants/Cornstalk.java | 18 ++++++++++ .../froilansfarm/plants/Crop.java | 20 +++++++---- .../froilansfarm/plants/TomatoPlant.java | 18 ++++++++++ .../froilansfarm/vehicles/Tractor.java | 4 ++- .../froilansfarm/animals/HorseTest.java | 4 +-- .../froilansfarm/days/TuesdayTest.java | 33 +++++++++++++++---- 15 files changed, 147 insertions(+), 34 deletions(-) create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/food/Corn.java rename src/main/java/com/zipcodewilmington/froilansfarm/{ => food}/EdibleEgg.java (68%) create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/food/Tomato.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/plants/Cornstalk.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/plants/TomatoPlant.java diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/CropRow.java b/src/main/java/com/zipcodewilmington/froilansfarm/CropRow.java index 9479f8b9..1311ef8a 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/CropRow.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/CropRow.java @@ -7,29 +7,35 @@ import java.util.List; public class CropRow { - private final List row = new LinkedList(); + + private final List row = new LinkedList<>(); public CropRow() {} + public CropRow(Crop crop) { this.row.add(crop); } + public CropRow(Crop[] crops) { this.row.addAll(Arrays.asList(crops)); } + public CropRow(List crops) { this.row.addAll(crops); } - public List whichCrops() { + public List getCrops() { return this.row; } public void store(Crop crop) { this.row.add(crop); } + public void store(Crop[] crops) { this.row.addAll(Arrays.asList(crops)); } + public void store(List crops) { this.row.addAll(crops); } @@ -40,9 +46,4 @@ public void fertilize() { } } - - - - - } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Farm.java b/src/main/java/com/zipcodewilmington/froilansfarm/Farm.java index 1d21f721..31824f48 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Farm.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Farm.java @@ -1,5 +1,26 @@ package com.zipcodewilmington.froilansfarm; +import java.util.ArrayList; +import java.util.List; + public class Farm { + private List fields = new ArrayList<>(); + + public Farm(List fields) { + this.fields.addAll(fields); + } + + public Farm(Field field) { + this.fields.add(field); + } + + public List getFields() { + return this.fields; + } + + public void addFields(Field... fields) { + this.fields.addAll(List.of(fields)); + } + } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Field.java b/src/main/java/com/zipcodewilmington/froilansfarm/Field.java index fd26e142..30a1692c 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Field.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Field.java @@ -5,29 +5,35 @@ import java.util.List; public class Field { - private final List cropRows = new LinkedList(); + + private final List cropRows = new LinkedList<>(); public Field() {} + public Field(CropRow croprow) { this.cropRows.add(croprow); } + public Field(CropRow[] cropRows) { this.cropRows.addAll(Arrays.asList(cropRows)); } + public Field(List cropRows) { this.cropRows.addAll(cropRows); } - public List whichCropRows() { + public List getCropRows() { return this.cropRows; } public void store(CropRow cropRow) { this.cropRows.add(cropRow); } + public void store(CropRow[] cropRows) { this.cropRows.addAll(Arrays.asList(cropRows)); } + public void store(List cropRows) { this.cropRows.addAll(cropRows); } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/animals/Chicken.java b/src/main/java/com/zipcodewilmington/froilansfarm/animals/Chicken.java index cb5cf55b..f2b93710 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/animals/Chicken.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/animals/Chicken.java @@ -1,6 +1,6 @@ package com.zipcodewilmington.froilansfarm.animals; -import com.zipcodewilmington.froilansfarm.EdibleEgg; +import com.zipcodewilmington.froilansfarm.food.EdibleEgg; import com.zipcodewilmington.froilansfarm.interfaces.Edible; import com.zipcodewilmington.froilansfarm.interfaces.Produce; diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/buildings/Stable.java b/src/main/java/com/zipcodewilmington/froilansfarm/buildings/Stable.java index 33d706e4..8328e2bb 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/buildings/Stable.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/buildings/Stable.java @@ -9,7 +9,6 @@ public class Stable { private List horses = new ArrayList<>(); - //additional add horse method public void addHorse(Horse horse) { horses.add(horse); } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/days/Tuesday.java b/src/main/java/com/zipcodewilmington/froilansfarm/days/Tuesday.java index dc6d9f8d..c194e777 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/days/Tuesday.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/days/Tuesday.java @@ -1,23 +1,30 @@ package com.zipcodewilmington.froilansfarm.days; +import com.zipcodewilmington.froilansfarm.CropRow; import com.zipcodewilmington.froilansfarm.Farm; import com.zipcodewilmington.froilansfarm.Farmer; +import com.zipcodewilmington.froilansfarm.Field; +import com.zipcodewilmington.froilansfarm.interfaces.Edible; import com.zipcodewilmington.froilansfarm.plants.Crop; import com.zipcodewilmington.froilansfarm.vehicles.Tractor; +import java.util.ArrayList; +import java.util.List; + import static com.zipcodewilmington.froilansfarm.days.EveryMorning.everyMorning; public class Tuesday { public static void tuesday(Farmer farmer, Tractor tractor, Farm farm) { everyMorning(); farmer.mount(tractor); - //TODO - /*tractor.operate(farm); - for(CropRow row : farm.getField().getArea()) { - for(Crop crop : row.getRow()) { - tractor.makeNoise(); - crop.harvest(); + List yields = new ArrayList<>(); + for(Field field : farm.getFields()) { + for(CropRow cropRow : field.getCropRows()) { + for(Crop crop : cropRow.getCrops()) { + tractor.makeNoise(); + yields.add(tractor.harvest(crop)); + } } - }*/ + } } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/food/Corn.java b/src/main/java/com/zipcodewilmington/froilansfarm/food/Corn.java new file mode 100644 index 00000000..d6309a52 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/food/Corn.java @@ -0,0 +1,6 @@ +package com.zipcodewilmington.froilansfarm.food; + +import com.zipcodewilmington.froilansfarm.interfaces.Edible; + +public class Corn implements Edible { +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/EdibleEgg.java b/src/main/java/com/zipcodewilmington/froilansfarm/food/EdibleEgg.java similarity index 68% rename from src/main/java/com/zipcodewilmington/froilansfarm/EdibleEgg.java rename to src/main/java/com/zipcodewilmington/froilansfarm/food/EdibleEgg.java index 860c6073..212780fb 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/EdibleEgg.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/food/EdibleEgg.java @@ -1,4 +1,4 @@ -package com.zipcodewilmington.froilansfarm; +package com.zipcodewilmington.froilansfarm.food; import com.zipcodewilmington.froilansfarm.interfaces.Edible; diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/food/Tomato.java b/src/main/java/com/zipcodewilmington/froilansfarm/food/Tomato.java new file mode 100644 index 00000000..451bf851 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/food/Tomato.java @@ -0,0 +1,6 @@ +package com.zipcodewilmington.froilansfarm.food; + +import com.zipcodewilmington.froilansfarm.interfaces.Edible; + +public class Tomato implements Edible { +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/plants/Cornstalk.java b/src/main/java/com/zipcodewilmington/froilansfarm/plants/Cornstalk.java new file mode 100644 index 00000000..1fe79516 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/plants/Cornstalk.java @@ -0,0 +1,18 @@ +package com.zipcodewilmington.froilansfarm.plants; + +import com.zipcodewilmington.froilansfarm.food.Corn; +import com.zipcodewilmington.froilansfarm.interfaces.Edible; + +public class Cornstalk extends Crop { + + @Override + public Edible yield() { + if(isFertilized() && !isHarvested()) { + return new Corn(); + } + else { + return null; + } + } + +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/plants/Crop.java b/src/main/java/com/zipcodewilmington/froilansfarm/plants/Crop.java index e591ce17..bc772d25 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/plants/Crop.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/plants/Crop.java @@ -4,20 +4,28 @@ public abstract class Crop implements Produce { - private boolean hasBeenHarvested; - private boolean hasBeenFertilized; + private boolean harvested; + private boolean fertilized; public Crop() { - this.hasBeenHarvested = false; - this.hasBeenFertilized = false; + this.harvested = false; + this.fertilized = false; } public void fertilize() { - this.hasBeenFertilized = true; + this.fertilized = true; } public void harvest() { - this.hasBeenHarvested = true; + this.harvested = true; + } + + public boolean isFertilized() { + return fertilized; + } + + public boolean isHarvested() { + return harvested; } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/plants/TomatoPlant.java b/src/main/java/com/zipcodewilmington/froilansfarm/plants/TomatoPlant.java new file mode 100644 index 00000000..61d58c04 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/plants/TomatoPlant.java @@ -0,0 +1,18 @@ +package com.zipcodewilmington.froilansfarm.plants; + +import com.zipcodewilmington.froilansfarm.food.Tomato; +import com.zipcodewilmington.froilansfarm.interfaces.Edible; + +public class TomatoPlant extends Crop { + + @Override + public Edible yield() { + if(isFertilized() && !isHarvested()) { + return new Tomato(); + } + else { + return null; + } + } + +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/vehicles/Tractor.java b/src/main/java/com/zipcodewilmington/froilansfarm/vehicles/Tractor.java index 5d43ed53..8998d3eb 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/vehicles/Tractor.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/vehicles/Tractor.java @@ -1,11 +1,13 @@ package com.zipcodewilmington.froilansfarm.vehicles; +import com.zipcodewilmington.froilansfarm.interfaces.Edible; import com.zipcodewilmington.froilansfarm.plants.Crop; public class Tractor extends FarmVehicle { - public void harvest(Crop crop) { + public Edible harvest(Crop crop) { crop.harvest(); + return crop.yield(); } } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/animals/HorseTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/animals/HorseTest.java index 8424f66d..102433e9 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/animals/HorseTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/animals/HorseTest.java @@ -1,6 +1,6 @@ package com.zipcodewilmington.froilansfarm.animals; -import com.zipcodewilmington.froilansfarm.EdibleEgg; +import com.zipcodewilmington.froilansfarm.food.Corn; import org.junit.jupiter.api.Test; class HorseTest { @@ -12,7 +12,7 @@ void eat() { Horse horse = new Horse(); // WHEN - horse.eat(new EdibleEgg()); + horse.eat(new Corn()); // THEN // ???? diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/days/TuesdayTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/days/TuesdayTest.java index 15cab073..98b40118 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/days/TuesdayTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/days/TuesdayTest.java @@ -1,12 +1,17 @@ package com.zipcodewilmington.froilansfarm.days; +import com.zipcodewilmington.froilansfarm.CropRow; import com.zipcodewilmington.froilansfarm.Farm; import com.zipcodewilmington.froilansfarm.Farmer; +import com.zipcodewilmington.froilansfarm.Field; +import com.zipcodewilmington.froilansfarm.plants.Cornstalk; import com.zipcodewilmington.froilansfarm.plants.Crop; +import com.zipcodewilmington.froilansfarm.plants.TomatoPlant; import com.zipcodewilmington.froilansfarm.vehicles.Tractor; import org.junit.jupiter.api.Test; import java.util.Arrays; +import java.util.List; import static com.zipcodewilmington.froilansfarm.days.Tuesday.tuesday; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -18,24 +23,40 @@ void tuesdayTest() { //GIVEN Farmer farmer = new Farmer("Froilan"); Tractor tractor = new Tractor(); - /*Crop corn1 = new Cornstalk(); + Crop corn1 = new Cornstalk(); + corn1.fertilize(); Crop corn2 = new Cornstalk(); + corn2.fertilize(); Crop corn3 = new Cornstalk(); + corn3.fertilize(); Crop corn4 = new Cornstalk(); + Crop tomato1 = new TomatoPlant(); + Crop tomato2 = new TomatoPlant(); + tomato2.fertilize(); + Crop tomato3 = new TomatoPlant(); + tomato3.fertilize(); + Crop tomato4 = new TomatoPlant(); + tomato4.fertilize(); CropRow cropRow1 = new CropRow(Arrays.asList(corn1, corn2)); CropRow cropRow2 = new CropRow(Arrays.asList(corn3, corn4)); - Field field = new Field(Arrays.asList(cropRow1, cropRow2)); - Farm farm = new Farm(field, null, null, null);*/ - Farm farm = new Farm(); + CropRow cropRow3 = new CropRow(Arrays.asList(tomato1, tomato2)); + CropRow cropRow4 = new CropRow(Arrays.asList(tomato3, tomato4)); + Field field1 = new Field(Arrays.asList(cropRow1, cropRow2)); + Field field2 = new Field(Arrays.asList(cropRow3, cropRow4)); + Farm farm = new Farm(List.of(field1, field2)); //WHEN tuesday(farmer, tractor, farm); //THEN - /*assertTrue(corn1.isHarvested()); + assertTrue(corn1.isHarvested()); assertTrue(corn2.isHarvested()); assertTrue(corn3.isHarvested()); - assertTrue(corn4.isHarvested());*/ + assertTrue(corn4.isHarvested()); + assertTrue(tomato1.isHarvested()); + assertTrue(tomato2.isHarvested()); + assertTrue(tomato3.isHarvested()); + assertTrue(tomato4.isHarvested()); } } From 69f1e8585ace6b0b61cb8db0a674f0193f20cea3 Mon Sep 17 00:00:00 2001 From: Luciaw1219 Date: Sun, 21 May 2023 14:55:19 -0400 Subject: [PATCH 15/20] correct mistake for harvesting and yeilding --- .../com/zipcodewilmington/froilansfarm/plants/Cornstalk.java | 2 ++ .../com/zipcodewilmington/froilansfarm/plants/TomatoPlant.java | 2 ++ .../com/zipcodewilmington/froilansfarm/vehicles/Tractor.java | 1 - 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/plants/Cornstalk.java b/src/main/java/com/zipcodewilmington/froilansfarm/plants/Cornstalk.java index 1fe79516..b1e9e70f 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/plants/Cornstalk.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/plants/Cornstalk.java @@ -8,9 +8,11 @@ public class Cornstalk extends Crop { @Override public Edible yield() { if(isFertilized() && !isHarvested()) { + this.harvest(); return new Corn(); } else { + this.harvest(); return null; } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/plants/TomatoPlant.java b/src/main/java/com/zipcodewilmington/froilansfarm/plants/TomatoPlant.java index 61d58c04..660df38e 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/plants/TomatoPlant.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/plants/TomatoPlant.java @@ -8,9 +8,11 @@ public class TomatoPlant extends Crop { @Override public Edible yield() { if(isFertilized() && !isHarvested()) { + this.harvest(); return new Tomato(); } else { + this.harvest(); return null; } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/vehicles/Tractor.java b/src/main/java/com/zipcodewilmington/froilansfarm/vehicles/Tractor.java index 8998d3eb..4f46b5b3 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/vehicles/Tractor.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/vehicles/Tractor.java @@ -6,7 +6,6 @@ public class Tractor extends FarmVehicle { public Edible harvest(Crop crop) { - crop.harvest(); return crop.yield(); } From cfcc2a8c21e48434e86a35a1fa539bb1d4790522 Mon Sep 17 00:00:00 2001 From: Luciaw1219 Date: Sun, 21 May 2023 14:59:18 -0400 Subject: [PATCH 16/20] uncomment croprow for farmer --- src/main/java/com/zipcodewilmington/froilansfarm/Farmer.java | 3 +-- .../zipcodewilmington/froilansfarm/interfaces/Botanist.java | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Farmer.java b/src/main/java/com/zipcodewilmington/froilansfarm/Farmer.java index 86835f8d..ba5fe509 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Farmer.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Farmer.java @@ -12,9 +12,8 @@ public Farmer(String name) { super(name); } - //TODO @Override - public void plant(/*CropRow cropRow, */Crop crop) { + public void plant(CropRow cropRow, Crop crop) { } @Override diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/interfaces/Botanist.java b/src/main/java/com/zipcodewilmington/froilansfarm/interfaces/Botanist.java index 22979f1b..7956e5c4 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/interfaces/Botanist.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/interfaces/Botanist.java @@ -1,10 +1,10 @@ package com.zipcodewilmington.froilansfarm.interfaces; +import com.zipcodewilmington.froilansfarm.CropRow; import com.zipcodewilmington.froilansfarm.plants.Crop; public interface Botanist { - //TODO - void plant(/*CropRow cropRow, */Crop crop); + void plant(CropRow cropRow, Crop crop); } From 238eae52bbcb22410606ca797b3e98b3289e3262 Mon Sep 17 00:00:00 2001 From: Luciaw1219 Date: Sun, 21 May 2023 14:59:51 -0400 Subject: [PATCH 17/20] uncomment croprow for farmer --- src/main/java/com/zipcodewilmington/froilansfarm/Farmer.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Farmer.java b/src/main/java/com/zipcodewilmington/froilansfarm/Farmer.java index ba5fe509..821fccc1 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Farmer.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Farmer.java @@ -14,6 +14,7 @@ public Farmer(String name) { @Override public void plant(CropRow cropRow, Crop crop) { + cropRow.store(crop); } @Override From 006703322d56b32250d58faa1e0f6e5612967e72 Mon Sep 17 00:00:00 2001 From: mouad Date: Sun, 21 May 2023 19:18:47 -0400 Subject: [PATCH 18/20] finish --- .../froilansfarm/CropRow.java | 7 +- .../zipcodewilmington/froilansfarm/Farm.java | 1 + .../zipcodewilmington/froilansfarm/Field.java | 3 + .../froilansfarm/MainApplication.java | 72 ++++++++++++++++++- .../froilansfarm/buildings/ChickenCoop.java | 20 +++++- .../froilansfarm/buildings/Stable.java | 18 +++++ .../froilansfarm/plants/Crop.java | 15 ++++ .../froilansfarm/plants/Tomato.java | 6 ++ .../froilansfarm/plants/TomatoPlant.java | 21 ++++++ .../froilansfarm/days/MondayTest.java | 33 ++++++++- 10 files changed, 191 insertions(+), 5 deletions(-) create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/plants/Tomato.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/plants/TomatoPlant.java diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/CropRow.java b/src/main/java/com/zipcodewilmington/froilansfarm/CropRow.java index fa4322ff..dbe8cb90 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/CropRow.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/CropRow.java @@ -1,5 +1,7 @@ package com.zipcodewilmington.froilansfarm; +import com.zipcodewilmington.froilansfarm.plants.Crop; + import java.util.Arrays; import java.util.LinkedList; import java.util.List; @@ -32,10 +34,13 @@ public void store(List crops) { this.row.addAll(crops); } - public void fertilize() { + + public boolean fertilize() { for (Crop crop : this.row) { crop.fertilize(); } + + return false; } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Farm.java b/src/main/java/com/zipcodewilmington/froilansfarm/Farm.java index 1d21f721..25168b92 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Farm.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Farm.java @@ -2,4 +2,5 @@ public class Farm { + } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Field.java b/src/main/java/com/zipcodewilmington/froilansfarm/Field.java index fd26e142..47f20411 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Field.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Field.java @@ -32,4 +32,7 @@ public void store(List cropRows) { this.cropRows.addAll(cropRows); } + public List getCropRows() { + return cropRows; + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/MainApplication.java b/src/main/java/com/zipcodewilmington/froilansfarm/MainApplication.java index 27c35334..5e289090 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/MainApplication.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/MainApplication.java @@ -1,10 +1,80 @@ package com.zipcodewilmington.froilansfarm; +import com.zipcodewilmington.froilansfarm.animals.Chicken; +import com.zipcodewilmington.froilansfarm.animals.Horse; +import com.zipcodewilmington.froilansfarm.buildings.ChickenCoop; +import com.zipcodewilmington.froilansfarm.buildings.FarmHouse; +import com.zipcodewilmington.froilansfarm.buildings.Stable; +import com.zipcodewilmington.froilansfarm.interfaces.Edible; +import com.zipcodewilmington.froilansfarm.plants.Crop; +import com.zipcodewilmington.froilansfarm.plants.TomatoPlant; +import com.zipcodewilmington.froilansfarm.vehicles.Aircraft; +import com.zipcodewilmington.froilansfarm.vehicles.CropDuster; +import com.zipcodewilmington.froilansfarm.vehicles.Tractor; +import com.zipcodewilmington.froilansfarm.vehicles.Vehicle; + +import java.util.List; + /** * Created by leon on 2/26/18. */ public class MainApplication { public static void main(String[] args) { - //TODO + // Create the Chicken objects using a loop + Chicken[] chickens = new Chicken[15]; + for (int i = 0; i < chickens.length; i++) { + chickens[i] = new Chicken(); + } + + // Create the ChickenCoops using the Chicken arrays + ChickenCoop[] coops = new ChickenCoop[4]; + coops[0] = new ChickenCoop(new Chicken[] { chickens[0], chickens[1], chickens[2], chickens[3], chickens[4] }); + coops[1] = new ChickenCoop(new Chicken[] { chickens[5], chickens[6], chickens[7], chickens[8] }); + coops[2] = new ChickenCoop(new Chicken[] { chickens[9], chickens[10], chickens[11] }); + coops[3] = new ChickenCoop(new Chicken[] { chickens[12], chickens[13], chickens[14] }); + + // Created the horses objects using a loop + Horse[] horses = new Horse[10]; + for (int i = 0; i < horses.length; i++) { + horses[i] = new Horse(); + } + + // Create the Stables using the Horse arrays + Stable[] stables = new Stable[3]; + stables[0] = new Stable(List.of(new Horse[]{horses[0], horses[1], horses[2], horses[3]})); + + stables[1] = new Stable(List.of(new Horse[]{horses[4], horses[5], horses[6], horses[7]})); + stables[2] = new Stable(List.of(new Horse[]{horses[8], horses[9]})); + + Crop corn; + corn = new Crop() { + @Override + public Edible yield() { + return null; + } + }; + + Crop tomato = new TomatoPlant(); + + // Create the crop rows + CropRow rowOne = new CropRow(new Crop[] {corn}); + CropRow rowTwo = new CropRow(new Crop[] {tomato}); + CropRow rowThree = new CropRow(new Crop[] {}); + CropRow rowFour = new CropRow(new Crop[] {}); + CropRow rowFive = new CropRow(new Crop[] {}); + + // Add the crop rows to the field + Field field = new Field(new CropRow[] {rowOne, rowTwo, rowThree, rowFour, rowFive}); + + Farmer froilan = new Farmer("Froilan"); + Tractor froilansTractor = new Tractor(); + CropDuster froilansCropDuster = new CropDuster(); + Vehicle[] froilainsVehicles = { froilansTractor }; + Farmer froilanda = new Farmer("Froilanda"); + Person[] people = {froilan,froilanda}; + Aircraft cropduster = new CropDuster(); + + + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/buildings/ChickenCoop.java b/src/main/java/com/zipcodewilmington/froilansfarm/buildings/ChickenCoop.java index c3c9688b..4728b821 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/buildings/ChickenCoop.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/buildings/ChickenCoop.java @@ -6,6 +6,24 @@ public class ChickenCoop { - ArrayList chickenList = new ArrayList<>(); + Chicken[] chickenList = new ArrayList<>().toArray(new Chicken[0]); + public ChickenCoop(Chicken[] chickenList) { + this.chickenList = chickenList; + } + + public Chicken[] getChickenList() { + return chickenList; + } + + public void setChickenList(ArrayList chickenList) { + this.chickenList = chickenList.toArray(new Chicken[0]); + } + + @Override + public String toString() { + return "ChickenCoop{" + + "chickenList=" + chickenList + + '}'; + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/buildings/Stable.java b/src/main/java/com/zipcodewilmington/froilansfarm/buildings/Stable.java index a95ce583..dde17da8 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/buildings/Stable.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/buildings/Stable.java @@ -8,4 +8,22 @@ public class Stable { private List horses; + public Stable(List horses) { + this.horses = horses; + } + + public List getHorses() { + return horses; + } + + public void setHorses(List horses) { + this.horses = horses; + } + + @Override + public String toString() { + return "Stable{" + + "horses=" + horses + + '}'; + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/plants/Crop.java b/src/main/java/com/zipcodewilmington/froilansfarm/plants/Crop.java index e591ce17..f2b041f0 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/plants/Crop.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/plants/Crop.java @@ -20,4 +20,19 @@ public void harvest() { this.hasBeenHarvested = true; } + public boolean isHasBeenHarvested() { + return hasBeenHarvested; + } + + public void setHasBeenHarvested(boolean hasBeenHarvested) { + this.hasBeenHarvested = hasBeenHarvested; + } + + public boolean isHasBeenFertilized() { + return hasBeenFertilized; + } + + public void setHasBeenFertilized(boolean hasBeenFertilized) { + this.hasBeenFertilized = hasBeenFertilized; + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/plants/Tomato.java b/src/main/java/com/zipcodewilmington/froilansfarm/plants/Tomato.java new file mode 100644 index 00000000..050d99fb --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/plants/Tomato.java @@ -0,0 +1,6 @@ +package com.zipcodewilmington.froilansfarm.plants; + +import com.zipcodewilmington.froilansfarm.interfaces.Edible; + +public class Tomato implements Edible { +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/plants/TomatoPlant.java b/src/main/java/com/zipcodewilmington/froilansfarm/plants/TomatoPlant.java new file mode 100644 index 00000000..0c8ba804 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/plants/TomatoPlant.java @@ -0,0 +1,21 @@ +package com.zipcodewilmington.froilansfarm.plants; + +import com.zipcodewilmington.froilansfarm.interfaces.Edible; + +public class TomatoPlant extends Crop { + public TomatoPlant() { + super(); + } + + public TomatoPlant(boolean hasBeenFertilized, boolean hasBeenHarvested) { + super(); + } + + public Edible yield() { + if (this.isHasBeenFertilized() && this.isHasBeenHarvested()) { + return new Tomato(); + } else { + return null; + } + } +} diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/days/MondayTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/days/MondayTest.java index 755f797d..b3ad6f69 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/days/MondayTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/days/MondayTest.java @@ -1,12 +1,41 @@ package com.zipcodewilmington.froilansfarm.days; +import com.zipcodewilmington.froilansfarm.CropRow; +import com.zipcodewilmington.froilansfarm.Farm; +import com.zipcodewilmington.froilansfarm.Farmer; +import com.zipcodewilmington.froilansfarm.Field; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; class MondayTest { @Test void mondayTest() { - //TODO + // Farm setup + Farm farm = new Farm(); + Field field = new Field(); +// farm.setField(field); + CropRow[] cropRows = field.getCropRows().toArray(new CropRow[0]); + CropRow cropRow1 = cropRows[0]; + CropRow cropRow2 = cropRows[1]; + CropRow cropRow3 = cropRows[2]; + + // Monday routine - Fertilizing crops + Farmer froilanda = new Farmer("Froilanda"); + froilanda.equals(cropRow1); + froilanda.equals(cropRow2); + froilanda.equals(cropRow3); + + // Assertions + Assertions.assertTrue(cropRow1.fertilize()); + Assertions.assertTrue(cropRow2.fertilize()); + Assertions.assertTrue(cropRow3.fertilize()); + } + + + + + } -} + From 282dc2e0f5d8795e580821729e10e017650dc3e5 Mon Sep 17 00:00:00 2001 From: mouad Date: Sun, 21 May 2023 20:18:51 -0400 Subject: [PATCH 19/20] classes done --- .../froilansfarm/MainApplication.java | 2 -- .../froilansfarm/days/Monday.java | 4 +--- .../froilansfarm/plants/Tomato.java | 6 ------ .../froilansfarm/plants/TomatoPlant.java | 21 ------------------- 4 files changed, 1 insertion(+), 32 deletions(-) delete mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/plants/Tomato.java delete mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/plants/TomatoPlant.java diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/MainApplication.java b/src/main/java/com/zipcodewilmington/froilansfarm/MainApplication.java index 5e289090..2ff955e3 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/MainApplication.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/MainApplication.java @@ -3,11 +3,9 @@ import com.zipcodewilmington.froilansfarm.animals.Chicken; import com.zipcodewilmington.froilansfarm.animals.Horse; import com.zipcodewilmington.froilansfarm.buildings.ChickenCoop; -import com.zipcodewilmington.froilansfarm.buildings.FarmHouse; import com.zipcodewilmington.froilansfarm.buildings.Stable; import com.zipcodewilmington.froilansfarm.interfaces.Edible; import com.zipcodewilmington.froilansfarm.plants.Crop; -import com.zipcodewilmington.froilansfarm.plants.TomatoPlant; import com.zipcodewilmington.froilansfarm.vehicles.Aircraft; import com.zipcodewilmington.froilansfarm.vehicles.CropDuster; import com.zipcodewilmington.froilansfarm.vehicles.Tractor; diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/days/Monday.java b/src/main/java/com/zipcodewilmington/froilansfarm/days/Monday.java index 2b85f1da..d1db57d0 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/days/Monday.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/days/Monday.java @@ -1,7 +1,5 @@ package com.zipcodewilmington.froilansfarm.days; public class Monday { - public static void monday() { - //TODO - } + public static void monday() {} } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/plants/Tomato.java b/src/main/java/com/zipcodewilmington/froilansfarm/plants/Tomato.java deleted file mode 100644 index 050d99fb..00000000 --- a/src/main/java/com/zipcodewilmington/froilansfarm/plants/Tomato.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.zipcodewilmington.froilansfarm.plants; - -import com.zipcodewilmington.froilansfarm.interfaces.Edible; - -public class Tomato implements Edible { -} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/plants/TomatoPlant.java b/src/main/java/com/zipcodewilmington/froilansfarm/plants/TomatoPlant.java deleted file mode 100644 index 0c8ba804..00000000 --- a/src/main/java/com/zipcodewilmington/froilansfarm/plants/TomatoPlant.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.zipcodewilmington.froilansfarm.plants; - -import com.zipcodewilmington.froilansfarm.interfaces.Edible; - -public class TomatoPlant extends Crop { - public TomatoPlant() { - super(); - } - - public TomatoPlant(boolean hasBeenFertilized, boolean hasBeenHarvested) { - super(); - } - - public Edible yield() { - if (this.isHasBeenFertilized() && this.isHasBeenHarvested()) { - return new Tomato(); - } else { - return null; - } - } -} From 8e64d323abe394bf35562ac240c8789c0204c952 Mon Sep 17 00:00:00 2001 From: Luciaw1219 Date: Mon, 22 May 2023 00:06:11 -0400 Subject: [PATCH 20/20] resolve merge conflicts --- .../zipcodewilmington/froilansfarm/Field.java | 3 - .../froilansfarm/MainApplication.java | 5 +- .../froilansfarm/buildings/Stable.java | 2 + .../froilansfarm/days/Monday.java | 13 ++++- .../froilansfarm/days/Tuesday.java | 14 ++--- .../froilansfarm/plants/Crop.java | 15 ----- .../froilansfarm/vehicles/CropDuster.java | 10 +++- .../froilansfarm/EdibleEggTest.java | 7 --- .../froilansfarm/FarmTest.java | 7 --- .../froilansfarm/animals/AnimalTest.java | 7 --- .../buildings/ChickenCoopTest.java | 7 --- .../froilansfarm/buildings/FarmHouseTest.java | 7 --- .../froilansfarm/buildings/StableTest.java | 7 --- .../froilansfarm/days/EveryMorningTest.java | 1 - .../froilansfarm/days/MondayTest.java | 55 ++++++++++++------- .../froilansfarm/days/TuesdayTest.java | 19 ++++++- .../vehicles/FarmVehicleTest.java | 7 --- 17 files changed, 83 insertions(+), 103 deletions(-) delete mode 100644 src/test/java/com/zipcodewilmington/froilansfarm/EdibleEggTest.java delete mode 100644 src/test/java/com/zipcodewilmington/froilansfarm/FarmTest.java delete mode 100644 src/test/java/com/zipcodewilmington/froilansfarm/animals/AnimalTest.java delete mode 100644 src/test/java/com/zipcodewilmington/froilansfarm/buildings/ChickenCoopTest.java delete mode 100644 src/test/java/com/zipcodewilmington/froilansfarm/buildings/FarmHouseTest.java delete mode 100644 src/test/java/com/zipcodewilmington/froilansfarm/buildings/StableTest.java delete mode 100644 src/test/java/com/zipcodewilmington/froilansfarm/vehicles/FarmVehicleTest.java diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Field.java b/src/main/java/com/zipcodewilmington/froilansfarm/Field.java index 323eeffc..30a1692c 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Field.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Field.java @@ -38,7 +38,4 @@ public void store(List cropRows) { this.cropRows.addAll(cropRows); } - public List getCropRows() { - return cropRows; - } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/MainApplication.java b/src/main/java/com/zipcodewilmington/froilansfarm/MainApplication.java index 2ff955e3..4e9d74f7 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/MainApplication.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/MainApplication.java @@ -6,6 +6,7 @@ import com.zipcodewilmington.froilansfarm.buildings.Stable; import com.zipcodewilmington.froilansfarm.interfaces.Edible; import com.zipcodewilmington.froilansfarm.plants.Crop; +import com.zipcodewilmington.froilansfarm.plants.TomatoPlant; import com.zipcodewilmington.froilansfarm.vehicles.Aircraft; import com.zipcodewilmington.froilansfarm.vehicles.CropDuster; import com.zipcodewilmington.froilansfarm.vehicles.Tractor; @@ -71,8 +72,6 @@ public Edible yield() { Farmer froilanda = new Farmer("Froilanda"); Person[] people = {froilan,froilanda}; Aircraft cropduster = new CropDuster(); - - - } + } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/buildings/Stable.java b/src/main/java/com/zipcodewilmington/froilansfarm/buildings/Stable.java index 1ff72698..47c65e64 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/buildings/Stable.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/buildings/Stable.java @@ -17,6 +17,8 @@ public Stable(List horses) { this.horses = horses; } + public Stable() {} + public List getHorses() { return horses; } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/days/Monday.java b/src/main/java/com/zipcodewilmington/froilansfarm/days/Monday.java index d1db57d0..b254719e 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/days/Monday.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/days/Monday.java @@ -1,5 +1,16 @@ package com.zipcodewilmington.froilansfarm.days; +import com.zipcodewilmington.froilansfarm.CropRow; +import com.zipcodewilmington.froilansfarm.Farmer; +import com.zipcodewilmington.froilansfarm.Field; +import com.zipcodewilmington.froilansfarm.vehicles.CropDuster; + public class Monday { - public static void monday() {} + public static void monday(Farmer farmer, CropDuster cropDuster, Field field) { + farmer.mount(cropDuster); + cropDuster.fly(); + for(CropRow cropRow : field.getCropRows()) { + cropDuster.fertilize(cropRow); + } + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/days/Tuesday.java b/src/main/java/com/zipcodewilmington/froilansfarm/days/Tuesday.java index c194e777..cfeb06a2 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/days/Tuesday.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/days/Tuesday.java @@ -14,17 +14,17 @@ import static com.zipcodewilmington.froilansfarm.days.EveryMorning.everyMorning; public class Tuesday { - public static void tuesday(Farmer farmer, Tractor tractor, Farm farm) { + public static List tuesday(Farmer farmer, Tractor tractor, Field field) { everyMorning(); farmer.mount(tractor); List yields = new ArrayList<>(); - for(Field field : farm.getFields()) { - for(CropRow cropRow : field.getCropRows()) { - for(Crop crop : cropRow.getCrops()) { - tractor.makeNoise(); - yields.add(tractor.harvest(crop)); - } + for(CropRow cropRow : field.getCropRows()) { + for(Crop crop : cropRow.getCrops()) { + tractor.makeNoise(); + Edible yield = tractor.harvest(crop); + if (yield != null) yields.add(yield); } } + return yields; } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/plants/Crop.java b/src/main/java/com/zipcodewilmington/froilansfarm/plants/Crop.java index ee399c03..bc772d25 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/plants/Crop.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/plants/Crop.java @@ -28,19 +28,4 @@ public boolean isHarvested() { return harvested; } - public boolean isHasBeenHarvested() { - return hasBeenHarvested; - } - - public void setHasBeenHarvested(boolean hasBeenHarvested) { - this.hasBeenHarvested = hasBeenHarvested; - } - - public boolean isHasBeenFertilized() { - return hasBeenFertilized; - } - - public void setHasBeenFertilized(boolean hasBeenFertilized) { - this.hasBeenFertilized = hasBeenFertilized; - } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/vehicles/CropDuster.java b/src/main/java/com/zipcodewilmington/froilansfarm/vehicles/CropDuster.java index 2edc4be2..94337f84 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/vehicles/CropDuster.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/vehicles/CropDuster.java @@ -1,8 +1,14 @@ package com.zipcodewilmington.froilansfarm.vehicles; +import com.zipcodewilmington.froilansfarm.CropRow; +import com.zipcodewilmington.froilansfarm.plants.Crop; + public class CropDuster extends Aircraft { - //TODO - public void fertilize(/*CropRow cropRow*/) {} + public void fertilize(CropRow cropRow) { + for(Crop crop : cropRow.getCrops()) { + crop.fertilize(); + } + } } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/EdibleEggTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/EdibleEggTest.java deleted file mode 100644 index 000b3e17..00000000 --- a/src/test/java/com/zipcodewilmington/froilansfarm/EdibleEggTest.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.zipcodewilmington.froilansfarm; - -import org.junit.jupiter.api.Test; - -class EdibleEggTest { - -} diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/FarmTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/FarmTest.java deleted file mode 100644 index 2dcc5708..00000000 --- a/src/test/java/com/zipcodewilmington/froilansfarm/FarmTest.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.zipcodewilmington.froilansfarm; - -import org.junit.jupiter.api.Test; - -class FarmTest { - -} diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/animals/AnimalTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/animals/AnimalTest.java deleted file mode 100644 index 8577486b..00000000 --- a/src/test/java/com/zipcodewilmington/froilansfarm/animals/AnimalTest.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.zipcodewilmington.froilansfarm.animals; - -import org.junit.jupiter.api.Test; - -class AnimalTest { - -} diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/buildings/ChickenCoopTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/buildings/ChickenCoopTest.java deleted file mode 100644 index cf323b83..00000000 --- a/src/test/java/com/zipcodewilmington/froilansfarm/buildings/ChickenCoopTest.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.zipcodewilmington.froilansfarm.buildings; - -import org.junit.jupiter.api.Test; - -class ChickenCoopTest { - -} diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/buildings/FarmHouseTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/buildings/FarmHouseTest.java deleted file mode 100644 index fbaaaab6..00000000 --- a/src/test/java/com/zipcodewilmington/froilansfarm/buildings/FarmHouseTest.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.zipcodewilmington.froilansfarm.buildings; - -import org.junit.jupiter.api.Test; - -class FarmHouseTest { - -} \ No newline at end of file diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/buildings/StableTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/buildings/StableTest.java deleted file mode 100644 index 7001a6f6..00000000 --- a/src/test/java/com/zipcodewilmington/froilansfarm/buildings/StableTest.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.zipcodewilmington.froilansfarm.buildings; - -import org.junit.jupiter.api.Test; - -class StableTest { - -} diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/days/EveryMorningTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/days/EveryMorningTest.java index 50288ff7..6b1a753e 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/days/EveryMorningTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/days/EveryMorningTest.java @@ -17,7 +17,6 @@ class EveryMorningTest { @Test void everyMorning() { - //TODO //GIVEN Farmer farmer = new Farmer("Froilan"); Farmer farmer2 = new Farmer("Froilanda"); diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/days/MondayTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/days/MondayTest.java index c638a92e..6bf55785 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/days/MondayTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/days/MondayTest.java @@ -1,36 +1,53 @@ package com.zipcodewilmington.froilansfarm.days; import com.zipcodewilmington.froilansfarm.CropRow; -import com.zipcodewilmington.froilansfarm.Farm; import com.zipcodewilmington.froilansfarm.Farmer; import com.zipcodewilmington.froilansfarm.Field; -import org.junit.jupiter.api.Assertions; +import com.zipcodewilmington.froilansfarm.plants.Cornstalk; +import com.zipcodewilmington.froilansfarm.plants.Crop; +import com.zipcodewilmington.froilansfarm.plants.TomatoPlant; +import com.zipcodewilmington.froilansfarm.vehicles.CropDuster; import org.junit.jupiter.api.Test; +import java.util.Arrays; + +import static com.zipcodewilmington.froilansfarm.days.Monday.monday; +import static org.junit.jupiter.api.Assertions.assertTrue; + class MondayTest { //On `Monday`, his sister, `Froilanda` uses the `CropDuster` to `fly` over the `Field` and `fertilize` each of the `CropRow` @Test void mondayTest() { - // Farm setup - Farm farm = new Farm(); - Field field = new Field(); -// farm.setField(field); - CropRow[] cropRows = field.getCropRows().toArray(new CropRow[0]); - CropRow cropRow1 = cropRows[0]; - CropRow cropRow2 = cropRows[1]; - CropRow cropRow3 = cropRows[2]; - - // Monday routine - Fertilizing crops + //GIVEN Farmer froilanda = new Farmer("Froilanda"); - froilanda.equals(cropRow1); - froilanda.equals(cropRow2); - froilanda.equals(cropRow3); + CropDuster cropDuster = new CropDuster(); + Crop corn1 = new Cornstalk(); + Crop corn2 = new Cornstalk(); + Crop corn3 = new Cornstalk(); + Crop corn4 = new Cornstalk(); + Crop tomato1 = new TomatoPlant(); + Crop tomato2 = new TomatoPlant(); + Crop tomato3 = new TomatoPlant(); + Crop tomato4 = new TomatoPlant(); + CropRow cropRow1 = new CropRow(Arrays.asList(corn1, corn2)); + CropRow cropRow2 = new CropRow(Arrays.asList(corn3, corn4)); + CropRow cropRow3 = new CropRow(Arrays.asList(tomato1, tomato2)); + CropRow cropRow4 = new CropRow(Arrays.asList(tomato3, tomato4)); + Field field = new Field(Arrays.asList(cropRow1, cropRow2, cropRow3, cropRow4)); + + //WHEN + monday(froilanda, cropDuster, field); // Assertions - Assertions.assertTrue(cropRow1.fertilize()); - Assertions.assertTrue(cropRow2.fertilize()); - Assertions.assertTrue(cropRow3.fertilize()); + assertTrue(corn1.isFertilized()); + assertTrue(corn2.isFertilized()); + assertTrue(corn3.isFertilized()); + assertTrue(corn4.isFertilized()); + assertTrue(tomato1.isFertilized()); + assertTrue(tomato2.isFertilized()); + assertTrue(tomato3.isFertilized()); + assertTrue(tomato4.isFertilized()); } - } +} diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/days/TuesdayTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/days/TuesdayTest.java index 98b40118..03ad63dc 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/days/TuesdayTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/days/TuesdayTest.java @@ -1,9 +1,11 @@ package com.zipcodewilmington.froilansfarm.days; import com.zipcodewilmington.froilansfarm.CropRow; -import com.zipcodewilmington.froilansfarm.Farm; import com.zipcodewilmington.froilansfarm.Farmer; import com.zipcodewilmington.froilansfarm.Field; +import com.zipcodewilmington.froilansfarm.food.Corn; +import com.zipcodewilmington.froilansfarm.food.Tomato; +import com.zipcodewilmington.froilansfarm.interfaces.Edible; import com.zipcodewilmington.froilansfarm.plants.Cornstalk; import com.zipcodewilmington.froilansfarm.plants.Crop; import com.zipcodewilmington.froilansfarm.plants.TomatoPlant; @@ -14,6 +16,7 @@ import java.util.List; import static com.zipcodewilmington.froilansfarm.days.Tuesday.tuesday; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; class TuesdayTest { @@ -43,10 +46,12 @@ void tuesdayTest() { CropRow cropRow4 = new CropRow(Arrays.asList(tomato3, tomato4)); Field field1 = new Field(Arrays.asList(cropRow1, cropRow2)); Field field2 = new Field(Arrays.asList(cropRow3, cropRow4)); - Farm farm = new Farm(List.of(field1, field2)); //WHEN - tuesday(farmer, tractor, farm); + List result1 = tuesday(farmer, tractor, field1); + List expected1 = List.of(new Corn(), new Corn(), new Corn()); + List result2 = tuesday(farmer, tractor, field2); + List expected2 = List.of(new Tomato(), new Tomato(), new Tomato()); //THEN assertTrue(corn1.isHarvested()); @@ -57,6 +62,14 @@ void tuesdayTest() { assertTrue(tomato2.isHarvested()); assertTrue(tomato3.isHarvested()); assertTrue(tomato4.isHarvested()); + assertEquals(result1.size(), expected1.size()); + assertTrue(result1.get(0) instanceof Corn); + assertTrue(result1.get(1) instanceof Corn); + assertTrue(result1.get(2) instanceof Corn); + assertEquals(result2.size(), expected2.size()); + assertTrue(result2.get(0) instanceof Tomato); + assertTrue(result2.get(1) instanceof Tomato); + assertTrue(result2.get(2) instanceof Tomato); } } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/vehicles/FarmVehicleTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/vehicles/FarmVehicleTest.java deleted file mode 100644 index fe4e1b6a..00000000 --- a/src/test/java/com/zipcodewilmington/froilansfarm/vehicles/FarmVehicleTest.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.zipcodewilmington.froilansfarm.vehicles; - -import org.junit.jupiter.api.Test; - -class FarmVehicleTest { - -}