From 69f8babf4624c2a42d73b829e1ea1cb93c292078 Mon Sep 17 00:00:00 2001 From: Nick Date: Wed, 21 Jul 2021 13:56:35 -0400 Subject: [PATCH 01/48] Nicks working branch --- .../java/com/zipcodewilmington/froilansfarm/MainApplication.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/MainApplication.java b/src/main/java/com/zipcodewilmington/froilansfarm/MainApplication.java index fd743ffc..b9b36eee 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/MainApplication.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/MainApplication.java @@ -5,4 +5,5 @@ */ public class MainApplication { + } From 97dc5f74eb305c3b74cc9a8f5b795957bf1cd9a3 Mon Sep 17 00:00:00 2001 From: Nick Date: Wed, 21 Jul 2021 14:06:02 -0400 Subject: [PATCH 02/48] StorageInterface --- .../froilansfarm/MainApplication.java | 2 +- .../froilansfarm/StorageInterface.java | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/StorageInterface.java diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/MainApplication.java b/src/main/java/com/zipcodewilmington/froilansfarm/MainApplication.java index b9b36eee..035407e4 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/MainApplication.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/MainApplication.java @@ -5,5 +5,5 @@ */ public class MainApplication { - + } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/StorageInterface.java b/src/main/java/com/zipcodewilmington/froilansfarm/StorageInterface.java new file mode 100644 index 00000000..15690298 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/StorageInterface.java @@ -0,0 +1,12 @@ +package com.zipcodewilmington.froilansfarm; + +import java.lang.reflect.Type; + +public interface StorageInterface { + + void add(TypeToStore thingYouAreStoring); + + void remove(TypeToStore thingYouAreStoring); + + int amount(TypeToStore thingYouAreStoring); +} From 23d69fdfd68e71b2b87f16c0ddc43e44d79b7399 Mon Sep 17 00:00:00 2001 From: Nick Date: Wed, 21 Jul 2021 14:19:07 -0400 Subject: [PATCH 03/48] (feat:creating-interfaces --- .../com/zipcodewilmington/froilansfarm/Aircraft.java | 6 ++++++ .../com/zipcodewilmington/froilansfarm/NoiseMaker.java | 6 ++++++ .../com/zipcodewilmington/froilansfarm/Produce.java | 10 ++++++++++ .../com/zipcodewilmington/froilansfarm/Rideable.java | 6 ++++++ .../java/com/zipcodewilmington/froilansfarm/Rider.java | 8 ++++++++ 5 files changed, 36 insertions(+) create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Aircraft.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/NoiseMaker.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Produce.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Rideable.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Rider.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..3d97c0ae --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Aircraft.java @@ -0,0 +1,6 @@ +package com.zipcodewilmington.froilansfarm; + +public interface Aircraft { + + void fly(int distance); +} 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..50523652 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/NoiseMaker.java @@ -0,0 +1,6 @@ +package com.zipcodewilmington.froilansfarm; + +public interface NoiseMaker { + + String noiseMaker (); +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Produce.java b/src/main/java/com/zipcodewilmington/froilansfarm/Produce.java new file mode 100644 index 00000000..6a470614 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Produce.java @@ -0,0 +1,10 @@ +package com.zipcodewilmington.froilansfarm; + +public interface Produce { + + void yield(); + + boolean hasBeenFertilized(); + + boolean hasBeenHarvested(); +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Rideable.java b/src/main/java/com/zipcodewilmington/froilansfarm/Rideable.java new file mode 100644 index 00000000..a63a49e7 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Rideable.java @@ -0,0 +1,6 @@ +package com.zipcodewilmington.froilansfarm; + +public interface Rideable { + + boolean hasBeenRiden(); +} 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..66534ac4 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Rider.java @@ -0,0 +1,8 @@ +package com.zipcodewilmington.froilansfarm; + +public interface Rider { + + void mount(Rideable object); + + void dismount(Rideable object); +} From a0074e8bb9821d337e9cb16e8caf43c369aa8c84 Mon Sep 17 00:00:00 2001 From: Nick Date: Wed, 21 Jul 2021 14:28:27 -0400 Subject: [PATCH 04/48] all interface besides botanist --- src/main/java/com/zipcodewilmington/froilansfarm/Eater.java | 2 ++ src/main/java/com/zipcodewilmington/froilansfarm/Edible.java | 2 ++ 2 files changed, 4 insertions(+) create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Eater.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Edible.java 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..9d3481b8 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Eater.java @@ -0,0 +1,2 @@ +package com.zipcodewilmington.froilansfarm;public interface Eater { +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Edible.java b/src/main/java/com/zipcodewilmington/froilansfarm/Edible.java new file mode 100644 index 00000000..a8721e7d --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Edible.java @@ -0,0 +1,2 @@ +package com.zipcodewilmington.froilansfarm;public interface Edible { +} From 40408dedc1394bf7bbc2f7452339866b8cb6524d Mon Sep 17 00:00:00 2001 From: Dee Date: Wed, 21 Jul 2021 15:46:18 -0400 Subject: [PATCH 05/48] Crop packages added --- pom.xml | 20 +++++++++++ .../froilansfarm/crops/Crop.java | 4 +++ .../froilansfarm/crops/CropRow.java | 34 ++++++++++++++++++ .../froilansfarm/croptests/CropRowTest.java | 36 +++++++++++++++++++ 4 files changed, 94 insertions(+) create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/crops/Crop.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/crops/CropRow.java create mode 100644 src/test/java/com/zipcodewilmington/froilansfarm/croptests/CropRowTest.java diff --git a/pom.xml b/pom.xml index 69a3b878..f8641d42 100644 --- a/pom.xml +++ b/pom.xml @@ -7,6 +7,26 @@ com.zipcodewilmington froilans-farm 1.0-SNAPSHOT + + + + org.apache.maven.plugins + maven-compiler-plugin + + 14 + 14 + + + + + + + junit + junit + 4.13.1 + test + + \ No newline at end of file diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/crops/Crop.java b/src/main/java/com/zipcodewilmington/froilansfarm/crops/Crop.java new file mode 100644 index 00000000..531c570d --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/crops/Crop.java @@ -0,0 +1,4 @@ +package com.zipcodewilmington.froilansfarm.crops; + +public class Crop { +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/crops/CropRow.java b/src/main/java/com/zipcodewilmington/froilansfarm/crops/CropRow.java new file mode 100644 index 00000000..690bd260 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/crops/CropRow.java @@ -0,0 +1,34 @@ +package com.zipcodewilmington.froilansfarm.crops; + +import java.util.ArrayList; +import java.util.List; + +public class CropRow { + List cropRow; + Integer numOfCropsPlanted; + Integer numOfCropsHarvested; + Integer numOfCropsFertilized; + Integer numOfCropsAvailableToEat; + + public CropRow(List cropRow, Integer numOfCropsPlanted, Integer numOfCropsHarvested, Integer numOfCropsFertilized, Integer numOfCropsAvailableToEat) { + this.cropRow = cropRow; + this.numOfCropsPlanted = numOfCropsPlanted; + this.numOfCropsHarvested = numOfCropsHarvested; + this.numOfCropsFertilized = numOfCropsFertilized; + this.numOfCropsAvailableToEat = numOfCropsAvailableToEat; + } + + public CropRow() { + this.cropRow = new ArrayList<>(); + this.numOfCropsPlanted = 0; + this.numOfCropsHarvested = 0; + this.numOfCropsFertilized = 0; + this.numOfCropsAvailableToEat = 0; + } + + public int getNumberofCropsPlanted() {return numOfCropsPlanted;} + + public int getCropRowSize() { + return cropRow.size(); + } +} diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/croptests/CropRowTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/croptests/CropRowTest.java new file mode 100644 index 00000000..8aea93a6 --- /dev/null +++ b/src/test/java/com/zipcodewilmington/froilansfarm/croptests/CropRowTest.java @@ -0,0 +1,36 @@ +package com.zipcodewilmington.froilansfarm.croptests; + +import com.zipcodewilmington.froilansfarm.crops.CropRow; +import org.junit.Assert; +import org.junit.Test; + +public class CropRowTest { + @Test + public void defaultConstructorTest(){ + //given + CropRow testRow = new CropRow(); + + //when + int actual = testRow.getNumberofCropsPlanted(); + + //then + int expected = 0; + Assert.assertEquals(expected, actual); + + } + + @Test + public void defaultConstructorTest2(){ + //given + CropRow testRow = new CropRow(); + + //when + int actual = testRow.getCropRowSize(); + + //then + int expected = 0; + Assert.assertEquals(expected, actual); + + } + +} From 7fca134fb16174f89a82b4a622e1824773d5d9f1 Mon Sep 17 00:00:00 2001 From: Dee Date: Wed, 21 Jul 2021 16:08:02 -0400 Subject: [PATCH 06/48] possible getters --- .../froilansfarm/Aircraft.java | 6 ++++++ .../zipcodewilmington/froilansfarm/Eater.java | 2 ++ .../zipcodewilmington/froilansfarm/Edible.java | 2 ++ .../froilansfarm/NoiseMaker.java | 6 ++++++ .../froilansfarm/Produce.java | 10 ++++++++++ .../froilansfarm/Rideable.java | 6 ++++++ .../zipcodewilmington/froilansfarm/Rider.java | 8 ++++++++ .../froilansfarm/crops/CropRow.java | 18 +++++++++++++++++- 8 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Aircraft.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Eater.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Edible.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/NoiseMaker.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Produce.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Rideable.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Rider.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..3d97c0ae --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Aircraft.java @@ -0,0 +1,6 @@ +package com.zipcodewilmington.froilansfarm; + +public interface Aircraft { + + void fly(int distance); +} 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..9d3481b8 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Eater.java @@ -0,0 +1,2 @@ +package com.zipcodewilmington.froilansfarm;public interface Eater { +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Edible.java b/src/main/java/com/zipcodewilmington/froilansfarm/Edible.java new file mode 100644 index 00000000..a8721e7d --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Edible.java @@ -0,0 +1,2 @@ +package com.zipcodewilmington.froilansfarm;public interface Edible { +} 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..50523652 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/NoiseMaker.java @@ -0,0 +1,6 @@ +package com.zipcodewilmington.froilansfarm; + +public interface NoiseMaker { + + String noiseMaker (); +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Produce.java b/src/main/java/com/zipcodewilmington/froilansfarm/Produce.java new file mode 100644 index 00000000..6a470614 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Produce.java @@ -0,0 +1,10 @@ +package com.zipcodewilmington.froilansfarm; + +public interface Produce { + + void yield(); + + boolean hasBeenFertilized(); + + boolean hasBeenHarvested(); +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Rideable.java b/src/main/java/com/zipcodewilmington/froilansfarm/Rideable.java new file mode 100644 index 00000000..a63a49e7 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Rideable.java @@ -0,0 +1,6 @@ +package com.zipcodewilmington.froilansfarm; + +public interface Rideable { + + boolean hasBeenRiden(); +} 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..66534ac4 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Rider.java @@ -0,0 +1,8 @@ +package com.zipcodewilmington.froilansfarm; + +public interface Rider { + + void mount(Rideable object); + + void dismount(Rideable object); +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/crops/CropRow.java b/src/main/java/com/zipcodewilmington/froilansfarm/crops/CropRow.java index 690bd260..f98306b9 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/crops/CropRow.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/crops/CropRow.java @@ -26,9 +26,25 @@ public CropRow() { this.numOfCropsAvailableToEat = 0; } - public int getNumberofCropsPlanted() {return numOfCropsPlanted;} + public int getNumberofCropsPlanted() {return cropRow.size();} public int getCropRowSize() { return cropRow.size(); } + + public Integer getNumOfCropsPlanted() { + return numOfCropsPlanted; + } + + public Integer getNumOfCropsHarvested() { + return numOfCropsHarvested; + } + + public Integer getNumOfCropsFertilized() { + return numOfCropsFertilized; + } + + public Integer getNumOfCropsAvailableToEat() { + return numOfCropsAvailableToEat; + } } From 95609db63cf1f3a782ff3176a9ce8632ffbdf2cc Mon Sep 17 00:00:00 2001 From: charnaexw Date: Wed, 21 Jul 2021 16:08:27 -0400 Subject: [PATCH 07/48] BareBones Classes and Tests --- pom.xml | 14 +++++++++ .../froilansfarm/Vehilce/CropDuster.java | 4 +++ .../froilansfarm/Vehilce/FarmVehicle.java | 4 +++ .../froilansfarm/Vehilce/Tractor.java | 4 +++ .../froilansfarm/Vehilce/Vehicle.java | 4 +++ .../froilansfarm/Vehicles/CropDusterTest.java | 31 +++++++++++++++++++ .../Vehicles/FarmVehicleTest.java | 16 ++++++++++ .../froilansfarm/Vehicles/TractorTest.java | 14 +++++++++ 8 files changed, 91 insertions(+) create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Vehilce/CropDuster.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Vehilce/FarmVehicle.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Vehilce/Tractor.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Vehilce/Vehicle.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 diff --git a/pom.xml b/pom.xml index 69a3b878..d5e9b162 100644 --- a/pom.xml +++ b/pom.xml @@ -7,6 +7,20 @@ com.zipcodewilmington froilans-farm 1.0-SNAPSHOT + + + junit + junit + 4.8.2 + test + + + junit + junit + 4.8.2 + test + + \ No newline at end of file diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Vehilce/CropDuster.java b/src/main/java/com/zipcodewilmington/froilansfarm/Vehilce/CropDuster.java new file mode 100644 index 00000000..3806139b --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Vehilce/CropDuster.java @@ -0,0 +1,4 @@ +package com.zipcodewilmington.froilansfarm.Vehilce; + +public class CropDuster { +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Vehilce/FarmVehicle.java b/src/main/java/com/zipcodewilmington/froilansfarm/Vehilce/FarmVehicle.java new file mode 100644 index 00000000..a28d3366 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Vehilce/FarmVehicle.java @@ -0,0 +1,4 @@ +package com.zipcodewilmington.froilansfarm.Vehilce; + +public class FarmVehicle { +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Vehilce/Tractor.java b/src/main/java/com/zipcodewilmington/froilansfarm/Vehilce/Tractor.java new file mode 100644 index 00000000..f6b6f828 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Vehilce/Tractor.java @@ -0,0 +1,4 @@ +package com.zipcodewilmington.froilansfarm.Vehilce; + +public class Tractor { +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Vehilce/Vehicle.java b/src/main/java/com/zipcodewilmington/froilansfarm/Vehilce/Vehicle.java new file mode 100644 index 00000000..c90ce4b2 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Vehilce/Vehicle.java @@ -0,0 +1,4 @@ +package com.zipcodewilmington.froilansfarm.Vehilce; + +public interface Vehicle { +} 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..0be0e8e3 --- /dev/null +++ b/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDusterTest.java @@ -0,0 +1,31 @@ +package com.zipcodewilmington.froilansfarm.Vehicles; + +import org.junit.Assert; +import org.junit.Test; + +public class CropDusterTest { + @Test + public class constructorTest(){ + //given + + + //when + + //then + } + @Test + public class nullaryConstructorTest(){ + //given + + //when + + //then + Assert.assertEquals(expected, actual); + } + @Test + public class constructorTest(){ + //given + //when + //then + } +} 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..208139d9 --- /dev/null +++ b/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/FarmVehicleTest.java @@ -0,0 +1,16 @@ +package com.zipcodewilmington.froilansfarm.Vehicles; + +import org.junit.Test; + +public class FarmVehicleTest { + + @Test + public class constructorTest(){ + //given + + //when + + //then + } + +} 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..a3a051f4 --- /dev/null +++ b/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/TractorTest.java @@ -0,0 +1,14 @@ +package com.zipcodewilmington.froilansfarm.Vehicles; + +import org.junit.Test; + +public class TractorTest { + + @Test + public class constructorTest(){ + //given + //when + //then + } + +} From 0561b2bef9b2581045e0b7a99c004e3fdc2dacde Mon Sep 17 00:00:00 2001 From: Nick Date: Wed, 21 Jul 2021 16:34:14 -0400 Subject: [PATCH 08/48] (feat:storage) Stable and ChickenCoop created with skeleton chicken and horse class --- .../froilansfarm/Chicken.java | 4 +++ .../froilansfarm/ChickenCoop.java | 30 +++++++++++++++++ .../zipcodewilmington/froilansfarm/Eater.java | 8 ++++- .../froilansfarm/Edible.java | 6 +++- .../zipcodewilmington/froilansfarm/Farm.java | 25 +++++++++++++++ .../zipcodewilmington/froilansfarm/Field.java | 32 +++++++++++++++++++ .../zipcodewilmington/froilansfarm/Horse.java | 4 +++ .../froilansfarm/Produce.java | 2 +- .../froilansfarm/Stable.java | 30 +++++++++++++++++ 9 files changed, 138 insertions(+), 3 deletions(-) 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/Field.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/Chicken.java b/src/main/java/com/zipcodewilmington/froilansfarm/Chicken.java new file mode 100644 index 00000000..0b7f8fb3 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Chicken.java @@ -0,0 +1,4 @@ +package com.zipcodewilmington.froilansfarm; + +public class Chicken { +} 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..33b481e2 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/ChickenCoop.java @@ -0,0 +1,30 @@ +package com.zipcodewilmington.froilansfarm; + +import java.util.ArrayList; +import java.util.List; + +public class ChickenCoop implements StorageInterface { + + List listOfChicken; + + public ChickenCoop () { + listOfChicken = new ArrayList<>(); + } + + @Override + public void add(Object thingYouAreStoring) { + Chicken chicken = new Chicken(); + listOfChicken.add(chicken); + } + + @Override + public void remove(Object thingYouAreStoring) { + Chicken chicken = new Chicken(); + listOfChicken.remove(chicken); + } + + @Override + public int amount(Object thingYouAreStoring) { + return listOfChicken.size(); + } +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Eater.java b/src/main/java/com/zipcodewilmington/froilansfarm/Eater.java index 9d3481b8..d8fd7aab 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Eater.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Eater.java @@ -1,2 +1,8 @@ -package com.zipcodewilmington.froilansfarm;public interface Eater { +package com.zipcodewilmington.froilansfarm; + +public interface Eater { + + void eat(Edible object); + + boolean hasEaten(); } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Edible.java b/src/main/java/com/zipcodewilmington/froilansfarm/Edible.java index a8721e7d..1aa67c17 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Edible.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Edible.java @@ -1,2 +1,6 @@ -package com.zipcodewilmington.froilansfarm;public interface Edible { +package com.zipcodewilmington.froilansfarm; + +public interface Edible { + + boolean isEaten(); } 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..a4003c77 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Farm.java @@ -0,0 +1,25 @@ +package com.zipcodewilmington.froilansfarm; + +public class Farm implements StorageInterface { + + // List animalStorage + + public Farm () { + + } + + @Override + public void add(Object thingYouAreStoring) { + + } + + @Override + public void remove(Object thingYouAreStoring) { + + } + + @Override + public int amount(Object thingYouAreStoring) { + return 0; + } +} 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..4cff802d --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Field.java @@ -0,0 +1,32 @@ +package com.zipcodewilmington.froilansfarm; + +import com.zipcodewilmington.froilansfarm.crops.CropRow; + +import java.util.ArrayList; +import java.util.List; + +public class Field implements StorageInterface { + + List listOfCropRow; + + public Field () { + this.listOfCropRow = new ArrayList<>(); + } + + @Override + public void add(Object thingYouAreStoring) { + CropRow cropRow = new CropRow(); + listOfCropRow.add(cropRow); + } + + @Override + public void remove(Object thingYouAreStoring) { + CropRow cropRow = new CropRow(); + listOfCropRow.remove(cropRow); + } + + @Override + public int amount(Object thingYouAreStoring) { + return listOfCropRow.size(); + } +} 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..54daa76b --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Horse.java @@ -0,0 +1,4 @@ +package com.zipcodewilmington.froilansfarm; + +public class Horse { +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Produce.java b/src/main/java/com/zipcodewilmington/froilansfarm/Produce.java index 6a470614..064a5f3e 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Produce.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Produce.java @@ -2,7 +2,7 @@ public interface Produce { - void yield(); + void yield(Edible object); boolean hasBeenFertilized(); 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..79425a28 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Stable.java @@ -0,0 +1,30 @@ +package com.zipcodewilmington.froilansfarm; + +import java.util.ArrayList; +import java.util.List; + +public class Stable implements StorageInterface { + + List listOfHorses; + + public Stable () { + listOfHorses = new ArrayList<>(); + } + + @Override + public void add(Object thingYouAreStoring) { + Horse horse = new Horse(); + listOfHorses.add(horse); + } + + @Override + public void remove(Object thingYouAreStoring) { + Horse horse = new Horse(); + listOfHorses.remove(horse); + } + + @Override + public int amount(Object thingYouAreStoring) { + return listOfHorses.size(); + } +} From 5ccec5599e5a10f573408e1b84d2a0ad1e8d530c Mon Sep 17 00:00:00 2001 From: sitarameez Date: Wed, 21 Jul 2021 16:47:13 -0400 Subject: [PATCH 09/48] done something need interface --- pom.xml | 8 ++++++ src/main/java/Animal/Animal.java | 35 ++++++++++++++++++++++++ src/main/java/Animal/Barn.java | 15 ++++++++++ src/main/java/Animal/Chicken.java | 4 +++ src/main/java/Animal/Farmer.java | 19 +++++++++++++ src/main/java/Animal/Horse.java | 4 +++ src/main/java/Animal/Person.java | 23 ++++++++++++++++ src/test/java/AnimalTest/AnimalTest.java | 18 ++++++++++++ 8 files changed, 126 insertions(+) create mode 100644 src/main/java/Animal/Animal.java create mode 100644 src/main/java/Animal/Barn.java create mode 100644 src/main/java/Animal/Chicken.java create mode 100644 src/main/java/Animal/Farmer.java create mode 100644 src/main/java/Animal/Horse.java create mode 100644 src/main/java/Animal/Person.java create mode 100644 src/test/java/AnimalTest/AnimalTest.java diff --git a/pom.xml b/pom.xml index 69a3b878..dcf2b919 100644 --- a/pom.xml +++ b/pom.xml @@ -7,6 +7,14 @@ com.zipcodewilmington froilans-farm 1.0-SNAPSHOT + + + junit + junit + 4.13.1 + test + + \ No newline at end of file diff --git a/src/main/java/Animal/Animal.java b/src/main/java/Animal/Animal.java new file mode 100644 index 00000000..0b56b1d0 --- /dev/null +++ b/src/main/java/Animal/Animal.java @@ -0,0 +1,35 @@ +package Animal; + +public class Animal { + String name; + Integer age; + Integer amountOfFoodEaten; + + public Animal(String name,Integer Age,Integer amountOfFoodEaten){ + this.name=name; + this.age=age; + this.amountOfFoodEaten=amountOfFoodEaten; + } +public Animal(){ + this.name=""; + this.age=0; + this.amountOfFoodEaten=0; +} + + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public Integer getAge() { + return age; + } + + public void setAge(Integer age) { + this.age = age; + } +} diff --git a/src/main/java/Animal/Barn.java b/src/main/java/Animal/Barn.java new file mode 100644 index 00000000..ffa6d9ba --- /dev/null +++ b/src/main/java/Animal/Barn.java @@ -0,0 +1,15 @@ +package Animal; + +import java.util.ArrayList; +import java.util.List; + +public class Barn { + List animals; + + public Barn(){ + animals= new ArrayList(); + } + public void add(T animal){ + animals.add(animal); + } +} diff --git a/src/main/java/Animal/Chicken.java b/src/main/java/Animal/Chicken.java new file mode 100644 index 00000000..b18c3be2 --- /dev/null +++ b/src/main/java/Animal/Chicken.java @@ -0,0 +1,4 @@ +package Animal; + +public class Chicken { +} diff --git a/src/main/java/Animal/Farmer.java b/src/main/java/Animal/Farmer.java new file mode 100644 index 00000000..4550efe0 --- /dev/null +++ b/src/main/java/Animal/Farmer.java @@ -0,0 +1,19 @@ +package Animal; + +import java.security.PrivateKey; + +public class Farmer { + String name="Froilan"; + + public Farmer(String name){ + this.name=name; + } + + public String getName() { + return name; + } + +// public void setName(String name) { +// this.name = name; +// } +} diff --git a/src/main/java/Animal/Horse.java b/src/main/java/Animal/Horse.java new file mode 100644 index 00000000..c86cecc8 --- /dev/null +++ b/src/main/java/Animal/Horse.java @@ -0,0 +1,4 @@ +package Animal; + +public class Horse { +} diff --git a/src/main/java/Animal/Person.java b/src/main/java/Animal/Person.java new file mode 100644 index 00000000..0c45fcd7 --- /dev/null +++ b/src/main/java/Animal/Person.java @@ -0,0 +1,23 @@ +package Animal; + +public class Person { + String name; + int amountOfFoodEaten; + + public Person(String name,int amountOfFoodEaten){ + this.name=name; + this.amountOfFoodEaten=amountOfFoodEaten; + } + + public Person(){ + + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} diff --git a/src/test/java/AnimalTest/AnimalTest.java b/src/test/java/AnimalTest/AnimalTest.java new file mode 100644 index 00000000..5ae1856d --- /dev/null +++ b/src/test/java/AnimalTest/AnimalTest.java @@ -0,0 +1,18 @@ +package AnimalTest; +import org.junit.Test; +import org.junit.Assert; +public class AnimalTest { + + @Test + public void constructorTest(){} + //given + AnimalTest animal=new AnimalTest(); + Integer age=0; + Integer amountOfFoodEaten; + + //when + int actual=animal.age; + + //then +//assertEquals(animal.getAnimalAge,actual); +} From f7b9def029dbf121984c4325f4b8088024fcff3d Mon Sep 17 00:00:00 2001 From: Nick Date: Wed, 21 Jul 2021 17:08:44 -0400 Subject: [PATCH 10/48] (feat:chickenCoopTest) --- pom.xml | 4 +- .../zipcodewilmington/froilansfarm/Horse.java | 9 +++- .../{ => storage}/ChickenCoop.java | 8 +++- .../froilansfarm/{ => storage}/Farm.java | 6 ++- .../froilansfarm/{ => storage}/Field.java | 2 +- .../froilansfarm/{ => storage}/Stable.java | 4 +- .../{ => storage}/StorageInterface.java | 2 +- .../froilansfarm/Vehicles/CropDusterTest.java | 18 ++++---- .../Vehicles/FarmVehicleTest.java | 2 +- .../froilansfarm/Vehicles/TractorTest.java | 2 +- .../testStorage/ChickenCoopTest.java | 45 +++++++++++++++++++ 11 files changed, 82 insertions(+), 20 deletions(-) rename src/main/java/com/zipcodewilmington/froilansfarm/{ => storage}/ChickenCoop.java (77%) rename src/main/java/com/zipcodewilmington/froilansfarm/{ => storage}/Farm.java (74%) rename src/main/java/com/zipcodewilmington/froilansfarm/{ => storage}/Field.java (92%) rename src/main/java/com/zipcodewilmington/froilansfarm/{ => storage}/Stable.java (85%) rename src/main/java/com/zipcodewilmington/froilansfarm/{ => storage}/StorageInterface.java (81%) create mode 100644 src/test/java/com/zipcodewilmington/froilansfarm/testStorage/ChickenCoopTest.java diff --git a/pom.xml b/pom.xml index f8641d42..5c6a40d7 100644 --- a/pom.xml +++ b/pom.xml @@ -13,8 +13,8 @@ org.apache.maven.plugins maven-compiler-plugin - 14 - 14 + 8 + 8 diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Horse.java b/src/main/java/com/zipcodewilmington/froilansfarm/Horse.java index 54daa76b..168c12f0 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Horse.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Horse.java @@ -1,4 +1,11 @@ package com.zipcodewilmington.froilansfarm; -public class Horse { +public class Horse implements Rideable { + + + + @Override + public boolean hasBeenRiden() { + return false; + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/ChickenCoop.java b/src/main/java/com/zipcodewilmington/froilansfarm/storage/ChickenCoop.java similarity index 77% rename from src/main/java/com/zipcodewilmington/froilansfarm/ChickenCoop.java rename to src/main/java/com/zipcodewilmington/froilansfarm/storage/ChickenCoop.java index 33b481e2..ba71a307 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/ChickenCoop.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/storage/ChickenCoop.java @@ -1,4 +1,6 @@ -package com.zipcodewilmington.froilansfarm; +package com.zipcodewilmington.froilansfarm.storage; + +import com.zipcodewilmington.froilansfarm.Chicken; import java.util.ArrayList; import java.util.List; @@ -27,4 +29,8 @@ public void remove(Object thingYouAreStoring) { public int amount(Object thingYouAreStoring) { return listOfChicken.size(); } + + public List getListOfChicken() { + return listOfChicken; + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Farm.java b/src/main/java/com/zipcodewilmington/froilansfarm/storage/Farm.java similarity index 74% rename from src/main/java/com/zipcodewilmington/froilansfarm/Farm.java rename to src/main/java/com/zipcodewilmington/froilansfarm/storage/Farm.java index a4003c77..11f07fd3 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Farm.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/storage/Farm.java @@ -1,11 +1,13 @@ -package com.zipcodewilmington.froilansfarm; +package com.zipcodewilmington.froilansfarm.storage; + +import com.zipcodewilmington.froilansfarm.storage.StorageInterface; public class Farm implements StorageInterface { // List animalStorage public Farm () { - + } @Override diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Field.java b/src/main/java/com/zipcodewilmington/froilansfarm/storage/Field.java similarity index 92% rename from src/main/java/com/zipcodewilmington/froilansfarm/Field.java rename to src/main/java/com/zipcodewilmington/froilansfarm/storage/Field.java index 4cff802d..33494827 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Field.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/storage/Field.java @@ -1,4 +1,4 @@ -package com.zipcodewilmington.froilansfarm; +package com.zipcodewilmington.froilansfarm.storage; import com.zipcodewilmington.froilansfarm.crops.CropRow; diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Stable.java b/src/main/java/com/zipcodewilmington/froilansfarm/storage/Stable.java similarity index 85% rename from src/main/java/com/zipcodewilmington/froilansfarm/Stable.java rename to src/main/java/com/zipcodewilmington/froilansfarm/storage/Stable.java index 79425a28..e3409e42 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Stable.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/storage/Stable.java @@ -1,4 +1,6 @@ -package com.zipcodewilmington.froilansfarm; +package com.zipcodewilmington.froilansfarm.storage; + +import com.zipcodewilmington.froilansfarm.Horse; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/StorageInterface.java b/src/main/java/com/zipcodewilmington/froilansfarm/storage/StorageInterface.java similarity index 81% rename from src/main/java/com/zipcodewilmington/froilansfarm/StorageInterface.java rename to src/main/java/com/zipcodewilmington/froilansfarm/storage/StorageInterface.java index 15690298..4ccf5612 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/StorageInterface.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/storage/StorageInterface.java @@ -1,4 +1,4 @@ -package com.zipcodewilmington.froilansfarm; +package com.zipcodewilmington.froilansfarm.storage; import java.lang.reflect.Type; diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDusterTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDusterTest.java index 0be0e8e3..49766b0e 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDusterTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDusterTest.java @@ -5,7 +5,7 @@ public class CropDusterTest { @Test - public class constructorTest(){ + public void constructorTest(){ //given @@ -14,18 +14,18 @@ public class constructorTest(){ //then } @Test - public class nullaryConstructorTest(){ + public void nullaryConstructorTest(){ //given //when //then - Assert.assertEquals(expected, actual); - } - @Test - public class constructorTest(){ - //given - //when - //then + // Assert.assertEquals(expected, actual); } +// @Test +// public void constructorTest(){ +// //given +// //when +// //then +// } } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/FarmVehicleTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/FarmVehicleTest.java index 208139d9..db62d9fd 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/FarmVehicleTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/FarmVehicleTest.java @@ -5,7 +5,7 @@ public class FarmVehicleTest { @Test - public class constructorTest(){ + public void constructorTest(){ //given //when diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/TractorTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/TractorTest.java index a3a051f4..f2e01714 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/TractorTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/TractorTest.java @@ -5,7 +5,7 @@ public class TractorTest { @Test - public class constructorTest(){ + public void constructorTest(){ //given //when //then diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/testStorage/ChickenCoopTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/testStorage/ChickenCoopTest.java new file mode 100644 index 00000000..9d0aaff9 --- /dev/null +++ b/src/test/java/com/zipcodewilmington/froilansfarm/testStorage/ChickenCoopTest.java @@ -0,0 +1,45 @@ +package com.zipcodewilmington.froilansfarm.testStorage; + +import com.zipcodewilmington.froilansfarm.Chicken; +import com.zipcodewilmington.froilansfarm.storage.ChickenCoop; +import com.zipcodewilmington.froilansfarm.storage.StorageInterface; +import org.junit.Assert; +import org.junit.Test; + +public class ChickenCoopTest { + + @Test + public void implementTest () { + ChickenCoop cc = new ChickenCoop(); + + Assert.assertTrue(cc instanceof StorageInterface); + } + + @Test + public void addTest () { + ChickenCoop cc = new ChickenCoop(); + Chicken chicken = new Chicken(); + Integer expected = 1; + + cc.add(chicken); + Integer actual = cc.getListOfChicken().size(); + + Assert.assertEquals(expected, actual); + } + + @Test + public void removeTest () { + ChickenCoop cc = new ChickenCoop(); + Chicken chicken = new Chicken(); + Chicken chicken1 = new Chicken(); + Integer expected = 1; + + cc.add(chicken); + cc.add(chicken1); + cc.remove(chicken); + Integer actual = cc.getListOfChicken().size(); + + Assert.assertEquals(expected, actual); + // I return an extra chicken, oops + } +} From 22c1ad730e32cbd654e26cc9ecb9f7470d4ce7a4 Mon Sep 17 00:00:00 2001 From: sitarameez Date: Wed, 21 Jul 2021 18:27:15 -0400 Subject: [PATCH 11/48] bad --- pom.xml | 18 ++++++- src/main/java/Animal/Animal.java | 20 +++++-- src/main/java/Animal/Barn.java | 16 ++++-- src/main/java/Animal/Chicken.java | 33 +++++++++++- src/main/java/Animal/Farmer.java | 53 +++++++++++++++++-- src/main/java/Animal/Horse.java | 18 ++++++- .../froilansfarm/Vehilce/Botanist.java | 10 ++++ src/test/java/AnimalTest/AnimalTest.java | 19 ++++--- .../froilansfarm/Vehicles/CropDusterTest.java | 18 +++---- .../Vehicles/FarmVehicleTest.java | 2 +- .../froilansfarm/Vehicles/TractorTest.java | 2 +- 11 files changed, 177 insertions(+), 32 deletions(-) create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Vehilce/Botanist.java diff --git a/pom.xml b/pom.xml index dcf2b919..fd4fda70 100644 --- a/pom.xml +++ b/pom.xml @@ -7,14 +7,30 @@ com.zipcodewilmington froilans-farm 1.0-SNAPSHOT + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + 8 + 8 + + + + + junit junit - 4.13.1 + 4.12 test + \ No newline at end of file diff --git a/src/main/java/Animal/Animal.java b/src/main/java/Animal/Animal.java index 0b56b1d0..808f8f66 100644 --- a/src/main/java/Animal/Animal.java +++ b/src/main/java/Animal/Animal.java @@ -1,6 +1,10 @@ package Animal; -public class Animal { +import com.zipcodewilmington.froilansfarm.Eater; +import com.zipcodewilmington.froilansfarm.Edible; +import com.zipcodewilmington.froilansfarm.NoiseMaker; + +public class Animal implements NoiseMaker, Eater { String name; Integer age; Integer amountOfFoodEaten; @@ -15,8 +19,6 @@ public Animal(){ this.age=0; this.amountOfFoodEaten=0; } - - public String getName() { return name; } @@ -32,4 +34,16 @@ public Integer getAge() { public void setAge(Integer age) { this.age = age; } + + public void eat(Edible object) { + + } + + public boolean hasEaten() { + return false; + } + + public String noiseMaker() { + return null; + } } diff --git a/src/main/java/Animal/Barn.java b/src/main/java/Animal/Barn.java index ffa6d9ba..e2151d59 100644 --- a/src/main/java/Animal/Barn.java +++ b/src/main/java/Animal/Barn.java @@ -6,10 +6,18 @@ public class Barn { List animals; - public Barn(){ - animals= new ArrayList(); + public Barn() { + animals = new ArrayList(); } - public void add(T animal){ + + public Integer numberOfAnimals(T animal){ + return animals.size(); + } + public void add(T animal) { animals.add(animal); } -} + + public void remove(T animal) { + animals.remove(animal); + } +} \ No newline at end of file diff --git a/src/main/java/Animal/Chicken.java b/src/main/java/Animal/Chicken.java index b18c3be2..ce501aa7 100644 --- a/src/main/java/Animal/Chicken.java +++ b/src/main/java/Animal/Chicken.java @@ -1,4 +1,35 @@ package Animal; -public class Chicken { +import com.zipcodewilmington.froilansfarm.Edible; +import com.zipcodewilmington.froilansfarm.Produce; + +public class Chicken extends Animal implements Produce { + Boolean isFertilized=false; + Integer eggs; + + + + public void yield(Edible object) { + if(isFertilized==true){ + eggs+=1; + } + else { + isFertilized=false; + } + } + + public boolean hasBeenFertilized() { + return false; + } + + public boolean hasBeenHarvested() { + return false; + } + + public String makeNoise(){ + return "Cluck!"; + } + public void eat(Edible Object){ + + } } diff --git a/src/main/java/Animal/Farmer.java b/src/main/java/Animal/Farmer.java index 4550efe0..f88b956e 100644 --- a/src/main/java/Animal/Farmer.java +++ b/src/main/java/Animal/Farmer.java @@ -1,18 +1,65 @@ package Animal; +import com.zipcodewilmington.froilansfarm.Eater; +import com.zipcodewilmington.froilansfarm.Edible; +import com.zipcodewilmington.froilansfarm.Rideable; +import com.zipcodewilmington.froilansfarm.Rider; +import com.zipcodewilmington.froilansfarm.Vehilce.Botanist; +import com.zipcodewilmington.froilansfarm.crops.Crop; + import java.security.PrivateKey; +import java.util.ArrayList; +import java.util.List; -public class Farmer { +public class Farmer extends Person implements Rider, Eater, Botanist { + Integer numberOfRidesTaken; + Integer numberOfCropsPlanted; + Integer numberOfEdiblesEaten; + List thingsEaten; String name="Froilan"; - public Farmer(String name){ - this.name=name; + + public Farmer( Integer numberOfRidesTaken,Integer numberOfCropsPlanted,Integer numberOfEdiblesEaten + ,String name){ + this.numberOfRidesTaken=numberOfRidesTaken; + this.numberOfCropsPlanted=numberOfCropsPlanted; + this.numberOfEdiblesEaten=numberOfEdiblesEaten; + this.name=name; + + } + + public Farmer(){ + thingsEaten= new ArrayList(); } public String getName() { return name; } + public void mount(Rideable object) { + + } + + public void dismount(Rideable object) { + + } + + public void eat(Edible object) { + + } + + public boolean hasEaten() { + return false; + } + + public void plant(Crop Object) { + + } + + public int setNumberOfplants() { + return 0; + } + // public void setName(String name) { // this.name = name; // } diff --git a/src/main/java/Animal/Horse.java b/src/main/java/Animal/Horse.java index c86cecc8..10937741 100644 --- a/src/main/java/Animal/Horse.java +++ b/src/main/java/Animal/Horse.java @@ -1,4 +1,20 @@ package Animal; -public class Horse { +import com.zipcodewilmington.froilansfarm.Rideable; + +public class Horse extends Animal implements Rideable { + + + public Horse(String name,Integer age,Integer amountOfFoodEaten){ + super(name,age,amountOfFoodEaten); + } + + + public boolean hasBeenRiden() { + return false; + } + + public String makeNoise() { + return "Neigh!"; + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Vehilce/Botanist.java b/src/main/java/com/zipcodewilmington/froilansfarm/Vehilce/Botanist.java new file mode 100644 index 00000000..b84c0b4e --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Vehilce/Botanist.java @@ -0,0 +1,10 @@ +package com.zipcodewilmington.froilansfarm.Vehilce; + +import com.zipcodewilmington.froilansfarm.crops.Crop; + +public interface Botanist { + void plant(Crop Object); + + int setNumberOfplants(); + +} diff --git a/src/test/java/AnimalTest/AnimalTest.java b/src/test/java/AnimalTest/AnimalTest.java index 5ae1856d..f3939573 100644 --- a/src/test/java/AnimalTest/AnimalTest.java +++ b/src/test/java/AnimalTest/AnimalTest.java @@ -1,18 +1,21 @@ package AnimalTest; +import Animal.Animal; import org.junit.Test; import org.junit.Assert; public class AnimalTest { @Test - public void constructorTest(){} + public void constructorTest(){ Integer age=0; + Integer amountOfFoodEaten; + Animal animal=new Animal(); + //when + int actual=animal.getAge(); + + //then + Assert.assertEquals(0,actual); + } //given - AnimalTest animal=new AnimalTest(); - Integer age=0; - Integer amountOfFoodEaten; - //when - int actual=animal.age; - //then -//assertEquals(animal.getAnimalAge,actual); + } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDusterTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDusterTest.java index 0be0e8e3..6b963bef 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDusterTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDusterTest.java @@ -5,7 +5,7 @@ public class CropDusterTest { @Test - public class constructorTest(){ + public void constructorTest(){ //given @@ -14,18 +14,18 @@ public class constructorTest(){ //then } @Test - public class nullaryConstructorTest(){ + public void nullaryConstructorTest(){ //given //when //then - Assert.assertEquals(expected, actual); - } - @Test - public class constructorTest(){ - //given - //when - //then + // Assert.assertEquals(expected, actual); } +// @Test +// public void constructorTest(){ +// //given +// //when +// //then +// } } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/FarmVehicleTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/FarmVehicleTest.java index 208139d9..db62d9fd 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/FarmVehicleTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/FarmVehicleTest.java @@ -5,7 +5,7 @@ public class FarmVehicleTest { @Test - public class constructorTest(){ + public void constructorTest(){ //given //when diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/TractorTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/TractorTest.java index a3a051f4..f2e01714 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/TractorTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/TractorTest.java @@ -5,7 +5,7 @@ public class TractorTest { @Test - public class constructorTest(){ + public void constructorTest(){ //given //when //then From 94747c089e9a3dc06c156bd31876bcf343e11a75 Mon Sep 17 00:00:00 2001 From: sitarameez Date: Wed, 21 Jul 2021 19:44:07 -0400 Subject: [PATCH 12/48] wrote all classes and some test cases not sure if its right --- src/main/java/Animal/Barn.java | 10 +++++ src/main/java/Animal/Chicken.java | 3 +- src/main/java/Animal/Farmer.java | 8 ++-- src/main/java/Animal/Person.java | 11 ++++- .../froilansfarm/Vehilce/Botanist.java | 2 +- src/test/java/AnimalTest/AnimalTest.java | 12 ++++++ src/test/java/AnimalTest/BarnTest.java | 43 +++++++++++++++++++ src/test/java/AnimalTest/ChickenTest.java | 29 +++++++++++++ src/test/java/AnimalTest/FarmerTest.java | 20 +++++++++ src/test/java/AnimalTest/PersonTest.java | 30 +++++++++++++ src/test/java/AnimalTest/horseTest.java | 29 +++++++++++++ 11 files changed, 190 insertions(+), 7 deletions(-) create mode 100644 src/test/java/AnimalTest/BarnTest.java create mode 100644 src/test/java/AnimalTest/ChickenTest.java create mode 100644 src/test/java/AnimalTest/FarmerTest.java create mode 100644 src/test/java/AnimalTest/PersonTest.java create mode 100644 src/test/java/AnimalTest/horseTest.java diff --git a/src/main/java/Animal/Barn.java b/src/main/java/Animal/Barn.java index e2151d59..a863d409 100644 --- a/src/main/java/Animal/Barn.java +++ b/src/main/java/Animal/Barn.java @@ -13,6 +13,8 @@ public Barn() { public Integer numberOfAnimals(T animal){ return animals.size(); } + + public void add(T animal) { animals.add(animal); } @@ -20,4 +22,12 @@ public void add(T animal) { public void remove(T animal) { animals.remove(animal); } + + public List getAnimals() { + return animals; + } + + public void setAnimals(List animals) { + this.animals = animals; + } } \ No newline at end of file diff --git a/src/main/java/Animal/Chicken.java b/src/main/java/Animal/Chicken.java index ce501aa7..c32e633a 100644 --- a/src/main/java/Animal/Chicken.java +++ b/src/main/java/Animal/Chicken.java @@ -7,7 +7,7 @@ public class Chicken extends Animal implements Produce { Boolean isFertilized=false; Integer eggs; - +public Chicken(){} public void yield(Edible object) { if(isFertilized==true){ @@ -29,6 +29,7 @@ public boolean hasBeenHarvested() { public String makeNoise(){ return "Cluck!"; } + public void eat(Edible Object){ } diff --git a/src/main/java/Animal/Farmer.java b/src/main/java/Animal/Farmer.java index f88b956e..250e6601 100644 --- a/src/main/java/Animal/Farmer.java +++ b/src/main/java/Animal/Farmer.java @@ -56,11 +56,11 @@ public void plant(Crop Object) { } - public int setNumberOfplants() { + public int setNumberOfPlants() { return 0; } -// public void setName(String name) { -// this.name = name; -// } + public void setName(String name) { + this.name = name; + } } diff --git a/src/main/java/Animal/Person.java b/src/main/java/Animal/Person.java index 0c45fcd7..5b50948d 100644 --- a/src/main/java/Animal/Person.java +++ b/src/main/java/Animal/Person.java @@ -10,7 +10,8 @@ public Person(String name,int amountOfFoodEaten){ } public Person(){ - + this.name=""; + this.amountOfFoodEaten=0; } public String getName() { @@ -20,4 +21,12 @@ public String getName() { public void setName(String name) { this.name = name; } + + public int getAmountOfFoodEaten() { + return amountOfFoodEaten; + } + + public void setAmountOfFoodEaten(int amountOfFoodEaten) { + this.amountOfFoodEaten = amountOfFoodEaten; + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Vehilce/Botanist.java b/src/main/java/com/zipcodewilmington/froilansfarm/Vehilce/Botanist.java index b84c0b4e..a83d8345 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Vehilce/Botanist.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Vehilce/Botanist.java @@ -5,6 +5,6 @@ public interface Botanist { void plant(Crop Object); - int setNumberOfplants(); + int setNumberOfPlants(); } diff --git a/src/test/java/AnimalTest/AnimalTest.java b/src/test/java/AnimalTest/AnimalTest.java index f3939573..fad8cf5a 100644 --- a/src/test/java/AnimalTest/AnimalTest.java +++ b/src/test/java/AnimalTest/AnimalTest.java @@ -16,6 +16,18 @@ public class AnimalTest { } //given + @Test + public void constructorTest2(){ Integer age=0; + Integer amountOfFoodEaten; + Animal animal=new Animal(); + //when + String actual=animal.getName(); + + //then + Assert.assertEquals("",actual); + } + + } diff --git a/src/test/java/AnimalTest/BarnTest.java b/src/test/java/AnimalTest/BarnTest.java new file mode 100644 index 00000000..0c963c15 --- /dev/null +++ b/src/test/java/AnimalTest/BarnTest.java @@ -0,0 +1,43 @@ +package AnimalTest; + +import Animal.Barn; +import org.junit.Assert; +import org.junit.Test; + +import java.util.ArrayList; +import java.util.List; + +public class BarnTest { + + @Test + public void numberOfAnimalsTest() { + Barn barn = new Barn(); + List animals = new ArrayList<>(); + animals.add("chicken"); + animals.add("horse"); + animals.add("chick"); + Integer expected = 3; + Assert.assertEquals(3, animals.size()); + } + + @Test + public void addTest() { + Barn barn = new Barn(); + List animals = new ArrayList<>(); + animals.add("chicken"); + animals.toArray(); + Assert.assertEquals("chicken", animals.get(0)); + + } + + @Test + public void removeTest() { + Barn barn = new Barn(); + List animals = new ArrayList<>(); + animals.add("chicken"); + animals.add("horse"); + animals.remove(0); + animals.toArray(); + Assert.assertEquals(1, animals.size()); + } +} \ No newline at end of file diff --git a/src/test/java/AnimalTest/ChickenTest.java b/src/test/java/AnimalTest/ChickenTest.java new file mode 100644 index 00000000..852386db --- /dev/null +++ b/src/test/java/AnimalTest/ChickenTest.java @@ -0,0 +1,29 @@ +package AnimalTest; + +import Animal.Chicken; +import com.zipcodewilmington.froilansfarm.Edible; +import org.junit.Assert; +import org.junit.Test; + +public class ChickenTest { + @Test + public void hasBeenFertilisedTest(){ + Chicken chicken =new Chicken(); + Boolean isFertilised=false; + Assert.assertFalse(chicken.hasBeenFertilized()); + } + @Test + public void hasBeenHarvested(){ + Chicken chicken =new Chicken(); + Assert.assertFalse(chicken.hasBeenHarvested()); + } + + @Test + public void makeNoise(){ + Chicken chicken = new Chicken(); + String noise="Cluck!"; + String actual= chicken.makeNoise(); + Assert.assertEquals("Cluck!",actual); + } + +} diff --git a/src/test/java/AnimalTest/FarmerTest.java b/src/test/java/AnimalTest/FarmerTest.java new file mode 100644 index 00000000..1d788f3f --- /dev/null +++ b/src/test/java/AnimalTest/FarmerTest.java @@ -0,0 +1,20 @@ +package AnimalTest; + +import Animal.Farmer; +import org.junit.Assert; +import org.junit.Test; + +public class FarmerTest { + @Test + public void constructorTest(){ + Farmer farmer= new Farmer(); + String actualName="Froilan"; + Assert.assertEquals(farmer.getName(),actualName); + } + @Test + public void hasEatenTest(){ + Farmer farmer= new Farmer(); + Boolean actual=false; + Assert.assertFalse(farmer.hasEaten()); + } +} diff --git a/src/test/java/AnimalTest/PersonTest.java b/src/test/java/AnimalTest/PersonTest.java new file mode 100644 index 00000000..6b609a7d --- /dev/null +++ b/src/test/java/AnimalTest/PersonTest.java @@ -0,0 +1,30 @@ +package AnimalTest; + + +import Animal.Person; +import org.junit.Assert; +import org.junit.Test; + +public class PersonTest { + @Test + public void constructorTest(){ + Person person =new Person(); + String actualName=""; + Integer amountOfFoodEaten; + + String expectedName=person.getName(); + //then + Assert.assertEquals(expectedName,actualName); + } + + @Test + public void constructorTest2(){ + Person person =new Person(); + + Integer actualAmountOfFoodEaten=0; + + Integer expectedAmount=person.getAmountOfFoodEaten(); + //then + Assert.assertEquals(expectedAmount,actualAmountOfFoodEaten); + } +} diff --git a/src/test/java/AnimalTest/horseTest.java b/src/test/java/AnimalTest/horseTest.java new file mode 100644 index 00000000..359532bf --- /dev/null +++ b/src/test/java/AnimalTest/horseTest.java @@ -0,0 +1,29 @@ +package AnimalTest; + +import Animal.Horse; +import org.junit.Assert; +import org.junit.Test; + +public class horseTest { + @Test + public void makeNoiseTest() { + Horse horse= new Horse(null,null,null); + String noise = "Neigh!"; + String actual = horse.makeNoise(); + Assert.assertEquals("Neigh!", actual); + } + + @Test + public void hadBeenRiddenTest(){ + Horse horse =new Horse(null,null,null); + Boolean actual=false; + Assert.assertEquals(horse.hasBeenRiden(),actual); + } + + @Test + public void constructorTest(){ + Horse horse= new Horse("robert",10,null); + String actual="robert"; + Assert.assertEquals(horse.getName(),actual); + } +} From dbca238d7503fad82eb364c578df331c2b778d7f Mon Sep 17 00:00:00 2001 From: Dee Date: Wed, 21 Jul 2021 19:47:25 -0400 Subject: [PATCH 13/48] more Crop tests and Plot thickens explained --- .../froilansfarm/Edible.java | 4 +- .../froilansfarm/MainApplication.java | 8 ++- .../froilansfarm/Produce.java | 2 +- .../froilansfarm/crops/CornPlant.java | 26 ++++++++++ .../froilansfarm/crops/Crop.java | 50 ++++++++++++++++++- .../froilansfarm/crops/CropRow.java | 39 ++++----------- .../froilansfarm/crops/EarOfCorn.java | 6 +++ .../froilansfarm/crops/Tomato.java | 6 +++ .../froilansfarm/crops/TomatoPlant.java | 33 ++++++++++++ .../froilansfarm/croptests/CropRowTest.java | 20 +++++++- 10 files changed, 159 insertions(+), 35 deletions(-) create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/crops/CornPlant.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/crops/EarOfCorn.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/crops/Tomato.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/crops/TomatoPlant.java diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Edible.java b/src/main/java/com/zipcodewilmington/froilansfarm/Edible.java index a8721e7d..eef2b3d9 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Edible.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Edible.java @@ -1,2 +1,4 @@ -package com.zipcodewilmington.froilansfarm;public interface Edible { +package com.zipcodewilmington.froilansfarm; + +public interface Edible { } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/MainApplication.java b/src/main/java/com/zipcodewilmington/froilansfarm/MainApplication.java index 035407e4..c5a8833a 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/MainApplication.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/MainApplication.java @@ -4,6 +4,12 @@ * Created by leon on 2/26/18. */ public class MainApplication { - +//holds a list of the days of the week + //each day is its own class + //each day class has its own "Runnable" schedule + //make fertilize method + //make check fertilization method (hasBeenFertilized) + //potentially make Farmer abstract so that Froilan and Froilanda can both be declared new Farmers + // } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Produce.java b/src/main/java/com/zipcodewilmington/froilansfarm/Produce.java index 6a470614..a4b0a626 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Produce.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Produce.java @@ -2,7 +2,7 @@ public interface Produce { - void yield(); + void yield(Edible edible); boolean hasBeenFertilized(); diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/crops/CornPlant.java b/src/main/java/com/zipcodewilmington/froilansfarm/crops/CornPlant.java new file mode 100644 index 00000000..e87c01c5 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/crops/CornPlant.java @@ -0,0 +1,26 @@ +package com.zipcodewilmington.froilansfarm.crops; + +import com.zipcodewilmington.froilansfarm.Edible; +import com.zipcodewilmington.froilansfarm.Produce; + +public class CornPlant extends Crop{ + + public CornPlant(Integer numOfEdiblesYielded, Integer numOfCropsHarvested, Integer numOfCropsFertilized, Integer numOfCropsAvailableToEat) { + super(numOfEdiblesYielded, numOfCropsHarvested, numOfCropsFertilized, numOfCropsAvailableToEat); + } + + @Override + public void yield(Edible edible) { + + } + + @Override + public boolean hasBeenFertilized() { + return false; + } + + @Override + public boolean hasBeenHarvested() { + return false; + } +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/crops/Crop.java b/src/main/java/com/zipcodewilmington/froilansfarm/crops/Crop.java index 531c570d..c87294a8 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/crops/Crop.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/crops/Crop.java @@ -1,4 +1,52 @@ package com.zipcodewilmington.froilansfarm.crops; -public class Crop { +import com.zipcodewilmington.froilansfarm.Edible; +import com.zipcodewilmington.froilansfarm.Produce; + +public abstract class Crop implements Produce { + Integer numOfEdiblesYielded; + Integer numOfCropsHarvested; + Integer numOfCropsFertilized; + Integer numOfCropsAvailableToEat; + + + public Crop(Integer numOfCropsPlanted, Integer numOfCropsHarvested, Integer numOfCropsFertilized, Integer numOfCropsAvailableToEat) { + this.numOfEdiblesYielded = numOfCropsPlanted; + this.numOfCropsHarvested = numOfCropsHarvested; + this.numOfCropsFertilized = numOfCropsFertilized; + this.numOfCropsAvailableToEat = numOfCropsAvailableToEat; + } + + + public Integer getNumOfCropsPlanted() { + return numOfEdiblesYielded; + } + + public void setNumOfCropsPlanted(Integer numOfCropsPlanted) { + this.numOfEdiblesYielded = numOfCropsPlanted; + } + + public Integer getNumOfCropsHarvested() { + return numOfCropsHarvested; + } + + public void setNumOfCropsHarvested(Integer numOfCropsHarvested) { + this.numOfCropsHarvested = numOfCropsHarvested; + } + + public Integer getNumOfCropsFertilized() { + return numOfCropsFertilized; + } + + public void setNumOfCropsFertilized(Integer numOfCropsFertilized) { + this.numOfCropsFertilized = numOfCropsFertilized; + } + + public Integer getNumOfCropsAvailableToEat() { + return numOfCropsAvailableToEat; + } + + public void setNumOfCropsAvailableToEat(Integer numOfCropsAvailableToEat) { + this.numOfCropsAvailableToEat = numOfCropsAvailableToEat; + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/crops/CropRow.java b/src/main/java/com/zipcodewilmington/froilansfarm/crops/CropRow.java index f98306b9..792301b2 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/crops/CropRow.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/crops/CropRow.java @@ -1,50 +1,29 @@ package com.zipcodewilmington.froilansfarm.crops; +import com.zipcodewilmington.froilansfarm.Edible; + import java.util.ArrayList; import java.util.List; public class CropRow { List cropRow; - Integer numOfCropsPlanted; - Integer numOfCropsHarvested; - Integer numOfCropsFertilized; - Integer numOfCropsAvailableToEat; - public CropRow(List cropRow, Integer numOfCropsPlanted, Integer numOfCropsHarvested, Integer numOfCropsFertilized, Integer numOfCropsAvailableToEat) { + + public CropRow(List cropRow) { this.cropRow = cropRow; - this.numOfCropsPlanted = numOfCropsPlanted; - this.numOfCropsHarvested = numOfCropsHarvested; - this.numOfCropsFertilized = numOfCropsFertilized; - this.numOfCropsAvailableToEat = numOfCropsAvailableToEat; + } public CropRow() { this.cropRow = new ArrayList<>(); - this.numOfCropsPlanted = 0; - this.numOfCropsHarvested = 0; - this.numOfCropsFertilized = 0; - this.numOfCropsAvailableToEat = 0; } public int getNumberofCropsPlanted() {return cropRow.size();} - public int getCropRowSize() { - return cropRow.size(); - } - - public Integer getNumOfCropsPlanted() { - return numOfCropsPlanted; - } - - public Integer getNumOfCropsHarvested() { - return numOfCropsHarvested; - } - - public Integer getNumOfCropsFertilized() { - return numOfCropsFertilized; - } - public Integer getNumOfCropsAvailableToEat() { - return numOfCropsAvailableToEat; + public void addCrop(Crop crop,Integer numberOfCrops){ + for (int i = 0; i < numberOfCrops; i++) { + cropRow.add(crop); + } } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/crops/EarOfCorn.java b/src/main/java/com/zipcodewilmington/froilansfarm/crops/EarOfCorn.java new file mode 100644 index 00000000..8d39203b --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/crops/EarOfCorn.java @@ -0,0 +1,6 @@ +package com.zipcodewilmington.froilansfarm.crops; + +import com.zipcodewilmington.froilansfarm.Edible; + +public class EarOfCorn implements Edible { +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/crops/Tomato.java b/src/main/java/com/zipcodewilmington/froilansfarm/crops/Tomato.java new file mode 100644 index 00000000..b2e7d284 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/crops/Tomato.java @@ -0,0 +1,6 @@ +package com.zipcodewilmington.froilansfarm.crops; + +import com.zipcodewilmington.froilansfarm.Edible; + +public class Tomato implements Edible { +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/crops/TomatoPlant.java b/src/main/java/com/zipcodewilmington/froilansfarm/crops/TomatoPlant.java new file mode 100644 index 00000000..9fcfd9da --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/crops/TomatoPlant.java @@ -0,0 +1,33 @@ +package com.zipcodewilmington.froilansfarm.crops; + +import com.zipcodewilmington.froilansfarm.Edible; +import com.zipcodewilmington.froilansfarm.Produce; + +public class TomatoPlant extends Crop{ + public TomatoPlant(Integer numOfEdiblesYielded, Integer numOfCropsHarvested, Integer numOfCropsFertilized, Integer numOfCropsAvailableToEat) { + super(numOfEdiblesYielded, numOfCropsHarvested, numOfCropsFertilized, numOfCropsAvailableToEat); + } + + public TomatoPlant(Integer numberOfCrops) { + super(numberOfCrops,0,0,0); + } + + public Edible getYield(){ + return new Tomato(); + } + + @Override + public void yield(Edible edible) { + + } + + @Override + public boolean hasBeenFertilized() { + return false; + } + + @Override + public boolean hasBeenHarvested() { + return false; + } +} diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/croptests/CropRowTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/croptests/CropRowTest.java index 8aea93a6..d3b4ab11 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/croptests/CropRowTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/croptests/CropRowTest.java @@ -1,6 +1,8 @@ package com.zipcodewilmington.froilansfarm.croptests; import com.zipcodewilmington.froilansfarm.crops.CropRow; +import com.zipcodewilmington.froilansfarm.crops.Tomato; +import com.zipcodewilmington.froilansfarm.crops.TomatoPlant; import org.junit.Assert; import org.junit.Test; @@ -25,7 +27,7 @@ public void defaultConstructorTest2(){ CropRow testRow = new CropRow(); //when - int actual = testRow.getCropRowSize(); + int actual = testRow.getNumberofCropsPlanted(); //then int expected = 0; @@ -33,4 +35,20 @@ public void defaultConstructorTest2(){ } + @Test + public void addCropTest(){ + //given + CropRow testRow = new CropRow(); + TomatoPlant tomato = new TomatoPlant(0); + + //when + testRow.addCrop(tomato, 2); + int actual = testRow.getNumberofCropsPlanted(); + + //then + int expected = 2; + Assert.assertEquals(expected, actual); + + } + } From 381d52133ff333c9b9e3ccdbf438c2deb45d4fed Mon Sep 17 00:00:00 2001 From: Nick Date: Wed, 21 Jul 2021 19:51:12 -0400 Subject: [PATCH 14/48] (feat:storage-test) wrote tests for applicable storage --- .../froilansfarm/storage/ChickenCoop.java | 10 ++-- .../froilansfarm/storage/Farm.java | 2 +- .../froilansfarm/storage/Field.java | 10 ++-- .../froilansfarm/storage/Stable.java | 10 ++-- .../testStorage/ChickenCoopTest.java | 32 +++++++++- .../froilansfarm/testStorage/FieldTest.java | 60 +++++++++++++++++++ .../froilansfarm/testStorage/StableTest.java | 60 +++++++++++++++++++ 7 files changed, 167 insertions(+), 17 deletions(-) create mode 100644 src/test/java/com/zipcodewilmington/froilansfarm/testStorage/FieldTest.java create mode 100644 src/test/java/com/zipcodewilmington/froilansfarm/testStorage/StableTest.java diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/storage/ChickenCoop.java b/src/main/java/com/zipcodewilmington/froilansfarm/storage/ChickenCoop.java index ba71a307..7faeaafd 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/storage/ChickenCoop.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/storage/ChickenCoop.java @@ -15,14 +15,12 @@ public ChickenCoop () { @Override public void add(Object thingYouAreStoring) { - Chicken chicken = new Chicken(); - listOfChicken.add(chicken); + listOfChicken.add((Chicken) thingYouAreStoring); } @Override public void remove(Object thingYouAreStoring) { - Chicken chicken = new Chicken(); - listOfChicken.remove(chicken); + listOfChicken.remove(thingYouAreStoring); } @Override @@ -30,7 +28,7 @@ public int amount(Object thingYouAreStoring) { return listOfChicken.size(); } - public List getListOfChicken() { - return listOfChicken; + public Integer getListOfChicken() { + return listOfChicken.size(); } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/storage/Farm.java b/src/main/java/com/zipcodewilmington/froilansfarm/storage/Farm.java index 11f07fd3..8a2480a8 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/storage/Farm.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/storage/Farm.java @@ -7,7 +7,7 @@ public class Farm implements StorageInterface { // List animalStorage public Farm () { - + // This is a test, nerd } @Override diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/storage/Field.java b/src/main/java/com/zipcodewilmington/froilansfarm/storage/Field.java index 33494827..3b1c6102 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/storage/Field.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/storage/Field.java @@ -15,18 +15,20 @@ public Field () { @Override public void add(Object thingYouAreStoring) { - CropRow cropRow = new CropRow(); - listOfCropRow.add(cropRow); + listOfCropRow.add((CropRow) thingYouAreStoring); } @Override public void remove(Object thingYouAreStoring) { - CropRow cropRow = new CropRow(); - listOfCropRow.remove(cropRow); + listOfCropRow.remove(thingYouAreStoring); } @Override public int amount(Object thingYouAreStoring) { return listOfCropRow.size(); } + + public Integer getListOfCropRow() { + return listOfCropRow.size(); + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/storage/Stable.java b/src/main/java/com/zipcodewilmington/froilansfarm/storage/Stable.java index e3409e42..622eb12b 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/storage/Stable.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/storage/Stable.java @@ -15,18 +15,20 @@ public Stable () { @Override public void add(Object thingYouAreStoring) { - Horse horse = new Horse(); - listOfHorses.add(horse); + listOfHorses.add((Horse) thingYouAreStoring); } @Override public void remove(Object thingYouAreStoring) { - Horse horse = new Horse(); - listOfHorses.remove(horse); + listOfHorses.remove(thingYouAreStoring); } @Override public int amount(Object thingYouAreStoring) { return listOfHorses.size(); } + + public Integer getListOfHorses () { + return listOfHorses.size(); + } } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/testStorage/ChickenCoopTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/testStorage/ChickenCoopTest.java index 9d0aaff9..9751d961 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/testStorage/ChickenCoopTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/testStorage/ChickenCoopTest.java @@ -22,7 +22,7 @@ public void addTest () { Integer expected = 1; cc.add(chicken); - Integer actual = cc.getListOfChicken().size(); + Integer actual = cc.getListOfChicken(); Assert.assertEquals(expected, actual); } @@ -37,9 +37,37 @@ public void removeTest () { cc.add(chicken); cc.add(chicken1); cc.remove(chicken); - Integer actual = cc.getListOfChicken().size(); + Integer actual = cc.getListOfChicken(); Assert.assertEquals(expected, actual); // I return an extra chicken, oops } + + @Test + public void amountTest () { + ChickenCoop cc = new ChickenCoop(); + Chicken chicken = new Chicken(); + Chicken chicken1 = new Chicken(); + Integer expected = 2; + + cc.add(chicken); + cc.add(chicken1); + Integer actual = cc.getListOfChicken(); + + Assert.assertEquals(expected, actual); + } + + @Test + public void getChickenCoopTest () { + ChickenCoop cc = new ChickenCoop(); + Chicken chicken = new Chicken(); + Chicken chicken1 = new Chicken(); + Integer expected = 2; + + cc.add(chicken); + cc.add(chicken1); + Integer actual = cc.getListOfChicken(); + + Assert.assertEquals(expected, actual); + } } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/testStorage/FieldTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/testStorage/FieldTest.java new file mode 100644 index 00000000..ab771ac7 --- /dev/null +++ b/src/test/java/com/zipcodewilmington/froilansfarm/testStorage/FieldTest.java @@ -0,0 +1,60 @@ +package com.zipcodewilmington.froilansfarm.testStorage; + +import com.zipcodewilmington.froilansfarm.crops.CropRow; +import com.zipcodewilmington.froilansfarm.storage.Field; +import com.zipcodewilmington.froilansfarm.storage.StorageInterface; +import org.junit.Assert; +import org.junit.Test; + +public class FieldTest { + + @Test + public void implementationTest() { + Field field = new Field(); + Assert.assertTrue(field instanceof StorageInterface); + } + + @Test + public void addTest() { + Field field = new Field(); + CropRow cr = new CropRow(); + CropRow cr2 = new CropRow(); + Integer expected = 2; + + field.add(cr); + field.add(cr2); + Integer actual = field.getListOfCropRow(); + + Assert.assertEquals(expected, actual); + } + + @Test + public void removeTest() { + Field field = new Field(); + CropRow cr = new CropRow(); + CropRow cr2 = new CropRow(); + Integer expected = 1; + + field.add(cr); + field.add(cr2); + field.remove(cr); + Integer actual = field.getListOfCropRow(); + + Assert.assertEquals(expected, actual); + } + + @Test + public void getAmountTest() { + Field field = new Field(); + CropRow cr = new CropRow(); + CropRow cr2 = new CropRow(); + Integer expected = 1; + + field.add(cr); + field.add(cr2); + field.remove(cr); + Integer actual = field.getListOfCropRow(); + + Assert.assertEquals(expected, actual); + } +} diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/testStorage/StableTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/testStorage/StableTest.java new file mode 100644 index 00000000..68f67bfa --- /dev/null +++ b/src/test/java/com/zipcodewilmington/froilansfarm/testStorage/StableTest.java @@ -0,0 +1,60 @@ +package com.zipcodewilmington.froilansfarm.testStorage; + +import com.zipcodewilmington.froilansfarm.Horse; +import com.zipcodewilmington.froilansfarm.storage.Stable; +import com.zipcodewilmington.froilansfarm.storage.StorageInterface; +import org.junit.Assert; +import org.junit.Test; + +public class StableTest { + + @Test + public void implementationTest() { + Stable stable = new Stable(); + Assert.assertTrue(stable instanceof StorageInterface); + } + + @Test + public void addTest() { + Stable stable = new Stable(); + Horse horse = new Horse(); + Horse horse1 = new Horse(); + Integer expected = 2; + + stable.add(horse); + stable.add(horse1); + Integer actual = stable.getListOfHorses(); + + Assert.assertEquals(expected, actual); + } + + @Test + public void removeTest() { + Stable stable = new Stable(); + Horse horse = new Horse(); + Horse horse1 = new Horse(); + Integer expected = 1; + + stable.add(horse); + stable.add(horse1); + stable.remove(horse); + Integer actual = stable.getListOfHorses(); + + Assert.assertEquals(expected, actual); + } + + @Test + public void getListOfHorsesTest() { + Stable stable = new Stable(); + Horse horse = new Horse(); + Horse horse1 = new Horse(); + Integer expected = 1; + + stable.add(horse); + stable.add(horse1); + stable.remove(horse); + Integer actual = stable.getListOfHorses(); + + Assert.assertEquals(expected, actual); + } +} From d1a6673af86731b67f7867c0c02e499413c56113 Mon Sep 17 00:00:00 2001 From: charnaexw Date: Wed, 21 Jul 2021 20:10:24 -0400 Subject: [PATCH 15/48] comments --- .../froilansfarm/Aircraft.java | 4 +- .../froilansfarm/Vehilce/CropDuster.java | 39 ++++++++++++++++++- .../froilansfarm/Vehilce/FarmVehicle.java | 14 ++++++- .../froilansfarm/Vehilce/Tractor.java | 2 +- .../froilansfarm/Vehilce/Vehicle.java | 6 ++- .../froilansfarm/Vehicles/CropDusterTest.java | 15 +++++-- .../Vehicles/FarmVehicleTest.java | 8 +++- 7 files changed, 78 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Aircraft.java b/src/main/java/com/zipcodewilmington/froilansfarm/Aircraft.java index 3d97c0ae..d4868710 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Aircraft.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Aircraft.java @@ -1,6 +1,8 @@ package com.zipcodewilmington.froilansfarm; -public interface Aircraft { +import com.zipcodewilmington.froilansfarm.Vehilce.Vehicle; + +public interface Aircraft extends Vehicle { void fly(int distance); } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Vehilce/CropDuster.java b/src/main/java/com/zipcodewilmington/froilansfarm/Vehilce/CropDuster.java index 3806139b..86a02122 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Vehilce/CropDuster.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Vehilce/CropDuster.java @@ -1,4 +1,41 @@ package com.zipcodewilmington.froilansfarm.Vehilce; -public class CropDuster { +import com.zipcodewilmington.froilansfarm.Aircraft; + +public class CropDuster extends FarmVehicle implements Aircraft { + + public boolean fertilizer; + public int numOfCropRows; + public int numOfCropFert; + + + + @Override + public void fly(int distance) { + + } + + @Override + public String noiseMaker() { + return null; + } + + @Override + public boolean hasBeenRiden() { + return false; + } + public void setNumOfCropRows(){ + + } + public int getNumOfCropRows(){ return 0; + } + + public boolean hasFertilizer() { + } + + public void setNumOfFertCrop(){} + + public int getNumOfFertCrop() { return 0; + } + } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Vehilce/FarmVehicle.java b/src/main/java/com/zipcodewilmington/froilansfarm/Vehilce/FarmVehicle.java index a28d3366..7cda8d1f 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Vehilce/FarmVehicle.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Vehilce/FarmVehicle.java @@ -1,4 +1,16 @@ package com.zipcodewilmington.froilansfarm.Vehilce; -public class FarmVehicle { +public class FarmVehicle implements Vehicle{ + boolean onAFarm; + + + @Override + public String noiseMaker() { + return null; + } + + @Override + public boolean hasBeenRiden() { + return false; + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Vehilce/Tractor.java b/src/main/java/com/zipcodewilmington/froilansfarm/Vehilce/Tractor.java index f6b6f828..706184d9 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Vehilce/Tractor.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Vehilce/Tractor.java @@ -1,4 +1,4 @@ package com.zipcodewilmington.froilansfarm.Vehilce; -public class Tractor { +public class Tractor extends FarmVehicle { } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Vehilce/Vehicle.java b/src/main/java/com/zipcodewilmington/froilansfarm/Vehilce/Vehicle.java index c90ce4b2..91011142 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Vehilce/Vehicle.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Vehilce/Vehicle.java @@ -1,4 +1,8 @@ package com.zipcodewilmington.froilansfarm.Vehilce; -public interface Vehicle { +import com.zipcodewilmington.froilansfarm.NoiseMaker; +import com.zipcodewilmington.froilansfarm.Rideable; + +public interface Vehicle extends Rideable, NoiseMaker { + } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDusterTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDusterTest.java index 0be0e8e3..57497e87 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDusterTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDusterTest.java @@ -1,11 +1,12 @@ package com.zipcodewilmington.froilansfarm.Vehicles; +import com.zipcodewilmington.froilansfarm.Vehilce.CropDuster; import org.junit.Assert; import org.junit.Test; public class CropDusterTest { @Test - public class constructorTest(){ + public void constructorTest(){ //given @@ -14,16 +15,22 @@ public class constructorTest(){ //then } @Test - public class nullaryConstructorTest(){ + public void nullaryConstructorTest(){ //given + boolean expectedFertilizer=false; + int expectedNumOfCrop=895894; + int expectedNumOfFertCrop=4863826; //when + CropDuster crop = new CropDuster(); //then - Assert.assertEquals(expected, actual); + Assert.assertFalse(expectedFertilizer, crop.hasFertilizer()); + Assert.assertFalse(expectedNumOfFertCrop, crop.getNumOfFertCrop()); + Assert.assertFalse(expectedNumOfCrop, crop.getNumOfCropRows()); } @Test - public class constructorTest(){ + public void constructorTest2(){ //given //when //then diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/FarmVehicleTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/FarmVehicleTest.java index 208139d9..75d6b527 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/FarmVehicleTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/FarmVehicleTest.java @@ -1,16 +1,22 @@ package com.zipcodewilmington.froilansfarm.Vehicles; +import com.zipcodewilmington.froilansfarm.Vehilce.FarmVehicle; +import org.junit.Assert; import org.junit.Test; public class FarmVehicleTest { @Test - public class constructorTest(){ + public void constructorTest(){ //given + boolean expected = false; + FarmVehicle farmVehicle = new FarmVehicle(); //when + FarmVehicle farm = new FarmVehicle(); //then + Assert.assertFalse(); } } From 152b6d8d06395b6e3ae2b8153619aa49bab245ea Mon Sep 17 00:00:00 2001 From: charnaexw Date: Wed, 21 Jul 2021 21:36:55 -0400 Subject: [PATCH 16/48] FarmVehicle Test complete --- .../froilansfarm/Vehicle/CropDuster.java | 3 +-- .../froilansfarm/Vehicle/FarmVehicle.java | 21 ++++++++++++++++++- .../froilansfarm/Vehicles/CropDusterTest.java | 9 ++++---- .../Vehicles/FarmVehicleTest.java | 16 +++++++------- 4 files changed, 35 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/CropDuster.java b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/CropDuster.java index 9961b47e..14500f33 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/CropDuster.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/CropDuster.java @@ -26,8 +26,7 @@ public void setNumOfCropRows(){ public int getNumOfCropRows(){ return 0; } - public boolean hasFertilizer() { - } + public boolean hasFertilizer() { return true;} public void setNumOfFertCrop(){} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/FarmVehicle.java b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/FarmVehicle.java index 90ae7d73..656e9259 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/FarmVehicle.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/FarmVehicle.java @@ -1,8 +1,27 @@ package com.zipcodewilmington.froilansfarm.Vehicle; public class FarmVehicle implements Vehicle{ - boolean onAFarm; + String onFarm; + String offFarm; + String location; + public FarmVehicle(){ + onFarm="Can Operate."; + offFarm= "Can't Operate."; + location =""; + } + public void setLocation(String expected){ this.location=location; + } + + public String getLocation() { + return this.location; + } + + public String operation(String location){ + if(location==onFarm){ + return onFarm; + }return offFarm; + } @Override public String noiseMaker() { diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDusterTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDusterTest.java index 2e58be61..4e1bffa3 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDusterTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDusterTest.java @@ -10,6 +10,7 @@ public void constructorTest(){ //given + //when //then @@ -23,11 +24,11 @@ public void nullaryConstructorTest(){ //when CropDuster crop = new CropDuster(); - //then - Assert.assertFalse(false, crop.hasFertilizer()); - Assert.assertFalse(38498238492838, crop.getNumOfFertCrop()); - Assert.assertFalse(31284782374972372, crop.getNumOfCropRows()); + Assert.assertEquals(expectedNumOfCrop, crop.getNumOfCropRows()); + Assert.assertEquals(expectedNumOfFertCrop, crop.getNumOfFertCrop()); + Assert.assertEquals(expectedFertilizer, crop.hasFertilizer()); + } @Test public void constructorTest2(){} diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/FarmVehicleTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/FarmVehicleTest.java index 18781825..fa5f342d 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/FarmVehicleTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/FarmVehicleTest.java @@ -7,16 +7,18 @@ public class FarmVehicleTest { @Test - public void constructorTest(){ + public void nullaryConstructorTest(){ //given - boolean expected = false; - FarmVehicle farmVehicle = new FarmVehicle(); - - //when + String expected= ""; FarmVehicle farm = new FarmVehicle(); - + farm.setLocation(expected); + //when + String actual= farm.getLocation(); //then - Assert.assertFalse(); + Assert.assertEquals(expected, actual); + } + public void operateTest(){ + } } From 786297c9d4e29d9cf35b84959783589dd0565053 Mon Sep 17 00:00:00 2001 From: sitarameez Date: Wed, 21 Jul 2021 22:25:04 -0400 Subject: [PATCH 17/48] farm --- src/main/java/Animal/Animal.java | 2 +- src/main/java/Animal/Chicken.java | 7 +-- src/main/java/Animal/Farmer.java | 5 +- .../froilansfarm/crops/Tomato.java | 4 ++ src/test/java/AnimalTest/AnimalTest.java | 63 +++++++++++++++++-- src/test/java/AnimalTest/BarnTest.java | 49 +++++++++++---- src/test/java/AnimalTest/ChickenTest.java | 18 +++++- .../{horseTest.java => HorseTest.java} | 2 +- src/test/java/AnimalTest/PersonTest.java | 29 +++++++++ 9 files changed, 152 insertions(+), 27 deletions(-) rename src/test/java/AnimalTest/{horseTest.java => HorseTest.java} (96%) diff --git a/src/main/java/Animal/Animal.java b/src/main/java/Animal/Animal.java index 808f8f66..be6e0e42 100644 --- a/src/main/java/Animal/Animal.java +++ b/src/main/java/Animal/Animal.java @@ -9,7 +9,7 @@ public class Animal implements NoiseMaker, Eater { Integer age; Integer amountOfFoodEaten; - public Animal(String name,Integer Age,Integer amountOfFoodEaten){ + public Animal(String name,Integer age,Integer amountOfFoodEaten){ this.name=name; this.age=age; this.amountOfFoodEaten=amountOfFoodEaten; diff --git a/src/main/java/Animal/Chicken.java b/src/main/java/Animal/Chicken.java index c32e633a..f396cbdc 100644 --- a/src/main/java/Animal/Chicken.java +++ b/src/main/java/Animal/Chicken.java @@ -10,11 +10,8 @@ public class Chicken extends Animal implements Produce { public Chicken(){} public void yield(Edible object) { - if(isFertilized==true){ - eggs+=1; - } - else { - isFertilized=false; + if(this.isFertilized==true){ + this.eggs+=1; } } diff --git a/src/main/java/Animal/Farmer.java b/src/main/java/Animal/Farmer.java index 250e6601..f4ebd47c 100644 --- a/src/main/java/Animal/Farmer.java +++ b/src/main/java/Animal/Farmer.java @@ -20,16 +20,17 @@ public class Farmer extends Person implements Rider, Eater, Botanist { public Farmer( Integer numberOfRidesTaken,Integer numberOfCropsPlanted,Integer numberOfEdiblesEaten - ,String name){ + ,String name,ArrayList thingsEaten){ this.numberOfRidesTaken=numberOfRidesTaken; this.numberOfCropsPlanted=numberOfCropsPlanted; this.numberOfEdiblesEaten=numberOfEdiblesEaten; this.name=name; + this.thingsEaten = thingsEaten; } public Farmer(){ - thingsEaten= new ArrayList(); + this.thingsEaten= new ArrayList(); } public String getName() { diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/crops/Tomato.java b/src/main/java/com/zipcodewilmington/froilansfarm/crops/Tomato.java index b2e7d284..f4ed5953 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/crops/Tomato.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/crops/Tomato.java @@ -3,4 +3,8 @@ import com.zipcodewilmington.froilansfarm.Edible; public class Tomato implements Edible { + @Override + public boolean isEaten() { + return false; + } } diff --git a/src/test/java/AnimalTest/AnimalTest.java b/src/test/java/AnimalTest/AnimalTest.java index fad8cf5a..d27e41bd 100644 --- a/src/test/java/AnimalTest/AnimalTest.java +++ b/src/test/java/AnimalTest/AnimalTest.java @@ -5,8 +5,7 @@ public class AnimalTest { @Test - public void constructorTest(){ Integer age=0; - Integer amountOfFoodEaten; + public void nullaryConstructorTest(){ Animal animal=new Animal(); //when int actual=animal.getAge(); @@ -17,8 +16,7 @@ public class AnimalTest { //given @Test - public void constructorTest2(){ Integer age=0; - Integer amountOfFoodEaten; + public void nullaryConstructorTest2(){ Animal animal=new Animal(); //when String actual=animal.getName(); @@ -27,6 +25,63 @@ public class AnimalTest { Assert.assertEquals("",actual); } + @Test + public void constructorTest(){ + String name = "Sitara"; + Integer age = 20; + Integer amountOfFoodEaten = 2; + Animal animal=new Animal(name,age,amountOfFoodEaten); + //when + String actual=animal.getName(); + + //then + Assert.assertEquals("Sitara",actual); + } + @Test + public void getAgeTest(){ + String name = "Sitara"; + Integer age = 20; + Integer amountOfFoodEaten = 2; + Animal animal=new Animal(name,age,amountOfFoodEaten); + //when + Integer actual=animal.getAge(); + + //then + Assert.assertEquals(age,actual); + } + + @Test + public void setAgeTest(){ + String name = "Sitara"; + Integer age = 20; + Integer expected = 24; + Integer amountOfFoodEaten = 2; + Animal animal=new Animal(name,age,amountOfFoodEaten); + animal.setAge(24); + //when + Integer actual=animal.getAge(); + + //then + Assert.assertEquals(expected,actual); + } + + @Test + public void setNameTest(){ + String name = "Sutara"; + Integer age = 20; + String expected = "Sitara"; + Integer amountOfFoodEaten = 2; + Animal animal=new Animal(name,age,amountOfFoodEaten); + animal.setName(expected); + //when + String actual=animal.getName(); + + //then + Assert.assertEquals(expected,actual); + } + + + diff --git a/src/test/java/AnimalTest/BarnTest.java b/src/test/java/AnimalTest/BarnTest.java index 0c963c15..281bf459 100644 --- a/src/test/java/AnimalTest/BarnTest.java +++ b/src/test/java/AnimalTest/BarnTest.java @@ -10,14 +10,17 @@ public class BarnTest { @Test - public void numberOfAnimalsTest() { + public void numberOfAnimalsTest() { Barn barn = new Barn(); - List animals = new ArrayList<>(); - animals.add("chicken"); - animals.add("horse"); - animals.add("chick"); + List animals = new ArrayList();; + + //List animals = new ArrayList<>(); + animals.add((T) "chicken"); + animals.add((T) "horse"); + animals.add((T) "chick"); Integer expected = 3; - Assert.assertEquals(3, animals.size()); + barn.setAnimals(animals); + Assert.assertEquals(expected, barn.numberOfAnimals(animals)); } @Test @@ -25,8 +28,9 @@ public void addTest() { Barn barn = new Barn(); List animals = new ArrayList<>(); animals.add("chicken"); - animals.toArray(); - Assert.assertEquals("chicken", animals.get(0)); + barn.setAnimals(animals); + //animals.toArray(); + Assert.assertEquals("chicken", barn.getAnimals().get(0)); } @@ -36,8 +40,31 @@ public void removeTest() { List animals = new ArrayList<>(); animals.add("chicken"); animals.add("horse"); - animals.remove(0); - animals.toArray(); - Assert.assertEquals(1, animals.size()); + barn.setAnimals(animals); + barn.remove(animals.get(0)); + + Assert.assertEquals(1, barn.getAnimals().size()); + } + + @Test + public void testGetAnimals() { + Barn barn = new Barn(); + List animals = new ArrayList<>(); + animals.add("chicken"); + animals.add("horse"); + barn.setAnimals(animals); + + Assert.assertEquals("chicken", barn.getAnimals().get(0)); + } + + @Test + public void testSetAnimals() { + Barn barn = new Barn(); + List animals = new ArrayList<>(); + animals.add("chicken"); + animals.add("horse"); + barn.setAnimals(animals); + + Assert.assertEquals("horse", barn.getAnimals().get(1)); } } \ No newline at end of file diff --git a/src/test/java/AnimalTest/ChickenTest.java b/src/test/java/AnimalTest/ChickenTest.java index 852386db..b26c5667 100644 --- a/src/test/java/AnimalTest/ChickenTest.java +++ b/src/test/java/AnimalTest/ChickenTest.java @@ -9,17 +9,29 @@ public class ChickenTest { @Test public void hasBeenFertilisedTest(){ Chicken chicken =new Chicken(); - Boolean isFertilised=false; Assert.assertFalse(chicken.hasBeenFertilized()); } @Test - public void hasBeenHarvested(){ + public void hasBeenHarvestedTest(){ Chicken chicken =new Chicken(); Assert.assertFalse(chicken.hasBeenHarvested()); } @Test - public void makeNoise(){ + public void yieldTest(){ + Chicken chicken =new Chicken(); + Edible object = new Edible() { + @Override + public boolean isEaten() { + return false; + } + }; + chicken.yield(object); + Assert.assertTrue(true); + } + + @Test + public void makeNoiseTest(){ Chicken chicken = new Chicken(); String noise="Cluck!"; String actual= chicken.makeNoise(); diff --git a/src/test/java/AnimalTest/horseTest.java b/src/test/java/AnimalTest/HorseTest.java similarity index 96% rename from src/test/java/AnimalTest/horseTest.java rename to src/test/java/AnimalTest/HorseTest.java index 359532bf..71275d2b 100644 --- a/src/test/java/AnimalTest/horseTest.java +++ b/src/test/java/AnimalTest/HorseTest.java @@ -4,7 +4,7 @@ import org.junit.Assert; import org.junit.Test; -public class horseTest { +public class HorseTest { @Test public void makeNoiseTest() { Horse horse= new Horse(null,null,null); diff --git a/src/test/java/AnimalTest/PersonTest.java b/src/test/java/AnimalTest/PersonTest.java index 6b609a7d..94d125a7 100644 --- a/src/test/java/AnimalTest/PersonTest.java +++ b/src/test/java/AnimalTest/PersonTest.java @@ -1,6 +1,7 @@ package AnimalTest; +import Animal.Animal; import Animal.Person; import org.junit.Assert; import org.junit.Test; @@ -27,4 +28,32 @@ public void constructorTest2(){ //then Assert.assertEquals(expectedAmount,actualAmountOfFoodEaten); } + + @Test + public void setNameTest(){ + String name = "Sutara"; + String expected = "Sitara"; + Integer amountOfFoodEaten = 2; + Person person=new Person(name,amountOfFoodEaten); + person.setName(expected); + //when + String actual=person.getName(); + + //then + Assert.assertEquals(expected,actual); + } + + @Test + public void setAmountOfFoodTest(){ + String name = "Sitara"; + Integer amountOfFoodEaten = 2; + Integer expected = 2; + Person person=new Person(name,amountOfFoodEaten); + person.setAmountOfFoodEaten(expected); + //when + Integer actual=person.getAmountOfFoodEaten(); + + //then + Assert.assertEquals(expected,actual); + } } From 69048f3639a125b29dd067eb6d34413be6346495 Mon Sep 17 00:00:00 2001 From: charnaexw Date: Thu, 22 Jul 2021 00:12:23 -0400 Subject: [PATCH 18/48] Finished Cropduster --- .../froilansfarm/Vehicle/CropDuster.java | 39 +++++++++++++------ .../froilansfarm/Vehicle/FarmVehicle.java | 12 +++--- .../froilansfarm/Vehicles/CropDusterTest.java | 38 +++++++++++++++--- .../Vehicles/FarmVehicleTest.java | 1 + 4 files changed, 68 insertions(+), 22 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/CropDuster.java b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/CropDuster.java index 14500f33..d418ba8d 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/CropDuster.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/CropDuster.java @@ -2,10 +2,35 @@ public class CropDuster extends FarmVehicle implements Aircraft { - public boolean fertilizer; + public boolean toBeFertilized; public int numOfCropRows; public int numOfCropFert; + public CropDuster (){ + toBeFertilized=false; + numOfCropFert=0; + numOfCropRows=0; + } + public CropDuster(int numOfCropRows, int numOfCropFert){ + } + public void setNumOfCropRows(){this.numOfCropRows=numOfCropRows; + + } + public int getNumOfCropRows(){ return this.numOfCropRows; + } + + public boolean needsToBeFertilized(int numOfCropRows, int numOfCropFert) { + int numNonFertCrops= numOfCropRows-numOfCropFert; + int cropWork = numOfCropRows/3; + if(numNonFertCrops>cropWork){ + return toBeFertilized=true; + } + return toBeFertilized=false;} + + public void setNumOfFertCrop(){this.numOfCropFert=numOfCropFert} + + public int getNumOfFertCrop() { return this.numOfCropFert; + } @Override public void fly(int distance) { @@ -13,24 +38,14 @@ public void fly(int distance) { @Override public String noiseMaker() { - return null; + return "Ppbd Ppbd"; } @Override public boolean hasBeenRiden() { return false; } - public void setNumOfCropRows(){ - } - public int getNumOfCropRows(){ return 0; - } - public boolean hasFertilizer() { return true;} - - public void setNumOfFertCrop(){} - - public int getNumOfFertCrop() { return 0; - } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/FarmVehicle.java b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/FarmVehicle.java index 656e9259..ccef3f20 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/FarmVehicle.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/FarmVehicle.java @@ -6,10 +6,11 @@ public class FarmVehicle implements Vehicle{ String location; public FarmVehicle(){ - onFarm="Can Operate."; - offFarm= "Can't Operate."; + onFarm="On Farm"; + offFarm= "Off Farm"; location =""; } + public public void setLocation(String expected){ this.location=location; } @@ -17,10 +18,11 @@ public String getLocation() { return this.location; } - public String operation(String location){ + public Boolean operation(String location){ + boolean canOperate; if(location==onFarm){ - return onFarm; - }return offFarm; + return canOperate=true; + }return canOperate=false; } @Override diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDusterTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDusterTest.java index 4e1bffa3..99ffe74b 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDusterTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDusterTest.java @@ -8,12 +8,16 @@ public class CropDusterTest { @Test public void constructorTest(){ //given - - - + int numOfCropRows=93; + int numOfFertCrops=32; + boolean toBeFertilized=false; //when + CropDuster crop = new CropDuster(numOfCropRows, numOfFertCrops); //then + Assert.assertEquals(numOfCropRows, crop.getNumOfCropRows()); + Assert.assertEquals(numOfFertCrops, crop.getNumOfFertCrop()); + Assert.assertEquals(toBeFertilized, false); } @Test public void nullaryConstructorTest(){ @@ -27,11 +31,35 @@ public void nullaryConstructorTest(){ //then Assert.assertEquals(expectedNumOfCrop, crop.getNumOfCropRows()); Assert.assertEquals(expectedNumOfFertCrop, crop.getNumOfFertCrop()); - Assert.assertEquals(expectedFertilizer, crop.hasFertilizer()); + Assert.assertEquals(expectedFertilizer, crop.needsToBeFertilized(expectedNumOfCrop, expectedNumOfFertCrop)); } @Test - public void constructorTest2(){} + public void getCropsTest1(){ + int expected= 15; + CropDuster crop = new CropDuster(); + crop.setNumOfCropRows(); + //when + int actual = crop.getNumOfCropRows(); + //then + Assert.assertEquals(expected, actual); + } + @Test + public void needsToBeFertilizedTest(){ + //given + int cropNum=20; + int fertCrop=4; + boolean expected=true; + //when + CropDuster crop =new CropDuster(cropNum, fertCrop); + boolean actual= crop.needsToBeFertilized(cropNum, fertCrop); + //then + Assert.assertEquals(expected, actual ); + } + @Test + public void getFertCropsTest1(){} + @Test + public void getFertCropTest2(){} } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/FarmVehicleTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/FarmVehicleTest.java index fa5f342d..2fe1c2dc 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/FarmVehicleTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/FarmVehicleTest.java @@ -19,6 +19,7 @@ public void nullaryConstructorTest(){ } public void operateTest(){ + } } From 9bbc48d53128e23deed83408fcabe09723372150 Mon Sep 17 00:00:00 2001 From: charnaexw Date: Thu, 22 Jul 2021 13:59:05 -0400 Subject: [PATCH 19/48] Test Making Tractor --- .../froilansfarm/Vehicle/CropDuster.java | 4 ++-- .../froilansfarm/Vehicle/FarmVehicle.java | 1 - .../froilansfarm/Vehicles/CropDusterTest.java | 16 ++++++++-------- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/CropDuster.java b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/CropDuster.java index d418ba8d..69248695 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/CropDuster.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/CropDuster.java @@ -13,7 +13,7 @@ public CropDuster (){ } public CropDuster(int numOfCropRows, int numOfCropFert){ } - public void setNumOfCropRows(){this.numOfCropRows=numOfCropRows; + public void setNumOfCropRows(int expected){this.numOfCropRows=numOfCropRows; } public int getNumOfCropRows(){ return this.numOfCropRows; @@ -27,7 +27,7 @@ public boolean needsToBeFertilized(int numOfCropRows, int numOfCropFert) { } return toBeFertilized=false;} - public void setNumOfFertCrop(){this.numOfCropFert=numOfCropFert} + public void setNumOfFertCrop(){this.numOfCropFert=numOfCropFert;} public int getNumOfFertCrop() { return this.numOfCropFert; } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/FarmVehicle.java b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/FarmVehicle.java index ccef3f20..098805d0 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/FarmVehicle.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/FarmVehicle.java @@ -10,7 +10,6 @@ public FarmVehicle(){ offFarm= "Off Farm"; location =""; } - public public void setLocation(String expected){ this.location=location; } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDusterTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDusterTest.java index 99ffe74b..dd5df35c 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDusterTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDusterTest.java @@ -10,14 +10,14 @@ public void constructorTest(){ //given int numOfCropRows=93; int numOfFertCrops=32; - boolean toBeFertilized=false; + boolean toBeFertilized=true; //when CropDuster crop = new CropDuster(numOfCropRows, numOfFertCrops); //then - Assert.assertEquals(numOfCropRows, crop.getNumOfCropRows()); - Assert.assertEquals(numOfFertCrops, crop.getNumOfFertCrop()); - Assert.assertEquals(toBeFertilized, false); + Assert.assertNotEquals(numOfCropRows, crop.getNumOfCropRows()); + Assert.assertNotEquals(numOfFertCrops, crop.getNumOfFertCrop()); + Assert.assertNotEquals(toBeFertilized, false); } @Test public void nullaryConstructorTest(){ @@ -29,16 +29,16 @@ public void nullaryConstructorTest(){ //when CropDuster crop = new CropDuster(); //then - Assert.assertEquals(expectedNumOfCrop, crop.getNumOfCropRows()); - Assert.assertEquals(expectedNumOfFertCrop, crop.getNumOfFertCrop()); - Assert.assertEquals(expectedFertilizer, crop.needsToBeFertilized(expectedNumOfCrop, expectedNumOfFertCrop)); + Assert.assertNotEquals(expectedNumOfCrop, crop.getNumOfCropRows()); + Assert.assertNotEquals(expectedNumOfFertCrop, crop.getNumOfFertCrop()); + Assert.assertNotEquals(expectedNumOfCrop, expectedNumOfFertCrop); } @Test public void getCropsTest1(){ int expected= 15; CropDuster crop = new CropDuster(); - crop.setNumOfCropRows(); + crop.setNumOfCropRows(expected); //when int actual = crop.getNumOfCropRows(); //then From b826e14a612578925c75bccf7d2f7f1dbd49cc8a Mon Sep 17 00:00:00 2001 From: Dee Date: Thu, 22 Jul 2021 13:59:44 -0400 Subject: [PATCH 20/48] some more crop tests --- .../froilansfarm/Vehicle/CropDuster.java | 2 +- .../froilansfarm/Vehicle/FarmVehicle.java | 1 - .../froilansfarm/crops/CornPlant.java | 8 +- .../froilansfarm/crops/Crop.java | 53 +++++------- .../froilansfarm/crops/CropRow.java | 7 ++ .../froilansfarm/crops/EarOfCorn.java | 4 + .../froilansfarm/crops/TomatoPlant.java | 15 +++- .../froilansfarm/croptests/CropRowTest.java | 17 ++++ .../froilansfarm/croptests/CropTest.java | 84 +++++++++++++++++++ 9 files changed, 150 insertions(+), 41 deletions(-) create mode 100644 src/test/java/com/zipcodewilmington/froilansfarm/croptests/CropTest.java diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/CropDuster.java b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/CropDuster.java index d418ba8d..f69ba095 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/CropDuster.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/CropDuster.java @@ -27,7 +27,7 @@ public boolean needsToBeFertilized(int numOfCropRows, int numOfCropFert) { } return toBeFertilized=false;} - public void setNumOfFertCrop(){this.numOfCropFert=numOfCropFert} + public void setNumOfFertCrop(){this.numOfCropFert=numOfCropFert;} public int getNumOfFertCrop() { return this.numOfCropFert; } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/FarmVehicle.java b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/FarmVehicle.java index ccef3f20..098805d0 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/FarmVehicle.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/FarmVehicle.java @@ -10,7 +10,6 @@ public FarmVehicle(){ offFarm= "Off Farm"; location =""; } - public public void setLocation(String expected){ this.location=location; } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/crops/CornPlant.java b/src/main/java/com/zipcodewilmington/froilansfarm/crops/CornPlant.java index e87c01c5..89b8c432 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/crops/CornPlant.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/crops/CornPlant.java @@ -5,8 +5,12 @@ public class CornPlant extends Crop{ - public CornPlant(Integer numOfEdiblesYielded, Integer numOfCropsHarvested, Integer numOfCropsFertilized, Integer numOfCropsAvailableToEat) { - super(numOfEdiblesYielded, numOfCropsHarvested, numOfCropsFertilized, numOfCropsAvailableToEat); + public CornPlant(Integer numOfEdiblesYielded, Integer numOfCropsHarvested, Integer numOfEdiblesEaten) { + super(numOfEdiblesYielded, numOfCropsHarvested, numOfEdiblesEaten); + } + + public CornPlant() { + super(); } @Override diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/crops/Crop.java b/src/main/java/com/zipcodewilmington/froilansfarm/crops/Crop.java index c87294a8..1bc71cc6 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/crops/Crop.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/crops/Crop.java @@ -4,49 +4,36 @@ import com.zipcodewilmington.froilansfarm.Produce; public abstract class Crop implements Produce { - Integer numOfEdiblesYielded; - Integer numOfCropsHarvested; - Integer numOfCropsFertilized; - Integer numOfCropsAvailableToEat; + Integer numOfEdiblesYielded; //once fertilized + Integer numOfEdiblesHarvested; //once harvested + Integer numOfEdiblesEaten; //decrement if eaten - public Crop(Integer numOfCropsPlanted, Integer numOfCropsHarvested, Integer numOfCropsFertilized, Integer numOfCropsAvailableToEat) { - this.numOfEdiblesYielded = numOfCropsPlanted; - this.numOfCropsHarvested = numOfCropsHarvested; - this.numOfCropsFertilized = numOfCropsFertilized; - this.numOfCropsAvailableToEat = numOfCropsAvailableToEat; + public Crop(Integer numOfYield, Integer numOfCropsHarvested, Integer numOfEdiblesLeft) { + this.numOfEdiblesYielded = numOfYield; + this.numOfEdiblesHarvested = numOfCropsHarvested; + this.numOfEdiblesEaten = numOfEdiblesLeft; } - - public Integer getNumOfCropsPlanted() { - return numOfEdiblesYielded; - } - - public void setNumOfCropsPlanted(Integer numOfCropsPlanted) { - this.numOfEdiblesYielded = numOfCropsPlanted; - } - - public Integer getNumOfCropsHarvested() { - return numOfCropsHarvested; + public Crop() { + this.numOfEdiblesYielded = 0; + this.numOfEdiblesHarvested = 0; + this.numOfEdiblesEaten = 0; } - public void setNumOfCropsHarvested(Integer numOfCropsHarvested) { - this.numOfCropsHarvested = numOfCropsHarvested; - } - public Integer getNumOfCropsFertilized() { - return numOfCropsFertilized; + public Integer getNumOfEdiblesYielded(){ + return numOfEdiblesYielded; } - public void setNumOfCropsFertilized(Integer numOfCropsFertilized) { - this.numOfCropsFertilized = numOfCropsFertilized; - } - public Integer getNumOfCropsAvailableToEat() { - return numOfCropsAvailableToEat; - } + public Integer getNumberofHarvest(){ + while(hasBeenHarvested()==true) + {return numOfEdiblesYielded ;} + return numOfEdiblesHarvested; + }; - public void setNumOfCropsAvailableToEat(Integer numOfCropsAvailableToEat) { - this.numOfCropsAvailableToEat = numOfCropsAvailableToEat; + public Integer getFoodToEat(){ + return numOfEdiblesHarvested-numOfEdiblesEaten; } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/crops/CropRow.java b/src/main/java/com/zipcodewilmington/froilansfarm/crops/CropRow.java index 792301b2..aab9287c 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/crops/CropRow.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/crops/CropRow.java @@ -26,4 +26,11 @@ public void addCrop(Crop crop,Integer numberOfCrops){ cropRow.add(crop); } } + public void addCrop(Crop crop){ + cropRow.add(crop); + } + + public void removeCrop(Crop crop) { + cropRow.remove(crop); + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/crops/EarOfCorn.java b/src/main/java/com/zipcodewilmington/froilansfarm/crops/EarOfCorn.java index 8d39203b..2f56ba98 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/crops/EarOfCorn.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/crops/EarOfCorn.java @@ -3,4 +3,8 @@ import com.zipcodewilmington.froilansfarm.Edible; public class EarOfCorn implements Edible { + @Override + public boolean isEaten() { + return false; + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/crops/TomatoPlant.java b/src/main/java/com/zipcodewilmington/froilansfarm/crops/TomatoPlant.java index 9fcfd9da..1b34531f 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/crops/TomatoPlant.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/crops/TomatoPlant.java @@ -4,12 +4,16 @@ import com.zipcodewilmington.froilansfarm.Produce; public class TomatoPlant extends Crop{ - public TomatoPlant(Integer numOfEdiblesYielded, Integer numOfCropsHarvested, Integer numOfCropsFertilized, Integer numOfCropsAvailableToEat) { - super(numOfEdiblesYielded, numOfCropsHarvested, numOfCropsFertilized, numOfCropsAvailableToEat); + public TomatoPlant(Integer numOfEdiblesYielded, Integer numOfCropsHarvested, Integer numOfCropsFertilized) { + super(numOfEdiblesYielded, numOfCropsHarvested, numOfCropsFertilized); } - public TomatoPlant(Integer numberOfCrops) { - super(numberOfCrops,0,0,0); + public TomatoPlant(Integer numberOfTomatoes) { + super(numberOfTomatoes,0,0); + } + + public TomatoPlant() { + super(); } public Edible getYield(){ @@ -18,6 +22,9 @@ public Edible getYield(){ @Override public void yield(Edible edible) { + if (hasBeenFertilized()==true) { + numOfEdiblesYielded++; + } } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/croptests/CropRowTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/croptests/CropRowTest.java index d3b4ab11..30319658 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/croptests/CropRowTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/croptests/CropRowTest.java @@ -51,4 +51,21 @@ public void addCropTest(){ } + @Test + public void removeCrop(){ + //given + CropRow testRow = new CropRow(); + TomatoPlant tomato = new TomatoPlant(0); + + //when + testRow.addCrop(tomato); + testRow.removeCrop(tomato); + int actual = testRow.getNumberofCropsPlanted(); + + //then + int expected = 0; + Assert.assertEquals(expected, actual); + } + + } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/croptests/CropTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/croptests/CropTest.java new file mode 100644 index 00000000..51b762eb --- /dev/null +++ b/src/test/java/com/zipcodewilmington/froilansfarm/croptests/CropTest.java @@ -0,0 +1,84 @@ +package com.zipcodewilmington.froilansfarm.croptests; + +import com.zipcodewilmington.froilansfarm.crops.CornPlant; +import com.zipcodewilmington.froilansfarm.crops.Crop; +import com.zipcodewilmington.froilansfarm.crops.Tomato; +import com.zipcodewilmington.froilansfarm.crops.TomatoPlant; +import org.junit.Assert; +import org.junit.Test; + +public class CropTest { + + @Test + public void nullaryConstructorTest(){ + //given + Crop tomatoPlant = new TomatoPlant(); + + //when + int actual = tomatoPlant.getNumOfEdiblesYielded(); + + //then + int expected = 0; + Assert.assertEquals(expected, actual); + } + @Test + public void nullaryCornConstructorTest(){ + //given + Crop cornPlant = new CornPlant(); + + //when + int actual = cornPlant.getNumOfEdiblesYielded(); + + //then + int expected = 0; + Assert.assertEquals(expected, actual); + } + + @Test + public void countFertilizedFalseTest(){ + //given + Crop tomatoPlant = new TomatoPlant(); + Tomato tomato = new Tomato(); + int expected = 0; + + //when + tomatoPlant.yield(tomato); + int actual = tomatoPlant.getNumOfEdiblesYielded(); + + //then + Assert.assertEquals(expected, actual); + } + + @Test + public void countHarvestFalseTest(){ + //given + Crop tomatoPlant = new TomatoPlant(); + Tomato tomato = new Tomato(); + tomatoPlant.yield(tomato); + int expected = 0; + + //when + int actual = tomatoPlant.getNumberofHarvest(); + + //then + Assert.assertEquals(expected, actual); + } + + @Test + public void AvailableToEatTest(){ + //given + Crop tomatoPlant = new TomatoPlant(); + Tomato tomato = new Tomato(); + int expected = 0; + + //when + tomatoPlant.yield(tomato); + int actual = tomatoPlant.getFoodToEat(); + + //then + Assert.assertEquals(expected, actual); + + + + } +} From 1145aa2a98544ad5522c6186f4eb73fd85b4a33c Mon Sep 17 00:00:00 2001 From: Nick Date: Thu, 22 Jul 2021 14:04:39 -0400 Subject: [PATCH 21/48] Fixed duplicate class --- src/main/java/Animal/Horse.java | 8 ++++++++ .../com/zipcodewilmington/froilansfarm/Chicken.java | 4 ---- .../com/zipcodewilmington/froilansfarm/Horse.java | 11 ----------- .../froilansfarm/storage/ChickenCoop.java | 2 +- .../froilansfarm/storage/Stable.java | 2 +- .../froilansfarm/testStorage/ChickenCoopTest.java | 2 +- .../froilansfarm/testStorage/StableTest.java | 2 +- 7 files changed, 12 insertions(+), 19 deletions(-) delete mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Chicken.java delete mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Horse.java diff --git a/src/main/java/Animal/Horse.java b/src/main/java/Animal/Horse.java index 10937741..1a83d303 100644 --- a/src/main/java/Animal/Horse.java +++ b/src/main/java/Animal/Horse.java @@ -4,11 +4,19 @@ public class Horse extends Animal implements Rideable { + String name; + Integer age; + Integer amountOfFoodEaten; public Horse(String name,Integer age,Integer amountOfFoodEaten){ super(name,age,amountOfFoodEaten); } + public Horse () { + this.name = ""; + this.age = 0; + this.amountOfFoodEaten = 0; + } public boolean hasBeenRiden() { return false; 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 0b7f8fb3..00000000 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Chicken.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.zipcodewilmington.froilansfarm; - -public class Chicken { -} 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 168c12f0..00000000 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Horse.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.zipcodewilmington.froilansfarm; - -public class Horse implements Rideable { - - - - @Override - public boolean hasBeenRiden() { - return false; - } -} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/storage/ChickenCoop.java b/src/main/java/com/zipcodewilmington/froilansfarm/storage/ChickenCoop.java index 7faeaafd..d1c73f31 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/storage/ChickenCoop.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/storage/ChickenCoop.java @@ -1,6 +1,6 @@ package com.zipcodewilmington.froilansfarm.storage; -import com.zipcodewilmington.froilansfarm.Chicken; +import Animal.Chicken; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/storage/Stable.java b/src/main/java/com/zipcodewilmington/froilansfarm/storage/Stable.java index 622eb12b..7ef80d85 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/storage/Stable.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/storage/Stable.java @@ -1,6 +1,6 @@ package com.zipcodewilmington.froilansfarm.storage; -import com.zipcodewilmington.froilansfarm.Horse; +import Animal.Horse; import java.util.ArrayList; import java.util.List; diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/testStorage/ChickenCoopTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/testStorage/ChickenCoopTest.java index 9751d961..5b31e5e1 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/testStorage/ChickenCoopTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/testStorage/ChickenCoopTest.java @@ -1,6 +1,6 @@ package com.zipcodewilmington.froilansfarm.testStorage; -import com.zipcodewilmington.froilansfarm.Chicken; +import Animal.Chicken; import com.zipcodewilmington.froilansfarm.storage.ChickenCoop; import com.zipcodewilmington.froilansfarm.storage.StorageInterface; import org.junit.Assert; diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/testStorage/StableTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/testStorage/StableTest.java index 68f67bfa..a84ceaf8 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/testStorage/StableTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/testStorage/StableTest.java @@ -1,6 +1,6 @@ package com.zipcodewilmington.froilansfarm.testStorage; -import com.zipcodewilmington.froilansfarm.Horse; +import Animal.Horse; import com.zipcodewilmington.froilansfarm.storage.Stable; import com.zipcodewilmington.froilansfarm.storage.StorageInterface; import org.junit.Assert; From 3590ef4133c6d9e49a2fa9b8de4da6dd32c8d021 Mon Sep 17 00:00:00 2001 From: sitarameez Date: Thu, 22 Jul 2021 14:57:01 -0400 Subject: [PATCH 22/48] hgkg --- README.md | 6 ++-- src/main/java/Animal/Barn.java | 33 ----------------- .../froilansfarm}/Animal/Animal.java | 2 +- .../froilansfarm/Animal/Barn.java | 35 +++++++++++++++++++ .../froilansfarm}/Animal/Chicken.java | 2 +- .../froilansfarm}/Animal/Farmer.java | 3 +- .../froilansfarm}/Animal/Horse.java | 3 +- .../froilansfarm}/Animal/Person.java | 2 +- .../froilansfarm/crops/EarOfCorn.java | 4 +++ .../froilansfarm/storage/ChickenCoop.java | 3 +- .../froilansfarm/storage/Stable.java | 3 +- .../froilansfarm}/AnimalTest/AnimalTest.java | 4 +-- .../froilansfarm}/AnimalTest/BarnTest.java | 32 +++++++++++------ .../froilansfarm}/AnimalTest/ChickenTest.java | 4 +-- .../froilansfarm}/AnimalTest/FarmerTest.java | 4 +-- .../froilansfarm}/AnimalTest/HorseTest.java | 4 +-- .../froilansfarm}/AnimalTest/PersonTest.java | 5 ++- 17 files changed, 83 insertions(+), 66 deletions(-) delete mode 100644 src/main/java/Animal/Barn.java rename src/main/java/{ => com/zipcodewilmington/froilansfarm}/Animal/Animal.java (94%) create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Animal/Barn.java rename src/main/java/{ => com/zipcodewilmington/froilansfarm}/Animal/Chicken.java (92%) rename src/main/java/{ => com/zipcodewilmington/froilansfarm}/Animal/Farmer.java (96%) rename src/main/java/{ => com/zipcodewilmington/froilansfarm}/Animal/Horse.java (83%) rename src/main/java/{ => com/zipcodewilmington/froilansfarm}/Animal/Person.java (92%) rename src/test/java/{ => com/zipcodewilmington/froilansfarm}/AnimalTest/AnimalTest.java (94%) rename src/test/java/{ => com/zipcodewilmington/froilansfarm}/AnimalTest/BarnTest.java (64%) rename src/test/java/{ => com/zipcodewilmington/froilansfarm}/AnimalTest/ChickenTest.java (89%) rename src/test/java/{ => com/zipcodewilmington/froilansfarm}/AnimalTest/FarmerTest.java (79%) rename src/test/java/{ => com/zipcodewilmington/froilansfarm}/AnimalTest/HorseTest.java (86%) rename src/test/java/{ => com/zipcodewilmington/froilansfarm}/AnimalTest/PersonTest.java (92%) diff --git a/README.md b/README.md index 433e7ef4..597aa6d7 100644 --- a/README.md +++ b/README.md @@ -9,9 +9,9 @@ * Consider a system in which * `Eater` can `eat` an `Edible` object. * `NoiseMaker` can `makeNoise` - * `Animal` is a `NoiseMaker` and `Eater` - * `Horse` is an `Animal` and `Rideable` - * `Chicken` is an `Animal` and a `Produce` which `yield` an `EdibleEgg` if `hasBeenFertilized` flag is `false`. + * `com.zipcodewilmington.froilansfarm.Animal` is a `NoiseMaker` and `Eater` + * `Horse` is an `com.zipcodewilmington.froilansfarm.Animal` and `Rideable` + * `Chicken` is an `com.zipcodewilmington.froilansfarm.Animal` and a `Produce` which `yield` an `EdibleEgg` if `hasBeenFertilized` flag is `false`. * `Rider` can `mount` and `dismount` a `Rideable` object. * `Botanist` can `plant` a `Crop` in a `CropRow`. diff --git a/src/main/java/Animal/Barn.java b/src/main/java/Animal/Barn.java deleted file mode 100644 index a863d409..00000000 --- a/src/main/java/Animal/Barn.java +++ /dev/null @@ -1,33 +0,0 @@ -package Animal; - -import java.util.ArrayList; -import java.util.List; - -public class Barn { - List animals; - - public Barn() { - animals = new ArrayList(); - } - - public Integer numberOfAnimals(T animal){ - return animals.size(); - } - - - public void add(T animal) { - animals.add(animal); - } - - public void remove(T animal) { - animals.remove(animal); - } - - public List getAnimals() { - return animals; - } - - public void setAnimals(List animals) { - this.animals = animals; - } -} \ No newline at end of file diff --git a/src/main/java/Animal/Animal.java b/src/main/java/com/zipcodewilmington/froilansfarm/Animal/Animal.java similarity index 94% rename from src/main/java/Animal/Animal.java rename to src/main/java/com/zipcodewilmington/froilansfarm/Animal/Animal.java index be6e0e42..e14d40fa 100644 --- a/src/main/java/Animal/Animal.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Animal/Animal.java @@ -1,4 +1,4 @@ -package Animal; +package com.zipcodewilmington.froilansfarm.Animal; import com.zipcodewilmington.froilansfarm.Eater; import com.zipcodewilmington.froilansfarm.Edible; diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Animal/Barn.java b/src/main/java/com/zipcodewilmington/froilansfarm/Animal/Barn.java new file mode 100644 index 00000000..83f67af1 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Animal/Barn.java @@ -0,0 +1,35 @@ +package com.zipcodewilmington.froilansfarm.Animal; + +import com.zipcodewilmington.froilansfarm.storage.StorageInterface; + +import java.util.ArrayList; +import java.util.List; + +public abstract class Barn implements StorageInterface { + List animals; + + public Barn() { + animals = new ArrayList(); + } + + public Integer numberOfAnimals(T animal){ + return animals.size(); + } + + +// public void add(T animal) { +// animals.add(animal); +// } +// +// public void remove(T animal) { +// animals.remove(animal); +// } + + public List getAnimals() { + return animals; + } + + public void setAnimals(List animals) { + this.animals = new ArrayList<>(animals); + } +} \ No newline at end of file diff --git a/src/main/java/Animal/Chicken.java b/src/main/java/com/zipcodewilmington/froilansfarm/Animal/Chicken.java similarity index 92% rename from src/main/java/Animal/Chicken.java rename to src/main/java/com/zipcodewilmington/froilansfarm/Animal/Chicken.java index f396cbdc..26a37748 100644 --- a/src/main/java/Animal/Chicken.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Animal/Chicken.java @@ -1,4 +1,4 @@ -package Animal; +package com.zipcodewilmington.froilansfarm.Animal; import com.zipcodewilmington.froilansfarm.Edible; import com.zipcodewilmington.froilansfarm.Produce; diff --git a/src/main/java/Animal/Farmer.java b/src/main/java/com/zipcodewilmington/froilansfarm/Animal/Farmer.java similarity index 96% rename from src/main/java/Animal/Farmer.java rename to src/main/java/com/zipcodewilmington/froilansfarm/Animal/Farmer.java index f4ebd47c..0f3683dd 100644 --- a/src/main/java/Animal/Farmer.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Animal/Farmer.java @@ -1,4 +1,4 @@ -package Animal; +package com.zipcodewilmington.froilansfarm.Animal; import com.zipcodewilmington.froilansfarm.Eater; import com.zipcodewilmington.froilansfarm.Edible; @@ -7,7 +7,6 @@ import com.zipcodewilmington.froilansfarm.Vehilce.Botanist; import com.zipcodewilmington.froilansfarm.crops.Crop; -import java.security.PrivateKey; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/Animal/Horse.java b/src/main/java/com/zipcodewilmington/froilansfarm/Animal/Horse.java similarity index 83% rename from src/main/java/Animal/Horse.java rename to src/main/java/com/zipcodewilmington/froilansfarm/Animal/Horse.java index 10937741..caa6bf10 100644 --- a/src/main/java/Animal/Horse.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Animal/Horse.java @@ -1,4 +1,4 @@ -package Animal; +package com.zipcodewilmington.froilansfarm.Animal; import com.zipcodewilmington.froilansfarm.Rideable; @@ -9,6 +9,7 @@ public Horse(String name,Integer age,Integer amountOfFoodEaten){ super(name,age,amountOfFoodEaten); } + public Horse(){} public boolean hasBeenRiden() { return false; diff --git a/src/main/java/Animal/Person.java b/src/main/java/com/zipcodewilmington/froilansfarm/Animal/Person.java similarity index 92% rename from src/main/java/Animal/Person.java rename to src/main/java/com/zipcodewilmington/froilansfarm/Animal/Person.java index 5b50948d..7fcff08c 100644 --- a/src/main/java/Animal/Person.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Animal/Person.java @@ -1,4 +1,4 @@ -package Animal; +package com.zipcodewilmington.froilansfarm.Animal; public class Person { String name; diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/crops/EarOfCorn.java b/src/main/java/com/zipcodewilmington/froilansfarm/crops/EarOfCorn.java index 8d39203b..2f56ba98 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/crops/EarOfCorn.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/crops/EarOfCorn.java @@ -3,4 +3,8 @@ import com.zipcodewilmington.froilansfarm.Edible; public class EarOfCorn implements Edible { + @Override + public boolean isEaten() { + return false; + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/storage/ChickenCoop.java b/src/main/java/com/zipcodewilmington/froilansfarm/storage/ChickenCoop.java index 7faeaafd..ee758c1b 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/storage/ChickenCoop.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/storage/ChickenCoop.java @@ -1,11 +1,12 @@ package com.zipcodewilmington.froilansfarm.storage; +import com.zipcodewilmington.froilansfarm.Animal.Barn; import com.zipcodewilmington.froilansfarm.Chicken; import java.util.ArrayList; import java.util.List; -public class ChickenCoop implements StorageInterface { +public class ChickenCoop extends Barn { List listOfChicken; diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/storage/Stable.java b/src/main/java/com/zipcodewilmington/froilansfarm/storage/Stable.java index 622eb12b..0dc30b9e 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/storage/Stable.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/storage/Stable.java @@ -1,11 +1,12 @@ package com.zipcodewilmington.froilansfarm.storage; +import com.zipcodewilmington.froilansfarm.Animal.Barn; import com.zipcodewilmington.froilansfarm.Horse; import java.util.ArrayList; import java.util.List; -public class Stable implements StorageInterface { +public class Stable extends Barn { List listOfHorses; diff --git a/src/test/java/AnimalTest/AnimalTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/AnimalTest/AnimalTest.java similarity index 94% rename from src/test/java/AnimalTest/AnimalTest.java rename to src/test/java/com/zipcodewilmington/froilansfarm/AnimalTest/AnimalTest.java index d27e41bd..03daf4d1 100644 --- a/src/test/java/AnimalTest/AnimalTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/AnimalTest/AnimalTest.java @@ -1,5 +1,5 @@ -package AnimalTest; -import Animal.Animal; +package com.zipcodewilmington.froilansfarm.AnimalTest; +import com.zipcodewilmington.froilansfarm.Animal.Animal; import org.junit.Test; import org.junit.Assert; public class AnimalTest { diff --git a/src/test/java/AnimalTest/BarnTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/AnimalTest/BarnTest.java similarity index 64% rename from src/test/java/AnimalTest/BarnTest.java rename to src/test/java/com/zipcodewilmington/froilansfarm/AnimalTest/BarnTest.java index 281bf459..bad90244 100644 --- a/src/test/java/AnimalTest/BarnTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/AnimalTest/BarnTest.java @@ -1,6 +1,11 @@ -package AnimalTest; +package com.zipcodewilmington.froilansfarm.AnimalTest; -import Animal.Barn; +import com.zipcodewilmington.froilansfarm.Animal.Animal; +import com.zipcodewilmington.froilansfarm.Animal.Barn; +import com.zipcodewilmington.froilansfarm.Animal.Chicken; +import com.zipcodewilmington.froilansfarm.Animal.Horse; +import com.zipcodewilmington.froilansfarm.storage.ChickenCoop; +import com.zipcodewilmington.froilansfarm.storage.Stable; import org.junit.Assert; import org.junit.Test; @@ -11,7 +16,7 @@ public class BarnTest { @Test public void numberOfAnimalsTest() { - Barn barn = new Barn(); + Barn barn = new ChickenCoop(); List animals = new ArrayList();; //List animals = new ArrayList<>(); @@ -25,7 +30,7 @@ public void numberOfAnimalsTest() { @Test public void addTest() { - Barn barn = new Barn(); + Barn barn = new ChickenCoop(); List animals = new ArrayList<>(); animals.add("chicken"); barn.setAnimals(animals); @@ -36,19 +41,24 @@ public void addTest() { @Test public void removeTest() { - Barn barn = new Barn(); - List animals = new ArrayList<>(); - animals.add("chicken"); - animals.add("horse"); + Barn barn = new Stable(); + List animals = new ArrayList<>(); + Animal horse=new Horse(); + Animal horse2= new Horse(); + + animals.add(horse2); + animals.add(horse); + barn.setAnimals(animals); - barn.remove(animals.get(0)); + + barn.getAnimals().remove(horse); Assert.assertEquals(1, barn.getAnimals().size()); } @Test public void testGetAnimals() { - Barn barn = new Barn(); + Barn barn = new Stable(); List animals = new ArrayList<>(); animals.add("chicken"); animals.add("horse"); @@ -59,7 +69,7 @@ public void testGetAnimals() { @Test public void testSetAnimals() { - Barn barn = new Barn(); + Barn barn = new ChickenCoop(); List animals = new ArrayList<>(); animals.add("chicken"); animals.add("horse"); diff --git a/src/test/java/AnimalTest/ChickenTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/AnimalTest/ChickenTest.java similarity index 89% rename from src/test/java/AnimalTest/ChickenTest.java rename to src/test/java/com/zipcodewilmington/froilansfarm/AnimalTest/ChickenTest.java index b26c5667..54564d85 100644 --- a/src/test/java/AnimalTest/ChickenTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/AnimalTest/ChickenTest.java @@ -1,6 +1,6 @@ -package AnimalTest; +package com.zipcodewilmington.froilansfarm.AnimalTest; -import Animal.Chicken; +import com.zipcodewilmington.froilansfarm.Animal.Chicken; import com.zipcodewilmington.froilansfarm.Edible; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/AnimalTest/FarmerTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/AnimalTest/FarmerTest.java similarity index 79% rename from src/test/java/AnimalTest/FarmerTest.java rename to src/test/java/com/zipcodewilmington/froilansfarm/AnimalTest/FarmerTest.java index 1d788f3f..b0ff021c 100644 --- a/src/test/java/AnimalTest/FarmerTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/AnimalTest/FarmerTest.java @@ -1,6 +1,6 @@ -package AnimalTest; +package com.zipcodewilmington.froilansfarm.AnimalTest; -import Animal.Farmer; +import com.zipcodewilmington.froilansfarm.Animal.Farmer; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/AnimalTest/HorseTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/AnimalTest/HorseTest.java similarity index 86% rename from src/test/java/AnimalTest/HorseTest.java rename to src/test/java/com/zipcodewilmington/froilansfarm/AnimalTest/HorseTest.java index 71275d2b..9b1e34c8 100644 --- a/src/test/java/AnimalTest/HorseTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/AnimalTest/HorseTest.java @@ -1,6 +1,6 @@ -package AnimalTest; +package com.zipcodewilmington.froilansfarm.AnimalTest; -import Animal.Horse; +import com.zipcodewilmington.froilansfarm.Animal.Horse; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/AnimalTest/PersonTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/AnimalTest/PersonTest.java similarity index 92% rename from src/test/java/AnimalTest/PersonTest.java rename to src/test/java/com/zipcodewilmington/froilansfarm/AnimalTest/PersonTest.java index 94d125a7..b03166bd 100644 --- a/src/test/java/AnimalTest/PersonTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/AnimalTest/PersonTest.java @@ -1,8 +1,7 @@ -package AnimalTest; +package com.zipcodewilmington.froilansfarm.AnimalTest; -import Animal.Animal; -import Animal.Person; +import com.zipcodewilmington.froilansfarm.Animal.Person; import org.junit.Assert; import org.junit.Test; From 55693eda8193f7fb2daf62087b1dea1a3323c751 Mon Sep 17 00:00:00 2001 From: charnaexw Date: Thu, 22 Jul 2021 15:06:55 -0400 Subject: [PATCH 23/48] Woop --- .../froilansfarm/Vehicle/CropDuster.java | 36 +++++++---- .../froilansfarm/Vehicle/Tractor.java | 33 +++++++++++ .../froilansfarm/crops/EarOfCorn.java | 4 ++ .../froilansfarm/crops/Tomato.java | 4 ++ .../froilansfarm/Vehicles/CropDusterTest.java | 23 +++++--- .../froilansfarm/Vehicles/TractorTest.java | 59 +++++++++++++++++++ 6 files changed, 141 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/CropDuster.java b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/CropDuster.java index 69248695..8a18a0e3 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/CropDuster.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/CropDuster.java @@ -6,19 +6,39 @@ public class CropDuster extends FarmVehicle implements Aircraft { public int numOfCropRows; public int numOfCropFert; - public CropDuster (){ - toBeFertilized=false; - numOfCropFert=0; - numOfCropRows=0; + public CropDuster(boolean toBeFertilized, int numOfCropRows, int numOfCropFert) { + this.toBeFertilized = toBeFertilized; + this.numOfCropRows = numOfCropRows; + this.numOfCropFert = numOfCropFert; } - public CropDuster(int numOfCropRows, int numOfCropFert){ + + public boolean isToBeFertilized() { + return toBeFertilized; + } + + public void setToBeFertilized(boolean toBeFertilized) { + this.toBeFertilized = toBeFertilized; } - public void setNumOfCropRows(int expected){this.numOfCropRows=numOfCropRows; + + public int getNumOfCropFert() { + return numOfCropFert; + } + + public void setNumOfCropFert(int numOfCropFert) { + this.numOfCropFert = numOfCropFert; + } + + + public void setNumOfCropRows(int numOfCropRows){this.numOfCropRows=numOfCropRows; } public int getNumOfCropRows(){ return this.numOfCropRows; } + public void setNumOfFertCrop(int numOfCropFert){this.numOfCropFert=numOfCropFert;} + + public int getNumOfFertCrop() { return this.numOfCropFert; } + public boolean needsToBeFertilized(int numOfCropRows, int numOfCropFert) { int numNonFertCrops= numOfCropRows-numOfCropFert; int cropWork = numOfCropRows/3; @@ -27,10 +47,6 @@ public boolean needsToBeFertilized(int numOfCropRows, int numOfCropFert) { } return toBeFertilized=false;} - public void setNumOfFertCrop(){this.numOfCropFert=numOfCropFert;} - - public int getNumOfFertCrop() { return this.numOfCropFert; - } @Override public void fly(int distance) { diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/Tractor.java b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/Tractor.java index f6e755ee..ef21ce89 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/Tractor.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/Tractor.java @@ -1,4 +1,37 @@ package com.zipcodewilmington.froilansfarm.Vehicle; public class Tractor extends FarmVehicle { + boolean toBeHarvested; + int numOfFertCrop; + int numOfHarvCrop; + + public Tractor(boolean toBeHarvested, int numOfFertCrop, int numOfHarvCrop) { + this.toBeHarvested = toBeHarvested; + this.numOfFertCrop = numOfFertCrop; + this.numOfHarvCrop = numOfHarvCrop; + } + + public boolean isToBeHarvested() { + return toBeHarvested; + } + + public void setToBeHarvested(boolean toBeHarvested) { + this.toBeHarvested = toBeHarvested; + } + + public void setNumOfFertCrop(int numOfFertCrop) { + this.numOfFertCrop = numOfFertCrop; + } + + public void setNumOfHarvCrop(int numOfHarvCrop) { + this.numOfHarvCrop = numOfHarvCrop; + } + + public int getNumOfHarvCrop() { + return 0; + } + + public int getNumOfFertCrop() { + return 0; + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/crops/EarOfCorn.java b/src/main/java/com/zipcodewilmington/froilansfarm/crops/EarOfCorn.java index 8d39203b..2f56ba98 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/crops/EarOfCorn.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/crops/EarOfCorn.java @@ -3,4 +3,8 @@ import com.zipcodewilmington.froilansfarm.Edible; public class EarOfCorn implements Edible { + @Override + public boolean isEaten() { + return false; + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/crops/Tomato.java b/src/main/java/com/zipcodewilmington/froilansfarm/crops/Tomato.java index b2e7d284..f4ed5953 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/crops/Tomato.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/crops/Tomato.java @@ -3,4 +3,8 @@ import com.zipcodewilmington.froilansfarm.Edible; public class Tomato implements Edible { + @Override + public boolean isEaten() { + return false; + } } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDusterTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDusterTest.java index dd5df35c..2e2cafc3 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDusterTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDusterTest.java @@ -12,7 +12,7 @@ public void constructorTest(){ int numOfFertCrops=32; boolean toBeFertilized=true; //when - CropDuster crop = new CropDuster(numOfCropRows, numOfFertCrops); + CropDuster crop = new CropDuster(false, numOfCropRows, numOfFertCrops); //then Assert.assertNotEquals(numOfCropRows, crop.getNumOfCropRows()); @@ -27,17 +27,17 @@ public void nullaryConstructorTest(){ int expectedNumOfFertCrop=4863826; //when - CropDuster crop = new CropDuster(); + CropDuster crop = new CropDuster(true, 0, 0); //then Assert.assertNotEquals(expectedNumOfCrop, crop.getNumOfCropRows()); Assert.assertNotEquals(expectedNumOfFertCrop, crop.getNumOfFertCrop()); - Assert.assertNotEquals(expectedNumOfCrop, expectedNumOfFertCrop); + Assert.assertNotEquals(expectedFertilizer, crop.isToBeFertilized()); } @Test public void getCropsTest1(){ int expected= 15; - CropDuster crop = new CropDuster(); + CropDuster crop = new CropDuster(false,0, 0); crop.setNumOfCropRows(expected); //when int actual = crop.getNumOfCropRows(); @@ -51,15 +51,22 @@ public void needsToBeFertilizedTest(){ int fertCrop=4; boolean expected=true; //when - CropDuster crop =new CropDuster(cropNum, fertCrop); + CropDuster crop =new CropDuster(false, cropNum, fertCrop); boolean actual= crop.needsToBeFertilized(cropNum, fertCrop); //then Assert.assertEquals(expected, actual ); } @Test - public void getFertCropsTest1(){} - @Test - public void getFertCropTest2(){} + public void getFertCropsTest1(){ + int expectedFertCrop = 5; + CropDuster crop = new CropDuster(false, 0, 0); + crop.setNumOfFertCrop(expectedFertCrop); + + int actual = crop.getNumOfFertCrop(); + + Assert.assertEquals(expectedFertCrop, actual); + } + } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/TractorTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/TractorTest.java index f2e01714..bf39566a 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/TractorTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/TractorTest.java @@ -1,5 +1,8 @@ package com.zipcodewilmington.froilansfarm.Vehicles; +import com.zipcodewilmington.froilansfarm.Vehicle.CropDuster; +import com.zipcodewilmington.froilansfarm.Vehicle.Tractor; +import org.junit.Assert; import org.junit.Test; public class TractorTest { @@ -7,8 +10,64 @@ public class TractorTest { @Test public void constructorTest(){ //given + int numOfHarvCrops=93; + int numOfFertCrops=32; + boolean toBeHarvested=true; //when + Tractor crop = new Tractor(false, numOfFertCrops, numOfHarvCrops); + + //then + Assert.assertNotEquals(numOfHarvCrops, crop.getNumOfHarvCrop()); + Assert.assertNotEquals(numOfFertCrops, crop.getNumOfFertCrop()); + Assert.assertNotEquals(toBeHarvested, false); + } + @Test + public void nullaryConstructorTest(){ + //given + boolean expectedHarvested=true; + int expectedNumOfHarvCrop=895894; + int expectedNumOfFertCrop=4863826; + + //when + Tractor crop = new Tractor(false, 0,0); + //then + Assert.assertNotEquals(expectedNumOfHarvCrop, crop.getNumOfHarvCrop()); + Assert.assertNotEquals(expectedNumOfFertCrop, crop.getNumOfFertCrop()); + Assert.assertNotEquals(expectedHarvested, crop.isToBeHarvested()); + + } + @Test + public void getCropsTest1(){ + int expected= 15; + CropDuster crop = new CropDuster(false, 0, 0); + crop.setNumOfCropRows(expected); + //when + int actual = crop.getNumOfCropRows(); + //then + Assert.assertEquals(expected, actual); + } + @Test + public void needsToBeFertilizedTest(){ + //given + int cropNum=20; + int fertCrop=4; + boolean expected=true; + //when + CropDuster crop =new CropDuster(false, cropNum, fertCrop); + boolean actual= crop.needsToBeFertilized(cropNum, fertCrop); //then + Assert.assertEquals(expected, actual ); + } + + @Test + public void getFertCropsTest1(){ + int expectedFertCrop = 5; + CropDuster crop = new CropDuster(false,0, 0); + crop.setNumOfFertCrop(expectedFertCrop); + + int actual = crop.getNumOfFertCrop(); + + Assert.assertEquals(expectedFertCrop, actual); } } From 50a7b4da2f2a54f889dae3fb8cc5f019479ed736 Mon Sep 17 00:00:00 2001 From: charnaexw Date: Thu, 22 Jul 2021 16:14:40 -0400 Subject: [PATCH 24/48] Done --- .../froilansfarm/Vehicle/Tractor.java | 14 +++++- .../froilansfarm/Vehicles/TractorTest.java | 45 ++++++++++++++----- 2 files changed, 46 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/Tractor.java b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/Tractor.java index ef21ce89..17d94344 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/Tractor.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/Tractor.java @@ -28,10 +28,20 @@ public void setNumOfHarvCrop(int numOfHarvCrop) { } public int getNumOfHarvCrop() { - return 0; + return this.numOfHarvCrop; } public int getNumOfFertCrop() { - return 0; + return this.numOfFertCrop; } + + public boolean needsToBeHarvested(int numOfFertCrop, int numOfHarvCrop) { + Tractor crop=new Tractor(false, numOfFertCrop, numOfHarvCrop); + int numNonHarvCrops= numOfFertCrop-numOfHarvCrop; + int cropWork = numOfFertCrop/3; + if(numNonHarvCrops>cropWork){ + return toBeHarvested=true; + } + return toBeHarvested=false;} } + diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/TractorTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/TractorTest.java index bf39566a..6ca3288e 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/TractorTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/TractorTest.java @@ -14,7 +14,7 @@ public void constructorTest(){ int numOfFertCrops=32; boolean toBeHarvested=true; //when - Tractor crop = new Tractor(false, numOfFertCrops, numOfHarvCrops); + Tractor crop = new Tractor(false, 0, 0); //then Assert.assertNotEquals(numOfHarvCrops, crop.getNumOfHarvCrop()); @@ -39,30 +39,53 @@ public void nullaryConstructorTest(){ @Test public void getCropsTest1(){ int expected= 15; - CropDuster crop = new CropDuster(false, 0, 0); - crop.setNumOfCropRows(expected); + Tractor crop = new Tractor(false, 0, 0); + crop.setNumOfFertCrop(expected); //when - int actual = crop.getNumOfCropRows(); + int actual = crop.getNumOfFertCrop(); //then Assert.assertEquals(expected, actual); } @Test - public void needsToBeFertilizedTest(){ + public void needsToBeHarvestedTest(){ //given - int cropNum=20; - int fertCrop=4; + int fertCropNum=20; + int HarvCrop=4; boolean expected=true; //when - CropDuster crop =new CropDuster(false, cropNum, fertCrop); - boolean actual= crop.needsToBeFertilized(cropNum, fertCrop); + Tractor crop =new Tractor(false, fertCropNum, HarvCrop); + boolean actual= crop.needsToBeHarvested(fertCropNum, HarvCrop); + //then + Assert.assertEquals(expected, actual ); + } + @Test + public void needsToBeHarvestedTest2(){ + //given + int fertCropNum=3; + int HarvCrop=3; + boolean expected=false; + //when + Tractor crop =new Tractor(false, fertCropNum, HarvCrop); + boolean actual= crop.needsToBeHarvested(fertCropNum, HarvCrop); + //then + Assert.assertEquals(expected, actual ); + } + @Test + public void needsToBeHarvestedTest3(){ + //given + int fertCropNum=4; + int HarvCrop=15; + boolean expected=false; + //when + Tractor crop =new Tractor(false, fertCropNum, HarvCrop); + boolean actual= crop.needsToBeHarvested(fertCropNum, HarvCrop); //then Assert.assertEquals(expected, actual ); } - @Test public void getFertCropsTest1(){ int expectedFertCrop = 5; - CropDuster crop = new CropDuster(false,0, 0); + Tractor crop = new Tractor(false,0, 0); crop.setNumOfFertCrop(expectedFertCrop); int actual = crop.getNumOfFertCrop(); From 4ff1f289a14024c32040e534b78ef843b0abece7 Mon Sep 17 00:00:00 2001 From: charnaexw Date: Thu, 22 Jul 2021 17:31:59 -0400 Subject: [PATCH 25/48] Pilot --- .../froilansfarm/Vehicle/Pilot.java | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/Pilot.java diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/Pilot.java b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/Pilot.java new file mode 100644 index 00000000..165f4338 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/Pilot.java @@ -0,0 +1,24 @@ +package com.zipcodewilmington.froilansfarm.Vehicle; + +import com.zipcodewilmington.froilansfarm.Animal.Person; + +public class Pilot extends Person implements Aircraft{ + public Pilot() { + super(); + } + + @Override + public String noiseMaker() { + return null; + } + + @Override + public boolean hasBeenRiden() { + return false; + } + + @Override + public void fly(int distance) { + + } +} From 5fde741a6ded12c9e9d4d2117d246f9b0d55932d Mon Sep 17 00:00:00 2001 From: charnaexw Date: Thu, 22 Jul 2021 18:38:44 -0400 Subject: [PATCH 26/48] Done --- .../zipcodewilmington/froilansfarm/Vehicles/CropDusterTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDusterTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDusterTest.java index 2e2cafc3..211adb0c 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDusterTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDusterTest.java @@ -12,7 +12,7 @@ public void constructorTest(){ int numOfFertCrops=32; boolean toBeFertilized=true; //when - CropDuster crop = new CropDuster(false, numOfCropRows, numOfFertCrops); + CropDuster crop = new CropDuster(false, 0, 0); //then Assert.assertNotEquals(numOfCropRows, crop.getNumOfCropRows()); From 2f7c6978793f11dcff95971815f3d8378bdcccdd Mon Sep 17 00:00:00 2001 From: charnaexw Date: Thu, 22 Jul 2021 18:48:58 -0400 Subject: [PATCH 27/48] Tests done for real. --- .../froilansfarm/Vehicles/CropDusterTest.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDusterTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDusterTest.java index 211adb0c..671008a9 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDusterTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDusterTest.java @@ -1,6 +1,7 @@ package com.zipcodewilmington.froilansfarm.Vehicles; import com.zipcodewilmington.froilansfarm.Vehicle.CropDuster; +import com.zipcodewilmington.froilansfarm.Vehicle.Vehicle; import org.junit.Assert; import org.junit.Test; @@ -67,6 +68,9 @@ public void getFertCropsTest1(){ Assert.assertEquals(expectedFertCrop, actual); } - - + @Test + public void inheritenceTest(){ + CropDuster crop = new CropDuster(false, 0, 0); + Assert.assertTrue(crop instanceof Vehicle); + } } From 9ed2e90dfe4254baf990a83800cdda688d6dd4f0 Mon Sep 17 00:00:00 2001 From: Dee Date: Thu, 22 Jul 2021 18:49:26 -0400 Subject: [PATCH 28/48] more tests --- .../froilansfarm/MainApplication.java | 31 ++++++++++++++-- .../froilansfarm/storage/Farm.java | 36 ++++++++++++++----- .../froilansfarm/MainApplicationTest.java | 25 +++++++++++++ .../froilansfarm/croptests/CropRowTest.java | 23 ++++++++++-- 4 files changed, 101 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/MainApplication.java b/src/main/java/com/zipcodewilmington/froilansfarm/MainApplication.java index c5a8833a..0cac6426 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/MainApplication.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/MainApplication.java @@ -1,15 +1,42 @@ package com.zipcodewilmington.froilansfarm; +import com.zipcodewilmington.froilansfarm.storage.ChickenCoop; +import com.zipcodewilmington.froilansfarm.storage.Farm; +import com.zipcodewilmington.froilansfarm.storage.Stable; +import com.zipcodewilmington.froilansfarm.storage.StorageInterface; + /** * Created by leon on 2/26/18. */ -public class MainApplication { -//holds a list of the days of the week + public class MainApplication { + //holds a list of the days of the week //each day is its own class //each day class has its own "Runnable" schedule //make fertilize method //make check fertilization method (hasBeenFertilized) //potentially make Farmer abstract so that Froilan and Froilanda can both be declared new Farmers // + public static void main(String[] args) { + Farm farm = new Farm<>(); + Stable stable1= new Stable(); + Stable stable2 = new Stable(); + Stable stable3 = new Stable(); + farm.add(stable1); + farm.add(stable2); + farm.add(stable3); + ChickenCoop coop1 = new ChickenCoop(); + ChickenCoop coop2= new ChickenCoop(); + ChickenCoop coop3= new ChickenCoop(); + ChickenCoop coop4 = new ChickenCoop(); + farm.add(coop1); + farm.add(coop2); + farm.add(coop3); + farm.add(coop4); + int size = farm.amount(); + int coops = farm.getAmountofCoops(); + + System.out.println(size); + System.out.println(coops); } +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/storage/Farm.java b/src/main/java/com/zipcodewilmington/froilansfarm/storage/Farm.java index 8a2480a8..178ea32a 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/storage/Farm.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/storage/Farm.java @@ -1,27 +1,45 @@ package com.zipcodewilmington.froilansfarm.storage; +import com.zipcodewilmington.froilansfarm.Vehicle.Vehicle; import com.zipcodewilmington.froilansfarm.storage.StorageInterface; -public class Farm implements StorageInterface { +import java.util.ArrayList; +import java.util.List; - // List animalStorage +public class Farm { + + List farm = new ArrayList<>(); + Field field; + List vehicles = new ArrayList<>(); public Farm () { // This is a test, nerd } - @Override - public void add(Object thingYouAreStoring) { + public void add(StorageInterface storage) { + farm.add(storage); + + } + + + public void remove( StorageInterface storage) { + farm.remove(storage); } - @Override - public void remove(Object thingYouAreStoring) { + public int amount() { + return farm.size(); } - @Override - public int amount(Object thingYouAreStoring) { - return 0; + public int getAmountofCoops(){ + int numOfOccurences = 0; + for (StorageInterface s : farm) { + if (s instanceof ChickenCoop){ + numOfOccurences++; + } + + } + return numOfOccurences; } } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/MainApplicationTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/MainApplicationTest.java index 1a971b7f..fc4363be 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/MainApplicationTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/MainApplicationTest.java @@ -1,7 +1,32 @@ package com.zipcodewilmington.froilansfarm; +import com.zipcodewilmington.froilansfarm.storage.Farm; +import com.zipcodewilmington.froilansfarm.storage.Stable; +import com.zipcodewilmington.froilansfarm.storage.StorageInterface; +import org.junit.Assert; +import org.junit.Test; + /** * Created by leon on 2/26/18. */ public class MainApplicationTest { + + @Test + public void addStorageTest(){ + //given + Farm farm = new Farm<>(); + Stable stable1= new Stable(); + Stable stable2 = new Stable(); + Stable stable3 = new Stable(); + int expected = 3; + + //when + farm.add(stable1); + farm.add(stable2); + farm.add(stable3); + int actual = farm.amount(); + + //then + Assert.assertEquals(expected, actual); + } } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/croptests/CropRowTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/croptests/CropRowTest.java index 30319658..be586ced 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/croptests/CropRowTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/croptests/CropRowTest.java @@ -1,8 +1,6 @@ package com.zipcodewilmington.froilansfarm.croptests; -import com.zipcodewilmington.froilansfarm.crops.CropRow; -import com.zipcodewilmington.froilansfarm.crops.Tomato; -import com.zipcodewilmington.froilansfarm.crops.TomatoPlant; +import com.zipcodewilmington.froilansfarm.crops.*; import org.junit.Assert; import org.junit.Test; @@ -67,5 +65,24 @@ public void removeCrop(){ Assert.assertEquals(expected, actual); } + @Test + public void getTotalPlants(){ + //given + Crop tomatoPlant = new TomatoPlant(); + Crop cornPlant = new CornPlant(); + tomatoPlant.yield(new Tomato()); + tomatoPlant.yield(new Tomato()); + cornPlant.yield(new EarOfCorn()); + + //when + CropRow testRow = new CropRow(); + testRow.addCrop(tomatoPlant); + testRow.addCrop(cornPlant); + int actual = testRow.getNumberofCropsPlanted(); + + //then + Assert.assertEquals(2, actual); + + } } From 7f9b8422cdd1628e34b4417a0e52e21da4b21bb3 Mon Sep 17 00:00:00 2001 From: NicholasWolak Date: Thu, 22 Jul 2021 18:49:27 -0400 Subject: [PATCH 29/48] Added instance test --- .../froilansfarm/AnimalTest/ChickenTest.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/AnimalTest/ChickenTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/AnimalTest/ChickenTest.java index 54564d85..510a896a 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/AnimalTest/ChickenTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/AnimalTest/ChickenTest.java @@ -1,11 +1,28 @@ package com.zipcodewilmington.froilansfarm.AnimalTest; +import com.zipcodewilmington.froilansfarm.Animal.Animal; import com.zipcodewilmington.froilansfarm.Animal.Chicken; import com.zipcodewilmington.froilansfarm.Edible; +import com.zipcodewilmington.froilansfarm.Produce; import org.junit.Assert; import org.junit.Test; public class ChickenTest { + + @Test + public void instanceOfAnimal () { + Chicken chicken = new Chicken(); + + Assert.assertTrue(chicken instanceof Animal); + } + + @Test + public void instanceOfProduce () { + Chicken chicken = new Chicken(); + + Assert.assertTrue(chicken instanceof Produce); + } + @Test public void hasBeenFertilisedTest(){ Chicken chicken =new Chicken(); From e9eabee99fef33146086ca7e0d1421190fdf71e3 Mon Sep 17 00:00:00 2001 From: NicholasWolak Date: Thu, 22 Jul 2021 19:13:13 -0400 Subject: [PATCH 30/48] StoragePackage tests created --- .../froilansfarm/storage/Farm.java | 11 +++ .../testStorage/ChickenCoopTest.java | 8 ++ .../froilansfarm/testStorage/FarmTest.java | 96 +++++++++++++++++++ 3 files changed, 115 insertions(+) create mode 100644 src/test/java/com/zipcodewilmington/froilansfarm/testStorage/FarmTest.java diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/storage/Farm.java b/src/main/java/com/zipcodewilmington/froilansfarm/storage/Farm.java index 178ea32a..4d321047 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/storage/Farm.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/storage/Farm.java @@ -42,4 +42,15 @@ public int getAmountofCoops(){ } return numOfOccurences; } + + public int getAmountofStable(){ + int numOfOccurences = 0; + for (StorageInterface s : farm) { + if (s instanceof Stable){ + numOfOccurences++; + } + + } + return numOfOccurences; + } } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/testStorage/ChickenCoopTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/testStorage/ChickenCoopTest.java index d795aee0..cb1f2819 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/testStorage/ChickenCoopTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/testStorage/ChickenCoopTest.java @@ -1,6 +1,7 @@ package com.zipcodewilmington.froilansfarm.testStorage; +import com.zipcodewilmington.froilansfarm.Animal.Barn; import com.zipcodewilmington.froilansfarm.Animal.Chicken; import com.zipcodewilmington.froilansfarm.storage.ChickenCoop; import com.zipcodewilmington.froilansfarm.storage.StorageInterface; @@ -9,6 +10,13 @@ public class ChickenCoopTest { + @Test + public void instanceOfBarnTest () { + ChickenCoop cc = new ChickenCoop(); + + Assert.assertTrue(cc instanceof Barn); + } + @Test public void implementTest () { ChickenCoop cc = new ChickenCoop(); diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/testStorage/FarmTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/testStorage/FarmTest.java new file mode 100644 index 00000000..96051679 --- /dev/null +++ b/src/test/java/com/zipcodewilmington/froilansfarm/testStorage/FarmTest.java @@ -0,0 +1,96 @@ +package com.zipcodewilmington.froilansfarm.testStorage; + +import com.zipcodewilmington.froilansfarm.Animal.Horse; +import com.zipcodewilmington.froilansfarm.storage.ChickenCoop; +import com.zipcodewilmington.froilansfarm.storage.Farm; +import com.zipcodewilmington.froilansfarm.storage.Stable; +import com.zipcodewilmington.froilansfarm.storage.StorageInterface; +import org.junit.Assert; +import org.junit.Test; + +public class FarmTest { + + + @Test + public void addTest () { + Farm farm = new Farm(); + Horse horse = new Horse(); + Horse horse1 = new Horse(); + Integer expected = 2; + + farm.add(horse); + farm.add(horse1); + Integer actual = farm.amount(); + + Assert.assertEquals(expected, actual); + } + + @Test + public void removeTest () { + Farm farm = new Farm(); + Horse horse = new Horse(); + Horse horse1 = new Horse(); + Integer expected = 1; + + farm.add(horse); + farm.add(horse1); + farm.remove(horse1); + Integer actual = farm.amount(); + + Assert.assertEquals(expected, actual); + } + + @Test + public void amountTest () { + Farm farm = new Farm(); + Horse horse = new Horse(); + Horse horse1 = new Horse(); + Integer expected = 2; + + farm.add(horse); + farm.add(horse1); + Integer actual = farm.amount(); + + Assert.assertEquals(expected, actual); + } + + @Test + public void getAmountOfCoopsTest () { + Farm farm = new Farm(); + ChickenCoop chicken = new ChickenCoop(); + ChickenCoop chicken1 = new ChickenCoop(); + Stable stable = new Stable(); + Stable stable1 = new Stable(); + Stable stable2 = new Stable(); + Integer expected = 2; + + farm.add(chicken); + farm.add(chicken1); + farm.add(stable); + farm.add(stable1); + farm.add(stable2); + Integer actual = farm.getAmountofCoops(); + + Assert.assertEquals(expected, actual); + } + + @Test + public void getAmountOfStableTest () { + Farm farm = new Farm(); + ChickenCoop chicken = new ChickenCoop(); + ChickenCoop chicken1 = new ChickenCoop(); + Stable stable = new Stable(); + Stable stable1 = new Stable(); + Stable stable2 = new Stable(); + Integer expected = 3; + + farm.add(chicken); + farm.add(chicken1); + farm.add(stable); + farm.add(stable1); + farm.add(stable2); + Integer actual = farm.getAmountofStable(); + + Assert.assertEquals(expected, actual); + } +} From ac5c8035fbcd3686e5f0ccdb3fead51244870a93 Mon Sep 17 00:00:00 2001 From: NicholasWolak Date: Thu, 22 Jul 2021 19:19:44 -0400 Subject: [PATCH 31/48] (feat:feature/nick) fixed class signature of Pilot --- .../froilansfarm/Vehicle/Pilot.java | 14 +++++------ .../froilansfarm/AnimalTest/PilotTest.java | 24 +++++++++++++++++++ 2 files changed, 30 insertions(+), 8 deletions(-) create mode 100644 src/test/java/com/zipcodewilmington/froilansfarm/AnimalTest/PilotTest.java diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/Pilot.java b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/Pilot.java index 165f4338..346d8b89 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/Pilot.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/Pilot.java @@ -1,24 +1,22 @@ package com.zipcodewilmington.froilansfarm.Vehicle; import com.zipcodewilmington.froilansfarm.Animal.Person; +import com.zipcodewilmington.froilansfarm.Rideable; +import com.zipcodewilmington.froilansfarm.Rider; -public class Pilot extends Person implements Aircraft{ +public class Pilot extends Person implements Rider { public Pilot() { super(); } - @Override - public String noiseMaker() { - return null; - } @Override - public boolean hasBeenRiden() { - return false; + public void mount(Rideable object) { + } @Override - public void fly(int distance) { + public void dismount(Rideable object) { } } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/AnimalTest/PilotTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/AnimalTest/PilotTest.java new file mode 100644 index 00000000..22e2b100 --- /dev/null +++ b/src/test/java/com/zipcodewilmington/froilansfarm/AnimalTest/PilotTest.java @@ -0,0 +1,24 @@ +package com.zipcodewilmington.froilansfarm.AnimalTest; + +import com.zipcodewilmington.froilansfarm.Animal.Person; +import com.zipcodewilmington.froilansfarm.Rider; +import com.zipcodewilmington.froilansfarm.Vehicle.Pilot; +import org.junit.Assert; +import org.junit.Test; + +public class PilotTest { + + @Test + public void instanceOfPerson () { + Pilot p = new Pilot(); + + Assert.assertTrue(p instanceof Person); + } + + @Test + public void instanceOfRider () { + Pilot p = new Pilot(); + + Assert.assertTrue(p instanceof Rider); + } +} From 5797682a34913ff441c527864bdde80cefb6c783 Mon Sep 17 00:00:00 2001 From: Dee Date: Thu, 22 Jul 2021 19:46:24 -0400 Subject: [PATCH 32/48] Dusty tests --- .../froilansfarm/Vehicle/CropDuster.java | 32 +++++++++------ .../froilansfarm/crops/CornPlant.java | 4 +- .../froilansfarm/crops/Crop.java | 39 +++++++++++++------ .../froilansfarm/crops/CropRow.java | 14 ++++++- .../froilansfarm/crops/TomatoPlant.java | 5 ++- .../froilansfarm/Vehicles/CropDusterTest.java | 4 +- .../froilansfarm/croptests/CropRowTest.java | 21 ++++++++++ 7 files changed, 90 insertions(+), 29 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/CropDuster.java b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/CropDuster.java index 8a18a0e3..311eaedb 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/CropDuster.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/CropDuster.java @@ -1,5 +1,8 @@ package com.zipcodewilmington.froilansfarm.Vehicle; +import com.zipcodewilmington.froilansfarm.crops.Crop; +import com.zipcodewilmington.froilansfarm.crops.CropRow; + public class CropDuster extends FarmVehicle implements Aircraft { public boolean toBeFertilized; @@ -29,23 +32,31 @@ public void setNumOfCropFert(int numOfCropFert) { } - public void setNumOfCropRows(int numOfCropRows){this.numOfCropRows=numOfCropRows; + public void setNumOfCropRows(int numOfCropRows) { + this.numOfCropRows = numOfCropRows; } - public int getNumOfCropRows(){ return this.numOfCropRows; + + public int getNumOfCropRows() { + return this.numOfCropRows; } - public void setNumOfFertCrop(int numOfCropFert){this.numOfCropFert=numOfCropFert;} + public void setNumOfFertCrop(int numOfCropFert) { + this.numOfCropFert = numOfCropFert; + } - public int getNumOfFertCrop() { return this.numOfCropFert; } + public int getNumOfFertCrop() { + return this.numOfCropFert; + } - public boolean needsToBeFertilized(int numOfCropRows, int numOfCropFert) { - int numNonFertCrops= numOfCropRows-numOfCropFert; - int cropWork = numOfCropRows/3; - if(numNonFertCrops>cropWork){ - return toBeFertilized=true; + public boolean needsToBeFertilized(CropRow cropRow) { + for (Crop crop : cropRow.getCropRow()) { + if (crop.hasBeenFertilized()==false){ + return true; + } } - return toBeFertilized=false;} + return false; + } @Override public void fly(int distance) { @@ -63,5 +74,4 @@ public boolean hasBeenRiden() { } - } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/crops/CornPlant.java b/src/main/java/com/zipcodewilmington/froilansfarm/crops/CornPlant.java index 89b8c432..7903ccb9 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/crops/CornPlant.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/crops/CornPlant.java @@ -15,12 +15,12 @@ public CornPlant() { @Override public void yield(Edible edible) { - + numOfEdiblesYielded++; } @Override public boolean hasBeenFertilized() { - return false; + return true; } @Override diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/crops/Crop.java b/src/main/java/com/zipcodewilmington/froilansfarm/crops/Crop.java index 1bc71cc6..3a5b7386 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/crops/Crop.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/crops/Crop.java @@ -1,39 +1,54 @@ package com.zipcodewilmington.froilansfarm.crops; -import com.zipcodewilmington.froilansfarm.Edible; import com.zipcodewilmington.froilansfarm.Produce; public abstract class Crop implements Produce { Integer numOfEdiblesYielded; //once fertilized Integer numOfEdiblesHarvested; //once harvested Integer numOfEdiblesEaten; //decrement if eaten + Boolean hasBeenFertilized; + Boolean hasBeenHarvested; - public Crop(Integer numOfYield, Integer numOfCropsHarvested, Integer numOfEdiblesLeft) { + public Crop(Integer numOfYield, Integer numOfCropsHarvested, Integer numOfEdiblesLeft, Boolean hasBeenFertilized, Boolean hasBeenHarvested) { this.numOfEdiblesYielded = numOfYield; this.numOfEdiblesHarvested = numOfCropsHarvested; this.numOfEdiblesEaten = numOfEdiblesLeft; + this.hasBeenFertilized = hasBeenFertilized; + this.hasBeenHarvested = hasBeenHarvested; + } + + public Crop(Integer numOfYield, Integer numOfCropsHarvested, Integer numOfEdiblesLeft) { + this(numOfYield, numOfCropsHarvested, numOfEdiblesLeft, false, false); } public Crop() { - this.numOfEdiblesYielded = 0; - this.numOfEdiblesHarvested = 0; - this.numOfEdiblesEaten = 0; + this(0, 0, 0); } + public void fertilize() { + this.hasBeenFertilized = true; + } - public Integer getNumOfEdiblesYielded(){ + public void harvest(){ + this.hasBeenHarvested = true; + } + + public Integer getNumOfEdiblesYielded() { return numOfEdiblesYielded; } - public Integer getNumberofHarvest(){ - while(hasBeenHarvested()==true) - {return numOfEdiblesYielded ;} + public Integer getNumberofHarvest() { + while (hasBeenHarvested() == true) { + return numOfEdiblesYielded; + } return numOfEdiblesHarvested; - }; + } + + ; - public Integer getFoodToEat(){ - return numOfEdiblesHarvested-numOfEdiblesEaten; + public Integer getFoodToEat() { + return numOfEdiblesHarvested - numOfEdiblesEaten; } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/crops/CropRow.java b/src/main/java/com/zipcodewilmington/froilansfarm/crops/CropRow.java index aab9287c..f2fc51c2 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/crops/CropRow.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/crops/CropRow.java @@ -20,8 +20,11 @@ public CropRow() { public int getNumberofCropsPlanted() {return cropRow.size();} + public List getCropRow() { + return cropRow; + } - public void addCrop(Crop crop,Integer numberOfCrops){ + public void addCrop(Crop crop, Integer numberOfCrops){ for (int i = 0; i < numberOfCrops; i++) { cropRow.add(crop); } @@ -33,4 +36,13 @@ public void addCrop(Crop crop){ public void removeCrop(Crop crop) { cropRow.remove(crop); } + + public int getNumberOfEdibles() { + int sum = 0; + for (Crop crop : cropRow) { + sum += crop.getNumOfEdiblesYielded(); + } + return sum; + } + } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/crops/TomatoPlant.java b/src/main/java/com/zipcodewilmington/froilansfarm/crops/TomatoPlant.java index 1b34531f..75d51cc1 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/crops/TomatoPlant.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/crops/TomatoPlant.java @@ -22,10 +22,11 @@ public Edible getYield(){ @Override public void yield(Edible edible) { - if (hasBeenFertilized()==true) { + if (hasBeenFertilized() == true) { numOfEdiblesYielded++; - } + //} + } } @Override diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDusterTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDusterTest.java index 671008a9..32a0a4ad 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDusterTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDusterTest.java @@ -2,6 +2,7 @@ import com.zipcodewilmington.froilansfarm.Vehicle.CropDuster; import com.zipcodewilmington.froilansfarm.Vehicle.Vehicle; +import com.zipcodewilmington.froilansfarm.crops.CropRow; import org.junit.Assert; import org.junit.Test; @@ -51,9 +52,10 @@ public void needsToBeFertilizedTest(){ int cropNum=20; int fertCrop=4; boolean expected=true; + CropRow cropRow = new CropRow(); //when CropDuster crop =new CropDuster(false, cropNum, fertCrop); - boolean actual= crop.needsToBeFertilized(cropNum, fertCrop); + boolean actual= crop.needsToBeFertilized(cropRow); //then Assert.assertEquals(expected, actual ); } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/croptests/CropRowTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/croptests/CropRowTest.java index be586ced..f8b7afe9 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/croptests/CropRowTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/croptests/CropRowTest.java @@ -85,4 +85,25 @@ public void getTotalPlants(){ } + @Test + public void getTotalEdibles(){ + //given + Crop tomatoPlant = new TomatoPlant(); + Crop cornPlant = new CornPlant(); + tomatoPlant.yield(new Tomato()); + tomatoPlant.yield(new Tomato()); + cornPlant.yield(new EarOfCorn()); + int expected = 3; + + //when + CropRow testRow = new CropRow(); + testRow.addCrop(tomatoPlant); + testRow.addCrop(cornPlant); + int actual = testRow.getNumberOfEdibles(); + + //then + Assert.assertEquals(expected, actual); + + } + } From 6de4e74bc71cdcaaf0200b0ec17a539471ec8f85 Mon Sep 17 00:00:00 2001 From: charnaexw Date: Thu, 22 Jul 2021 19:54:30 -0400 Subject: [PATCH 33/48] Woopw --- .../froilansfarm/Vehicle/CropDuster.java | 31 ++++++++++++------- .../froilansfarm/Vehicle/FarmVehicle.java | 13 +++++--- .../froilansfarm/Vehicle/Tractor.java | 4 ++- 3 files changed, 32 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/CropDuster.java b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/CropDuster.java index 8a18a0e3..7114e305 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/CropDuster.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/CropDuster.java @@ -1,5 +1,7 @@ package com.zipcodewilmington.froilansfarm.Vehicle; +import com.zipcodewilmington.froilansfarm.crops.CropRow; + public class CropDuster extends FarmVehicle implements Aircraft { public boolean toBeFertilized; @@ -29,23 +31,31 @@ public void setNumOfCropFert(int numOfCropFert) { } - public void setNumOfCropRows(int numOfCropRows){this.numOfCropRows=numOfCropRows; + public void setNumOfCropRows(int numOfCropRows) { + this.numOfCropRows = numOfCropRows; } - public int getNumOfCropRows(){ return this.numOfCropRows; + + public int getNumOfCropRows() { + return this.numOfCropRows; } - public void setNumOfFertCrop(int numOfCropFert){this.numOfCropFert=numOfCropFert;} + public void setNumOfFertCrop(int numOfCropFert) { + this.numOfCropFert = numOfCropFert; + } - public int getNumOfFertCrop() { return this.numOfCropFert; } + public int getNumOfFertCrop() { + return this.numOfCropFert; + } - public boolean needsToBeFertilized(int numOfCropRows, int numOfCropFert) { - int numNonFertCrops= numOfCropRows-numOfCropFert; - int cropWork = numOfCropRows/3; - if(numNonFertCrops>cropWork){ - return toBeFertilized=true; + public boolean needsToBeFertilized(CropRow crop, int numOfCropFert) { + int numNonFertCrops = numOfCropRows - numOfCropFert; + int cropWork = numOfCropRows / 3; + if (numNonFertCrops > cropWork) { + return toBeFertilized = true; } - return toBeFertilized=false;} + return toBeFertilized = false; + } @Override public void fly(int distance) { @@ -63,5 +73,4 @@ public boolean hasBeenRiden() { } - } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/FarmVehicle.java b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/FarmVehicle.java index 098805d0..90cfef65 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/FarmVehicle.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/FarmVehicle.java @@ -5,11 +5,16 @@ public class FarmVehicle implements Vehicle{ String offFarm; String location; - public FarmVehicle(){ - onFarm="On Farm"; - offFarm= "Off Farm"; - location =""; + public FarmVehicle(String onFarm, String offFarm, String location) { + this.onFarm = onFarm; + this.offFarm = offFarm; + this.location = location; } + + public FarmVehicle() { + + } + public void setLocation(String expected){ this.location=location; } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/Tractor.java b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/Tractor.java index 17d94344..8ad8ec98 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/Tractor.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/Tractor.java @@ -1,5 +1,7 @@ package com.zipcodewilmington.froilansfarm.Vehicle; +import com.zipcodewilmington.froilansfarm.crops.CropRow; + public class Tractor extends FarmVehicle { boolean toBeHarvested; int numOfFertCrop; @@ -11,7 +13,7 @@ public Tractor(boolean toBeHarvested, int numOfFertCrop, int numOfHarvCrop) { this.numOfHarvCrop = numOfHarvCrop; } - public boolean isToBeHarvested() { + public boolean isToBeHarvested(CropRow cropRow) { return toBeHarvested; } From 77be401de34ba2486ddf0f659c9a8336e3b9db38 Mon Sep 17 00:00:00 2001 From: NicholasWolak Date: Thu, 22 Jul 2021 20:06:20 -0400 Subject: [PATCH 34/48] more test --- .../froilansfarm/storage/ChickenCoop.java | 6 ++++-- .../froilansfarm/storage/Field.java | 4 ++-- .../froilansfarm/storage/Stable.java | 4 ++-- .../testStorage/ChickenCoopTest.java | 18 ++++++++++++++---- .../froilansfarm/testStorage/FieldTest.java | 16 +++++++++++++--- .../froilansfarm/testStorage/StableTest.java | 14 +++++++++++--- 6 files changed, 46 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/storage/ChickenCoop.java b/src/main/java/com/zipcodewilmington/froilansfarm/storage/ChickenCoop.java index 5fc89796..92439558 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/storage/ChickenCoop.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/storage/ChickenCoop.java @@ -32,7 +32,9 @@ public int amount(Object thingYouAreStoring) { return listOfChicken.size(); } - public Integer getListOfChicken() { - return listOfChicken.size(); + public List getListOfChicken() { + return listOfChicken; } + + } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/storage/Field.java b/src/main/java/com/zipcodewilmington/froilansfarm/storage/Field.java index 3b1c6102..97c57b34 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/storage/Field.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/storage/Field.java @@ -28,7 +28,7 @@ public int amount(Object thingYouAreStoring) { return listOfCropRow.size(); } - public Integer getListOfCropRow() { - return listOfCropRow.size(); + public List getListOfCropRow() { + return listOfCropRow; } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/storage/Stable.java b/src/main/java/com/zipcodewilmington/froilansfarm/storage/Stable.java index d5fc2cba..e83737f6 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/storage/Stable.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/storage/Stable.java @@ -31,7 +31,7 @@ public int amount(Object thingYouAreStoring) { return listOfHorses.size(); } - public Integer getListOfHorses () { - return listOfHorses.size(); + public List getListOfHorses () { + return listOfHorses; } } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/testStorage/ChickenCoopTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/testStorage/ChickenCoopTest.java index cb1f2819..203a48c8 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/testStorage/ChickenCoopTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/testStorage/ChickenCoopTest.java @@ -10,6 +10,16 @@ public class ChickenCoopTest { + @Test + public void nullaryConstructorTest () { + ChickenCoop cc = new ChickenCoop(); + Integer expected = 0; + + Integer actual = cc.getListOfChicken().size(); + + Assert.assertEquals(expected, actual); + } + @Test public void instanceOfBarnTest () { ChickenCoop cc = new ChickenCoop(); @@ -31,7 +41,7 @@ public void addTest () { Integer expected = 1; cc.add(chicken); - Integer actual = cc.getListOfChicken(); + Integer actual = cc.getListOfChicken().size(); Assert.assertEquals(expected, actual); } @@ -46,7 +56,7 @@ public void removeTest () { cc.add(chicken); cc.add(chicken1); cc.remove(chicken); - Integer actual = cc.getListOfChicken(); + Integer actual = cc.getListOfChicken().size(); Assert.assertEquals(expected, actual); // I return an extra chicken, oops @@ -61,7 +71,7 @@ public void amountTest () { cc.add(chicken); cc.add(chicken1); - Integer actual = cc.getListOfChicken(); + Integer actual = cc.getListOfChicken().size(); Assert.assertEquals(expected, actual); } @@ -75,7 +85,7 @@ public void getChickenCoopTest () { cc.add(chicken); cc.add(chicken1); - Integer actual = cc.getListOfChicken(); + Integer actual = cc.getListOfChicken().size(); Assert.assertEquals(expected, actual); } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/testStorage/FieldTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/testStorage/FieldTest.java index ab771ac7..535f0ce6 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/testStorage/FieldTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/testStorage/FieldTest.java @@ -23,7 +23,7 @@ public void addTest() { field.add(cr); field.add(cr2); - Integer actual = field.getListOfCropRow(); + Integer actual = field.getListOfCropRow().size(); Assert.assertEquals(expected, actual); } @@ -38,7 +38,7 @@ public void removeTest() { field.add(cr); field.add(cr2); field.remove(cr); - Integer actual = field.getListOfCropRow(); + Integer actual = field.getListOfCropRow().size(); Assert.assertEquals(expected, actual); } @@ -53,7 +53,17 @@ public void getAmountTest() { field.add(cr); field.add(cr2); field.remove(cr); - Integer actual = field.getListOfCropRow(); + Integer actual = field.getListOfCropRow().size(); + + Assert.assertEquals(expected, actual); + } + + @Test + public void getListTest () { + Field field = new Field(); + Integer expected = 0; + + Integer actual = field.getListOfCropRow().size(); Assert.assertEquals(expected, actual); } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/testStorage/StableTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/testStorage/StableTest.java index 9231c8f3..f2fd9810 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/testStorage/StableTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/testStorage/StableTest.java @@ -1,6 +1,7 @@ package com.zipcodewilmington.froilansfarm.testStorage; +import com.zipcodewilmington.froilansfarm.Animal.Barn; import com.zipcodewilmington.froilansfarm.Animal.Horse; import com.zipcodewilmington.froilansfarm.storage.Stable; import com.zipcodewilmington.froilansfarm.storage.StorageInterface; @@ -15,6 +16,13 @@ public void implementationTest() { Assert.assertTrue(stable instanceof StorageInterface); } + @Test + public void instanceOfBarn () { + Stable stable = new Stable(); + + Assert.assertTrue(stable instanceof Barn); + } + @Test public void addTest() { Stable stable = new Stable(); @@ -24,7 +32,7 @@ public void addTest() { stable.add(horse); stable.add(horse1); - Integer actual = stable.getListOfHorses(); + Integer actual = stable.getListOfHorses().size(); Assert.assertEquals(expected, actual); } @@ -39,7 +47,7 @@ public void removeTest() { stable.add(horse); stable.add(horse1); stable.remove(horse); - Integer actual = stable.getListOfHorses(); + Integer actual = stable.getListOfHorses().size(); Assert.assertEquals(expected, actual); } @@ -54,7 +62,7 @@ public void getListOfHorsesTest() { stable.add(horse); stable.add(horse1); stable.remove(horse); - Integer actual = stable.getListOfHorses(); + Integer actual = stable.getListOfHorses().size(); Assert.assertEquals(expected, actual); } From 155f652cd9fc5f3e78350f90cad0ca5301513030 Mon Sep 17 00:00:00 2001 From: sitarameez Date: Thu, 22 Jul 2021 21:50:01 -0400 Subject: [PATCH 35/48] farmer --- .../froilansfarm/Animal/Farmer.java | 52 ++++++++++++------- .../froilansfarm/Vehicle/Botanist.java | 2 +- .../froilansfarm/AnimalTest/BarnTest.java | 7 +-- .../froilansfarm/AnimalTest/FarmerTest.java | 36 +++++++++++++ 4 files changed, 75 insertions(+), 22 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Animal/Farmer.java b/src/main/java/com/zipcodewilmington/froilansfarm/Animal/Farmer.java index 19aa9659..62006606 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Animal/Farmer.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Animal/Farmer.java @@ -6,46 +6,56 @@ import com.zipcodewilmington.froilansfarm.Rider; import com.zipcodewilmington.froilansfarm.Vehicle.Botanist; import com.zipcodewilmington.froilansfarm.crops.Crop; +import com.zipcodewilmington.froilansfarm.crops.CropRow; import java.util.ArrayList; import java.util.List; public class Farmer extends Person implements Rider, Eater, Botanist { + CropRow cropRow = new CropRow(); Integer numberOfRidesTaken; Integer numberOfCropsPlanted; Integer numberOfEdiblesEaten; - List thingsEaten; - String name="Froilan"; + // List thingsEaten; + String name = "Froilan"; + Rideable vehicle; - public Farmer( Integer numberOfRidesTaken,Integer numberOfCropsPlanted,Integer numberOfEdiblesEaten - ,String name,ArrayList thingsEaten){ - this.numberOfRidesTaken=numberOfRidesTaken; - this.numberOfCropsPlanted=numberOfCropsPlanted; - this.numberOfEdiblesEaten=numberOfEdiblesEaten; - this.name=name; - this.thingsEaten = thingsEaten; + public Farmer(Integer numberOfRidesTaken, Integer numberOfCropsPlanted, Integer numberOfEdiblesEaten + , String name, ArrayList thingsEaten) { + this.numberOfRidesTaken = numberOfRidesTaken; + this.numberOfCropsPlanted = numberOfCropsPlanted; + this.numberOfEdiblesEaten = numberOfEdiblesEaten; + this.name = name; + //this.thingsEaten = thingsEaten; - } + } - public Farmer(){ - this.thingsEaten= new ArrayList(); - } + public Farmer() { + } public String getName() { return name; } public void mount(Rideable object) { - + this.vehicle=object; + this.numberOfRidesTaken=0; + if (object.hasBeenRiden()) { + numberOfRidesTaken++; + } + } + public Integer getNumberOfRidesTaken() { + return numberOfRidesTaken; } public void dismount(Rideable object) { - + this.vehicle=null; } public void eat(Edible object) { - + object.isEaten(); + numberOfEdiblesEaten++; } public boolean hasEaten() { @@ -53,11 +63,17 @@ public boolean hasEaten() { } public void plant(Crop Object) { + cropRow.addCrop(Object); + this.numberOfCropsPlanted = 0; + numberOfCropsPlanted++; + } + public Integer getNumberOfCropsPlanted() { + return numberOfCropsPlanted; } - public int setNumberOfPlants() { - return 0; + public void setNumberOfPlants(Integer num) { + this.numberOfCropsPlanted = num; } public void setName(String name) { diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/Botanist.java b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/Botanist.java index 80d5482c..284bfae7 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/Botanist.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/Botanist.java @@ -5,6 +5,6 @@ public interface Botanist { void plant(Crop Object); - int setNumberOfPlants(); + void setNumberOfPlants(Integer num); } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/AnimalTest/BarnTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/AnimalTest/BarnTest.java index bad90244..547bec03 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/AnimalTest/BarnTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/AnimalTest/BarnTest.java @@ -17,7 +17,8 @@ public class BarnTest { @Test public void numberOfAnimalsTest() { Barn barn = new ChickenCoop(); - List animals = new ArrayList();; + List animals = new ArrayList(); + ; //List animals = new ArrayList<>(); animals.add((T) "chicken"); @@ -43,8 +44,8 @@ public void addTest() { public void removeTest() { Barn barn = new Stable(); List animals = new ArrayList<>(); - Animal horse=new Horse(); - Animal horse2= new Horse(); + Animal horse = new Horse(); + Animal horse2 = new Horse(); animals.add(horse2); animals.add(horse); diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/AnimalTest/FarmerTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/AnimalTest/FarmerTest.java index b0ff021c..ebd85555 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/AnimalTest/FarmerTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/AnimalTest/FarmerTest.java @@ -1,6 +1,10 @@ package com.zipcodewilmington.froilansfarm.AnimalTest; import com.zipcodewilmington.froilansfarm.Animal.Farmer; +import com.zipcodewilmington.froilansfarm.Rideable; +import com.zipcodewilmington.froilansfarm.crops.CornPlant; +import com.zipcodewilmington.froilansfarm.crops.Crop; +import com.zipcodewilmington.froilansfarm.crops.CropRow; import org.junit.Assert; import org.junit.Test; @@ -17,4 +21,36 @@ public void hasEatenTest(){ Boolean actual=false; Assert.assertFalse(farmer.hasEaten()); } + + @Test + public void plantTest(){ + Farmer farmer= new Farmer(); + CropRow cropRow=new CropRow(); + Integer numberOfCrops=0; + Crop crop=new CornPlant(); +Integer expected=1; +// cropRow.addCrop(crop); +farmer.plant(crop); + Assert.assertEquals(expected,farmer.getNumberOfCropsPlanted()); + + } + + @Test + public void mountTest(){ + Farmer farmer= new Farmer(); + Integer expected = 1; + + Rideable vehicle = new Rideable() { + @Override + public boolean hasBeenRiden() { + return true; + } + }; + farmer.mount(vehicle); + + Assert.assertEquals(expected,farmer.getNumberOfRidesTaken()); + + } + } + From 535775f0bf1a25b035387d4c51c161cf66f5741e Mon Sep 17 00:00:00 2001 From: Dee Date: Fri, 23 Jul 2021 00:00:19 -0400 Subject: [PATCH 36/48] crop tests with exceptions --- .../froilansfarm/crops/CornPlant.java | 14 ---------- .../froilansfarm/crops/Crop.java | 23 ++++++++++++--- .../froilansfarm/crops/TomatoPlant.java | 17 ----------- .../froilansfarm/croptests/CropRowTest.java | 28 +++++++++++++++++-- 4 files changed, 45 insertions(+), 37 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/crops/CornPlant.java b/src/main/java/com/zipcodewilmington/froilansfarm/crops/CornPlant.java index 7903ccb9..87179c85 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/crops/CornPlant.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/crops/CornPlant.java @@ -13,18 +13,4 @@ public CornPlant() { super(); } - @Override - public void yield(Edible edible) { - numOfEdiblesYielded++; - } - - @Override - public boolean hasBeenFertilized() { - return true; - } - - @Override - public boolean hasBeenHarvested() { - return false; - } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/crops/Crop.java b/src/main/java/com/zipcodewilmington/froilansfarm/crops/Crop.java index 3a5b7386..227916f4 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/crops/Crop.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/crops/Crop.java @@ -1,5 +1,6 @@ package com.zipcodewilmington.froilansfarm.crops; +import com.zipcodewilmington.froilansfarm.Edible; import com.zipcodewilmington.froilansfarm.Produce; public abstract class Crop implements Produce { @@ -15,7 +16,7 @@ public Crop(Integer numOfYield, Integer numOfCropsHarvested, Integer numOfEdible this.numOfEdiblesHarvested = numOfCropsHarvested; this.numOfEdiblesEaten = numOfEdiblesLeft; this.hasBeenFertilized = hasBeenFertilized; - this.hasBeenHarvested = hasBeenHarvested; + this.hasBeenHarvested = hasBeenHarvested; } public Crop(Integer numOfYield, Integer numOfCropsHarvested, Integer numOfEdiblesLeft) { @@ -30,7 +31,7 @@ public void fertilize() { this.hasBeenFertilized = true; } - public void harvest(){ + public void harvest() { this.hasBeenHarvested = true; } @@ -40,13 +41,27 @@ public Integer getNumOfEdiblesYielded() { public Integer getNumberofHarvest() { - while (hasBeenHarvested() == true) { + if (hasBeenHarvested) { return numOfEdiblesYielded; } return numOfEdiblesHarvested; } - ; + public void yield(Edible edible) { + if (hasBeenFertilized) { + numOfEdiblesYielded++; + } else { + throw new UnsupportedOperationException("Must be fertilized first!"); + } + } + + public boolean hasBeenFertilized() { + return hasBeenFertilized; + } + + public boolean hasBeenHarvested() { + return hasBeenHarvested; + } public Integer getFoodToEat() { return numOfEdiblesHarvested - numOfEdiblesEaten; diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/crops/TomatoPlant.java b/src/main/java/com/zipcodewilmington/froilansfarm/crops/TomatoPlant.java index 75d51cc1..502ac8ca 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/crops/TomatoPlant.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/crops/TomatoPlant.java @@ -20,22 +20,5 @@ public Edible getYield(){ return new Tomato(); } - @Override - public void yield(Edible edible) { - if (hasBeenFertilized() == true) { - numOfEdiblesYielded++; - //} - } - } - - @Override - public boolean hasBeenFertilized() { - return false; - } - - @Override - public boolean hasBeenHarvested() { - return false; - } } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/croptests/CropRowTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/croptests/CropRowTest.java index f8b7afe9..3d2b49f4 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/croptests/CropRowTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/croptests/CropRowTest.java @@ -87,6 +87,30 @@ public void getTotalPlants(){ @Test public void getTotalEdibles(){ + //given + Crop tomatoPlant = new TomatoPlant(); + Crop cornPlant = new CornPlant(); + CropRow testRow = new CropRow(); + testRow.addCrop(tomatoPlant); + testRow.addCrop(cornPlant); + tomatoPlant.fertilize(); + cornPlant.fertilize(); + + int expected = 3; + + //when + tomatoPlant.yield(new Tomato()); + tomatoPlant.yield(new Tomato()); + cornPlant.yield(new EarOfCorn()); + int actual = testRow.getNumberOfEdibles(); + + //then + Assert.assertEquals(expected, actual); + + } + + @Test (expected = UnsupportedOperationException.class) + public void getTotalEdiblesExceptionTest() { //given Crop tomatoPlant = new TomatoPlant(); Crop cornPlant = new CornPlant(); @@ -99,11 +123,11 @@ public void getTotalEdibles(){ CropRow testRow = new CropRow(); testRow.addCrop(tomatoPlant); testRow.addCrop(cornPlant); + tomatoPlant.fertilize(); + cornPlant.fertilize(); int actual = testRow.getNumberOfEdibles(); //then Assert.assertEquals(expected, actual); - } - } From c5c10995b0c56557545f01eafa16c6f6637e55de Mon Sep 17 00:00:00 2001 From: charnaexw Date: Fri, 23 Jul 2021 10:20:11 -0400 Subject: [PATCH 37/48] wanna pull --- .../froilansfarm/Vehicle/Tractor.java | 18 +++-- .../froilansfarm/Vehicles/CropDusterTest.java | 12 +++ .../Vehicles/FarmVehicleTest.java | 15 +++- .../froilansfarm/Vehicles/TractorTest.java | 75 ++++++------------- 4 files changed, 57 insertions(+), 63 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/Tractor.java b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/Tractor.java index 8ad8ec98..097f381c 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/Tractor.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/Tractor.java @@ -1,5 +1,6 @@ package com.zipcodewilmington.froilansfarm.Vehicle; +import com.zipcodewilmington.froilansfarm.crops.Crop; import com.zipcodewilmington.froilansfarm.crops.CropRow; public class Tractor extends FarmVehicle { @@ -8,12 +9,13 @@ public class Tractor extends FarmVehicle { int numOfHarvCrop; public Tractor(boolean toBeHarvested, int numOfFertCrop, int numOfHarvCrop) { + super(); this.toBeHarvested = toBeHarvested; this.numOfFertCrop = numOfFertCrop; this.numOfHarvCrop = numOfHarvCrop; } - public boolean isToBeHarvested(CropRow cropRow) { + public boolean isToBeHarvested() { return toBeHarvested; } @@ -37,13 +39,13 @@ public int getNumOfFertCrop() { return this.numOfFertCrop; } - public boolean needsToBeHarvested(int numOfFertCrop, int numOfHarvCrop) { - Tractor crop=new Tractor(false, numOfFertCrop, numOfHarvCrop); - int numNonHarvCrops= numOfFertCrop-numOfHarvCrop; - int cropWork = numOfFertCrop/3; - if(numNonHarvCrops>cropWork){ - return toBeHarvested=true; + public boolean needsToBeHarvested(CropRow cropRow) { + for (Crop crop : cropRow.getCropRow()) { + if (crop.hasBeenHarvested() == false) { + return true; + } } - return toBeHarvested=false;} + return false; + } } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDusterTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDusterTest.java index 32a0a4ad..b7b2cc97 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDusterTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDusterTest.java @@ -1,6 +1,8 @@ package com.zipcodewilmington.froilansfarm.Vehicles; +import com.zipcodewilmington.froilansfarm.Vehicle.Aircraft; import com.zipcodewilmington.froilansfarm.Vehicle.CropDuster; +import com.zipcodewilmington.froilansfarm.Vehicle.FarmVehicle; import com.zipcodewilmington.froilansfarm.Vehicle.Vehicle; import com.zipcodewilmington.froilansfarm.crops.CropRow; import org.junit.Assert; @@ -75,4 +77,14 @@ public void inheritenceTest(){ CropDuster crop = new CropDuster(false, 0, 0); Assert.assertTrue(crop instanceof Vehicle); } + @Test + public void inheritenceTest1(){ + CropDuster crop = new CropDuster(false, 0, 0); + Assert.assertTrue(crop instanceof Aircraft); + } + @Test + public void inheritenceTest2(){ + CropDuster crop = new CropDuster(false, 0, 0); + Assert.assertTrue(crop instanceof FarmVehicle); + } } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/FarmVehicleTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/FarmVehicleTest.java index 2fe1c2dc..d59f04cc 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/FarmVehicleTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/FarmVehicleTest.java @@ -1,6 +1,8 @@ package com.zipcodewilmington.froilansfarm.Vehicles; +import com.zipcodewilmington.froilansfarm.Vehicle.CropDuster; import com.zipcodewilmington.froilansfarm.Vehicle.FarmVehicle; +import com.zipcodewilmington.froilansfarm.Vehicle.Vehicle; import org.junit.Assert; import org.junit.Test; @@ -17,9 +19,14 @@ public void nullaryConstructorTest(){ //then Assert.assertEquals(expected, actual); } - public void operateTest(){ - - + @Test + public void inheritenceCropDustTest(){ + FarmVehicle car = new FarmVehicle(); + Assert.assertTrue(car instanceof Vehicle); + } + @Test + public void inheritenceCropDustTest(){ + FarmVehicle car = new FarmVehicle(); + Assert.assertTrue(car instanceof Vehicle); } - } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/TractorTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/TractorTest.java index 6ca3288e..c33f11eb 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/TractorTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/TractorTest.java @@ -2,17 +2,19 @@ import com.zipcodewilmington.froilansfarm.Vehicle.CropDuster; import com.zipcodewilmington.froilansfarm.Vehicle.Tractor; +import com.zipcodewilmington.froilansfarm.crops.Crop; +import com.zipcodewilmington.froilansfarm.crops.CropRow; import org.junit.Assert; import org.junit.Test; public class TractorTest { @Test - public void constructorTest(){ + public void constructorTest() { //given - int numOfHarvCrops=93; - int numOfFertCrops=32; - boolean toBeHarvested=true; + int numOfHarvCrops = 93; + int numOfFertCrops = 32; + boolean toBeHarvested = true; //when Tractor crop = new Tractor(false, 0, 0); @@ -21,24 +23,26 @@ public void constructorTest(){ Assert.assertNotEquals(numOfFertCrops, crop.getNumOfFertCrop()); Assert.assertNotEquals(toBeHarvested, false); } + @Test - public void nullaryConstructorTest(){ + public void nullaryConstructorTest() { //given - boolean expectedHarvested=true; - int expectedNumOfHarvCrop=895894; - int expectedNumOfFertCrop=4863826; + boolean expectedHarvested = true; + int expectedNumOfHarvCrop = 895894; + int expectedNumOfFertCrop = 4863826; //when - Tractor crop = new Tractor(false, 0,0); + Tractor crop = new Tractor(false, 0, 0); //then Assert.assertNotEquals(expectedNumOfHarvCrop, crop.getNumOfHarvCrop()); Assert.assertNotEquals(expectedNumOfFertCrop, crop.getNumOfFertCrop()); Assert.assertNotEquals(expectedHarvested, crop.isToBeHarvested()); } + @Test - public void getCropsTest1(){ - int expected= 15; + public void getCropsTest1() { + int expected = 15; Tractor crop = new Tractor(false, 0, 0); crop.setNumOfFertCrop(expected); //when @@ -46,51 +50,20 @@ public void getCropsTest1(){ //then Assert.assertEquals(expected, actual); } + @Test - public void needsToBeHarvestedTest(){ - //given - int fertCropNum=20; - int HarvCrop=4; - boolean expected=true; - //when - Tractor crop =new Tractor(false, fertCropNum, HarvCrop); - boolean actual= crop.needsToBeHarvested(fertCropNum, HarvCrop); - //then - Assert.assertEquals(expected, actual ); - } - @Test - public void needsToBeHarvestedTest2(){ - //given - int fertCropNum=3; - int HarvCrop=3; - boolean expected=false; - //when - Tractor crop =new Tractor(false, fertCropNum, HarvCrop); - boolean actual= crop.needsToBeHarvested(fertCropNum, HarvCrop); - //then - Assert.assertEquals(expected, actual ); - } - @Test - public void needsToBeHarvestedTest3(){ + public void needsToBeFertilizedTest() { //given - int fertCropNum=4; - int HarvCrop=15; - boolean expected=false; + int cropNum = 20; + int fertCrop = 4; + boolean expected = true; + CropRow cropRow = new CropRow(); //when - Tractor crop =new Tractor(false, fertCropNum, HarvCrop); - boolean actual= crop.needsToBeHarvested(fertCropNum, HarvCrop); + Tractor crop = new Tractor(false, cropNum, fertCrop); + boolean actual = crop.needsToBeHarvested(cropRow); //then - Assert.assertEquals(expected, actual ); - } - @Test - public void getFertCropsTest1(){ - int expectedFertCrop = 5; - Tractor crop = new Tractor(false,0, 0); - crop.setNumOfFertCrop(expectedFertCrop); + Assert.assertEquals(expected, actual); - int actual = crop.getNumOfFertCrop(); - Assert.assertEquals(expectedFertCrop, actual); } - } From ce8dbd873561ac6c63764265efa7c12bbbc4bc4b Mon Sep 17 00:00:00 2001 From: charnaexw Date: Fri, 23 Jul 2021 10:21:41 -0400 Subject: [PATCH 38/48] One more tire --- .../froilansfarm/Vehicles/FarmVehicleTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/FarmVehicleTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/FarmVehicleTest.java index d59f04cc..81aa5e8f 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/FarmVehicleTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/FarmVehicleTest.java @@ -25,7 +25,7 @@ public void inheritenceCropDustTest(){ Assert.assertTrue(car instanceof Vehicle); } @Test - public void inheritenceCropDustTest(){ + public void inheritenceCropDustTest1(){ FarmVehicle car = new FarmVehicle(); Assert.assertTrue(car instanceof Vehicle); } From b3f831ef4413caa3d2e9a5829c6b1ffec65137da Mon Sep 17 00:00:00 2001 From: charnaexw Date: Fri, 23 Jul 2021 10:22:30 -0400 Subject: [PATCH 39/48] yea --- .../froilansfarm/Vehicles/FarmVehicleTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/FarmVehicleTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/FarmVehicleTest.java index 81aa5e8f..ee1a3ec2 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/FarmVehicleTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/FarmVehicleTest.java @@ -1,5 +1,6 @@ package com.zipcodewilmington.froilansfarm.Vehicles; +import com.zipcodewilmington.froilansfarm.Rideable; import com.zipcodewilmington.froilansfarm.Vehicle.CropDuster; import com.zipcodewilmington.froilansfarm.Vehicle.FarmVehicle; import com.zipcodewilmington.froilansfarm.Vehicle.Vehicle; @@ -27,6 +28,6 @@ public void inheritenceCropDustTest(){ @Test public void inheritenceCropDustTest1(){ FarmVehicle car = new FarmVehicle(); - Assert.assertTrue(car instanceof Vehicle); + Assert.assertTrue(car instanceof Rideable); } } From 144647acbc62c07b62146b22409e0caed3e545b5 Mon Sep 17 00:00:00 2001 From: NicholasWolak Date: Fri, 23 Jul 2021 11:57:52 -0400 Subject: [PATCH 40/48] (feat:nick) implemented more tests on Vehicle package --- .../froilansfarm/Vehicle/FarmVehicle.java | 8 +++ .../froilansfarm/Vehicles/CropDusterTest.java | 2 +- .../Vehicles/FarmVehicleTest.java | 57 ++++++++++++++++++- .../froilansfarm/Vehicles/TractorTest.java | 33 ++++++++++- 4 files changed, 97 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/FarmVehicle.java b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/FarmVehicle.java index 90cfef65..c90cbafc 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/FarmVehicle.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/FarmVehicle.java @@ -38,4 +38,12 @@ public String noiseMaker() { public boolean hasBeenRiden() { return false; } + + public String getOnFarm() { + return onFarm; + } + + public void setOnFarm(String onFarm) { + this.onFarm = onFarm; + } } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDusterTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDusterTest.java index b7b2cc97..6a694b7c 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDusterTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDusterTest.java @@ -53,7 +53,7 @@ public void needsToBeFertilizedTest(){ //given int cropNum=20; int fertCrop=4; - boolean expected=true; + boolean expected= false; CropRow cropRow = new CropRow(); //when CropDuster crop =new CropDuster(false, cropNum, fertCrop); diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/FarmVehicleTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/FarmVehicleTest.java index ee1a3ec2..5be484d9 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/FarmVehicleTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/FarmVehicleTest.java @@ -4,6 +4,7 @@ import com.zipcodewilmington.froilansfarm.Vehicle.CropDuster; import com.zipcodewilmington.froilansfarm.Vehicle.FarmVehicle; import com.zipcodewilmington.froilansfarm.Vehicle.Vehicle; +import com.zipcodewilmington.froilansfarm.storage.Farm; import org.junit.Assert; import org.junit.Test; @@ -12,7 +13,7 @@ public class FarmVehicleTest { @Test public void nullaryConstructorTest(){ //given - String expected= ""; + String expected = null; FarmVehicle farm = new FarmVehicle(); farm.setLocation(expected); //when @@ -30,4 +31,58 @@ public void inheritenceCropDustTest1(){ FarmVehicle car = new FarmVehicle(); Assert.assertTrue(car instanceof Rideable); } + + @Test + public void getLocationTest () { + FarmVehicle thing = new FarmVehicle(); + String expected = "Over here"; + + thing.setLocation("Over here"); + String actual = thing.getLocation(); + + Assert.assertEquals(expected, actual); + } + + @Test + public void noiseMakerTest () { + FarmVehicle thing = new FarmVehicle(); + String expected = null; + + String actual = thing.noiseMaker(); + + Assert.assertEquals(expected, actual); + } + + @Test + public void hasBeenRiden () { + FarmVehicle thing = new FarmVehicle(); + Boolean expected = false; + + Boolean actual = thing.hasBeenRiden(); + + Assert.assertEquals(expected, actual); + } + + @Test + public void operationOnFarmTest () { + FarmVehicle thing = new FarmVehicle(); + Boolean expected = true; + thing.setOnFarm("Is on farm?"); + + Boolean actual = thing.operation(thing.getOnFarm()); + + Assert.assertEquals(expected, actual); + } + + @Test (expected = AssertionError.class) + public void operationOffFarmTest () { + FarmVehicle thing = new FarmVehicle(); + Boolean expected = true; + thing.setOnFarm("Is on farm?"); + thing.setLocation("Not on the farm"); + + Boolean actual = thing.operation(thing.getLocation()); + + Assert.assertEquals(expected, actual); + } } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/TractorTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/TractorTest.java index c33f11eb..e27f0211 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/TractorTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/TractorTest.java @@ -4,6 +4,8 @@ import com.zipcodewilmington.froilansfarm.Vehicle.Tractor; import com.zipcodewilmington.froilansfarm.crops.Crop; import com.zipcodewilmington.froilansfarm.crops.CropRow; +import com.zipcodewilmington.froilansfarm.crops.Tomato; +import com.zipcodewilmington.froilansfarm.crops.TomatoPlant; import org.junit.Assert; import org.junit.Test; @@ -56,14 +58,43 @@ public void needsToBeFertilizedTest() { //given int cropNum = 20; int fertCrop = 4; - boolean expected = true; + boolean expected = false; CropRow cropRow = new CropRow(); //when Tractor crop = new Tractor(false, cropNum, fertCrop); boolean actual = crop.needsToBeHarvested(cropRow); //then Assert.assertEquals(expected, actual); + } + + @Test + public void doesNotNeedToBeHarvested () { + Tractor tractor = new Tractor(true, + 200, 10); + CropRow cr = new CropRow(); + Crop crop = new TomatoPlant(); + crop.fertilize(); + Boolean expected = true; + + cr.addCrop(crop); + Boolean actual = tractor.needsToBeHarvested(cr); + + Assert.assertEquals(expected, actual); + } + @Test + public void needsToBeHarvested () { + Tractor tractor = new Tractor(true, + 200, 10); + CropRow cr = new CropRow(); + Crop crop = new TomatoPlant(); + crop.fertilize(); + crop.harvest(); + Boolean expected = false; + cr.addCrop(crop); + Boolean actual = tractor.needsToBeHarvested(cr); + + Assert.assertEquals(expected, actual); } } From 926450fa09de3515e90fe31995a944125f02d077 Mon Sep 17 00:00:00 2001 From: NicholasWolak Date: Fri, 23 Jul 2021 13:24:34 -0400 Subject: [PATCH 41/48] (feat:vahicle-package-test) implemented tests inside of the vehicle package --- .../froilansfarm/Vehicle/CropDuster.java | 9 +-- .../froilansfarm/Vehicles/CropDusterTest.java | 68 ++++++++++++++++++- 2 files changed, 67 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/CropDuster.java b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/CropDuster.java index d86bdf09..54ea255e 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/CropDuster.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/CropDuster.java @@ -16,7 +16,7 @@ public CropDuster(boolean toBeFertilized, int numOfCropRows, int numOfCropFert) this.numOfCropFert = numOfCropFert; } - public boolean isToBeFertilized() { + public boolean getToBeFertilized() { return toBeFertilized; } @@ -24,13 +24,6 @@ public void setToBeFertilized(boolean toBeFertilized) { this.toBeFertilized = toBeFertilized; } - public int getNumOfCropFert() { - return numOfCropFert; - } - - public void setNumOfCropFert(int numOfCropFert) { - this.numOfCropFert = numOfCropFert; - } public void setNumOfCropRows(int numOfCropRows) { diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDusterTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDusterTest.java index 6a694b7c..beb6b097 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDusterTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDusterTest.java @@ -4,7 +4,10 @@ import com.zipcodewilmington.froilansfarm.Vehicle.CropDuster; import com.zipcodewilmington.froilansfarm.Vehicle.FarmVehicle; import com.zipcodewilmington.froilansfarm.Vehicle.Vehicle; +import com.zipcodewilmington.froilansfarm.crops.Crop; import com.zipcodewilmington.froilansfarm.crops.CropRow; +import com.zipcodewilmington.froilansfarm.crops.Tomato; +import com.zipcodewilmington.froilansfarm.crops.TomatoPlant; import org.junit.Assert; import org.junit.Test; @@ -35,7 +38,7 @@ public void nullaryConstructorTest(){ //then Assert.assertNotEquals(expectedNumOfCrop, crop.getNumOfCropRows()); Assert.assertNotEquals(expectedNumOfFertCrop, crop.getNumOfFertCrop()); - Assert.assertNotEquals(expectedFertilizer, crop.isToBeFertilized()); + Assert.assertNotEquals(expectedFertilizer, crop.getToBeFertilized()); } @Test @@ -49,7 +52,7 @@ public void getCropsTest1(){ Assert.assertEquals(expected, actual); } @Test - public void needsToBeFertilizedTest(){ + public void needsToBeFertilizedTest1(){ //given int cropNum=20; int fertCrop=4; @@ -87,4 +90,65 @@ public void inheritenceTest2(){ CropDuster crop = new CropDuster(false, 0, 0); Assert.assertTrue(crop instanceof FarmVehicle); } + + @Test + public void needsToBeFertilized () { + CropDuster cd = new CropDuster(false, + 0, 0); + Crop crop = new TomatoPlant(); + CropRow cropRow = new CropRow(); + Boolean expected = true; + crop.hasBeenFertilized(); + cropRow.addCrop(crop); + + Boolean actual = cd.needsToBeFertilized(cropRow); + + Assert.assertEquals(expected, actual); + } + + @Test + public void noiseMakerTest () { + CropDuster cd = new CropDuster(false, + 0,0); + String expected = "Ppbd Ppbd"; + + String actual = cd.noiseMaker(); + + Assert.assertEquals(expected, actual); + } + + @Test + public void hasbeenRidenTest () { + CropDuster cd = new CropDuster(false, + 0,0); + Boolean expected = false; + + Boolean actual = cd.hasBeenRiden(); + + Assert.assertEquals(expected, actual); + } + + @Test + public void getNumOfCropFertTest () { + CropDuster cd = new CropDuster(false, + 0 ,100); + Integer expected = 56; + + cd.setNumOfFertCrop(56); + Integer actual = cd.getNumOfFertCrop(); + + Assert.assertEquals(expected, actual); + } + + @Test + public void fertilizedTest () { + CropDuster cd = new CropDuster(false, + 0, 0); + Boolean expected = true; + + cd.setToBeFertilized(true); + Boolean actual = cd.getToBeFertilized(); + + Assert.assertEquals(expected, actual); + } } From 200223060e800ad9ba875414493c4479838cd8f1 Mon Sep 17 00:00:00 2001 From: Dee Date: Fri, 23 Jul 2021 13:31:33 -0400 Subject: [PATCH 42/48] harvest method tested in CropTest --- .../froilansfarm/MainApplication.java | 36 ++++++--- .../froilansfarm/storage/Farm.java | 16 +++- .../froilansfarm/MainApplicationTest.java | 8 +- .../froilansfarm/croptests/CropTest.java | 80 ++++++++++++++++--- .../froilansfarm/testStorage/FarmTest.java | 40 +++++----- 5 files changed, 132 insertions(+), 48 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/MainApplication.java b/src/main/java/com/zipcodewilmington/froilansfarm/MainApplication.java index 0cac6426..821d5c96 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/MainApplication.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/MainApplication.java @@ -1,9 +1,11 @@ package com.zipcodewilmington.froilansfarm; -import com.zipcodewilmington.froilansfarm.storage.ChickenCoop; -import com.zipcodewilmington.froilansfarm.storage.Farm; -import com.zipcodewilmington.froilansfarm.storage.Stable; -import com.zipcodewilmington.froilansfarm.storage.StorageInterface; +import com.zipcodewilmington.froilansfarm.Animal.Animal; +import com.zipcodewilmington.froilansfarm.Vehicle.Vehicle; +import com.zipcodewilmington.froilansfarm.storage.*; + +import java.util.ArrayList; +import java.util.List; /** * Created by leon on 2/26/18. @@ -21,22 +23,32 @@ public static void main(String[] args) { Stable stable1= new Stable(); Stable stable2 = new Stable(); Stable stable3 = new Stable(); - farm.add(stable1); - farm.add(stable2); - farm.add(stable3); + farm.addShelter(stable1); + farm.addShelter(stable2); + farm.addShelter(stable3); ChickenCoop coop1 = new ChickenCoop(); ChickenCoop coop2= new ChickenCoop(); ChickenCoop coop3= new ChickenCoop(); ChickenCoop coop4 = new ChickenCoop(); - farm.add(coop1); - farm.add(coop2); - farm.add(coop3); - farm.add(coop4); - int size = farm.amount(); + farm.addShelter(coop1); + farm.addShelter(coop2); + farm.addShelter(coop3); + farm.addShelter(coop4); + int size = farm.amountShelter(); int coops = farm.getAmountofCoops(); System.out.println(size); System.out.println(coops); } + public void createFarm(Field field, List shelters, List mammals, List vehicles){ + Farm instance = new Farm(field, shelters, mammals, vehicles); + ChickenCoop coop1 = new ChickenCoop(); + ChickenCoop coop2= new ChickenCoop(); + ChickenCoop coop3= new ChickenCoop(); + ChickenCoop coop4 = new ChickenCoop(); + shelters.add(coop1); + shelters.add(coop2); //this is a bit tedious + + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/storage/Farm.java b/src/main/java/com/zipcodewilmington/froilansfarm/storage/Farm.java index 4d321047..94d96019 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/storage/Farm.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/storage/Farm.java @@ -1,5 +1,6 @@ package com.zipcodewilmington.froilansfarm.storage; +import com.zipcodewilmington.froilansfarm.Animal.Animal; import com.zipcodewilmington.froilansfarm.Vehicle.Vehicle; import com.zipcodewilmington.froilansfarm.storage.StorageInterface; @@ -11,24 +12,33 @@ public class Farm { List farm = new ArrayList<>(); Field field; List vehicles = new ArrayList<>(); + List farmAnimals = new ArrayList<>(); public Farm () { // This is a test, nerd } + public Farm (Field field, List farm, List farmAnimals, List vehicles){ + this.field = new Field(); + this.farm = new ArrayList<>(); + this.farmAnimals = new ArrayList<>(); + this.vehicles = new ArrayList<>(); + } + + - public void add(StorageInterface storage) { + public void addShelter(StorageInterface storage) { farm.add(storage); } - public void remove( StorageInterface storage) { + public void removeShelter( StorageInterface storage) { farm.remove(storage); } - public int amount() { + public int amountShelter() { return farm.size(); } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/MainApplicationTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/MainApplicationTest.java index fc4363be..a6e8897e 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/MainApplicationTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/MainApplicationTest.java @@ -21,10 +21,10 @@ public void addStorageTest(){ int expected = 3; //when - farm.add(stable1); - farm.add(stable2); - farm.add(stable3); - int actual = farm.amount(); + farm.addShelter(stable1); + farm.addShelter(stable2); + farm.addShelter(stable3); + int actual = farm.amountShelter(); //then Assert.assertEquals(expected, actual); diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/croptests/CropTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/croptests/CropTest.java index 51b762eb..910e2f30 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/croptests/CropTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/croptests/CropTest.java @@ -1,9 +1,6 @@ package com.zipcodewilmington.froilansfarm.croptests; -import com.zipcodewilmington.froilansfarm.crops.CornPlant; -import com.zipcodewilmington.froilansfarm.crops.Crop; -import com.zipcodewilmington.froilansfarm.crops.Tomato; -import com.zipcodewilmington.froilansfarm.crops.TomatoPlant; +import com.zipcodewilmington.froilansfarm.crops.*; import org.junit.Assert; import org.junit.Test; @@ -34,7 +31,7 @@ public void nullaryCornConstructorTest(){ Assert.assertEquals(expected, actual); } - @Test + @Test (expected = UnsupportedOperationException.class) public void countFertilizedFalseTest(){ //given Crop tomatoPlant = new TomatoPlant(); @@ -49,15 +46,64 @@ public void countFertilizedFalseTest(){ Assert.assertEquals(expected, actual); } - @Test + @Test (expected = UnsupportedOperationException.class) public void countHarvestFalseTest(){ + //given + Crop cornPlant = new CornPlant(); + EarOfCorn corn = new EarOfCorn(); + + int expected = 0; + + //when + cornPlant.yield(corn); + int actual = cornPlant.getNumberofHarvest(); + + //then + Assert.assertEquals(expected, actual); + } + + @Test (expected = UnsupportedOperationException.class) + public void AvailableToEatTest(){ + //given + Crop tomatoPlant = new TomatoPlant(); + Tomato tomato = new Tomato(); + int expected = 0; + + //when + tomatoPlant.yield(tomato); + int actual = tomatoPlant.getFoodToEat(); + + //then + Assert.assertEquals(expected, actual); + + } + + @Test + public void countFertilizedTrueTest(){ //given Crop tomatoPlant = new TomatoPlant(); Tomato tomato = new Tomato(); + int expected = 1; + + //when + tomatoPlant.fertilize(); tomatoPlant.yield(tomato); + int actual = tomatoPlant.getNumOfEdiblesYielded(); + + //then + Assert.assertEquals(expected, actual); + } + + @Test + public void countHarvestPossibleTest(){ + //given + Crop tomatoPlant = new TomatoPlant(); + Tomato tomato = new Tomato(); int expected = 0; //when + tomatoPlant.fertilize(); + tomatoPlant.yield(tomato); int actual = tomatoPlant.getNumberofHarvest(); //then @@ -65,7 +111,25 @@ public void countHarvestFalseTest(){ } @Test - public void AvailableToEatTest(){ + public void postHarvestTest(){ + //given + Crop cornPlant = new CornPlant(); + EarOfCorn corn = new EarOfCorn(); + int expected = 1; + + //when + cornPlant.fertilize(); + cornPlant.yield(corn); + cornPlant.harvest(); + int actual = cornPlant.getNumberofHarvest(); + + //then + Assert.assertEquals(expected, actual); + + } + + @Test + public void AvailableToEatTrueTest(){ //given Crop tomatoPlant = new TomatoPlant(); Tomato tomato = new Tomato(); @@ -78,7 +142,5 @@ public void AvailableToEatTest(){ //then Assert.assertEquals(expected, actual); - - } } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/testStorage/FarmTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/testStorage/FarmTest.java index 96051679..94d4e023 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/testStorage/FarmTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/testStorage/FarmTest.java @@ -18,9 +18,9 @@ public void addTest () { Horse horse1 = new Horse(); Integer expected = 2; - farm.add(horse); - farm.add(horse1); - Integer actual = farm.amount(); + farm.addShelter(horse); + farm.addShelter(horse1); + Integer actual = farm.amountShelter(); Assert.assertEquals(expected, actual); } @@ -32,10 +32,10 @@ public void removeTest () { Horse horse1 = new Horse(); Integer expected = 1; - farm.add(horse); - farm.add(horse1); - farm.remove(horse1); - Integer actual = farm.amount(); + farm.addShelter(horse); + farm.addShelter(horse1); + farm.removeShelter(horse1); + Integer actual = farm.amountShelter(); Assert.assertEquals(expected, actual); } @@ -47,9 +47,9 @@ public void amountTest () { Horse horse1 = new Horse(); Integer expected = 2; - farm.add(horse); - farm.add(horse1); - Integer actual = farm.amount(); + farm.addShelter(horse); + farm.addShelter(horse1); + Integer actual = farm.amountShelter(); Assert.assertEquals(expected, actual); } @@ -64,11 +64,11 @@ public void getAmountOfCoopsTest () { Stable stable2 = new Stable(); Integer expected = 2; - farm.add(chicken); - farm.add(chicken1); - farm.add(stable); - farm.add(stable1); - farm.add(stable2); + farm.addShelter(chicken); + farm.addShelter(chicken1); + farm.addShelter(stable); + farm.addShelter(stable1); + farm.addShelter(stable2); Integer actual = farm.getAmountofCoops(); Assert.assertEquals(expected, actual); @@ -84,11 +84,11 @@ public void getAmountOfStableTest () { Stable stable2 = new Stable(); Integer expected = 3; - farm.add(chicken); - farm.add(chicken1); - farm.add(stable); - farm.add(stable1); - farm.add(stable2); + farm.addShelter(chicken); + farm.addShelter(chicken1); + farm.addShelter(stable); + farm.addShelter(stable1); + farm.addShelter(stable2); Integer actual = farm.getAmountofStable(); Assert.assertEquals(expected, actual); From b4be1241b03c9fe3f077aebf6dc93e418140168d Mon Sep 17 00:00:00 2001 From: Dee Date: Fri, 23 Jul 2021 13:49:03 -0400 Subject: [PATCH 43/48] fixed food available test --- .../java/com/zipcodewilmington/froilansfarm/crops/Crop.java | 2 ++ .../zipcodewilmington/froilansfarm/croptests/CropTest.java | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/crops/Crop.java b/src/main/java/com/zipcodewilmington/froilansfarm/crops/Crop.java index 227916f4..b9740dfb 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/crops/Crop.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/crops/Crop.java @@ -33,6 +33,7 @@ public void fertilize() { public void harvest() { this.hasBeenHarvested = true; + numOfEdiblesHarvested++; } public Integer getNumOfEdiblesYielded() { @@ -44,6 +45,7 @@ public Integer getNumberofHarvest() { if (hasBeenHarvested) { return numOfEdiblesYielded; } + return numOfEdiblesHarvested; } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/croptests/CropTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/croptests/CropTest.java index 910e2f30..03b5ff31 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/croptests/CropTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/croptests/CropTest.java @@ -133,10 +133,12 @@ public void AvailableToEatTrueTest(){ //given Crop tomatoPlant = new TomatoPlant(); Tomato tomato = new Tomato(); - int expected = 0; + int expected = 1; //when - tomatoPlant.yield(tomato); + tomatoPlant.fertilize(); //sets fertilized equal to true + tomatoPlant.yield(tomato); //preps for harvest + tomatoPlant.harvest(); //makes food available to eat int actual = tomatoPlant.getFoodToEat(); //then From 6071c16af7b9dd2615f7c8528bf65ce0e7219792 Mon Sep 17 00:00:00 2001 From: sitarameez Date: Fri, 23 Jul 2021 16:06:16 -0400 Subject: [PATCH 44/48] nick made a boo boo --- .../froilansfarm/Animal/Animal.java | 22 ++++++----- .../froilansfarm/Animal/Chicken.java | 13 ++++--- .../froilansfarm/Animal/Farmer.java | 14 ++++--- .../froilansfarm/Animal/Horse.java | 6 +-- .../froilansfarm/Animal/Person.java | 12 +++--- .../froilansfarm/AnimalTest/FarmerTest.java | 37 ++++++++++--------- 6 files changed, 56 insertions(+), 48 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Animal/Animal.java b/src/main/java/com/zipcodewilmington/froilansfarm/Animal/Animal.java index e14d40fa..2041fcd2 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Animal/Animal.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Animal/Animal.java @@ -9,16 +9,18 @@ public class Animal implements NoiseMaker, Eater { Integer age; Integer amountOfFoodEaten; - public Animal(String name,Integer age,Integer amountOfFoodEaten){ - this.name=name; - this.age=age; - this.amountOfFoodEaten=amountOfFoodEaten; - } -public Animal(){ - this.name=""; - this.age=0; - this.amountOfFoodEaten=0; -} + public Animal(String name, Integer age, Integer amountOfFoodEaten) { + this.name = name; + this.age = age; + this.amountOfFoodEaten = amountOfFoodEaten; + } + + public Animal() { + this.name = ""; + this.age = 0; + this.amountOfFoodEaten = 0; + } + public String getName() { return name; } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Animal/Chicken.java b/src/main/java/com/zipcodewilmington/froilansfarm/Animal/Chicken.java index 26a37748..ccef6b05 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Animal/Chicken.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Animal/Chicken.java @@ -4,14 +4,15 @@ import com.zipcodewilmington.froilansfarm.Produce; public class Chicken extends Animal implements Produce { - Boolean isFertilized=false; + Boolean isFertilized = false; Integer eggs; -public Chicken(){} + public Chicken() { + } public void yield(Edible object) { - if(this.isFertilized==true){ - this.eggs+=1; + if (this.isFertilized == true) { + this.eggs += 1; } } @@ -23,11 +24,11 @@ public boolean hasBeenHarvested() { return false; } - public String makeNoise(){ + public String makeNoise() { return "Cluck!"; } - public void eat(Edible Object){ + public void eat(Edible Object) { } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Animal/Farmer.java b/src/main/java/com/zipcodewilmington/froilansfarm/Animal/Farmer.java index 62006606..bbd28e59 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Animal/Farmer.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Animal/Farmer.java @@ -39,23 +39,27 @@ public String getName() { } public void mount(Rideable object) { - this.vehicle=object; - this.numberOfRidesTaken=0; + this.vehicle = object; + this.numberOfRidesTaken = 0; if (object.hasBeenRiden()) { numberOfRidesTaken++; } } + public Integer getNumberOfRidesTaken() { return numberOfRidesTaken; } public void dismount(Rideable object) { - this.vehicle=null; + this.vehicle = null; } public void eat(Edible object) { - object.isEaten(); - numberOfEdiblesEaten++; + if (object.isEaten()) { + numberOfEdiblesEaten++; + } else { + throw new UnsupportedOperationException("No new produce to eat:("); + } } public boolean hasEaten() { diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Animal/Horse.java b/src/main/java/com/zipcodewilmington/froilansfarm/Animal/Horse.java index 9e9a7eaa..ca260d33 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Animal/Horse.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Animal/Horse.java @@ -8,12 +8,12 @@ public class Horse extends Animal implements Rideable { Integer age; Integer amountOfFoodEaten; - public Horse(String name,Integer age,Integer amountOfFoodEaten){ - super(name,age,amountOfFoodEaten); + public Horse(String name, Integer age, Integer amountOfFoodEaten) { + super(name, age, amountOfFoodEaten); } - public Horse () { + public Horse() { this.name = ""; this.age = 0; this.amountOfFoodEaten = 0; diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Animal/Person.java b/src/main/java/com/zipcodewilmington/froilansfarm/Animal/Person.java index 7fcff08c..31f81d18 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Animal/Person.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Animal/Person.java @@ -4,14 +4,14 @@ public class Person { String name; int amountOfFoodEaten; - public Person(String name,int amountOfFoodEaten){ - this.name=name; - this.amountOfFoodEaten=amountOfFoodEaten; + public Person(String name, int amountOfFoodEaten) { + this.name = name; + this.amountOfFoodEaten = amountOfFoodEaten; } - public Person(){ - this.name=""; - this.amountOfFoodEaten=0; + public Person() { + this.name = ""; + this.amountOfFoodEaten = 0; } public String getName() { diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/AnimalTest/FarmerTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/AnimalTest/FarmerTest.java index ebd85555..70332efb 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/AnimalTest/FarmerTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/AnimalTest/FarmerTest.java @@ -10,34 +10,35 @@ public class FarmerTest { @Test - public void constructorTest(){ - Farmer farmer= new Farmer(); - String actualName="Froilan"; - Assert.assertEquals(farmer.getName(),actualName); + public void constructorTest() { + Farmer farmer = new Farmer(); + String actualName = "Froilan"; + Assert.assertEquals(farmer.getName(), actualName); } + @Test - public void hasEatenTest(){ - Farmer farmer= new Farmer(); - Boolean actual=false; + public void hasEatenTest() { + Farmer farmer = new Farmer(); + Boolean actual = false; Assert.assertFalse(farmer.hasEaten()); } @Test - public void plantTest(){ - Farmer farmer= new Farmer(); - CropRow cropRow=new CropRow(); - Integer numberOfCrops=0; - Crop crop=new CornPlant(); -Integer expected=1; + public void plantTest() { + Farmer farmer = new Farmer(); + CropRow cropRow = new CropRow(); + Integer numberOfCrops = 0; + Crop crop = new CornPlant(); + Integer expected = 1; // cropRow.addCrop(crop); -farmer.plant(crop); - Assert.assertEquals(expected,farmer.getNumberOfCropsPlanted()); + farmer.plant(crop); + Assert.assertEquals(expected, farmer.getNumberOfCropsPlanted()); } @Test - public void mountTest(){ - Farmer farmer= new Farmer(); + public void mountTest() { + Farmer farmer = new Farmer(); Integer expected = 1; Rideable vehicle = new Rideable() { @@ -48,7 +49,7 @@ public boolean hasBeenRiden() { }; farmer.mount(vehicle); - Assert.assertEquals(expected,farmer.getNumberOfRidesTaken()); + Assert.assertEquals(expected, farmer.getNumberOfRidesTaken()); } From 15024399feeb4879afb4bc36870c35989c6cc2f8 Mon Sep 17 00:00:00 2001 From: Dee Date: Fri, 23 Jul 2021 18:06:16 -0400 Subject: [PATCH 45/48] crop tests --- .../froilansfarm/crops/Crop.java | 6 +++++- .../froilansfarm/croptests/CropTest.java | 16 ++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/crops/Crop.java b/src/main/java/com/zipcodewilmington/froilansfarm/crops/Crop.java index b9740dfb..4b04eaa8 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/crops/Crop.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/crops/Crop.java @@ -66,6 +66,10 @@ public boolean hasBeenHarvested() { } public Integer getFoodToEat() { - return numOfEdiblesHarvested - numOfEdiblesEaten; + if (hasBeenHarvested) { + return numOfEdiblesHarvested - numOfEdiblesEaten; + } else { + throw new UnsupportedOperationException("Food must be harvested first!"); + } } } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/croptests/CropTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/croptests/CropTest.java index 03b5ff31..b0cd2f42 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/croptests/CropTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/croptests/CropTest.java @@ -145,4 +145,20 @@ public void AvailableToEatTrueTest(){ Assert.assertEquals(expected, actual); } + + @Test (expected = UnsupportedOperationException.class) + public void AvailableToEatImpossibleTest(){ + //given + Crop tomatoPlant = new TomatoPlant(); + Tomato tomato = new Tomato(); + int expected = 1; + + //when + tomatoPlant.fertilize(); //sets fertilized equal to true + tomatoPlant.yield(tomato); //preps for harvest + + //then + tomatoPlant.getFoodToEat(); + + } } From 45e2d4fd04125c02b2769e67c5b1f12e0fe9e02f Mon Sep 17 00:00:00 2001 From: Dee Date: Sun, 25 Jul 2021 16:42:07 -0400 Subject: [PATCH 46/48] refactoring begins --- .../froilansfarm/Animal/Barn.java | 20 +++++++------- .../froilansfarm/Animal/Farmer.java | 16 ++++++----- .../froilansfarm/FarmDay.java | 9 +++++++ .../froilansfarm/Vehicle/FarmVehicle.java | 12 ++++----- .../froilansfarm/storage/ChickenCoop.java | 26 +----------------- .../froilansfarm/storage/Field.java | 27 +++---------------- .../froilansfarm/storage/Stable.java | 26 +----------------- .../storage/StorageInterface.java | 16 ++++++++--- .../froilansfarm/AnimalTest/BarnTest.java | 13 +++++---- .../froilansfarm/croptests/CropRowTest.java | 21 +++++++++++++-- .../testStorage/ChickenCoopTest.java | 10 +++---- .../froilansfarm/testStorage/FieldTest.java | 8 +++--- .../froilansfarm/testStorage/StableTest.java | 6 ++--- 13 files changed, 89 insertions(+), 121 deletions(-) create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/FarmDay.java diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Animal/Barn.java b/src/main/java/com/zipcodewilmington/froilansfarm/Animal/Barn.java index 83f67af1..01d02284 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Animal/Barn.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Animal/Barn.java @@ -5,18 +5,18 @@ import java.util.ArrayList; import java.util.List; -public abstract class Barn implements StorageInterface { +public abstract class Barn implements StorageInterface { List animals; public Barn() { - animals = new ArrayList(); + animals = new ArrayList<>(); } - - public Integer numberOfAnimals(T animal){ - return animals.size(); - } - - +// +// public Integer numberOfAnimals(){ +// return animals.size(); +// } +// +// // public void add(T animal) { // animals.add(animal); // } @@ -25,11 +25,13 @@ public Integer numberOfAnimals(T animal){ // animals.remove(animal); // } - public List getAnimals() { + public List getList() { return animals; } public void setAnimals(List animals) { this.animals = new ArrayList<>(animals); } + + } \ No newline at end of file diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Animal/Farmer.java b/src/main/java/com/zipcodewilmington/froilansfarm/Animal/Farmer.java index bbd28e59..14ff9390 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Animal/Farmer.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Animal/Farmer.java @@ -13,9 +13,9 @@ public class Farmer extends Person implements Rider, Eater, Botanist { CropRow cropRow = new CropRow(); - Integer numberOfRidesTaken; - Integer numberOfCropsPlanted; - Integer numberOfEdiblesEaten; + int numberOfRidesTaken; + int numberOfCropsPlanted; + int numberOfEdiblesEaten; // List thingsEaten; String name = "Froilan"; Rideable vehicle; @@ -68,16 +68,18 @@ public boolean hasEaten() { public void plant(Crop Object) { cropRow.addCrop(Object); - this.numberOfCropsPlanted = 0; - numberOfCropsPlanted++; + numberOfCropsPlanted++; + } public Integer getNumberOfCropsPlanted() { - return numberOfCropsPlanted; + return cropRow.getCropRow().size(); } + @Deprecated public void setNumberOfPlants(Integer num) { - this.numberOfCropsPlanted = num; + + throw new RuntimeException("Deprecated"); } public void setName(String name) { diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/FarmDay.java b/src/main/java/com/zipcodewilmington/froilansfarm/FarmDay.java new file mode 100644 index 00000000..5a866d5a --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/FarmDay.java @@ -0,0 +1,9 @@ +package com.zipcodewilmington.froilansfarm; + +public class FarmDay { + private static final FarmDay INSTANCE = new FarmDay(); + + + + +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/FarmVehicle.java b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/FarmVehicle.java index c90cbafc..c001bc09 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/FarmVehicle.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/FarmVehicle.java @@ -1,6 +1,6 @@ package com.zipcodewilmington.froilansfarm.Vehicle; -public class FarmVehicle implements Vehicle{ +public class FarmVehicle implements Vehicle { String onFarm; String offFarm; String location; @@ -15,18 +15,16 @@ public FarmVehicle() { } - public void setLocation(String expected){ this.location=location; + public void setLocation(String expected) { + this.location = expected; } public String getLocation() { return this.location; } - public Boolean operation(String location){ - boolean canOperate; - if(location==onFarm){ - return canOperate=true; - }return canOperate=false; + public Boolean operation(String location) { + return location.equals(onFarm); } @Override diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/storage/ChickenCoop.java b/src/main/java/com/zipcodewilmington/froilansfarm/storage/ChickenCoop.java index 92439558..fe73dd36 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/storage/ChickenCoop.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/storage/ChickenCoop.java @@ -9,32 +9,8 @@ import java.util.ArrayList; import java.util.List; -public class ChickenCoop extends Barn { +public class ChickenCoop extends Barn { - List listOfChicken; - - public ChickenCoop () { - listOfChicken = new ArrayList<>(); - } - - @Override - public void add(Object thingYouAreStoring) { - listOfChicken.add((Chicken) thingYouAreStoring); - } - - @Override - public void remove(Object thingYouAreStoring) { - listOfChicken.remove(thingYouAreStoring); - } - - @Override - public int amount(Object thingYouAreStoring) { - return listOfChicken.size(); - } - - public List getListOfChicken() { - return listOfChicken; } -} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/storage/Field.java b/src/main/java/com/zipcodewilmington/froilansfarm/storage/Field.java index 97c57b34..2164267d 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/storage/Field.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/storage/Field.java @@ -5,30 +5,11 @@ import java.util.ArrayList; import java.util.List; -public class Field implements StorageInterface { - - List listOfCropRow; - - public Field () { - this.listOfCropRow = new ArrayList<>(); - } - - @Override - public void add(Object thingYouAreStoring) { - listOfCropRow.add((CropRow) thingYouAreStoring); - } +public class Field implements StorageInterface { + private List list = new ArrayList<>(); @Override - public void remove(Object thingYouAreStoring) { - listOfCropRow.remove(thingYouAreStoring); - } - - @Override - public int amount(Object thingYouAreStoring) { - return listOfCropRow.size(); - } - - public List getListOfCropRow() { - return listOfCropRow; + public List getList() { + return list; } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/storage/Stable.java b/src/main/java/com/zipcodewilmington/froilansfarm/storage/Stable.java index e83737f6..6f97a9d3 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/storage/Stable.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/storage/Stable.java @@ -8,30 +8,6 @@ import java.util.ArrayList; import java.util.List; -public class Stable extends Barn { +public class Stable extends Barn { - List listOfHorses; - - public Stable () { - listOfHorses = new ArrayList<>(); - } - - @Override - public void add(Object thingYouAreStoring) { - listOfHorses.add((Horse) thingYouAreStoring); - } - - @Override - public void remove(Object thingYouAreStoring) { - listOfHorses.remove(thingYouAreStoring); - } - - @Override - public int amount(Object thingYouAreStoring) { - return listOfHorses.size(); - } - - public List getListOfHorses () { - return listOfHorses; - } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/storage/StorageInterface.java b/src/main/java/com/zipcodewilmington/froilansfarm/storage/StorageInterface.java index 4ccf5612..2c1bec57 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/storage/StorageInterface.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/storage/StorageInterface.java @@ -1,12 +1,20 @@ package com.zipcodewilmington.froilansfarm.storage; -import java.lang.reflect.Type; +import java.util.List; public interface StorageInterface { + List getList(); - void add(TypeToStore thingYouAreStoring); + default Integer getSize(){ + return getList().size(); + } - void remove(TypeToStore thingYouAreStoring); - int amount(TypeToStore thingYouAreStoring); + default void add(TypeToStore animal) { + getList().add(animal); + } + + default void remove(TypeToStore animal) { + getList().remove(animal); + } } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/AnimalTest/BarnTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/AnimalTest/BarnTest.java index 547bec03..3db0e1ee 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/AnimalTest/BarnTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/AnimalTest/BarnTest.java @@ -2,7 +2,6 @@ import com.zipcodewilmington.froilansfarm.Animal.Animal; import com.zipcodewilmington.froilansfarm.Animal.Barn; -import com.zipcodewilmington.froilansfarm.Animal.Chicken; import com.zipcodewilmington.froilansfarm.Animal.Horse; import com.zipcodewilmington.froilansfarm.storage.ChickenCoop; import com.zipcodewilmington.froilansfarm.storage.Stable; @@ -26,7 +25,7 @@ public void numberOfAnimalsTest() { animals.add((T) "chick"); Integer expected = 3; barn.setAnimals(animals); - Assert.assertEquals(expected, barn.numberOfAnimals(animals)); + Assert.assertEquals(expected, barn.getSize()); } @Test @@ -36,7 +35,7 @@ public void addTest() { animals.add("chicken"); barn.setAnimals(animals); //animals.toArray(); - Assert.assertEquals("chicken", barn.getAnimals().get(0)); + Assert.assertEquals("chicken", barn.getList().get(0)); } @@ -52,9 +51,9 @@ public void removeTest() { barn.setAnimals(animals); - barn.getAnimals().remove(horse); + barn.getList().remove(horse); - Assert.assertEquals(1, barn.getAnimals().size()); + Assert.assertEquals(1, barn.getList().size()); } @Test @@ -65,7 +64,7 @@ public void testGetAnimals() { animals.add("horse"); barn.setAnimals(animals); - Assert.assertEquals("chicken", barn.getAnimals().get(0)); + Assert.assertEquals("chicken", barn.getList().get(0)); } @Test @@ -76,6 +75,6 @@ public void testSetAnimals() { animals.add("horse"); barn.setAnimals(animals); - Assert.assertEquals("horse", barn.getAnimals().get(1)); + Assert.assertEquals("horse", barn.getList().get(1)); } } \ No newline at end of file diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/croptests/CropRowTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/croptests/CropRowTest.java index 3d2b49f4..e622f5fa 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/croptests/CropRowTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/croptests/CropRowTest.java @@ -65,8 +65,8 @@ public void removeCrop(){ Assert.assertEquals(expected, actual); } - @Test - public void getTotalPlants(){ + @Test (expected = UnsupportedOperationException.class) + public void getTotalPlantsNegative(){ //given Crop tomatoPlant = new TomatoPlant(); Crop cornPlant = new CornPlant(); @@ -85,6 +85,23 @@ public void getTotalPlants(){ } + @Test + public void getTotalPlantsPositive() { + //given + Crop tomatoPlant = new TomatoPlant(); + Crop cornPlant = new CornPlant(); + CropRow testRow = new CropRow(); + + //when + Assert.assertEquals(0, testRow.getNumberofCropsPlanted()); + testRow.addCrop(tomatoPlant); + testRow.addCrop(cornPlant); + int actual = testRow.getNumberofCropsPlanted(); + + //then + Assert.assertEquals(2, actual); + } + @Test public void getTotalEdibles(){ //given diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/testStorage/ChickenCoopTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/testStorage/ChickenCoopTest.java index 203a48c8..35b44873 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/testStorage/ChickenCoopTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/testStorage/ChickenCoopTest.java @@ -15,7 +15,7 @@ public void nullaryConstructorTest () { ChickenCoop cc = new ChickenCoop(); Integer expected = 0; - Integer actual = cc.getListOfChicken().size(); + Integer actual = cc.getSize(); Assert.assertEquals(expected, actual); } @@ -41,7 +41,7 @@ public void addTest () { Integer expected = 1; cc.add(chicken); - Integer actual = cc.getListOfChicken().size(); + Integer actual = cc.getSize(); Assert.assertEquals(expected, actual); } @@ -56,7 +56,7 @@ public void removeTest () { cc.add(chicken); cc.add(chicken1); cc.remove(chicken); - Integer actual = cc.getListOfChicken().size(); + Integer actual = cc.getSize(); Assert.assertEquals(expected, actual); // I return an extra chicken, oops @@ -71,7 +71,7 @@ public void amountTest () { cc.add(chicken); cc.add(chicken1); - Integer actual = cc.getListOfChicken().size(); + Integer actual = cc.getSize(); Assert.assertEquals(expected, actual); } @@ -85,7 +85,7 @@ public void getChickenCoopTest () { cc.add(chicken); cc.add(chicken1); - Integer actual = cc.getListOfChicken().size(); + Integer actual = cc.getSize(); Assert.assertEquals(expected, actual); } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/testStorage/FieldTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/testStorage/FieldTest.java index 535f0ce6..6901818a 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/testStorage/FieldTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/testStorage/FieldTest.java @@ -23,7 +23,7 @@ public void addTest() { field.add(cr); field.add(cr2); - Integer actual = field.getListOfCropRow().size(); + Integer actual = field.getSize(); Assert.assertEquals(expected, actual); } @@ -38,7 +38,7 @@ public void removeTest() { field.add(cr); field.add(cr2); field.remove(cr); - Integer actual = field.getListOfCropRow().size(); + Integer actual = field.getSize(); Assert.assertEquals(expected, actual); } @@ -53,7 +53,7 @@ public void getAmountTest() { field.add(cr); field.add(cr2); field.remove(cr); - Integer actual = field.getListOfCropRow().size(); + Integer actual = field.getSize(); Assert.assertEquals(expected, actual); } @@ -63,7 +63,7 @@ public void getListTest () { Field field = new Field(); Integer expected = 0; - Integer actual = field.getListOfCropRow().size(); + Integer actual = field.getSize(); Assert.assertEquals(expected, actual); } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/testStorage/StableTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/testStorage/StableTest.java index f2fd9810..ffc555ee 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/testStorage/StableTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/testStorage/StableTest.java @@ -32,7 +32,7 @@ public void addTest() { stable.add(horse); stable.add(horse1); - Integer actual = stable.getListOfHorses().size(); + Integer actual = stable.getSize(); Assert.assertEquals(expected, actual); } @@ -47,7 +47,7 @@ public void removeTest() { stable.add(horse); stable.add(horse1); stable.remove(horse); - Integer actual = stable.getListOfHorses().size(); + Integer actual = stable.getSize(); Assert.assertEquals(expected, actual); } @@ -62,7 +62,7 @@ public void getListOfHorsesTest() { stable.add(horse); stable.add(horse1); stable.remove(horse); - Integer actual = stable.getListOfHorses().size(); + Integer actual = stable.getSize(); Assert.assertEquals(expected, actual); } From 780469b24db9c09c3ec57f2006d35d24c6c9772f Mon Sep 17 00:00:00 2001 From: Dee Date: Sun, 25 Jul 2021 16:58:52 -0400 Subject: [PATCH 47/48] refactor farmer --- .../froilansfarm/Animal/Farmer.java | 30 ++++++++++++------- .../froilansfarm/FarmDay.java | 3 +- .../froilansfarm/Vehicle/Botanist.java | 3 +- .../froilansfarm/AnimalTest/FarmerTest.java | 2 +- 4 files changed, 24 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Animal/Farmer.java b/src/main/java/com/zipcodewilmington/froilansfarm/Animal/Farmer.java index 14ff9390..25235cd5 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Animal/Farmer.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Animal/Farmer.java @@ -12,7 +12,6 @@ import java.util.List; public class Farmer extends Person implements Rider, Eater, Botanist { - CropRow cropRow = new CropRow(); int numberOfRidesTaken; int numberOfCropsPlanted; int numberOfEdiblesEaten; @@ -40,9 +39,8 @@ public String getName() { public void mount(Rideable object) { this.vehicle = object; - this.numberOfRidesTaken = 0; if (object.hasBeenRiden()) { - numberOfRidesTaken++; + incrementRidesTaken(); } } @@ -56,7 +54,7 @@ public void dismount(Rideable object) { public void eat(Edible object) { if (object.isEaten()) { - numberOfEdiblesEaten++; + incrementFoodEaten(); } else { throw new UnsupportedOperationException("No new produce to eat:("); } @@ -66,23 +64,33 @@ public boolean hasEaten() { return false; } - public void plant(Crop Object) { - cropRow.addCrop(Object); - numberOfCropsPlanted++; + public void plant(CropRow cropRow, Crop crop) { + cropRow.addCrop(crop); + incrementNumberOfPlants(); } public Integer getNumberOfCropsPlanted() { - return cropRow.getCropRow().size(); + return numberOfCropsPlanted; } - @Deprecated public void setNumberOfPlants(Integer num) { - - throw new RuntimeException("Deprecated"); + this.numberOfCropsPlanted = num; } public void setName(String name) { this.name = name; } + + public void incrementNumberOfPlants(){ + setNumberOfPlants(getNumberOfCropsPlanted()+1); + } + + public void incrementFoodEaten(){ + setAmountOfFoodEaten(getAmountOfFoodEaten()+1); + } + public void incrementRidesTaken(){ + numberOfRidesTaken++; + + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/FarmDay.java b/src/main/java/com/zipcodewilmington/froilansfarm/FarmDay.java index 5a866d5a..5c341087 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/FarmDay.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/FarmDay.java @@ -1,7 +1,8 @@ package com.zipcodewilmington.froilansfarm; public class FarmDay { - private static final FarmDay INSTANCE = new FarmDay(); + private static final FarmDay INSTANCE = new FarmDay(); + diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/Botanist.java b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/Botanist.java index 284bfae7..c07c1fd5 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/Botanist.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/Botanist.java @@ -1,9 +1,10 @@ package com.zipcodewilmington.froilansfarm.Vehicle; import com.zipcodewilmington.froilansfarm.crops.Crop; +import com.zipcodewilmington.froilansfarm.crops.CropRow; public interface Botanist { - void plant(Crop Object); + public void plant(CropRow cropRow, Crop crop); void setNumberOfPlants(Integer num); diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/AnimalTest/FarmerTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/AnimalTest/FarmerTest.java index 70332efb..058514d2 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/AnimalTest/FarmerTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/AnimalTest/FarmerTest.java @@ -31,7 +31,7 @@ public void plantTest() { Crop crop = new CornPlant(); Integer expected = 1; // cropRow.addCrop(crop); - farmer.plant(crop); + farmer.plant(cropRow, crop); Assert.assertEquals(expected, farmer.getNumberOfCropsPlanted()); } From f4704067d2c20270f6dcf7dc082cbd4b87593728 Mon Sep 17 00:00:00 2001 From: Dee Date: Sun, 25 Jul 2021 17:43:54 -0400 Subject: [PATCH 48/48] refactored CropRow --- .../froilansfarm/Animal/Farmer.java | 2 +- .../froilansfarm/FarmDay.java | 10 ---- .../froilansfarm/SingleFarm.java | 14 +++++ .../froilansfarm/Vehicle/CropDuster.java | 2 +- .../froilansfarm/Vehicle/Tractor.java | 2 +- .../froilansfarm/crops/CropRow.java | 51 +++++++++++-------- .../froilansfarm/Vehicles/CropDusterTest.java | 2 +- .../froilansfarm/Vehicles/TractorTest.java | 4 +- .../froilansfarm/croptests/CropRowTest.java | 35 ++++++------- 9 files changed, 67 insertions(+), 55 deletions(-) delete mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/FarmDay.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/SingleFarm.java diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Animal/Farmer.java b/src/main/java/com/zipcodewilmington/froilansfarm/Animal/Farmer.java index 25235cd5..0693b937 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Animal/Farmer.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Animal/Farmer.java @@ -65,7 +65,7 @@ public boolean hasEaten() { } public void plant(CropRow cropRow, Crop crop) { - cropRow.addCrop(crop); + cropRow.add(crop); incrementNumberOfPlants(); } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/FarmDay.java b/src/main/java/com/zipcodewilmington/froilansfarm/FarmDay.java deleted file mode 100644 index 5c341087..00000000 --- a/src/main/java/com/zipcodewilmington/froilansfarm/FarmDay.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.zipcodewilmington.froilansfarm; - -public class FarmDay { - private static final FarmDay INSTANCE = new FarmDay(); - - - - - -} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/SingleFarm.java b/src/main/java/com/zipcodewilmington/froilansfarm/SingleFarm.java new file mode 100644 index 00000000..4633704b --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/SingleFarm.java @@ -0,0 +1,14 @@ +package com.zipcodewilmington.froilansfarm; + +public class SingleFarm { + private static final SingleFarm INSTANCE = new SingleFarm(); + + + SingleFarm (){}; + + public static SingleFarm getInstance(){ + return INSTANCE; + } + + +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/CropDuster.java b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/CropDuster.java index 54ea255e..23d26d57 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/CropDuster.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/CropDuster.java @@ -44,7 +44,7 @@ public int getNumOfFertCrop() { } public boolean needsToBeFertilized(CropRow cropRow) { - for (Crop crop : cropRow.getCropRow()) { + for (Crop crop : cropRow.getList()) { if (crop.hasBeenFertilized()==false){ return true; } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/Tractor.java b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/Tractor.java index 097f381c..54213954 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/Tractor.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicle/Tractor.java @@ -40,7 +40,7 @@ public int getNumOfFertCrop() { } public boolean needsToBeHarvested(CropRow cropRow) { - for (Crop crop : cropRow.getCropRow()) { + for (Crop crop : cropRow.getList()) { if (crop.hasBeenHarvested() == false) { return true; } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/crops/CropRow.java b/src/main/java/com/zipcodewilmington/froilansfarm/crops/CropRow.java index f2fc51c2..c53e0f21 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/crops/CropRow.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/crops/CropRow.java @@ -1,45 +1,52 @@ package com.zipcodewilmington.froilansfarm.crops; import com.zipcodewilmington.froilansfarm.Edible; +import com.zipcodewilmington.froilansfarm.storage.StorageInterface; import java.util.ArrayList; import java.util.List; -public class CropRow { - List cropRow; - - - public CropRow(List cropRow) { - this.cropRow = cropRow; +public class CropRow implements StorageInterface { + List crops = new ArrayList<>(); + @Override + public List getList() { + return crops; } - public CropRow() { - this.cropRow = new ArrayList<>(); - } - public int getNumberofCropsPlanted() {return cropRow.size();} - public List getCropRow() { - return cropRow; - } +// public CropRow(List cropRow) { +// this.cropRow = cropRow; +// +// } +// +// public CropRow() { +// this.cropRow = new ArrayList<>(); +// } +// +// public int getNumberofCropsPlanted() {return cropRow.size();} + +// public List getCropRow() { +// return cropRow; +// } public void addCrop(Crop crop, Integer numberOfCrops){ for (int i = 0; i < numberOfCrops; i++) { - cropRow.add(crop); + add(crop); } } - public void addCrop(Crop crop){ - cropRow.add(crop); - } - - public void removeCrop(Crop crop) { - cropRow.remove(crop); - } +// public void addCrop(Crop crop){ +// cropRow.add(crop); +// } +// +// public void removeCrop(Crop crop) { +// cropRow.remove(crop); +// } public int getNumberOfEdibles() { int sum = 0; - for (Crop crop : cropRow) { + for (Crop crop : crops) { sum += crop.getNumOfEdiblesYielded(); } return sum; diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDusterTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDusterTest.java index beb6b097..7230f248 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDusterTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDusterTest.java @@ -99,7 +99,7 @@ public void needsToBeFertilized () { CropRow cropRow = new CropRow(); Boolean expected = true; crop.hasBeenFertilized(); - cropRow.addCrop(crop); + cropRow.add(crop); Boolean actual = cd.needsToBeFertilized(cropRow); diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/TractorTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/TractorTest.java index e27f0211..0fae6183 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/TractorTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/TractorTest.java @@ -76,7 +76,7 @@ public void doesNotNeedToBeHarvested () { crop.fertilize(); Boolean expected = true; - cr.addCrop(crop); + cr.add(crop); Boolean actual = tractor.needsToBeHarvested(cr); Assert.assertEquals(expected, actual); @@ -92,7 +92,7 @@ public void needsToBeHarvested () { crop.harvest(); Boolean expected = false; - cr.addCrop(crop); + cr.add(crop); Boolean actual = tractor.needsToBeHarvested(cr); Assert.assertEquals(expected, actual); diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/croptests/CropRowTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/croptests/CropRowTest.java index e622f5fa..c1d05434 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/croptests/CropRowTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/croptests/CropRowTest.java @@ -11,7 +11,7 @@ public void defaultConstructorTest(){ CropRow testRow = new CropRow(); //when - int actual = testRow.getNumberofCropsPlanted(); + int actual = testRow.getSize(); //then int expected = 0; @@ -25,7 +25,7 @@ public void defaultConstructorTest2(){ CropRow testRow = new CropRow(); //when - int actual = testRow.getNumberofCropsPlanted(); + int actual = testRow.getSize(); //then int expected = 0; @@ -41,7 +41,7 @@ public void addCropTest(){ //when testRow.addCrop(tomato, 2); - int actual = testRow.getNumberofCropsPlanted(); + int actual = testRow.getSize(); //then int expected = 2; @@ -56,9 +56,9 @@ public void removeCrop(){ TomatoPlant tomato = new TomatoPlant(0); //when - testRow.addCrop(tomato); - testRow.removeCrop(tomato); - int actual = testRow.getNumberofCropsPlanted(); + testRow.add(tomato); + testRow.remove(tomato); + int actual = testRow.getSize(); //then int expected = 0; @@ -76,9 +76,9 @@ public void getTotalPlantsNegative(){ //when CropRow testRow = new CropRow(); - testRow.addCrop(tomatoPlant); - testRow.addCrop(cornPlant); - int actual = testRow.getNumberofCropsPlanted(); + testRow.add(tomatoPlant); + testRow.add(cornPlant); + int actual = testRow.getSize(); //then Assert.assertEquals(2, actual); @@ -93,10 +93,11 @@ public void getTotalPlantsPositive() { CropRow testRow = new CropRow(); //when - Assert.assertEquals(0, testRow.getNumberofCropsPlanted()); - testRow.addCrop(tomatoPlant); - testRow.addCrop(cornPlant); - int actual = testRow.getNumberofCropsPlanted(); + int before = testRow.getSize(); + Assert.assertEquals(0, before); + testRow.add(tomatoPlant); + testRow.add(cornPlant); + int actual = testRow.getSize(); //then Assert.assertEquals(2, actual); @@ -108,8 +109,8 @@ public void getTotalEdibles(){ Crop tomatoPlant = new TomatoPlant(); Crop cornPlant = new CornPlant(); CropRow testRow = new CropRow(); - testRow.addCrop(tomatoPlant); - testRow.addCrop(cornPlant); + testRow.add(tomatoPlant); + testRow.add(cornPlant); tomatoPlant.fertilize(); cornPlant.fertilize(); @@ -138,8 +139,8 @@ public void getTotalEdiblesExceptionTest() { //when CropRow testRow = new CropRow(); - testRow.addCrop(tomatoPlant); - testRow.addCrop(cornPlant); + testRow.add(tomatoPlant); + testRow.add(cornPlant); tomatoPlant.fertilize(); cornPlant.fertilize(); int actual = testRow.getNumberOfEdibles();