From b05993636d494637ceac60ec627f2b7f70d76266 Mon Sep 17 00:00:00 2001 From: Greg Donnelly Date: Tue, 23 Mar 2021 21:27:48 -0400 Subject: [PATCH 01/60] UML --- Farm.puml | 154 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 154 insertions(+) create mode 100644 Farm.puml diff --git a/Farm.puml b/Farm.puml new file mode 100644 index 00000000..82b75576 --- /dev/null +++ b/Farm.puml @@ -0,0 +1,154 @@ +@startuml +'https://plantuml.com/class-diagram + +abstract class Edible{ +hasBeenFertilized; +} +abstract class Animal { +makeNoise; +} +abstract class FarmVehicle { +operate; +makeNoise; +} +abstract class Aircraft { +fly; +makeNoise; +} +abstract class Farm { +} + +interface Eater { +eat(Edible obj); +} +interface NoiseMaker { +makeNoise; +} +interface Rideable {} +interface Produce { +yield(Edible obj) if hasBeenFertilized; +} +interface Vehicle { +makeNoise; +} +interface Person { +eat(Edible obj); +makeNoise; +} +interface Rider { +mount(Rideable obj) +dismount(Rideable obj) +eat(Edible obj); +makeNoise; +} +interface Botanist { +plant (Crop crop, CropRow row); +eat(Edible obj); +makeNoise; +} + +class Horse { +makeNoise; +} +class Chicken { +makeNoise; +yield(EdibleEgg egg) if hasBeenFertilized == false +} +class EdibleEgg { +hasBeenFertilized; +} +class Field { +store(CropRow); +} +class CropRow { +store(Crop); +} +class Crop { +yield (Edible obj) if hasBeenFertilized && hasBeenHarvested; +} +class CornStalk { +yield(EarCorn); +} +class EarCorn { +hasBeenFertilized; +hasBeenHarvested; +} +class TomatoPlant { +yield(Tomato); +} +class Tomato { +hasBeenFertilized; +hasBeenHarvested; +} +class Tractor { +harvest(Crop crop); +operate; +makeNoise; +} +class CropDuster { +fertilize(CropRow row); +fly; +makeNoise; +} +class Farmer { +mount(Rideable obj) +dismount(Rideable obj) +eat(Edible obj); +makeNoise; +plant (Crop crop, CropRow row); +} +class Stable { +store (Horse horse); +} +class FarmHouse { +store (Person person) +} +class ChickenCoop { +store (Chicken) +} + + + +Eater <|-- Animal +NoiseMaker <|-- Animal + +Animal <|-- Horse +Rideable <|-- Horse + +Animal <|-- Chicken +Produce <|-- Chicken + +Person <|-- Rider +Person <|-- Botanist + +Field <|-- CropRow + +NoiseMaker <|--- Vehicle +Rideable <|--- Vehicle + +Vehicle <|--- Aircraft +Vehicle <|--- FarmVehicle + +Produce <|--- Crop + +Crop <|--- CornStalk +Crop <|--- TomatoPlant + +Edible <|-- EarCorn +Edible <|-- Tomato +Edible <|--- EdibleEgg + +NoiseMaker <|---- Person +Eater <|---- Person + +FarmVehicle <|-- Tractor +Aircraft <|-- CropDuster + +Botanist <|---- Farmer +Rider <|---- Farmer + +Farm <|-- FarmHouse +Farm <|-- ChickenCoop +Farm <|-- Stable + +@enduml \ No newline at end of file From 8c25011f88277ccb1aba532747c08e48eff1805a Mon Sep 17 00:00:00 2001 From: Greg Donnelly Date: Tue, 23 Mar 2021 21:30:05 -0400 Subject: [PATCH 02/60] UML --- Farm.puml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Farm.puml b/Farm.puml index 82b75576..a05c2732 100644 --- a/Farm.puml +++ b/Farm.puml @@ -48,7 +48,7 @@ makeNoise; } class Horse { -makeNoise; +makeNoise } class Chicken { makeNoise; From 4751a397a1d00f8124a121564407801f2462bf34 Mon Sep 17 00:00:00 2001 From: Greg Donnelly Date: Tue, 23 Mar 2021 22:41:23 -0400 Subject: [PATCH 03/60] UML updated --- Farm.puml | 114 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 114 insertions(+) diff --git a/Farm.puml b/Farm.puml index a05c2732..6db76ca5 100644 --- a/Farm.puml +++ b/Farm.puml @@ -5,6 +5,7 @@ abstract class Edible{ hasBeenFertilized; } abstract class Animal { +eat (Edible obj) makeNoise; } abstract class FarmVehicle { @@ -18,6 +19,8 @@ makeNoise; abstract class Farm { } + + interface Eater { eat(Edible obj); } @@ -46,11 +49,20 @@ plant (Crop crop, CropRow row); eat(Edible obj); makeNoise; } +interface DailyRoutine { +mount (Horse horse) +dismount (Horse horse) +feed (Horse horse, int numOfCorn) +} + + class Horse { makeNoise +eat (Edible obj) } class Chicken { +eat (Edible obj) makeNoise; yield(EdibleEgg egg) if hasBeenFertilized == false } @@ -80,6 +92,27 @@ class Tomato { hasBeenFertilized; hasBeenHarvested; } +class BeanStalk { +yield(Soybean soybean) +} +class SoyBean { +hasBeenFertilized; +hasBeenHarvested; +} +class PumpkinVines { +yield(Pumpkin pumpkin) +} +class Pumpkin { +hasBeenFertilized; +hasBeenHarvested; +} +class AppleTrees { +yield (Apple apple) +} +class Apple { +hasBeenFertilized; +hasBeenHarvested; +} class Tractor { harvest(Crop crop); operate; @@ -97,6 +130,13 @@ eat(Edible obj); makeNoise; plant (Crop crop, CropRow row); } +class Pilot { +mount(Rideable obj) +dismount(Rideable obj) +eat(Edible obj); +makeNoise; +Fly (CropDuster duster); +} class Stable { store (Horse horse); } @@ -106,6 +146,64 @@ store (Person person) class ChickenCoop { store (Chicken) } +class Moonshine { +distill (Corn corn) +} +class ProduceStand { +addProduce (Produce) +} + +class Monday { +mount (Horse horse) +dismount (Horse horse) +feed (Horse horse, int numOfCorn) +eat(Edible obj) +fly (CropDuster duster) +} +class Tuesday { +mount (Horse horse) +dismount (Horse horse) +feed (Horse horse, int numOfCorn) +eat(Edible obj) +mount(Tractor tractor) +harvest (Crop crop) +dismount(Tractor tractor) +} +class Wednesday { +mount (Horse horse) +dismount (Horse horse) +feed (Horse horse, int numOfCorn) +eat(Edible obj) +distill (Moonshine moonshine) +} +class Thursday { +mount (Horse horse) +dismount (Horse horse) +feed (Horse horse, int numOfCorn) +eat(Edible obj) +} +class Friday { +mount (Horse horse) +dismount (Horse horse) +feed (Horse horse, int numOfCorn) +eat(Edible obj) +drink (Moonshine moonshine) +work (ProduceStand produceStand) +} +class Saturday { +mount (Horse horse) +dismount (Horse horse) +feed (Horse horse, int numOfCorn) +eat(Edible obj) +feed (Chicken chicken) +} +class Sunday { +mount (Horse horse) +dismount (Horse horse) +feed (Horse horse, int numOfCorn) +eat(Edible obj) +plant (Crop crop, CropRow row) 3-5 +} @@ -133,10 +231,16 @@ Produce <|--- Crop Crop <|--- CornStalk Crop <|--- TomatoPlant +Crop <|--- BeanStalk +Crop <|--- PumpkinVines +Crop <|--- AppleTrees Edible <|-- EarCorn Edible <|-- Tomato Edible <|--- EdibleEgg +Edible <|--- SoyBean +Edible <|--- Pumpkin +Edible <|--- Apple NoiseMaker <|---- Person Eater <|---- Person @@ -151,4 +255,14 @@ Farm <|-- FarmHouse Farm <|-- ChickenCoop Farm <|-- Stable +Rider <|--- Pilot + +DailyRoutine <|--- Monday +DailyRoutine <|--- Tuesday +DailyRoutine <|--- Wednesday +DailyRoutine <|--- Thursday +DailyRoutine <|--- Friday +DailyRoutine <|--- Saturday +DailyRoutine <|--- Sunday + @enduml \ No newline at end of file From a656b89c1a56094fda34cd126c66a6fc202a87ed Mon Sep 17 00:00:00 2001 From: Greg Donnelly Date: Wed, 24 Mar 2021 16:36:16 -0400 Subject: [PATCH 04/60] uml update --- Farm.puml | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/Farm.puml b/Farm.puml index 6db76ca5..fbdbfa47 100644 --- a/Farm.puml +++ b/Farm.puml @@ -29,7 +29,7 @@ makeNoise; } interface Rideable {} interface Produce { -yield(Edible obj) if hasBeenFertilized; +yield(EdiblePlant obj) if hasBeenFertilized; } interface Vehicle { makeNoise; @@ -59,10 +59,10 @@ feed (Horse horse, int numOfCorn) class Horse { makeNoise -eat (Edible obj) +eat (EdiblePlant obj) } class Chicken { -eat (Edible obj) +eat (EdiblePlant obj) makeNoise; yield(EdibleEgg egg) if hasBeenFertilized == false } @@ -76,7 +76,11 @@ class CropRow { store(Crop); } class Crop { -yield (Edible obj) if hasBeenFertilized && hasBeenHarvested; +yield (EdiblePlant obj) if hasBeenFertilized && hasBeenHarvested; +} +class EdiblePlant { +hasBeenFertilized; +hasBeenHarvested; } class CornStalk { yield(EarCorn); @@ -153,6 +157,7 @@ class ProduceStand { addProduce (Produce) } + class Monday { mount (Horse horse) dismount (Horse horse) @@ -235,12 +240,14 @@ Crop <|--- BeanStalk Crop <|--- PumpkinVines Crop <|--- AppleTrees -Edible <|-- EarCorn -Edible <|-- Tomato +Edible <|- EdiblePlant Edible <|--- EdibleEgg -Edible <|--- SoyBean -Edible <|--- Pumpkin -Edible <|--- Apple + +EdiblePlant <|-- EarCorn +EdiblePlant <|-- Tomato +EdiblePlant <|--- SoyBean +EdiblePlant <|--- Pumpkin +EdiblePlant <|--- Apple NoiseMaker <|---- Person Eater <|---- Person From a1dba45828fa25d779214b3e02ee8d75dfe6a2ba Mon Sep 17 00:00:00 2001 From: Greg Donnelly Date: Wed, 24 Mar 2021 17:09:21 -0400 Subject: [PATCH 05/60] UML APPROVED --- Farm.puml | 197 +++++++++++++++++++++++++++++++----------------------- 1 file changed, 114 insertions(+), 83 deletions(-) diff --git a/Farm.puml b/Farm.puml index fbdbfa47..d5f3ad6b 100644 --- a/Farm.puml +++ b/Farm.puml @@ -1,11 +1,9 @@ @startuml 'https://plantuml.com/class-diagram -abstract class Edible{ -hasBeenFertilized; -} -abstract class Animal { -eat (Edible obj) + +abstract class Animal { +eat (EdiblePlant obj) makeNoise; } abstract class FarmVehicle { @@ -16,12 +14,25 @@ abstract class Aircraft { fly; makeNoise; } -abstract class Farm { -} - -interface Eater { +interface LivingThing {} +interface HorseFood { +hasBeenFertilized; +hasBeenHarvested; +} +interface ChickenFood { +hasBeenFertilized; +hasBeenHarvested; +} +interface EdiblePlant { +hasBeenFertilized; +hasBeenHarvested; +} +interface Edible{ +hasBeenFertilized; +} +interface Eater { eat(Edible obj); } interface NoiseMaker { @@ -34,7 +45,7 @@ yield(EdiblePlant obj) if hasBeenFertilized; interface Vehicle { makeNoise; } -interface Person { +interface Person { eat(Edible obj); makeNoise; } @@ -54,15 +65,20 @@ mount (Horse horse) dismount (Horse horse) feed (Horse horse, int numOfCorn) } +interface Housing { +store (LivingThing livingThing) +} - -class Horse { +class Farm { +Collections for houses +} +class Horse { makeNoise -eat (EdiblePlant obj) +eat (HorseFood obj) } -class Chicken { -eat (EdiblePlant obj) +class Chicken { +eat (ChickenFood obj) makeNoise; yield(EdibleEgg egg) if hasBeenFertilized == false } @@ -78,10 +94,6 @@ store(Crop); class Crop { yield (EdiblePlant obj) if hasBeenFertilized && hasBeenHarvested; } -class EdiblePlant { -hasBeenFertilized; -hasBeenHarvested; -} class CornStalk { yield(EarCorn); } @@ -156,59 +168,68 @@ distill (Corn corn) class ProduceStand { addProduce (Produce) } +class routineEngine { +Monday; +Tuesday; +Wednesday; +Thursday; +Friday; +Saturday; +Sunday; +} -class Monday { -mount (Horse horse) -dismount (Horse horse) -feed (Horse horse, int numOfCorn) -eat(Edible obj) -fly (CropDuster duster) -} -class Tuesday { -mount (Horse horse) -dismount (Horse horse) -feed (Horse horse, int numOfCorn) -eat(Edible obj) -mount(Tractor tractor) -harvest (Crop crop) -dismount(Tractor tractor) -} -class Wednesday { -mount (Horse horse) -dismount (Horse horse) -feed (Horse horse, int numOfCorn) -eat(Edible obj) -distill (Moonshine moonshine) -} -class Thursday { -mount (Horse horse) -dismount (Horse horse) -feed (Horse horse, int numOfCorn) -eat(Edible obj) -} -class Friday { -mount (Horse horse) -dismount (Horse horse) -feed (Horse horse, int numOfCorn) -eat(Edible obj) -drink (Moonshine moonshine) -work (ProduceStand produceStand) -} -class Saturday { -mount (Horse horse) -dismount (Horse horse) -feed (Horse horse, int numOfCorn) -eat(Edible obj) -feed (Chicken chicken) -} -class Sunday { -mount (Horse horse) -dismount (Horse horse) -feed (Horse horse, int numOfCorn) -eat(Edible obj) -plant (Crop crop, CropRow row) 3-5 -} +'class Monday { +'mount (Horse horse) +'dismount (Horse horse) +'feed (Horse horse, int numOfCorn) +'eat(Edible obj) +'fly (CropDuster duster) +'} +'class Tuesday { +'mount (Horse horse) +'dismount (Horse horse) +'feed (Horse horse, int numOfCorn) +'eat(Edible obj) +'mount(Tractor tractor) +'harvest (Crop crop) +'dismount(Tractor tractor) +'} +'class Wednesday { +'mount (Horse horse) +'dismount (Horse horse) +'feed (Horse horse, int numOfCorn) +'eat(Edible obj) +'distill (Moonshine moonshine) +'} +'class Thursday { +'mount (Horse horse) +'dismount (Horse horse) +'feed (Horse horse, int numOfCorn) +'eat(Edible obj) +'} +'class Friday { +'mount (Horse horse) +'dismount (Horse horse) +'feed (Horse horse, int numOfCorn) +'eat(Edible obj) +'drink (Moonshine moonshine) +'work (ProduceStand produceStand) +'} +'class Saturday { +'mount (Horse horse) +'dismount (Horse horse) +'feed (Horse horse, int numOfCorn) +'eat(Edible obj) +'feed (Chicken chicken) +'} +'class Sunday { +'mount (Horse horse) +'dismount (Horse horse) +'feed (Horse horse, int numOfCorn) +'eat(Edible obj) +'plant (Crop crop, CropRow row) 3-5 +'} @@ -243,11 +264,16 @@ Crop <|--- AppleTrees Edible <|- EdiblePlant Edible <|--- EdibleEgg -EdiblePlant <|-- EarCorn EdiblePlant <|-- Tomato -EdiblePlant <|--- SoyBean EdiblePlant <|--- Pumpkin -EdiblePlant <|--- Apple +EdiblePlant <|-- HorseFood +EdiblePlant <|-- ChickenFood + +HorseFood <|-- EarCorn +HorseFood <|-- Apple + +ChickenFood <|-- SoyBean +ChickenFood <|-- EarCorn NoiseMaker <|---- Person Eater <|---- Person @@ -258,18 +284,23 @@ Aircraft <|-- CropDuster Botanist <|---- Farmer Rider <|---- Farmer -Farm <|-- FarmHouse -Farm <|-- ChickenCoop -Farm <|-- Stable +Housing <|-- FarmHouse +Housing <|-- ChickenCoop +Housing <|-- Stable Rider <|--- Pilot -DailyRoutine <|--- Monday -DailyRoutine <|--- Tuesday -DailyRoutine <|--- Wednesday -DailyRoutine <|--- Thursday -DailyRoutine <|--- Friday -DailyRoutine <|--- Saturday -DailyRoutine <|--- Sunday +DailyRoutine <|-- routineEngine + +LivingThing <|---- Animal +LivingThing <|---- Person + +'DailyRoutine <|--- Monday +'DailyRoutine <|--- Tuesday +'DailyRoutine <|--- Wednesday +'DailyRoutine <|--- Thursday +'DailyRoutine <|--- Friday +'DailyRoutine <|--- Saturday +'DailyRoutine <|--- Sunday @enduml \ No newline at end of file From f9008aa597618476a5eb29bfc5e3892bd3d724d8 Mon Sep 17 00:00:00 2001 From: Greg Donnelly Date: Wed, 24 Mar 2021 19:38:41 -0400 Subject: [PATCH 06/60] packages made --- Farm.puml | 21 +++++++++---------- .../froilansfarm/MainApplication.java | 3 +++ 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/Farm.puml b/Farm.puml index d5f3ad6b..ec6d8d7b 100644 --- a/Farm.puml +++ b/Farm.puml @@ -1,8 +1,7 @@ @startuml 'https://plantuml.com/class-diagram - -abstract class Animal { +abstract class Animal { eat (EdiblePlant obj) makeNoise; } @@ -40,7 +39,7 @@ makeNoise; } interface Rideable {} interface Produce { -yield(EdiblePlant obj) if hasBeenFertilized; +yield(Edible obj) if hasBeenFertilized; } interface Vehicle { makeNoise; @@ -73,11 +72,11 @@ store (LivingThing livingThing) class Farm { Collections for houses } -class Horse { +class Horse { makeNoise eat (HorseFood obj) } -class Chicken { +class Chicken { eat (ChickenFood obj) makeNoise; yield(EdibleEgg egg) if hasBeenFertilized == false @@ -91,38 +90,38 @@ store(CropRow); class CropRow { store(Crop); } -class Crop { +class Crop { yield (EdiblePlant obj) if hasBeenFertilized && hasBeenHarvested; } -class CornStalk { +class CornStalk { yield(EarCorn); } class EarCorn { hasBeenFertilized; hasBeenHarvested; } -class TomatoPlant { +class TomatoPlant { yield(Tomato); } class Tomato { hasBeenFertilized; hasBeenHarvested; } -class BeanStalk { +class BeanStalk { yield(Soybean soybean) } class SoyBean { hasBeenFertilized; hasBeenHarvested; } -class PumpkinVines { +class PumpkinVines { yield(Pumpkin pumpkin) } class Pumpkin { hasBeenFertilized; hasBeenHarvested; } -class AppleTrees { +class AppleTrees { yield (Apple apple) } class Apple { diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/MainApplication.java b/src/main/java/com/zipcodewilmington/froilansfarm/MainApplication.java index fd743ffc..30115fce 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/MainApplication.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/MainApplication.java @@ -1,5 +1,8 @@ package com.zipcodewilmington.froilansfarm; +import java.util.ArrayList; +import java.util.Comparator; + /** * Created by leon on 2/26/18. */ From 61f9190f258b0bfd453949cf4f7aa2e9506f9043 Mon Sep 17 00:00:00 2001 From: Greg Donnelly Date: Wed, 24 Mar 2021 19:57:20 -0400 Subject: [PATCH 07/60] classes and interfaces made with extensions and implementations for Edible Package --- .../zipcodewilmington/froilansfarm/EdiblePackage/Apple.java | 4 ++++ .../froilansfarm/EdiblePackage/ChickenFood.java | 5 +++++ .../froilansfarm/EdiblePackage/EarCorn.java | 4 ++++ .../zipcodewilmington/froilansfarm/EdiblePackage/Edible.java | 5 +++++ .../froilansfarm/EdiblePackage/EdiblePlant.java | 5 +++++ .../zipcodewilmington/froilansfarm/EdiblePackage/Egg.java | 4 ++++ .../froilansfarm/EdiblePackage/HorseFood.java | 5 +++++ .../froilansfarm/EdiblePackage/Moonshine.java | 4 ++++ .../froilansfarm/EdiblePackage/Pumpkin.java | 4 ++++ .../froilansfarm/EdiblePackage/SoyBean.java | 4 ++++ .../zipcodewilmington/froilansfarm/EdiblePackage/Tomato.java | 4 ++++ 11 files changed, 48 insertions(+) create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/Apple.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/ChickenFood.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/EarCorn.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/Edible.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/EdiblePlant.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/Egg.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/HorseFood.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/Moonshine.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/Pumpkin.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/SoyBean.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/Tomato.java diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/Apple.java b/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/Apple.java new file mode 100644 index 00000000..2a2983b7 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/Apple.java @@ -0,0 +1,4 @@ +package com.zipcodewilmington.froilansfarm.EdiblePackage; + +public class Apple implements HorseFood{ +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/ChickenFood.java b/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/ChickenFood.java new file mode 100644 index 00000000..c5221143 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/ChickenFood.java @@ -0,0 +1,5 @@ +package com.zipcodewilmington.froilansfarm.EdiblePackage; + +public interface ChickenFood extends EdiblePlant{ + +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/EarCorn.java b/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/EarCorn.java new file mode 100644 index 00000000..46a3163d --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/EarCorn.java @@ -0,0 +1,4 @@ +package com.zipcodewilmington.froilansfarm.EdiblePackage; + +public class EarCorn implements HorseFood, ChickenFood { +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/Edible.java b/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/Edible.java new file mode 100644 index 00000000..99ab2129 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/Edible.java @@ -0,0 +1,5 @@ +package com.zipcodewilmington.froilansfarm.EdiblePackage; + +public interface Edible { + +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/EdiblePlant.java b/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/EdiblePlant.java new file mode 100644 index 00000000..e1b96270 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/EdiblePlant.java @@ -0,0 +1,5 @@ +package com.zipcodewilmington.froilansfarm.EdiblePackage; + +public interface EdiblePlant extends Edible{ + +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/Egg.java b/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/Egg.java new file mode 100644 index 00000000..eb22ada6 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/Egg.java @@ -0,0 +1,4 @@ +package com.zipcodewilmington.froilansfarm.EdiblePackage; + +public class Egg implements Edible{ +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/HorseFood.java b/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/HorseFood.java new file mode 100644 index 00000000..b4aa842b --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/HorseFood.java @@ -0,0 +1,5 @@ +package com.zipcodewilmington.froilansfarm.EdiblePackage; + +public interface HorseFood extends EdiblePlant{ + +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/Moonshine.java b/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/Moonshine.java new file mode 100644 index 00000000..de1e1a96 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/Moonshine.java @@ -0,0 +1,4 @@ +package com.zipcodewilmington.froilansfarm.EdiblePackage; + +public class Moonshine { +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/Pumpkin.java b/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/Pumpkin.java new file mode 100644 index 00000000..e7d3e903 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/Pumpkin.java @@ -0,0 +1,4 @@ +package com.zipcodewilmington.froilansfarm.EdiblePackage; + +public class Pumpkin implements EdiblePlant{ +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/SoyBean.java b/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/SoyBean.java new file mode 100644 index 00000000..551c7c0a --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/SoyBean.java @@ -0,0 +1,4 @@ +package com.zipcodewilmington.froilansfarm.EdiblePackage; + +public class SoyBean implements ChickenFood{ +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/Tomato.java b/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/Tomato.java new file mode 100644 index 00000000..52e43c7d --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/Tomato.java @@ -0,0 +1,4 @@ +package com.zipcodewilmington.froilansfarm.EdiblePackage; + +public class Tomato implements EdiblePlant{ +} From 892fdd0069b08f72c364eb2e22e231db670aace5 Mon Sep 17 00:00:00 2001 From: Greg Donnelly Date: Wed, 24 Mar 2021 20:06:24 -0400 Subject: [PATCH 08/60] vehicle package and edible package made --- .../com/zipcodewilmington/froilansfarm/Vehicles/Aircraft.java | 4 ++++ .../zipcodewilmington/froilansfarm/Vehicles/CropDuster.java | 4 ++++ .../zipcodewilmington/froilansfarm/Vehicles/FarmVehicle.java | 4 ++++ .../com/zipcodewilmington/froilansfarm/Vehicles/Tractor.java | 4 ++++ .../com/zipcodewilmington/froilansfarm/Vehicles/Vehicle.java | 4 ++++ 5 files changed, 20 insertions(+) create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Aircraft.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDuster.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/FarmVehicle.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Tractor.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Vehicle.java diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Aircraft.java b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Aircraft.java new file mode 100644 index 00000000..e153673c --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Aircraft.java @@ -0,0 +1,4 @@ +package com.zipcodewilmington.froilansfarm.Vehicles; + +public abstract class Aircraft implements Vehicle { +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDuster.java b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDuster.java new file mode 100644 index 00000000..6526371f --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDuster.java @@ -0,0 +1,4 @@ +package com.zipcodewilmington.froilansfarm.Vehicles; + +public class CropDuster extends Aircraft{ +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/FarmVehicle.java b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/FarmVehicle.java new file mode 100644 index 00000000..4b13af3e --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/FarmVehicle.java @@ -0,0 +1,4 @@ +package com.zipcodewilmington.froilansfarm.Vehicles; + +public abstract class FarmVehicle implements Vehicle { +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Tractor.java b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Tractor.java new file mode 100644 index 00000000..2dc013ed --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Tractor.java @@ -0,0 +1,4 @@ +package com.zipcodewilmington.froilansfarm.Vehicles; + +public class Tractor extends FarmVehicle{ +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Vehicle.java b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Vehicle.java new file mode 100644 index 00000000..d399cad5 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Vehicle.java @@ -0,0 +1,4 @@ +package com.zipcodewilmington.froilansfarm.Vehicles; + +public interface Vehicle { +} From 8281399205b5cf7c3a63c8525a4b065f2c863eb5 Mon Sep 17 00:00:00 2001 From: Greg Donnelly Date: Wed, 24 Mar 2021 20:10:07 -0400 Subject: [PATCH 09/60] outer interfaces made --- src/main/java/com/zipcodewilmington/froilansfarm/Eater.java | 4 ++++ .../java/com/zipcodewilmington/froilansfarm/LivingThing.java | 4 ++++ .../java/com/zipcodewilmington/froilansfarm/NoiseMaker.java | 4 ++++ .../java/com/zipcodewilmington/froilansfarm/Rideable.java | 4 ++++ 4 files changed, 16 insertions(+) create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Eater.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/LivingThing.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/NoiseMaker.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Rideable.java diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Eater.java b/src/main/java/com/zipcodewilmington/froilansfarm/Eater.java new file mode 100644 index 00000000..6a7d5f51 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Eater.java @@ -0,0 +1,4 @@ +package com.zipcodewilmington.froilansfarm; + +public interface Eater { +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/LivingThing.java b/src/main/java/com/zipcodewilmington/froilansfarm/LivingThing.java new file mode 100644 index 00000000..e6e05cd6 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/LivingThing.java @@ -0,0 +1,4 @@ +package com.zipcodewilmington.froilansfarm; + +public interface LivingThing { +} 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 { +} From 2a533a461c16f272d9221f4dd85002f8136664d5 Mon Sep 17 00:00:00 2001 From: Greg Donnelly Date: Wed, 24 Mar 2021 20:13:52 -0400 Subject: [PATCH 10/60] Produce interface --- src/main/java/com/zipcodewilmington/froilansfarm/Produce.java | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Produce.java diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Produce.java b/src/main/java/com/zipcodewilmington/froilansfarm/Produce.java new file mode 100644 index 00000000..de8ec934 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Produce.java @@ -0,0 +1,4 @@ +package com.zipcodewilmington.froilansfarm; + +public interface Produce { +} From df27a4627a1b8d6e565e3e0be73b4db4bb72e5ec Mon Sep 17 00:00:00 2001 From: Greg Donnelly Date: Wed, 24 Mar 2021 20:24:06 -0400 Subject: [PATCH 11/60] Crops package made --- .../zipcodewilmington/froilansfarm/Crops/AppleTrees.java | 6 ++++++ .../zipcodewilmington/froilansfarm/Crops/BeanStalk.java | 6 ++++++ .../zipcodewilmington/froilansfarm/Crops/CornStalk.java | 6 ++++++ .../com/zipcodewilmington/froilansfarm/Crops/Crop.java | 7 +++++++ .../zipcodewilmington/froilansfarm/Crops/PumpkinVines.java | 6 ++++++ .../zipcodewilmington/froilansfarm/Crops/TomatoPlant.java | 6 ++++++ 6 files changed, 37 insertions(+) create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Crops/AppleTrees.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Crops/BeanStalk.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/PumpkinVines.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Crops/TomatoPlant.java diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Crops/AppleTrees.java b/src/main/java/com/zipcodewilmington/froilansfarm/Crops/AppleTrees.java new file mode 100644 index 00000000..8c21d7bf --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Crops/AppleTrees.java @@ -0,0 +1,6 @@ +package com.zipcodewilmington.froilansfarm.Crops; + +import com.zipcodewilmington.froilansfarm.EdiblePackage.Apple; + +public class AppleTrees extends Crop { +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Crops/BeanStalk.java b/src/main/java/com/zipcodewilmington/froilansfarm/Crops/BeanStalk.java new file mode 100644 index 00000000..78821a89 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Crops/BeanStalk.java @@ -0,0 +1,6 @@ +package com.zipcodewilmington.froilansfarm.Crops; + +import com.zipcodewilmington.froilansfarm.EdiblePackage.SoyBean; + +public class BeanStalk extends Crop { +} 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..0338644c --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Crops/CornStalk.java @@ -0,0 +1,6 @@ +package com.zipcodewilmington.froilansfarm.Crops; + +import com.zipcodewilmington.froilansfarm.EdiblePackage.EarCorn; + +public class CornStalk extends Crop { +} 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..2a45240c --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Crops/Crop.java @@ -0,0 +1,7 @@ +package com.zipcodewilmington.froilansfarm.Crops; + +import com.zipcodewilmington.froilansfarm.EdiblePackage.EdiblePlant; +import com.zipcodewilmington.froilansfarm.Produce; + +public class Crop implements Produce { +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Crops/PumpkinVines.java b/src/main/java/com/zipcodewilmington/froilansfarm/Crops/PumpkinVines.java new file mode 100644 index 00000000..a60cf32a --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Crops/PumpkinVines.java @@ -0,0 +1,6 @@ +package com.zipcodewilmington.froilansfarm.Crops; + +import com.zipcodewilmington.froilansfarm.EdiblePackage.Pumpkin; + +public class PumpkinVines extends Crop{ +} 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..1d2c7f30 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Crops/TomatoPlant.java @@ -0,0 +1,6 @@ +package com.zipcodewilmington.froilansfarm.Crops; + +import com.zipcodewilmington.froilansfarm.EdiblePackage.Tomato; + +public class TomatoPlant extends Crop { +} From 38bcdcd43076f007b83989493b6a17345d249d01 Mon Sep 17 00:00:00 2001 From: Greg Donnelly Date: Wed, 24 Mar 2021 20:27:57 -0400 Subject: [PATCH 12/60] farm package made --- .../com/zipcodewilmington/froilansfarm/Farm/ChickenCoop.java | 4 ++++ .../java/com/zipcodewilmington/froilansfarm/Farm/CropRow.java | 4 ++++ .../java/com/zipcodewilmington/froilansfarm/Farm/Farm.java | 4 ++++ .../com/zipcodewilmington/froilansfarm/Farm/FarmHouse.java | 4 ++++ .../java/com/zipcodewilmington/froilansfarm/Farm/Field.java | 4 ++++ .../java/com/zipcodewilmington/froilansfarm/Farm/Housing.java | 4 ++++ .../com/zipcodewilmington/froilansfarm/Farm/ProduceStand.java | 4 ++++ .../java/com/zipcodewilmington/froilansfarm/Farm/Stable.java | 4 ++++ 8 files changed, 32 insertions(+) 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/Farm.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/Housing.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Farm/ProduceStand.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Farm/Stable.java 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..abdb2db1 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Farm/ChickenCoop.java @@ -0,0 +1,4 @@ +package com.zipcodewilmington.froilansfarm.Farm; + +public class ChickenCoop implements Housing{ +} 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..dfd6e373 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Farm/CropRow.java @@ -0,0 +1,4 @@ +package com.zipcodewilmington.froilansfarm.Farm; + +public class CropRow extends Field{ +} 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..b3052862 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Farm/Farm.java @@ -0,0 +1,4 @@ +package com.zipcodewilmington.froilansfarm.Farm; + +public class Farm { +} 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..4aed622f --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Farm/FarmHouse.java @@ -0,0 +1,4 @@ +package com.zipcodewilmington.froilansfarm.Farm; + +public class FarmHouse implements Housing{ +} 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..0025dcc8 --- /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/Housing.java b/src/main/java/com/zipcodewilmington/froilansfarm/Farm/Housing.java new file mode 100644 index 00000000..b8efad6f --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Farm/Housing.java @@ -0,0 +1,4 @@ +package com.zipcodewilmington.froilansfarm.Farm; + +public interface Housing { +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Farm/ProduceStand.java b/src/main/java/com/zipcodewilmington/froilansfarm/Farm/ProduceStand.java new file mode 100644 index 00000000..86f0c32d --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Farm/ProduceStand.java @@ -0,0 +1,4 @@ +package com.zipcodewilmington.froilansfarm.Farm; + +public class ProduceStand { +} 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..9f19e27f --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Farm/Stable.java @@ -0,0 +1,4 @@ +package com.zipcodewilmington.froilansfarm.Farm; + +public class Stable implements Housing{ +} From f8e72c8e4f4d1f89a2777c203436c364676945e9 Mon Sep 17 00:00:00 2001 From: jorge Date: Wed, 24 Mar 2021 20:29:22 -0400 Subject: [PATCH 13/60] added vehicle and edibles methods --- .../froilansfarm/EdiblePackage/Apple.java | 7 +++++++ .../froilansfarm/EdiblePackage/EarCorn.java | 7 +++++++ .../froilansfarm/EdiblePackage/Edible.java | 1 + .../froilansfarm/EdiblePackage/EdiblePlant.java | 2 +- .../zipcodewilmington/froilansfarm/EdiblePackage/Egg.java | 3 +++ .../froilansfarm/EdiblePackage/Moonshine.java | 2 ++ .../froilansfarm/EdiblePackage/Pumpkin.java | 7 +++++++ .../froilansfarm/EdiblePackage/SoyBean.java | 7 +++++++ .../froilansfarm/EdiblePackage/Tomato.java | 7 +++++++ .../zipcodewilmington/froilansfarm/Vehicles/Aircraft.java | 4 ++++ .../froilansfarm/Vehicles/CropDuster.java | 6 ++++++ .../froilansfarm/Vehicles/FarmVehicle.java | 3 +++ .../zipcodewilmington/froilansfarm/Vehicles/Tractor.java | 6 ++++++ .../zipcodewilmington/froilansfarm/Vehicles/Vehicle.java | 1 + 14 files changed, 62 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/Apple.java b/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/Apple.java index 2a2983b7..5e73eb12 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/Apple.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/Apple.java @@ -1,4 +1,11 @@ package com.zipcodewilmington.froilansfarm.EdiblePackage; public class Apple implements HorseFood{ + public boolean hasBeenFertilized() { + return false; + } + + public boolean hasBeenHarvested() { + return false; + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/EarCorn.java b/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/EarCorn.java index 46a3163d..a5b20333 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/EarCorn.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/EarCorn.java @@ -1,4 +1,11 @@ package com.zipcodewilmington.froilansfarm.EdiblePackage; public class EarCorn implements HorseFood, ChickenFood { + public boolean hasBeenFertilized() { + return false; + } + + public boolean hasBeenHarvested() { + return false; + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/Edible.java b/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/Edible.java index 99ab2129..4f2f8a7f 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/Edible.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/Edible.java @@ -2,4 +2,5 @@ public interface Edible { + boolean hasBeenFertilized(); } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/EdiblePlant.java b/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/EdiblePlant.java index e1b96270..595dfd9f 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/EdiblePlant.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/EdiblePlant.java @@ -1,5 +1,5 @@ package com.zipcodewilmington.froilansfarm.EdiblePackage; public interface EdiblePlant extends Edible{ - + boolean hasBeenHarvested(); } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/Egg.java b/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/Egg.java index eb22ada6..7422a6de 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/Egg.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/Egg.java @@ -1,4 +1,7 @@ package com.zipcodewilmington.froilansfarm.EdiblePackage; public class Egg implements Edible{ + public boolean hasBeenFertilized() { + return false; + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/Moonshine.java b/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/Moonshine.java index de1e1a96..c1421cc6 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/Moonshine.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/Moonshine.java @@ -1,4 +1,6 @@ package com.zipcodewilmington.froilansfarm.EdiblePackage; public class Moonshine { + public void distill(EarCorn corn){ + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/Pumpkin.java b/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/Pumpkin.java index e7d3e903..618fbf88 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/Pumpkin.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/Pumpkin.java @@ -1,4 +1,11 @@ package com.zipcodewilmington.froilansfarm.EdiblePackage; public class Pumpkin implements EdiblePlant{ + public boolean hasBeenFertilized() { + return false; + } + + public boolean hasBeenHarvested() { + return false; + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/SoyBean.java b/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/SoyBean.java index 551c7c0a..a87d9285 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/SoyBean.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/SoyBean.java @@ -1,4 +1,11 @@ package com.zipcodewilmington.froilansfarm.EdiblePackage; public class SoyBean implements ChickenFood{ + public boolean hasBeenFertilized() { + return false; + } + + public boolean hasBeenHarvested() { + return false; + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/Tomato.java b/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/Tomato.java index 52e43c7d..6339495f 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/Tomato.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/Tomato.java @@ -1,4 +1,11 @@ package com.zipcodewilmington.froilansfarm.EdiblePackage; public class Tomato implements EdiblePlant{ + public boolean hasBeenFertilized() { + return false; + } + + public boolean hasBeenHarvested() { + return false; + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Aircraft.java b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Aircraft.java index e153673c..98bda01e 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Aircraft.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Aircraft.java @@ -1,4 +1,8 @@ package com.zipcodewilmington.froilansfarm.Vehicles; public abstract class Aircraft implements Vehicle { + boolean fly(boolean bool) { + return false; + } + } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDuster.java b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDuster.java index 6526371f..5a81756b 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDuster.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDuster.java @@ -1,4 +1,10 @@ package com.zipcodewilmington.froilansfarm.Vehicles; public class CropDuster extends Aircraft{ + public String makeNoise() { + return "NnNnNn"; + } + public void fertilizeRow(/*CropRow row*/){ + //calls to crop row and sprays tf out of crops to fertilize + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/FarmVehicle.java b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/FarmVehicle.java index 4b13af3e..c812f1ab 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/FarmVehicle.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/FarmVehicle.java @@ -1,4 +1,7 @@ package com.zipcodewilmington.froilansfarm.Vehicles; public abstract class FarmVehicle implements Vehicle { + boolean operate(boolean bool) { + return false; + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Tractor.java b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Tractor.java index 2dc013ed..e12197d0 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Tractor.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Tractor.java @@ -1,4 +1,10 @@ package com.zipcodewilmington.froilansfarm.Vehicles; public class Tractor extends FarmVehicle{ + public String makeNoise() { + return "Clack-Clunk"; + } + public void harvestCrop(Crop crop){ + //method which calls to crop row and tells that its getting harvested af + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Vehicle.java b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Vehicle.java index d399cad5..3724a7d4 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Vehicle.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Vehicle.java @@ -1,4 +1,5 @@ package com.zipcodewilmington.froilansfarm.Vehicles; public interface Vehicle { + String makeNoise(); } From 791edd63364eb2cf3e46855bcfca6ca2518e2e28 Mon Sep 17 00:00:00 2001 From: jorge Date: Wed, 24 Mar 2021 20:35:37 -0400 Subject: [PATCH 14/60] added methods to noiseMaker Produce and Eater --- .../java/com/zipcodewilmington/froilansfarm/Crops/Crop.java | 3 +++ src/main/java/com/zipcodewilmington/froilansfarm/Eater.java | 3 +++ .../java/com/zipcodewilmington/froilansfarm/NoiseMaker.java | 1 + src/main/java/com/zipcodewilmington/froilansfarm/Produce.java | 1 + 4 files changed, 8 insertions(+) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Crops/Crop.java b/src/main/java/com/zipcodewilmington/froilansfarm/Crops/Crop.java index 2a45240c..b15a33c2 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Crops/Crop.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Crops/Crop.java @@ -4,4 +4,7 @@ import com.zipcodewilmington.froilansfarm.Produce; public class Crop implements Produce { + public void addProduce(Produce produce) { + + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Eater.java b/src/main/java/com/zipcodewilmington/froilansfarm/Eater.java index 6a7d5f51..2026d78d 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Eater.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Eater.java @@ -1,4 +1,7 @@ package com.zipcodewilmington.froilansfarm; +import com.zipcodewilmington.froilansfarm.EdiblePackage.Edible; + public interface Eater { + void eat(Edible obj); } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/NoiseMaker.java b/src/main/java/com/zipcodewilmington/froilansfarm/NoiseMaker.java index a8d66041..ba1f1e20 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/NoiseMaker.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/NoiseMaker.java @@ -1,4 +1,5 @@ package com.zipcodewilmington.froilansfarm; public interface NoiseMaker { + String makeNoise(); } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Produce.java b/src/main/java/com/zipcodewilmington/froilansfarm/Produce.java index de8ec934..090645ac 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Produce.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Produce.java @@ -1,4 +1,5 @@ package com.zipcodewilmington.froilansfarm; public interface Produce { + public void addProduce(Produce produce); } From 1c680bb4cc41be2cf8b4cac7f2704bbf379d8d87 Mon Sep 17 00:00:00 2001 From: Greg Donnelly Date: Wed, 24 Mar 2021 20:41:16 -0400 Subject: [PATCH 15/60] routine package made --- .../zipcodewilmington/froilansfarm/Routines/DailyRoutine.java | 4 ++++ .../froilansfarm/Routines/RoutineEngine.java | 4 ++++ 2 files changed, 8 insertions(+) create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Routines/DailyRoutine.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Routines/RoutineEngine.java diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Routines/DailyRoutine.java b/src/main/java/com/zipcodewilmington/froilansfarm/Routines/DailyRoutine.java new file mode 100644 index 00000000..a51524b5 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Routines/DailyRoutine.java @@ -0,0 +1,4 @@ +package com.zipcodewilmington.froilansfarm.Routines; + +public interface DailyRoutine { +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Routines/RoutineEngine.java b/src/main/java/com/zipcodewilmington/froilansfarm/Routines/RoutineEngine.java new file mode 100644 index 00000000..5ec9012d --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Routines/RoutineEngine.java @@ -0,0 +1,4 @@ +package com.zipcodewilmington.froilansfarm.Routines; + +public class RoutineEngine implements DailyRoutine{ +} From f15d8d7a760c3ba2c4b1f677b717b079495db4d8 Mon Sep 17 00:00:00 2001 From: jorge Date: Wed, 24 Mar 2021 21:06:59 -0400 Subject: [PATCH 16/60] added 2 mothods to crop --- .../froilansfarm/Crops/BeanStalk.java | 1 + .../zipcodewilmington/froilansfarm/Crops/Crop.java | 13 ++++++++++++- .../froilansfarm/Vehicles/Tractor.java | 2 +- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Crops/BeanStalk.java b/src/main/java/com/zipcodewilmington/froilansfarm/Crops/BeanStalk.java index 78821a89..573de615 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Crops/BeanStalk.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Crops/BeanStalk.java @@ -3,4 +3,5 @@ import com.zipcodewilmington.froilansfarm.EdiblePackage.SoyBean; public class BeanStalk extends Crop { + } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Crops/Crop.java b/src/main/java/com/zipcodewilmington/froilansfarm/Crops/Crop.java index b15a33c2..05e7a00f 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Crops/Crop.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Crops/Crop.java @@ -3,8 +3,19 @@ import com.zipcodewilmington.froilansfarm.EdiblePackage.EdiblePlant; import com.zipcodewilmington.froilansfarm.Produce; +import java.util.Random; + public class Crop implements Produce { public void addProduce(Produce produce) { - + } + public void yield(boolean fertilized){ + if(fertilized){ + //gonna do some stuff like add to produce or food + //times howMush method + } + } + public int howMuch(){ + Random randomAmount = new Random(); + return randomAmount.nextInt(10) + 1; } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Tractor.java b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Tractor.java index e12197d0..3baef4d5 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Tractor.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Tractor.java @@ -4,7 +4,7 @@ public class Tractor extends FarmVehicle{ public String makeNoise() { return "Clack-Clunk"; } - public void harvestCrop(Crop crop){ + public void harvestCrop(){ //method which calls to crop row and tells that its getting harvested af } } From d3af9c85d27262d933529c45402e46e88f916587 Mon Sep 17 00:00:00 2001 From: KellyPorter02 Date: Wed, 24 Mar 2021 21:07:38 -0400 Subject: [PATCH 17/60] Persons & Animal package --- .../froilansfarm/Animals/Animal.java | 8 ++++++++ .../froilansfarm/Animals/Chicken.java | 18 ++++++++++++++++++ .../froilansfarm/Animals/Horse.java | 14 ++++++++++++++ .../froilansfarm/Persons/Botanist.java | 4 ++++ .../froilansfarm/Persons/Farmer.java | 13 +++++++++++++ .../froilansfarm/Persons/Person.java | 11 +++++++++++ .../froilansfarm/Persons/Pilot.java | 13 +++++++++++++ .../froilansfarm/Persons/Rider.java | 4 ++++ 8 files changed, 85 insertions(+) create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Animals/Animal.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Animals/Chicken.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Animals/Horse.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Persons/Botanist.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Persons/Farmer.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Persons/Person.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Persons/Pilot.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Persons/Rider.java 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..2ebce33a --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Animals/Animal.java @@ -0,0 +1,8 @@ +package com.zipcodewilmington.froilansfarm.Animals; + +import com.zipcodewilmington.froilansfarm.Eater; +import com.zipcodewilmington.froilansfarm.LivingThing; +import com.zipcodewilmington.froilansfarm.NoiseMaker; + +public abstract class Animal implements Eater, LivingThing, NoiseMaker { +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Animals/Chicken.java b/src/main/java/com/zipcodewilmington/froilansfarm/Animals/Chicken.java new file mode 100644 index 00000000..a1a5d4e0 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Animals/Chicken.java @@ -0,0 +1,18 @@ +package com.zipcodewilmington.froilansfarm.Animals; + +import com.zipcodewilmington.froilansfarm.EdiblePackage.Edible; +import com.zipcodewilmington.froilansfarm.Produce; + +public class Chicken extends Animal implements Produce { + public void eat(Edible obj) { + + } + + public String makeNoise() { + return null; + } + + public void addProduce(Produce produce) { + + } +} 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..fae35c46 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Animals/Horse.java @@ -0,0 +1,14 @@ +package com.zipcodewilmington.froilansfarm.Animals; + +import com.zipcodewilmington.froilansfarm.EdiblePackage.Edible; +import com.zipcodewilmington.froilansfarm.Rideable; + +public class Horse extends Animal implements Rideable { + public void eat(Edible obj) { + + } + + public String makeNoise() { + return null; + } +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Persons/Botanist.java b/src/main/java/com/zipcodewilmington/froilansfarm/Persons/Botanist.java new file mode 100644 index 00000000..f36cff0f --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Persons/Botanist.java @@ -0,0 +1,4 @@ +package com.zipcodewilmington.froilansfarm.Persons; + +public interface Botanist extends Person { +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Persons/Farmer.java b/src/main/java/com/zipcodewilmington/froilansfarm/Persons/Farmer.java new file mode 100644 index 00000000..7dd60ce3 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Persons/Farmer.java @@ -0,0 +1,13 @@ +package com.zipcodewilmington.froilansfarm.Persons; + +import com.zipcodewilmington.froilansfarm.EdiblePackage.Edible; + +public class Farmer implements Rider, Botanist { + public void eat(Edible obj) { + + } + + public String makeNoise() { + return null; + } +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Persons/Person.java b/src/main/java/com/zipcodewilmington/froilansfarm/Persons/Person.java new file mode 100644 index 00000000..e9962925 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Persons/Person.java @@ -0,0 +1,11 @@ +package com.zipcodewilmington.froilansfarm.Persons; + +import com.zipcodewilmington.froilansfarm.Eater; +import com.zipcodewilmington.froilansfarm.LivingThing; +import com.zipcodewilmington.froilansfarm.NoiseMaker; + +public interface Person extends LivingThing, Eater, NoiseMaker{ + + + } + diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Persons/Pilot.java b/src/main/java/com/zipcodewilmington/froilansfarm/Persons/Pilot.java new file mode 100644 index 00000000..3b107c91 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Persons/Pilot.java @@ -0,0 +1,13 @@ +package com.zipcodewilmington.froilansfarm.Persons; + +import com.zipcodewilmington.froilansfarm.EdiblePackage.Edible; + +public class Pilot implements Rider{ + public void eat(Edible obj) { + + } + + public String makeNoise() { + return null; + } +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Persons/Rider.java b/src/main/java/com/zipcodewilmington/froilansfarm/Persons/Rider.java new file mode 100644 index 00000000..52097d22 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Persons/Rider.java @@ -0,0 +1,4 @@ +package com.zipcodewilmington.froilansfarm.Persons; + +public interface Rider extends Person { +} From 5ce1398b385ed16b7f710f47cbd121553c3354d3 Mon Sep 17 00:00:00 2001 From: jorge Date: Wed, 24 Mar 2021 21:13:42 -0400 Subject: [PATCH 18/60] Added method to ProduceStand --- .../com/zipcodewilmington/froilansfarm/Farm/ChickenCoop.java | 5 +++++ .../com/zipcodewilmington/froilansfarm/Farm/FarmHouse.java | 5 +++++ .../com/zipcodewilmington/froilansfarm/Farm/Housing.java | 3 +++ .../zipcodewilmington/froilansfarm/Farm/ProduceStand.java | 5 +++++ .../java/com/zipcodewilmington/froilansfarm/Farm/Stable.java | 5 +++++ 5 files changed, 23 insertions(+) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Farm/ChickenCoop.java b/src/main/java/com/zipcodewilmington/froilansfarm/Farm/ChickenCoop.java index abdb2db1..0be3e9af 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Farm/ChickenCoop.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Farm/ChickenCoop.java @@ -1,4 +1,9 @@ package com.zipcodewilmington.froilansfarm.Farm; +import com.zipcodewilmington.froilansfarm.LivingThing; + public class ChickenCoop implements Housing{ + public void store(LivingThing creature) { + + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Farm/FarmHouse.java b/src/main/java/com/zipcodewilmington/froilansfarm/Farm/FarmHouse.java index 4aed622f..134ec294 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Farm/FarmHouse.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Farm/FarmHouse.java @@ -1,4 +1,9 @@ package com.zipcodewilmington.froilansfarm.Farm; +import com.zipcodewilmington.froilansfarm.LivingThing; + public class FarmHouse implements Housing{ + public void store(LivingThing creature) { + + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Farm/Housing.java b/src/main/java/com/zipcodewilmington/froilansfarm/Farm/Housing.java index b8efad6f..af07d29b 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Farm/Housing.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Farm/Housing.java @@ -1,4 +1,7 @@ package com.zipcodewilmington.froilansfarm.Farm; +import com.zipcodewilmington.froilansfarm.LivingThing; + public interface Housing { + void store(LivingThing creature); } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Farm/ProduceStand.java b/src/main/java/com/zipcodewilmington/froilansfarm/Farm/ProduceStand.java index 86f0c32d..44a5237d 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Farm/ProduceStand.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Farm/ProduceStand.java @@ -1,4 +1,9 @@ package com.zipcodewilmington.froilansfarm.Farm; +import com.zipcodewilmington.froilansfarm.Produce; + public class ProduceStand { + public void addProduce(Produce stuffs){ + + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Farm/Stable.java b/src/main/java/com/zipcodewilmington/froilansfarm/Farm/Stable.java index 9f19e27f..864d950e 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Farm/Stable.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Farm/Stable.java @@ -1,4 +1,9 @@ package com.zipcodewilmington.froilansfarm.Farm; +import com.zipcodewilmington.froilansfarm.LivingThing; + public class Stable implements Housing{ + public void store(LivingThing creature) { + + } } From eb4456d06e302cd0612296eeab2174fda873870b Mon Sep 17 00:00:00 2001 From: Greg Donnelly Date: Wed, 24 Mar 2021 21:15:25 -0400 Subject: [PATCH 19/60] routines package made --- .../froilansfarm/Routines/DailyRoutine.java | 7 +++++ .../froilansfarm/Routines/RoutineEngine.java | 27 +++++++++++++++++++ .../froilansfarm/Vehicles/Tractor.java | 2 ++ 3 files changed, 36 insertions(+) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Routines/DailyRoutine.java b/src/main/java/com/zipcodewilmington/froilansfarm/Routines/DailyRoutine.java index a51524b5..286ddc1c 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Routines/DailyRoutine.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Routines/DailyRoutine.java @@ -1,4 +1,11 @@ package com.zipcodewilmington.froilansfarm.Routines; +import com.zipcodewilmington.froilansfarm.EdiblePackage.ChickenFood; +import com.zipcodewilmington.froilansfarm.EdiblePackage.HorseFood; + public interface DailyRoutine { +// public boolean mount (Horse horse); +// public boolean dismount (Horse horse); +// public boolean feedHorse(Horse horse, HorseFood food); +// public boolean feedChickens(Chicken chicken, ChickenFood chickFood); } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Routines/RoutineEngine.java b/src/main/java/com/zipcodewilmington/froilansfarm/Routines/RoutineEngine.java index 5ec9012d..20603f8d 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Routines/RoutineEngine.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Routines/RoutineEngine.java @@ -1,4 +1,31 @@ package com.zipcodewilmington.froilansfarm.Routines; +import com.zipcodewilmington.froilansfarm.Animals.Chicken; +import com.zipcodewilmington.froilansfarm.Animals.Horse; +import com.zipcodewilmington.froilansfarm.EdiblePackage.ChickenFood; +import com.zipcodewilmington.froilansfarm.EdiblePackage.HorseFood; + public class RoutineEngine implements DailyRoutine{ + public boolean mount (Horse horse) {return false;} + public boolean dismount (Horse horse) {return false;} + public boolean feedHorse(Horse horse, HorseFood food) {return false;} + public boolean feedChickens(Chicken chicken, ChickenFood chickFood) {return false;} + + public boolean dailies (boolean mount, boolean dismount, boolean feedHorses, boolean feedChickens) { + if (mount && dismount && feedHorses && feedChickens) { + return true; + } else { + return false; + } + } + + + + public void Monday () {} + public void Tuesday () {} + public void Wednesday () {} + public void Thursday () {} + public void Friday () {} + public void Saturday () {} + public void Sunday () {} } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Tractor.java b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Tractor.java index e12197d0..aa2d00f4 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Tractor.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Tractor.java @@ -1,5 +1,7 @@ package com.zipcodewilmington.froilansfarm.Vehicles; +import com.zipcodewilmington.froilansfarm.Crops.Crop; + public class Tractor extends FarmVehicle{ public String makeNoise() { return "Clack-Clunk"; From bd052d2d98dba095e038d29956af1c35a67d4817 Mon Sep 17 00:00:00 2001 From: Greg Donnelly Date: Wed, 24 Mar 2021 21:40:35 -0400 Subject: [PATCH 20/60] ;aksdj --- .../froilansfarm/Routines/RoutineEngine.java | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Routines/RoutineEngine.java b/src/main/java/com/zipcodewilmington/froilansfarm/Routines/RoutineEngine.java index 20603f8d..ec332ce6 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Routines/RoutineEngine.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Routines/RoutineEngine.java @@ -3,21 +3,17 @@ import com.zipcodewilmington.froilansfarm.Animals.Chicken; import com.zipcodewilmington.froilansfarm.Animals.Horse; import com.zipcodewilmington.froilansfarm.EdiblePackage.ChickenFood; +import com.zipcodewilmington.froilansfarm.EdiblePackage.EarCorn; import com.zipcodewilmington.froilansfarm.EdiblePackage.HorseFood; public class RoutineEngine implements DailyRoutine{ - public boolean mount (Horse horse) {return false;} + public boolean mount (Horse horse) { return false;} public boolean dismount (Horse horse) {return false;} public boolean feedHorse(Horse horse, HorseFood food) {return false;} - public boolean feedChickens(Chicken chicken, ChickenFood chickFood) {return false;} + public boolean feedChickens(Chicken chicken, ChickenFood chickFood) { + chicken.eat(chickFood); + return true;} - public boolean dailies (boolean mount, boolean dismount, boolean feedHorses, boolean feedChickens) { - if (mount && dismount && feedHorses && feedChickens) { - return true; - } else { - return false; - } - } From 577e1a27655b51ce3d8105fe94c0331d1917dff0 Mon Sep 17 00:00:00 2001 From: jorge Date: Wed, 24 Mar 2021 22:09:17 -0400 Subject: [PATCH 21/60] made tests for EdiblesPAckage --- .../TestEdiblesPackage/TestApple.java | 18 ++++++++++++++++++ .../TestEdiblesPackage/TestEarCorn.java | 18 ++++++++++++++++++ .../TestEdiblesPackage/TestEgg.java | 10 ++++++++++ .../TestEdiblesPackage/TestPumpkin.java | 18 ++++++++++++++++++ .../TestEdiblesPackage/TestSoyBean.java | 18 ++++++++++++++++++ .../TestEdiblesPackage/TestTomato.java | 18 ++++++++++++++++++ 6 files changed, 100 insertions(+) diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/TestEdiblesPackage/TestApple.java b/src/test/java/com/zipcodewilmington/froilansfarm/TestEdiblesPackage/TestApple.java index c16158ce..5559ec07 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/TestEdiblesPackage/TestApple.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/TestEdiblesPackage/TestApple.java @@ -1,10 +1,28 @@ package com.zipcodewilmington.froilansfarm.TestEdiblesPackage; import com.zipcodewilmington.froilansfarm.EdiblePackage.Apple; +import com.zipcodewilmington.froilansfarm.EdiblePackage.Edible; +import com.zipcodewilmington.froilansfarm.EdiblePackage.EdiblePlant; import org.junit.Assert; import org.junit.Test; public class TestApple { + @Test + public void testImplementsEdible(){ + //Arrange + Apple apple = new Apple(); + + //Assertion + Assert.assertTrue(apple instanceof Edible); + } + @Test + public void testImplementsEdiblePlant(){ + //Arrange + Apple apple = new Apple(); + + //Assertion + Assert.assertTrue(apple instanceof EdiblePlant); + } @Test public void testHasBeenFertilized(){ //Arrange diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/TestEdiblesPackage/TestEarCorn.java b/src/test/java/com/zipcodewilmington/froilansfarm/TestEdiblesPackage/TestEarCorn.java index 89adca36..46d6f9f6 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/TestEdiblesPackage/TestEarCorn.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/TestEdiblesPackage/TestEarCorn.java @@ -2,10 +2,28 @@ import com.zipcodewilmington.froilansfarm.EdiblePackage.Apple; import com.zipcodewilmington.froilansfarm.EdiblePackage.EarCorn; +import com.zipcodewilmington.froilansfarm.EdiblePackage.Edible; +import com.zipcodewilmington.froilansfarm.EdiblePackage.EdiblePlant; import org.junit.Assert; import org.junit.Test; public class TestEarCorn { + @Test + public void testImplementsEdible(){ + //Arrange + EarCorn corn = new EarCorn(); + + //Assertion + Assert.assertTrue(corn instanceof Edible); + } + @Test + public void testImplementsEdiblePlant(){ + //Arrange + EarCorn corn = new EarCorn(); + + //Assertion + Assert.assertTrue(corn instanceof EdiblePlant); + } @Test public void testHasBeenFertilized(){ //Arrange diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/TestEdiblesPackage/TestEgg.java b/src/test/java/com/zipcodewilmington/froilansfarm/TestEdiblesPackage/TestEgg.java index 1864d2bd..21349477 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/TestEdiblesPackage/TestEgg.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/TestEdiblesPackage/TestEgg.java @@ -1,11 +1,21 @@ package com.zipcodewilmington.froilansfarm.TestEdiblesPackage; import com.zipcodewilmington.froilansfarm.EdiblePackage.Apple; +import com.zipcodewilmington.froilansfarm.EdiblePackage.Edible; +import com.zipcodewilmington.froilansfarm.EdiblePackage.EdiblePlant; import com.zipcodewilmington.froilansfarm.EdiblePackage.Egg; import org.junit.Assert; import org.junit.Test; public class TestEgg { + @Test + public void testImplementsEdiblePlant(){ + //Arrange + Egg egg = new Egg(); + + //Assertion + Assert.assertTrue(egg instanceof Edible); + } @Test public void testHasBeenFertilized(){ //Arrange diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/TestEdiblesPackage/TestPumpkin.java b/src/test/java/com/zipcodewilmington/froilansfarm/TestEdiblesPackage/TestPumpkin.java index 3cd57740..f22b2eaa 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/TestEdiblesPackage/TestPumpkin.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/TestEdiblesPackage/TestPumpkin.java @@ -1,11 +1,29 @@ package com.zipcodewilmington.froilansfarm.TestEdiblesPackage; import com.zipcodewilmington.froilansfarm.EdiblePackage.Apple; +import com.zipcodewilmington.froilansfarm.EdiblePackage.Edible; +import com.zipcodewilmington.froilansfarm.EdiblePackage.EdiblePlant; import com.zipcodewilmington.froilansfarm.EdiblePackage.Pumpkin; import org.junit.Assert; import org.junit.Test; public class TestPumpkin { + @Test + public void testImplementsEdible(){ + //Arrange + Pumpkin pumpkin = new Pumpkin(); + + //Assertion + Assert.assertTrue(pumpkin instanceof Edible); + } + @Test + public void testImplementsEdiblePlant(){ + //Arrange + Pumpkin pumpkin = new Pumpkin(); + + //Assertion + Assert.assertTrue(pumpkin instanceof EdiblePlant); + } @Test public void testHasBeenFertilized(){ //Arrange diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/TestEdiblesPackage/TestSoyBean.java b/src/test/java/com/zipcodewilmington/froilansfarm/TestEdiblesPackage/TestSoyBean.java index 13a0d9ed..13ba1248 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/TestEdiblesPackage/TestSoyBean.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/TestEdiblesPackage/TestSoyBean.java @@ -1,11 +1,29 @@ package com.zipcodewilmington.froilansfarm.TestEdiblesPackage; import com.zipcodewilmington.froilansfarm.EdiblePackage.Apple; +import com.zipcodewilmington.froilansfarm.EdiblePackage.Edible; +import com.zipcodewilmington.froilansfarm.EdiblePackage.EdiblePlant; import com.zipcodewilmington.froilansfarm.EdiblePackage.SoyBean; import org.junit.Assert; import org.junit.Test; public class TestSoyBean { + @Test + public void testImplementsEdible(){ + //Arrange + SoyBean bean = new SoyBean(); + + //Assertion + Assert.assertTrue(bean instanceof Edible); + } + @Test + public void testImplementsEdiblePlant(){ + //Arrange + SoyBean bean = new SoyBean(); + + //Assertion + Assert.assertTrue(bean instanceof EdiblePlant); + } @Test public void testHasBeenFertilized(){ //Arrange diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/TestEdiblesPackage/TestTomato.java b/src/test/java/com/zipcodewilmington/froilansfarm/TestEdiblesPackage/TestTomato.java index 01162a8f..d6bd1a6b 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/TestEdiblesPackage/TestTomato.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/TestEdiblesPackage/TestTomato.java @@ -1,11 +1,29 @@ package com.zipcodewilmington.froilansfarm.TestEdiblesPackage; import com.zipcodewilmington.froilansfarm.EdiblePackage.Apple; +import com.zipcodewilmington.froilansfarm.EdiblePackage.Edible; +import com.zipcodewilmington.froilansfarm.EdiblePackage.EdiblePlant; import com.zipcodewilmington.froilansfarm.EdiblePackage.Tomato; import org.junit.Assert; import org.junit.Test; public class TestTomato { + @Test + public void testImplementsEdible(){ + //Arrange + Tomato tomato = new Tomato(); + + //Assertion + Assert.assertTrue(tomato instanceof Edible); + } + @Test + public void testImplementsEdiblePlant(){ + //Arrange + Tomato tomato = new Tomato(); + + //Assertion + Assert.assertTrue(tomato instanceof EdiblePlant); + } @Test public void testHasBeenFertilized(){ //Arrange From bff439fa145a24fe149740aab0d357a833da9849 Mon Sep 17 00:00:00 2001 From: KellyPorter02 Date: Wed, 24 Mar 2021 22:14:43 -0400 Subject: [PATCH 22/60] Some chicken tests --- .../froilansfarm/Animals/Chicken.java | 20 +++++- .../zipcodewilmington/froilansfarm/Eater.java | 2 +- .../froilansfarm/AnimalsTest/ChickenTest.java | 65 +++++++++++++++++++ 3 files changed, 83 insertions(+), 4 deletions(-) create mode 100644 src/test/java/com/zipcodewilmington/froilansfarm/AnimalsTest/ChickenTest.java diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Animals/Chicken.java b/src/main/java/com/zipcodewilmington/froilansfarm/Animals/Chicken.java index a1a5d4e0..fa469184 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Animals/Chicken.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Animals/Chicken.java @@ -1,18 +1,32 @@ package com.zipcodewilmington.froilansfarm.Animals; +import com.zipcodewilmington.froilansfarm.EdiblePackage.ChickenFood; +import com.zipcodewilmington.froilansfarm.EdiblePackage.EarCorn; import com.zipcodewilmington.froilansfarm.EdiblePackage.Edible; import com.zipcodewilmington.froilansfarm.Produce; public class Chicken extends Animal implements Produce { - public void eat(Edible obj) { - } public String makeNoise() { - return null; + System.out.println("Bok Bok!"); + return "Bok Bok!"; } public void addProduce(Produce produce) { } + +// @Override + public String eat(ChickenFood chickyFood) { + System.out.println("Peck Peck"); + return "Peck Peck"; + } + + + @Override + public String eat(Edible obj) { + System.out.println("Peck Peck"); + return "Peck Peck"; + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Eater.java b/src/main/java/com/zipcodewilmington/froilansfarm/Eater.java index 2026d78d..59e2b830 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Eater.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Eater.java @@ -3,5 +3,5 @@ import com.zipcodewilmington.froilansfarm.EdiblePackage.Edible; public interface Eater { - void eat(Edible obj); + String eat(Edible obj); } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/AnimalsTest/ChickenTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/AnimalsTest/ChickenTest.java new file mode 100644 index 00000000..6856073f --- /dev/null +++ b/src/test/java/com/zipcodewilmington/froilansfarm/AnimalsTest/ChickenTest.java @@ -0,0 +1,65 @@ +package com.zipcodewilmington.froilansfarm.AnimalsTest; + +import com.zipcodewilmington.froilansfarm.Animals.Chicken; +import com.zipcodewilmington.froilansfarm.EdiblePackage.EarCorn; +import com.zipcodewilmington.froilansfarm.EdiblePackage.Egg; +import org.junit.Assert; +import org.junit.Test; + +public class ChickenTest { + + @Test + public void eatTestEarCorn() { + // Arrange + String expected = "Peck Peck"; + Chicken testChicky = new Chicken(); + EarCorn testCorn = new EarCorn(); + // Act + String returned = testChicky.eat(testCorn); + // Assert + Assert.assertEquals(expected, returned); + } + + @Test + public void eatTestEgg() { // Chicken should not be able to eat an egg + // Arrange + String expected = "Peck Peck"; + Chicken testChicky = new Chicken(); + Egg testEgg = new Egg(); + // Act + String returned = testChicky.eat(testEgg); + // Assert + Assert.assertEquals(expected, returned); + } + + @Test + public void makeNoiseTest1() { + // Arrange + String expected = "Bok Bok!"; + Chicken testChicky = new Chicken(); + // Act + String returned = testChicky.makeNoise(); + // Assert + Assert.assertEquals(expected, returned); + } + + @Test + public void makeNoiseTest2() { + // Arrange + String expected = "Woof!"; + Chicken testChicky = new Chicken(); + // Act + String returned = testChicky.makeNoise(); + // Assert + Assert.assertNotEquals(expected, returned); + } + + @Test + public void addProduce() { + // Arrange + + // Act + + // Assert + } +} From 5763c43c86d5974364d6b5d0d6e28ac0136e821f Mon Sep 17 00:00:00 2001 From: KellyPorter02 Date: Wed, 24 Mar 2021 22:25:07 -0400 Subject: [PATCH 23/60] changed return types of all downstream classes to Eater interface --- pom.xml | 8 ++++++++ .../zipcodewilmington/froilansfarm/Animals/Animal.java | 4 ++++ .../zipcodewilmington/froilansfarm/Animals/Chicken.java | 2 +- .../com/zipcodewilmington/froilansfarm/Animals/Horse.java | 3 ++- .../zipcodewilmington/froilansfarm/Persons/Farmer.java | 3 ++- .../com/zipcodewilmington/froilansfarm/Persons/Pilot.java | 3 ++- 6 files changed, 19 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 69a3b878..403b67d4 100644 --- a/pom.xml +++ b/pom.xml @@ -7,6 +7,14 @@ com.zipcodewilmington froilans-farm 1.0-SNAPSHOT + + + junit + junit + 4.12 + test + + \ No newline at end of file diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Animals/Animal.java b/src/main/java/com/zipcodewilmington/froilansfarm/Animals/Animal.java index 2ebce33a..06f9d049 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Animals/Animal.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Animals/Animal.java @@ -1,8 +1,12 @@ package com.zipcodewilmington.froilansfarm.Animals; import com.zipcodewilmington.froilansfarm.Eater; +import com.zipcodewilmington.froilansfarm.EdiblePackage.Edible; import com.zipcodewilmington.froilansfarm.LivingThing; import com.zipcodewilmington.froilansfarm.NoiseMaker; public abstract class Animal implements Eater, LivingThing, NoiseMaker { + public String eat(Edible obj) { + 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 fa469184..6b61e3d9 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Animals/Chicken.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Animals/Chicken.java @@ -24,7 +24,7 @@ public String eat(ChickenFood chickyFood) { } - @Override + public String eat(Edible obj) { System.out.println("Peck Peck"); return "Peck Peck"; diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Animals/Horse.java b/src/main/java/com/zipcodewilmington/froilansfarm/Animals/Horse.java index fae35c46..7fd14cf2 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Animals/Horse.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Animals/Horse.java @@ -4,8 +4,9 @@ import com.zipcodewilmington.froilansfarm.Rideable; public class Horse extends Animal implements Rideable { - public void eat(Edible obj) { + public String eat(Edible obj) { + return null; } public String makeNoise() { diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Persons/Farmer.java b/src/main/java/com/zipcodewilmington/froilansfarm/Persons/Farmer.java index 7dd60ce3..7ec9e037 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Persons/Farmer.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Persons/Farmer.java @@ -3,8 +3,9 @@ import com.zipcodewilmington.froilansfarm.EdiblePackage.Edible; public class Farmer implements Rider, Botanist { - public void eat(Edible obj) { + public String eat(Edible obj) { + return null; } public String makeNoise() { diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Persons/Pilot.java b/src/main/java/com/zipcodewilmington/froilansfarm/Persons/Pilot.java index 3b107c91..129367ed 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Persons/Pilot.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Persons/Pilot.java @@ -3,8 +3,9 @@ import com.zipcodewilmington.froilansfarm.EdiblePackage.Edible; public class Pilot implements Rider{ - public void eat(Edible obj) { + public String eat(Edible obj) { + return null; } public String makeNoise() { From cdb1dd432df75caa847823ebc670b33afe6f7ef8 Mon Sep 17 00:00:00 2001 From: jorge Date: Wed, 24 Mar 2021 22:36:40 -0400 Subject: [PATCH 24/60] made tests for VehiclesPackage --- .../TestEdiblesPackage/TestChickenFood.java | 8 ++++ .../TestVehicles/TestAirCraft.java | 10 +++++ .../TestVehicles/TestCropDuster.java | 38 +++++++++++++++++++ .../TestVehicles/TestTractor.java | 36 ++++++++++++++++++ 4 files changed, 92 insertions(+) create mode 100644 src/test/java/com/zipcodewilmington/froilansfarm/TestEdiblesPackage/TestChickenFood.java create mode 100644 src/test/java/com/zipcodewilmington/froilansfarm/TestVehicles/TestAirCraft.java create mode 100644 src/test/java/com/zipcodewilmington/froilansfarm/TestVehicles/TestCropDuster.java create mode 100644 src/test/java/com/zipcodewilmington/froilansfarm/TestVehicles/TestTractor.java diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/TestEdiblesPackage/TestChickenFood.java b/src/test/java/com/zipcodewilmington/froilansfarm/TestEdiblesPackage/TestChickenFood.java new file mode 100644 index 00000000..d0cfdf37 --- /dev/null +++ b/src/test/java/com/zipcodewilmington/froilansfarm/TestEdiblesPackage/TestChickenFood.java @@ -0,0 +1,8 @@ +package com.zipcodewilmington.froilansfarm.TestEdiblesPackage; + +import com.zipcodewilmington.froilansfarm.EdiblePackage.ChickenFood; +import com.zipcodewilmington.froilansfarm.EdiblePackage.EdiblePlant; +import org.junit.Assert; + +public class TestChickenFood { +} diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/TestVehicles/TestAirCraft.java b/src/test/java/com/zipcodewilmington/froilansfarm/TestVehicles/TestAirCraft.java new file mode 100644 index 00000000..2b3bcb6f --- /dev/null +++ b/src/test/java/com/zipcodewilmington/froilansfarm/TestVehicles/TestAirCraft.java @@ -0,0 +1,10 @@ +package com.zipcodewilmington.froilansfarm.TestVehicles; + +import com.zipcodewilmington.froilansfarm.Vehicles.Aircraft; +import com.zipcodewilmington.froilansfarm.Vehicles.Vehicle; +import org.junit.Assert; +import org.junit.Test; + +public class TestAirCraft { + +} diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/TestVehicles/TestCropDuster.java b/src/test/java/com/zipcodewilmington/froilansfarm/TestVehicles/TestCropDuster.java new file mode 100644 index 00000000..2d4425b2 --- /dev/null +++ b/src/test/java/com/zipcodewilmington/froilansfarm/TestVehicles/TestCropDuster.java @@ -0,0 +1,38 @@ +package com.zipcodewilmington.froilansfarm.TestVehicles; + +import com.zipcodewilmington.froilansfarm.Vehicles.Aircraft; +import com.zipcodewilmington.froilansfarm.Vehicles.CropDuster; +import com.zipcodewilmington.froilansfarm.Vehicles.Vehicle; +import org.junit.Assert; +import org.junit.Test; + +public class TestCropDuster { + @Test + public void testInheritanceAirCraft(){ + //Arrange + CropDuster duster = new CropDuster(); + + //Assertion + Assert.assertTrue(duster instanceof Aircraft); + } + @Test + public void testImplementsVehicle(){ + //Arrange + CropDuster duster = new CropDuster(); + + //Assertion + Assert.assertTrue(duster instanceof Vehicle); + } + @Test + public void testMakeNoise(){ + //Arrange + CropDuster duster = new CropDuster(); + + //Action + String expected = "NnNnNn"; + String actual = duster.makeNoise(); + + //Assertion + Assert.assertEquals(expected,actual); + } +} diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/TestVehicles/TestTractor.java b/src/test/java/com/zipcodewilmington/froilansfarm/TestVehicles/TestTractor.java new file mode 100644 index 00000000..936514e8 --- /dev/null +++ b/src/test/java/com/zipcodewilmington/froilansfarm/TestVehicles/TestTractor.java @@ -0,0 +1,36 @@ +package com.zipcodewilmington.froilansfarm.TestVehicles; + +import com.zipcodewilmington.froilansfarm.Vehicles.*; +import org.junit.Assert; +import org.junit.Test; + +public class TestTractor { + @Test + public void testInheritanceFarmVehicle(){ + //Arrange + Tractor tractor = new Tractor(); + + //Assertion + Assert.assertTrue(tractor instanceof FarmVehicle); + } + @Test + public void testImplementsVehicle(){ + //Arrange + Tractor tractor = new Tractor(); + + //Assertion + Assert.assertTrue(tractor instanceof Vehicle); + } + @Test + public void testMakeNoise(){ + //Arrange + Tractor tractor = new Tractor();; + + //Action + String expected = "NnNnNn"; + String actual = tractor.makeNoise(); + + //Assertion + Assert.assertEquals(expected,actual); + } +} From c6b72e0d06087b8cba8bfd2b63a07e3790255f00 Mon Sep 17 00:00:00 2001 From: KellyPorter02 Date: Wed, 24 Mar 2021 22:41:09 -0400 Subject: [PATCH 25/60] Some tests for Horse --- .../froilansfarm/Animals/Horse.java | 8 +- .../froilansfarm/AnimalsTest/ChickenTest.java | 2 +- .../froilansfarm/AnimalsTest/HorseTest.java | 84 +++++++++++++++++++ 3 files changed, 90 insertions(+), 4 deletions(-) create mode 100644 src/test/java/com/zipcodewilmington/froilansfarm/AnimalsTest/HorseTest.java diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Animals/Horse.java b/src/main/java/com/zipcodewilmington/froilansfarm/Animals/Horse.java index 7fd14cf2..de70cd32 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Animals/Horse.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Animals/Horse.java @@ -4,12 +4,14 @@ import com.zipcodewilmington.froilansfarm.Rideable; public class Horse extends Animal implements Rideable { - public String eat(Edible obj) { - return null; + public String eat(Edible obj) { + System.out.println("munch munch munch"); + return "munch munch munch"; } public String makeNoise() { - return null; + System.out.println("Neeeighhh!"); + return "Neeeighhh!"; } } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/AnimalsTest/ChickenTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/AnimalsTest/ChickenTest.java index 6856073f..28cc5648 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/AnimalsTest/ChickenTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/AnimalsTest/ChickenTest.java @@ -29,7 +29,7 @@ public void eatTestEgg() { // Chicken should not be able to eat an egg // Act String returned = testChicky.eat(testEgg); // Assert - Assert.assertEquals(expected, returned); + Assert.assertNotEquals(expected, returned); } @Test diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/AnimalsTest/HorseTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/AnimalsTest/HorseTest.java new file mode 100644 index 00000000..d52d6998 --- /dev/null +++ b/src/test/java/com/zipcodewilmington/froilansfarm/AnimalsTest/HorseTest.java @@ -0,0 +1,84 @@ +package com.zipcodewilmington.froilansfarm.AnimalsTest; + + +import com.zipcodewilmington.froilansfarm.Animals.Horse; + +import com.zipcodewilmington.froilansfarm.EdiblePackage.Apple; +import com.zipcodewilmington.froilansfarm.EdiblePackage.EarCorn; +import com.zipcodewilmington.froilansfarm.EdiblePackage.Egg; +import com.zipcodewilmington.froilansfarm.EdiblePackage.Tomato; +import org.junit.Assert; +import org.junit.Test; + +public class HorseTest { + + @Test + public void makeNoiseTest1() { + // Arrange + String expected = "Neeeighhh!"; + Horse testHorsey = new Horse(); + // Act + String returned = testHorsey.makeNoise(); + // Assert + Assert.assertEquals(expected, returned); + } + + @Test + public void makeNoiseTest2BokBok() { + // Arrange + String expected = "Bok Bok!"; + Horse testHorsey = new Horse(); + // Act + String returned = testHorsey.makeNoise(); + // Assert + Assert.assertNotEquals(expected, returned); + } + + @Test + public void eatTestEgg() { + // Arrange + String expected = "munch munch munch"; + Horse testHorsey = new Horse(); + Egg testEgg = new Egg(); + // Act + String returned = testHorsey.eat(testEgg); + // Assert + Assert.assertNotEquals(expected, returned); + } + + @Test + public void eatTestEarCorn() { + // Arrange + String expected = "munch munch munch"; + Horse testHorsey = new Horse(); + EarCorn testEarCorn = new EarCorn(); + // Act + String returned = testHorsey.eat(testEarCorn); + // Assert + Assert.assertEquals(expected, returned); + } + + @Test + public void eatTestApple() { + // Arrange + String expected = "munch munch munch"; + Horse testHorsey = new Horse(); + Apple testApple = new Apple(); + // Act + String returned = testHorsey.eat(testApple); + // Assert + Assert.assertEquals(expected, returned); + } + + @Test + public void eatTestTomato() { + // Arrange + String expected = "munch munch munch"; + Horse testHorsey = new Horse(); + Tomato testTomato = new Tomato(); + // Act + String returned = testHorsey.eat(testTomato); + // Assert + Assert.assertNotEquals(expected, returned); + } +} From 0392843e91b686119ec1c45d855abbd898c4296b Mon Sep 17 00:00:00 2001 From: Greg Donnelly Date: Wed, 24 Mar 2021 23:01:39 -0400 Subject: [PATCH 26/60] coops and stables are present --- .../froilansfarm/Farm/ChickenCoop.java | 18 +++++++++++++++--- .../froilansfarm/Farm/Farm.java | 15 +++++++++++++++ .../froilansfarm/Farm/FarmHouse.java | 5 ++--- .../froilansfarm/Farm/Housing.java | 10 ++++++++-- .../froilansfarm/Farm/Stable.java | 12 ++++++++++-- 5 files changed, 50 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Farm/ChickenCoop.java b/src/main/java/com/zipcodewilmington/froilansfarm/Farm/ChickenCoop.java index 0be3e9af..6fecb484 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Farm/ChickenCoop.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Farm/ChickenCoop.java @@ -1,9 +1,21 @@ package com.zipcodewilmington.froilansfarm.Farm; -import com.zipcodewilmington.froilansfarm.LivingThing; +import com.zipcodewilmington.froilansfarm.Animals.Chicken; -public class ChickenCoop implements Housing{ - public void store(LivingThing creature) { +import java.util.ArrayList; +import java.util.List; +public class ChickenCoop extends Housing{ + ArrayList coop; + + public ChickenCoop(int numOfChickens, Chicken chicken) { + coop = new ArrayList(numOfChickens); + for (int i = 0; i < numOfChickens; i++) { + store(chicken); + } + } + + public void store(Chicken chicken) { + coop.add(chicken); } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Farm/Farm.java b/src/main/java/com/zipcodewilmington/froilansfarm/Farm/Farm.java index b3052862..18544f71 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Farm/Farm.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Farm/Farm.java @@ -1,4 +1,19 @@ package com.zipcodewilmington.froilansfarm.Farm; +import com.zipcodewilmington.froilansfarm.Animals.Chicken; +import com.zipcodewilmington.froilansfarm.Animals.Horse; + +import java.util.ArrayList; + public class Farm { + Chicken chicken = new Chicken(); + Horse horse = new Horse(); + ChickenCoop coopOne = new ChickenCoop(4, chicken); + ChickenCoop coopTwo = new ChickenCoop(4, chicken); + ChickenCoop coopThree = new ChickenCoop(3, chicken); + ChickenCoop coopFour = new ChickenCoop(4, chicken); + + Stable stableOne = new Stable(4, horse); + Stable stableTwo = new Stable(3, horse); + Stable stableThree = new Stable(3, horse); } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Farm/FarmHouse.java b/src/main/java/com/zipcodewilmington/froilansfarm/Farm/FarmHouse.java index 134ec294..a017a3f5 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Farm/FarmHouse.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Farm/FarmHouse.java @@ -1,9 +1,8 @@ package com.zipcodewilmington.froilansfarm.Farm; import com.zipcodewilmington.froilansfarm.LivingThing; +import com.zipcodewilmington.froilansfarm.Persons.Person; -public class FarmHouse implements Housing{ - public void store(LivingThing creature) { +public class FarmHouse extends Housing { - } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Farm/Housing.java b/src/main/java/com/zipcodewilmington/froilansfarm/Farm/Housing.java index af07d29b..f9f7d5fa 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Farm/Housing.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Farm/Housing.java @@ -2,6 +2,12 @@ import com.zipcodewilmington.froilansfarm.LivingThing; -public interface Housing { - void store(LivingThing creature); +import java.util.ArrayList; + +public abstract class Housing { + ArrayList livingStorage = new ArrayList(); + + public void store(E creature) { + livingStorage.add(creature); + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Farm/Stable.java b/src/main/java/com/zipcodewilmington/froilansfarm/Farm/Stable.java index 864d950e..206d9c16 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Farm/Stable.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Farm/Stable.java @@ -1,9 +1,17 @@ package com.zipcodewilmington.froilansfarm.Farm; +import com.zipcodewilmington.froilansfarm.Animals.Horse; import com.zipcodewilmington.froilansfarm.LivingThing; -public class Stable implements Housing{ - public void store(LivingThing creature) { +import java.util.ArrayList; +public class Stable extends Housing{ + ArrayList stable; + + public Stable(int numOfHorses, Horse horse) { + stable = new ArrayList(); + for (int i = 0; i < numOfHorses; i++) { + store(horse); + } } } From 96832324983e0c19a08c7a1c6a21d24465ed8ad4 Mon Sep 17 00:00:00 2001 From: KellyPorter02 Date: Wed, 24 Mar 2021 23:08:07 -0400 Subject: [PATCH 27/60] PilotTest class created --- .../froilansfarm/Persons/Pilot.java | 7 ++++--- .../froilansfarm/PersonsTest/PilotTest.java | 19 +++++++++++++++++++ 2 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 src/test/java/com/zipcodewilmington/froilansfarm/PersonsTest/PilotTest.java diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Persons/Pilot.java b/src/main/java/com/zipcodewilmington/froilansfarm/Persons/Pilot.java index 129367ed..729ffb32 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Persons/Pilot.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Persons/Pilot.java @@ -4,11 +4,12 @@ public class Pilot implements Rider{ public String eat(Edible obj) { - - return null; + System.out.println("Yum, this food is tasty"); + return "Yum, this food is tasty"; } public String makeNoise() { - return null; + System.out.println("Everyone has oceans to fly, if they have the heart to do it. Is it reckless? Maybe. But what do dreams know of boundaries?"); + return "Everyone has oceans to fly, if they have the heart to do it. Is it reckless? Maybe. But what do dreams know of boundaries?"; } } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/PersonsTest/PilotTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/PersonsTest/PilotTest.java new file mode 100644 index 00000000..5351841d --- /dev/null +++ b/src/test/java/com/zipcodewilmington/froilansfarm/PersonsTest/PilotTest.java @@ -0,0 +1,19 @@ +package com.zipcodewilmington.froilansfarm.PersonsTest; + +import com.zipcodewilmington.froilansfarm.Persons.Pilot; +import org.junit.Assert; +import org.junit.Test; + +public class PilotTest { + + @Test + public void makeNoiseTest1() { + // Arrange + String expected = "Everyone has oceans to fly, if they have the heart to do it. Is it reckless? Maybe. But what do dreams know of boundaries?"; + Pilot testPilot = new Pilot(); + // Act + String returned = testPilot.makeNoise(); + // Assert + Assert.assertEquals(expected, returned); + } +} From b641bef80217053daa10706d3eace51eefb2e702 Mon Sep 17 00:00:00 2001 From: Greg Donnelly Date: Wed, 24 Mar 2021 23:14:06 -0400 Subject: [PATCH 28/60] adjustments --- .../froilansfarm/Farm/ChickenCoop.java | 11 ++++-- .../froilansfarm/Farm/Housing.java | 4 +++ .../HousingTest/ChickenCoopTest.java | 36 +++++++++++++++++++ 3 files changed, 48 insertions(+), 3 deletions(-) create mode 100644 src/test/java/com/zipcodewilmington/froilansfarm/HousingTest/ChickenCoopTest.java diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Farm/ChickenCoop.java b/src/main/java/com/zipcodewilmington/froilansfarm/Farm/ChickenCoop.java index 6fecb484..60cefa70 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Farm/ChickenCoop.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Farm/ChickenCoop.java @@ -3,13 +3,13 @@ import com.zipcodewilmington.froilansfarm.Animals.Chicken; import java.util.ArrayList; -import java.util.List; public class ChickenCoop extends Housing{ - ArrayList coop; + ArrayList coop = new ArrayList(); + + public ChickenCoop() {} public ChickenCoop(int numOfChickens, Chicken chicken) { - coop = new ArrayList(numOfChickens); for (int i = 0; i < numOfChickens; i++) { store(chicken); } @@ -18,4 +18,9 @@ public ChickenCoop(int numOfChickens, Chicken chicken) { public void store(Chicken chicken) { coop.add(chicken); } + + @Override + public int size() { + return coop.size(); + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Farm/Housing.java b/src/main/java/com/zipcodewilmington/froilansfarm/Farm/Housing.java index f9f7d5fa..45a47dec 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Farm/Housing.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Farm/Housing.java @@ -10,4 +10,8 @@ public abstract class Housing { public void store(E creature) { livingStorage.add(creature); } + + public int size() { + return livingStorage.size(); + } } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/HousingTest/ChickenCoopTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/HousingTest/ChickenCoopTest.java new file mode 100644 index 00000000..32507f9d --- /dev/null +++ b/src/test/java/com/zipcodewilmington/froilansfarm/HousingTest/ChickenCoopTest.java @@ -0,0 +1,36 @@ +package com.zipcodewilmington.froilansfarm.HousingTest; + +import com.zipcodewilmington.froilansfarm.Animals.Chicken; +import com.zipcodewilmington.froilansfarm.Farm.ChickenCoop; +import org.junit.Assert; +import org.junit.Test; + +public class ChickenCoopTest { + Chicken chicken = new Chicken(); + + @Test + public void coopSizeOne() { + //Given + ChickenCoop chickenCoop = new ChickenCoop(4, chicken); + int expected = 4; + + //When + int actual = chickenCoop.size(); + + //Then + Assert.assertEquals(expected, actual); + } + + @Test + public void coopSizeTwo() { + //Given + ChickenCoop chickenCoop = new ChickenCoop(12, chicken); + int expected = 12; + + //When + int actual = chickenCoop.size(); + + //Then + Assert.assertEquals(expected, actual); + } +} From eb52003aeea99225a58ea9d43178853050126cc6 Mon Sep 17 00:00:00 2001 From: KellyPorter02 Date: Thu, 25 Mar 2021 00:20:30 -0400 Subject: [PATCH 29/60] Added method stubs to Botanist, Rider Interface --- .../froilansfarm/Persons/Botanist.java | 4 ++ .../froilansfarm/Persons/Farmer.java | 20 +++++- .../froilansfarm/Persons/Pilot.java | 11 ++- .../froilansfarm/Persons/Rider.java | 5 ++ .../froilansfarm/Vehicles/CropDuster.java | 4 +- .../froilansfarm/Vehicles/Tractor.java | 2 +- .../froilansfarm/PersonsTest/FarmerTest.java | 72 +++++++++++++++++++ .../froilansfarm/PersonsTest/PilotTest.java | 50 +++++++++++++ 8 files changed, 163 insertions(+), 5 deletions(-) create mode 100644 src/test/java/com/zipcodewilmington/froilansfarm/PersonsTest/FarmerTest.java diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Persons/Botanist.java b/src/main/java/com/zipcodewilmington/froilansfarm/Persons/Botanist.java index f36cff0f..04906215 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Persons/Botanist.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Persons/Botanist.java @@ -1,4 +1,8 @@ package com.zipcodewilmington.froilansfarm.Persons; +import com.zipcodewilmington.froilansfarm.Crops.Crop; +import com.zipcodewilmington.froilansfarm.Farm.CropRow; + public interface Botanist extends Person { + void plant(Crop crop, CropRow cropRow); } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Persons/Farmer.java b/src/main/java/com/zipcodewilmington/froilansfarm/Persons/Farmer.java index 7ec9e037..04c0b479 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Persons/Farmer.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Persons/Farmer.java @@ -1,14 +1,30 @@ package com.zipcodewilmington.froilansfarm.Persons; +import com.zipcodewilmington.froilansfarm.Crops.Crop; import com.zipcodewilmington.froilansfarm.EdiblePackage.Edible; +import com.zipcodewilmington.froilansfarm.Farm.CropRow; +import com.zipcodewilmington.froilansfarm.Rideable; -public class Farmer implements Rider, Botanist { +public class Farmer implements Rider, Botanist, Person { public String eat(Edible obj) { + System.out.println("This food is downright edible!"); + return "This food is downright edible!"; + } + + public String makeNoise() { + System.out.println("E-I-E-I-O"); + return "E-I-E-I-O"; + } + public String mount(Rideable obj) { return null; } - public String makeNoise() { + public String dismount(Rideable obj) { return null; } + + public void plant(Crop crop, CropRow cropRow) { + + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Persons/Pilot.java b/src/main/java/com/zipcodewilmington/froilansfarm/Persons/Pilot.java index 729ffb32..5f948789 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Persons/Pilot.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Persons/Pilot.java @@ -1,8 +1,9 @@ package com.zipcodewilmington.froilansfarm.Persons; import com.zipcodewilmington.froilansfarm.EdiblePackage.Edible; +import com.zipcodewilmington.froilansfarm.Rideable; -public class Pilot implements Rider{ +public class Pilot implements Rider, Person { public String eat(Edible obj) { System.out.println("Yum, this food is tasty"); return "Yum, this food is tasty"; @@ -12,4 +13,12 @@ public String makeNoise() { System.out.println("Everyone has oceans to fly, if they have the heart to do it. Is it reckless? Maybe. But what do dreams know of boundaries?"); return "Everyone has oceans to fly, if they have the heart to do it. Is it reckless? Maybe. But what do dreams know of boundaries?"; } + + public String mount(Rideable obj) { + return null; + } + + public String dismount(Rideable obj) { + return null; + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Persons/Rider.java b/src/main/java/com/zipcodewilmington/froilansfarm/Persons/Rider.java index 52097d22..23793921 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Persons/Rider.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Persons/Rider.java @@ -1,4 +1,9 @@ package com.zipcodewilmington.froilansfarm.Persons; +import com.zipcodewilmington.froilansfarm.Rideable; + public interface Rider extends Person { + String mount(Rideable obj); + String dismount(Rideable obj); + } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDuster.java b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDuster.java index 5a81756b..d257e65a 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDuster.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDuster.java @@ -1,10 +1,12 @@ package com.zipcodewilmington.froilansfarm.Vehicles; +import com.zipcodewilmington.froilansfarm.Farm.CropRow; + public class CropDuster extends Aircraft{ public String makeNoise() { return "NnNnNn"; } - public void fertilizeRow(/*CropRow row*/){ + public void fertilizeRow(CropRow row){ //calls to crop row and sprays tf out of crops to fertilize } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Tractor.java b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Tractor.java index ec6e91ad..8a039d91 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Tractor.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Tractor.java @@ -6,7 +6,7 @@ public class Tractor extends FarmVehicle{ public String makeNoise() { return "Clack-Clunk"; } - public void harvestCrop(){ + public void harvest(Crop crop){ //method which calls to crop row and tells that its getting harvested af } } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/PersonsTest/FarmerTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/PersonsTest/FarmerTest.java new file mode 100644 index 00000000..3289f3b0 --- /dev/null +++ b/src/test/java/com/zipcodewilmington/froilansfarm/PersonsTest/FarmerTest.java @@ -0,0 +1,72 @@ +package com.zipcodewilmington.froilansfarm.PersonsTest; + +import com.zipcodewilmington.froilansfarm.EdiblePackage.Apple; +import com.zipcodewilmington.froilansfarm.EdiblePackage.Egg; +import com.zipcodewilmington.froilansfarm.EdiblePackage.Pumpkin; +import com.zipcodewilmington.froilansfarm.Persons.Farmer; +import org.junit.Assert; +import org.junit.Test; + +public class FarmerTest { + @Test + public void makeNoiseTest1() { + // Arrange + String expected = "E-I-E-I-O"; + Farmer testFarmer = new Farmer(); + // Act + String returned = testFarmer.makeNoise(); + // Assert + Assert.assertEquals(expected, returned); + } + + @Test + public void makeNoiseTest2() { + // Arrange + String expected = "I'm on a boat"; + Farmer testFarmer = new Farmer(); + // Act + String returned = testFarmer.makeNoise(); + // Assert + Assert.assertNotEquals(expected, returned); + } + + @Test + public void eatTestEgg() { + // Arrange + String expected = "This food is downright edible!"; + Farmer testFarmer = new Farmer(); + Egg testEgg = new Egg(); + // Act + String returned = testFarmer.eat(testEgg); + // Assert + Assert.assertEquals(expected, returned); + } + + @Test + public void eatTestApple() { + // Arrange + String expected = "This food is downright edible!"; + Farmer testFarmer = new Farmer(); + Apple testApple = new Apple(); + // Act + String returned = testFarmer.eat(testApple); + // Assert + Assert.assertEquals(expected, returned); + } + + @Test + public void eatTestPumpkin() { + // Arrange + String expected = "This food is downright edible!"; + Farmer testFarmer = new Farmer(); + Pumpkin testPumpkin = new Pumpkin(); + // Act + String returned = testFarmer.eat(testPumpkin); + // Assert + Assert.assertEquals(expected, returned); + } + + @Test + public void mountTest1() { + } +} diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/PersonsTest/PilotTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/PersonsTest/PilotTest.java index 5351841d..929aaa2f 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/PersonsTest/PilotTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/PersonsTest/PilotTest.java @@ -1,5 +1,8 @@ package com.zipcodewilmington.froilansfarm.PersonsTest; +import com.zipcodewilmington.froilansfarm.EdiblePackage.Apple; +import com.zipcodewilmington.froilansfarm.EdiblePackage.Egg; +import com.zipcodewilmington.froilansfarm.EdiblePackage.Pumpkin; import com.zipcodewilmington.froilansfarm.Persons.Pilot; import org.junit.Assert; import org.junit.Test; @@ -16,4 +19,51 @@ public void makeNoiseTest1() { // Assert Assert.assertEquals(expected, returned); } + + @Test + public void makeNoiseTest2() { + // Arrange + String expected = "I'm on a boat"; + Pilot testPilot = new Pilot(); + // Act + String returned = testPilot.makeNoise(); + // Assert + Assert.assertNotEquals(expected, returned); + } + + @Test + public void eatTestEgg() { + // Arrange + String expected = "Yum, this food is tasty"; + Pilot testPilot = new Pilot(); + Egg testEgg = new Egg(); + // Act + String returned = testPilot.eat(testEgg); + // Assert + Assert.assertEquals(expected, returned); + } + + @Test + public void eatTestApple() { + // Arrange + String expected = "Yum, this food is tasty"; + Pilot testPilot = new Pilot(); + Apple testApple = new Apple(); + // Act + String returned = testPilot.eat(testApple); + // Assert + Assert.assertEquals(expected, returned); + } + + @Test + public void eatTestPumpkin() { + // Arrange + String expected = "Yum, this food is tasty"; + Pilot testPilot = new Pilot(); + Pumpkin testPumpkin = new Pumpkin(); + // Act + String returned = testPilot.eat(testPumpkin); + // Assert + Assert.assertEquals(expected, returned); + } } From f8dd049ae8ede91777c0bf983650e49e52bf99b3 Mon Sep 17 00:00:00 2001 From: Greg Donnelly Date: Thu, 25 Mar 2021 00:53:45 -0400 Subject: [PATCH 30/60] lots of stuf --- .../froilansfarm/Farm/ChickenCoop.java | 5 ++ .../froilansfarm/Farm/CropRow.java | 28 ++++++- .../froilansfarm/Farm/FarmHouse.java | 25 ++++++- .../froilansfarm/Farm/Field.java | 20 +++++ .../froilansfarm/Farm/Stable.java | 19 ++++- .../HousingTest/ChickenCoopTest.java | 38 ++++++++++ .../froilansfarm/HousingTest/CropRowTest.java | 24 ++++++ .../HousingTest/FarmHouseTest.java | 61 +++++++++++++++ .../froilansfarm/HousingTest/FieldTest.java | 23 ++++++ .../froilansfarm/HousingTest/StableTest.java | 74 +++++++++++++++++++ 10 files changed, 312 insertions(+), 5 deletions(-) create mode 100644 src/test/java/com/zipcodewilmington/froilansfarm/HousingTest/CropRowTest.java create mode 100644 src/test/java/com/zipcodewilmington/froilansfarm/HousingTest/FarmHouseTest.java create mode 100644 src/test/java/com/zipcodewilmington/froilansfarm/HousingTest/FieldTest.java create mode 100644 src/test/java/com/zipcodewilmington/froilansfarm/HousingTest/StableTest.java diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Farm/ChickenCoop.java b/src/main/java/com/zipcodewilmington/froilansfarm/Farm/ChickenCoop.java index 60cefa70..4b4335c2 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Farm/ChickenCoop.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Farm/ChickenCoop.java @@ -15,6 +15,11 @@ public ChickenCoop(int numOfChickens, Chicken chicken) { } } + public void killChicken(Chicken dinner) { + coop.remove(dinner); + } + + @Override public void store(Chicken chicken) { coop.add(chicken); } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Farm/CropRow.java b/src/main/java/com/zipcodewilmington/froilansfarm/Farm/CropRow.java index dfd6e373..b3d7d6d4 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Farm/CropRow.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Farm/CropRow.java @@ -1,4 +1,28 @@ package com.zipcodewilmington.froilansfarm.Farm; -public class CropRow extends Field{ -} +import com.zipcodewilmington.froilansfarm.Crops.Crop; +import com.zipcodewilmington.froilansfarm.EdiblePackage.EdiblePlant; +import com.zipcodewilmington.froilansfarm.Produce; + +import java.util.ArrayList; + + +public class CropRow { + ArrayList> row = new ArrayList>(); + + public CropRow() {} + + public CropRow(int numOfCrop, Crop crop) { + for (int i = 0; i < numOfCrop; i++) { + plantCrops(crop); + } + } + + public void plantCrops(Crop crop) { + row.add(crop); + } + + public int cropsPerRow() { + return row.size(); + } +} \ 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 a017a3f5..e6911f3a 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Farm/FarmHouse.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Farm/FarmHouse.java @@ -1,8 +1,31 @@ package com.zipcodewilmington.froilansfarm.Farm; -import com.zipcodewilmington.froilansfarm.LivingThing; import com.zipcodewilmington.froilansfarm.Persons.Person; +import java.util.ArrayList; + public class FarmHouse extends Housing { + ArrayList house = new ArrayList(); + + public FarmHouse() {} + + public FarmHouse(int numOfPeople, Person person) { + for (int i = 0; i < numOfPeople; i++) { + store(person); + } + } + + public void movedOut (Person person) { + house.remove(person); + } + + @Override + public void store(Person person) { + house.add(person); + } + @Override + public int size() { + return house.size(); + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Farm/Field.java b/src/main/java/com/zipcodewilmington/froilansfarm/Farm/Field.java index 0025dcc8..ac021a74 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Farm/Field.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Farm/Field.java @@ -1,4 +1,24 @@ package com.zipcodewilmington.froilansfarm.Farm; +import java.util.ArrayList; + public class Field { + ArrayList field = new ArrayList(); + + public Field() {} + + public Field(int numOfRows, CropRow row) { + for (int i = 0; i < numOfRows; i++) { + tillLand(row); + } + } + + public void tillLand(CropRow row) { + field.add(row); + } + + public int fieldSize() { + return field.size(); + } + } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Farm/Stable.java b/src/main/java/com/zipcodewilmington/froilansfarm/Farm/Stable.java index 206d9c16..e3202106 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Farm/Stable.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Farm/Stable.java @@ -6,12 +6,27 @@ import java.util.ArrayList; public class Stable extends Housing{ - ArrayList stable; + ArrayList stable = new ArrayList(); + + public Stable() {} public Stable(int numOfHorses, Horse horse) { - stable = new ArrayList(); for (int i = 0; i < numOfHorses; i++) { store(horse); } } + + public void brokenLeg (Horse horse) { + stable.remove(horse); + } + + @Override + public int size() { + return stable.size(); + } + + @Override + public void store(Horse horse) { + stable.add(horse); + } } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/HousingTest/ChickenCoopTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/HousingTest/ChickenCoopTest.java index 32507f9d..37427275 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/HousingTest/ChickenCoopTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/HousingTest/ChickenCoopTest.java @@ -2,6 +2,7 @@ import com.zipcodewilmington.froilansfarm.Animals.Chicken; import com.zipcodewilmington.froilansfarm.Farm.ChickenCoop; +import com.zipcodewilmington.froilansfarm.Farm.Housing; import org.junit.Assert; import org.junit.Test; @@ -33,4 +34,41 @@ public void coopSizeTwo() { //Then Assert.assertEquals(expected, actual); } + + @Test + public void addChickenOne() { + //Given + ChickenCoop chickenCoop = new ChickenCoop(12, chicken); + chickenCoop.store(chicken); + int expected = 13; + + //When + int actual = chickenCoop.size(); + + //Then + Assert.assertEquals(expected, actual); + } + + @Test + public void removeChicken() { + //Given + ChickenCoop chickenCoop = new ChickenCoop(12, chicken); + chickenCoop.killChicken(chicken); + int expected = 11; + + //When + int actual = chickenCoop.size(); + + //Then + Assert.assertEquals(expected, actual); + } + + @Test + public void inheritance() { + //Given + ChickenCoop chickenCoop = new ChickenCoop(); + + //Then + Assert.assertTrue(chickenCoop instanceof Housing); + } } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/HousingTest/CropRowTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/HousingTest/CropRowTest.java new file mode 100644 index 00000000..117683eb --- /dev/null +++ b/src/test/java/com/zipcodewilmington/froilansfarm/HousingTest/CropRowTest.java @@ -0,0 +1,24 @@ +package com.zipcodewilmington.froilansfarm.HousingTest; + +import com.zipcodewilmington.froilansfarm.Crops.Crop; +import com.zipcodewilmington.froilansfarm.Farm.CropRow; +import org.junit.Assert; +import org.junit.Test; + +public class CropRowTest { + Crop crop = new Crop(); + + + @Test + public void rowSize() { + //Given + CropRow row = new CropRow(12, crop); + int expected = 12; + + //When + int actual = row.cropsPerRow(); + + //Then + Assert.assertEquals(expected, actual); + } +} diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/HousingTest/FarmHouseTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/HousingTest/FarmHouseTest.java new file mode 100644 index 00000000..10d3e0cb --- /dev/null +++ b/src/test/java/com/zipcodewilmington/froilansfarm/HousingTest/FarmHouseTest.java @@ -0,0 +1,61 @@ +package com.zipcodewilmington.froilansfarm.HousingTest; + +import com.zipcodewilmington.froilansfarm.Farm.FarmHouse; +import com.zipcodewilmington.froilansfarm.Farm.Housing; +import com.zipcodewilmington.froilansfarm.Persons.Farmer; +import com.zipcodewilmington.froilansfarm.Persons.Person; +import org.junit.Assert; +import org.junit.Test; + +public class FarmHouseTest { + Person person = new Farmer(); + + @Test + public void houseSizeOne() { + //Given + FarmHouse farmHouse = new FarmHouse(3, person); + int expected = 3; + + //When + int actual = farmHouse.size(); + + //Then + Assert.assertEquals(expected, actual); + } + + @Test + public void houseSizeTwo() { + //Given + FarmHouse farmHouse = new FarmHouse(56, person); + int expected = 56; + + //When + int actual = farmHouse.size(); + + //Then + Assert.assertEquals(expected, actual); + } + + @Test + public void removePersonOne() { + //Given + FarmHouse farmHouse = new FarmHouse(4, person); + int expected = 3; + + //When + farmHouse.movedOut(person); + int actual = farmHouse.size(); + + //Then + Assert.assertEquals(expected, actual); + } + + @Test + public void inheritance() { + //Given + FarmHouse farmHouse = new FarmHouse(); + + //Then + Assert.assertTrue(farmHouse instanceof Housing); + } +} diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/HousingTest/FieldTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/HousingTest/FieldTest.java new file mode 100644 index 00000000..18e9b113 --- /dev/null +++ b/src/test/java/com/zipcodewilmington/froilansfarm/HousingTest/FieldTest.java @@ -0,0 +1,23 @@ +package com.zipcodewilmington.froilansfarm.HousingTest; + +import com.zipcodewilmington.froilansfarm.Farm.CropRow; +import com.zipcodewilmington.froilansfarm.Farm.Field; +import org.junit.Assert; +import org.junit.Test; + +public class FieldTest { + CropRow row = new CropRow(); + + @Test + public void fieldSize() { + //Given + Field field = new Field(5, row); + int expected = 5; + + //When + int actual = field.fieldSize(); + + //Then + Assert.assertEquals(expected, actual); + } +} diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/HousingTest/StableTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/HousingTest/StableTest.java new file mode 100644 index 00000000..89e19169 --- /dev/null +++ b/src/test/java/com/zipcodewilmington/froilansfarm/HousingTest/StableTest.java @@ -0,0 +1,74 @@ +package com.zipcodewilmington.froilansfarm.HousingTest; + +import com.zipcodewilmington.froilansfarm.Animals.Horse; +import com.zipcodewilmington.froilansfarm.Farm.Housing; +import com.zipcodewilmington.froilansfarm.Farm.Stable; +import org.junit.Assert; +import org.junit.Test; + +public class StableTest { + Horse horse = new Horse(); + + @Test + public void stableSizeOne() { + //Given + Stable stable = new Stable(83, horse); + int expected = 83; + + //When + int actual = stable.size(); + + //Then + Assert.assertEquals(expected, actual); + } + + @Test + public void stableSizeTwo() { + //Given + Stable stable = new Stable(8, horse); + int expected = 8; + + //When + int actual = stable.size(); + + //Then + Assert.assertEquals(expected, actual); + } + + @Test + public void horseDiedOne() { + //Given + Stable stable = new Stable(8, horse); + int expected = 7; + + //When + stable.brokenLeg(horse); + int actual = stable.size(); + + //Then + Assert.assertEquals(expected, actual); + } + + @Test + public void addHorse() { + //Given + Stable stable = new Stable(8, horse); + int expected = 9; + + //When + stable.store(horse); + int actual = stable.size(); + + //Then + Assert.assertEquals(expected, actual); + } + + @Test + public void inheritance() { + //Given + Stable stable = new Stable(); + + //Then + Assert.assertTrue(stable instanceof Housing); + } +} From 7e785adf99988bba2c25fc73790d4a1516d21897 Mon Sep 17 00:00:00 2001 From: KellyPorter02 Date: Thu, 25 Mar 2021 01:01:02 -0400 Subject: [PATCH 31/60] Tests for farmer class --- .../froilansfarm/Persons/Farmer.java | 23 ++- .../froilansfarm/PersonsTest/FarmerTest.java | 145 ++++++++++++++++++ 2 files changed, 166 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Persons/Farmer.java b/src/main/java/com/zipcodewilmington/froilansfarm/Persons/Farmer.java index 04c0b479..50db9ddf 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Persons/Farmer.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Persons/Farmer.java @@ -6,6 +6,23 @@ import com.zipcodewilmington.froilansfarm.Rideable; public class Farmer implements Rider, Botanist, Person { + + public String name; + + public Farmer() {} + + public Farmer(String name) { + this.name = name; + } + + public void setName(String name) { + this.name = name; + } + + public String getName() { + return name; + } + public String eat(Edible obj) { System.out.println("This food is downright edible!"); return "This food is downright edible!"; @@ -17,11 +34,13 @@ public String makeNoise() { } public String mount(Rideable obj) { - return null; + System.out.println(this.name + " gets on the " + obj + "."); + return this.name + " gets on the " + obj + "."; } public String dismount(Rideable obj) { - return null; + System.out.println(this.name + " gets off the " + obj + "."); + return this.name + " gets on the " + obj + "."; } public void plant(Crop crop, CropRow cropRow) { diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/PersonsTest/FarmerTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/PersonsTest/FarmerTest.java index 3289f3b0..4e064ed0 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/PersonsTest/FarmerTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/PersonsTest/FarmerTest.java @@ -1,5 +1,6 @@ package com.zipcodewilmington.froilansfarm.PersonsTest; +import com.zipcodewilmington.froilansfarm.Animals.Horse; import com.zipcodewilmington.froilansfarm.EdiblePackage.Apple; import com.zipcodewilmington.froilansfarm.EdiblePackage.Egg; import com.zipcodewilmington.froilansfarm.EdiblePackage.Pumpkin; @@ -8,6 +9,99 @@ import org.junit.Test; public class FarmerTest { + + @Test + public void nulleryContructor1() { + // Arrange + Farmer testFarmer = new Farmer(); + String expectedName = "Sally"; + // Act + testFarmer.setName(expectedName); + String returnedName = testFarmer.getName(); + // Assert + Assert.assertEquals(expectedName, returnedName); + } + + @Test + public void nulleryContructor2() { + // Arrange + Farmer testFarmer = new Farmer(); + String expectedName = "Sally"; + // Act + testFarmer.setName(expectedName); + String returnedName = testFarmer.getName(); + // Assert + Assert.assertNotEquals("Jim-Bob Jr.", returnedName); + } + + @Test + public void ConstructorTestName1() { + // Arrange + String expectedName = "Darrell"; + Farmer testFarmer = new Farmer(expectedName); + // Act + String returnedName = testFarmer.getName(); + // Assert + Assert.assertEquals(expectedName, returnedName); + } + + @Test + public void ConstructorTestName2() { + // Arrange + String expectedName = "Darrell"; + Farmer testFarmer = new Farmer(expectedName); + // Act + String returnedName = testFarmer.getName(); + // Assert + Assert.assertNotEquals("Bobby Joe", returnedName); + } + + @Test + public void setNameTest1() { + // Arrange + String givenName = "Darrell"; + Farmer testFarmer = new Farmer(givenName); + // Act + testFarmer.setName("Dolly"); + String returnedName = testFarmer.getName(); + // Assert + Assert.assertEquals("Dolly", returnedName); + } + + @Test + public void setNameTest2() { + // Arrange + String expectedName = "Darrell"; + Farmer testFarmer = new Farmer(expectedName); + // Act + testFarmer.setName("Dolly"); + String returnedName = testFarmer.getName(); + // Assert + Assert.assertNotEquals("Bobby Joe", returnedName); + } + + @Test + public void getNameTest1() { + // Arrange + String expectedName = "Darrell"; + Farmer testFarmer = new Farmer(expectedName); + // Act + String returnedName = testFarmer.getName(); + // Assert + Assert.assertEquals("Darrell", returnedName); + } + + @Test + public void getNameTest2() { + // Arrange + String expectedName = "Darrell"; + Farmer testFarmer = new Farmer(expectedName); + // Act + String returnedName = testFarmer.getName(); + // Assert + Assert.assertNotEquals("Bobby Joe", returnedName); + } + @Test public void makeNoiseTest1() { // Arrange @@ -68,5 +162,56 @@ public void eatTestPumpkin() { @Test public void mountTest1() { + // Arrange + String expected = "";//this.name + " gets on the " + obj + "."; + Farmer testFarmer = new Farmer("George"); + Horse testHorse = new Horse(); + // Act + String returned = testFarmer.mount(testHorse); + // Assert + Assert.assertEquals(expected, returned); + } + + @Test + public void mountTest2() { + // Arrange + String expected = "";//this.name + " gets on the " + obj + "."; + Farmer testFarmer = new Farmer("Geralt"); + Horse testHorse = new Horse(); + // Act + String returned = testFarmer.mount(testHorse); + // Assert + Assert.assertEquals(expected, returned); } + + @Test + public void dismountTest1() { + // Arrange + + Farmer testFarmer = new Farmer("Geralt"); + Horse testHorse = new Horse(); + // Act + String returned = testFarmer.dismount(testHorse); + String expected = "";//this.name + " gets on the " + obj + "."; + // Assert + Assert.assertEquals(expected, returned); + } + + @Test + public void dismountTest2() { + // Arrange + + Farmer testFarmer = new Farmer("Geralt"); + Horse testHorse = new Horse(); + // Act + String returned = testFarmer.dismount(testHorse); + String expected = "";//this.name + " gets on the " + obj + "."; + // Assert + Assert.assertEquals(expected, returned); + } + + @Test + public void plant() { + } + } From 7d42cbf24c99770fe40f21638d6cf253993fd331 Mon Sep 17 00:00:00 2001 From: Greg Donnelly Date: Thu, 25 Mar 2021 13:25:17 -0400 Subject: [PATCH 32/60] harvesting crops methods added. tests added --- .../froilansfarm/EdiblePackage/SoyBean.java | 6 +++++ .../froilansfarm/Farm/CropRow.java | 17 +++++++++++- .../froilansfarm/Farm/Field.java | 26 +++++++++++++++---- .../froilansfarm/HousingTest/CropRowTest.java | 18 +++++++++++++ .../froilansfarm/HousingTest/FieldTest.java | 16 ++++++++++++ 5 files changed, 77 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/SoyBean.java b/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/SoyBean.java index a87d9285..40bcf427 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/SoyBean.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/SoyBean.java @@ -1,6 +1,8 @@ package com.zipcodewilmington.froilansfarm.EdiblePackage; public class SoyBean implements ChickenFood{ + public int numOfSoyBeans; + public boolean hasBeenFertilized() { return false; } @@ -8,4 +10,8 @@ public boolean hasBeenFertilized() { public boolean hasBeenHarvested() { return false; } + + public void setNumOfSoyBeans(int num) { + numOfSoyBeans = num; + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Farm/CropRow.java b/src/main/java/com/zipcodewilmington/froilansfarm/Farm/CropRow.java index b3d7d6d4..06d821d2 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Farm/CropRow.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Farm/CropRow.java @@ -8,7 +8,7 @@ public class CropRow { - ArrayList> row = new ArrayList>(); + public ArrayList> row = new ArrayList>(); public CropRow() {} @@ -22,6 +22,21 @@ public void plantCrops(Crop crop) { row.add(crop); } + public int harvestCrop(Crop crop) { + //Will return crop.Yield() which will be a random range + return 0; + } + +// public int harvestRow() { +// int numOfVegYielded = 0; +// for (Crop crop : this.row) { +// //Calls yield of the plant which returns a random number +// //Add that to total of VegYielded for testing +// row.remove(crop); +// } +// return numOfVegYielded; +// } + public int cropsPerRow() { return row.size(); } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Farm/Field.java b/src/main/java/com/zipcodewilmington/froilansfarm/Farm/Field.java index ac021a74..93c9bc1f 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Farm/Field.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Farm/Field.java @@ -1,24 +1,40 @@ package com.zipcodewilmington.froilansfarm.Farm; +import com.zipcodewilmington.froilansfarm.Crops.Crop; +import com.zipcodewilmington.froilansfarm.EdiblePackage.EdiblePlant; + import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.Map; public class Field { - ArrayList field = new ArrayList(); + Map fieldMap = new LinkedHashMap(); + CropRow cropRow = new CropRow(); + Crop crop = new Crop(); public Field() {} public Field(int numOfRows, CropRow row) { for (int i = 0; i < numOfRows; i++) { - tillLand(row); + tillLand(i, row); } } - public void tillLand(CropRow row) { - field.add(row); + public void tillLand(int rowNum, CropRow row) { + fieldMap.put(rowNum, row); } public int fieldSize() { - return field.size(); + return fieldMap.size(); + } + + public int harvestRow(int rowNum) { + int numOfVeg = 0; + for (int i = 0; i < fieldMap.get(rowNum).cropsPerRow(); i++) { + //Will call harvestCrop which calls yield + //Add to numOfVeg + } + return numOfVeg; } } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/HousingTest/CropRowTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/HousingTest/CropRowTest.java index 117683eb..9b125d9c 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/HousingTest/CropRowTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/HousingTest/CropRowTest.java @@ -1,12 +1,15 @@ package com.zipcodewilmington.froilansfarm.HousingTest; +import com.zipcodewilmington.froilansfarm.Crops.BeanStalk; import com.zipcodewilmington.froilansfarm.Crops.Crop; +import com.zipcodewilmington.froilansfarm.EdiblePackage.EdiblePlant; import com.zipcodewilmington.froilansfarm.Farm.CropRow; import org.junit.Assert; import org.junit.Test; public class CropRowTest { Crop crop = new Crop(); + Crop bean = new BeanStalk(); @Test @@ -21,4 +24,19 @@ public void rowSize() { //Then Assert.assertEquals(expected, actual); } + + @Test + public void addCrop() { + //Given + CropRow row = new CropRow(5, bean); + int expected = 7; + + //When + row.plantCrops(bean); + row.plantCrops(bean); + int actual = row.cropsPerRow(); + + //Then + Assert.assertEquals(expected, actual); + } } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/HousingTest/FieldTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/HousingTest/FieldTest.java index 18e9b113..3ae9922a 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/HousingTest/FieldTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/HousingTest/FieldTest.java @@ -20,4 +20,20 @@ public void fieldSize() { //Then Assert.assertEquals(expected, actual); } + + @Test + public void addRow() { + //Given + Field field = new Field(); + int expected = 3; + + //When + field.tillLand(1, row); + field.tillLand(2, row); + field.tillLand(3, row); + int actual = field.fieldSize(); + + //Then + Assert.assertEquals(expected, actual); + } } From 849c2656084cc2fad9f8e9fd226d45aecc033ddd Mon Sep 17 00:00:00 2001 From: jorge Date: Thu, 25 Mar 2021 16:03:46 -0400 Subject: [PATCH 33/60] adding to aircraft --- .../zipcodewilmington/froilansfarm/Vehicles/CropDuster.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDuster.java b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDuster.java index 5a81756b..d257e65a 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDuster.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDuster.java @@ -1,10 +1,12 @@ package com.zipcodewilmington.froilansfarm.Vehicles; +import com.zipcodewilmington.froilansfarm.Farm.CropRow; + public class CropDuster extends Aircraft{ public String makeNoise() { return "NnNnNn"; } - public void fertilizeRow(/*CropRow row*/){ + public void fertilizeRow(CropRow row){ //calls to crop row and sprays tf out of crops to fertilize } } From d169419b6b2ee34790635489c7c0aa329a895df3 Mon Sep 17 00:00:00 2001 From: jorge Date: Thu, 25 Mar 2021 17:28:17 -0400 Subject: [PATCH 34/60] added to cropduster --- .../froilansfarm/Vehicles/CropDuster.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDuster.java b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDuster.java index d257e65a..a62ea18f 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDuster.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDuster.java @@ -1,12 +1,17 @@ package com.zipcodewilmington.froilansfarm.Vehicles; +import com.zipcodewilmington.froilansfarm.Crops.Crop; import com.zipcodewilmington.froilansfarm.Farm.CropRow; public class CropDuster extends Aircraft{ + public String makeNoise() { return "NnNnNn"; } + public void fertilizeRow(CropRow row){ - //calls to crop row and sprays tf out of crops to fertilize + for (Crop crop: row) { + crop.yield(true); + } } } From c80e2a5a2770fac0d8782d755dce4c07814843f4 Mon Sep 17 00:00:00 2001 From: jorge Date: Thu, 25 Mar 2021 17:48:23 -0400 Subject: [PATCH 35/60] stuff --- src/main/java/com/zipcodewilmington/froilansfarm/Rideable.java | 1 + .../zipcodewilmington/froilansfarm/Vehicles/CropDuster.java | 3 +++ 2 files changed, 4 insertions(+) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Rideable.java b/src/main/java/com/zipcodewilmington/froilansfarm/Rideable.java index eabd3875..a7c43aff 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Rideable.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Rideable.java @@ -1,4 +1,5 @@ package com.zipcodewilmington.froilansfarm; public interface Rideable { + } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDuster.java b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDuster.java index a62ea18f..2243b9dd 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDuster.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDuster.java @@ -2,6 +2,7 @@ import com.zipcodewilmington.froilansfarm.Crops.Crop; import com.zipcodewilmington.froilansfarm.Farm.CropRow; +import com.zipcodewilmington.froilansfarm.Persons.Rider; public class CropDuster extends Aircraft{ @@ -14,4 +15,6 @@ public void fertilizeRow(CropRow row){ crop.yield(true); } } + + } From 182461cb77dc19c318dd8b8c7f8620db9ae90bf6 Mon Sep 17 00:00:00 2001 From: KellyPorter02 Date: Thu, 25 Mar 2021 19:19:55 -0400 Subject: [PATCH 36/60] added isMounted method to Rideable interface --- .../zipcodewilmington/froilansfarm/PersonsTest/FarmerTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/PersonsTest/FarmerTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/PersonsTest/FarmerTest.java index 4e064ed0..e57c3cda 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/PersonsTest/FarmerTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/PersonsTest/FarmerTest.java @@ -175,9 +175,9 @@ public void mountTest1() { @Test public void mountTest2() { // Arrange - String expected = "";//this.name + " gets on the " + obj + "."; Farmer testFarmer = new Farmer("Geralt"); Horse testHorse = new Horse(); + String expected = "Geralt" + " gets on the " + testHorse + "."; // Act String returned = testFarmer.mount(testHorse); // Assert From 7d7870774abe7bdc5def7e6dd088160cf07259e7 Mon Sep 17 00:00:00 2001 From: jorge Date: Thu, 25 Mar 2021 19:21:58 -0400 Subject: [PATCH 37/60] more stuff --- .../com/zipcodewilmington/froilansfarm/Vehicles/Tractor.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Tractor.java b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Tractor.java index ec6e91ad..0b665c13 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Tractor.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Tractor.java @@ -1,12 +1,12 @@ package com.zipcodewilmington.froilansfarm.Vehicles; import com.zipcodewilmington.froilansfarm.Crops.Crop; +import com.zipcodewilmington.froilansfarm.Farm.CropRow; public class Tractor extends FarmVehicle{ public String makeNoise() { return "Clack-Clunk"; } - public void harvestCrop(){ - //method which calls to crop row and tells that its getting harvested af + public void harvestRow(CropRow row){ } } From cb6c2d273164e06debbe70a22e670005dc72ba3f Mon Sep 17 00:00:00 2001 From: Greg Donnelly Date: Thu, 25 Mar 2021 19:37:26 -0400 Subject: [PATCH 38/60] more tests --- .../froilansfarm/Farm/CropRow.java | 33 +++++----- .../froilansfarm/Farm/Field.java | 13 ++-- .../HousingTest/FieldRowTests.java | 64 +++++++++++++++++++ 3 files changed, 84 insertions(+), 26 deletions(-) create mode 100644 src/test/java/com/zipcodewilmington/froilansfarm/HousingTest/FieldRowTests.java diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Farm/CropRow.java b/src/main/java/com/zipcodewilmington/froilansfarm/Farm/CropRow.java index 06d821d2..c7d797a7 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Farm/CropRow.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Farm/CropRow.java @@ -7,37 +7,36 @@ import java.util.ArrayList; -public class CropRow { - public ArrayList> row = new ArrayList>(); +public class CropRow { + public ArrayList row; - public CropRow() {} + public CropRow() { + row = new ArrayList(); + } - public CropRow(int numOfCrop, Crop crop) { + public CropRow(int numOfCrop, E crop) { + row = new ArrayList(); for (int i = 0; i < numOfCrop; i++) { plantCrops(crop); } } - public void plantCrops(Crop crop) { + public void plantCrops(E crop) { row.add(crop); } - public int harvestCrop(Crop crop) { - //Will return crop.Yield() which will be a random range - return 0; + public int harvestCrop(E crop) { + int numOfCrops = crop.howMuch(); + row.remove(crop); + return numOfCrops; } -// public int harvestRow() { -// int numOfVegYielded = 0; -// for (Crop crop : this.row) { -// //Calls yield of the plant which returns a random number -// //Add that to total of VegYielded for testing -// row.remove(crop); -// } -// return numOfVegYielded; -// } public int cropsPerRow() { return row.size(); } + + public Crop cropType (int num) { + return row.get(num); + } } \ No newline at end of file diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Farm/Field.java b/src/main/java/com/zipcodewilmington/froilansfarm/Farm/Field.java index 93c9bc1f..3d949245 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Farm/Field.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Farm/Field.java @@ -1,21 +1,17 @@ package com.zipcodewilmington.froilansfarm.Farm; -import com.zipcodewilmington.froilansfarm.Crops.Crop; -import com.zipcodewilmington.froilansfarm.EdiblePackage.EdiblePlant; - -import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.Map; public class Field { - Map fieldMap = new LinkedHashMap(); CropRow cropRow = new CropRow(); - Crop crop = new Crop(); + public Map fieldMap = new LinkedHashMap(); + public Field() {} public Field(int numOfRows, CropRow row) { - for (int i = 0; i < numOfRows; i++) { + for (int i = 1; i <= numOfRows; i++) { tillLand(i, row); } } @@ -31,8 +27,7 @@ public int fieldSize() { public int harvestRow(int rowNum) { int numOfVeg = 0; for (int i = 0; i < fieldMap.get(rowNum).cropsPerRow(); i++) { - //Will call harvestCrop which calls yield - //Add to numOfVeg + numOfVeg += cropRow.harvestCrop(fieldMap.get(rowNum).cropType(i)); } return numOfVeg; } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/HousingTest/FieldRowTests.java b/src/test/java/com/zipcodewilmington/froilansfarm/HousingTest/FieldRowTests.java new file mode 100644 index 00000000..adc7db3f --- /dev/null +++ b/src/test/java/com/zipcodewilmington/froilansfarm/HousingTest/FieldRowTests.java @@ -0,0 +1,64 @@ +package com.zipcodewilmington.froilansfarm.HousingTest; + +import com.zipcodewilmington.froilansfarm.Crops.BeanStalk; +import com.zipcodewilmington.froilansfarm.EdiblePackage.SoyBean; +import com.zipcodewilmington.froilansfarm.Farm.CropRow; +import com.zipcodewilmington.froilansfarm.Farm.Field; +import org.junit.Assert; +import org.junit.Test; + +public class FieldRowTests { + BeanStalk bean = new BeanStalk(); + CropRow row = new CropRow(5, bean); + CropRow emptyRow = new CropRow(); + + @Test + public void fieldConstructor() { + //Given + Field field = new Field(1, row); + int expected = 1; + + //When + int actual = field.fieldSize(); + + //Then + Assert.assertEquals(expected, actual); + } + + @Test + public void fieldConstructorTwo() { + //Given + Field field = new Field(); + field.tillLand(1, emptyRow); + emptyRow.plantCrops(bean); + emptyRow.plantCrops(bean); + emptyRow.plantCrops(bean); + int expected = 3; + + //When + int actual = field.fieldMap.get(1).cropsPerRow(); + + //Then + Assert.assertEquals(expected, actual); + } + + @Test + public void harvestRowOne() { + //Given + Field field = new Field(1, row); + field.fieldMap.get(1).plantCrops(bean); + + //When + int actual = field.harvestRow(1); + System.out.println(actual); + + //Then + Assert.assertTrue(actual < 50 && actual > 5); + } + + @Test + public void tillLand() { + //Given + + } +} From 7b06dba8483aef6fec1d3b44a3d9916a8e71eb53 Mon Sep 17 00:00:00 2001 From: Greg Donnelly Date: Thu, 25 Mar 2021 20:15:39 -0400 Subject: [PATCH 39/60] stuff --- .../froilansfarm/Farm/Field.java | 6 ++++- .../HousingTest/FieldRowTests.java | 25 ++++++++++++++++++- 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Farm/Field.java b/src/main/java/com/zipcodewilmington/froilansfarm/Farm/Field.java index 3d949245..6d6d5b60 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Farm/Field.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Farm/Field.java @@ -17,7 +17,11 @@ public Field(int numOfRows, CropRow row) { } public void tillLand(int rowNum, CropRow row) { - fieldMap.put(rowNum, row); + if (!fieldMap.containsKey(rowNum)) { + fieldMap.put(rowNum, row); + } else { + System.out.println("You already have crops there!"); + } } public int fieldSize() { diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/HousingTest/FieldRowTests.java b/src/test/java/com/zipcodewilmington/froilansfarm/HousingTest/FieldRowTests.java index adc7db3f..ca9c8926 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/HousingTest/FieldRowTests.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/HousingTest/FieldRowTests.java @@ -50,15 +50,38 @@ public void harvestRowOne() { //When int actual = field.harvestRow(1); - System.out.println(actual); //Then Assert.assertTrue(actual < 50 && actual > 5); } + @Test + public void harvestRowTwo() { + //Given + Field field = new Field(); + field.tillLand(1, emptyRow); + field.fieldMap.get(1).plantCrops(bean); + field.fieldMap.get(1).plantCrops(bean); + field.fieldMap.get(1).plantCrops(bean); + + //When + int actual = field.harvestRow(1); + + //Then + Assert.assertTrue(actual > 2 && actual < 34); + } + @Test public void tillLand() { //Given + Field field = new Field(); + field.tillLand(1, emptyRow); + field.tillLand(2, emptyRow); + //When + int actual = field.fieldSize(); + + //Then + Assert.assertTrue(actual == 2); } } From 4080bb02fcb6f80a6681d2db4d61c7680fef0b18 Mon Sep 17 00:00:00 2001 From: jorge Date: Thu, 25 Mar 2021 20:21:15 -0400 Subject: [PATCH 40/60] added moonshine methods and tests --- .../froilansfarm/EdiblePackage/Moonshine.java | 16 ++++++++- .../froilansfarm/Persons/Farmer.java | 11 ++++++ .../froilansfarm/Persons/Person.java | 2 ++ .../froilansfarm/Persons/Pilot.java | 11 ++++++ .../froilansfarm/Vehicles/CropDuster.java | 6 ++-- .../TestEdiblesPackage/TestMoonshine.java | 36 +++++++++++++++++++ 6 files changed, 78 insertions(+), 4 deletions(-) create mode 100644 src/test/java/com/zipcodewilmington/froilansfarm/TestEdiblesPackage/TestMoonshine.java diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/Moonshine.java b/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/Moonshine.java index c1421cc6..b25c8343 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/Moonshine.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/Moonshine.java @@ -1,6 +1,20 @@ package com.zipcodewilmington.froilansfarm.EdiblePackage; +import java.util.ArrayList; + public class Moonshine { - public void distill(EarCorn corn){ + + public int numberOfGrowlers = 0; + + public void distill(){ + numberOfGrowlers++; + } + + public void removeGrowler(int growler){ + numberOfGrowlers -= growler; + } + + public int getNumberOfGrowlers(){ + return numberOfGrowlers; } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Persons/Farmer.java b/src/main/java/com/zipcodewilmington/froilansfarm/Persons/Farmer.java index 7ec9e037..00b7629c 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Persons/Farmer.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Persons/Farmer.java @@ -1,8 +1,10 @@ package com.zipcodewilmington.froilansfarm.Persons; import com.zipcodewilmington.froilansfarm.EdiblePackage.Edible; +import com.zipcodewilmington.froilansfarm.EdiblePackage.Moonshine; public class Farmer implements Rider, Botanist { + Moonshine shine = new Moonshine(); public String eat(Edible obj) { return null; @@ -11,4 +13,13 @@ public String eat(Edible obj) { public String makeNoise() { return null; } + + public boolean drankShine() { + return true; + } + + public boolean isDrunk(boolean drank){ + shine.removeGrowler(1); + return true; + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Persons/Person.java b/src/main/java/com/zipcodewilmington/froilansfarm/Persons/Person.java index e9962925..c8e966be 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Persons/Person.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Persons/Person.java @@ -6,6 +6,8 @@ public interface Person extends LivingThing, Eater, NoiseMaker{ + boolean drankShine(); + } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Persons/Pilot.java b/src/main/java/com/zipcodewilmington/froilansfarm/Persons/Pilot.java index 129367ed..a2afe83e 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Persons/Pilot.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Persons/Pilot.java @@ -1,8 +1,10 @@ package com.zipcodewilmington.froilansfarm.Persons; import com.zipcodewilmington.froilansfarm.EdiblePackage.Edible; +import com.zipcodewilmington.froilansfarm.EdiblePackage.Moonshine; public class Pilot implements Rider{ + Moonshine shine = new Moonshine(); public String eat(Edible obj) { return null; @@ -11,4 +13,13 @@ public String eat(Edible obj) { public String makeNoise() { return null; } + + public boolean drankShine() { + return true; + } + + public boolean isDrunk(boolean drank){ + shine.removeGrowler(1); + return true; + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDuster.java b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDuster.java index 2243b9dd..5d769af0 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDuster.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDuster.java @@ -11,9 +11,9 @@ public String makeNoise() { } public void fertilizeRow(CropRow row){ - for (Crop crop: row) { - crop.yield(true); - } +// for (Crop crop: row) { +// crop.yield(true); +// } } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/TestEdiblesPackage/TestMoonshine.java b/src/test/java/com/zipcodewilmington/froilansfarm/TestEdiblesPackage/TestMoonshine.java new file mode 100644 index 00000000..fae42f2c --- /dev/null +++ b/src/test/java/com/zipcodewilmington/froilansfarm/TestEdiblesPackage/TestMoonshine.java @@ -0,0 +1,36 @@ +package com.zipcodewilmington.froilansfarm.TestEdiblesPackage; + +import com.zipcodewilmington.froilansfarm.EdiblePackage.Moonshine; +import org.junit.Assert; +import org.junit.Test; + +public class TestMoonshine { + @Test + public void testDistill(){ + //Arrange + Moonshine moonshine = new Moonshine(); + + //Action + moonshine.distill(); + int expected = 1; + int actual = moonshine.getNumberOfGrowlers(); + + //Assert + Assert.assertEquals(expected,actual); + } + @Test + public void testRemoveGrowler(){ + //Arrange + Moonshine moonshine = new Moonshine(); + moonshine.distill(); + moonshine.distill(); + + //Action + moonshine.removeGrowler(1); + int expected = 1; + int actual = moonshine.getNumberOfGrowlers(); + + //Assert + Assert.assertEquals(expected,actual); + } +} From 10a33b4fb558c0914b347ade536ade392cdb9eb7 Mon Sep 17 00:00:00 2001 From: Greg Donnelly Date: Thu, 25 Mar 2021 20:23:47 -0400 Subject: [PATCH 41/60] tests for CropRow --- .../froilansfarm/HousingTest/CropRowTest.java | 21 ++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/HousingTest/CropRowTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/HousingTest/CropRowTest.java index 9b125d9c..831ee4b9 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/HousingTest/CropRowTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/HousingTest/CropRowTest.java @@ -2,7 +2,6 @@ import com.zipcodewilmington.froilansfarm.Crops.BeanStalk; import com.zipcodewilmington.froilansfarm.Crops.Crop; -import com.zipcodewilmington.froilansfarm.EdiblePackage.EdiblePlant; import com.zipcodewilmington.froilansfarm.Farm.CropRow; import org.junit.Assert; import org.junit.Test; @@ -39,4 +38,24 @@ public void addCrop() { //Then Assert.assertEquals(expected, actual); } + + @Test + public void removeCrop() { + //Given + CropRow row = new CropRow(2, bean); + row.harvestCrop(bean); + int expected = 1; + + //When + int actual = row.cropsPerRow(); + + //Then + Assert.assertEquals(expected, actual); + } + + @Test + public void cropType() { + //Given + CropRow row = new CropRow(); + } } From 4a57ea721a014030dbec4338d42fee6dc98592d0 Mon Sep 17 00:00:00 2001 From: Greg Donnelly Date: Thu, 25 Mar 2021 21:13:28 -0400 Subject: [PATCH 42/60] croptests --- .../zipcodewilmington/froilansfarm/Farm/CropRow.java | 2 -- .../froilansfarm/HousingTest/CropRowTest.java | 11 ++++++++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Farm/CropRow.java b/src/main/java/com/zipcodewilmington/froilansfarm/Farm/CropRow.java index c7d797a7..ead155c8 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Farm/CropRow.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Farm/CropRow.java @@ -1,8 +1,6 @@ package com.zipcodewilmington.froilansfarm.Farm; import com.zipcodewilmington.froilansfarm.Crops.Crop; -import com.zipcodewilmington.froilansfarm.EdiblePackage.EdiblePlant; -import com.zipcodewilmington.froilansfarm.Produce; import java.util.ArrayList; diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/HousingTest/CropRowTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/HousingTest/CropRowTest.java index 831ee4b9..53f878ad 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/HousingTest/CropRowTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/HousingTest/CropRowTest.java @@ -2,6 +2,7 @@ import com.zipcodewilmington.froilansfarm.Crops.BeanStalk; import com.zipcodewilmington.froilansfarm.Crops.Crop; +import com.zipcodewilmington.froilansfarm.EdiblePackage.SoyBean; import com.zipcodewilmington.froilansfarm.Farm.CropRow; import org.junit.Assert; import org.junit.Test; @@ -56,6 +57,14 @@ public void removeCrop() { @Test public void cropType() { //Given - CropRow row = new CropRow(); + CropRow row = new CropRow(3, bean); + + Crop expected = bean; + + //When + Crop actual = row.cropType(1); + + //Then + Assert.assertEquals(expected, actual); } } From 876d4ed34ba2dd461f48e98db9dca0a04184367c Mon Sep 17 00:00:00 2001 From: Greg Donnelly Date: Thu, 25 Mar 2021 21:16:35 -0400 Subject: [PATCH 43/60] more tests added to fields and rows --- .../zipcodewilmington/froilansfarm/HousingTest/CropRowTest.java | 1 - .../froilansfarm/HousingTest/FieldRowTests.java | 1 - 2 files changed, 2 deletions(-) diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/HousingTest/CropRowTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/HousingTest/CropRowTest.java index 53f878ad..ac686744 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/HousingTest/CropRowTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/HousingTest/CropRowTest.java @@ -2,7 +2,6 @@ import com.zipcodewilmington.froilansfarm.Crops.BeanStalk; import com.zipcodewilmington.froilansfarm.Crops.Crop; -import com.zipcodewilmington.froilansfarm.EdiblePackage.SoyBean; import com.zipcodewilmington.froilansfarm.Farm.CropRow; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/HousingTest/FieldRowTests.java b/src/test/java/com/zipcodewilmington/froilansfarm/HousingTest/FieldRowTests.java index ca9c8926..458b915b 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/HousingTest/FieldRowTests.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/HousingTest/FieldRowTests.java @@ -1,7 +1,6 @@ package com.zipcodewilmington.froilansfarm.HousingTest; import com.zipcodewilmington.froilansfarm.Crops.BeanStalk; -import com.zipcodewilmington.froilansfarm.EdiblePackage.SoyBean; import com.zipcodewilmington.froilansfarm.Farm.CropRow; import com.zipcodewilmington.froilansfarm.Farm.Field; import org.junit.Assert; From 490193eca78290df5eb824e8f47e417c6f3c0734 Mon Sep 17 00:00:00 2001 From: Greg Donnelly Date: Thu, 25 Mar 2021 22:24:18 -0400 Subject: [PATCH 44/60] produceStand and tests --- .../froilansfarm/Farm/ProduceStand.java | 30 ++++++++++++-- .../HousingTest/ProduceStandTest.java | 41 +++++++++++++++++++ 2 files changed, 68 insertions(+), 3 deletions(-) create mode 100644 src/test/java/com/zipcodewilmington/froilansfarm/HousingTest/ProduceStandTest.java diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Farm/ProduceStand.java b/src/main/java/com/zipcodewilmington/froilansfarm/Farm/ProduceStand.java index 44a5237d..a81d2bae 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Farm/ProduceStand.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Farm/ProduceStand.java @@ -1,9 +1,33 @@ package com.zipcodewilmington.froilansfarm.Farm; -import com.zipcodewilmington.froilansfarm.Produce; +import com.zipcodewilmington.froilansfarm.EdiblePackage.EdiblePlant; -public class ProduceStand { - public void addProduce(Produce stuffs){ +import java.util.LinkedHashMap; +public class ProduceStand { + LinkedHashMap produceStand; + + public ProduceStand() { + this.produceStand = new LinkedHashMap(); + } + + public void addToStand(E produce, int quantity){ + if (produceStand.containsKey(produce)) { + int inventory = produceStand.get(produce); + inventory += quantity; + produceStand.put(produce, inventory); + } else { + produceStand.put(produce, quantity); + } + } + + public void sellProduce(E produce, int quantity) { + int currentStock = produceStand.get(produce); + currentStock -= quantity; + produceStand.put(produce, currentStock); + } + + public int produceInventory(EdiblePlant crop) { + return produceStand.get(crop); } } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/HousingTest/ProduceStandTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/HousingTest/ProduceStandTest.java new file mode 100644 index 00000000..eca44192 --- /dev/null +++ b/src/test/java/com/zipcodewilmington/froilansfarm/HousingTest/ProduceStandTest.java @@ -0,0 +1,41 @@ +package com.zipcodewilmington.froilansfarm.HousingTest; + +import com.zipcodewilmington.froilansfarm.EdiblePackage.Apple; +import com.zipcodewilmington.froilansfarm.EdiblePackage.SoyBean; +import com.zipcodewilmington.froilansfarm.Farm.ProduceStand; +import org.junit.Assert; +import org.junit.Test; + +public class ProduceStandTest { + SoyBean bean = new SoyBean(); + Apple apple = new Apple(); + + @Test + public void addProduce() { + //Given + ProduceStand produceStand = new ProduceStand(); + produceStand.addToStand(bean, 7); + int expected = 7; + + //When + int actual = produceStand.produceInventory(bean); + + //Then + Assert.assertEquals(expected, actual); + } + + @Test + public void sellProduce() { + //Given + ProduceStand produceStand = new ProduceStand(); + produceStand.addToStand(apple, 12); + produceStand.sellProduce(apple, 5); + int expected = 7; + + //When + int actual = produceStand.produceInventory(apple); + + //Then + Assert.assertEquals(expected, actual); + } +} From bc5c093e3895f2fcee08dc0fe28b8f468493c5a5 Mon Sep 17 00:00:00 2001 From: jorge Date: Thu, 25 Mar 2021 22:26:22 -0400 Subject: [PATCH 45/60] worked on stuff --- .../froilansfarm/Crops/Crop.java | 24 +++++++++++++++---- .../froilansfarm/Produce.java | 2 +- .../froilansfarm/Vehicles/Tractor.java | 13 ++++++++-- 3 files changed, 32 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Crops/Crop.java b/src/main/java/com/zipcodewilmington/froilansfarm/Crops/Crop.java index 05e7a00f..8837efc9 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Crops/Crop.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Crops/Crop.java @@ -3,16 +3,32 @@ import com.zipcodewilmington.froilansfarm.EdiblePackage.EdiblePlant; import com.zipcodewilmington.froilansfarm.Produce; +import java.lang.reflect.Array; +import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.Random; public class Crop implements Produce { - public void addProduce(Produce produce) { + + private LinkedHashMap basket; + private boolean isFertilized; + + public Crop() { + LinkedHashMap basket = new LinkedHashMap(); + } + + public void getFertilized(boolean fertilization){ + isFertilized = fertilization; + } + + public boolean setFertilized(){ + return isFertilized; } - public void yield(boolean fertilized){ + public boolean yield(boolean fertilized){ if(fertilized){ - //gonna do some stuff like add to produce or food - //times howMush method + return true; } + return false; } public int howMuch(){ Random randomAmount = new Random(); diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Produce.java b/src/main/java/com/zipcodewilmington/froilansfarm/Produce.java index 090645ac..c5c0c9af 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Produce.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Produce.java @@ -1,5 +1,5 @@ package com.zipcodewilmington.froilansfarm; public interface Produce { - public void addProduce(Produce produce); + } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Tractor.java b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Tractor.java index adec0f81..435c91c9 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Tractor.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Tractor.java @@ -4,12 +4,21 @@ import com.zipcodewilmington.froilansfarm.Farm.CropRow; public class Tractor extends FarmVehicle{ + + Crop crop = new Crop(); + private boolean readyToHarvest = false; + public String makeNoise() { return "Clack-Clunk"; } - public void harvest(Crop crop){ - //method which calls to crop row and tells that its getting harvested af + + public boolean getReadyToHarvest(){ + if(crop.setFertilized()){ + return true; + } + return false; } + public void harvestRow(CropRow row){ } } From 94257cfc6965925e5317523ea9755b7c488a90bc Mon Sep 17 00:00:00 2001 From: jorge Date: Thu, 25 Mar 2021 22:47:14 -0400 Subject: [PATCH 46/60] added crop methods --- .../java/com/zipcodewilmington/froilansfarm/Crops/Crop.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Crops/Crop.java b/src/main/java/com/zipcodewilmington/froilansfarm/Crops/Crop.java index 8837efc9..71ee4dcd 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Crops/Crop.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Crops/Crop.java @@ -24,8 +24,8 @@ public void getFertilized(boolean fertilization){ public boolean setFertilized(){ return isFertilized; } - public boolean yield(boolean fertilized){ - if(fertilized){ + public boolean yield(boolean isFertilized){ + if(isFertilized){ return true; } return false; From bdefcdade23d85ca89b65e069e467ee7cdd62e5a Mon Sep 17 00:00:00 2001 From: Greg Donnelly Date: Thu, 25 Mar 2021 22:49:07 -0400 Subject: [PATCH 47/60] routines --- .../froilansfarm/Animals/Chicken.java | 1 + .../zipcodewilmington/froilansfarm/Produce.java | 2 +- .../froilansfarm/Routines/DailyRoutine.java | 7 +++---- .../froilansfarm/Routines/RoutineEngine.java | 16 +++++++--------- 4 files changed, 12 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Animals/Chicken.java b/src/main/java/com/zipcodewilmington/froilansfarm/Animals/Chicken.java index 6b61e3d9..dbfe70e7 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Animals/Chicken.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Animals/Chicken.java @@ -3,6 +3,7 @@ import com.zipcodewilmington.froilansfarm.EdiblePackage.ChickenFood; import com.zipcodewilmington.froilansfarm.EdiblePackage.EarCorn; import com.zipcodewilmington.froilansfarm.EdiblePackage.Edible; +import com.zipcodewilmington.froilansfarm.EdiblePackage.Egg; import com.zipcodewilmington.froilansfarm.Produce; public class Chicken extends Animal implements Produce { diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Produce.java b/src/main/java/com/zipcodewilmington/froilansfarm/Produce.java index 090645ac..c9c18398 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Produce.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Produce.java @@ -1,5 +1,5 @@ package com.zipcodewilmington.froilansfarm; public interface Produce { - public void addProduce(Produce produce); + void addProduce(Produce produce); } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Routines/DailyRoutine.java b/src/main/java/com/zipcodewilmington/froilansfarm/Routines/DailyRoutine.java index 286ddc1c..af115f22 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Routines/DailyRoutine.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Routines/DailyRoutine.java @@ -1,11 +1,10 @@ package com.zipcodewilmington.froilansfarm.Routines; +import com.zipcodewilmington.froilansfarm.Animals.Chicken; +import com.zipcodewilmington.froilansfarm.Animals.Horse; import com.zipcodewilmington.froilansfarm.EdiblePackage.ChickenFood; import com.zipcodewilmington.froilansfarm.EdiblePackage.HorseFood; public interface DailyRoutine { -// public boolean mount (Horse horse); -// public boolean dismount (Horse horse); -// public boolean feedHorse(Horse horse, HorseFood food); -// public boolean feedChickens(Chicken chicken, ChickenFood chickFood); + } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Routines/RoutineEngine.java b/src/main/java/com/zipcodewilmington/froilansfarm/Routines/RoutineEngine.java index ec332ce6..85a7bc36 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Routines/RoutineEngine.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Routines/RoutineEngine.java @@ -6,16 +6,14 @@ import com.zipcodewilmington.froilansfarm.EdiblePackage.EarCorn; import com.zipcodewilmington.froilansfarm.EdiblePackage.HorseFood; -public class RoutineEngine implements DailyRoutine{ - public boolean mount (Horse horse) { return false;} - public boolean dismount (Horse horse) {return false;} - public boolean feedHorse(Horse horse, HorseFood food) {return false;} - public boolean feedChickens(Chicken chicken, ChickenFood chickFood) { - chicken.eat(chickFood); - return true;} - - +public class RoutineEngine{ + public void dailyRoutine() { + boolean mount (Horse horse); + boolean dismount (Horse horse); + boolean feedHorse(Horse horse, HorseFood food); + boolean feedChickens(Chicken chicken, ChickenFood chickFood); + } public void Monday () {} public void Tuesday () {} From 8048203a0a57c932bf636008b3f7471013fc1a29 Mon Sep 17 00:00:00 2001 From: Greg Donnelly Date: Thu, 25 Mar 2021 22:51:52 -0400 Subject: [PATCH 48/60] should merge now --- .../zipcodewilmington/froilansfarm/Produce.java | 5 +---- .../froilansfarm/Routines/RoutineEngine.java | 14 +++++++------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Produce.java b/src/main/java/com/zipcodewilmington/froilansfarm/Produce.java index 02a60b70..270faae1 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Produce.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Produce.java @@ -1,9 +1,6 @@ package com.zipcodewilmington.froilansfarm; public interface Produce { -<<<<<<< HEAD - void addProduce(Produce produce); -======= ->>>>>>> 82d0eba514ed1d65997c7537c05dd53fe9ff7805 + } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Routines/RoutineEngine.java b/src/main/java/com/zipcodewilmington/froilansfarm/Routines/RoutineEngine.java index 85a7bc36..d3e15ca7 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Routines/RoutineEngine.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Routines/RoutineEngine.java @@ -7,13 +7,13 @@ import com.zipcodewilmington.froilansfarm.EdiblePackage.HorseFood; public class RoutineEngine{ - - public void dailyRoutine() { - boolean mount (Horse horse); - boolean dismount (Horse horse); - boolean feedHorse(Horse horse, HorseFood food); - boolean feedChickens(Chicken chicken, ChickenFood chickFood); - } +// +// public void dailyRoutine() { +// boolean mount (Horse horse); +// boolean dismount (Horse horse); +// boolean feedHorse(Horse horse, HorseFood food); +// boolean feedChickens(Chicken chicken, ChickenFood chickFood); +// } public void Monday () {} public void Tuesday () {} From 16a2057bffbbf03643534741e06963a2b8170162 Mon Sep 17 00:00:00 2001 From: Greg Donnelly Date: Thu, 25 Mar 2021 22:52:58 -0400 Subject: [PATCH 49/60] produce stopped being a bicht --- src/main/java/com/zipcodewilmington/froilansfarm/Produce.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Produce.java b/src/main/java/com/zipcodewilmington/froilansfarm/Produce.java index 1b34537b..270faae1 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Produce.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Produce.java @@ -1,8 +1,6 @@ package com.zipcodewilmington.froilansfarm; public interface Produce { - void addProduce(Produce produce); - } From c4f8fde08248e86d3f59dac5366ad756afbb6a74 Mon Sep 17 00:00:00 2001 From: Greg Donnelly Date: Fri, 26 Mar 2021 05:48:29 -0400 Subject: [PATCH 50/60] crops now yield the edible plants --- .../com/zipcodewilmington/froilansfarm/Animals/Chicken.java | 6 +++--- .../zipcodewilmington/froilansfarm/Crops/AppleTrees.java | 5 +++++ .../com/zipcodewilmington/froilansfarm/Crops/BeanStalk.java | 4 ++++ .../com/zipcodewilmington/froilansfarm/Crops/CornStalk.java | 5 +++++ .../java/com/zipcodewilmington/froilansfarm/Crops/Crop.java | 5 +++++ .../zipcodewilmington/froilansfarm/Crops/PumpkinVines.java | 5 +++++ .../zipcodewilmington/froilansfarm/Crops/TomatoPlant.java | 6 ++++++ .../java/com/zipcodewilmington/froilansfarm/Produce.java | 5 ++++- 8 files changed, 37 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Animals/Chicken.java b/src/main/java/com/zipcodewilmington/froilansfarm/Animals/Chicken.java index dbfe70e7..e11abf36 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Animals/Chicken.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Animals/Chicken.java @@ -7,15 +7,15 @@ import com.zipcodewilmington.froilansfarm.Produce; public class Chicken extends Animal implements Produce { - + private Egg egg = new Egg(); public String makeNoise() { System.out.println("Bok Bok!"); return "Bok Bok!"; } - public void addProduce(Produce produce) { - + public Egg yieldProd() { + return egg; } // @Override diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Crops/AppleTrees.java b/src/main/java/com/zipcodewilmington/froilansfarm/Crops/AppleTrees.java index 8c21d7bf..0bb8d243 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Crops/AppleTrees.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Crops/AppleTrees.java @@ -3,4 +3,9 @@ import com.zipcodewilmington.froilansfarm.EdiblePackage.Apple; public class AppleTrees extends Crop { + Apple apple = new Apple(); + + public Apple yieldProd() { + return apple; + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Crops/BeanStalk.java b/src/main/java/com/zipcodewilmington/froilansfarm/Crops/BeanStalk.java index 573de615..6af05ba1 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Crops/BeanStalk.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Crops/BeanStalk.java @@ -3,5 +3,9 @@ import com.zipcodewilmington.froilansfarm.EdiblePackage.SoyBean; public class BeanStalk extends Crop { + SoyBean soyBean = new SoyBean(); + public SoyBean yieldProd() { + return soyBean; + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Crops/CornStalk.java b/src/main/java/com/zipcodewilmington/froilansfarm/Crops/CornStalk.java index 0338644c..4f3c909c 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Crops/CornStalk.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Crops/CornStalk.java @@ -3,4 +3,9 @@ import com.zipcodewilmington.froilansfarm.EdiblePackage.EarCorn; public class CornStalk extends Crop { + EarCorn earCorn = new EarCorn(); + + public EarCorn yieldProd() { + return earCorn; + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Crops/Crop.java b/src/main/java/com/zipcodewilmington/froilansfarm/Crops/Crop.java index 71ee4dcd..ea80a032 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Crops/Crop.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Crops/Crop.java @@ -1,5 +1,6 @@ package com.zipcodewilmington.froilansfarm.Crops; +import com.zipcodewilmington.froilansfarm.EdiblePackage.Edible; import com.zipcodewilmington.froilansfarm.EdiblePackage.EdiblePlant; import com.zipcodewilmington.froilansfarm.Produce; @@ -34,4 +35,8 @@ public int howMuch(){ Random randomAmount = new Random(); return randomAmount.nextInt(10) + 1; } + + public E yieldProd() { + return null; + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Crops/PumpkinVines.java b/src/main/java/com/zipcodewilmington/froilansfarm/Crops/PumpkinVines.java index a60cf32a..08d2e786 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Crops/PumpkinVines.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Crops/PumpkinVines.java @@ -3,4 +3,9 @@ import com.zipcodewilmington.froilansfarm.EdiblePackage.Pumpkin; public class PumpkinVines extends Crop{ + Pumpkin pumpkin = new Pumpkin(); + + public Pumpkin yieldProd() { + return pumpkin; + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Crops/TomatoPlant.java b/src/main/java/com/zipcodewilmington/froilansfarm/Crops/TomatoPlant.java index 1d2c7f30..95433dab 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Crops/TomatoPlant.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Crops/TomatoPlant.java @@ -3,4 +3,10 @@ import com.zipcodewilmington.froilansfarm.EdiblePackage.Tomato; public class TomatoPlant extends Crop { + Tomato tomato = new Tomato(); + + + public Tomato yieldProd() { + return tomato; + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Produce.java b/src/main/java/com/zipcodewilmington/froilansfarm/Produce.java index 270faae1..d005db44 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Produce.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Produce.java @@ -1,6 +1,9 @@ package com.zipcodewilmington.froilansfarm; -public interface Produce { +import com.zipcodewilmington.froilansfarm.EdiblePackage.Edible; +public interface Produce { + + E yieldProd(); } From 7da6cfb48807b7ff7c423abe46f33e992186f793 Mon Sep 17 00:00:00 2001 From: Greg Donnelly Date: Fri, 26 Mar 2021 07:23:16 -0400 Subject: [PATCH 51/60] can't get harvestRow to work because Field is somehow null --- .../froilansfarm/Farm/Field.java | 14 ++++++- .../froilansfarm/Vehicles/Tractor.java | 41 ++++++++++++++++++- .../TestVehicles/TestTractor.java | 23 +++++++++++ 3 files changed, 74 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Farm/Field.java b/src/main/java/com/zipcodewilmington/froilansfarm/Farm/Field.java index 6d6d5b60..ccbb285f 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Farm/Field.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Farm/Field.java @@ -5,12 +5,15 @@ public class Field { CropRow cropRow = new CropRow(); - public Map fieldMap = new LinkedHashMap(); + public LinkedHashMap fieldMap = new LinkedHashMap(); - public Field() {} + public Field() { + //fieldMap = new LinkedHashMap(); + } public Field(int numOfRows, CropRow row) { + //fieldMap = new LinkedHashMap(); for (int i = 1; i <= numOfRows; i++) { tillLand(i, row); } @@ -36,4 +39,11 @@ public int harvestRow(int rowNum) { return numOfVeg; } + public CropRow getCropRow(Integer rowNum) { + return fieldMap.get(rowNum); + } + + public LinkedHashMap getFieldMap() { + return this.fieldMap; + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Tractor.java b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Tractor.java index 435c91c9..0896e53a 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Tractor.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Tractor.java @@ -1,12 +1,21 @@ package com.zipcodewilmington.froilansfarm.Vehicles; import com.zipcodewilmington.froilansfarm.Crops.Crop; +import com.zipcodewilmington.froilansfarm.EdiblePackage.EdiblePlant; import com.zipcodewilmington.froilansfarm.Farm.CropRow; +import com.zipcodewilmington.froilansfarm.Farm.Field; +import com.zipcodewilmington.froilansfarm.Farm.ProduceStand; +import com.zipcodewilmington.froilansfarm.Produce; +import javafx.util.Pair; -public class Tractor extends FarmVehicle{ +import java.util.LinkedHashMap; +import java.util.Map; +public class Tractor extends FarmVehicle{ + ProduceStand produceStand; Crop crop = new Crop(); private boolean readyToHarvest = false; + Field field; public String makeNoise() { return "Clack-Clunk"; @@ -19,6 +28,34 @@ public boolean getReadyToHarvest(){ return false; } - public void harvestRow(CropRow row){ + public void harvestRow(int rowNum){ + CropRow cropRow = field.getCropRow(rowNum); + Integer rowKey = getRowKey(field.getFieldMap(), cropRow); + EdiblePlant ePlant = crop.yieldProd(); + Integer numOfEPlant = field.harvestRow(rowKey); + produceStand.addToStand(ePlant, numOfEPlant); } + + + public Integer getRowKey(Map map, CropRow value) { + Integer rowKey = 0; + for (Map.Entry entry : map.entrySet()) { + if (entry.getValue().equals(value)) { + rowKey = entry.getKey(); + } + } + return rowKey; + } + + +// public Integer getRowKey(Map map, CropRow value) { +// int rowKey = 0; +// for (Map.Entry entry : map.entrySet()) { +// if (entry.getValue().equals(value)) { +// rowKey = entry.getKey(); +// } +// } +// return rowKey; +// } + } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/TestVehicles/TestTractor.java b/src/test/java/com/zipcodewilmington/froilansfarm/TestVehicles/TestTractor.java index 936514e8..1fe0efdc 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/TestVehicles/TestTractor.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/TestVehicles/TestTractor.java @@ -1,5 +1,10 @@ package com.zipcodewilmington.froilansfarm.TestVehicles; +import com.zipcodewilmington.froilansfarm.Crops.AppleTrees; +import com.zipcodewilmington.froilansfarm.EdiblePackage.Apple; +import com.zipcodewilmington.froilansfarm.Farm.CropRow; +import com.zipcodewilmington.froilansfarm.Farm.Field; +import com.zipcodewilmington.froilansfarm.Farm.ProduceStand; import com.zipcodewilmington.froilansfarm.Vehicles.*; import org.junit.Assert; import org.junit.Test; @@ -33,4 +38,22 @@ public void testMakeNoise(){ //Assertion Assert.assertEquals(expected,actual); } + @Test + public void testHarvestRow() { + //Given + Tractor tractor = new Tractor(); + ProduceStand produceStand = new ProduceStand(); + Apple apple = new Apple(); + AppleTrees appleTrees = new AppleTrees(); + CropRow row = new CropRow(1, appleTrees); + Field field = new Field(1, row); + + + //When + tractor.harvestRow(tractor.getRowKey(field.fieldMap, row)); + int numOfApples = produceStand.produceInventory(apple); + + //Then + Assert.assertTrue(numOfApples < 11 && numOfApples > 0); + } } From ea506b0e5a82e9d0d8386cf0456260e732d73413 Mon Sep 17 00:00:00 2001 From: Greg Donnelly Date: Fri, 26 Mar 2021 08:07:58 -0400 Subject: [PATCH 52/60] upaate` --- .../froilansfarm/Farm/ChickenCoop.java | 4 ++ .../froilansfarm/Farm/Farm.java | 22 ++++-- .../froilansfarm/Farm/Field.java | 6 +- .../froilansfarm/Farm/Stable.java | 4 ++ .../froilansfarm/Routines/RoutineEngine.java | 70 +++++++++++++++---- .../froilansfarm/Vehicles/Tractor.java | 4 +- 6 files changed, 85 insertions(+), 25 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Farm/ChickenCoop.java b/src/main/java/com/zipcodewilmington/froilansfarm/Farm/ChickenCoop.java index 4b4335c2..f69fbf3b 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Farm/ChickenCoop.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Farm/ChickenCoop.java @@ -28,4 +28,8 @@ public void store(Chicken chicken) { public int size() { return coop.size(); } + + public ArrayList getCoop() { + return this.coop; + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Farm/Farm.java b/src/main/java/com/zipcodewilmington/froilansfarm/Farm/Farm.java index 18544f71..6fcd76fe 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Farm/Farm.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Farm/Farm.java @@ -2,18 +2,26 @@ import com.zipcodewilmington.froilansfarm.Animals.Chicken; import com.zipcodewilmington.froilansfarm.Animals.Horse; +import com.zipcodewilmington.froilansfarm.Crops.Crop; import java.util.ArrayList; public class Farm { + CropRow row = new CropRow(); Chicken chicken = new Chicken(); Horse horse = new Horse(); - ChickenCoop coopOne = new ChickenCoop(4, chicken); - ChickenCoop coopTwo = new ChickenCoop(4, chicken); - ChickenCoop coopThree = new ChickenCoop(3, chicken); - ChickenCoop coopFour = new ChickenCoop(4, chicken); + public Field field = new Field(5, row); - Stable stableOne = new Stable(4, horse); - Stable stableTwo = new Stable(3, horse); - Stable stableThree = new Stable(3, horse); + public ChickenCoop coopOne = new ChickenCoop(4, chicken); + public ChickenCoop coopTwo = new ChickenCoop(4, chicken); + public ChickenCoop coopThree = new ChickenCoop(3, chicken); + public ChickenCoop coopFour = new ChickenCoop(4, chicken); + + public Stable stableOne = new Stable(4, horse); + public Stable stableTwo = new Stable(3, horse); + public Stable stableThree = new Stable(3, horse); + + public Field getField() { + return field; + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Farm/Field.java b/src/main/java/com/zipcodewilmington/froilansfarm/Farm/Field.java index ccbb285f..648b40f9 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Farm/Field.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Farm/Field.java @@ -5,15 +5,15 @@ public class Field { CropRow cropRow = new CropRow(); - public LinkedHashMap fieldMap = new LinkedHashMap(); + public LinkedHashMap fieldMap; public Field() { - //fieldMap = new LinkedHashMap(); + fieldMap = new LinkedHashMap(); } public Field(int numOfRows, CropRow row) { - //fieldMap = new LinkedHashMap(); + fieldMap = new LinkedHashMap(); for (int i = 1; i <= numOfRows; i++) { tillLand(i, row); } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Farm/Stable.java b/src/main/java/com/zipcodewilmington/froilansfarm/Farm/Stable.java index e3202106..f7e49b5d 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Farm/Stable.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Farm/Stable.java @@ -20,6 +20,10 @@ public void brokenLeg (Horse horse) { stable.remove(horse); } + public ArrayList getStable() { + return this.stable; + } + @Override public int size() { return stable.size(); diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Routines/RoutineEngine.java b/src/main/java/com/zipcodewilmington/froilansfarm/Routines/RoutineEngine.java index d3e15ca7..32005da8 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Routines/RoutineEngine.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Routines/RoutineEngine.java @@ -2,24 +2,66 @@ import com.zipcodewilmington.froilansfarm.Animals.Chicken; import com.zipcodewilmington.froilansfarm.Animals.Horse; +import com.zipcodewilmington.froilansfarm.EdiblePackage.Apple; import com.zipcodewilmington.froilansfarm.EdiblePackage.ChickenFood; import com.zipcodewilmington.froilansfarm.EdiblePackage.EarCorn; import com.zipcodewilmington.froilansfarm.EdiblePackage.HorseFood; +import com.zipcodewilmington.froilansfarm.Farm.Farm; +import com.zipcodewilmington.froilansfarm.Persons.Farmer; public class RoutineEngine{ -// -// public void dailyRoutine() { -// boolean mount (Horse horse); -// boolean dismount (Horse horse); -// boolean feedHorse(Horse horse, HorseFood food); -// boolean feedChickens(Chicken chicken, ChickenFood chickFood); -// } + Farmer froiland = new Farmer(); + Farm farm = new Farm(); - public void Monday () {} - public void Tuesday () {} - public void Wednesday () {} - public void Thursday () {} - public void Friday () {} - public void Saturday () {} - public void Sunday () {} + public void dailyRoutine() { + for (Horse horse : farm.stableOne.getStable()){ + froiland.mount(horse); + froiland.dismount(horse); + //feed horses + } + for (Horse horse : farm.stableTwo.getStable()){ + froiland.mount(horse); + froiland.dismount(horse); + //feed horses + } + for (Horse horse : farm.stableThree.getStable()){ + froiland.mount(horse); + froiland.dismount(horse); + //feed horses + } + for (Chicken chicken : farm.coopOne.getCoop()) { + //feed chickens + } + for (Chicken chicken : farm.coopTwo.getCoop()) { + //feed chickens + } + for (Chicken chicken : farm.coopThree.getCoop()) { + //feed chickens + } + for (Chicken chicken : farm.coopFour.getCoop()) { + //feed chickens + } + } + + public void Monday () { + dailyRoutine(); + } + public void Tuesday () { + dailyRoutine(); + } + public void Wednesday () { + dailyRoutine(); + } + public void Thursday () { + dailyRoutine(); + } + public void Friday () { + dailyRoutine(); + } + public void Saturday () { + dailyRoutine(); + } + public void Sunday () { + dailyRoutine(); + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Tractor.java b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Tractor.java index 0896e53a..17d69383 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Tractor.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Tractor.java @@ -3,6 +3,7 @@ import com.zipcodewilmington.froilansfarm.Crops.Crop; import com.zipcodewilmington.froilansfarm.EdiblePackage.EdiblePlant; import com.zipcodewilmington.froilansfarm.Farm.CropRow; +import com.zipcodewilmington.froilansfarm.Farm.Farm; import com.zipcodewilmington.froilansfarm.Farm.Field; import com.zipcodewilmington.froilansfarm.Farm.ProduceStand; import com.zipcodewilmington.froilansfarm.Produce; @@ -12,10 +13,11 @@ import java.util.Map; public class Tractor extends FarmVehicle{ + Field field; ProduceStand produceStand; Crop crop = new Crop(); private boolean readyToHarvest = false; - Field field; + public String makeNoise() { return "Clack-Clunk"; From 916b791e954a35fc9d882b65d73417e8fb2e4650 Mon Sep 17 00:00:00 2001 From: Greg Donnelly Date: Fri, 26 Mar 2021 08:26:05 -0400 Subject: [PATCH 53/60] eaters can eat a number of a food. Farmer can feed chickens and horses. routine engine updates Please enter the commit message for your changes. Lines starting --- .../zipcodewilmington/froilansfarm/Eater.java | 2 +- .../froilansfarm/Persons/Farmer.java | 14 ++++++- .../froilansfarm/Persons/Pilot.java | 2 +- .../froilansfarm/Routines/RoutineEngine.java | 41 ++++++++++++++----- 4 files changed, 45 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Eater.java b/src/main/java/com/zipcodewilmington/froilansfarm/Eater.java index 59e2b830..0aee06ed 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Eater.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Eater.java @@ -3,5 +3,5 @@ import com.zipcodewilmington.froilansfarm.EdiblePackage.Edible; public interface Eater { - String eat(Edible obj); + String eat(Edible obj, int numOfFood); } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Persons/Farmer.java b/src/main/java/com/zipcodewilmington/froilansfarm/Persons/Farmer.java index 6e7fdec5..80602795 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Persons/Farmer.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Persons/Farmer.java @@ -1,7 +1,12 @@ package com.zipcodewilmington.froilansfarm.Persons; +import com.zipcodewilmington.froilansfarm.Animals.Animal; +import com.zipcodewilmington.froilansfarm.Animals.Chicken; +import com.zipcodewilmington.froilansfarm.Animals.Horse; import com.zipcodewilmington.froilansfarm.Crops.Crop; +import com.zipcodewilmington.froilansfarm.EdiblePackage.ChickenFood; import com.zipcodewilmington.froilansfarm.EdiblePackage.Edible; +import com.zipcodewilmington.froilansfarm.EdiblePackage.HorseFood; import com.zipcodewilmington.froilansfarm.EdiblePackage.Moonshine; import com.zipcodewilmington.froilansfarm.Farm.CropRow; import com.zipcodewilmington.froilansfarm.Rideable; @@ -30,7 +35,7 @@ public String getName() { return name; } - public String eat(Edible obj) { + public String eat(Edible obj, int numOfFood) { System.out.println("This food is downright edible!"); return "This food is downright edible!"; } @@ -62,4 +67,11 @@ public boolean isDrunk(boolean drank){ shine.removeGrowler(1); return true; } + + public void feedHorse(Horse horse, HorseFood food) { + horse.eat(food); + } + public void feedChicken(Chicken chicken, ChickenFood food) { + chicken.eat(food); + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Persons/Pilot.java b/src/main/java/com/zipcodewilmington/froilansfarm/Persons/Pilot.java index 239c3c34..0aadad80 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Persons/Pilot.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Persons/Pilot.java @@ -8,7 +8,7 @@ public class Pilot implements Rider, Person { Moonshine shine = new Moonshine(); - public String eat(Edible obj) { + public String eat(Edible obj, int numOfFood) { System.out.println("Yum, this food is tasty"); return "Yum, this food is tasty"; } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Routines/RoutineEngine.java b/src/main/java/com/zipcodewilmington/froilansfarm/Routines/RoutineEngine.java index 32005da8..82000dc2 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Routines/RoutineEngine.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Routines/RoutineEngine.java @@ -2,45 +2,64 @@ import com.zipcodewilmington.froilansfarm.Animals.Chicken; import com.zipcodewilmington.froilansfarm.Animals.Horse; -import com.zipcodewilmington.froilansfarm.EdiblePackage.Apple; -import com.zipcodewilmington.froilansfarm.EdiblePackage.ChickenFood; -import com.zipcodewilmington.froilansfarm.EdiblePackage.EarCorn; -import com.zipcodewilmington.froilansfarm.EdiblePackage.HorseFood; +import com.zipcodewilmington.froilansfarm.EdiblePackage.*; import com.zipcodewilmington.froilansfarm.Farm.Farm; import com.zipcodewilmington.froilansfarm.Persons.Farmer; +import com.zipcodewilmington.froilansfarm.Persons.Pilot; public class RoutineEngine{ Farmer froiland = new Farmer(); + Pilot froilanda = new Pilot(); Farm farm = new Farm(); + Egg egg = new Egg(); + EarCorn earCorn = new EarCorn(); + Tomato tomato = new Tomato(); + Apple apple = new Apple(); + Pumpkin pumpkin = new Pumpkin(); + SoyBean soyBean = new SoyBean(); + public void dailyRoutine() { for (Horse horse : farm.stableOne.getStable()){ froiland.mount(horse); froiland.dismount(horse); - //feed horses + froiland.feedHorse(horse, apple); + froiland.feedHorse(horse, earCorn); } for (Horse horse : farm.stableTwo.getStable()){ froiland.mount(horse); froiland.dismount(horse); - //feed horses + froiland.feedHorse(horse, apple); + froiland.feedHorse(horse, earCorn); } for (Horse horse : farm.stableThree.getStable()){ froiland.mount(horse); froiland.dismount(horse); - //feed horses + froiland.feedHorse(horse, apple); + froiland.feedHorse(horse, earCorn); } for (Chicken chicken : farm.coopOne.getCoop()) { - //feed chickens + froiland.feedChicken(chicken, earCorn); + froiland.feedChicken(chicken, soyBean); } for (Chicken chicken : farm.coopTwo.getCoop()) { - //feed chickens + froiland.feedChicken(chicken, earCorn); + froiland.feedChicken(chicken, soyBean); } for (Chicken chicken : farm.coopThree.getCoop()) { - //feed chickens + froiland.feedChicken(chicken, earCorn); + froiland.feedChicken(chicken, soyBean); } for (Chicken chicken : farm.coopFour.getCoop()) { - //feed chickens + froiland.feedChicken(chicken, earCorn); + froiland.feedChicken(chicken, soyBean); } + froiland.eat(egg, 5); + froiland.eat(tomato, 2); + froiland.eat(earCorn, 1); + froilanda.eat(egg, 2); + froilanda.eat(earCorn,2); + froilanda.eat(tomato,1); } public void Monday () { From cff96e53792480da5a5a996ef087e084a3473904 Mon Sep 17 00:00:00 2001 From: jorge Date: Fri, 26 Mar 2021 09:10:41 -0400 Subject: [PATCH 54/60] added to field and tractor --- .../froilansfarm/Farm/Field.java | 10 ++++++++- .../froilansfarm/Vehicles/Tractor.java | 22 ++++++++++++------- 2 files changed, 23 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Farm/Field.java b/src/main/java/com/zipcodewilmington/froilansfarm/Farm/Field.java index 648b40f9..55e29322 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Farm/Field.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Farm/Field.java @@ -7,11 +7,11 @@ public class Field { CropRow cropRow = new CropRow(); public LinkedHashMap fieldMap; - public Field() { fieldMap = new LinkedHashMap(); } + public Field(int numOfRows, CropRow row) { fieldMap = new LinkedHashMap(); for (int i = 1; i <= numOfRows; i++) { @@ -19,6 +19,14 @@ public Field(int numOfRows, CropRow row) { } } + public LinkedHashMap getHashMap(){ + return fieldMap; + } + + public void setFieldMap(LinkedHashMap map){ + this.fieldMap = map; + } + public void tillLand(int rowNum, CropRow row) { if (!fieldMap.containsKey(rowNum)) { fieldMap.put(rowNum, row); diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Tractor.java b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Tractor.java index 17d69383..432255c2 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Tractor.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Tractor.java @@ -3,11 +3,9 @@ import com.zipcodewilmington.froilansfarm.Crops.Crop; import com.zipcodewilmington.froilansfarm.EdiblePackage.EdiblePlant; import com.zipcodewilmington.froilansfarm.Farm.CropRow; -import com.zipcodewilmington.froilansfarm.Farm.Farm; import com.zipcodewilmington.froilansfarm.Farm.Field; import com.zipcodewilmington.froilansfarm.Farm.ProduceStand; import com.zipcodewilmington.froilansfarm.Produce; -import javafx.util.Pair; import java.util.LinkedHashMap; import java.util.Map; @@ -17,12 +15,17 @@ public class Tractor extends FarmVehicle{ ProduceStand produceStand; Crop crop = new Crop(); private boolean readyToHarvest = false; + private LinkedHashMap fieldMap = null; public String makeNoise() { return "Clack-Clunk"; } + public void setFieldMap(LinkedHashMap fieldMap){ + this.fieldMap = fieldMap; + } + public boolean getReadyToHarvest(){ if(crop.setFertilized()){ return true; @@ -31,16 +34,19 @@ public boolean getReadyToHarvest(){ } public void harvestRow(int rowNum){ - CropRow cropRow = field.getCropRow(rowNum); - Integer rowKey = getRowKey(field.getFieldMap(), cropRow); - EdiblePlant ePlant = crop.yieldProd(); - Integer numOfEPlant = field.harvestRow(rowKey); - produceStand.addToStand(ePlant, numOfEPlant); + if(this.fieldMap != null) { + CropRow cropRow = fieldMap.get(rowNum); + Integer rowKey = getRowKey(fieldMap, cropRow); + EdiblePlant ePlant = crop.yieldProd(); + field.setFieldMap(fieldMap); + Integer numOfEPlant = field.harvestRow(rowKey); + produceStand.addToStand(ePlant, numOfEPlant); + } } public Integer getRowKey(Map map, CropRow value) { - Integer rowKey = 0; + Integer rowKey = null; for (Map.Entry entry : map.entrySet()) { if (entry.getValue().equals(value)) { rowKey = entry.getKey(); From 79d565feacccc51ce93593840799906929bcbca3 Mon Sep 17 00:00:00 2001 From: Greg Donnelly Date: Fri, 26 Mar 2021 09:11:34 -0400 Subject: [PATCH 55/60] updates --- .../froilansfarm/Animals/Chicken.java | 5 +++-- .../froilansfarm/Animals/Horse.java | 2 +- .../froilansfarm/EdiblePackage/Moonshine.java | 4 ++-- .../froilansfarm/Persons/Botanist.java | 2 +- .../froilansfarm/Persons/Farmer.java | 13 +++++++++++-- .../froilansfarm/Persons/Person.java | 5 +++-- .../froilansfarm/Routines/RoutineEngine.java | 14 ++++++++++++++ .../TestEdiblesPackage/TestMoonshine.java | 9 ++++----- 8 files changed, 39 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Animals/Chicken.java b/src/main/java/com/zipcodewilmington/froilansfarm/Animals/Chicken.java index e11abf36..99e057ea 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Animals/Chicken.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Animals/Chicken.java @@ -18,7 +18,7 @@ public Egg yieldProd() { return egg; } -// @Override + public String eat(ChickenFood chickyFood) { System.out.println("Peck Peck"); return "Peck Peck"; @@ -26,8 +26,9 @@ public String eat(ChickenFood chickyFood) { - public String eat(Edible obj) { + public String eat(Edible obj, int numOfFood) { System.out.println("Peck Peck"); return "Peck Peck"; } + } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Animals/Horse.java b/src/main/java/com/zipcodewilmington/froilansfarm/Animals/Horse.java index abd306b0..ed49c042 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Animals/Horse.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Animals/Horse.java @@ -6,7 +6,7 @@ public class Horse extends Animal implements Rideable { - public String eat(Edible obj) { + public String eat(Edible obj, int numOfFood) { System.out.println("munch munch munch"); return "munch munch munch"; } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/Moonshine.java b/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/Moonshine.java index b25c8343..cad3e4d3 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/Moonshine.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/Moonshine.java @@ -6,8 +6,8 @@ public class Moonshine { public int numberOfGrowlers = 0; - public void distill(){ - numberOfGrowlers++; + public void distill(int numOfGrowl){ + numberOfGrowlers+= numOfGrowl; } public void removeGrowler(int growler){ diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Persons/Botanist.java b/src/main/java/com/zipcodewilmington/froilansfarm/Persons/Botanist.java index 04906215..19f8113a 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Persons/Botanist.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Persons/Botanist.java @@ -4,5 +4,5 @@ import com.zipcodewilmington.froilansfarm.Farm.CropRow; public interface Botanist extends Person { - void plant(Crop crop, CropRow cropRow); + CropRow plant(Crop crop, CropRow cropRow, int numOfCrop); } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Persons/Farmer.java b/src/main/java/com/zipcodewilmington/froilansfarm/Persons/Farmer.java index 80602795..0a0e3637 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Persons/Farmer.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Persons/Farmer.java @@ -9,6 +9,7 @@ import com.zipcodewilmington.froilansfarm.EdiblePackage.HorseFood; import com.zipcodewilmington.froilansfarm.EdiblePackage.Moonshine; import com.zipcodewilmington.froilansfarm.Farm.CropRow; +import com.zipcodewilmington.froilansfarm.Farm.Field; import com.zipcodewilmington.froilansfarm.Rideable; @@ -16,6 +17,7 @@ import com.zipcodewilmington.froilansfarm.Rideable; public class Farmer implements Rider, Botanist, Person { + Field field; Moonshine shine = new Moonshine(); @@ -55,8 +57,11 @@ public String dismount(Rideable obj) { return this.name + " gets on the " + obj + "."; } - public void plant(Crop crop, CropRow cropRow) { - + public CropRow plant(Crop crop, CropRow cropRow, int numOfCrop) { + for (int i = 0; i < numOfCrop; i++) { + cropRow.plantCrops(crop); + } + return cropRow; } public boolean drankShine() { @@ -74,4 +79,8 @@ public void feedHorse(Horse horse, HorseFood food) { public void feedChicken(Chicken chicken, ChickenFood food) { chicken.eat(food); } + + public String workFarmStand() { + return "Fresh Produce 4 Sale"; + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Persons/Person.java b/src/main/java/com/zipcodewilmington/froilansfarm/Persons/Person.java index c8e966be..6222e34f 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Persons/Person.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Persons/Person.java @@ -1,6 +1,7 @@ package com.zipcodewilmington.froilansfarm.Persons; import com.zipcodewilmington.froilansfarm.Eater; +import com.zipcodewilmington.froilansfarm.EdiblePackage.Edible; import com.zipcodewilmington.froilansfarm.LivingThing; import com.zipcodewilmington.froilansfarm.NoiseMaker; @@ -8,6 +9,6 @@ public interface Person extends LivingThing, Eater, NoiseMaker{ boolean drankShine(); - - } + String eat(Edible obj, int numOfFood); +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Routines/RoutineEngine.java b/src/main/java/com/zipcodewilmington/froilansfarm/Routines/RoutineEngine.java index 82000dc2..8bab935c 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Routines/RoutineEngine.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Routines/RoutineEngine.java @@ -6,6 +6,8 @@ import com.zipcodewilmington.froilansfarm.Farm.Farm; import com.zipcodewilmington.froilansfarm.Persons.Farmer; import com.zipcodewilmington.froilansfarm.Persons.Pilot; +import com.zipcodewilmington.froilansfarm.Vehicles.CropDuster; +import com.zipcodewilmington.froilansfarm.Vehicles.Tractor; public class RoutineEngine{ Farmer froiland = new Farmer(); @@ -17,6 +19,9 @@ public class RoutineEngine{ Apple apple = new Apple(); Pumpkin pumpkin = new Pumpkin(); SoyBean soyBean = new SoyBean(); + CropDuster cropDuster = new CropDuster(); + Tractor tractor = new Tractor(); + Moonshine moonshine = new Moonshine(); public void dailyRoutine() { @@ -64,18 +69,27 @@ public void dailyRoutine() { public void Monday () { dailyRoutine(); + froilanda.mount(cropDuster); + //fertilize field + froilanda.dismount(cropDuster); } public void Tuesday () { dailyRoutine(); + froiland.mount(tractor); + //Harvests each row + froiland.dismount(tractor); } public void Wednesday () { dailyRoutine(); + moonshine.distill(4); } public void Thursday () { dailyRoutine(); } public void Friday () { dailyRoutine(); + froiland.workFarmStand(); + froiland.isDrunk(froilanda.drankShine()); } public void Saturday () { dailyRoutine(); diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/TestEdiblesPackage/TestMoonshine.java b/src/test/java/com/zipcodewilmington/froilansfarm/TestEdiblesPackage/TestMoonshine.java index fae42f2c..43d48a63 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/TestEdiblesPackage/TestMoonshine.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/TestEdiblesPackage/TestMoonshine.java @@ -11,8 +11,8 @@ public void testDistill(){ Moonshine moonshine = new Moonshine(); //Action - moonshine.distill(); - int expected = 1; + moonshine.distill(3); + int expected = 3; int actual = moonshine.getNumberOfGrowlers(); //Assert @@ -22,12 +22,11 @@ public void testDistill(){ public void testRemoveGrowler(){ //Arrange Moonshine moonshine = new Moonshine(); - moonshine.distill(); - moonshine.distill(); + moonshine.distill(3); //Action moonshine.removeGrowler(1); - int expected = 1; + int expected = 2; int actual = moonshine.getNumberOfGrowlers(); //Assert From 3a82912470778595988b032483e7b6d574004122 Mon Sep 17 00:00:00 2001 From: Greg Donnelly Date: Fri, 26 Mar 2021 14:06:29 -0400 Subject: [PATCH 56/60] got farmer.plant to work with the singleton. Struggling to get tractor to work --- .../froilansfarm/Farm/CropRow.java | 6 +++++ .../froilansfarm/Farm/Field.java | 25 ++++++++++++++++--- .../froilansfarm/Persons/Botanist.java | 2 +- .../froilansfarm/Persons/Farmer.java | 11 ++++---- .../froilansfarm/Routines/RoutineEngine.java | 9 +++++++ .../froilansfarm/Vehicles/Tractor.java | 22 +++++++--------- .../froilansfarm/PersonsTest/FarmerTest.java | 21 +++++++++++++--- .../froilansfarm/PersonsTest/PilotTest.java | 6 ++--- .../TestVehicles/TestTractor.java | 6 ++++- 9 files changed, 77 insertions(+), 31 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Farm/CropRow.java b/src/main/java/com/zipcodewilmington/froilansfarm/Farm/CropRow.java index ead155c8..af224cdd 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Farm/CropRow.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Farm/CropRow.java @@ -37,4 +37,10 @@ public int cropsPerRow() { public Crop cropType (int num) { return row.get(num); } + + public void add (E crop, int numOfCrops) { + for (int i = 0; i < numOfCrops; i++) { + row.add(crop); + } + } } \ No newline at end of file diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Farm/Field.java b/src/main/java/com/zipcodewilmington/froilansfarm/Farm/Field.java index 55e29322..f6dc9036 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Farm/Field.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Farm/Field.java @@ -1,9 +1,13 @@ package com.zipcodewilmington.froilansfarm.Farm; +import com.zipcodewilmington.froilansfarm.Crops.Crop; + import java.util.LinkedHashMap; import java.util.Map; public class Field { + private static Field field_instance = null; + CropRow cropRow = new CropRow(); public LinkedHashMap fieldMap; @@ -11,6 +15,12 @@ public Field() { fieldMap = new LinkedHashMap(); } + public static Field getInstance() { + if (field_instance == null) { + field_instance = new Field(); + } + return field_instance; + } public Field(int numOfRows, CropRow row) { fieldMap = new LinkedHashMap(); @@ -28,15 +38,15 @@ public void setFieldMap(LinkedHashMap map){ } public void tillLand(int rowNum, CropRow row) { - if (!fieldMap.containsKey(rowNum)) { - fieldMap.put(rowNum, row); + if (!Field.getInstance().getFieldMap().containsKey(rowNum)) { + Field.getInstance().getFieldMap().put(rowNum, row); } else { System.out.println("You already have crops there!"); } } public int fieldSize() { - return fieldMap.size(); + return Field.getInstance().fieldSize(); } public int harvestRow(int rowNum) { @@ -48,10 +58,17 @@ public int harvestRow(int rowNum) { } public CropRow getCropRow(Integer rowNum) { - return fieldMap.get(rowNum); + return Field.getInstance().fieldMap.get(rowNum); } public LinkedHashMap getFieldMap() { return this.fieldMap; } + + public void plantCrops(int key, CropRow row, Crop crop, int numOfCrop) { + if (Field.getInstance().getFieldMap().containsKey(key)) { + Field.getInstance().fieldMap.get(key).add(crop, numOfCrop); + } + Field.getInstance().fieldMap.put(key, row); + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Persons/Botanist.java b/src/main/java/com/zipcodewilmington/froilansfarm/Persons/Botanist.java index 19f8113a..9a977d69 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Persons/Botanist.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Persons/Botanist.java @@ -4,5 +4,5 @@ import com.zipcodewilmington.froilansfarm.Farm.CropRow; public interface Botanist extends Person { - CropRow plant(Crop crop, CropRow cropRow, int numOfCrop); + void plant(int key, Crop crop, CropRow cropRow, int numOfCrop); } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Persons/Farmer.java b/src/main/java/com/zipcodewilmington/froilansfarm/Persons/Farmer.java index 0a0e3637..30b10878 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Persons/Farmer.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Persons/Farmer.java @@ -16,8 +16,10 @@ import com.zipcodewilmington.froilansfarm.Farm.CropRow; import com.zipcodewilmington.froilansfarm.Rideable; +import java.util.LinkedHashMap; + public class Farmer implements Rider, Botanist, Person { - Field field; + LinkedHashMap fieldMap = Field.getInstance().fieldMap; Moonshine shine = new Moonshine(); @@ -57,11 +59,8 @@ public String dismount(Rideable obj) { return this.name + " gets on the " + obj + "."; } - public CropRow plant(Crop crop, CropRow cropRow, int numOfCrop) { - for (int i = 0; i < numOfCrop; i++) { - cropRow.plantCrops(crop); - } - return cropRow; + public void plant(int key, Crop crop, CropRow cropRow, int numOfCrop) { + Field.getInstance().plantCrops(key, cropRow, crop, numOfCrop); } public boolean drankShine() { diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Routines/RoutineEngine.java b/src/main/java/com/zipcodewilmington/froilansfarm/Routines/RoutineEngine.java index 8bab935c..cb460d22 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Routines/RoutineEngine.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Routines/RoutineEngine.java @@ -2,8 +2,10 @@ import com.zipcodewilmington.froilansfarm.Animals.Chicken; import com.zipcodewilmington.froilansfarm.Animals.Horse; +import com.zipcodewilmington.froilansfarm.Crops.*; import com.zipcodewilmington.froilansfarm.EdiblePackage.*; import com.zipcodewilmington.froilansfarm.Farm.Farm; +import com.zipcodewilmington.froilansfarm.Farm.Field; import com.zipcodewilmington.froilansfarm.Persons.Farmer; import com.zipcodewilmington.froilansfarm.Persons.Pilot; import com.zipcodewilmington.froilansfarm.Vehicles.CropDuster; @@ -22,6 +24,12 @@ public class RoutineEngine{ CropDuster cropDuster = new CropDuster(); Tractor tractor = new Tractor(); Moonshine moonshine = new Moonshine(); + CornStalk cornStalk = new CornStalk(); + BeanStalk beanStalk = new BeanStalk(); + AppleTrees appleTrees = new AppleTrees(); + PumpkinVines pumpkinVines = new PumpkinVines(); + TomatoPlant tomatoPlant = new TomatoPlant(); + Field field = new Field(); public void dailyRoutine() { @@ -96,5 +104,6 @@ public void Saturday () { } public void Sunday () { dailyRoutine(); + froiland.plant(1, cornStalk, field.getCropRow(1), 5); } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Tractor.java b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Tractor.java index 432255c2..bd1ef956 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Tractor.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Tractor.java @@ -11,20 +11,19 @@ import java.util.Map; public class Tractor extends FarmVehicle{ - Field field; + Field field = Field.getInstance(); ProduceStand produceStand; Crop crop = new Crop(); private boolean readyToHarvest = false; - private LinkedHashMap fieldMap = null; public String makeNoise() { return "Clack-Clunk"; } - public void setFieldMap(LinkedHashMap fieldMap){ - this.fieldMap = fieldMap; - } +// public void setFieldMap(LinkedHashMap fieldMap){ +// this.fieldMap = fieldMap; +// } public boolean getReadyToHarvest(){ if(crop.setFertilized()){ @@ -34,14 +33,11 @@ public boolean getReadyToHarvest(){ } public void harvestRow(int rowNum){ - if(this.fieldMap != null) { - CropRow cropRow = fieldMap.get(rowNum); - Integer rowKey = getRowKey(fieldMap, cropRow); - EdiblePlant ePlant = crop.yieldProd(); - field.setFieldMap(fieldMap); - Integer numOfEPlant = field.harvestRow(rowKey); - produceStand.addToStand(ePlant, numOfEPlant); - } + CropRow cropRow = field.fieldMap.get(rowNum); + Integer rowKey = getRowKey(field.fieldMap, cropRow); + EdiblePlant ePlant = crop.yieldProd(); + Integer numOfEPlant = field.harvestRow(rowKey); + produceStand.addToStand(ePlant, numOfEPlant); } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/PersonsTest/FarmerTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/PersonsTest/FarmerTest.java index e57c3cda..8144316d 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/PersonsTest/FarmerTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/PersonsTest/FarmerTest.java @@ -1,9 +1,12 @@ package com.zipcodewilmington.froilansfarm.PersonsTest; import com.zipcodewilmington.froilansfarm.Animals.Horse; +import com.zipcodewilmington.froilansfarm.Crops.AppleTrees; import com.zipcodewilmington.froilansfarm.EdiblePackage.Apple; import com.zipcodewilmington.froilansfarm.EdiblePackage.Egg; import com.zipcodewilmington.froilansfarm.EdiblePackage.Pumpkin; +import com.zipcodewilmington.froilansfarm.Farm.CropRow; +import com.zipcodewilmington.froilansfarm.Farm.Field; import com.zipcodewilmington.froilansfarm.Persons.Farmer; import org.junit.Assert; import org.junit.Test; @@ -131,7 +134,7 @@ public void eatTestEgg() { Farmer testFarmer = new Farmer(); Egg testEgg = new Egg(); // Act - String returned = testFarmer.eat(testEgg); + String returned = testFarmer.eat(testEgg, 2); // Assert Assert.assertEquals(expected, returned); } @@ -143,7 +146,7 @@ public void eatTestApple() { Farmer testFarmer = new Farmer(); Apple testApple = new Apple(); // Act - String returned = testFarmer.eat(testApple); + String returned = testFarmer.eat(testApple, 2); // Assert Assert.assertEquals(expected, returned); } @@ -155,7 +158,7 @@ public void eatTestPumpkin() { Farmer testFarmer = new Farmer(); Pumpkin testPumpkin = new Pumpkin(); // Act - String returned = testFarmer.eat(testPumpkin); + String returned = testFarmer.eat(testPumpkin, 2); // Assert Assert.assertEquals(expected, returned); } @@ -212,6 +215,18 @@ public void dismountTest2() { @Test public void plant() { + Field field = new Field(); + CropRow row = new CropRow(); + Farmer farmer = new Farmer(); + AppleTrees appleTrees = new AppleTrees(); + field.tillLand(1, row); + farmer.plant(1, appleTrees, field.getCropRow(1), 5); + int expected = 5; + System.out.println(Field.getInstance().fieldMap); + + int actual = field.getCropRow(1).cropsPerRow(); + + Assert.assertEquals(expected, actual); } } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/PersonsTest/PilotTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/PersonsTest/PilotTest.java index 929aaa2f..a5dd89aa 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/PersonsTest/PilotTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/PersonsTest/PilotTest.java @@ -38,7 +38,7 @@ public void eatTestEgg() { Pilot testPilot = new Pilot(); Egg testEgg = new Egg(); // Act - String returned = testPilot.eat(testEgg); + String returned = testPilot.eat(testEgg, 2); // Assert Assert.assertEquals(expected, returned); } @@ -50,7 +50,7 @@ public void eatTestApple() { Pilot testPilot = new Pilot(); Apple testApple = new Apple(); // Act - String returned = testPilot.eat(testApple); + String returned = testPilot.eat(testApple,2 ); // Assert Assert.assertEquals(expected, returned); } @@ -62,7 +62,7 @@ public void eatTestPumpkin() { Pilot testPilot = new Pilot(); Pumpkin testPumpkin = new Pumpkin(); // Act - String returned = testPilot.eat(testPumpkin); + String returned = testPilot.eat(testPumpkin, 2); // Assert Assert.assertEquals(expected, returned); } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/TestVehicles/TestTractor.java b/src/test/java/com/zipcodewilmington/froilansfarm/TestVehicles/TestTractor.java index 1fe0efdc..379d93af 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/TestVehicles/TestTractor.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/TestVehicles/TestTractor.java @@ -5,6 +5,7 @@ import com.zipcodewilmington.froilansfarm.Farm.CropRow; import com.zipcodewilmington.froilansfarm.Farm.Field; import com.zipcodewilmington.froilansfarm.Farm.ProduceStand; +import com.zipcodewilmington.froilansfarm.Persons.Farmer; import com.zipcodewilmington.froilansfarm.Vehicles.*; import org.junit.Assert; import org.junit.Test; @@ -41,12 +42,15 @@ public void testMakeNoise(){ @Test public void testHarvestRow() { //Given + Farmer farmer = new Farmer(); Tractor tractor = new Tractor(); ProduceStand produceStand = new ProduceStand(); Apple apple = new Apple(); AppleTrees appleTrees = new AppleTrees(); CropRow row = new CropRow(1, appleTrees); - Field field = new Field(1, row); + Field field = Field.getInstance(); + field.fieldMap.put(1, row); + farmer.plant(1, appleTrees, row, 1); //When From a0a43ec47b5b48bd61448c7a5bdda6346239ee5b Mon Sep 17 00:00:00 2001 From: Greg Donnelly Date: Fri, 26 Mar 2021 16:52:40 -0400 Subject: [PATCH 57/60] ProduceStand is a singleton. MainApplication class built --- .../froilansfarm/Animals/Chicken.java | 7 ++++ .../froilansfarm/Crops/Crop.java | 11 +++--- .../froilansfarm/Farm/ProduceStand.java | 12 +++++- .../froilansfarm/MainApplication.java | 7 ++++ .../froilansfarm/Persons/Farmer.java | 11 +++++- .../froilansfarm/Routines/RoutineEngine.java | 37 +++++++++++++++++-- .../froilansfarm/Vehicles/Aircraft.java | 4 +- .../froilansfarm/Vehicles/CropDuster.java | 15 +++++--- .../froilansfarm/Vehicles/Tractor.java | 2 +- .../TestVehicles/TestCropDuster.java | 20 ++++++++++ 10 files changed, 107 insertions(+), 19 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Animals/Chicken.java b/src/main/java/com/zipcodewilmington/froilansfarm/Animals/Chicken.java index 99e057ea..92e53873 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Animals/Chicken.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Animals/Chicken.java @@ -6,6 +6,8 @@ import com.zipcodewilmington.froilansfarm.EdiblePackage.Egg; import com.zipcodewilmington.froilansfarm.Produce; +import java.util.Random; + public class Chicken extends Animal implements Produce { private Egg egg = new Egg(); @@ -31,4 +33,9 @@ public String eat(Edible obj, int numOfFood) { return "Peck Peck"; } + public int numOfEggs() { + Random randomAmount = new Random(); + return randomAmount.nextInt(5) + 1; + } + } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Crops/Crop.java b/src/main/java/com/zipcodewilmington/froilansfarm/Crops/Crop.java index ea80a032..e256ba5f 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Crops/Crop.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Crops/Crop.java @@ -12,19 +12,20 @@ public class Crop implements Produce { private LinkedHashMap basket; - private boolean isFertilized; + public boolean isFertilized; public Crop() { LinkedHashMap basket = new LinkedHashMap(); } - public void getFertilized(boolean fertilization){ - isFertilized = fertilization; + public boolean getFertilized(){ + return this.isFertilized; } - public boolean setFertilized(){ - return isFertilized; + public void setFertilized(boolean fertilized){ + isFertilized = fertilized; } + public boolean yield(boolean isFertilized){ if(isFertilized){ return true; diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Farm/ProduceStand.java b/src/main/java/com/zipcodewilmington/froilansfarm/Farm/ProduceStand.java index a81d2bae..9b6b87fc 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Farm/ProduceStand.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Farm/ProduceStand.java @@ -1,10 +1,20 @@ package com.zipcodewilmington.froilansfarm.Farm; +import com.zipcodewilmington.froilansfarm.EdiblePackage.Edible; import com.zipcodewilmington.froilansfarm.EdiblePackage.EdiblePlant; import java.util.LinkedHashMap; -public class ProduceStand { +public class ProduceStand { + private static ProduceStand produce_stand = null; + + public static ProduceStand getInstance() { + if (produce_stand == null) { + produce_stand = new ProduceStand(); + } + return produce_stand; + } + LinkedHashMap produceStand; public ProduceStand() { diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/MainApplication.java b/src/main/java/com/zipcodewilmington/froilansfarm/MainApplication.java index 30115fce..06ad6707 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/MainApplication.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/MainApplication.java @@ -1,5 +1,7 @@ package com.zipcodewilmington.froilansfarm; +import com.zipcodewilmington.froilansfarm.Routines.RoutineEngine; + import java.util.ArrayList; import java.util.Comparator; @@ -8,4 +10,9 @@ */ public class MainApplication { + public static void main(String[] args) { + RoutineEngine farmWeek = new RoutineEngine(); + farmWeek.run(); + } + } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Persons/Farmer.java b/src/main/java/com/zipcodewilmington/froilansfarm/Persons/Farmer.java index 30b10878..cf2f5ab3 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Persons/Farmer.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Persons/Farmer.java @@ -10,6 +10,7 @@ import com.zipcodewilmington.froilansfarm.EdiblePackage.Moonshine; import com.zipcodewilmington.froilansfarm.Farm.CropRow; import com.zipcodewilmington.froilansfarm.Farm.Field; +import com.zipcodewilmington.froilansfarm.Farm.ProduceStand; import com.zipcodewilmington.froilansfarm.Rideable; @@ -19,10 +20,10 @@ import java.util.LinkedHashMap; public class Farmer implements Rider, Botanist, Person { + ProduceStand produceStand = ProduceStand.getInstance(); LinkedHashMap fieldMap = Field.getInstance().fieldMap; - Moonshine shine = new Moonshine(); - + Chicken chicken = new Chicken(); public String name; public Farmer() {} @@ -69,6 +70,7 @@ public boolean drankShine() { public boolean isDrunk(boolean drank){ shine.removeGrowler(1); + System.out.println("You're not on mute!"); return true; } @@ -82,4 +84,9 @@ public void feedChicken(Chicken chicken, ChickenFood food) { public String workFarmStand() { return "Fresh Produce 4 Sale"; } + + public void getEggs() { + int eggs = chicken.numOfEggs(); + produceStand.addToStand(chicken.yieldProd(), chicken.numOfEggs()); + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Routines/RoutineEngine.java b/src/main/java/com/zipcodewilmington/froilansfarm/Routines/RoutineEngine.java index cb460d22..485d6530 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Routines/RoutineEngine.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Routines/RoutineEngine.java @@ -4,6 +4,7 @@ import com.zipcodewilmington.froilansfarm.Animals.Horse; import com.zipcodewilmington.froilansfarm.Crops.*; import com.zipcodewilmington.froilansfarm.EdiblePackage.*; +import com.zipcodewilmington.froilansfarm.Farm.ChickenCoop; import com.zipcodewilmington.froilansfarm.Farm.Farm; import com.zipcodewilmington.froilansfarm.Farm.Field; import com.zipcodewilmington.froilansfarm.Persons.Farmer; @@ -29,7 +30,7 @@ public class RoutineEngine{ AppleTrees appleTrees = new AppleTrees(); PumpkinVines pumpkinVines = new PumpkinVines(); TomatoPlant tomatoPlant = new TomatoPlant(); - Field field = new Field(); + Field field = Field.getInstance(); public void dailyRoutine() { @@ -78,7 +79,8 @@ public void dailyRoutine() { public void Monday () { dailyRoutine(); froilanda.mount(cropDuster); - //fertilize field + cropDuster.fly(); + cropDuster.fertilizeField(); froilanda.dismount(cropDuster); } public void Tuesday () { @@ -93,17 +95,46 @@ public void Wednesday () { } public void Thursday () { dailyRoutine(); + for (Chicken chicken : farm.coopOne.getCoop()) { + chicken.numOfEggs(); + } + for (Chicken chicken : farm.coopTwo.getCoop()) { + chicken.numOfEggs(); + } + for (Chicken chicken : farm.coopThree.getCoop()) { + chicken.numOfEggs(); + } + for (Chicken chicken : farm.coopFour.getCoop()) { + chicken.numOfEggs(); + } } public void Friday () { dailyRoutine(); froiland.workFarmStand(); - froiland.isDrunk(froilanda.drankShine()); + froiland.isDrunk(froiland.drankShine()); + froilanda.isDrunk(froilanda.drankShine()); } public void Saturday () { + froiland.isDrunk(froiland.drankShine()); + froilanda.isDrunk(froilanda.drankShine()); dailyRoutine(); } public void Sunday () { dailyRoutine(); froiland.plant(1, cornStalk, field.getCropRow(1), 5); + froiland.plant(2, tomatoPlant, field.getCropRow(2), 5); + froiland.plant(3, beanStalk, field.getCropRow(3), 5); + froiland.plant(4, appleTrees, field.getCropRow(4), 5); + froiland.plant(5, pumpkinVines, field.getCropRow(5), 5); + } + + public void run() { + Sunday(); + Monday(); + Tuesday(); + Wednesday(); + Thursday(); + Friday(); + Saturday(); } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Aircraft.java b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Aircraft.java index 423234e2..6d072e34 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Aircraft.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Aircraft.java @@ -3,8 +3,8 @@ import com.zipcodewilmington.froilansfarm.Persons.Rider; public abstract class Aircraft implements Vehicle { - boolean fly(boolean bool) { - return false; + public String fly() { + return "I am serious... and don't call me Shirley"; } public boolean isMounted(Rider obj) { diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDuster.java b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDuster.java index 10a6054d..26ab5ae9 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDuster.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDuster.java @@ -2,17 +2,22 @@ import com.zipcodewilmington.froilansfarm.Crops.Crop; import com.zipcodewilmington.froilansfarm.Farm.CropRow; -import com.zipcodewilmington.froilansfarm.Persons.Rider; +import com.zipcodewilmington.froilansfarm.Farm.Field; + public class CropDuster extends Aircraft { + Field field = Field.getInstance(); + public String makeNoise() { return "NnNnNn"; } - public void fertilizeRow (/*CropRow row*/){ -// for (Crop crop : CropRow) { -// crop.yield(true); -// } + public void fertilizeField (){ + for (CropRow row : field.fieldMap.values()) { + for (Crop s : row.row) { + s.setFertilized(true); + } + } } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Tractor.java b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Tractor.java index bd1ef956..a37400e8 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Tractor.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Tractor.java @@ -26,7 +26,7 @@ public String makeNoise() { // } public boolean getReadyToHarvest(){ - if(crop.setFertilized()){ + if(crop.isFertilized){ return true; } return false; diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/TestVehicles/TestCropDuster.java b/src/test/java/com/zipcodewilmington/froilansfarm/TestVehicles/TestCropDuster.java index 2d4425b2..f698b825 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/TestVehicles/TestCropDuster.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/TestVehicles/TestCropDuster.java @@ -1,5 +1,8 @@ package com.zipcodewilmington.froilansfarm.TestVehicles; +import com.zipcodewilmington.froilansfarm.Crops.CornStalk; +import com.zipcodewilmington.froilansfarm.Farm.CropRow; +import com.zipcodewilmington.froilansfarm.Farm.Field; import com.zipcodewilmington.froilansfarm.Vehicles.Aircraft; import com.zipcodewilmington.froilansfarm.Vehicles.CropDuster; import com.zipcodewilmington.froilansfarm.Vehicles.Vehicle; @@ -35,4 +38,21 @@ public void testMakeNoise(){ //Assertion Assert.assertEquals(expected,actual); } + + @Test + public void fertilizedCrops() { + //Given + CropDuster duster = new CropDuster(); + CornStalk cornStalk = new CornStalk(); + Field field = Field.getInstance(); + CropRow cropRow = new CropRow(1, cornStalk); + field.fieldMap.put(1, cropRow); + + //When + duster.fertilizeField(); + boolean actual = cornStalk.getFertilized(); + + //Then + Assert.assertTrue(actual); + } } From b103d59f2500acd5e6e4574398293b533dc476b3 Mon Sep 17 00:00:00 2001 From: Greg Donnelly Date: Sat, 27 Mar 2021 10:55:03 -0400 Subject: [PATCH 58/60] Tractor being tested correctly. Just need to fix isMounted for horses --- .../froilansfarm/Farm/ProduceStand.java | 25 +++++++------- .../froilansfarm/Vehicles/Tractor.java | 27 +++++++++++---- .../HousingTest/ProduceStandTest.java | 4 +-- .../TestVehicles/TestTractor.java | 33 ++++++++++--------- 4 files changed, 53 insertions(+), 36 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Farm/ProduceStand.java b/src/main/java/com/zipcodewilmington/froilansfarm/Farm/ProduceStand.java index 9b6b87fc..28cf08fa 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Farm/ProduceStand.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Farm/ProduceStand.java @@ -1,13 +1,19 @@ package com.zipcodewilmington.froilansfarm.Farm; -import com.zipcodewilmington.froilansfarm.EdiblePackage.Edible; -import com.zipcodewilmington.froilansfarm.EdiblePackage.EdiblePlant; +import com.zipcodewilmington.froilansfarm.EdiblePackage.*; import java.util.LinkedHashMap; public class ProduceStand { + private static ProduceStand produce_stand = null; + public LinkedHashMap produceStand; + + private ProduceStand() { + this.produceStand = new LinkedHashMap(); + } + public static ProduceStand getInstance() { if (produce_stand == null) { produce_stand = new ProduceStand(); @@ -15,19 +21,13 @@ public static ProduceStand getInstance() { return produce_stand; } - LinkedHashMap produceStand; - - public ProduceStand() { - this.produceStand = new LinkedHashMap(); - } - public void addToStand(E produce, int quantity){ if (produceStand.containsKey(produce)) { - int inventory = produceStand.get(produce); + Integer inventory = produceStand.get(produce); inventory += quantity; produceStand.put(produce, inventory); } else { - produceStand.put(produce, quantity); + produceStand.put(produce, quantity); } } @@ -37,7 +37,8 @@ public void sellProduce(E produce, int quantity) { produceStand.put(produce, currentStock); } - public int produceInventory(EdiblePlant crop) { - return produceStand.get(crop); + public int produceInventory(E produce) { + return produceStand.get(produce); } + } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Tractor.java b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Tractor.java index a37400e8..f1018a43 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Tractor.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Tractor.java @@ -1,6 +1,7 @@ package com.zipcodewilmington.froilansfarm.Vehicles; import com.zipcodewilmington.froilansfarm.Crops.Crop; +import com.zipcodewilmington.froilansfarm.EdiblePackage.Edible; import com.zipcodewilmington.froilansfarm.EdiblePackage.EdiblePlant; import com.zipcodewilmington.froilansfarm.Farm.CropRow; import com.zipcodewilmington.froilansfarm.Farm.Field; @@ -12,7 +13,7 @@ public class Tractor extends FarmVehicle{ Field field = Field.getInstance(); - ProduceStand produceStand; + ProduceStand produceStand = ProduceStand.getInstance(); Crop crop = new Crop(); private boolean readyToHarvest = false; @@ -32,12 +33,24 @@ public boolean getReadyToHarvest(){ return false; } - public void harvestRow(int rowNum){ - CropRow cropRow = field.fieldMap.get(rowNum); - Integer rowKey = getRowKey(field.fieldMap, cropRow); - EdiblePlant ePlant = crop.yieldProd(); - Integer numOfEPlant = field.harvestRow(rowKey); - produceStand.addToStand(ePlant, numOfEPlant); +// public void harvestRow(int rowNum){ +// CropRow cropRow = field.fieldMap.get(rowNum); +// Integer rowKey = getRowKey(field.fieldMap, cropRow); +// EdiblePlant ePlant = crop.yieldProd(); +// Integer numOfEPlant = field.harvestRow(rowKey); +// produceStand.addToStand(ePlant, numOfEPlant); +// } + + public void harvestField() { + for (CropRow row : field.fieldMap.values()) { + EdiblePlant current = null; + int count = 0; + for (Crop s : row.row) { + current = s.yieldProd(); + count += s.howMuch(); + } + produceStand.addToStand(current, count); + } } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/HousingTest/ProduceStandTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/HousingTest/ProduceStandTest.java index eca44192..7921f4f8 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/HousingTest/ProduceStandTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/HousingTest/ProduceStandTest.java @@ -13,7 +13,7 @@ public class ProduceStandTest { @Test public void addProduce() { //Given - ProduceStand produceStand = new ProduceStand(); + ProduceStand produceStand = ProduceStand.getInstance(); produceStand.addToStand(bean, 7); int expected = 7; @@ -27,7 +27,7 @@ public void addProduce() { @Test public void sellProduce() { //Given - ProduceStand produceStand = new ProduceStand(); + ProduceStand produceStand = ProduceStand.getInstance(); produceStand.addToStand(apple, 12); produceStand.sellProduce(apple, 5); int expected = 7; diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/TestVehicles/TestTractor.java b/src/test/java/com/zipcodewilmington/froilansfarm/TestVehicles/TestTractor.java index 379d93af..fa772128 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/TestVehicles/TestTractor.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/TestVehicles/TestTractor.java @@ -2,19 +2,23 @@ import com.zipcodewilmington.froilansfarm.Crops.AppleTrees; import com.zipcodewilmington.froilansfarm.EdiblePackage.Apple; +import com.zipcodewilmington.froilansfarm.EdiblePackage.Edible; import com.zipcodewilmington.froilansfarm.Farm.CropRow; import com.zipcodewilmington.froilansfarm.Farm.Field; import com.zipcodewilmington.froilansfarm.Farm.ProduceStand; import com.zipcodewilmington.froilansfarm.Persons.Farmer; +import com.zipcodewilmington.froilansfarm.Produce; import com.zipcodewilmington.froilansfarm.Vehicles.*; import org.junit.Assert; import org.junit.Test; +import java.util.LinkedHashMap; + public class TestTractor { @Test public void testInheritanceFarmVehicle(){ //Arrange - Tractor tractor = new Tractor(); + Tractor tractor = new Tractor(); //Assertion Assert.assertTrue(tractor instanceof FarmVehicle); @@ -22,7 +26,7 @@ public void testInheritanceFarmVehicle(){ @Test public void testImplementsVehicle(){ //Arrange - Tractor tractor = new Tractor(); + Tractor tractor = new Tractor(); //Assertion Assert.assertTrue(tractor instanceof Vehicle); @@ -30,7 +34,7 @@ public void testImplementsVehicle(){ @Test public void testMakeNoise(){ //Arrange - Tractor tractor = new Tractor();; + Tractor tractor = new Tractor();; //Action String expected = "NnNnNn"; @@ -42,22 +46,21 @@ public void testMakeNoise(){ @Test public void testHarvestRow() { //Given - Farmer farmer = new Farmer(); - Tractor tractor = new Tractor(); - ProduceStand produceStand = new ProduceStand(); - Apple apple = new Apple(); - AppleTrees appleTrees = new AppleTrees(); - CropRow row = new CropRow(1, appleTrees); Field field = Field.getInstance(); - field.fieldMap.put(1, row); - farmer.plant(1, appleTrees, row, 1); - + CropRow row = new CropRow(); + AppleTrees appleTrees = new AppleTrees(); + field.tillLand(1, row); + row.add(appleTrees, 1); + Tractor tractor = new Tractor(); + int expected = 1; //When - tractor.harvestRow(tractor.getRowKey(field.fieldMap, row)); - int numOfApples = produceStand.produceInventory(apple); + ProduceStand produceStand = ProduceStand.getInstance(); + tractor.harvestField(); + int output = produceStand.produceStand.size(); + //Then - Assert.assertTrue(numOfApples < 11 && numOfApples > 0); + Assert.assertEquals(expected, output); } } From c3f54b3dc4bd1e11c2a47cc7a776fb0aeee0c057 Mon Sep 17 00:00:00 2001 From: Greg Donnelly Date: Sat, 27 Mar 2021 12:12:24 -0400 Subject: [PATCH 59/60] only horse mounted needs to be adjusted. Field is fixed. Tractor is fixed. --- .../froilansfarm/Animals/Horse.java | 5 ++- .../froilansfarm/Farm/Field.java | 10 ++--- .../froilansfarm/Persons/Farmer.java | 11 +++-- .../froilansfarm/Routines/RoutineEngine.java | 40 ++++++++++++------- .../froilansfarm/Vehicles/Tractor.java | 10 +++++ .../froilansfarm/PersonsTest/FarmerTest.java | 15 +++++++ 6 files changed, 64 insertions(+), 27 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Animals/Horse.java b/src/main/java/com/zipcodewilmington/froilansfarm/Animals/Horse.java index ed49c042..bb6f8bfb 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Animals/Horse.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Animals/Horse.java @@ -1,10 +1,12 @@ package com.zipcodewilmington.froilansfarm.Animals; import com.zipcodewilmington.froilansfarm.EdiblePackage.Edible; +import com.zipcodewilmington.froilansfarm.Persons.Farmer; import com.zipcodewilmington.froilansfarm.Persons.Rider; import com.zipcodewilmington.froilansfarm.Rideable; public class Horse extends Animal implements Rideable { + Farmer farmer = new Farmer(); public String eat(Edible obj, int numOfFood) { System.out.println("munch munch munch"); @@ -18,7 +20,8 @@ public String makeNoise() { public boolean isMounted(Rider riderObj) { String mounted = riderObj.mount(this); - if (mounted.equals(riderObj + " gets on the " + this + ".")) return true; + if (farmer.mounted) { return true; + } return false; } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Farm/Field.java b/src/main/java/com/zipcodewilmington/froilansfarm/Farm/Field.java index f6dc9036..0a8b9242 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Farm/Field.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Farm/Field.java @@ -24,9 +24,9 @@ public static Field getInstance() { public Field(int numOfRows, CropRow row) { fieldMap = new LinkedHashMap(); - for (int i = 1; i <= numOfRows; i++) { - tillLand(i, row); - } +// for (int i = 1; i <= numOfRows; i++) { +// tillLand(i, row); +// } } public LinkedHashMap getHashMap(){ @@ -66,9 +66,7 @@ public LinkedHashMap getFieldMap() { } public void plantCrops(int key, CropRow row, Crop crop, int numOfCrop) { - if (Field.getInstance().getFieldMap().containsKey(key)) { - Field.getInstance().fieldMap.get(key).add(crop, numOfCrop); - } Field.getInstance().fieldMap.put(key, row); + Field.getInstance().fieldMap.get(key).row.add(numOfCrop); } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Persons/Farmer.java b/src/main/java/com/zipcodewilmington/froilansfarm/Persons/Farmer.java index cf2f5ab3..bf3b9de1 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Persons/Farmer.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Persons/Farmer.java @@ -1,6 +1,5 @@ package com.zipcodewilmington.froilansfarm.Persons; -import com.zipcodewilmington.froilansfarm.Animals.Animal; import com.zipcodewilmington.froilansfarm.Animals.Chicken; import com.zipcodewilmington.froilansfarm.Animals.Horse; import com.zipcodewilmington.froilansfarm.Crops.Crop; @@ -14,9 +13,6 @@ import com.zipcodewilmington.froilansfarm.Rideable; -import com.zipcodewilmington.froilansfarm.Farm.CropRow; -import com.zipcodewilmington.froilansfarm.Rideable; - import java.util.LinkedHashMap; public class Farmer implements Rider, Botanist, Person { @@ -25,6 +21,7 @@ public class Farmer implements Rider, Botanist, Person { Moonshine shine = new Moonshine(); Chicken chicken = new Chicken(); public String name; + public boolean mounted = false; public Farmer() {} @@ -52,11 +49,13 @@ public String makeNoise() { public String mount(Rideable rideableObj) { System.out.println(this.name + " gets on the " + rideableObj + "."); + mounted = true; return this.name + " gets on the " + rideableObj + "."; } public String dismount(Rideable obj) { System.out.println(this.name + " gets off the " + obj + "."); + mounted = false; return this.name + " gets on the " + obj + "."; } @@ -81,8 +80,8 @@ public void feedChicken(Chicken chicken, ChickenFood food) { chicken.eat(food); } - public String workFarmStand() { - return "Fresh Produce 4 Sale"; + public void workFarmStand() { + System.out.println("Fresh Produce 4 Sale"); } public void getEggs() { diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Routines/RoutineEngine.java b/src/main/java/com/zipcodewilmington/froilansfarm/Routines/RoutineEngine.java index 485d6530..45c1585d 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Routines/RoutineEngine.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Routines/RoutineEngine.java @@ -4,9 +4,7 @@ import com.zipcodewilmington.froilansfarm.Animals.Horse; import com.zipcodewilmington.froilansfarm.Crops.*; import com.zipcodewilmington.froilansfarm.EdiblePackage.*; -import com.zipcodewilmington.froilansfarm.Farm.ChickenCoop; -import com.zipcodewilmington.froilansfarm.Farm.Farm; -import com.zipcodewilmington.froilansfarm.Farm.Field; +import com.zipcodewilmington.froilansfarm.Farm.*; import com.zipcodewilmington.froilansfarm.Persons.Farmer; import com.zipcodewilmington.froilansfarm.Persons.Pilot; import com.zipcodewilmington.froilansfarm.Vehicles.CropDuster; @@ -30,7 +28,9 @@ public class RoutineEngine{ AppleTrees appleTrees = new AppleTrees(); PumpkinVines pumpkinVines = new PumpkinVines(); TomatoPlant tomatoPlant = new TomatoPlant(); - Field field = Field.getInstance(); + Field oldField = new Field(); + Field field = oldField.getInstance(); + ProduceStand produceStand = ProduceStand.getInstance(); public void dailyRoutine() { @@ -86,7 +86,8 @@ public void Monday () { public void Tuesday () { dailyRoutine(); froiland.mount(tractor); - //Harvests each row + tractor.harvestField(); + System.out.println(produceStand.produceStand); froiland.dismount(tractor); } public void Wednesday () { @@ -96,20 +97,21 @@ public void Wednesday () { public void Thursday () { dailyRoutine(); for (Chicken chicken : farm.coopOne.getCoop()) { - chicken.numOfEggs(); + froiland.getEggs(); } for (Chicken chicken : farm.coopTwo.getCoop()) { - chicken.numOfEggs(); + froiland.getEggs(); } for (Chicken chicken : farm.coopThree.getCoop()) { - chicken.numOfEggs(); + froiland.getEggs(); } for (Chicken chicken : farm.coopFour.getCoop()) { - chicken.numOfEggs(); + froiland.getEggs(); } } public void Friday () { dailyRoutine(); + System.out.println(produceStand.produceStand); froiland.workFarmStand(); froiland.isDrunk(froiland.drankShine()); froilanda.isDrunk(froilanda.drankShine()); @@ -121,11 +123,21 @@ public void Saturday () { } public void Sunday () { dailyRoutine(); - froiland.plant(1, cornStalk, field.getCropRow(1), 5); - froiland.plant(2, tomatoPlant, field.getCropRow(2), 5); - froiland.plant(3, beanStalk, field.getCropRow(3), 5); - froiland.plant(4, appleTrees, field.getCropRow(4), 5); - froiland.plant(5, pumpkinVines, field.getCropRow(5), 5); + CropRow cropRow = new CropRow(); + field.getInstance().tillLand(1, cropRow); + cropRow.add(appleTrees, 5); + CropRow cropRowTwo = new CropRow(); + field.getInstance().tillLand(2, cropRowTwo); + cropRowTwo.add(cornStalk, 5); + CropRow cropRowThree = new CropRow(); + field.getInstance().tillLand(3, cropRowThree); + cropRowThree.add(beanStalk, 5); + CropRow cropRowFour = new CropRow(); + field.getInstance().tillLand(4, cropRowFour); + cropRowFour.add(tomatoPlant, 5); + CropRow cropRowFive = new CropRow(); + field.getInstance().tillLand(5, cropRowFive); + cropRowFive.add(pumpkinVines, 5); } public void run() { diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Tractor.java b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Tractor.java index f1018a43..76698053 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Tractor.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Tractor.java @@ -50,10 +50,20 @@ public void harvestField() { count += s.howMuch(); } produceStand.addToStand(current, count); +// for (int i = 0; i < field.fieldMap.size(); i++) { +// CropRow row = field.getCropRow(i); +// int count = 0; +// Edible veg = null; +// for (int j = 0; j < row.cropsPerRow(); j++) { +// count += row.row.get(j).howMuch(); +// veg = row.row.get(j).yieldProd(); +// } +// produceStand.addToStand(veg, count); } } + public Integer getRowKey(Map map, CropRow value) { Integer rowKey = null; for (Map.Entry entry : map.entrySet()) { diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/PersonsTest/FarmerTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/PersonsTest/FarmerTest.java index 8144316d..33cdc338 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/PersonsTest/FarmerTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/PersonsTest/FarmerTest.java @@ -7,6 +7,7 @@ import com.zipcodewilmington.froilansfarm.EdiblePackage.Pumpkin; import com.zipcodewilmington.froilansfarm.Farm.CropRow; import com.zipcodewilmington.froilansfarm.Farm.Field; +import com.zipcodewilmington.froilansfarm.Farm.ProduceStand; import com.zipcodewilmington.froilansfarm.Persons.Farmer; import org.junit.Assert; import org.junit.Test; @@ -229,4 +230,18 @@ public void plant() { Assert.assertEquals(expected, actual); } + @Test + public void getEggsTest() { + //Given + ProduceStand produceStand = ProduceStand.getInstance(); + Farmer farmer = new Farmer(); + int expected = 1; + + //When + farmer.getEggs(); + int actual = produceStand.produceStand.size(); + + //Then + Assert.assertEquals(expected, actual); + } } From 20d5f0c58c7a152d683c28f745e6a76b0df654eb Mon Sep 17 00:00:00 2001 From: Greg Donnelly Date: Sat, 27 Mar 2021 21:09:00 -0400 Subject: [PATCH 60/60] produceStand prints not the hashcode --- .../com/zipcodewilmington/froilansfarm/Crops/Crop.java | 1 + .../froilansfarm/EdiblePackage/Apple.java | 5 +++++ .../froilansfarm/EdiblePackage/EarCorn.java | 4 ++++ .../froilansfarm/EdiblePackage/Edible.java | 2 ++ .../froilansfarm/EdiblePackage/Egg.java | 4 ++++ .../froilansfarm/EdiblePackage/Pumpkin.java | 4 ++++ .../froilansfarm/EdiblePackage/SoyBean.java | 4 ++++ .../froilansfarm/EdiblePackage/Tomato.java | 4 ++++ .../froilansfarm/Farm/ProduceStand.java | 10 ++++++++++ .../froilansfarm/Routines/RoutineEngine.java | 5 +++-- 10 files changed, 41 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Crops/Crop.java b/src/main/java/com/zipcodewilmington/froilansfarm/Crops/Crop.java index e256ba5f..108db3ee 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Crops/Crop.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Crops/Crop.java @@ -40,4 +40,5 @@ public int howMuch(){ public E yieldProd() { return null; } + } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/Apple.java b/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/Apple.java index 5e73eb12..d4ee6b24 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/Apple.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/Apple.java @@ -1,6 +1,7 @@ package com.zipcodewilmington.froilansfarm.EdiblePackage; public class Apple implements HorseFood{ + public boolean hasBeenFertilized() { return false; } @@ -8,4 +9,8 @@ public boolean hasBeenFertilized() { public boolean hasBeenHarvested() { return false; } + + public String getKeyStr() { + return "Apple"; + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/EarCorn.java b/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/EarCorn.java index a5b20333..5fb48bf8 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/EarCorn.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/EarCorn.java @@ -8,4 +8,8 @@ public boolean hasBeenFertilized() { public boolean hasBeenHarvested() { return false; } + + public String getKeyStr() { + return "EarCorn"; + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/Edible.java b/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/Edible.java index 4f2f8a7f..fe57c3a3 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/Edible.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/Edible.java @@ -3,4 +3,6 @@ public interface Edible { boolean hasBeenFertilized(); + + String getKeyStr(); } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/Egg.java b/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/Egg.java index 7422a6de..928b3a81 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/Egg.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/Egg.java @@ -4,4 +4,8 @@ public class Egg implements Edible{ public boolean hasBeenFertilized() { return false; } + + public String getKeyStr() { + return "Eggs"; + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/Pumpkin.java b/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/Pumpkin.java index 618fbf88..29e930ad 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/Pumpkin.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/Pumpkin.java @@ -8,4 +8,8 @@ public boolean hasBeenFertilized() { public boolean hasBeenHarvested() { return false; } + + public String getKeyStr() { + return "Pumpkin"; + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/SoyBean.java b/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/SoyBean.java index 40bcf427..bb3cc3e2 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/SoyBean.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/SoyBean.java @@ -14,4 +14,8 @@ public boolean hasBeenHarvested() { public void setNumOfSoyBeans(int num) { numOfSoyBeans = num; } + + public String getKeyStr() { + return "Soy Bean"; + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/Tomato.java b/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/Tomato.java index 6339495f..9d6e9e98 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/Tomato.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/EdiblePackage/Tomato.java @@ -8,4 +8,8 @@ public boolean hasBeenFertilized() { public boolean hasBeenHarvested() { return false; } + + public String getKeyStr() { + return "Tomato"; + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Farm/ProduceStand.java b/src/main/java/com/zipcodewilmington/froilansfarm/Farm/ProduceStand.java index 28cf08fa..f355973b 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Farm/ProduceStand.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Farm/ProduceStand.java @@ -1,7 +1,10 @@ package com.zipcodewilmington.froilansfarm.Farm; +import com.zipcodewilmington.froilansfarm.Crops.Crop; import com.zipcodewilmington.froilansfarm.EdiblePackage.*; +import java.security.Key; +import java.util.Arrays; import java.util.LinkedHashMap; public class ProduceStand { @@ -41,4 +44,11 @@ public int produceInventory(E produce) { return produceStand.get(produce); } + public void printMap() { + for (E key : produceStand.keySet()){ + String amount = produceStand.get(key).toString(); + System.out.println(key.getKeyStr() + " " + amount); + } + } + } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Routines/RoutineEngine.java b/src/main/java/com/zipcodewilmington/froilansfarm/Routines/RoutineEngine.java index 45c1585d..d94f50d6 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Routines/RoutineEngine.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Routines/RoutineEngine.java @@ -87,7 +87,7 @@ public void Tuesday () { dailyRoutine(); froiland.mount(tractor); tractor.harvestField(); - System.out.println(produceStand.produceStand); + produceStand.printMap(); froiland.dismount(tractor); } public void Wednesday () { @@ -111,7 +111,8 @@ public void Thursday () { } public void Friday () { dailyRoutine(); - System.out.println(produceStand.produceStand); + // System.out.println(produceStand.produceStand); + produceStand.printMap(); froiland.workFarmStand(); froiland.isDrunk(froiland.drankShine()); froilanda.isDrunk(froilanda.drankShine());