From a0f8e72d299a47f25a19bf90b4aeb88744d239e2 Mon Sep 17 00:00:00 2001 From: MannyMb Date: Wed, 21 Jul 2021 22:59:45 -0400 Subject: [PATCH 01/26] Adding Classes --- .../java/com/zipcodewilmington/froilansfarm/Froilan.java | 4 ++++ .../java/com/zipcodewilmington/froilansfarm/Froilanda.java | 4 ++++ .../java/com/zipcodewilmington/froilansfarm/NoiseMaker.java | 4 ++++ .../java/com/zipcodewilmington/froilansfarm/Rideable.java | 4 ++++ .../com/zipcodewilmington/froilansfarm/animals/Animal.java | 5 +++++ .../com/zipcodewilmington/froilansfarm/animals/Chicken.java | 4 ++++ .../com/zipcodewilmington/froilansfarm/animals/Eater.java | 4 ++++ .../com/zipcodewilmington/froilansfarm/animals/Horse.java | 4 ++++ .../froilansfarm/animals/person/Botanist.java | 4 ++++ .../froilansfarm/animals/person/Farmer.java | 4 ++++ .../froilansfarm/animals/person/Person.java | 4 ++++ .../zipcodewilmington/froilansfarm/animals/person/Pilot.java | 4 ++++ .../com/zipcodewilmington/froilansfarm/crops/CornStalk.java | 4 ++++ .../java/com/zipcodewilmington/froilansfarm/crops/Crop.java | 4 ++++ .../com/zipcodewilmington/froilansfarm/crops/EarCorn.java | 4 ++++ .../com/zipcodewilmington/froilansfarm/crops/Edible.java | 4 ++++ .../com/zipcodewilmington/froilansfarm/crops/Potato.java | 4 ++++ .../com/zipcodewilmington/froilansfarm/crops/PotatoRoot.java | 4 ++++ .../com/zipcodewilmington/froilansfarm/crops/Tomato.java | 4 ++++ .../zipcodewilmington/froilansfarm/crops/TomatoPlant.java | 4 ++++ .../com/zipcodewilmington/froilansfarm/farm/ChickenCoop.java | 4 ++++ .../com/zipcodewilmington/froilansfarm/farm/CropRow.java | 4 ++++ .../com/zipcodewilmington/froilansfarm/farm/FarmHouse.java | 4 ++++ .../java/com/zipcodewilmington/froilansfarm/farm/Field.java | 4 ++++ .../com/zipcodewilmington/froilansfarm/farm/Produce.java | 4 ++++ .../com/zipcodewilmington/froilansfarm/farm/Shelter.java | 4 ++++ .../java/com/zipcodewilmington/froilansfarm/farm/Stable.java | 4 ++++ .../com/zipcodewilmington/froilansfarm/vehicle/Aircraft.java | 4 ++++ .../zipcodewilmington/froilansfarm/vehicle/CropDuster.java | 4 ++++ .../zipcodewilmington/froilansfarm/vehicle/FarmVehicle.java | 4 ++++ .../com/zipcodewilmington/froilansfarm/vehicle/Tractor.java | 4 ++++ .../com/zipcodewilmington/froilansfarm/vehicle/Vehicle.java | 4 ++++ 32 files changed, 129 insertions(+) create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Froilan.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Froilanda.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/NoiseMaker.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Rideable.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/animals/Animal.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/animals/Chicken.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/animals/Eater.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/animals/Horse.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/animals/person/Botanist.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/animals/person/Farmer.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/animals/person/Person.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/animals/person/Pilot.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/crops/CornStalk.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/crops/Crop.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/crops/EarCorn.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/crops/Edible.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/crops/Potato.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/crops/PotatoRoot.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 create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/farm/ChickenCoop.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/farm/CropRow.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/farm/FarmHouse.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/farm/Field.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/farm/Produce.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/farm/Shelter.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/farm/Stable.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/vehicle/Aircraft.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/vehicle/CropDuster.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/vehicle/FarmVehicle.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/vehicle/Tractor.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/vehicle/Vehicle.java diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Froilan.java b/src/main/java/com/zipcodewilmington/froilansfarm/Froilan.java new file mode 100644 index 00000000..1092e9ec --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Froilan.java @@ -0,0 +1,4 @@ +package com.zipcodewilmington.froilansfarm; + +public class Froilan { +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Froilanda.java b/src/main/java/com/zipcodewilmington/froilansfarm/Froilanda.java new file mode 100644 index 00000000..a1d0cb13 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Froilanda.java @@ -0,0 +1,4 @@ +package com.zipcodewilmington.froilansfarm; + +public class Froilanda { +} 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..a8d66041 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/NoiseMaker.java @@ -0,0 +1,4 @@ +package com.zipcodewilmington.froilansfarm; + +public interface NoiseMaker { +} 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..eabd3875 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Rideable.java @@ -0,0 +1,4 @@ +package com.zipcodewilmington.froilansfarm; + +public interface Rideable { +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/animals/Animal.java b/src/main/java/com/zipcodewilmington/froilansfarm/animals/Animal.java new file mode 100644 index 00000000..a85711aa --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/animals/Animal.java @@ -0,0 +1,5 @@ +package com.zipcodewilmington.froilansfarm.animals; + +public abstract class Animal { + +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/animals/Chicken.java b/src/main/java/com/zipcodewilmington/froilansfarm/animals/Chicken.java new file mode 100644 index 00000000..7ee81e26 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/animals/Chicken.java @@ -0,0 +1,4 @@ +package com.zipcodewilmington.froilansfarm.animals; + +public class Chicken { +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/animals/Eater.java b/src/main/java/com/zipcodewilmington/froilansfarm/animals/Eater.java new file mode 100644 index 00000000..3808b744 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/animals/Eater.java @@ -0,0 +1,4 @@ +package com.zipcodewilmington.froilansfarm.animals; + +public interface Eater { +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/animals/Horse.java b/src/main/java/com/zipcodewilmington/froilansfarm/animals/Horse.java new file mode 100644 index 00000000..50539ff3 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/animals/Horse.java @@ -0,0 +1,4 @@ +package com.zipcodewilmington.froilansfarm.animals; + +public class Horse { +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/animals/person/Botanist.java b/src/main/java/com/zipcodewilmington/froilansfarm/animals/person/Botanist.java new file mode 100644 index 00000000..8ddc1f1c --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/animals/person/Botanist.java @@ -0,0 +1,4 @@ +package com.zipcodewilmington.froilansfarm.animals.person; + +public class Botanist { +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/animals/person/Farmer.java b/src/main/java/com/zipcodewilmington/froilansfarm/animals/person/Farmer.java new file mode 100644 index 00000000..f3543da2 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/animals/person/Farmer.java @@ -0,0 +1,4 @@ +package com.zipcodewilmington.froilansfarm.animals.person; + +public class Farmer { +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/animals/person/Person.java b/src/main/java/com/zipcodewilmington/froilansfarm/animals/person/Person.java new file mode 100644 index 00000000..0d900aad --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/animals/person/Person.java @@ -0,0 +1,4 @@ +package com.zipcodewilmington.froilansfarm.animals.person; + +public class Person { +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/animals/person/Pilot.java b/src/main/java/com/zipcodewilmington/froilansfarm/animals/person/Pilot.java new file mode 100644 index 00000000..c923a710 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/animals/person/Pilot.java @@ -0,0 +1,4 @@ +package com.zipcodewilmington.froilansfarm.animals.person; + +public class Pilot { +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/crops/CornStalk.java b/src/main/java/com/zipcodewilmington/froilansfarm/crops/CornStalk.java new file mode 100644 index 00000000..b744dd09 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/crops/CornStalk.java @@ -0,0 +1,4 @@ +package com.zipcodewilmington.froilansfarm.crops; + +public class CornStalk { +} 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..81347caf --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/crops/Crop.java @@ -0,0 +1,4 @@ +package com.zipcodewilmington.froilansfarm.crops; + +public abstract class Crop { +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/crops/EarCorn.java b/src/main/java/com/zipcodewilmington/froilansfarm/crops/EarCorn.java new file mode 100644 index 00000000..8dfd382b --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/crops/EarCorn.java @@ -0,0 +1,4 @@ +package com.zipcodewilmington.froilansfarm.crops; + +public class EarCorn { +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/crops/Edible.java b/src/main/java/com/zipcodewilmington/froilansfarm/crops/Edible.java new file mode 100644 index 00000000..391520fb --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/crops/Edible.java @@ -0,0 +1,4 @@ +package com.zipcodewilmington.froilansfarm.crops; + +public interface Edible { +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/crops/Potato.java b/src/main/java/com/zipcodewilmington/froilansfarm/crops/Potato.java new file mode 100644 index 00000000..1500668a --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/crops/Potato.java @@ -0,0 +1,4 @@ +package com.zipcodewilmington.froilansfarm.crops; + +public class Potato { +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/crops/PotatoRoot.java b/src/main/java/com/zipcodewilmington/froilansfarm/crops/PotatoRoot.java new file mode 100644 index 00000000..49109536 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/crops/PotatoRoot.java @@ -0,0 +1,4 @@ +package com.zipcodewilmington.froilansfarm.crops; + +public class PotatoRoot { +} 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..7c678a19 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/crops/Tomato.java @@ -0,0 +1,4 @@ +package com.zipcodewilmington.froilansfarm.crops; + +public class Tomato { +} 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..4436221a --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/crops/TomatoPlant.java @@ -0,0 +1,4 @@ +package com.zipcodewilmington.froilansfarm.crops; + +public class TomatoPlant { +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/farm/ChickenCoop.java b/src/main/java/com/zipcodewilmington/froilansfarm/farm/ChickenCoop.java new file mode 100644 index 00000000..d6a09640 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/farm/ChickenCoop.java @@ -0,0 +1,4 @@ +package com.zipcodewilmington.froilansfarm.farm; + +public class ChickenCoop { +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/farm/CropRow.java b/src/main/java/com/zipcodewilmington/froilansfarm/farm/CropRow.java new file mode 100644 index 00000000..3eee84f8 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/farm/CropRow.java @@ -0,0 +1,4 @@ +package com.zipcodewilmington.froilansfarm.farm; + +public class CropRow { +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/farm/FarmHouse.java b/src/main/java/com/zipcodewilmington/froilansfarm/farm/FarmHouse.java new file mode 100644 index 00000000..8874155c --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/farm/FarmHouse.java @@ -0,0 +1,4 @@ +package com.zipcodewilmington.froilansfarm.farm; + +public class FarmHouse { +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/farm/Field.java b/src/main/java/com/zipcodewilmington/froilansfarm/farm/Field.java new file mode 100644 index 00000000..56cfcdf3 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/farm/Field.java @@ -0,0 +1,4 @@ +package com.zipcodewilmington.froilansfarm.farm; + +public class Field { +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/farm/Produce.java b/src/main/java/com/zipcodewilmington/froilansfarm/farm/Produce.java new file mode 100644 index 00000000..9bef91f0 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/farm/Produce.java @@ -0,0 +1,4 @@ +package com.zipcodewilmington.froilansfarm.farm; + +public interface Produce { +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/farm/Shelter.java b/src/main/java/com/zipcodewilmington/froilansfarm/farm/Shelter.java new file mode 100644 index 00000000..69128235 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/farm/Shelter.java @@ -0,0 +1,4 @@ +package com.zipcodewilmington.froilansfarm.farm; + +public abstract class Shelter { +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/farm/Stable.java b/src/main/java/com/zipcodewilmington/froilansfarm/farm/Stable.java new file mode 100644 index 00000000..f6776f00 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/farm/Stable.java @@ -0,0 +1,4 @@ +package com.zipcodewilmington.froilansfarm.farm; + +public class Stable { +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/Aircraft.java b/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/Aircraft.java new file mode 100644 index 00000000..c2e20a68 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/Aircraft.java @@ -0,0 +1,4 @@ +package com.zipcodewilmington.froilansfarm.vehicle; + +public class Aircraft { +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/CropDuster.java b/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/CropDuster.java new file mode 100644 index 00000000..11e650b6 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/CropDuster.java @@ -0,0 +1,4 @@ +package com.zipcodewilmington.froilansfarm.vehicle; + +public class CropDuster { +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/FarmVehicle.java b/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/FarmVehicle.java new file mode 100644 index 00000000..1332dde8 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/FarmVehicle.java @@ -0,0 +1,4 @@ +package com.zipcodewilmington.froilansfarm.vehicle; + +public interface FarmVehicle { +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/Tractor.java b/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/Tractor.java new file mode 100644 index 00000000..4aada1c0 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/Tractor.java @@ -0,0 +1,4 @@ +package com.zipcodewilmington.froilansfarm.vehicle; + +public class Tractor { +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/Vehicle.java b/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/Vehicle.java new file mode 100644 index 00000000..8b5f6f25 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/Vehicle.java @@ -0,0 +1,4 @@ +package com.zipcodewilmington.froilansfarm.vehicle; + +public class Vehicle { +} From 1b50486d87bf96dbd1337f23ea0926ad6d1f64db Mon Sep 17 00:00:00 2001 From: MannyMb Date: Wed, 21 Jul 2021 23:15:04 -0400 Subject: [PATCH 02/26] test packages --- .../java/com/zipcodewilmington/froilansfarm/crops/Egg.java | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/crops/Egg.java diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/crops/Egg.java b/src/main/java/com/zipcodewilmington/froilansfarm/crops/Egg.java new file mode 100644 index 00000000..377d8b84 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/crops/Egg.java @@ -0,0 +1,4 @@ +package com.zipcodewilmington.froilansfarm.crops; + +public class Egg { +} From 6d33ae0ec5e8f1e811086ed46a9c7a17335ed46b Mon Sep 17 00:00:00 2001 From: Rex Date: Thu, 22 Jul 2021 20:38:03 -0400 Subject: [PATCH 03/26] Made edible food and tests --- pom.xml | 8 ++++++ .../froilansfarm/animals/Eater.java | 4 +++ .../froilansfarm/crops/CornStalk.java | 5 +++- .../froilansfarm/crops/EarCorn.java | 5 +++- .../froilansfarm/crops/Edible.java | 3 +++ .../froilansfarm/crops/Egg.java | 10 +++++++- .../froilansfarm/crops/Potato.java | 5 +++- .../froilansfarm/crops/Tomato.java | 5 +++- .../froilansfarm/EarCornTest.java | 19 ++++++++++++++ .../froilansfarm/EdibleTest.java | 25 +++++++++++++++++++ .../froilansfarm/EggTest.java | 18 +++++++++++++ .../froilansfarm/PotatoTest.java | 19 ++++++++++++++ .../froilansfarm/TomatoTest.java | 18 +++++++++++++ 13 files changed, 139 insertions(+), 5 deletions(-) create mode 100644 src/test/java/com/zipcodewilmington/froilansfarm/EarCornTest.java create mode 100644 src/test/java/com/zipcodewilmington/froilansfarm/EdibleTest.java create mode 100644 src/test/java/com/zipcodewilmington/froilansfarm/EggTest.java create mode 100644 src/test/java/com/zipcodewilmington/froilansfarm/PotatoTest.java create mode 100644 src/test/java/com/zipcodewilmington/froilansfarm/TomatoTest.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/com/zipcodewilmington/froilansfarm/animals/Eater.java b/src/main/java/com/zipcodewilmington/froilansfarm/animals/Eater.java index 3808b744..486f989e 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/animals/Eater.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/animals/Eater.java @@ -1,4 +1,8 @@ package com.zipcodewilmington.froilansfarm.animals; +import com.zipcodewilmington.froilansfarm.crops.Edible; + public interface Eater { + + public void eat(Edible food); } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/crops/CornStalk.java b/src/main/java/com/zipcodewilmington/froilansfarm/crops/CornStalk.java index b744dd09..ba128d0f 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/crops/CornStalk.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/crops/CornStalk.java @@ -1,4 +1,7 @@ package com.zipcodewilmington.froilansfarm.crops; -public class CornStalk { +public class CornStalk implements Edible{ + public boolean IsEdible() { + return true; + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/crops/EarCorn.java b/src/main/java/com/zipcodewilmington/froilansfarm/crops/EarCorn.java index 8dfd382b..cc818f39 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/crops/EarCorn.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/crops/EarCorn.java @@ -1,4 +1,7 @@ package com.zipcodewilmington.froilansfarm.crops; -public class EarCorn { +public class EarCorn implements Edible{ + public boolean IsEdible() { + return true; + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/crops/Edible.java b/src/main/java/com/zipcodewilmington/froilansfarm/crops/Edible.java index 391520fb..30e489ee 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/crops/Edible.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/crops/Edible.java @@ -1,4 +1,7 @@ package com.zipcodewilmington.froilansfarm.crops; public interface Edible { + + public boolean IsEdible(); //check if food is edible or not + } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/crops/Egg.java b/src/main/java/com/zipcodewilmington/froilansfarm/crops/Egg.java index 377d8b84..2632add1 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/crops/Egg.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/crops/Egg.java @@ -1,4 +1,12 @@ package com.zipcodewilmington.froilansfarm.crops; -public class Egg { +public class Egg implements Edible{ + public boolean IsEdible() { + return true; + } + + public boolean isInedibleEgg() { + return false; + } + } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/crops/Potato.java b/src/main/java/com/zipcodewilmington/froilansfarm/crops/Potato.java index 1500668a..cd1e26bd 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/crops/Potato.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/crops/Potato.java @@ -1,4 +1,7 @@ package com.zipcodewilmington.froilansfarm.crops; -public class Potato { +public class Potato implements Edible { + public boolean IsEdible() { + return true; + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/crops/Tomato.java b/src/main/java/com/zipcodewilmington/froilansfarm/crops/Tomato.java index 7c678a19..b024f794 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/crops/Tomato.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/crops/Tomato.java @@ -1,4 +1,7 @@ package com.zipcodewilmington.froilansfarm.crops; -public class Tomato { +public class Tomato implements Edible{ + public boolean IsEdible() { + return true; + } } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/EarCornTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/EarCornTest.java new file mode 100644 index 00000000..9f531ff9 --- /dev/null +++ b/src/test/java/com/zipcodewilmington/froilansfarm/EarCornTest.java @@ -0,0 +1,19 @@ +package com.zipcodewilmington.froilansfarm; + +import com.zipcodewilmington.froilansfarm.crops.EarCorn; +import org.junit.Assert; +import org.junit.Test; + +public class EarCornTest { + + @Test + public void earCornIsEdibleTest() { + EarCorn edibleEarCorn = new EarCorn(); + + boolean expected = true; + boolean actual = edibleEarCorn.IsEdible(); + + Assert.assertEquals(expected, actual); + } + +} diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/EdibleTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/EdibleTest.java new file mode 100644 index 00000000..7555abee --- /dev/null +++ b/src/test/java/com/zipcodewilmington/froilansfarm/EdibleTest.java @@ -0,0 +1,25 @@ +package com.zipcodewilmington.froilansfarm; + +import com.sun.org.apache.xpath.internal.operations.Bool; +import com.zipcodewilmington.froilansfarm.crops.Egg; +import com.zipcodewilmington.froilansfarm.crops.Potato; +import com.zipcodewilmington.froilansfarm.crops.Tomato; +import com.zipcodewilmington.froilansfarm.crops.TomatoPlant; +import org.junit.Test; + +public class EdibleTest { + + @Test + public void EdibleFoodTest() { + Egg edibleEgg = new Egg(); + Egg inedibleEgg = new Egg(); + inedibleEgg.isInedibleEgg(); + + Boolean expected = true; + Boolean actual = edibleEgg.IsEdible(); + + inedibleEgg.isInedibleEgg(); + Boolean expected2 = false; + Boolean actual2 = inedibleEgg.isInedibleEgg(); + } +} diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/EggTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/EggTest.java new file mode 100644 index 00000000..8f7c312e --- /dev/null +++ b/src/test/java/com/zipcodewilmington/froilansfarm/EggTest.java @@ -0,0 +1,18 @@ +package com.zipcodewilmington.froilansfarm; + +import com.zipcodewilmington.froilansfarm.crops.Egg; +import org.junit.Assert; +import org.junit.Test; + +public class EggTest { + + @Test + public void EggIsEdibleTest(){ + Egg edibleEgg = new Egg(); + + Boolean expected = true; + Boolean actual = edibleEgg.IsEdible(); + + Assert.assertEquals(expected, actual); + } +} diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/PotatoTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/PotatoTest.java new file mode 100644 index 00000000..67719fa1 --- /dev/null +++ b/src/test/java/com/zipcodewilmington/froilansfarm/PotatoTest.java @@ -0,0 +1,19 @@ +package com.zipcodewilmington.froilansfarm; + +import com.zipcodewilmington.froilansfarm.crops.Potato; +import org.junit.Assert; +import org.junit.Test; + +public class PotatoTest { + + @Test + public void PotatoIsEdibleTest() { + Potato ediblePotato = new Potato(); + + Boolean expected = true; + Boolean actual = ediblePotato.IsEdible(); + + Assert.assertEquals(expected, actual); + } + +} diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/TomatoTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/TomatoTest.java new file mode 100644 index 00000000..e5776479 --- /dev/null +++ b/src/test/java/com/zipcodewilmington/froilansfarm/TomatoTest.java @@ -0,0 +1,18 @@ +package com.zipcodewilmington.froilansfarm; + +import com.zipcodewilmington.froilansfarm.crops.EarCorn; +import com.zipcodewilmington.froilansfarm.crops.Tomato; +import org.junit.Assert; +import org.junit.Test; + +public class TomatoTest { + @Test + public void TomatoIsEdibleTest() { + Tomato edibleTomato = new Tomato(); + + boolean expected = true; + boolean actual = edibleTomato.IsEdible(); + + Assert.assertEquals(expected, actual); + } +} From dafb3a739528945e2797d9df8809cb02839ca912 Mon Sep 17 00:00:00 2001 From: Bobbi-Z <85585077+Bobbi-Z@users.noreply.github.com> Date: Thu, 22 Jul 2021 20:46:07 -0400 Subject: [PATCH 04/26] updates --- pom.xml | 27 ++++++++++++++++++- .../froilansfarm/Froilan.java | 4 ++- .../froilansfarm/Froilanda.java | 4 ++- .../froilansfarm/NoiseMaker.java | 2 ++ .../froilansfarm/Rideable.java | 4 ++- .../froilansfarm/animals/Animal.java | 4 ++- .../froilansfarm/animals/Chicken.java | 7 ++++- .../froilansfarm/animals/Horse.java | 13 ++++++++- .../froilansfarm/animals/person/Botanist.java | 6 ++++- .../froilansfarm/animals/person/Farmer.java | 18 ++++++++++++- .../froilansfarm/animals/person/Person.java | 7 ++++- .../froilansfarm/animals/person/Pilot.java | 2 +- .../froilansfarm/animals/person/Rider.java | 9 +++++++ .../froilansfarm/MainApplicationTest.java | 3 +++ 14 files changed, 99 insertions(+), 11 deletions(-) create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/animals/person/Rider.java diff --git a/pom.xml b/pom.xml index 69a3b878..64bcf407 100644 --- a/pom.xml +++ b/pom.xml @@ -4,9 +4,34 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 + com.zipcodewilmington froilans-farm 1.0-SNAPSHOT - + + + + org.junit.jupiter + junit-jupiter-engine + 5.4.2 + test + + + org.junit.jupiter + junit-jupiter-api + 5.4.2 + test + + + org.apache.commons + commons-lang3 + 3.12.0 + + + org.apache.commons + commons-math3 + 3.6.1 + + \ No newline at end of file diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Froilan.java b/src/main/java/com/zipcodewilmington/froilansfarm/Froilan.java index 1092e9ec..aa7c26c8 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Froilan.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Froilan.java @@ -1,4 +1,6 @@ package com.zipcodewilmington.froilansfarm; -public class Froilan { +import com.zipcodewilmington.froilansfarm.animals.person.Farmer; + +public class Froilan extends Farmer { } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Froilanda.java b/src/main/java/com/zipcodewilmington/froilansfarm/Froilanda.java index a1d0cb13..b8d37da6 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Froilanda.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Froilanda.java @@ -1,4 +1,6 @@ package com.zipcodewilmington.froilansfarm; -public class Froilanda { +import com.zipcodewilmington.froilansfarm.animals.person.Pilot; + +public class Froilanda extends Pilot { } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/NoiseMaker.java b/src/main/java/com/zipcodewilmington/froilansfarm/NoiseMaker.java index a8d66041..8db71148 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/NoiseMaker.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/NoiseMaker.java @@ -1,4 +1,6 @@ package com.zipcodewilmington.froilansfarm; public interface NoiseMaker { + String makeNoise(); + } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Rideable.java b/src/main/java/com/zipcodewilmington/froilansfarm/Rideable.java index eabd3875..e27809d7 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Rideable.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Rideable.java @@ -1,4 +1,6 @@ package com.zipcodewilmington.froilansfarm; -public interface Rideable { +public interface Rideable { + void move(); + } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/animals/Animal.java b/src/main/java/com/zipcodewilmington/froilansfarm/animals/Animal.java index a85711aa..a6d50a73 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/animals/Animal.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/animals/Animal.java @@ -1,5 +1,7 @@ package com.zipcodewilmington.froilansfarm.animals; -public abstract class Animal { +import com.zipcodewilmington.froilansfarm.NoiseMaker; + +public abstract class Animal implements NoiseMaker, Eater { } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/animals/Chicken.java b/src/main/java/com/zipcodewilmington/froilansfarm/animals/Chicken.java index 7ee81e26..f835ce9f 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/animals/Chicken.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/animals/Chicken.java @@ -1,4 +1,9 @@ package com.zipcodewilmington.froilansfarm.animals; -public class Chicken { +import com.zipcodewilmington.froilansfarm.farm.Produce; + +public class Chicken extends Animal implements Produce { + public String makeNoise() { + return null; + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/animals/Horse.java b/src/main/java/com/zipcodewilmington/froilansfarm/animals/Horse.java index 50539ff3..f261981e 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/animals/Horse.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/animals/Horse.java @@ -1,4 +1,15 @@ package com.zipcodewilmington.froilansfarm.animals; -public class Horse { +import com.zipcodewilmington.froilansfarm.Rideable; + +public class Horse extends Animal implements Rideable { + public String makeNoise() { + return null; + } + + public void move() { + + } + + } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/animals/person/Botanist.java b/src/main/java/com/zipcodewilmington/froilansfarm/animals/person/Botanist.java index 8ddc1f1c..52f38323 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/animals/person/Botanist.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/animals/person/Botanist.java @@ -1,4 +1,8 @@ package com.zipcodewilmington.froilansfarm.animals.person; -public class Botanist { +import com.zipcodewilmington.froilansfarm.crops.Crop; +import com.zipcodewilmington.froilansfarm.farm.CropRow; + +public interface Botanist { + void plant(Crop crop, CropRow row); } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/animals/person/Farmer.java b/src/main/java/com/zipcodewilmington/froilansfarm/animals/person/Farmer.java index f3543da2..1bd15ee5 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/animals/person/Farmer.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/animals/person/Farmer.java @@ -1,4 +1,20 @@ package com.zipcodewilmington.froilansfarm.animals.person; -public class Farmer { +import com.zipcodewilmington.froilansfarm.Rideable; +import com.zipcodewilmington.froilansfarm.crops.Crop; +import com.zipcodewilmington.froilansfarm.farm.CropRow; + +public class Farmer extends Person implements Rider, Botanist { + + public void mount(Rideable rideable) { + + } + + public void dismount() { + + } + + public void plant(Crop crop, CropRow row) { + + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/animals/person/Person.java b/src/main/java/com/zipcodewilmington/froilansfarm/animals/person/Person.java index 0d900aad..fd2abb95 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/animals/person/Person.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/animals/person/Person.java @@ -1,4 +1,9 @@ package com.zipcodewilmington.froilansfarm.animals.person; -public class Person { +import com.zipcodewilmington.froilansfarm.animals.Animal; + +public class Person extends Animal { + public String makeNoise() { + return null; + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/animals/person/Pilot.java b/src/main/java/com/zipcodewilmington/froilansfarm/animals/person/Pilot.java index c923a710..5e94a3a5 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/animals/person/Pilot.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/animals/person/Pilot.java @@ -1,4 +1,4 @@ package com.zipcodewilmington.froilansfarm.animals.person; -public class Pilot { +public class Pilot { } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/animals/person/Rider.java b/src/main/java/com/zipcodewilmington/froilansfarm/animals/person/Rider.java new file mode 100644 index 00000000..ad82d791 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/animals/person/Rider.java @@ -0,0 +1,9 @@ +package com.zipcodewilmington.froilansfarm.animals.person; + +import com.zipcodewilmington.froilansfarm.Rideable; + +public interface Rider { + void mount(Rideable rideable); + void dismount(); + +} diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/MainApplicationTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/MainApplicationTest.java index 1a971b7f..27025773 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/MainApplicationTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/MainApplicationTest.java @@ -1,7 +1,10 @@ package com.zipcodewilmington.froilansfarm; + + /** * Created by leon on 2/26/18. */ public class MainApplicationTest { + } From fd219675994bf6672e42178964fea4b03d760512 Mon Sep 17 00:00:00 2001 From: Zachary Kitto Date: Thu, 22 Jul 2021 20:50:42 -0400 Subject: [PATCH 05/26] Added Farm & Shelter classes --- pom.xml | 20 +++++ .../froilansfarm/animals/Chicken.java | 2 +- .../froilansfarm/animals/Horse.java | 2 +- .../froilansfarm/animals/person/Person.java | 4 +- .../froilansfarm/farm/ChickenCoop.java | 13 ++- .../froilansfarm/farm/Farm.java | 43 +++++++++ .../froilansfarm/farm/FarmBuilder.java | 43 +++++++++ .../froilansfarm/farm/FarmHouse.java | 13 ++- .../froilansfarm/farm/Shelter.java | 28 +++++- .../froilansfarm/farm/Stable.java | 13 ++- .../froilansfarm/farm/FarmTest.java | 35 ++++++++ .../froilansfarm/farm/ShelterTest.java | 90 +++++++++++++++++++ 12 files changed, 299 insertions(+), 7 deletions(-) create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/farm/Farm.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/farm/FarmBuilder.java create mode 100644 src/test/java/com/zipcodewilmington/froilansfarm/farm/FarmTest.java create mode 100644 src/test/java/com/zipcodewilmington/froilansfarm/farm/ShelterTest.java diff --git a/pom.xml b/pom.xml index 69a3b878..dea76e3e 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 + + 7 + 7 + + + + + + + junit + junit + 4.13.1 + test + + \ No newline at end of file diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/animals/Chicken.java b/src/main/java/com/zipcodewilmington/froilansfarm/animals/Chicken.java index 7ee81e26..00635b75 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/animals/Chicken.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/animals/Chicken.java @@ -1,4 +1,4 @@ package com.zipcodewilmington.froilansfarm.animals; -public class Chicken { +public class Chicken extends Animal{ } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/animals/Horse.java b/src/main/java/com/zipcodewilmington/froilansfarm/animals/Horse.java index 50539ff3..c22e2c9d 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/animals/Horse.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/animals/Horse.java @@ -1,4 +1,4 @@ package com.zipcodewilmington.froilansfarm.animals; -public class Horse { +public class Horse extends Animal { } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/animals/person/Person.java b/src/main/java/com/zipcodewilmington/froilansfarm/animals/person/Person.java index 0d900aad..5ec1756b 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/animals/person/Person.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/animals/person/Person.java @@ -1,4 +1,6 @@ package com.zipcodewilmington.froilansfarm.animals.person; -public class Person { +import com.zipcodewilmington.froilansfarm.animals.Animal; + +public class Person extends Animal { } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/farm/ChickenCoop.java b/src/main/java/com/zipcodewilmington/froilansfarm/farm/ChickenCoop.java index d6a09640..2dab2b8e 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/farm/ChickenCoop.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/farm/ChickenCoop.java @@ -1,4 +1,15 @@ package com.zipcodewilmington.froilansfarm.farm; -public class ChickenCoop { +import com.zipcodewilmington.froilansfarm.animals.Chicken; + +import java.util.List; + +public class ChickenCoop extends Shelter { + + public ChickenCoop() { + } + + public ChickenCoop(List chickens) { + super.setAnimals(chickens); + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/farm/Farm.java b/src/main/java/com/zipcodewilmington/froilansfarm/farm/Farm.java new file mode 100644 index 00000000..e749a8cf --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/farm/Farm.java @@ -0,0 +1,43 @@ +package com.zipcodewilmington.froilansfarm.farm; + +import com.zipcodewilmington.froilansfarm.vehicle.Vehicle; + +import java.util.List; + +public class Farm { + + List farmhouses; + List stables; + List chickenCoops; + List fields; + List vehicles; + + public Farm(List farmhouses, List stables, List chickenCoops, List fields, List vehicles) { + this.farmhouses = farmhouses; + this.stables = stables; + this.chickenCoops = chickenCoops; + this.fields = fields; + this.vehicles = vehicles; + } + + public List getFarmhouses() { + return farmhouses; + } + + public List getStables() { + return stables; + } + + public List getChickenCoops() { + return chickenCoops; + } + + public List getFields() { + return fields; + } + + public List getVehicles() { + return vehicles; + } +} + diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/farm/FarmBuilder.java b/src/main/java/com/zipcodewilmington/froilansfarm/farm/FarmBuilder.java new file mode 100644 index 00000000..febbd760 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/farm/FarmBuilder.java @@ -0,0 +1,43 @@ +package com.zipcodewilmington.froilansfarm.farm; + +import com.zipcodewilmington.froilansfarm.vehicle.Vehicle; + +import java.util.List; + +public class FarmBuilder { + + private List farmhouses; + private List stables; + private List chickenCoops; + private List fields; + private List vehicles; + + public FarmBuilder setFarmhouses(List farmhouses) { + this.farmhouses = farmhouses; + return this; + } + + public FarmBuilder setStables(List stables) { + this.stables = stables; + return this; + } + + public FarmBuilder setChickenCoops(List chickenCoops) { + this.chickenCoops = chickenCoops; + return this; + } + + public FarmBuilder setFields(List fields) { + this.fields = fields; + return this; + } + + public FarmBuilder setVehicles(List vehicles) { + this.vehicles = vehicles; + return this; + } + + public Farm build() { + return new Farm(farmhouses, stables, chickenCoops, fields, vehicles); + } +} \ No newline at end of file diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/farm/FarmHouse.java b/src/main/java/com/zipcodewilmington/froilansfarm/farm/FarmHouse.java index 8874155c..492fb309 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/farm/FarmHouse.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/farm/FarmHouse.java @@ -1,4 +1,15 @@ package com.zipcodewilmington.froilansfarm.farm; -public class FarmHouse { +import com.zipcodewilmington.froilansfarm.animals.person.Person; + +import java.util.List; + +public class FarmHouse extends Shelter { + + public FarmHouse() { + } + + public FarmHouse(List people) { + super.setAnimals(people); + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/farm/Shelter.java b/src/main/java/com/zipcodewilmington/froilansfarm/farm/Shelter.java index 69128235..7a424642 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/farm/Shelter.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/farm/Shelter.java @@ -1,4 +1,30 @@ package com.zipcodewilmington.froilansfarm.farm; -public abstract class Shelter { +import com.zipcodewilmington.froilansfarm.animals.Animal; + +import java.util.*; + +public abstract class Shelter { + + private List animals = new ArrayList<>(); + + public void add(SomeType animal) { + animals.add(animal); + } + + public void remove(SomeType animal) { + animals.remove(animal); + } + + public Integer getNumberOfAnimals() { + return animals.size(); + } + + public List getAnimals() { + return animals; + } + + public void setAnimals(List animals) { + this.animals = animals; + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/farm/Stable.java b/src/main/java/com/zipcodewilmington/froilansfarm/farm/Stable.java index f6776f00..c2afafde 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/farm/Stable.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/farm/Stable.java @@ -1,4 +1,15 @@ package com.zipcodewilmington.froilansfarm.farm; -public class Stable { +import com.zipcodewilmington.froilansfarm.animals.Horse; + +import java.util.List; + +public class Stable extends Shelter { + + public Stable() { + } + + public Stable(List horses) { + super.setAnimals(horses); + } } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/farm/FarmTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/farm/FarmTest.java new file mode 100644 index 00000000..c572bda7 --- /dev/null +++ b/src/test/java/com/zipcodewilmington/froilansfarm/farm/FarmTest.java @@ -0,0 +1,35 @@ +package com.zipcodewilmington.froilansfarm.farm; + +import com.zipcodewilmington.froilansfarm.vehicle.Vehicle; +import org.junit.Assert; +import org.junit.Test; + +import java.util.*; + +public class FarmTest { + + @Test + public void constructorTest() { + // Given + List expectedFarmhouses = new ArrayList<>(Arrays.asList(new FarmHouse())); + List expectedStables = new ArrayList<>(Arrays.asList(new Stable())); + List expectedChickenCoops = new ArrayList<>(Arrays.asList(new ChickenCoop())); + List expectedFields = new ArrayList<>(Arrays.asList(new Field())); + List expectedVehicles = new ArrayList<>(Arrays.asList(new Vehicle())); + + // When + Farm farm = new FarmBuilder().setFarmhouses(expectedFarmhouses).setStables(expectedStables).setChickenCoops(expectedChickenCoops).setFields(expectedFields).setVehicles(expectedVehicles).build(); + List actualFarmhouses = farm.getFarmhouses(); + List actualStables = farm.getStables(); + List actualChickenCoops = farm.getChickenCoops(); + List actualFields = farm.getFields(); + List actualVehicles = farm.getVehicles(); + + // Then + Assert.assertEquals(expectedFarmhouses, actualFarmhouses); + Assert.assertEquals(expectedStables, actualStables); + Assert.assertEquals(expectedChickenCoops, actualChickenCoops); + Assert.assertEquals(expectedFields, actualFields); + Assert.assertEquals(expectedVehicles, actualVehicles); + } +} diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/farm/ShelterTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/farm/ShelterTest.java new file mode 100644 index 00000000..420522ee --- /dev/null +++ b/src/test/java/com/zipcodewilmington/froilansfarm/farm/ShelterTest.java @@ -0,0 +1,90 @@ +package com.zipcodewilmington.froilansfarm.farm; + +import com.zipcodewilmington.froilansfarm.animals.Chicken; +import com.zipcodewilmington.froilansfarm.animals.Horse; +import com.zipcodewilmington.froilansfarm.animals.person.Person; +import com.zipcodewilmington.froilansfarm.vehicle.Vehicle; +import org.junit.Assert; +import org.junit.Test; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +public class ShelterTest { + + @Test + public void chickenCoopConstructorTest() { + // Given + List expectedChickens = new ArrayList<>(Arrays.asList(new Chicken(), new Chicken(), new Chicken(), new Chicken())); + ChickenCoop chickenCoop = new ChickenCoop(expectedChickens); + + + // When + List actualChickens = chickenCoop.getAnimals(); + + // Then + Assert.assertEquals(expectedChickens, actualChickens); + } + + @Test + public void stableConstructorTest() { + // Given + List expectedHorses = new ArrayList<>(Arrays.asList(new Horse(), new Horse(), new Horse(), new Horse())); + Stable stable = new Stable(expectedHorses); + + + // When + List actualHorses = stable.getAnimals(); + + // Then + Assert.assertEquals(expectedHorses, actualHorses); + } + + @Test + public void farmHouseConstructorTest() { + // Given + List expectedPeople = new ArrayList<>(Arrays.asList(new Person(), new Person(), new Person(), new Person())); + FarmHouse farmHouse = new FarmHouse(expectedPeople); + + + // When + List actualPeople = farmHouse.getAnimals(); + + // Then + Assert.assertEquals(expectedPeople, actualPeople); + } + + @Test + public void addTest() { + // Given + Person expectedPerson = new Person(); + FarmHouse farmHouse = new FarmHouse(); + + + // When + farmHouse.add(expectedPerson); + List people = farmHouse.getAnimals(); + Person actualPerson = people.get(0); + + // Then + Assert.assertEquals(expectedPerson, actualPerson); + } + + @Test + public void removeTest() { + // Given + Person person1 = new Person(); + Person person2 = new Person(); + FarmHouse farmHouse = new FarmHouse(new ArrayList<>(Arrays.asList(person1, person2))); + Integer expectedNumberOfPeople = 1; + + + // When + farmHouse.remove(person1); + Integer actualNumberOfPeople = farmHouse.getNumberOfAnimals(); + + // Then + Assert.assertEquals(expectedNumberOfPeople, actualNumberOfPeople); + } +} From ee743133e5108066191a2809a736f76d506e1ef7 Mon Sep 17 00:00:00 2001 From: Nisha Date: Thu, 22 Jul 2021 21:02:56 -0400 Subject: [PATCH 06/26] Added some stuff --- pom.xml | 33 ++++++++++++++++++- .../froilansfarm/vehicle/Aircraft.java | 11 ++++++- .../froilansfarm/vehicle/CropDuster.java | 14 +++++++- .../froilansfarm/vehicle/FarmVehicle.java | 7 +++- .../froilansfarm/vehicle/Tractor.java | 9 ++++- .../froilansfarm/vehicle/Vehicle.java | 5 ++- .../froilansfarm/vehicle/AircraftTest.java | 19 +++++++++++ .../froilansfarm/vehicle/CropDusterTest.java | 19 +++++++++++ .../froilansfarm/vehicle/FarmVehicleTest.java | 14 ++++++++ 9 files changed, 125 insertions(+), 6 deletions(-) create mode 100644 src/test/java/com/zipcodewilmington/froilansfarm/vehicle/AircraftTest.java create mode 100644 src/test/java/com/zipcodewilmington/froilansfarm/vehicle/CropDusterTest.java create mode 100644 src/test/java/com/zipcodewilmington/froilansfarm/vehicle/FarmVehicleTest.java diff --git a/pom.xml b/pom.xml index 69a3b878..1ed9d46e 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,38 @@ com.zipcodewilmington froilans-farm - 1.0-SNAPSHOT + 1.0-SNAPSHOTorg.apache.maven.pluginsmaven-compiler-plugin88 + + org.apache.maven.plugins + maven-compiler-plugin + + 8 + 8 + + + + org.apache.maven.plugins + maven-compiler-plugin + + 8 + 8 + + + + + + junit + junit + RELEASE + test + + + org.junit.jupiter + junit-jupiter + RELEASE + test + + \ No newline at end of file diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/Aircraft.java b/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/Aircraft.java index c2e20a68..1b72e989 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/Aircraft.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/Aircraft.java @@ -1,4 +1,13 @@ package com.zipcodewilmington.froilansfarm.vehicle; -public class Aircraft { +public abstract class Aircraft implements FarmVehicle { + + + public void fly(){ + + } + public void operate(Object vehicle) { + + } + } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/CropDuster.java b/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/CropDuster.java index 11e650b6..6da34b5a 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/CropDuster.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/CropDuster.java @@ -1,4 +1,16 @@ package com.zipcodewilmington.froilansfarm.vehicle; -public class CropDuster { +import com.zipcodewilmington.froilansfarm.farm.CropRow; + +public class CropDuster implements FarmVehicle { + + + + public void fertilize(CropRow row){ + + } + + public void operate(Object vehicle) { + + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/FarmVehicle.java b/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/FarmVehicle.java index 1332dde8..16d557ee 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/FarmVehicle.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/FarmVehicle.java @@ -1,4 +1,9 @@ package com.zipcodewilmington.froilansfarm.vehicle; -public interface FarmVehicle { +public interface FarmVehicle { + + + public default void operate(T vehicle){ + + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/Tractor.java b/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/Tractor.java index 4aada1c0..e6822d4c 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/Tractor.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/Tractor.java @@ -1,4 +1,11 @@ package com.zipcodewilmington.froilansfarm.vehicle; -public class Tractor { +import com.zipcodewilmington.froilansfarm.crops.Crop; + +public class Tractor implements FarmVehicle{ + + @Override + public void operate(Object vehicle) { + + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/Vehicle.java b/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/Vehicle.java index 8b5f6f25..2e10aaa7 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/Vehicle.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/Vehicle.java @@ -1,4 +1,7 @@ package com.zipcodewilmington.froilansfarm.vehicle; -public class Vehicle { +import com.zipcodewilmington.froilansfarm.NoiseMaker; +import com.zipcodewilmington.froilansfarm.Rideable; + +public abstract class Vehicle implements NoiseMaker, Rideable { } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/vehicle/AircraftTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/vehicle/AircraftTest.java new file mode 100644 index 00000000..0f3131ea --- /dev/null +++ b/src/test/java/com/zipcodewilmington/froilansfarm/vehicle/AircraftTest.java @@ -0,0 +1,19 @@ +package com.zipcodewilmington.froilansfarm.vehicle; + +import org.junit.Test; + +import static org.junit.jupiter.api.Assertions.*; + +class AircraftTest { + + @Test + void operateTest() { + + + + + + + + } +} \ No newline at end of file diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/vehicle/CropDusterTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/vehicle/CropDusterTest.java new file mode 100644 index 00000000..f5d36bdd --- /dev/null +++ b/src/test/java/com/zipcodewilmington/froilansfarm/vehicle/CropDusterTest.java @@ -0,0 +1,19 @@ +package com.zipcodewilmington.froilansfarm.vehicle; + +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.*; + +class CropDusterTest { + + @Test + void fertilize() { + CropDuster cropDus = new CropDuster(); + + + } + + @Test + void operate() { + } +} \ No newline at end of file diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/vehicle/FarmVehicleTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/vehicle/FarmVehicleTest.java new file mode 100644 index 00000000..3c7787a8 --- /dev/null +++ b/src/test/java/com/zipcodewilmington/froilansfarm/vehicle/FarmVehicleTest.java @@ -0,0 +1,14 @@ +package com.zipcodewilmington.froilansfarm.vehicle; + +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.*; + +class FarmVehicleTest { + + + @Test + void operate() { + + } +} \ No newline at end of file From 9ce86556370fd3cb3cd38629835ba12f7c6632c6 Mon Sep 17 00:00:00 2001 From: MannyMb Date: Thu, 22 Jul 2021 21:07:54 -0400 Subject: [PATCH 07/26] adding some stuff --- .../froilansfarm/crops/CornStalk.java | 6 +++--- .../froilansfarm/crops/Crop.java | 16 +++++++++++++++- .../froilansfarm/crops/PotatoRoot.java | 7 ++++++- .../froilansfarm/crops/TomatoPlant.java | 5 ++++- .../froilansfarm/farm/CropRow.java | 5 ++++- .../froilansfarm/farm/Field.java | 1 + .../froilansfarm/farm/Produce.java | 4 ++++ 7 files changed, 37 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/crops/CornStalk.java b/src/main/java/com/zipcodewilmington/froilansfarm/crops/CornStalk.java index ba128d0f..3a0dba67 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/crops/CornStalk.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/crops/CornStalk.java @@ -1,7 +1,7 @@ package com.zipcodewilmington.froilansfarm.crops; -public class CornStalk implements Edible{ - public boolean IsEdible() { - return true; +public class CornStalk extends Crop{ + public void yield() { + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/crops/Crop.java b/src/main/java/com/zipcodewilmington/froilansfarm/crops/Crop.java index 81347caf..2dee9fd1 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/crops/Crop.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/crops/Crop.java @@ -1,4 +1,18 @@ package com.zipcodewilmington.froilansfarm.crops; -public abstract class Crop { +import com.zipcodewilmington.froilansfarm.farm.Produce; + +public abstract class Crop implements Produce { + + public boolean hasBeenFertilized() { + return false; + } + + public void addCrop() { + // crop.add(); + } + + public void removeCrop() { + // crop.remove(); + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/crops/PotatoRoot.java b/src/main/java/com/zipcodewilmington/froilansfarm/crops/PotatoRoot.java index 49109536..8f2ea5a5 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/crops/PotatoRoot.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/crops/PotatoRoot.java @@ -1,4 +1,9 @@ package com.zipcodewilmington.froilansfarm.crops; -public class PotatoRoot { +public class PotatoRoot extends Crop { + + public void yield() { + + } + } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/crops/TomatoPlant.java b/src/main/java/com/zipcodewilmington/froilansfarm/crops/TomatoPlant.java index 4436221a..2a90814a 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/crops/TomatoPlant.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/crops/TomatoPlant.java @@ -1,4 +1,7 @@ package com.zipcodewilmington.froilansfarm.crops; -public class TomatoPlant { +public class TomatoPlant extends Crop{ + public void yield() { + + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/farm/CropRow.java b/src/main/java/com/zipcodewilmington/froilansfarm/farm/CropRow.java index 3eee84f8..7e3d8d58 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/farm/CropRow.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/farm/CropRow.java @@ -1,4 +1,7 @@ package com.zipcodewilmington.froilansfarm.farm; -public class CropRow { +import com.zipcodewilmington.froilansfarm.crops.Crop; + +public class CropRow { + } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/farm/Field.java b/src/main/java/com/zipcodewilmington/froilansfarm/farm/Field.java index 56cfcdf3..83c3a10d 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/farm/Field.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/farm/Field.java @@ -1,4 +1,5 @@ package com.zipcodewilmington.froilansfarm.farm; public class Field { + } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/farm/Produce.java b/src/main/java/com/zipcodewilmington/froilansfarm/farm/Produce.java index 9bef91f0..63451f05 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/farm/Produce.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/farm/Produce.java @@ -1,4 +1,8 @@ package com.zipcodewilmington.froilansfarm.farm; public interface Produce { + + void yield(); + + boolean hasBeenFertilized(); } From 8fe133a79c5db26184dde31e01bd6a0d0a0a8b67 Mon Sep 17 00:00:00 2001 From: Bobbi-Z <85585077+Bobbi-Z@users.noreply.github.com> Date: Thu, 22 Jul 2021 21:49:19 -0400 Subject: [PATCH 08/26] getting details hammered out --- .../java/com/zipcodewilmington/froilansfarm/Froilanda.java | 6 +++++- .../java/com/zipcodewilmington/froilansfarm/Rideable.java | 4 +++- .../froilansfarm/animals/person/Pilot.java | 3 ++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Froilanda.java b/src/main/java/com/zipcodewilmington/froilansfarm/Froilanda.java index b8d37da6..475bc69f 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Froilanda.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Froilanda.java @@ -1,6 +1,10 @@ package com.zipcodewilmington.froilansfarm; +import com.zipcodewilmington.froilansfarm.animals.person.Person; import com.zipcodewilmington.froilansfarm.animals.person.Pilot; -public class Froilanda extends Pilot { +public class Froilanda extends Person implements Pilot { + public void fly() { + + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Rideable.java b/src/main/java/com/zipcodewilmington/froilansfarm/Rideable.java index e27809d7..04cbd392 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Rideable.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Rideable.java @@ -1,6 +1,8 @@ package com.zipcodewilmington.froilansfarm; -public interface Rideable { +import com.zipcodewilmington.froilansfarm.animals.person.Rider; + +public interface Rideable { void move(); } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/animals/person/Pilot.java b/src/main/java/com/zipcodewilmington/froilansfarm/animals/person/Pilot.java index 5e94a3a5..d3551fe7 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/animals/person/Pilot.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/animals/person/Pilot.java @@ -1,4 +1,5 @@ package com.zipcodewilmington.froilansfarm.animals.person; -public class Pilot { +public interface Pilot { + void fly(); } From 0d5904ce63a46cf47fa178e898cfc95f8c338e6f Mon Sep 17 00:00:00 2001 From: MannyMb Date: Thu, 22 Jul 2021 23:22:14 -0400 Subject: [PATCH 09/26] adding some stuff to crop abstract --- .../froilansfarm/crops/CornStalk.java | 9 +++++-- .../froilansfarm/crops/Crop.java | 25 ++++++++++++++----- .../froilansfarm/crops/PotatoRoot.java | 9 ++++--- .../froilansfarm/crops/TomatoPlant.java | 9 +++++-- .../froilansfarm/farm/CropRow.java | 4 +-- .../froilansfarm/farm/Produce.java | 6 +++-- 6 files changed, 44 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/crops/CornStalk.java b/src/main/java/com/zipcodewilmington/froilansfarm/crops/CornStalk.java index 3a0dba67..da9c8483 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/crops/CornStalk.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/crops/CornStalk.java @@ -1,7 +1,12 @@ package com.zipcodewilmington.froilansfarm.crops; -public class CornStalk extends Crop{ - public void yield() { +public class CornStalk extends Crop{ + public CornStalk(boolean hasBeenHarvested, boolean hasBeenFertilized) { + super(hasBeenHarvested, hasBeenFertilized); + } + + protected EarCorn getEdible() { + return new EarCorn(); } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/crops/Crop.java b/src/main/java/com/zipcodewilmington/froilansfarm/crops/Crop.java index 2dee9fd1..0fb24075 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/crops/Crop.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/crops/Crop.java @@ -2,17 +2,30 @@ import com.zipcodewilmington.froilansfarm.farm.Produce; -public abstract class Crop implements Produce { +public abstract class Crop implements Produce { + private boolean hasBeenHarvested; + private boolean hasBeenFertilized; + + public Crop(boolean hasBeenHarvested, boolean hasBeenFertilized) { + this.hasBeenHarvested = hasBeenHarvested; + this.hasBeenFertilized = hasBeenFertilized; + } public boolean hasBeenFertilized() { - return false; + return hasBeenFertilized; } - public void addCrop() { - // crop.add(); + public boolean hasBeenHarvested() { + return hasBeenHarvested; } - public void removeCrop() { - // crop.remove(); + protected abstract someType getEdible(); + + public someType yield() { + if(hasBeenFertilized() && hasBeenHarvested()) { + return getEdible(); + } + return null; } + } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/crops/PotatoRoot.java b/src/main/java/com/zipcodewilmington/froilansfarm/crops/PotatoRoot.java index 8f2ea5a5..a15bce11 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/crops/PotatoRoot.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/crops/PotatoRoot.java @@ -1,9 +1,12 @@ package com.zipcodewilmington.froilansfarm.crops; -public class PotatoRoot extends Crop { - - public void yield() { +public class PotatoRoot extends Crop { + public PotatoRoot(boolean hasBeenHarvested, boolean hasBeenFertilized) { + super(hasBeenHarvested, hasBeenFertilized); } + protected Potato getEdible() { + return new Potato(); + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/crops/TomatoPlant.java b/src/main/java/com/zipcodewilmington/froilansfarm/crops/TomatoPlant.java index 2a90814a..747462ee 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/crops/TomatoPlant.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/crops/TomatoPlant.java @@ -1,7 +1,12 @@ package com.zipcodewilmington.froilansfarm.crops; -public class TomatoPlant extends Crop{ - public void yield() { +public class TomatoPlant extends Crop{ + public TomatoPlant(boolean hasBeenHarvested, boolean hasBeenFertilized) { + super(hasBeenHarvested, hasBeenFertilized); + } + + protected Tomato getEdible() { + return new Tomato(); } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/farm/CropRow.java b/src/main/java/com/zipcodewilmington/froilansfarm/farm/CropRow.java index 7e3d8d58..2b669099 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/farm/CropRow.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/farm/CropRow.java @@ -1,7 +1,5 @@ package com.zipcodewilmington.froilansfarm.farm; -import com.zipcodewilmington.froilansfarm.crops.Crop; - -public class CropRow { +public class CropRow { } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/farm/Produce.java b/src/main/java/com/zipcodewilmington/froilansfarm/farm/Produce.java index 63451f05..82c3f1f2 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/farm/Produce.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/farm/Produce.java @@ -1,8 +1,10 @@ package com.zipcodewilmington.froilansfarm.farm; -public interface Produce { +import com.zipcodewilmington.froilansfarm.crops.Edible; - void yield(); +public interface Produce { + + someType yield(); boolean hasBeenFertilized(); } From b07225551e5bd325f099a6c7f753cb0af4b0bb26 Mon Sep 17 00:00:00 2001 From: MannyMb Date: Fri, 23 Jul 2021 01:08:50 -0400 Subject: [PATCH 10/26] pushing to dev --- pom.xml | 61 +++---------------- .../froilansfarm/animals/Chicken.java | 16 +++++ .../froilansfarm/animals/Horse.java | 5 ++ .../froilansfarm/animals/person/Person.java | 6 ++ .../froilansfarm/crops/CornStalk.java | 2 +- .../froilansfarm/crops/Crop.java | 4 +- .../froilansfarm/crops/PotatoRoot.java | 2 +- .../froilansfarm/crops/TomatoPlant.java | 2 +- .../froilansfarm/EarCornTest.java | 1 + .../cropsTest/AbstractCropTest.java | 5 ++ .../froilansfarm/cropsTest/CornStalkTest.java | 22 +++++++ .../cropsTest/PotatoRootTest.java | 20 ++++++ .../froilansfarm/cropsTest/TomatoPlant.java | 21 +++++++ 13 files changed, 111 insertions(+), 56 deletions(-) create mode 100644 src/test/java/com/zipcodewilmington/froilansfarm/cropsTest/AbstractCropTest.java create mode 100644 src/test/java/com/zipcodewilmington/froilansfarm/cropsTest/CornStalkTest.java create mode 100644 src/test/java/com/zipcodewilmington/froilansfarm/cropsTest/PotatoRootTest.java create mode 100644 src/test/java/com/zipcodewilmington/froilansfarm/cropsTest/TomatoPlant.java diff --git a/pom.xml b/pom.xml index 0bea0881..0d90871e 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ com.zipcodewilmington froilans-farm - 1.0-SNAPSHOTorg.apache.maven.pluginsmaven-compiler-plugin88 + 1.0-SNAPSHOT org.apache.maven.plugins maven-compiler-plugin @@ -17,52 +17,13 @@ 8 - - org.apache.maven.plugins - maven-compiler-plugin - - 8 - 8 - - - - - 1.0-SNAPSHOT - - - - org.apache.maven.plugins - maven-compiler-plugin - - 7 - 7 - - - + - - - junit - junit - RELEASE - test - - - org.junit.jupiter - junit-jupiter - RELEASE - test - - - 4.13.1 - test - - - + junit @@ -70,19 +31,15 @@ 4.13.1 test - - - org.apache.commons - commons-lang3 - 3.12.0 - - org.apache.commons - commons-math3 - 3.6.1 - + org.junit.jupiter + junit-jupiter + RELEASE + test + + \ No newline at end of file diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/animals/Chicken.java b/src/main/java/com/zipcodewilmington/froilansfarm/animals/Chicken.java index 44983fb3..ecc59c6a 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/animals/Chicken.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/animals/Chicken.java @@ -1,10 +1,26 @@ package com.zipcodewilmington.froilansfarm.animals; +import com.zipcodewilmington.froilansfarm.crops.Edible; import com.zipcodewilmington.froilansfarm.farm.Produce; public class Chicken extends Animal implements Produce { public String makeNoise() { return null; } + + @Override + public void eat(Edible food) { + + } + + @Override + public Edible yield() { + return null; + } + + @Override + public boolean hasBeenFertilized() { + return false; + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/animals/Horse.java b/src/main/java/com/zipcodewilmington/froilansfarm/animals/Horse.java index e9322d8f..753df1db 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/animals/Horse.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/animals/Horse.java @@ -2,6 +2,7 @@ import com.zipcodewilmington.froilansfarm.Rideable; +import com.zipcodewilmington.froilansfarm.crops.Edible; public class Horse extends Animal implements Rideable { public String makeNoise() { @@ -13,4 +14,8 @@ public void move() { } + @Override + public void eat(Edible food) { + + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/animals/person/Person.java b/src/main/java/com/zipcodewilmington/froilansfarm/animals/person/Person.java index e976e4ea..faa5cbd3 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/animals/person/Person.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/animals/person/Person.java @@ -1,10 +1,16 @@ package com.zipcodewilmington.froilansfarm.animals.person; import com.zipcodewilmington.froilansfarm.animals.Animal; +import com.zipcodewilmington.froilansfarm.crops.Edible; public class Person extends Animal { public String makeNoise() { return null; } + + @Override + public void eat(Edible food) { + + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/crops/CornStalk.java b/src/main/java/com/zipcodewilmington/froilansfarm/crops/CornStalk.java index da9c8483..972cbdb8 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/crops/CornStalk.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/crops/CornStalk.java @@ -6,7 +6,7 @@ public CornStalk(boolean hasBeenHarvested, boolean hasBeenFertilized) { super(hasBeenHarvested, hasBeenFertilized); } - protected EarCorn getEdible() { + public EarCorn getEdible() { return new EarCorn(); } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/crops/Crop.java b/src/main/java/com/zipcodewilmington/froilansfarm/crops/Crop.java index 0fb24075..ec477550 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/crops/Crop.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/crops/Crop.java @@ -19,7 +19,9 @@ public boolean hasBeenHarvested() { return hasBeenHarvested; } - protected abstract someType getEdible(); + public someType getEdible() { + return null; + } public someType yield() { if(hasBeenFertilized() && hasBeenHarvested()) { diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/crops/PotatoRoot.java b/src/main/java/com/zipcodewilmington/froilansfarm/crops/PotatoRoot.java index a15bce11..857e6cb7 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/crops/PotatoRoot.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/crops/PotatoRoot.java @@ -6,7 +6,7 @@ public PotatoRoot(boolean hasBeenHarvested, boolean hasBeenFertilized) { super(hasBeenHarvested, hasBeenFertilized); } - protected Potato getEdible() { + public Potato getEdible() { return new Potato(); } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/crops/TomatoPlant.java b/src/main/java/com/zipcodewilmington/froilansfarm/crops/TomatoPlant.java index 747462ee..ca4dd21b 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/crops/TomatoPlant.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/crops/TomatoPlant.java @@ -6,7 +6,7 @@ public TomatoPlant(boolean hasBeenHarvested, boolean hasBeenFertilized) { super(hasBeenHarvested, hasBeenFertilized); } - protected Tomato getEdible() { + public Tomato getEdible() { return new Tomato(); } } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/EarCornTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/EarCornTest.java index 9f531ff9..4be2241c 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/EarCornTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/EarCornTest.java @@ -4,6 +4,7 @@ import org.junit.Assert; import org.junit.Test; + public class EarCornTest { @Test diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/cropsTest/AbstractCropTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/cropsTest/AbstractCropTest.java new file mode 100644 index 00000000..44a22379 --- /dev/null +++ b/src/test/java/com/zipcodewilmington/froilansfarm/cropsTest/AbstractCropTest.java @@ -0,0 +1,5 @@ +package com.zipcodewilmington.froilansfarm.cropsTest; + +public class AbstractCropTest { + +} diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/cropsTest/CornStalkTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/cropsTest/CornStalkTest.java new file mode 100644 index 00000000..38678e70 --- /dev/null +++ b/src/test/java/com/zipcodewilmington/froilansfarm/cropsTest/CornStalkTest.java @@ -0,0 +1,22 @@ +package com.zipcodewilmington.froilansfarm.cropsTest; + +import com.zipcodewilmington.froilansfarm.crops.CornStalk; +import org.junit.Test; + +public class CornStalkTest { + + @Test + public void testGetEdible() { + + // Given + + + // When + + + // Then + + + } + +} diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/cropsTest/PotatoRootTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/cropsTest/PotatoRootTest.java new file mode 100644 index 00000000..0685be95 --- /dev/null +++ b/src/test/java/com/zipcodewilmington/froilansfarm/cropsTest/PotatoRootTest.java @@ -0,0 +1,20 @@ +package com.zipcodewilmington.froilansfarm.cropsTest; + +import org.junit.Test; + +public class PotatoRootTest { + + @Test + public void testGetEdible() { + + // Given + + + // When + + + // Then + + + } +} diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/cropsTest/TomatoPlant.java b/src/test/java/com/zipcodewilmington/froilansfarm/cropsTest/TomatoPlant.java new file mode 100644 index 00000000..3deb55de --- /dev/null +++ b/src/test/java/com/zipcodewilmington/froilansfarm/cropsTest/TomatoPlant.java @@ -0,0 +1,21 @@ +package com.zipcodewilmington.froilansfarm.cropsTest; + + +import org.junit.Test; + +public class TomatoPlant { + + @Test + public void testGetEdible() { + + // Given + + + // When + + + // Then + + + } +} From 19eedc9b6e6f31fc5a51665a9d49af512e8ae73a Mon Sep 17 00:00:00 2001 From: Bobbi-Z <85585077+Bobbi-Z@users.noreply.github.com> Date: Fri, 23 Jul 2021 01:34:36 -0400 Subject: [PATCH 11/26] getting details hammered out --- pom.xml | 105 ++++++------------ .../froilansfarm/Froilan.java | 12 +- .../froilansfarm/Froilanda.java | 6 + .../froilansfarm/animals/Chicken.java | 15 +++ .../froilansfarm/animals/Eater.java | 2 +- .../froilansfarm/animals/Horse.java | 5 + .../froilansfarm/animals/person/Farmer.java | 12 ++ .../froilansfarm/animals/person/Person.java | 28 +++++ .../froilansfarm/farm/Shelter.java | 2 +- .../froilansfarm/vehicle/FarmVehicle.java | 8 +- .../froilansfarm/vehicle/Tractor.java | 4 +- .../froilansfarm/animal/AnimalTest.java | 4 + .../froilansfarm/animal/ChickenTest.java | 4 + .../froilansfarm/animal/HorseTest.java | 4 + .../animal/person/FarmerTest.java | 48 ++++++++ .../animal/person/FroilandTest.java | 4 + .../animal/person/FroilandaTest.java | 4 + .../animal/person/PersonTest.java | 44 ++++++++ .../froilansfarm/farm/FarmTest.java | 48 ++++---- 19 files changed, 251 insertions(+), 108 deletions(-) create mode 100644 src/test/java/com/zipcodewilmington/froilansfarm/animal/AnimalTest.java create mode 100644 src/test/java/com/zipcodewilmington/froilansfarm/animal/ChickenTest.java create mode 100644 src/test/java/com/zipcodewilmington/froilansfarm/animal/HorseTest.java create mode 100644 src/test/java/com/zipcodewilmington/froilansfarm/animal/person/FarmerTest.java create mode 100644 src/test/java/com/zipcodewilmington/froilansfarm/animal/person/FroilandTest.java create mode 100644 src/test/java/com/zipcodewilmington/froilansfarm/animal/person/FroilandaTest.java create mode 100644 src/test/java/com/zipcodewilmington/froilansfarm/animal/person/PersonTest.java diff --git a/pom.xml b/pom.xml index 0bea0881..4d7000bb 100644 --- a/pom.xml +++ b/pom.xml @@ -2,13 +2,15 @@ - 4.0.0 +4.0.0 - com.zipcodewilmington - froilans-farm +com.zipcodewilmington +froilans-farm - 1.0-SNAPSHOTorg.apache.maven.pluginsmaven-compiler-plugin88 +1.0-SNAPSHOT + + org.apache.maven.plugins maven-compiler-plugin @@ -17,72 +19,35 @@ 8 - - org.apache.maven.plugins - maven-compiler-plugin - - 8 - 8 - - - - - 1.0-SNAPSHOT - - - - org.apache.maven.plugins - maven-compiler-plugin - - 7 - 7 - - - - - - - - junit - junit - - RELEASE - test - - - org.junit.jupiter - junit-jupiter - RELEASE - test - - - - 4.13.1 - test - - - - - - - junit - junit - 4.13.1 - test - - - - org.apache.commons - commons-lang3 - 3.12.0 - - - org.apache.commons - commons-math3 - 3.6.1 - + + + + + + + + junit + junit + 4.13.1 + test + + + org.apache.commons + commons-lang3 + 3.12.0 + + + org.apache.commons + commons-math3 + 3.6.1 + + + org.junit.jupiter + junit-jupiter + RELEASE + test + + - - \ No newline at end of file diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Froilan.java b/src/main/java/com/zipcodewilmington/froilansfarm/Froilan.java index aa7c26c8..9f90e3eb 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Froilan.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Froilan.java @@ -1,6 +1,6 @@ -package com.zipcodewilmington.froilansfarm; - -import com.zipcodewilmington.froilansfarm.animals.person.Farmer; - -public class Froilan extends Farmer { -} +//package com.zipcodewilmington.froilansfarm; +// +//import com.zipcodewilmington.froilansfarm.animals.person.Farmer; +// +//public class Froilan extends Farmer { +//} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Froilanda.java b/src/main/java/com/zipcodewilmington/froilansfarm/Froilanda.java index 475bc69f..5c9e37b5 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Froilanda.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Froilanda.java @@ -2,9 +2,15 @@ import com.zipcodewilmington.froilansfarm.animals.person.Person; import com.zipcodewilmington.froilansfarm.animals.person.Pilot; +import com.zipcodewilmington.froilansfarm.crops.Edible; public class Froilanda extends Person implements Pilot { public void fly() { } + + public Boolean eat(Edible food) { + + return null; + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/animals/Chicken.java b/src/main/java/com/zipcodewilmington/froilansfarm/animals/Chicken.java index 44983fb3..78da9baa 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/animals/Chicken.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/animals/Chicken.java @@ -1,10 +1,25 @@ package com.zipcodewilmington.froilansfarm.animals; +import com.zipcodewilmington.froilansfarm.crops.Edible; import com.zipcodewilmington.froilansfarm.farm.Produce; public class Chicken extends Animal implements Produce { public String makeNoise() { return null; } + + public Boolean eat(Edible food) { + + return null; + } + + public void yield() { + + } + + public boolean hasBeenFertilized() { + + return false; + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/animals/Eater.java b/src/main/java/com/zipcodewilmington/froilansfarm/animals/Eater.java index 486f989e..6c87cdda 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/animals/Eater.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/animals/Eater.java @@ -4,5 +4,5 @@ public interface Eater { - public void eat(Edible food); + public Boolean eat(Edible food); } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/animals/Horse.java b/src/main/java/com/zipcodewilmington/froilansfarm/animals/Horse.java index e9322d8f..5043ae81 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/animals/Horse.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/animals/Horse.java @@ -2,6 +2,7 @@ import com.zipcodewilmington.froilansfarm.Rideable; +import com.zipcodewilmington.froilansfarm.crops.Edible; public class Horse extends Animal implements Rideable { public String makeNoise() { @@ -13,4 +14,8 @@ public void move() { } + public Boolean eat(Edible food) { + + return null; + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/animals/person/Farmer.java b/src/main/java/com/zipcodewilmington/froilansfarm/animals/person/Farmer.java index 1bd15ee5..c45dfb4c 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/animals/person/Farmer.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/animals/person/Farmer.java @@ -6,6 +6,14 @@ public class Farmer extends Person implements Rider, Botanist { + public Farmer(){ + + } + + public Farmer(String name) { + super(name); + } + public void mount(Rideable rideable) { } @@ -17,4 +25,8 @@ public void dismount() { public void plant(Crop crop, CropRow row) { } + + public String makeNoise(){ + return "YeeHaw!"; + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/animals/person/Person.java b/src/main/java/com/zipcodewilmington/froilansfarm/animals/person/Person.java index e976e4ea..100f22a6 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/animals/person/Person.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/animals/person/Person.java @@ -1,10 +1,38 @@ package com.zipcodewilmington.froilansfarm.animals.person; import com.zipcodewilmington.froilansfarm.animals.Animal; +import com.zipcodewilmington.froilansfarm.crops.Edible; public class Person extends Animal { + private String name; + + public Person() { + + } + + public Person (String name){ + setName(name); + } + + public String makeNoise() { + + return null; + } + + public Boolean eat(Edible food) { + return null; } + + public void setName(String name){ + this.name = name; + } + + public String getName() { + return name; + } + + } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/farm/Shelter.java b/src/main/java/com/zipcodewilmington/froilansfarm/farm/Shelter.java index 7a424642..4c1a63de 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/farm/Shelter.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/farm/Shelter.java @@ -6,7 +6,7 @@ public abstract class Shelter { - private List animals = new ArrayList<>(); + private List animals = new ArrayList(); public void add(SomeType animal) { animals.add(animal); diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/FarmVehicle.java b/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/FarmVehicle.java index 16d557ee..13fb18c2 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/FarmVehicle.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/FarmVehicle.java @@ -1,9 +1,9 @@ package com.zipcodewilmington.froilansfarm.vehicle; -public interface FarmVehicle { +public interface FarmVehicle { - public default void operate(T vehicle){ - - } +// public default void operate(){ +// +// } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/Tractor.java b/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/Tractor.java index e6822d4c..de9d5f63 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/Tractor.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/Tractor.java @@ -2,9 +2,9 @@ import com.zipcodewilmington.froilansfarm.crops.Crop; -public class Tractor implements FarmVehicle{ +public class Tractor implements FarmVehicle{ + - @Override public void operate(Object vehicle) { } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/animal/AnimalTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/animal/AnimalTest.java new file mode 100644 index 00000000..27a98a88 --- /dev/null +++ b/src/test/java/com/zipcodewilmington/froilansfarm/animal/AnimalTest.java @@ -0,0 +1,4 @@ +package com.zipcodewilmington.froilansfarm.animal; + +public class AnimalTest { +} diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/animal/ChickenTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/animal/ChickenTest.java new file mode 100644 index 00000000..305fe4db --- /dev/null +++ b/src/test/java/com/zipcodewilmington/froilansfarm/animal/ChickenTest.java @@ -0,0 +1,4 @@ +package com.zipcodewilmington.froilansfarm.animal; + +public class ChickenTest { +} diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/animal/HorseTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/animal/HorseTest.java new file mode 100644 index 00000000..d13e9ce6 --- /dev/null +++ b/src/test/java/com/zipcodewilmington/froilansfarm/animal/HorseTest.java @@ -0,0 +1,4 @@ +package com.zipcodewilmington.froilansfarm.animal; + +public class HorseTest { +} diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/animal/person/FarmerTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/animal/person/FarmerTest.java new file mode 100644 index 00000000..b79f1ebc --- /dev/null +++ b/src/test/java/com/zipcodewilmington/froilansfarm/animal/person/FarmerTest.java @@ -0,0 +1,48 @@ +package com.zipcodewilmington.froilansfarm.animal.person; + +import com.sun.org.apache.xpath.internal.operations.Bool; +import com.sun.prism.impl.FactoryResetException; +import com.zipcodewilmington.froilansfarm.animals.person.Botanist; +import com.zipcodewilmington.froilansfarm.animals.person.Farmer; +import com.zipcodewilmington.froilansfarm.animals.person.Person; +import com.zipcodewilmington.froilansfarm.animals.person.Rider; +import com.zipcodewilmington.froilansfarm.crops.Crop; +import com.zipcodewilmington.froilansfarm.crops.Egg; +import com.zipcodewilmington.froilansfarm.farm.CropRow; +import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.BeforeEach; + +public class FarmerTest { + + + private Farmer farmer; + + @BeforeEach + void setUp() { + Farmer farmer = new Farmer(); + } + + + @Test + public void testInstanceOf(){ + + Assertions.assertTrue(farmer instanceof Person); + Assertions.assertTrue(farmer instanceof Rider); + Assertions.assertTrue(farmer instanceof Botanist); + } + + @Test + public void testMakeNoise(){ + //given + String expected = "YeeHaw!"; + + //When + String actual = farmer.makeNoise(); + + //then + Assertions.assertEquals(expected, actual); + } + +} diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/animal/person/FroilandTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/animal/person/FroilandTest.java new file mode 100644 index 00000000..b72e37ab --- /dev/null +++ b/src/test/java/com/zipcodewilmington/froilansfarm/animal/person/FroilandTest.java @@ -0,0 +1,4 @@ +package com.zipcodewilmington.froilansfarm.animal.person; + +public class FroilandTest { +} diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/animal/person/FroilandaTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/animal/person/FroilandaTest.java new file mode 100644 index 00000000..52ef1318 --- /dev/null +++ b/src/test/java/com/zipcodewilmington/froilansfarm/animal/person/FroilandaTest.java @@ -0,0 +1,4 @@ +//package com.zipcodewilmington.froilansfarm.animal.person; +// +//public class FroilandaTest { +//} diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/animal/person/PersonTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/animal/person/PersonTest.java new file mode 100644 index 00000000..2ef388b0 --- /dev/null +++ b/src/test/java/com/zipcodewilmington/froilansfarm/animal/person/PersonTest.java @@ -0,0 +1,44 @@ +package com.zipcodewilmington.froilansfarm.animal.person; + +import com.zipcodewilmington.froilansfarm.animals.person.Person; +import org.apache.commons.lang3.ClassUtils; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +public class PersonTest { + + private Person person; + + @BeforeEach + void setUp() { + this.person = new Person(); + } + + @Test + public void testConstructor(){ + String actualName = person.getName(); + String expectedName = ""; + Assertions.assertEquals(expectedName, actualName); + } + + @Test + public void testSetName(){ + String expectedName = "Froilan"; + person.setName(expectedName); + String actualName = person.getName(); + Assertions.assertEquals(expectedName, actualName); + } + + @Test + void makeNoise() { + } + + @Test + void eat() { + } + + @Test + void getName() { + } +} diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/farm/FarmTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/farm/FarmTest.java index c572bda7..b4f0d9ee 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/farm/FarmTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/farm/FarmTest.java @@ -8,28 +8,28 @@ public class FarmTest { - @Test - public void constructorTest() { - // Given - List expectedFarmhouses = new ArrayList<>(Arrays.asList(new FarmHouse())); - List expectedStables = new ArrayList<>(Arrays.asList(new Stable())); - List expectedChickenCoops = new ArrayList<>(Arrays.asList(new ChickenCoop())); - List expectedFields = new ArrayList<>(Arrays.asList(new Field())); - List expectedVehicles = new ArrayList<>(Arrays.asList(new Vehicle())); - - // When - Farm farm = new FarmBuilder().setFarmhouses(expectedFarmhouses).setStables(expectedStables).setChickenCoops(expectedChickenCoops).setFields(expectedFields).setVehicles(expectedVehicles).build(); - List actualFarmhouses = farm.getFarmhouses(); - List actualStables = farm.getStables(); - List actualChickenCoops = farm.getChickenCoops(); - List actualFields = farm.getFields(); - List actualVehicles = farm.getVehicles(); - - // Then - Assert.assertEquals(expectedFarmhouses, actualFarmhouses); - Assert.assertEquals(expectedStables, actualStables); - Assert.assertEquals(expectedChickenCoops, actualChickenCoops); - Assert.assertEquals(expectedFields, actualFields); - Assert.assertEquals(expectedVehicles, actualVehicles); - } +// @Test +// public void constructorTest() { +// // Given +// List expectedFarmhouses = new ArrayList<>(Arrays.asList(new FarmHouse())); +// List expectedStables = new ArrayList<>(Arrays.asList(new Stable())); +// List expectedChickenCoops = new ArrayList<>(Arrays.asList(new ChickenCoop())); +// List expectedFields = new ArrayList<>(Arrays.asList(new Field())); +// List expectedVehicles = new ArrayList<>(Arrays.asList(new Vehicle())); +// +// // When +// Farm farm = new FarmBuilder().setFarmhouses(expectedFarmhouses).setStables(expectedStables).setChickenCoops(expectedChickenCoops).setFields(expectedFields).setVehicles(expectedVehicles).build(); +// List actualFarmhouses = farm.getFarmhouses(); +// List actualStables = farm.getStables(); +// List actualChickenCoops = farm.getChickenCoops(); +// List actualFields = farm.getFields(); +// List actualVehicles = farm.getVehicles(); +// +// // Then +// Assert.assertEquals(expectedFarmhouses, actualFarmhouses); +// Assert.assertEquals(expectedStables, actualStables); +// Assert.assertEquals(expectedChickenCoops, actualChickenCoops); +// Assert.assertEquals(expectedFields, actualFields); +// Assert.assertEquals(expectedVehicles, actualVehicles); +// } } From f7debb8497e8641e5f5a3251ad4a1b809cc1ab74 Mon Sep 17 00:00:00 2001 From: MannyMb Date: Fri, 23 Jul 2021 02:01:29 -0400 Subject: [PATCH 12/26] testing --- .../froilansfarm/cropsTest/TomatoPlant.java | 21 ----------------- .../cropsTest/TomatoPlantTest.java | 23 +++++++++++++++++++ 2 files changed, 23 insertions(+), 21 deletions(-) delete mode 100644 src/test/java/com/zipcodewilmington/froilansfarm/cropsTest/TomatoPlant.java create mode 100644 src/test/java/com/zipcodewilmington/froilansfarm/cropsTest/TomatoPlantTest.java diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/cropsTest/TomatoPlant.java b/src/test/java/com/zipcodewilmington/froilansfarm/cropsTest/TomatoPlant.java deleted file mode 100644 index 3deb55de..00000000 --- a/src/test/java/com/zipcodewilmington/froilansfarm/cropsTest/TomatoPlant.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.zipcodewilmington.froilansfarm.cropsTest; - - -import org.junit.Test; - -public class TomatoPlant { - - @Test - public void testGetEdible() { - - // Given - - - // When - - - // Then - - - } -} diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/cropsTest/TomatoPlantTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/cropsTest/TomatoPlantTest.java new file mode 100644 index 00000000..926111f7 --- /dev/null +++ b/src/test/java/com/zipcodewilmington/froilansfarm/cropsTest/TomatoPlantTest.java @@ -0,0 +1,23 @@ +package com.zipcodewilmington.froilansfarm.cropsTest; + +import com.zipcodewilmington.froilansfarm.crops.Tomato; +import com.zipcodewilmington.froilansfarm.crops.TomatoPlant; +import org.junit.Assert; +import org.junit.Test; + +public class TomatoPlantTest { + + @Test + public void testGetEdible() { + + // Given + TomatoPlant tomatoPlant = new TomatoPlant(true, true); + + // When + Tomato tomato = tomatoPlant.getEdible(); + + // Then + Assert.assertNotNull(tomato); + + } +} From c8357730ce855e33a9fdbe46d157b79649e04bee Mon Sep 17 00:00:00 2001 From: Bobbi-Z <85585077+Bobbi-Z@users.noreply.github.com> Date: Fri, 23 Jul 2021 02:58:15 -0400 Subject: [PATCH 13/26] testetesetestsetset --- .../froilansfarm/animals/Chicken.java | 3 ++- .../froilansfarm/animals/Horse.java | 3 ++- .../froilansfarm/animals/person/Farmer.java | 2 +- .../froilansfarm/animal/ChickenTest.java | 13 +++++++++ .../froilansfarm/animal/HorseTest.java | 27 +++++++++++++++++-- .../animal/person/FarmerTest.java | 14 +++------- .../animal/person/PersonTest.java | 13 +++++---- 7 files changed, 52 insertions(+), 23 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/animals/Chicken.java b/src/main/java/com/zipcodewilmington/froilansfarm/animals/Chicken.java index 78da9baa..1cd774d2 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/animals/Chicken.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/animals/Chicken.java @@ -6,7 +6,8 @@ public class Chicken extends Animal implements Produce { public String makeNoise() { - return null; + + return "cluck!" ; } public Boolean eat(Edible food) { diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/animals/Horse.java b/src/main/java/com/zipcodewilmington/froilansfarm/animals/Horse.java index 5043ae81..95d4a3cb 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/animals/Horse.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/animals/Horse.java @@ -5,8 +5,9 @@ import com.zipcodewilmington.froilansfarm.crops.Edible; public class Horse extends Animal implements Rideable { + public String makeNoise() { - return null; + return "neigh!"; } public void move() { diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/animals/person/Farmer.java b/src/main/java/com/zipcodewilmington/froilansfarm/animals/person/Farmer.java index c45dfb4c..c1a301aa 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/animals/person/Farmer.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/animals/person/Farmer.java @@ -5,7 +5,7 @@ import com.zipcodewilmington.froilansfarm.farm.CropRow; public class Farmer extends Person implements Rider, Botanist { - +// private String name; public Farmer(){ } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/animal/ChickenTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/animal/ChickenTest.java index 305fe4db..135e73ae 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/animal/ChickenTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/animal/ChickenTest.java @@ -1,4 +1,17 @@ package com.zipcodewilmington.froilansfarm.animal; +import com.zipcodewilmington.froilansfarm.animals.Chicken; +import org.junit.Test; +import org.junit.jupiter.api.Assertions; + public class ChickenTest { + Chicken chicken = new Chicken(); + + @Test + public void testMakeNoise() { + String expected = "cluck!"; + String actual = chicken.makeNoise(); + Assertions.assertEquals(expected, actual); + } + } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/animal/HorseTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/animal/HorseTest.java index d13e9ce6..bc1fe34c 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/animal/HorseTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/animal/HorseTest.java @@ -1,4 +1,27 @@ package com.zipcodewilmington.froilansfarm.animal; -public class HorseTest { -} +import com.zipcodewilmington.froilansfarm.animals.Horse; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.*; + +class HorseTest { + + Horse horse = new Horse(); + + @Test + void testMakeNoise() { + String expected = "neigh!"; + String actual = horse.makeNoise(); + Assertions.assertEquals(expected, actual); + } + + @Test + void move() { + } + + @Test + void eat() { + } +} \ No newline at end of file diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/animal/person/FarmerTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/animal/person/FarmerTest.java index b79f1ebc..f94a1ac5 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/animal/person/FarmerTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/animal/person/FarmerTest.java @@ -1,30 +1,22 @@ package com.zipcodewilmington.froilansfarm.animal.person; -import com.sun.org.apache.xpath.internal.operations.Bool; -import com.sun.prism.impl.FactoryResetException; import com.zipcodewilmington.froilansfarm.animals.person.Botanist; import com.zipcodewilmington.froilansfarm.animals.person.Farmer; import com.zipcodewilmington.froilansfarm.animals.person.Person; import com.zipcodewilmington.froilansfarm.animals.person.Rider; -import com.zipcodewilmington.froilansfarm.crops.Crop; -import com.zipcodewilmington.froilansfarm.crops.Egg; -import com.zipcodewilmington.froilansfarm.farm.CropRow; + import org.junit.Test; import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; public class FarmerTest { - - - private Farmer farmer; + private Farmer farmer = new Farmer(); @BeforeEach void setUp() { - Farmer farmer = new Farmer(); + this.farmer = new Farmer(); } - @Test public void testInstanceOf(){ diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/animal/person/PersonTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/animal/person/PersonTest.java index 2ef388b0..8ad791af 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/animal/person/PersonTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/animal/person/PersonTest.java @@ -1,24 +1,23 @@ package com.zipcodewilmington.froilansfarm.animal.person; import com.zipcodewilmington.froilansfarm.animals.person.Person; -import org.apache.commons.lang3.ClassUtils; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; public class PersonTest { - private Person person; + private Person person = new Person(); - @BeforeEach - void setUp() { - this.person = new Person(); - } +// @BeforeEach +// void setUp() { +// this.person = new Person(); +// } @Test public void testConstructor(){ String actualName = person.getName(); - String expectedName = ""; + String expectedName = null; Assertions.assertEquals(expectedName, actualName); } From b5c52450ae0ab9e6569eece3b0351553c0b0432c Mon Sep 17 00:00:00 2001 From: MannyMb Date: Fri, 23 Jul 2021 03:02:36 -0400 Subject: [PATCH 14/26] added some test --- .../com/zipcodewilmington/froilansfarm/EdibleTest.java | 2 +- .../froilansfarm/cropsTest/CornStalkTest.java | 8 +++++--- .../froilansfarm/cropsTest/PotatoRootTest.java | 9 ++++++--- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/EdibleTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/EdibleTest.java index 7555abee..b6b4af61 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/EdibleTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/EdibleTest.java @@ -1,6 +1,6 @@ package com.zipcodewilmington.froilansfarm; -import com.sun.org.apache.xpath.internal.operations.Bool; +//import com.sun.org.apache.xpath.internal.operations.Bool; import com.zipcodewilmington.froilansfarm.crops.Egg; import com.zipcodewilmington.froilansfarm.crops.Potato; import com.zipcodewilmington.froilansfarm.crops.Tomato; diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/cropsTest/CornStalkTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/cropsTest/CornStalkTest.java index 38678e70..18bc1f12 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/cropsTest/CornStalkTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/cropsTest/CornStalkTest.java @@ -1,6 +1,8 @@ package com.zipcodewilmington.froilansfarm.cropsTest; import com.zipcodewilmington.froilansfarm.crops.CornStalk; +import com.zipcodewilmington.froilansfarm.crops.EarCorn; +import org.junit.Assert; import org.junit.Test; public class CornStalkTest { @@ -9,13 +11,13 @@ public class CornStalkTest { public void testGetEdible() { // Given - + CornStalk cornStalk = new CornStalk(true, true); // When - + EarCorn earCorn = cornStalk.getEdible(); // Then - + Assert.assertNotNull(earCorn); } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/cropsTest/PotatoRootTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/cropsTest/PotatoRootTest.java index 0685be95..9bc66ba4 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/cropsTest/PotatoRootTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/cropsTest/PotatoRootTest.java @@ -1,5 +1,8 @@ package com.zipcodewilmington.froilansfarm.cropsTest; +import com.zipcodewilmington.froilansfarm.crops.Potato; +import com.zipcodewilmington.froilansfarm.crops.PotatoRoot; +import org.junit.Assert; import org.junit.Test; public class PotatoRootTest { @@ -8,13 +11,13 @@ public class PotatoRootTest { public void testGetEdible() { // Given - + PotatoRoot potatoRoot = new PotatoRoot(true, true); // When - + Potato potato = potatoRoot.getEdible(); // Then - + Assert.assertNotNull(potato); } } From 1c51138b0f7ade00efb273b59412083eec513ab1 Mon Sep 17 00:00:00 2001 From: Bobbi-Z <85585077+Bobbi-Z@users.noreply.github.com> Date: Fri, 23 Jul 2021 03:33:03 -0400 Subject: [PATCH 15/26] crop is commented out intellij would not read the generics. --- .../froilansfarm/animals/Chicken.java | 4 +- .../froilansfarm/crops/Crop.java | 66 +++++++++---------- 2 files changed, 35 insertions(+), 35 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/animals/Chicken.java b/src/main/java/com/zipcodewilmington/froilansfarm/animals/Chicken.java index 1cd774d2..7e0b30ce 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/animals/Chicken.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/animals/Chicken.java @@ -2,9 +2,9 @@ import com.zipcodewilmington.froilansfarm.crops.Edible; -import com.zipcodewilmington.froilansfarm.farm.Produce; +//import com.zipcodewilmington.froilansfarm.farm.Produce; -public class Chicken extends Animal implements Produce { +public class Chicken extends Animal { public String makeNoise() { return "cluck!" ; diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/crops/Crop.java b/src/main/java/com/zipcodewilmington/froilansfarm/crops/Crop.java index ec477550..ba1fa5cc 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/crops/Crop.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/crops/Crop.java @@ -1,33 +1,33 @@ -package com.zipcodewilmington.froilansfarm.crops; - -import com.zipcodewilmington.froilansfarm.farm.Produce; - -public abstract class Crop implements Produce { - private boolean hasBeenHarvested; - private boolean hasBeenFertilized; - - public Crop(boolean hasBeenHarvested, boolean hasBeenFertilized) { - this.hasBeenHarvested = hasBeenHarvested; - this.hasBeenFertilized = hasBeenFertilized; - } - - public boolean hasBeenFertilized() { - return hasBeenFertilized; - } - - public boolean hasBeenHarvested() { - return hasBeenHarvested; - } - - public someType getEdible() { - return null; - } - - public someType yield() { - if(hasBeenFertilized() && hasBeenHarvested()) { - return getEdible(); - } - return null; - } - -} +//package com.zipcodewilmington.froilansfarm.crops; +// +//import com.zipcodewilmington.froilansfarm.farm.Produce; +// +//public abstract class Crop implements Produce { +// private boolean hasBeenHarvested; +// private boolean hasBeenFertilized; +// +// public Crop(boolean hasBeenHarvested, boolean hasBeenFertilized) { +// this.hasBeenHarvested = hasBeenHarvested; +// this.hasBeenFertilized = hasBeenFertilized; +// } +// +// public boolean hasBeenFertilized() { +// return hasBeenFertilized; +// } +// +// public boolean hasBeenHarvested() { +// return hasBeenHarvested; +// } +// +// public someType getEdible() { +// return null; +// } +// +// public someType yield() { +// if(hasBeenFertilized() && hasBeenHarvested()) { +// return getEdible(); +// } +// return null; +// } +// +//} From e93ce52ebf803c2b8f0d5e5f2e0d61530f2b5d53 Mon Sep 17 00:00:00 2001 From: Nisha Date: Fri, 23 Jul 2021 08:49:08 -0400 Subject: [PATCH 16/26] added some tests --- .../froilansfarm/vehicle/Aircraft.java | 4 +++- .../froilansfarm/vehicle/CropDuster.java | 4 +++- .../froilansfarm/vehicle/Tractor.java | 21 ++++++++++++++++++ .../froilansfarm/vehicle/AircraftTest.java | 2 ++ .../froilansfarm/vehicle/CropDusterTest.java | 6 +++++ .../froilansfarm/vehicle/TractorTest.java | 22 +++++++++++++++++++ 6 files changed, 57 insertions(+), 2 deletions(-) create mode 100644 src/test/java/com/zipcodewilmington/froilansfarm/vehicle/TractorTest.java diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/Aircraft.java b/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/Aircraft.java index 1b72e989..fde3caf7 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/Aircraft.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/Aircraft.java @@ -3,7 +3,9 @@ public abstract class Aircraft implements FarmVehicle { - public void fly(){ + public boolean fly(){ + return true; + } public void operate(Object vehicle) { diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/CropDuster.java b/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/CropDuster.java index 6da34b5a..45d97b06 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/CropDuster.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/CropDuster.java @@ -6,11 +6,13 @@ public class CropDuster implements FarmVehicle { - public void fertilize(CropRow row){ + public boolean fertilize(int row){ + return true; } public void operate(Object vehicle) { + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/Tractor.java b/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/Tractor.java index e6822d4c..2462f54a 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/Tractor.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/Tractor.java @@ -4,8 +4,29 @@ public class Tractor implements FarmVehicle{ + private int crop; + + public Tractor(int crop) { + this.crop = crop; + } + + public int getCrop() { + return crop; + } + + public void setCrop(int crop) { + crop = crop; + } + + public boolean harvest(int crop){ + return true; + + } + @Override public void operate(Object vehicle) { } + + } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/vehicle/AircraftTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/vehicle/AircraftTest.java index 0f3131ea..2fefd230 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/vehicle/AircraftTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/vehicle/AircraftTest.java @@ -15,5 +15,7 @@ void operateTest() { + + } } \ No newline at end of file diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/vehicle/CropDusterTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/vehicle/CropDusterTest.java index f5d36bdd..c6846a8c 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/vehicle/CropDusterTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/vehicle/CropDusterTest.java @@ -1,5 +1,6 @@ package com.zipcodewilmington.froilansfarm.vehicle; +import org.junit.Assert; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.*; @@ -10,6 +11,11 @@ class CropDusterTest { void fertilize() { CropDuster cropDus = new CropDuster(); + boolean expected = true; + boolean actual = cropDus.fertilize(5); + + Assert.assertEquals(expected,actual); + } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/vehicle/TractorTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/vehicle/TractorTest.java new file mode 100644 index 00000000..33ce8627 --- /dev/null +++ b/src/test/java/com/zipcodewilmington/froilansfarm/vehicle/TractorTest.java @@ -0,0 +1,22 @@ +package com.zipcodewilmington.froilansfarm.vehicle; + +import com.zipcodewilmington.froilansfarm.crops.Crop; +import org.junit.Assert; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.*; + +class TractorTest { + + + @Test + void harvest() { + Tractor t = new Tractor(4); + + boolean expected = true; + boolean actual = t.harvest(4); + + Assert.assertEquals(expected,actual); + + } +} \ No newline at end of file From a0feac03d94ad5c72dabb21fd714d470e2f0b861 Mon Sep 17 00:00:00 2001 From: Zachary Kitto Date: Fri, 23 Jul 2021 10:55:59 -0400 Subject: [PATCH 17/26] able to build --- .../java/com/zipcodewilmington/froilansfarm/vehicle/Tractor.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/Tractor.java b/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/Tractor.java index 64d0d147..56d1ff4e 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/Tractor.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/Tractor.java @@ -25,7 +25,6 @@ public boolean harvest(int crop){ } - @Override public void operate(Object vehicle) { From 3b60393bf505dae353f6cf21bfca595092a085ea Mon Sep 17 00:00:00 2001 From: Nisha Date: Fri, 23 Jul 2021 11:00:56 -0400 Subject: [PATCH 18/26] some stuff --- .../froilansfarm/vehicle/Aircraft.java | 4 +++ .../froilansfarm/vehicle/FarmVehicle.java | 6 ++-- .../froilansfarm/vehicle/Tractor.java | 28 ++++++++----------- .../froilansfarm/vehicle/AircraftTest.java | 2 +- .../froilansfarm/vehicle/TractorTest.java | 7 +++-- 5 files changed, 25 insertions(+), 22 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/Aircraft.java b/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/Aircraft.java index fde3caf7..bc5ed4ea 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/Aircraft.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/Aircraft.java @@ -12,4 +12,8 @@ public void operate(Object vehicle) { } + @Override + public boolean operate() { + return false; + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/FarmVehicle.java b/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/FarmVehicle.java index 13fb18c2..ed262aa4 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/FarmVehicle.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/FarmVehicle.java @@ -3,7 +3,7 @@ public interface FarmVehicle { -// public default void operate(){ -// -// } + public boolean operate(); } + +//in test class use tractor diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/Tractor.java b/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/Tractor.java index 64d0d147..320dfe79 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/Tractor.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/Tractor.java @@ -1,36 +1,32 @@ package com.zipcodewilmington.froilansfarm.vehicle; +import com.sun.scenario.effect.Crop; import com.zipcodewilmington.froilansfarm.crops.Crop; +import com.zipcodewilmington.froilansfarm.crops.Tomato; public class Tractor implements FarmVehicle{ - private int crop; + private Crop; - public Tractor(int crop) { - this.crop = crop; - } - public int getCrop() { - return crop; - } + public Tractor() { - public void setCrop(int crop) { - crop = crop; } - public boolean harvest(int crop){ + + public boolean harvest(Crop crop) { return true; } - @Override - - - public void operate(Object vehicle) { + public boolean harvest(){ + return true; } - - + @Override + public boolean operate() { + return true; + } } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/vehicle/AircraftTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/vehicle/AircraftTest.java index 2fefd230..bcb2a794 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/vehicle/AircraftTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/vehicle/AircraftTest.java @@ -9,7 +9,7 @@ class AircraftTest { @Test void operateTest() { - +//craftDuster diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/vehicle/TractorTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/vehicle/TractorTest.java index 33ce8627..334239f1 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/vehicle/TractorTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/vehicle/TractorTest.java @@ -1,6 +1,7 @@ package com.zipcodewilmington.froilansfarm.vehicle; import com.zipcodewilmington.froilansfarm.crops.Crop; +import com.zipcodewilmington.froilansfarm.crops.Tomato; import org.junit.Assert; import org.junit.jupiter.api.Test; @@ -9,12 +10,14 @@ class TractorTest { + + @Test void harvest() { - Tractor t = new Tractor(4); + Tractor t = new Tractor(); boolean expected = true; - boolean actual = t.harvest(4); + boolean actual = t.harvest(); Assert.assertEquals(expected,actual); From 4a001a3cebb30903bacd6eaa60b149d97d4dbdf0 Mon Sep 17 00:00:00 2001 From: Zachary Kitto Date: Fri, 23 Jul 2021 19:44:21 -0400 Subject: [PATCH 19/26] Added CropRow, Field, FarmStorage --- .../froilansfarm/Froilan.java | 47 ++++++++++-- .../froilansfarm/crops/Crop.java | 74 ++++++++++--------- .../froilansfarm/farm/ChickenCoop.java | 6 +- .../froilansfarm/farm/CropRow.java | 23 +++++- .../froilansfarm/farm/FarmBuilder.java | 22 +++--- .../froilansfarm/farm/FarmHouse.java | 6 +- .../froilansfarm/farm/FarmStorage.java | 57 ++++++++++++++ .../froilansfarm/farm/Field.java | 13 ++++ .../froilansfarm/farm/Stable.java | 6 +- .../froilansfarm/vehicle/CropDuster.java | 12 ++- .../froilansfarm/vehicle/Tractor.java | 21 ++++-- .../froilansfarm/farm/CropRowTest.java | 28 +++++++ .../froilansfarm/farm/FieldTest.java | 29 ++++++++ .../froilansfarm/farm/ShelterTest.java | 17 +++-- .../froilansfarm/farm/StorageTest.java | 26 +++++++ .../froilansfarm/vehicle/TractorTest.java | 20 ++--- 16 files changed, 324 insertions(+), 83 deletions(-) create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/farm/FarmStorage.java create mode 100644 src/test/java/com/zipcodewilmington/froilansfarm/farm/CropRowTest.java create mode 100644 src/test/java/com/zipcodewilmington/froilansfarm/farm/FieldTest.java create mode 100644 src/test/java/com/zipcodewilmington/froilansfarm/farm/StorageTest.java diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Froilan.java b/src/main/java/com/zipcodewilmington/froilansfarm/Froilan.java index 9f90e3eb..096fd502 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Froilan.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Froilan.java @@ -1,6 +1,41 @@ -//package com.zipcodewilmington.froilansfarm; -// -//import com.zipcodewilmington.froilansfarm.animals.person.Farmer; -// -//public class Froilan extends Farmer { -//} +package com.zipcodewilmington.froilansfarm; + +import com.zipcodewilmington.froilansfarm.animals.Chicken; +import com.zipcodewilmington.froilansfarm.animals.Horse; +import com.zipcodewilmington.froilansfarm.animals.person.Farmer; +import com.zipcodewilmington.froilansfarm.crops.CornStalk; +import com.zipcodewilmington.froilansfarm.crops.Crop; +import com.zipcodewilmington.froilansfarm.crops.PotatoRoot; +import com.zipcodewilmington.froilansfarm.crops.TomatoPlant; +import com.zipcodewilmington.froilansfarm.farm.*; +import com.zipcodewilmington.froilansfarm.vehicle.CropDuster; +import com.zipcodewilmington.froilansfarm.vehicle.Tractor; + +import java.util.ArrayList; +import java.util.Arrays; + +public class Froilan extends Farmer { + + FarmBuilder builder = new FarmBuilder(); + Farm farm = builder + .setFarmhouses( + new FarmHouse()) + .setFields( + new Field(new CropRow(new CornStalk(true, true)), + new CropRow(new TomatoPlant(true, true)), + new CropRow(new PotatoRoot(true, true)), + new CropRow(new TomatoPlant(true, true)), + new CropRow(new PotatoRoot(true, true)))) + .setStables( + new Stable(new Horse(), new Horse(), new Horse()), + new Stable(new Horse(), new Horse(), new Horse(), new Horse()), + new Stable(new Horse(), new Horse(), new Horse())) + .setChickenCoops( + new ChickenCoop(new Chicken(), new Chicken(), new Chicken(), new Chicken()), + new ChickenCoop(new Chicken(), new Chicken(), new Chicken(), new Chicken()), + new ChickenCoop(new Chicken(), new Chicken(), new Chicken(), new Chicken()), + new ChickenCoop(new Chicken(), new Chicken(), new Chicken())) + .setVehicles(new Tractor(5), new CropDuster()) + .build(); + +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/crops/Crop.java b/src/main/java/com/zipcodewilmington/froilansfarm/crops/Crop.java index ba1fa5cc..edeb6d1b 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/crops/Crop.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/crops/Crop.java @@ -1,33 +1,41 @@ -//package com.zipcodewilmington.froilansfarm.crops; -// -//import com.zipcodewilmington.froilansfarm.farm.Produce; -// -//public abstract class Crop implements Produce { -// private boolean hasBeenHarvested; -// private boolean hasBeenFertilized; -// -// public Crop(boolean hasBeenHarvested, boolean hasBeenFertilized) { -// this.hasBeenHarvested = hasBeenHarvested; -// this.hasBeenFertilized = hasBeenFertilized; -// } -// -// public boolean hasBeenFertilized() { -// return hasBeenFertilized; -// } -// -// public boolean hasBeenHarvested() { -// return hasBeenHarvested; -// } -// -// public someType getEdible() { -// return null; -// } -// -// public someType yield() { -// if(hasBeenFertilized() && hasBeenHarvested()) { -// return getEdible(); -// } -// return null; -// } -// -//} +package com.zipcodewilmington.froilansfarm.crops; + +import com.zipcodewilmington.froilansfarm.farm.Produce; + +public abstract class Crop implements Produce { + private boolean hasBeenHarvested; + private boolean hasBeenFertilized; + + public Crop(boolean hasBeenHarvested, boolean hasBeenFertilized) { + this.hasBeenHarvested = hasBeenHarvested; + this.hasBeenFertilized = hasBeenFertilized; + } + + public boolean hasBeenFertilized() { + return hasBeenFertilized; + } + + public boolean hasBeenHarvested() { + return hasBeenHarvested; + } + + public void setHasBeenHarvested(boolean hasBeenHarvested) { + this.hasBeenHarvested = hasBeenHarvested; + } + + public void setHasBeenFertilized(boolean hasBeenFertilized) { + this.hasBeenFertilized = hasBeenFertilized; + } + + public someType getEdible() { + return null; + } + + public someType yield() { + if(hasBeenFertilized() && hasBeenHarvested()) { + return getEdible(); + } + return null; + } + +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/farm/ChickenCoop.java b/src/main/java/com/zipcodewilmington/froilansfarm/farm/ChickenCoop.java index 2dab2b8e..0495d682 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/farm/ChickenCoop.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/farm/ChickenCoop.java @@ -2,14 +2,14 @@ import com.zipcodewilmington.froilansfarm.animals.Chicken; -import java.util.List; +import java.util.*; public class ChickenCoop extends Shelter { public ChickenCoop() { } - public ChickenCoop(List chickens) { - super.setAnimals(chickens); + public ChickenCoop(Chicken... chickens) { + super.setAnimals(new ArrayList<>(Arrays.asList(chickens))); } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/farm/CropRow.java b/src/main/java/com/zipcodewilmington/froilansfarm/farm/CropRow.java index 2b669099..fac6a438 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/farm/CropRow.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/farm/CropRow.java @@ -1,5 +1,26 @@ package com.zipcodewilmington.froilansfarm.farm; -public class CropRow { +import com.zipcodewilmington.froilansfarm.crops.Crop; +import com.zipcodewilmington.froilansfarm.crops.Edible; +import java.util.ArrayList; +import java.util.List; + +public class CropRow { + + private List cropsInRow = new ArrayList<>(); + + public CropRow(SomeCrop someCrop) { + for (int i = 0; i < 15; i++) { + cropsInRow.add(someCrop); + } + } + + public List getCropsInRow() { + return cropsInRow; + } + + public Integer getNumberOfCropsInRow() { + return cropsInRow.size(); + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/farm/FarmBuilder.java b/src/main/java/com/zipcodewilmington/froilansfarm/farm/FarmBuilder.java index febbd760..bd3579c7 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/farm/FarmBuilder.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/farm/FarmBuilder.java @@ -2,7 +2,7 @@ import com.zipcodewilmington.froilansfarm.vehicle.Vehicle; -import java.util.List; +import java.util.*; public class FarmBuilder { @@ -12,28 +12,28 @@ public class FarmBuilder { private List fields; private List vehicles; - public FarmBuilder setFarmhouses(List farmhouses) { - this.farmhouses = farmhouses; + public FarmBuilder setFarmhouses(FarmHouse farmhouses) { + this.farmhouses = new ArrayList<>(Arrays.asList(farmhouses)); return this; } - public FarmBuilder setStables(List stables) { - this.stables = stables; + public FarmBuilder setStables(Stable... stables) { + this.stables = new ArrayList<>(Arrays.asList(stables)); return this; } - public FarmBuilder setChickenCoops(List chickenCoops) { - this.chickenCoops = chickenCoops; + public FarmBuilder setChickenCoops(ChickenCoop... chickenCoops) { + this.chickenCoops = new ArrayList<>(Arrays.asList(chickenCoops)); return this; } - public FarmBuilder setFields(List fields) { - this.fields = fields; + public FarmBuilder setFields(Field... fields) { + this.fields = new ArrayList<>(Arrays.asList(fields)); return this; } - public FarmBuilder setVehicles(List vehicles) { - this.vehicles = vehicles; + public FarmBuilder setVehicles(Vehicle... vehicles) { + this.vehicles = new ArrayList<>(Arrays.asList(vehicles)); return this; } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/farm/FarmHouse.java b/src/main/java/com/zipcodewilmington/froilansfarm/farm/FarmHouse.java index 492fb309..c83c655d 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/farm/FarmHouse.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/farm/FarmHouse.java @@ -2,14 +2,14 @@ import com.zipcodewilmington.froilansfarm.animals.person.Person; -import java.util.List; +import java.util.*; public class FarmHouse extends Shelter { public FarmHouse() { } - public FarmHouse(List people) { - super.setAnimals(people); + public FarmHouse(Person... people) { + super.setAnimals(new ArrayList<>(Arrays.asList(people))); } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/farm/FarmStorage.java b/src/main/java/com/zipcodewilmington/froilansfarm/farm/FarmStorage.java new file mode 100644 index 00000000..235b90a6 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/farm/FarmStorage.java @@ -0,0 +1,57 @@ +package com.zipcodewilmington.froilansfarm.farm; + +import com.zipcodewilmington.froilansfarm.crops.*; + +import java.util.*; + +public class FarmStorage { + + private static FarmStorage farmStorage; + + private List list = new ArrayList<>(); + private Map, List> map = constructMap(); + + + + private FarmStorage() { + } + + public static FarmStorage getInstance() { + if (farmStorage == null) { + farmStorage = new FarmStorage(); + return farmStorage; + } + return farmStorage; + } + + public void add(SomeEdible foodItem) { + List list = map.get(foodItem.getClass()); + list.add(foodItem); + } + + public void remove(SomeEdible foodItem) { + List list = map.get(foodItem.getClass()); + list.remove(foodItem); + } + + public void populateMap() { + Tomato tomato = new Tomato(); + Potato potato = new Potato(); + Egg egg = new Egg(); + EarCorn earCorn = new EarCorn(); + map.put((Class) tomato.getClass(), null); + map.put((Class) potato.getClass(), null); + map.put((Class) egg.getClass(), null); + map.put((Class) earCorn.getClass(), null); + } + + public Map, List> constructMap() { + map = new HashMap<>(); + populateMap(); + return map; + } + + public Map, List> getMap() { + return map; + } +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/farm/Field.java b/src/main/java/com/zipcodewilmington/froilansfarm/farm/Field.java index 83c3a10d..4191916e 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/farm/Field.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/farm/Field.java @@ -1,5 +1,18 @@ package com.zipcodewilmington.froilansfarm.farm; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + public class Field { + private List rowsInField; + + public Field(CropRow... cropRows) { // 5, + rowsInField = new ArrayList<>(Arrays.asList(cropRows)); + } + + public List getRowsInField() { + return rowsInField; + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/farm/Stable.java b/src/main/java/com/zipcodewilmington/froilansfarm/farm/Stable.java index c2afafde..dbac1df5 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/farm/Stable.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/farm/Stable.java @@ -2,14 +2,14 @@ import com.zipcodewilmington.froilansfarm.animals.Horse; -import java.util.List; +import java.util.*; public class Stable extends Shelter { public Stable() { } - public Stable(List horses) { - super.setAnimals(horses); + public Stable(Horse... horses) { + super.setAnimals(new ArrayList<>(Arrays.asList(horses))); } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/CropDuster.java b/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/CropDuster.java index 45d97b06..25592df3 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/CropDuster.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/CropDuster.java @@ -2,7 +2,7 @@ import com.zipcodewilmington.froilansfarm.farm.CropRow; -public class CropDuster implements FarmVehicle { +public class CropDuster extends Vehicle implements FarmVehicle { @@ -14,5 +14,15 @@ public boolean fertilize(int row){ public void operate(Object vehicle) { + } + + @Override + public String makeNoise() { + return null; + } + + @Override + public void move() { + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/Tractor.java b/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/Tractor.java index 56d1ff4e..63a4a044 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/Tractor.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/Tractor.java @@ -1,8 +1,10 @@ package com.zipcodewilmington.froilansfarm.vehicle; import com.zipcodewilmington.froilansfarm.crops.Crop; +import com.zipcodewilmington.froilansfarm.farm.CropRow; +import com.zipcodewilmington.froilansfarm.farm.FarmStorage; -public class Tractor implements FarmVehicle{ +public class Tractor extends Vehicle implements FarmVehicle{ @@ -20,10 +22,10 @@ public void setCrop(int crop) { crop = crop; } - public boolean harvest(int crop){ - return true; - - } +// public void harvest(CropRow cropRow){ +// FarmStorage storage = FarmStorage.getInstance(); +// storage.add(cropRow.getCrop()); +// } @@ -32,4 +34,13 @@ public void operate(Object vehicle) { } + @Override + public String makeNoise() { + return null; + } + + @Override + public void move() { + + } } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/farm/CropRowTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/farm/CropRowTest.java new file mode 100644 index 00000000..0f87097b --- /dev/null +++ b/src/test/java/com/zipcodewilmington/froilansfarm/farm/CropRowTest.java @@ -0,0 +1,28 @@ +package com.zipcodewilmington.froilansfarm.farm; + +import com.zipcodewilmington.froilansfarm.crops.EarCorn; +import com.zipcodewilmington.froilansfarm.crops.Potato; +import com.zipcodewilmington.froilansfarm.crops.Tomato; +import com.zipcodewilmington.froilansfarm.crops.TomatoPlant; +import org.junit.Assert; +import org.junit.Test; + +import java.util.Arrays; +import java.util.List; + +public class CropRowTest { + + @Test + public void constructorTest() { + // Given + TomatoPlant tomato = new TomatoPlant(true, true); + CropRow cropRow = new CropRow(tomato); + Integer expectedNumberOfCrops = 15; + + // When + Integer actualNumberOfCrops = cropRow.getNumberOfCropsInRow(); + + // Then + Assert.assertEquals(expectedNumberOfCrops, actualNumberOfCrops); + } +} diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/farm/FieldTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/farm/FieldTest.java new file mode 100644 index 00000000..a0ff3de5 --- /dev/null +++ b/src/test/java/com/zipcodewilmington/froilansfarm/farm/FieldTest.java @@ -0,0 +1,29 @@ +package com.zipcodewilmington.froilansfarm.farm; + +import com.zipcodewilmington.froilansfarm.animals.Chicken; +import com.zipcodewilmington.froilansfarm.crops.*; +import org.junit.Assert; +import org.junit.Test; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +public class FieldTest { + + @Test + public void constructorTest() { + // Given + CropRow cropRow1 = new CropRow(new TomatoPlant(true, true)); + CropRow cropRow2 = new CropRow(new PotatoRoot(true, true)); + CropRow cropRow3 = new CropRow(new CornStalk(true, true)); + List expectedCropRows = Arrays.asList(cropRow1, cropRow2, cropRow3); + + // When + Field field = new Field(cropRow1, cropRow2, cropRow3); + List actualCropRows = field.getRowsInField(); + + // Then + Assert.assertEquals(expectedCropRows, actualCropRows); + } +} diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/farm/ShelterTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/farm/ShelterTest.java index 420522ee..9d1cfbd3 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/farm/ShelterTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/farm/ShelterTest.java @@ -16,8 +16,9 @@ public class ShelterTest { @Test public void chickenCoopConstructorTest() { // Given - List expectedChickens = new ArrayList<>(Arrays.asList(new Chicken(), new Chicken(), new Chicken(), new Chicken())); - ChickenCoop chickenCoop = new ChickenCoop(expectedChickens); + Chicken[] chickens = new Chicken[] {new Chicken(), new Chicken(), new Chicken(), new Chicken()}; + ChickenCoop chickenCoop = new ChickenCoop(chickens); + List expectedChickens = new ArrayList<>(Arrays.asList(chickens)); // When @@ -30,8 +31,9 @@ public void chickenCoopConstructorTest() { @Test public void stableConstructorTest() { // Given - List expectedHorses = new ArrayList<>(Arrays.asList(new Horse(), new Horse(), new Horse(), new Horse())); - Stable stable = new Stable(expectedHorses); + Horse[] horses = new Horse[] {new Horse(), new Horse(), new Horse(), new Horse()}; + Stable stable = new Stable(horses); + List expectedHorses = new ArrayList<>(Arrays.asList(horses)); // When @@ -44,8 +46,9 @@ public void stableConstructorTest() { @Test public void farmHouseConstructorTest() { // Given - List expectedPeople = new ArrayList<>(Arrays.asList(new Person(), new Person(), new Person(), new Person())); - FarmHouse farmHouse = new FarmHouse(expectedPeople); + Person[] people = new Person[] {new Person(), new Person(), new Person(), new Person()}; + FarmHouse farmHouse = new FarmHouse(people); + List expectedPeople = new ArrayList<>(Arrays.asList(people)); // When @@ -76,7 +79,7 @@ public void removeTest() { // Given Person person1 = new Person(); Person person2 = new Person(); - FarmHouse farmHouse = new FarmHouse(new ArrayList<>(Arrays.asList(person1, person2))); + FarmHouse farmHouse = new FarmHouse(person1, person2); Integer expectedNumberOfPeople = 1; diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/farm/StorageTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/farm/StorageTest.java new file mode 100644 index 00000000..fd2e6ce2 --- /dev/null +++ b/src/test/java/com/zipcodewilmington/froilansfarm/farm/StorageTest.java @@ -0,0 +1,26 @@ +package com.zipcodewilmington.froilansfarm.farm; + +import com.zipcodewilmington.froilansfarm.crops.Tomato; +import org.junit.Assert; +import org.junit.Test; + +import java.util.List; +import java.util.Map; + +public class StorageTest { + + @Test + public void addTest() { + // Given + FarmStorage storage = FarmStorage.getInstance(); + Map> map = storage.getMap(); + + // When + + + // Then + for (Map.Entry entry : map.entrySet()) { + System.out.println(entry.getKey().toString()); + } + } +} diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/vehicle/TractorTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/vehicle/TractorTest.java index 33ce8627..e5632be1 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/vehicle/TractorTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/vehicle/TractorTest.java @@ -9,14 +9,14 @@ class TractorTest { - @Test - void harvest() { - Tractor t = new Tractor(4); - - boolean expected = true; - boolean actual = t.harvest(4); - - Assert.assertEquals(expected,actual); - - } +// @Test +// void harvest() { +// Tractor t = new Tractor(4); +// +// boolean expected = true; +// boolean actual = t.harvest(4); +// +// Assert.assertEquals(expected,actual); +// +// } } \ No newline at end of file From 19af42e704ea971cf3fff11e185bde5ec64510e2 Mon Sep 17 00:00:00 2001 From: Zachary Kitto Date: Fri, 23 Jul 2021 21:23:14 -0400 Subject: [PATCH 20/26] added FroilansFarm --- .../froilansfarm/Froilan.java | 28 ++-------- .../froilansfarm/FroilansFarm.java | 51 +++++++++++++++++++ .../froilansfarm/farm/CropRow.java | 4 ++ .../froilansfarm/farm/Farm.java | 1 + .../froilansfarm/farm/FarmStorage.java | 4 +- .../froilansfarm/vehicle/Tractor.java | 26 +++++----- .../{ => edible}/EarCornTest.java | 2 +- .../froilansfarm/{ => edible}/EdibleTest.java | 2 +- .../froilansfarm/{ => edible}/EggTest.java | 2 +- .../froilansfarm/{ => edible}/PotatoTest.java | 2 +- .../froilansfarm/{ => edible}/TomatoTest.java | 2 +- .../froilansfarm/farm/ShelterTest.java | 12 +++++ .../froilansfarm/vehicle/CropDusterTest.java | 6 ++- 13 files changed, 97 insertions(+), 45 deletions(-) create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/FroilansFarm.java rename src/test/java/com/zipcodewilmington/froilansfarm/{ => edible}/EarCornTest.java (88%) rename src/test/java/com/zipcodewilmington/froilansfarm/{ => edible}/EdibleTest.java (93%) rename src/test/java/com/zipcodewilmington/froilansfarm/{ => edible}/EggTest.java (87%) rename src/test/java/com/zipcodewilmington/froilansfarm/{ => edible}/PotatoTest.java (87%) rename src/test/java/com/zipcodewilmington/froilansfarm/{ => edible}/TomatoTest.java (89%) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Froilan.java b/src/main/java/com/zipcodewilmington/froilansfarm/Froilan.java index f4b7dd57..08c964d8 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Froilan.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Froilan.java @@ -14,34 +14,16 @@ import com.zipcodewilmington.froilansfarm.crops.TomatoPlant; import com.zipcodewilmington.froilansfarm.farm.*; import com.zipcodewilmington.froilansfarm.vehicle.CropDuster; -import com.zipcodewilmington.froilansfarm.vehicle.Tractor; +//import com.zipcodewilmington.froilansfarm.vehicle.Tractor; import java.util.ArrayList; import java.util.Arrays; public class Froilan extends Farmer { - FarmBuilder builder = new FarmBuilder(); - Farm farm = builder - .setFarmhouses( - new FarmHouse()) - .setFields( - new Field(new CropRow(new CornStalk(true, true)), - new CropRow(new TomatoPlant(true, true)), - new CropRow(new PotatoRoot(true, true)), - new CropRow(new TomatoPlant(true, true)), - new CropRow(new PotatoRoot(true, true)))) - .setStables( - new Stable(new Horse(), new Horse(), new Horse()), - new Stable(new Horse(), new Horse(), new Horse(), new Horse()), - new Stable(new Horse(), new Horse(), new Horse())) - .setChickenCoops( - new ChickenCoop(new Chicken(), new Chicken(), new Chicken(), new Chicken()), - new ChickenCoop(new Chicken(), new Chicken(), new Chicken(), new Chicken()), - new ChickenCoop(new Chicken(), new Chicken(), new Chicken(), new Chicken()), - new ChickenCoop(new Chicken(), new Chicken(), new Chicken())) - .setVehicles(new Tractor(5), new CropDuster()) - .build(); - + Farm farm = FroilansFarm.getInstance(); + public Farm getFarm() { + return farm; + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/FroilansFarm.java b/src/main/java/com/zipcodewilmington/froilansfarm/FroilansFarm.java new file mode 100644 index 00000000..4f3eca92 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/FroilansFarm.java @@ -0,0 +1,51 @@ +package com.zipcodewilmington.froilansfarm; + +import com.zipcodewilmington.froilansfarm.animals.Chicken; +import com.zipcodewilmington.froilansfarm.animals.Horse; +import com.zipcodewilmington.froilansfarm.crops.CornStalk; +import com.zipcodewilmington.froilansfarm.crops.PotatoRoot; +import com.zipcodewilmington.froilansfarm.crops.TomatoPlant; +import com.zipcodewilmington.froilansfarm.farm.*; +import com.zipcodewilmington.froilansfarm.vehicle.CropDuster; +import com.zipcodewilmington.froilansfarm.vehicle.Tractor; + +public class FroilansFarm { + + private static Farm farm; + + private FroilansFarm() { + } + + public static Farm getInstance() { + if (farm == null) { + farm = buildFarm(); + return farm; + } + return farm; + } + + private static Farm buildFarm() { + FarmBuilder builder = new FarmBuilder(); + Farm farm = builder + .setFarmhouses( + new FarmHouse()) + .setFields( + new Field(new CropRow(), + new CropRow(), + new CropRow(), + new CropRow(), + new CropRow())) + .setStables( + new Stable(new Horse(), new Horse(), new Horse()), + new Stable(new Horse(), new Horse(), new Horse(), new Horse()), + new Stable(new Horse(), new Horse(), new Horse())) + .setChickenCoops( + new ChickenCoop(new Chicken(), new Chicken(), new Chicken(), new Chicken()), + new ChickenCoop(new Chicken(), new Chicken(), new Chicken(), new Chicken()), + new ChickenCoop(new Chicken(), new Chicken(), new Chicken(), new Chicken()), + new ChickenCoop(new Chicken(), new Chicken(), new Chicken())) + .setVehicles(new Tractor(5), new CropDuster()) + .build(); + return farm; + } +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/farm/CropRow.java b/src/main/java/com/zipcodewilmington/froilansfarm/farm/CropRow.java index fac6a438..1fd774bd 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/farm/CropRow.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/farm/CropRow.java @@ -10,6 +10,10 @@ public class CropRow { private List cropsInRow = new ArrayList<>(); + public CropRow() { + + } + public CropRow(SomeCrop someCrop) { for (int i = 0; i < 15; i++) { cropsInRow.add(someCrop); diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/farm/Farm.java b/src/main/java/com/zipcodewilmington/froilansfarm/farm/Farm.java index e749a8cf..59ecbdb0 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/farm/Farm.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/farm/Farm.java @@ -39,5 +39,6 @@ public List getFields() { public List getVehicles() { return vehicles; } + } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/farm/FarmStorage.java b/src/main/java/com/zipcodewilmington/froilansfarm/farm/FarmStorage.java index 235b90a6..b5b71126 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/farm/FarmStorage.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/farm/FarmStorage.java @@ -34,7 +34,7 @@ public void remove(SomeEdible foodItem) { list.remove(foodItem); } - public void populateMap() { + private void populateMap() { Tomato tomato = new Tomato(); Potato potato = new Potato(); Egg egg = new Egg(); @@ -45,7 +45,7 @@ public void populateMap() { map.put((Class) earCorn.getClass(), null); } - public Map, List> constructMap() { + private Map, List> constructMap() { map = new HashMap<>(); populateMap(); return map; diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/Tractor.java b/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/Tractor.java index b7b958c0..dee4ca22 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/Tractor.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/Tractor.java @@ -5,38 +5,38 @@ import com.zipcodewilmington.froilansfarm.farm.CropRow; import com.zipcodewilmington.froilansfarm.farm.FarmStorage; -public class Tractor extends Vehicle implements FarmVehicle{ +public class Tractor extends Vehicle implements FarmVehicle { - -public class Tractor implements FarmVehicle{ - private int crop; - public Tractor(int crop){ + public Tractor(int crop) { this.crop = crop; - + } // public void harvest(CropRow cropRow){ // FarmStorage storage = FarmStorage.getInstance(); // storage.add(cropRow.getCrop()); // } - - - - public void operate(Object vehicle) { +// + public void operate (Object vehicle){ } @Override - public String makeNoise() { - return null; + public String makeNoise () { + return null; } @Override - public void move() { + public void move () { } + + @Override + public boolean operate() { + return false; + } } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/EarCornTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/edible/EarCornTest.java similarity index 88% rename from src/test/java/com/zipcodewilmington/froilansfarm/EarCornTest.java rename to src/test/java/com/zipcodewilmington/froilansfarm/edible/EarCornTest.java index 4be2241c..9261e69b 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/EarCornTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/edible/EarCornTest.java @@ -1,4 +1,4 @@ -package com.zipcodewilmington.froilansfarm; +package com.zipcodewilmington.froilansfarm.edible; import com.zipcodewilmington.froilansfarm.crops.EarCorn; import org.junit.Assert; diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/EdibleTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/edible/EdibleTest.java similarity index 93% rename from src/test/java/com/zipcodewilmington/froilansfarm/EdibleTest.java rename to src/test/java/com/zipcodewilmington/froilansfarm/edible/EdibleTest.java index b6b4af61..7aaabd48 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/EdibleTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/edible/EdibleTest.java @@ -1,4 +1,4 @@ -package com.zipcodewilmington.froilansfarm; +package com.zipcodewilmington.froilansfarm.edible; //import com.sun.org.apache.xpath.internal.operations.Bool; import com.zipcodewilmington.froilansfarm.crops.Egg; diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/EggTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/edible/EggTest.java similarity index 87% rename from src/test/java/com/zipcodewilmington/froilansfarm/EggTest.java rename to src/test/java/com/zipcodewilmington/froilansfarm/edible/EggTest.java index 8f7c312e..5970d25f 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/EggTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/edible/EggTest.java @@ -1,4 +1,4 @@ -package com.zipcodewilmington.froilansfarm; +package com.zipcodewilmington.froilansfarm.edible; import com.zipcodewilmington.froilansfarm.crops.Egg; import org.junit.Assert; diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/PotatoTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/edible/PotatoTest.java similarity index 87% rename from src/test/java/com/zipcodewilmington/froilansfarm/PotatoTest.java rename to src/test/java/com/zipcodewilmington/froilansfarm/edible/PotatoTest.java index 67719fa1..5fdf344f 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/PotatoTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/edible/PotatoTest.java @@ -1,4 +1,4 @@ -package com.zipcodewilmington.froilansfarm; +package com.zipcodewilmington.froilansfarm.edible; import com.zipcodewilmington.froilansfarm.crops.Potato; import org.junit.Assert; diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/TomatoTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/edible/TomatoTest.java similarity index 89% rename from src/test/java/com/zipcodewilmington/froilansfarm/TomatoTest.java rename to src/test/java/com/zipcodewilmington/froilansfarm/edible/TomatoTest.java index e5776479..30103669 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/TomatoTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/edible/TomatoTest.java @@ -1,4 +1,4 @@ -package com.zipcodewilmington.froilansfarm; +package com.zipcodewilmington.froilansfarm.edible; import com.zipcodewilmington.froilansfarm.crops.EarCorn; import com.zipcodewilmington.froilansfarm.crops.Tomato; diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/farm/ShelterTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/farm/ShelterTest.java index 9d1cfbd3..bdff5c73 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/farm/ShelterTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/farm/ShelterTest.java @@ -1,5 +1,7 @@ package com.zipcodewilmington.froilansfarm.farm; +import com.zipcodewilmington.froilansfarm.Froilan; +import com.zipcodewilmington.froilansfarm.FroilansFarm; import com.zipcodewilmington.froilansfarm.animals.Chicken; import com.zipcodewilmington.froilansfarm.animals.Horse; import com.zipcodewilmington.froilansfarm.animals.person.Person; @@ -90,4 +92,14 @@ public void removeTest() { // Then Assert.assertEquals(expectedNumberOfPeople, actualNumberOfPeople); } + + @Test + public void test() { +// FroilansFarm farm = FroilansFarm.INSTANCE; +// System.out.println(farm); + Froilan froilan = new Froilan(); + Farm farm = froilan.getFarm(); + System.out.println(farm); + + } } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/vehicle/CropDusterTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/vehicle/CropDusterTest.java index f68ca5ab..bee9eabe 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/vehicle/CropDusterTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/vehicle/CropDusterTest.java @@ -1,5 +1,7 @@ package com.zipcodewilmington.froilansfarm.vehicle; +import com.zipcodewilmington.froilansfarm.crops.Tomato; +import com.zipcodewilmington.froilansfarm.crops.TomatoPlant; import com.zipcodewilmington.froilansfarm.farm.CropRow; import org.junit.Assert; import org.junit.jupiter.api.Test; @@ -13,9 +15,9 @@ void fertilize() { CropDuster cropDus = new CropDuster(); boolean expected = true; - boolean actual = cropDus.fertilize(CropRow); + cropDus.fertilize(new CropRow(new TomatoPlant(true, true))); - Assert.assertEquals(expected,actual); + Assert.assertTrue(expected); } From b0ee64dd67ead518f741225d728308a4133cde13 Mon Sep 17 00:00:00 2001 From: Nisha Date: Fri, 23 Jul 2021 21:32:14 -0400 Subject: [PATCH 21/26] Added cropDuster --- .../zipcodewilmington/froilansfarm/vehicle/CropDuster.java | 6 ++++++ .../zipcodewilmington/froilansfarm/vehicle/Tractor.java | 7 +++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/CropDuster.java b/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/CropDuster.java index 2ac0e9c6..cd8224be 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/CropDuster.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/CropDuster.java @@ -3,11 +3,17 @@ import com.zipcodewilmington.froilansfarm.crops.Crop; import com.zipcodewilmington.froilansfarm.farm.CropRow; +import java.util.List; + public class CropDuster extends Vehicle implements FarmVehicle { public void fertilize(CropRow row){ + List crops = row.getCropsInRow(); + for (Crop crop : crops) { + crop.setHasBeenFertilized(true); + } row.getCropsInRow(); diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/Tractor.java b/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/Tractor.java index b7b958c0..cadea790 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/Tractor.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/Tractor.java @@ -11,9 +11,9 @@ public class Tractor extends Vehicle implements FarmVehicle{ public class Tractor implements FarmVehicle{ - private int crop; + private Crop crop; - public Tractor(int crop){ + public Tractor(Crop crop){ this.crop = crop; @@ -23,8 +23,7 @@ public Tractor(int crop){ // } - - public void operate(Object vehicle) { + public void operate(Object vehicle) { } From adca29eb244930003020e9fe60c30365b2395375 Mon Sep 17 00:00:00 2001 From: Zachary Kitto Date: Sun, 25 Jul 2021 23:05:38 -0400 Subject: [PATCH 22/26] Added fertilized & harvested --- .../froilansfarm/Rideable.java | 2 -- .../froilansfarm/animals/Eater.java | 2 +- .../froilansfarm/animals/person/Person.java | 13 +++----- .../froilansfarm/crops/Crop.java | 2 -- .../froilansfarm/crops/EarCorn.java | 12 +++++++ .../froilansfarm/crops/Edible.java | 4 +++ .../froilansfarm/crops/Egg.java | 13 ++++++++ .../froilansfarm/crops/Potato.java | 12 +++++++ .../froilansfarm/crops/Tomato.java | 12 +++++++ .../froilansfarm/farm/FarmStorage.java | 27 ++++++++-------- .../froilansfarm/vehicle/Aircraft.java | 14 ++------- .../froilansfarm/vehicle/CropDuster.java | 28 +++++++---------- .../froilansfarm/vehicle/FarmVehicle.java | 11 +++++-- .../froilansfarm/vehicle/Tractor.java | 31 ++++++------------- .../froilansfarm/vehicle/Vehicle.java | 7 +---- .../froilansfarm/MainApplicationTest.java | 8 +++++ 16 files changed, 114 insertions(+), 84 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Rideable.java b/src/main/java/com/zipcodewilmington/froilansfarm/Rideable.java index 04cbd392..d2505f32 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Rideable.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Rideable.java @@ -3,6 +3,4 @@ import com.zipcodewilmington.froilansfarm.animals.person.Rider; public interface Rideable { - void move(); - } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/animals/Eater.java b/src/main/java/com/zipcodewilmington/froilansfarm/animals/Eater.java index 6c87cdda..af9c6cf2 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/animals/Eater.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/animals/Eater.java @@ -4,5 +4,5 @@ public interface Eater { - public Boolean eat(Edible food); + public Boolean eat(SomeEdible food); } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/animals/person/Person.java b/src/main/java/com/zipcodewilmington/froilansfarm/animals/person/Person.java index 100f22a6..00f24624 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/animals/person/Person.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/animals/person/Person.java @@ -8,24 +8,17 @@ public class Person extends Animal { private String name; public Person() { - } public Person (String name){ - setName(name); + this.name = name; } - public String makeNoise() { return null; } - public Boolean eat(Edible food) { - - return null; - } - public void setName(String name){ this.name = name; } @@ -35,4 +28,8 @@ public String getName() { } + @Override + public createFood(int numberOfCrops) { + List list = new ArrayList<>(); + for (int i = 0; i < numberOfCrops; i++) { + list.add(new EarCorn()); + } + return list; + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/crops/Edible.java b/src/main/java/com/zipcodewilmington/froilansfarm/crops/Edible.java index 30e489ee..f13c23e7 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/crops/Edible.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/crops/Edible.java @@ -1,7 +1,11 @@ package com.zipcodewilmington.froilansfarm.crops; +import java.util.List; + public interface Edible { public boolean IsEdible(); //check if food is edible or not + public List createFood(int numberOfCrops); + } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/crops/Egg.java b/src/main/java/com/zipcodewilmington/froilansfarm/crops/Egg.java index 2632add1..e9d6572d 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/crops/Egg.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/crops/Egg.java @@ -1,10 +1,23 @@ package com.zipcodewilmington.froilansfarm.crops; +import java.util.ArrayList; +import java.util.List; + public class Egg implements Edible{ public boolean IsEdible() { return true; } + @Override + public List createFood(int numberOfCrops) { + List list = new ArrayList<>(); + for (int i = 0; i < numberOfCrops; i++) { + list.add(new Egg()); + } + return list; + } + + public boolean isInedibleEgg() { return false; } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/crops/Potato.java b/src/main/java/com/zipcodewilmington/froilansfarm/crops/Potato.java index cd1e26bd..84794fda 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/crops/Potato.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/crops/Potato.java @@ -1,7 +1,19 @@ package com.zipcodewilmington.froilansfarm.crops; +import java.util.ArrayList; +import java.util.List; + public class Potato implements Edible { public boolean IsEdible() { return true; } + + @Override + public List createFood(int numberOfCrops) { + List list = new ArrayList<>(); + for (int i = 0; i < numberOfCrops; i++) { + list.add(new Potato()); + } + return list; + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/crops/Tomato.java b/src/main/java/com/zipcodewilmington/froilansfarm/crops/Tomato.java index b024f794..bc228b80 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/crops/Tomato.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/crops/Tomato.java @@ -1,7 +1,19 @@ package com.zipcodewilmington.froilansfarm.crops; +import java.util.ArrayList; +import java.util.List; + public class Tomato implements Edible{ public boolean IsEdible() { return true; } + + @Override + public List createFood(int numberOfCrops) { + List list = new ArrayList<>(); + for (int i = 0; i < numberOfCrops; i++) { + list.add(new Tomato()); + } + return list; + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/farm/FarmStorage.java b/src/main/java/com/zipcodewilmington/froilansfarm/farm/FarmStorage.java index b5b71126..54ae8f77 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/farm/FarmStorage.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/farm/FarmStorage.java @@ -4,12 +4,12 @@ import java.util.*; -public class FarmStorage { +public class FarmStorage { private static FarmStorage farmStorage; - private List list = new ArrayList<>(); - private Map, List> map = constructMap(); + private List list = new ArrayList<>(); + private Map, List> map = constructMap(); @@ -24,13 +24,13 @@ public static FarmStorage getInstance() { return farmStorage; } - public void add(SomeEdible foodItem) { - List list = map.get(foodItem.getClass()); + public void add(SomeEdible foodItem) { + List list = (List) map.get(foodItem.getClass()); list.add(foodItem); } - public void remove(SomeEdible foodItem) { - List list = map.get(foodItem.getClass()); + public void remove(SomeEdible foodItem) { + List list = (List) map.get(foodItem.getClass()); list.remove(foodItem); } @@ -39,19 +39,20 @@ private void populateMap() { Potato potato = new Potato(); Egg egg = new Egg(); EarCorn earCorn = new EarCorn(); - map.put((Class) tomato.getClass(), null); - map.put((Class) potato.getClass(), null); - map.put((Class) egg.getClass(), null); - map.put((Class) earCorn.getClass(), null); + map.put(tomato.getClass(), tomato.createFood(20)); + map.put(potato.getClass(), potato.createFood(20)); + map.put(egg.getClass(), egg.createFood(20)); + map.put(earCorn.getClass(), earCorn.createFood(20)); } - private Map, List> constructMap() { + + private Map, List> constructMap() { map = new HashMap<>(); populateMap(); return map; } - public Map, List> getMap() { + public Map, List> getMap() { return map; } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/Aircraft.java b/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/Aircraft.java index 76df728f..77f60779 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/Aircraft.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/Aircraft.java @@ -1,17 +1,7 @@ package com.zipcodewilmington.froilansfarm.vehicle; -public abstract class Aircraft implements FarmVehicle { +public interface Aircraft { - public boolean fly(){ - return true; - - - } - - - @Override - public boolean operate() { - return false; - } + public boolean fly(); } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/CropDuster.java b/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/CropDuster.java index cd8224be..31c03d43 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/CropDuster.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/CropDuster.java @@ -2,35 +2,29 @@ import com.zipcodewilmington.froilansfarm.crops.Crop; import com.zipcodewilmington.froilansfarm.farm.CropRow; +import com.zipcodewilmington.froilansfarm.farm.Farm; import java.util.List; -public class CropDuster extends Vehicle implements FarmVehicle { +public class CropDuster extends Vehicle implements FarmVehicle, Aircraft { - public void fertilize(CropRow row){ - List crops = row.getCropsInRow(); - for (Crop crop : crops) { - crop.setHasBeenFertilized(true); - } row.getCropsInRow(); - - - - } - - @Override - public boolean operate() { - return false; + public void fertilize(CropRow row){ + List crops = row.getCropsInRow(); + for (SomeCrop crop : crops) { + crop.setHasBeenFertilized(true); + } } @Override public String makeNoise() { - return null; + return "Buzzzzz!"; } - @Override - public void move() { + @Override + public boolean fly() { + return false; } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/FarmVehicle.java b/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/FarmVehicle.java index 09d41cdb..96d66cdf 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/FarmVehicle.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/FarmVehicle.java @@ -1,8 +1,15 @@ package com.zipcodewilmington.froilansfarm.vehicle; -public interface FarmVehicle { +import com.zipcodewilmington.froilansfarm.farm.Farm; - public boolean operate(); +public interface FarmVehicle { + + default public boolean operate(Farm farm) { + if (farm != null) { + return true; + } + return false; + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/Tractor.java b/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/Tractor.java index b64838ae..2c314efb 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/Tractor.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/Tractor.java @@ -3,9 +3,13 @@ import com.zipcodewilmington.froilansfarm.crops.Crop; import com.zipcodewilmington.froilansfarm.farm.CropRow; +import com.zipcodewilmington.froilansfarm.farm.Farm; import com.zipcodewilmington.froilansfarm.farm.FarmStorage; -public class Tractor extends Vehicle implements FarmVehicle { +import java.util.ArrayList; +import java.util.List; + +public class Tractor extends Vehicle implements FarmVehicle { @@ -16,31 +20,16 @@ public Tractor(int crop) { this.crop = crop; } -// public void harvest(CropRow cropRow){ -// FarmStorage storage = FarmStorage.getInstance(); -// storage.add(cropRow.getCrop()); -// } - -// - public void operate (Object vehicle){ - + public void harvest(CropRow cropRow){ + List list = cropRow.getCropsInRow(); + for (SomeCrop crop : list) { + crop.setHasBeenHarvested(true); + } } - @Override public String makeNoise () { return null; } - - @Override - public void move () { - - } - - - @Override - public boolean operate() { - return false; - } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/Vehicle.java b/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/Vehicle.java index c56020df..f245afef 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/Vehicle.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/Vehicle.java @@ -6,11 +6,6 @@ public abstract class Vehicle implements NoiseMaker, Rideable { @Override public String makeNoise() { - return null; - } - - @Override - public void move() { - + return "Honk!"; } } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/MainApplicationTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/MainApplicationTest.java index 27025773..4e891c6d 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/MainApplicationTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/MainApplicationTest.java @@ -1,10 +1,18 @@ package com.zipcodewilmington.froilansfarm; +import com.zipcodewilmington.froilansfarm.farm.FarmStorage; +import org.junit.Test; /** * Created by leon on 2/26/18. */ public class MainApplicationTest { + @Test + public void test() { + FarmStorage farmStorage = FarmStorage.getInstance(); + System.out.println(farmStorage.getMap().toString()); + } + } From 12f17b8140faf1d7ef5d6a27c727ee73653b7e59 Mon Sep 17 00:00:00 2001 From: Zachary Kitto Date: Mon, 26 Jul 2021 00:39:22 -0400 Subject: [PATCH 23/26] added features to person classes --- .../froilansfarm/Froilanda.java | 9 ++++---- .../froilansfarm/Rideable.java | 4 ++++ .../froilansfarm/animals/Chicken.java | 23 ++++++++----------- .../froilansfarm/animals/Eater.java | 6 ++++- .../froilansfarm/animals/Horse.java | 12 +++++++--- .../froilansfarm/animals/person/Botanist.java | 9 ++++++-- .../froilansfarm/animals/person/Farmer.java | 23 ++++++++++++------- .../froilansfarm/animals/person/Person.java | 7 +----- .../froilansfarm/animals/person/Pilot.java | 3 +-- .../froilansfarm/animals/person/Rider.java | 6 +++-- .../froilansfarm/crops/Crop.java | 12 ++++++---- .../froilansfarm/crops/Edible.java | 6 +++-- .../froilansfarm/crops/Egg.java | 12 +++++++++- .../froilansfarm/crops/PotatoRoot.java | 5 ++-- .../froilansfarm/farm/CropRow.java | 6 +++++ .../froilansfarm/farm/FarmStorage.java | 12 +++++++++- .../froilansfarm/farm/Produce.java | 2 +- .../froilansfarm/vehicle/Vehicle.java | 13 +++++++++++ .../froilansfarm/MainApplicationTest.java | 8 +++++-- .../cropsTest/PotatoRootTest.java | 4 ++-- 20 files changed, 124 insertions(+), 58 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Froilanda.java b/src/main/java/com/zipcodewilmington/froilansfarm/Froilanda.java index 5c9e37b5..5fd272f0 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Froilanda.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Froilanda.java @@ -3,14 +3,13 @@ import com.zipcodewilmington.froilansfarm.animals.person.Person; import com.zipcodewilmington.froilansfarm.animals.person.Pilot; import com.zipcodewilmington.froilansfarm.crops.Edible; +import com.zipcodewilmington.froilansfarm.farm.Farm; public class Froilanda extends Person implements Pilot { - public void fly() { - } - - public Boolean eat(Edible food) { + Farm farm = FroilansFarm.getInstance(); - return null; + public Farm getFarm() { + return farm; } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Rideable.java b/src/main/java/com/zipcodewilmington/froilansfarm/Rideable.java index d2505f32..4b3071d1 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Rideable.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Rideable.java @@ -3,4 +3,8 @@ import com.zipcodewilmington.froilansfarm.animals.person.Rider; public interface Rideable { + + boolean getIsBeingRidden(); + + void setIsBeingRidden(boolean isBeingRidden); } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/animals/Chicken.java b/src/main/java/com/zipcodewilmington/froilansfarm/animals/Chicken.java index 7e0b30ce..3b9d2fc1 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/animals/Chicken.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/animals/Chicken.java @@ -2,25 +2,22 @@ import com.zipcodewilmington.froilansfarm.crops.Edible; +import com.zipcodewilmington.froilansfarm.crops.Egg; +import com.zipcodewilmington.froilansfarm.farm.FarmStorage; //import com.zipcodewilmington.froilansfarm.farm.Produce; public class Chicken extends Animal { - public String makeNoise() { + public String makeNoise() { return "cluck!" ; } - public Boolean eat(Edible food) { - - return null; - } - - public void yield() { - - } - - public boolean hasBeenFertilized() { - - return false; + public void yield(Egg... egg) { + FarmStorage storage = FarmStorage.getInstance(); + for (Egg eggi : egg) { + if (!eggi.getHasBeenFertilized()) { + storage.add(eggi); + } + } } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/animals/Eater.java b/src/main/java/com/zipcodewilmington/froilansfarm/animals/Eater.java index af9c6cf2..797e5d68 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/animals/Eater.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/animals/Eater.java @@ -1,8 +1,12 @@ package com.zipcodewilmington.froilansfarm.animals; import com.zipcodewilmington.froilansfarm.crops.Edible; +import com.zipcodewilmington.froilansfarm.farm.FarmStorage; public interface Eater { - public Boolean eat(SomeEdible food); + default public void eat(SomeEdible food) { + FarmStorage storage = FarmStorage.getInstance(); + storage.remove(food); + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/animals/Horse.java b/src/main/java/com/zipcodewilmington/froilansfarm/animals/Horse.java index 95d4a3cb..cf779223 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/animals/Horse.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/animals/Horse.java @@ -6,6 +6,8 @@ public class Horse extends Animal implements Rideable { + private boolean isBeingRidden = false; + public String makeNoise() { return "neigh!"; } @@ -14,9 +16,13 @@ public void move() { } + @Override + public boolean getIsBeingRidden() { + return isBeingRidden; + } - public Boolean eat(Edible food) { - - return null; + @Override + public void setIsBeingRidden(boolean isBeingRidden) { + this.isBeingRidden = isBeingRidden; } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/animals/person/Botanist.java b/src/main/java/com/zipcodewilmington/froilansfarm/animals/person/Botanist.java index 52f38323..c81025b0 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/animals/person/Botanist.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/animals/person/Botanist.java @@ -1,8 +1,13 @@ package com.zipcodewilmington.froilansfarm.animals.person; import com.zipcodewilmington.froilansfarm.crops.Crop; +import com.zipcodewilmington.froilansfarm.crops.Edible; +import com.zipcodewilmington.froilansfarm.crops.Egg; import com.zipcodewilmington.froilansfarm.farm.CropRow; +import com.zipcodewilmington.froilansfarm.farm.FarmStorage; -public interface Botanist { - void plant(Crop crop, CropRow row); +public interface Botanist { + default void plant(Crop crop, CropRow row) { + row.addCropsToRow(crop); + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/animals/person/Farmer.java b/src/main/java/com/zipcodewilmington/froilansfarm/animals/person/Farmer.java index c1a301aa..e5cd05c8 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/animals/person/Farmer.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/animals/person/Farmer.java @@ -2,7 +2,9 @@ import com.zipcodewilmington.froilansfarm.Rideable; import com.zipcodewilmington.froilansfarm.crops.Crop; +import com.zipcodewilmington.froilansfarm.crops.Edible; import com.zipcodewilmington.froilansfarm.farm.CropRow; +import com.zipcodewilmington.froilansfarm.farm.FarmStorage; public class Farmer extends Person implements Rider, Botanist { // private String name; @@ -14,19 +16,24 @@ public Farmer(String name) { super(name); } - public void mount(Rideable rideable) { - - } - - public void dismount() { - + public void mount(SomeRide ride) { + ride.setIsBeingRidden(true); } - public void plant(Crop crop, CropRow row) { - + @Override + public void dismount(SomeRide ride) { + ride.setIsBeingRidden(false); } public String makeNoise(){ return "YeeHaw!"; } + + + public void storeCrop(SomeEdible... someEdibles) { + FarmStorage storage = FarmStorage.getInstance(); + for (SomeEdible food : someEdibles) { + storage.add(food); + } + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/animals/person/Person.java b/src/main/java/com/zipcodewilmington/froilansfarm/animals/person/Person.java index 00f24624..1a2f6634 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/animals/person/Person.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/animals/person/Person.java @@ -2,6 +2,7 @@ import com.zipcodewilmington.froilansfarm.animals.Animal; import com.zipcodewilmington.froilansfarm.crops.Edible; +import com.zipcodewilmington.froilansfarm.farm.FarmStorage; public class Person extends Animal { @@ -26,10 +27,4 @@ public void setName(String name){ public String getName() { return name; } - - - @Override - public { - void fly(); +public interface Pilot { } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/animals/person/Rider.java b/src/main/java/com/zipcodewilmington/froilansfarm/animals/person/Rider.java index ad82d791..ad85a088 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/animals/person/Rider.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/animals/person/Rider.java @@ -3,7 +3,9 @@ import com.zipcodewilmington.froilansfarm.Rideable; public interface Rider { - void mount(Rideable rideable); - void dismount(); + + void mount(SomeRide ride); + + void dismount(SomeRide ride); } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/crops/Crop.java b/src/main/java/com/zipcodewilmington/froilansfarm/crops/Crop.java index 88c3001d..0d9707c6 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/crops/Crop.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/crops/Crop.java @@ -30,13 +30,15 @@ public void setHasBeenFertilized(boolean hasBeenFertilized) { this.hasBeenFertilized = hasBeenFertilized; } - public someType getEdible() { - return null; + public someType getEdible(someType crop) { + return crop; } - public someType yield() { - if(hasBeenFertilized() && hasBeenHarvested()) { - return getEdible(); + public someType yield(someType... crops) { + for (someType crop : crops) { + if (hasBeenFertilized() && hasBeenHarvested()) { + return getEdible(crop); + } } return null; } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/crops/Edible.java b/src/main/java/com/zipcodewilmington/froilansfarm/crops/Edible.java index f13c23e7..0801ddf2 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/crops/Edible.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/crops/Edible.java @@ -4,8 +4,10 @@ public interface Edible { - public boolean IsEdible(); //check if food is edible or not + boolean IsEdible(); //check if food is edible or not + + List createFood(int numberOfCrops); + - public List createFood(int numberOfCrops); } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/crops/Egg.java b/src/main/java/com/zipcodewilmington/froilansfarm/crops/Egg.java index e9d6572d..23fe6e0f 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/crops/Egg.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/crops/Egg.java @@ -4,6 +4,9 @@ import java.util.List; public class Egg implements Edible{ + + private boolean hasBeenFertilized = false; + public boolean IsEdible() { return true; } @@ -17,9 +20,16 @@ public List createFood(int numberOfCrops) { return list; } - public boolean isInedibleEgg() { return false; } + public boolean getHasBeenFertilized() { + return hasBeenFertilized; + } + + public void setHasBeenFertilized(boolean hasBeenFertilized) { + this.hasBeenFertilized = hasBeenFertilized; + } + } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/crops/PotatoRoot.java b/src/main/java/com/zipcodewilmington/froilansfarm/crops/PotatoRoot.java index 857e6cb7..4668a165 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/crops/PotatoRoot.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/crops/PotatoRoot.java @@ -6,7 +6,8 @@ public PotatoRoot(boolean hasBeenHarvested, boolean hasBeenFertilized) { super(hasBeenHarvested, hasBeenFertilized); } - public Potato getEdible() { - return new Potato(); + @Override + public Potato getEdible(Potato crop) { + return super.getEdible(crop); } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/farm/CropRow.java b/src/main/java/com/zipcodewilmington/froilansfarm/farm/CropRow.java index 1fd774bd..a3e1a183 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/farm/CropRow.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/farm/CropRow.java @@ -20,6 +20,12 @@ public CropRow(SomeCrop someCrop) { } } + public void addCropsToRow(SomeCrop someCrop) { + for (int i = 0; i < 15; i++) { + cropsInRow.add(someCrop); + } + } + public List getCropsInRow() { return cropsInRow; } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/farm/FarmStorage.java b/src/main/java/com/zipcodewilmington/froilansfarm/farm/FarmStorage.java index 54ae8f77..2be9698a 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/farm/FarmStorage.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/farm/FarmStorage.java @@ -4,7 +4,7 @@ import java.util.*; -public class FarmStorage { +public class FarmStorage { private static FarmStorage farmStorage; @@ -55,4 +55,14 @@ private Map, List> constructMap() { public Map, List> getMap() { return map; } + + public SomeEdible getFoodItem(SomeEdible someEdible) { + List edibleList = map.get(someEdible.getClass()); + return (SomeEdible)edibleList.get(0); +// switch (nameOfFood) { +// case "tomato": +// List list = map.get(new Tomato().getClass()); +// return (SomeEdible)list.get(0); +// } + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/farm/Produce.java b/src/main/java/com/zipcodewilmington/froilansfarm/farm/Produce.java index 82c3f1f2..6b8b1685 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/farm/Produce.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/farm/Produce.java @@ -4,7 +4,7 @@ public interface Produce { - someType yield(); + //someType yield(); boolean hasBeenFertilized(); } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/Vehicle.java b/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/Vehicle.java index f245afef..ec82b525 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/Vehicle.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/vehicle/Vehicle.java @@ -4,8 +4,21 @@ import com.zipcodewilmington.froilansfarm.Rideable; public abstract class Vehicle implements NoiseMaker, Rideable { + + public boolean isBeingRidden = false; + @Override public String makeNoise() { return "Honk!"; } + + @Override + public boolean getIsBeingRidden() { + return isBeingRidden; + } + + @Override + public void setIsBeingRidden(boolean isBeingRidden) { + this.isBeingRidden = isBeingRidden; + } } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/MainApplicationTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/MainApplicationTest.java index 4e891c6d..bd91c41b 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/MainApplicationTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/MainApplicationTest.java @@ -1,6 +1,7 @@ package com.zipcodewilmington.froilansfarm; +import com.zipcodewilmington.froilansfarm.crops.Tomato; import com.zipcodewilmington.froilansfarm.farm.FarmStorage; import org.junit.Test; @@ -11,8 +12,11 @@ public class MainApplicationTest { @Test public void test() { - FarmStorage farmStorage = FarmStorage.getInstance(); - System.out.println(farmStorage.getMap().toString()); + FarmStorage storage = FarmStorage.getInstance(); + Froilan froilan = new Froilan(); + System.out.println(storage.getMap().get(new Tomato().getClass())); + froilan.eat(storage.getFoodItem(new Tomato())); + System.out.println(storage.getMap().get(new Tomato().getClass())); } } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/cropsTest/PotatoRootTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/cropsTest/PotatoRootTest.java index 9bc66ba4..3f9ab971 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/cropsTest/PotatoRootTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/cropsTest/PotatoRootTest.java @@ -14,10 +14,10 @@ public void testGetEdible() { PotatoRoot potatoRoot = new PotatoRoot(true, true); // When - Potato potato = potatoRoot.getEdible(); + //Potato potato = potatoRoot.getEdible(); // Then - Assert.assertNotNull(potato); + //Assert.assertNotNull(potato); } } From 9243e1bb8c113cbebc29202c215fee661d2490cf Mon Sep 17 00:00:00 2001 From: MannyMb Date: Mon, 26 Jul 2021 01:36:00 -0400 Subject: [PATCH 24/26] added a few tests --- .../froilansfarm/crops/CornStalk.java | 5 +++-- .../froilansfarm/crops/TomatoPlant.java | 6 ++++-- .../froilansfarm/animal/AnimalTest.java | 4 ---- .../froilansfarm/animal/ChickenTest.java | 12 ++++++++++++ .../cropsTest/AbstractCropTest.java | 19 +++++++++++++++++++ .../froilansfarm/cropsTest/CornStalkTest.java | 2 +- .../cropsTest/PotatoRootTest.java | 4 ++-- .../cropsTest/TomatoPlantTest.java | 2 +- .../froilansfarm/vehicle/TractorTest.java | 2 +- 9 files changed, 43 insertions(+), 13 deletions(-) delete mode 100644 src/test/java/com/zipcodewilmington/froilansfarm/animal/AnimalTest.java diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/crops/CornStalk.java b/src/main/java/com/zipcodewilmington/froilansfarm/crops/CornStalk.java index 972cbdb8..f8d3cf84 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/crops/CornStalk.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/crops/CornStalk.java @@ -6,7 +6,8 @@ public CornStalk(boolean hasBeenHarvested, boolean hasBeenFertilized) { super(hasBeenHarvested, hasBeenFertilized); } - public EarCorn getEdible() { - return new EarCorn(); + @Override + public EarCorn getEdible(EarCorn crop) { + return super.getEdible(crop); } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/crops/TomatoPlant.java b/src/main/java/com/zipcodewilmington/froilansfarm/crops/TomatoPlant.java index ca4dd21b..afa8429e 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/crops/TomatoPlant.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/crops/TomatoPlant.java @@ -6,7 +6,9 @@ public TomatoPlant(boolean hasBeenHarvested, boolean hasBeenFertilized) { super(hasBeenHarvested, hasBeenFertilized); } - public Tomato getEdible() { - return new Tomato(); + @Override + public Tomato getEdible(Tomato crop) { + return super.getEdible(crop); } + } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/animal/AnimalTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/animal/AnimalTest.java deleted file mode 100644 index 27a98a88..00000000 --- a/src/test/java/com/zipcodewilmington/froilansfarm/animal/AnimalTest.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.zipcodewilmington.froilansfarm.animal; - -public class AnimalTest { -} diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/animal/ChickenTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/animal/ChickenTest.java index 135e73ae..cbbd8eed 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/animal/ChickenTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/animal/ChickenTest.java @@ -1,6 +1,7 @@ package com.zipcodewilmington.froilansfarm.animal; import com.zipcodewilmington.froilansfarm.animals.Chicken; +import com.zipcodewilmington.froilansfarm.farm.FarmStorage; import org.junit.Test; import org.junit.jupiter.api.Assertions; @@ -14,4 +15,15 @@ public void testMakeNoise() { Assertions.assertEquals(expected, actual); } + @Test + public void testYield() { + // Given + //FarmStorage store = FarmStorage.getInstance(); + + // When + + // Then + + } + } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/cropsTest/AbstractCropTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/cropsTest/AbstractCropTest.java index 44a22379..2db23037 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/cropsTest/AbstractCropTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/cropsTest/AbstractCropTest.java @@ -1,5 +1,24 @@ package com.zipcodewilmington.froilansfarm.cropsTest; +import com.zipcodewilmington.froilansfarm.crops.CornStalk; +import com.zipcodewilmington.froilansfarm.crops.Crop; +import com.zipcodewilmington.froilansfarm.crops.EarCorn; +import com.zipcodewilmington.froilansfarm.crops.Edible; +import org.junit.Assert; +import org.junit.Test; + public class AbstractCropTest { + @Test + public void testGetEdible() { + + // Given + CornStalk cornStalk = new CornStalk(true, true); + + // When + EarCorn earCorn = cornStalk.getEdible(new EarCorn()); + + // Then + Assert.assertNotNull(earCorn); + } } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/cropsTest/CornStalkTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/cropsTest/CornStalkTest.java index 18bc1f12..c3b8beaa 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/cropsTest/CornStalkTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/cropsTest/CornStalkTest.java @@ -14,7 +14,7 @@ public void testGetEdible() { CornStalk cornStalk = new CornStalk(true, true); // When - EarCorn earCorn = cornStalk.getEdible(); + EarCorn earCorn = cornStalk.getEdible(new EarCorn()); // Then Assert.assertNotNull(earCorn); diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/cropsTest/PotatoRootTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/cropsTest/PotatoRootTest.java index 3f9ab971..3601b3f9 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/cropsTest/PotatoRootTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/cropsTest/PotatoRootTest.java @@ -14,10 +14,10 @@ public void testGetEdible() { PotatoRoot potatoRoot = new PotatoRoot(true, true); // When - //Potato potato = potatoRoot.getEdible(); + Potato potato = potatoRoot.getEdible(new Potato()); // Then - //Assert.assertNotNull(potato); + Assert.assertNotNull(potato); } } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/cropsTest/TomatoPlantTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/cropsTest/TomatoPlantTest.java index 926111f7..2a0beebe 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/cropsTest/TomatoPlantTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/cropsTest/TomatoPlantTest.java @@ -14,7 +14,7 @@ public void testGetEdible() { TomatoPlant tomatoPlant = new TomatoPlant(true, true); // When - Tomato tomato = tomatoPlant.getEdible(); + Tomato tomato = tomatoPlant.getEdible(new Tomato()); // Then Assert.assertNotNull(tomato); diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/vehicle/TractorTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/vehicle/TractorTest.java index 49b06f59..1c081e62 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/vehicle/TractorTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/vehicle/TractorTest.java @@ -1,6 +1,6 @@ package com.zipcodewilmington.froilansfarm.vehicle; -import com.sun.scenario.effect.Crop; +//import com.sun.scenario.effect.Crop; import com.zipcodewilmington.froilansfarm.crops.Egg; import com.zipcodewilmington.froilansfarm.crops.Potato; From 9146d59d764260fc18895bc9b09472d42564ac01 Mon Sep 17 00:00:00 2001 From: MannyMb Date: Mon, 26 Jul 2021 01:48:31 -0400 Subject: [PATCH 25/26] need to work on tests --- .../froilansfarm/edible/EggTest.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/edible/EggTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/edible/EggTest.java index 5970d25f..46942385 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/edible/EggTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/edible/EggTest.java @@ -1,5 +1,6 @@ package com.zipcodewilmington.froilansfarm.edible; +import com.sun.org.apache.xpath.internal.operations.Bool; import com.zipcodewilmington.froilansfarm.crops.Egg; import org.junit.Assert; import org.junit.Test; @@ -15,4 +16,16 @@ public void EggIsEdibleTest(){ Assert.assertEquals(expected, actual); } + + @Test + public void hasBeenFertilizedTest() { + // Given + //Egg fertilizedEgg = new Egg(); + + // When + //boolean setEgg = fertilizedEgg.IsEdible(); + + // Then + //Assert.assertTrue(setEgg); + } } From 0ac3bd873fd6cdfbe60aa7813c725ddcf4a7e932 Mon Sep 17 00:00:00 2001 From: MannyMb Date: Mon, 26 Jul 2021 01:56:43 -0400 Subject: [PATCH 26/26] removed empty test folders --- .../com/zipcodewilmington/froilansfarm/animal/ChickenTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/animal/ChickenTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/animal/ChickenTest.java index cbbd8eed..6946e9df 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/animal/ChickenTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/animal/ChickenTest.java @@ -23,7 +23,6 @@ public void testYield() { // When // Then - } }