From 5e9a0b4abcf65fca68ea7747e6d5f4c5852843db Mon Sep 17 00:00:00 2001 From: Nathan Date: Tue, 20 Jul 2021 19:32:05 -0400 Subject: [PATCH 001/100] made eater and noiseMaker interfaces --- src/main/java/com/zipcodewilmington/froilansfarm/Eater.java | 5 +++++ .../java/com/zipcodewilmington/froilansfarm/NoiseMaker.java | 5 +++++ 2 files changed, 10 insertions(+) create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Eater.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/NoiseMaker.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..e53f3721 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Eater.java @@ -0,0 +1,5 @@ +package com.zipcodewilmington.froilansfarm; + +public interface Eater { + void eat(Edible edible); +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/NoiseMaker.java b/src/main/java/com/zipcodewilmington/froilansfarm/NoiseMaker.java new file mode 100644 index 00000000..ba1f1e20 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/NoiseMaker.java @@ -0,0 +1,5 @@ +package com.zipcodewilmington.froilansfarm; + +public interface NoiseMaker { + String makeNoise(); +} From 2af5afe45180b832d23cb8e52a80ace2a03742fd Mon Sep 17 00:00:00 2001 From: Jeremy Date: Tue, 20 Jul 2021 19:35:27 -0400 Subject: [PATCH 002/100] Added 2 classes --- src/main/java/com/zipcodewilmington/froilansfarm/EarCorn.java | 4 ++++ src/main/java/com/zipcodewilmington/froilansfarm/Egg.java | 4 ++++ 2 files changed, 8 insertions(+) create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/EarCorn.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Egg.java diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/EarCorn.java b/src/main/java/com/zipcodewilmington/froilansfarm/EarCorn.java new file mode 100644 index 00000000..e17c36a1 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/EarCorn.java @@ -0,0 +1,4 @@ +package com.zipcodewilmington.froilansfarm; + +public class EarCorn { +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Egg.java b/src/main/java/com/zipcodewilmington/froilansfarm/Egg.java new file mode 100644 index 00000000..66327890 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Egg.java @@ -0,0 +1,4 @@ +package com.zipcodewilmington.froilansfarm; + +public class Egg { +} From ec719f288e728d1a037d6dc240a4d502d2b17f9a Mon Sep 17 00:00:00 2001 From: Nathan Date: Tue, 20 Jul 2021 19:45:27 -0400 Subject: [PATCH 003/100] ridable interface --- .../java/com/zipcodewilmington/froilansfarm/Ridable.java | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Ridable.java diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Ridable.java b/src/main/java/com/zipcodewilmington/froilansfarm/Ridable.java new file mode 100644 index 00000000..3a8a0975 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Ridable.java @@ -0,0 +1,5 @@ +package com.zipcodewilmington.froilansfarm; + +public interface Ridable { + void ride(); +} From db85b171e621357a7db31481b06cfa15d44f2a5d Mon Sep 17 00:00:00 2001 From: jgiroso Date: Tue, 20 Jul 2021 19:46:16 -0400 Subject: [PATCH 004/100] added classes for shelter and Person and animal types --- .../com/zipcodewilmington/froilansfarm/Chicken.java | 4 ++++ .../zipcodewilmington/froilansfarm/ChickenCoop.java | 5 +++++ .../com/zipcodewilmington/froilansfarm/FarmHouse.java | 6 ++++++ .../java/com/zipcodewilmington/froilansfarm/Horse.java | 4 ++++ .../com/zipcodewilmington/froilansfarm/Person.java | 4 ++++ .../com/zipcodewilmington/froilansfarm/Shelter.java | 10 ++++++++++ .../com/zipcodewilmington/froilansfarm/Stable.java | 5 +++++ 7 files changed, 38 insertions(+) create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Chicken.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/ChickenCoop.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/FarmHouse.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Horse.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Person.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Shelter.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Stable.java diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Chicken.java b/src/main/java/com/zipcodewilmington/froilansfarm/Chicken.java new file mode 100644 index 00000000..0b7f8fb3 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Chicken.java @@ -0,0 +1,4 @@ +package com.zipcodewilmington.froilansfarm; + +public class Chicken { +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/ChickenCoop.java b/src/main/java/com/zipcodewilmington/froilansfarm/ChickenCoop.java new file mode 100644 index 00000000..9ff08721 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/ChickenCoop.java @@ -0,0 +1,5 @@ +package com.zipcodewilmington.froilansfarm; + +public class ChickenCoop implements Shelter { + +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/FarmHouse.java b/src/main/java/com/zipcodewilmington/froilansfarm/FarmHouse.java new file mode 100644 index 00000000..7b5dba6f --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/FarmHouse.java @@ -0,0 +1,6 @@ +package com.zipcodewilmington.froilansfarm; + +public class FarmHouse implements Shelter { + + +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Horse.java b/src/main/java/com/zipcodewilmington/froilansfarm/Horse.java new file mode 100644 index 00000000..54daa76b --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Horse.java @@ -0,0 +1,4 @@ +package com.zipcodewilmington.froilansfarm; + +public class Horse { +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Person.java b/src/main/java/com/zipcodewilmington/froilansfarm/Person.java new file mode 100644 index 00000000..2a5328ba --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Person.java @@ -0,0 +1,4 @@ +package com.zipcodewilmington.froilansfarm; + +public class Person { +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Shelter.java b/src/main/java/com/zipcodewilmington/froilansfarm/Shelter.java new file mode 100644 index 00000000..1891a109 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Shelter.java @@ -0,0 +1,10 @@ +package com.zipcodewilmington.froilansfarm; + +public interface Shelter { + + void add(ShelterableType thingToBeStored); + + ShelterableType getTypeByName(String name); + + void remove(ShelterableType thingToBeStored); +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Stable.java b/src/main/java/com/zipcodewilmington/froilansfarm/Stable.java new file mode 100644 index 00000000..f16af69d --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Stable.java @@ -0,0 +1,5 @@ +package com.zipcodewilmington.froilansfarm; + +public class Stable implements Shelter { + +} From ddd449e62d557b849b445a4d00b42275c371f4f5 Mon Sep 17 00:00:00 2001 From: Jeremy Date: Tue, 20 Jul 2021 19:49:26 -0400 Subject: [PATCH 005/100] Added all food classes --- .../java/com/zipcodewilmington/froilansfarm/CornStalk.java | 5 +++++ src/main/java/com/zipcodewilmington/froilansfarm/Crop.java | 5 +++++ .../java/com/zipcodewilmington/froilansfarm/CropRow.java | 5 +++++ src/main/java/com/zipcodewilmington/froilansfarm/Edible.java | 5 +++++ src/main/java/com/zipcodewilmington/froilansfarm/Egg.java | 1 + src/main/java/com/zipcodewilmington/froilansfarm/Field.java | 5 +++++ .../java/com/zipcodewilmington/froilansfarm/Produce.java | 5 +++++ src/main/java/com/zipcodewilmington/froilansfarm/Tomato.java | 5 +++++ .../java/com/zipcodewilmington/froilansfarm/TomatoPlant.java | 5 +++++ 9 files changed, 41 insertions(+) create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/CornStalk.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Crop.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/CropRow.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Edible.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Field.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Produce.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Tomato.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/TomatoPlant.java diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/CornStalk.java b/src/main/java/com/zipcodewilmington/froilansfarm/CornStalk.java new file mode 100644 index 00000000..68598bf6 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/CornStalk.java @@ -0,0 +1,5 @@ +package com.zipcodewilmington.froilansfarm; + +public class CornStalk { + +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Crop.java b/src/main/java/com/zipcodewilmington/froilansfarm/Crop.java new file mode 100644 index 00000000..f87820d8 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Crop.java @@ -0,0 +1,5 @@ +package com.zipcodewilmington.froilansfarm; + +public class Crop { + +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/CropRow.java b/src/main/java/com/zipcodewilmington/froilansfarm/CropRow.java new file mode 100644 index 00000000..a6a48999 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/CropRow.java @@ -0,0 +1,5 @@ +package com.zipcodewilmington.froilansfarm; + +public class CropRow { + +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Edible.java b/src/main/java/com/zipcodewilmington/froilansfarm/Edible.java new file mode 100644 index 00000000..1de95c08 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Edible.java @@ -0,0 +1,5 @@ +package com.zipcodewilmington.froilansfarm; + +public class Edible { + +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Egg.java b/src/main/java/com/zipcodewilmington/froilansfarm/Egg.java index 66327890..116d2492 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Egg.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Egg.java @@ -1,4 +1,5 @@ package com.zipcodewilmington.froilansfarm; public class Egg { + boolean isFertlized = false; } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Field.java b/src/main/java/com/zipcodewilmington/froilansfarm/Field.java new file mode 100644 index 00000000..6358c3d8 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Field.java @@ -0,0 +1,5 @@ +package com.zipcodewilmington.froilansfarm; + +public class Field { + +} 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..0469a4fc --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Produce.java @@ -0,0 +1,5 @@ +package com.zipcodewilmington.froilansfarm; + +public class Produce { + +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Tomato.java b/src/main/java/com/zipcodewilmington/froilansfarm/Tomato.java new file mode 100644 index 00000000..dac91659 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Tomato.java @@ -0,0 +1,5 @@ +package com.zipcodewilmington.froilansfarm; + +public class Tomato { + +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/TomatoPlant.java b/src/main/java/com/zipcodewilmington/froilansfarm/TomatoPlant.java new file mode 100644 index 00000000..cd9ff984 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/TomatoPlant.java @@ -0,0 +1,5 @@ +package com.zipcodewilmington.froilansfarm; + +public class TomatoPlant { + +} From 8e7d56b1104ca113242b1fb648ad8919b404ddf1 Mon Sep 17 00:00:00 2001 From: Nathan Date: Tue, 20 Jul 2021 19:53:33 -0400 Subject: [PATCH 006/100] edible interface --- .../com/zipcodewilmington/froilansfarm/Animal.java | 12 ++++++++++++ .../com/zipcodewilmington/froilansfarm/Edible.java | 4 ++++ 2 files changed, 16 insertions(+) create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Animal.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Edible.java diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Animal.java b/src/main/java/com/zipcodewilmington/froilansfarm/Animal.java new file mode 100644 index 00000000..c37e6b85 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Animal.java @@ -0,0 +1,12 @@ +package com.zipcodewilmington.froilansfarm; + +public class Animal implements Eater, NoiseMaker { + + public void eat(Object o) { + + } + + public String makeNoise() { + return null; + } +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Edible.java b/src/main/java/com/zipcodewilmington/froilansfarm/Edible.java new file mode 100644 index 00000000..eef2b3d9 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Edible.java @@ -0,0 +1,4 @@ +package com.zipcodewilmington.froilansfarm; + +public interface Edible { +} From cb74c343925766ed5eac096c71392b41bd5ba00d Mon Sep 17 00:00:00 2001 From: Zach Date: Tue, 20 Jul 2021 19:58:03 -0400 Subject: [PATCH 007/100] Added vehicle classes and interfaces --- src/main/java/Vehicles/Aircraft.java | 4 ++++ src/main/java/Vehicles/CropDuster.java | 4 ++++ src/main/java/Vehicles/FarmVehicle.java | 4 ++++ src/main/java/Vehicles/Tractor.java | 4 ++++ src/main/java/Vehicles/Vehicle.java | 4 ++++ 5 files changed, 20 insertions(+) create mode 100644 src/main/java/Vehicles/Aircraft.java create mode 100644 src/main/java/Vehicles/CropDuster.java create mode 100644 src/main/java/Vehicles/FarmVehicle.java create mode 100644 src/main/java/Vehicles/Tractor.java create mode 100644 src/main/java/Vehicles/Vehicle.java diff --git a/src/main/java/Vehicles/Aircraft.java b/src/main/java/Vehicles/Aircraft.java new file mode 100644 index 00000000..a492fc9c --- /dev/null +++ b/src/main/java/Vehicles/Aircraft.java @@ -0,0 +1,4 @@ +package Vehicles; + +public class Aircraft implements FarmVehicle, Vehicle{ +} diff --git a/src/main/java/Vehicles/CropDuster.java b/src/main/java/Vehicles/CropDuster.java new file mode 100644 index 00000000..85bd806e --- /dev/null +++ b/src/main/java/Vehicles/CropDuster.java @@ -0,0 +1,4 @@ +package Vehicles; + +public class CropDuster extends Aircraft{ +} diff --git a/src/main/java/Vehicles/FarmVehicle.java b/src/main/java/Vehicles/FarmVehicle.java new file mode 100644 index 00000000..fa548b68 --- /dev/null +++ b/src/main/java/Vehicles/FarmVehicle.java @@ -0,0 +1,4 @@ +package Vehicles; + +public interface FarmVehicle { +} diff --git a/src/main/java/Vehicles/Tractor.java b/src/main/java/Vehicles/Tractor.java new file mode 100644 index 00000000..091fbec8 --- /dev/null +++ b/src/main/java/Vehicles/Tractor.java @@ -0,0 +1,4 @@ +package Vehicles; + +public class Tractor implements Vehicle, FarmVehicle{ +} diff --git a/src/main/java/Vehicles/Vehicle.java b/src/main/java/Vehicles/Vehicle.java new file mode 100644 index 00000000..780a7e69 --- /dev/null +++ b/src/main/java/Vehicles/Vehicle.java @@ -0,0 +1,4 @@ +package Vehicles; + +public interface Vehicle { +} From 2bda368111f5971e0d1cd62f425dd5188dba6c66 Mon Sep 17 00:00:00 2001 From: jgiroso Date: Tue, 20 Jul 2021 20:00:27 -0400 Subject: [PATCH 008/100] added methods to shelter classes --- .../froilansfarm/ChickenCoop.java | 17 +++++++++++++++++ .../froilansfarm/FarmHouse.java | 16 ++++++++++++++++ .../zipcodewilmington/froilansfarm/Stable.java | 17 +++++++++++++++++ 3 files changed, 50 insertions(+) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/ChickenCoop.java b/src/main/java/com/zipcodewilmington/froilansfarm/ChickenCoop.java index 9ff08721..1aa85a7c 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/ChickenCoop.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/ChickenCoop.java @@ -1,5 +1,22 @@ package com.zipcodewilmington.froilansfarm; +import java.util.ArrayList; +import java.util.List; + public class ChickenCoop implements Shelter { + List chickenList = new ArrayList(); + Chicken chicken; + + public void add(Chicken thingToBeStored) { + chickenList.add(thingToBeStored); + } + + public Chicken getTypeByName(String name) { + return chicken.getName(); + } + + public void remove(Chicken thingToBeStored) { + chickenList.remove(thingToBeStored); + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/FarmHouse.java b/src/main/java/com/zipcodewilmington/froilansfarm/FarmHouse.java index 7b5dba6f..e90fc65e 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/FarmHouse.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/FarmHouse.java @@ -1,6 +1,22 @@ package com.zipcodewilmington.froilansfarm; +import java.util.ArrayList; +import java.util.List; + public class FarmHouse implements Shelter { + List personList = new ArrayList(); + Person person; + + public void add(Person thingToBeStored) { + personList.add(thingToBeStored); + } + + public Person getTypeByName(String name) { + return person.getName(); + } + public void remove(Person thingToBeStored) { + personList.remove(thingToBeStored); + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Stable.java b/src/main/java/com/zipcodewilmington/froilansfarm/Stable.java index f16af69d..fddf0646 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Stable.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Stable.java @@ -1,5 +1,22 @@ package com.zipcodewilmington.froilansfarm; +import java.util.ArrayList; +import java.util.List; + public class Stable implements Shelter { + List horseList = new ArrayList(); + Horse horse; + + public void add(Horse thingToBeStored) { + horseList.add(thingToBeStored); + } + + public Horse getTypeByName(String name) { + return horse.getName(); + } + + public void remove(Horse thingToBeStored) { + horseList.remove(thingToBeStored); + } } From 87d877f263b87f584e80d33443514da88656ffba Mon Sep 17 00:00:00 2001 From: jgiroso Date: Tue, 20 Jul 2021 20:05:05 -0400 Subject: [PATCH 009/100] edited shelter variables --- .../com/zipcodewilmington/froilansfarm/ChickenCoop.java | 8 ++++---- .../com/zipcodewilmington/froilansfarm/FarmHouse.java | 8 ++++---- .../java/com/zipcodewilmington/froilansfarm/Stable.java | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/ChickenCoop.java b/src/main/java/com/zipcodewilmington/froilansfarm/ChickenCoop.java index 1aa85a7c..9b91b301 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/ChickenCoop.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/ChickenCoop.java @@ -8,15 +8,15 @@ public class ChickenCoop implements Shelter { List chickenList = new ArrayList(); Chicken chicken; - public void add(Chicken thingToBeStored) { - chickenList.add(thingToBeStored); + public void add(Chicken chicken) { + chickenList.add(chicken); } public Chicken getTypeByName(String name) { return chicken.getName(); } - public void remove(Chicken thingToBeStored) { - chickenList.remove(thingToBeStored); + public void remove(Chicken chicken) { + chickenList.remove(chicken); } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/FarmHouse.java b/src/main/java/com/zipcodewilmington/froilansfarm/FarmHouse.java index e90fc65e..8bb6b422 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/FarmHouse.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/FarmHouse.java @@ -8,15 +8,15 @@ public class FarmHouse implements Shelter { List personList = new ArrayList(); Person person; - public void add(Person thingToBeStored) { - personList.add(thingToBeStored); + public void add(Person person) { + personList.add(person); } public Person getTypeByName(String name) { return person.getName(); } - public void remove(Person thingToBeStored) { - personList.remove(thingToBeStored); + public void remove(Person person) { + personList.remove(person); } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Stable.java b/src/main/java/com/zipcodewilmington/froilansfarm/Stable.java index fddf0646..6a84efbb 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Stable.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Stable.java @@ -8,15 +8,15 @@ public class Stable implements Shelter { List horseList = new ArrayList(); Horse horse; - public void add(Horse thingToBeStored) { - horseList.add(thingToBeStored); + public void add(Horse horse) { + horseList.add(horse); } public Horse getTypeByName(String name) { return horse.getName(); } - public void remove(Horse thingToBeStored) { - horseList.remove(thingToBeStored); + public void remove(Horse horse) { + horseList.remove(horse); } } From 80202b0242bdc5973af03c8138eb2e578f4bb5e7 Mon Sep 17 00:00:00 2001 From: Zach Date: Tue, 20 Jul 2021 20:10:14 -0400 Subject: [PATCH 010/100] Updated vehicle intefaces --- src/main/java/Vehicles/Aircraft.java | 11 ++++++++++- src/main/java/Vehicles/CropDuster.java | 5 ++++- src/main/java/Vehicles/FarmVehicle.java | 6 +++++- src/main/java/Vehicles/Tractor.java | 19 ++++++++++++++++++- src/main/java/Vehicles/Vehicle.java | 5 ++++- 5 files changed, 41 insertions(+), 5 deletions(-) diff --git a/src/main/java/Vehicles/Aircraft.java b/src/main/java/Vehicles/Aircraft.java index a492fc9c..f38798bf 100644 --- a/src/main/java/Vehicles/Aircraft.java +++ b/src/main/java/Vehicles/Aircraft.java @@ -1,4 +1,13 @@ package Vehicles; -public class Aircraft implements FarmVehicle, Vehicle{ +public class Aircraft implements Vehicle{ + void fly(){} + + public String makeNoise() { + return "Bzzzzeewwwwwwwwwww Rat-tat-tat-tat-tat"; + } + + public void ride() { + + } } diff --git a/src/main/java/Vehicles/CropDuster.java b/src/main/java/Vehicles/CropDuster.java index 85bd806e..280eded6 100644 --- a/src/main/java/Vehicles/CropDuster.java +++ b/src/main/java/Vehicles/CropDuster.java @@ -1,4 +1,7 @@ package Vehicles; -public class CropDuster extends Aircraft{ +import com.zipcodewilmington.froilansfarm.CropRow; + +public abstract class CropDuster extends Aircraft{ + public void fertilize(CropRow row){} } diff --git a/src/main/java/Vehicles/FarmVehicle.java b/src/main/java/Vehicles/FarmVehicle.java index fa548b68..8f471b93 100644 --- a/src/main/java/Vehicles/FarmVehicle.java +++ b/src/main/java/Vehicles/FarmVehicle.java @@ -1,4 +1,8 @@ package Vehicles; -public interface FarmVehicle { +import com.zipcodewilmington.froilansfarm.Crop; +import com.zipcodewilmington.froilansfarm.CropRow; + +public interface FarmVehicle extends Vehicle{ + void operate(); // } diff --git a/src/main/java/Vehicles/Tractor.java b/src/main/java/Vehicles/Tractor.java index 091fbec8..0e459070 100644 --- a/src/main/java/Vehicles/Tractor.java +++ b/src/main/java/Vehicles/Tractor.java @@ -1,4 +1,21 @@ package Vehicles; -public class Tractor implements Vehicle, FarmVehicle{ +import com.zipcodewilmington.froilansfarm.Crop; + +public class Tractor implements FarmVehicle{ + public Crop harvest(Crop crop){ + return null; + } + + public void operate() { + + } + + public String makeNoise() { + return null; + } + + public void ride() { + + } } diff --git a/src/main/java/Vehicles/Vehicle.java b/src/main/java/Vehicles/Vehicle.java index 780a7e69..c49a3d3f 100644 --- a/src/main/java/Vehicles/Vehicle.java +++ b/src/main/java/Vehicles/Vehicle.java @@ -1,4 +1,7 @@ package Vehicles; -public interface Vehicle { +import com.zipcodewilmington.froilansfarm.NoiseMaker; +import com.zipcodewilmington.froilansfarm.Ridable; + +public interface Vehicle extends NoiseMaker, Ridable { } From 160a6b6a4c39d863cc93ffcdc38df1533cefe6c7 Mon Sep 17 00:00:00 2001 From: Nathan Date: Tue, 20 Jul 2021 20:26:37 -0400 Subject: [PATCH 011/100] added more stuff --- .../com/zipcodewilmington/froilansfarm/Animal.java | 13 +++++++++++++ .../com/zipcodewilmington/froilansfarm/Chicken.java | 8 +++++++- .../com/zipcodewilmington/froilansfarm/Edible.java | 2 +- .../com/zipcodewilmington/froilansfarm/Horse.java | 10 +++++++++- .../com/zipcodewilmington/froilansfarm/Produce.java | 8 ++++++++ 5 files changed, 38 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Animal.java b/src/main/java/com/zipcodewilmington/froilansfarm/Animal.java index c37e6b85..a089e82c 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Animal.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Animal.java @@ -1,6 +1,7 @@ package com.zipcodewilmington.froilansfarm; public class Animal implements Eater, NoiseMaker { + private String name; public void eat(Object o) { @@ -9,4 +10,16 @@ public void eat(Object o) { public String makeNoise() { return null; } + + public Animal(String name) { + this.name = name; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Chicken.java b/src/main/java/com/zipcodewilmington/froilansfarm/Chicken.java index 0b7f8fb3..e857bfb5 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Chicken.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Chicken.java @@ -1,4 +1,10 @@ package com.zipcodewilmington.froilansfarm; -public class Chicken { +public class Chicken extends Animal { + + public Chicken(String name) { + super(name); + } + + } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Edible.java b/src/main/java/com/zipcodewilmington/froilansfarm/Edible.java index eef2b3d9..2c7861b7 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Edible.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Edible.java @@ -1,4 +1,4 @@ package com.zipcodewilmington.froilansfarm; -public interface Edible { +public class Edible { } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Horse.java b/src/main/java/com/zipcodewilmington/froilansfarm/Horse.java index 54daa76b..f927b63e 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Horse.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Horse.java @@ -1,4 +1,12 @@ package com.zipcodewilmington.froilansfarm; -public class Horse { +public class Horse extends Animal implements Ridable { + + public Horse(String name) { + super(name); + } + + public void ride() { + + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Produce.java b/src/main/java/com/zipcodewilmington/froilansfarm/Produce.java index 0469a4fc..32d955a4 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Produce.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Produce.java @@ -1,5 +1,13 @@ package com.zipcodewilmington.froilansfarm; public class Produce { + private Boolean hasBeenFertilized; + private Produce yield() { + if(this.hasBeenFertilized){ + return this; + } else { + return null; + } + } } From 7f95af881bb7c8f2fe7f1d9a823751832816fb1c Mon Sep 17 00:00:00 2001 From: jgiroso Date: Tue, 20 Jul 2021 20:29:27 -0400 Subject: [PATCH 012/100] added tests but need classes first --- pom.xml | 8 ++++++++ .../com/zipcodewilmington/froilansfarm/ChickenCoop.java | 4 ++++ .../com/zipcodewilmington/froilansfarm/FarmHouse.java | 5 +++++ .../java/com/zipcodewilmington/froilansfarm/Person.java | 6 ++++++ .../java/com/zipcodewilmington/froilansfarm/Stable.java | 4 ++++ .../zipcodewilmington/froilansfarm/ChickenCoopTest.java | 6 ++++++ .../com/zipcodewilmington/froilansfarm/FarmHouseTest.java | 8 ++++++++ .../com/zipcodewilmington/froilansfarm/StableTest.java | 6 ++++++ 8 files changed, 47 insertions(+) create mode 100644 src/test/java/com/zipcodewilmington/froilansfarm/ChickenCoopTest.java create mode 100644 src/test/java/com/zipcodewilmington/froilansfarm/FarmHouseTest.java create mode 100644 src/test/java/com/zipcodewilmington/froilansfarm/StableTest.java 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/ChickenCoop.java b/src/main/java/com/zipcodewilmington/froilansfarm/ChickenCoop.java index 9b91b301..4543c00c 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/ChickenCoop.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/ChickenCoop.java @@ -8,6 +8,10 @@ public class ChickenCoop implements Shelter { List chickenList = new ArrayList(); Chicken chicken; + public ChickenCoop(Chicken chicken) { + this.chicken = chicken; + this.chickenList = chickenList; + } public void add(Chicken chicken) { chickenList.add(chicken); } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/FarmHouse.java b/src/main/java/com/zipcodewilmington/froilansfarm/FarmHouse.java index 8bb6b422..031d8240 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/FarmHouse.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/FarmHouse.java @@ -8,6 +8,11 @@ public class FarmHouse implements Shelter { List personList = new ArrayList(); Person person; + public FarmHouse(Person person) { + this.person = person; + this.personList = personList; + } + public void add(Person person) { personList.add(person); } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Person.java b/src/main/java/com/zipcodewilmington/froilansfarm/Person.java index 2a5328ba..08eaca90 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Person.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Person.java @@ -1,4 +1,10 @@ package com.zipcodewilmington.froilansfarm; public class Person { + + private String name; + + public Person(String name) { + this.name = name; + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Stable.java b/src/main/java/com/zipcodewilmington/froilansfarm/Stable.java index 6a84efbb..f6426c62 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Stable.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Stable.java @@ -8,6 +8,10 @@ public class Stable implements Shelter { List horseList = new ArrayList(); Horse horse; + public Stable(Horse horse) { + this.horse = horse; + this.horseList = horseList; + } public void add(Horse horse) { horseList.add(horse); } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/ChickenCoopTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/ChickenCoopTest.java new file mode 100644 index 00000000..4ddb3606 --- /dev/null +++ b/src/test/java/com/zipcodewilmington/froilansfarm/ChickenCoopTest.java @@ -0,0 +1,6 @@ +package com.zipcodewilmington.froilansfarm; + +public class ChickenCoopTest { + + +} diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/FarmHouseTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/FarmHouseTest.java new file mode 100644 index 00000000..1ba824bd --- /dev/null +++ b/src/test/java/com/zipcodewilmington/froilansfarm/FarmHouseTest.java @@ -0,0 +1,8 @@ +package com.zipcodewilmington.froilansfarm; + +import org.junit.Test; + +public class FarmHouseTest { + + +} diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/StableTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/StableTest.java new file mode 100644 index 00000000..ab094e92 --- /dev/null +++ b/src/test/java/com/zipcodewilmington/froilansfarm/StableTest.java @@ -0,0 +1,6 @@ +package com.zipcodewilmington.froilansfarm; + +public class StableTest { + + +} From 089debbb9e9b4f8b2ebfd392cb56c53a00222db9 Mon Sep 17 00:00:00 2001 From: Nathan Date: Tue, 20 Jul 2021 20:31:56 -0400 Subject: [PATCH 013/100] edited eater --- src/main/java/com/zipcodewilmington/froilansfarm/Animal.java | 2 +- src/main/java/com/zipcodewilmington/froilansfarm/Eater.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Animal.java b/src/main/java/com/zipcodewilmington/froilansfarm/Animal.java index a089e82c..ff114ff8 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Animal.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Animal.java @@ -3,7 +3,7 @@ public class Animal implements Eater, NoiseMaker { private String name; - public void eat(Object o) { + public void eat(Edible edible) { } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Eater.java b/src/main/java/com/zipcodewilmington/froilansfarm/Eater.java index e53f3721..76a876bc 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Eater.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Eater.java @@ -1,5 +1,6 @@ package com.zipcodewilmington.froilansfarm; -public interface Eater { +public interface Eater { void eat(Edible edible); } +// \ No newline at end of file From 98de612c24611d44bc2a9aea437d68e7ffffe7f3 Mon Sep 17 00:00:00 2001 From: Zach Date: Tue, 20 Jul 2021 20:32:58 -0400 Subject: [PATCH 014/100] Created farm class --- .../zipcodewilmington/froilansfarm/Farm.java | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Farm.java diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Farm.java b/src/main/java/com/zipcodewilmington/froilansfarm/Farm.java new file mode 100644 index 00000000..d39fcde4 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Farm.java @@ -0,0 +1,31 @@ +package com.zipcodewilmington.froilansfarm; + +public abstract class Farm { + private FarmHouse farmhouse; + private Stable stable; + private ChickenCoop chickenCoop; + + public FarmHouse getFarmhouse() { + return farmhouse; + } + + public void setFarmhouse(FarmHouse farmhouse) { + this.farmhouse = farmhouse; + } + + public Stable getStable() { + return stable; + } + + public void setStable(Stable stable) { + this.stable = stable; + } + + public ChickenCoop getChickenCoop() { + return chickenCoop; + } + + public void setChickenCoop(ChickenCoop chickenCoop) { + this.chickenCoop = chickenCoop; + } +} From a7c14fd1bdb73739fb594cf321a08e97e2b1b593 Mon Sep 17 00:00:00 2001 From: Zach Date: Tue, 20 Jul 2021 20:59:29 -0400 Subject: [PATCH 015/100] Farm --- src/main/java/Vehicles/Aircraft.java | 2 ++ .../zipcodewilmington/froilansfarm/Farm.java | 28 +++++++------------ 2 files changed, 12 insertions(+), 18 deletions(-) diff --git a/src/main/java/Vehicles/Aircraft.java b/src/main/java/Vehicles/Aircraft.java index f38798bf..28651a45 100644 --- a/src/main/java/Vehicles/Aircraft.java +++ b/src/main/java/Vehicles/Aircraft.java @@ -1,5 +1,7 @@ package Vehicles; +import com.zipcodewilmington.froilansfarm.Farm; + public class Aircraft implements Vehicle{ void fly(){} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Farm.java b/src/main/java/com/zipcodewilmington/froilansfarm/Farm.java index d39fcde4..01f4cde6 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Farm.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Farm.java @@ -1,31 +1,23 @@ package com.zipcodewilmington.froilansfarm; -public abstract class Farm { - private FarmHouse farmhouse; - private Stable stable; - private ChickenCoop chickenCoop; +public class Farm { + private static Shelter farmhouse; + private static Shelter stable; + private static Shelter chickenCoop; - public FarmHouse getFarmhouse() { - return farmhouse; - } + public Farm(){ - public void setFarmhouse(FarmHouse farmhouse) { - this.farmhouse = farmhouse; } - public Stable getStable() { - return stable; + public static Shelter getFarmhouse() { + return farmhouse; } - public void setStable(Stable stable) { - this.stable = stable; + public static Shelter getStable() { + return stable; } - public ChickenCoop getChickenCoop() { + public static Shelter getChickenCoop() { return chickenCoop; } - - public void setChickenCoop(ChickenCoop chickenCoop) { - this.chickenCoop = chickenCoop; - } } From db6bd0cb33a7e849ecccdc383d61fe2a4760af64 Mon Sep 17 00:00:00 2001 From: Jeremy Date: Tue, 20 Jul 2021 21:01:33 -0400 Subject: [PATCH 016/100] added some implementations --- .../com/zipcodewilmington/froilansfarm/CornStalk.java | 4 ++++ .../java/com/zipcodewilmington/froilansfarm/Crop.java | 1 + .../java/com/zipcodewilmington/froilansfarm/Edible.java | 1 + .../java/com/zipcodewilmington/froilansfarm/Tomato.java | 2 +- .../com/zipcodewilmington/froilansfarm/TomatoPlant.java | 9 ++++++++- 5 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/CornStalk.java b/src/main/java/com/zipcodewilmington/froilansfarm/CornStalk.java index 68598bf6..1746caa6 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/CornStalk.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/CornStalk.java @@ -1,5 +1,9 @@ package com.zipcodewilmington.froilansfarm; public class CornStalk { + Integer capacity = 0; + public EarCorn earCorn () { + return null; + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Crop.java b/src/main/java/com/zipcodewilmington/froilansfarm/Crop.java index f87820d8..93b15a85 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Crop.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Crop.java @@ -2,4 +2,5 @@ public class Crop { + } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Edible.java b/src/main/java/com/zipcodewilmington/froilansfarm/Edible.java index 2c7861b7..1de95c08 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Edible.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Edible.java @@ -1,4 +1,5 @@ package com.zipcodewilmington.froilansfarm; public class Edible { + } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Tomato.java b/src/main/java/com/zipcodewilmington/froilansfarm/Tomato.java index dac91659..b3b1ddda 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Tomato.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Tomato.java @@ -1,5 +1,5 @@ package com.zipcodewilmington.froilansfarm; -public class Tomato { +public class Tomato extends TomatoPlant { } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/TomatoPlant.java b/src/main/java/com/zipcodewilmington/froilansfarm/TomatoPlant.java index cd9ff984..aae499fd 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/TomatoPlant.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/TomatoPlant.java @@ -1,5 +1,12 @@ package com.zipcodewilmington.froilansfarm; -public class TomatoPlant { +public class TomatoPlant extends Crop{ + public Tomato yield() { + + Tomato tomato = new Tomato(); + + return tomato; + + } } From 14424ab7bd4a50589fb10d2be0b9000b35d11d3f Mon Sep 17 00:00:00 2001 From: Jeremy Date: Tue, 20 Jul 2021 21:02:15 -0400 Subject: [PATCH 017/100] test --- .../java/com/zipcodewilmington/froilansfarm/CornStalk.java | 7 +++++-- .../com/zipcodewilmington/froilansfarm/TomatoPlant.java | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/CornStalk.java b/src/main/java/com/zipcodewilmington/froilansfarm/CornStalk.java index 1746caa6..accb6a8e 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/CornStalk.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/CornStalk.java @@ -4,6 +4,9 @@ public class CornStalk { Integer capacity = 0; public EarCorn earCorn () { - return null; + + EarCorn earCorn = new EarCorn(); + + return earCorn; } -} +} \ No newline at end of file diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/TomatoPlant.java b/src/main/java/com/zipcodewilmington/froilansfarm/TomatoPlant.java index aae499fd..496a60bc 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/TomatoPlant.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/TomatoPlant.java @@ -1,6 +1,6 @@ package com.zipcodewilmington.froilansfarm; -public class TomatoPlant extends Crop{ +public class TomatoPlant extends Produce{ public Tomato yield() { From 08fa101892f02209707a7c9971e597b4611829d7 Mon Sep 17 00:00:00 2001 From: jgiroso Date: Tue, 20 Jul 2021 21:25:55 -0400 Subject: [PATCH 018/100] added FarmHouse test and changes to shelter classes --- pom.xml | 12 ++++++ .../froilansfarm/Animal.java | 4 ++ .../froilansfarm/Chicken.java | 2 + .../froilansfarm/ChickenCoop.java | 10 ++++- .../froilansfarm/FarmHouse.java | 12 +++++- .../froilansfarm/Farmer.java | 8 ++++ .../zipcodewilmington/froilansfarm/Horse.java | 2 + .../froilansfarm/Person.java | 12 ++++++ .../froilansfarm/Shelter.java | 2 +- .../froilansfarm/Stable.java | 10 ++++- .../froilansfarm/FarmHouseTest.java | 39 ++++++++++++++++++- 11 files changed, 105 insertions(+), 8 deletions(-) create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Farmer.java diff --git a/pom.xml b/pom.xml index 403b67d4..5e326510 100644 --- a/pom.xml +++ b/pom.xml @@ -7,6 +7,18 @@ com.zipcodewilmington froilans-farm 1.0-SNAPSHOT + + + + org.apache.maven.plugins + maven-compiler-plugin + + 15 + 15 + + + + junit diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Animal.java b/src/main/java/com/zipcodewilmington/froilansfarm/Animal.java index ff114ff8..60a2ed1d 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Animal.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Animal.java @@ -3,6 +3,10 @@ public class Animal implements Eater, NoiseMaker { private String name; + public Animal() { + name = ""; + } + public void eat(Edible edible) { } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Chicken.java b/src/main/java/com/zipcodewilmington/froilansfarm/Chicken.java index e857bfb5..c8f40c30 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Chicken.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Chicken.java @@ -6,5 +6,7 @@ public Chicken(String name) { super(name); } + public Chicken() { } + } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/ChickenCoop.java b/src/main/java/com/zipcodewilmington/froilansfarm/ChickenCoop.java index 4543c00c..af6551f8 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/ChickenCoop.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/ChickenCoop.java @@ -16,8 +16,14 @@ public void add(Chicken chicken) { chickenList.add(chicken); } - public Chicken getTypeByName(String name) { - return chicken.getName(); + public Chicken getObjectByName(String name) { + Chicken thisChicken = new Chicken(); + for(Chicken chicken : chickenList) { + if(chicken.equals(name)) { + thisChicken = chicken; + } + } + return thisChicken; } public void remove(Chicken chicken) { diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/FarmHouse.java b/src/main/java/com/zipcodewilmington/froilansfarm/FarmHouse.java index 031d8240..d85e7972 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/FarmHouse.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/FarmHouse.java @@ -13,12 +13,20 @@ public FarmHouse(Person person) { this.personList = personList; } + public FarmHouse() {} + public void add(Person person) { personList.add(person); } - public Person getTypeByName(String name) { - return person.getName(); + public Person getObjectByName(String name) { + Person thisPerson = new Person(); + for(Person person : personList) { + if(person.equals(name)) { + thisPerson = person; + } + } + return thisPerson; } public void remove(Person person) { diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Farmer.java b/src/main/java/com/zipcodewilmington/froilansfarm/Farmer.java new file mode 100644 index 00000000..8a4174c0 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Farmer.java @@ -0,0 +1,8 @@ +package com.zipcodewilmington.froilansfarm; + +public class Farmer extends Person{ + + public Farmer(String name) { + super(name); + } +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Horse.java b/src/main/java/com/zipcodewilmington/froilansfarm/Horse.java index f927b63e..68af14ae 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Horse.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Horse.java @@ -6,6 +6,8 @@ public Horse(String name) { super(name); } + public Horse() { } + public void ride() { } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Person.java b/src/main/java/com/zipcodewilmington/froilansfarm/Person.java index 08eaca90..4f602978 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Person.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Person.java @@ -7,4 +7,16 @@ public class Person { public Person(String name) { this.name = name; } + + public Person() { + name = ""; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Shelter.java b/src/main/java/com/zipcodewilmington/froilansfarm/Shelter.java index 1891a109..addaacc1 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Shelter.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Shelter.java @@ -4,7 +4,7 @@ public interface Shelter { void add(ShelterableType thingToBeStored); - ShelterableType getTypeByName(String name); + ShelterableType getObjectByName(String name); void remove(ShelterableType thingToBeStored); } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Stable.java b/src/main/java/com/zipcodewilmington/froilansfarm/Stable.java index f6426c62..85085398 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Stable.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Stable.java @@ -16,8 +16,14 @@ public void add(Horse horse) { horseList.add(horse); } - public Horse getTypeByName(String name) { - return horse.getName(); + public Horse getObjectByName(String name) { + Horse thisHorse = new Horse(); + for(Horse horse : horseList) { + if(horse.equals(name)) { + thisHorse = horse; + } + } + return thisHorse; } public void remove(Horse horse) { diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/FarmHouseTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/FarmHouseTest.java index 1ba824bd..6576f2de 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/FarmHouseTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/FarmHouseTest.java @@ -1,8 +1,45 @@ package com.zipcodewilmington.froilansfarm; +import org.junit.Assert; import org.junit.Test; public class FarmHouseTest { -} + @Test + public void testAdd() { + //given + Person person = new Farmer("Froilan"); + //when + FarmHouse farmhouse = new FarmHouse(); + farmhouse.add(person); + //then + Assert.assertTrue(farmhouse.personList.contains(person)); + } + + @Test + public void testRemove() { + //given + Person person1 = new Farmer("Froilan"); + Person person2 = new Farmer("Froilanda"); + //when + FarmHouse farmhouse = new FarmHouse(); + farmhouse.add(person1); + farmhouse.add(person2); + farmhouse.remove(person1); + //then + Assert.assertFalse(farmhouse.personList.contains(person1)); + } + +// @Test +// public void testGetName() { +// //given +// String expected = "Froilan"; +// Person person = new Farmer(expected); +// //when +// FarmHouse farmhouse = new FarmHouse(); +// farmhouse.getObjectByName(expected); +// //then +// System.out.println(farmhouse.getObjectByName(expected)); +// } + } From b3c387da927e5e3dfb0721f475304f50386eadce Mon Sep 17 00:00:00 2001 From: Zach Date: Tue, 20 Jul 2021 21:27:19 -0400 Subject: [PATCH 019/100] various changes --- src/main/java/Vehicles/CropDuster.java | 4 +++- .../zipcodewilmington/froilansfarm/CornStalk.java | 2 +- .../com/zipcodewilmington/froilansfarm/Crop.java | 8 ++++++++ .../zipcodewilmington/froilansfarm/CropRow.java | 14 +++++++++++++- .../froilansfarm/TomatoPlant.java | 2 +- 5 files changed, 26 insertions(+), 4 deletions(-) diff --git a/src/main/java/Vehicles/CropDuster.java b/src/main/java/Vehicles/CropDuster.java index 280eded6..19568559 100644 --- a/src/main/java/Vehicles/CropDuster.java +++ b/src/main/java/Vehicles/CropDuster.java @@ -3,5 +3,7 @@ import com.zipcodewilmington.froilansfarm.CropRow; public abstract class CropDuster extends Aircraft{ - public void fertilize(CropRow row){} + public void fertilize(CropRow row){ + row.fertilize(); + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/CornStalk.java b/src/main/java/com/zipcodewilmington/froilansfarm/CornStalk.java index accb6a8e..bee6e867 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/CornStalk.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/CornStalk.java @@ -1,6 +1,6 @@ package com.zipcodewilmington.froilansfarm; -public class CornStalk { +public class CornStalk extends Crop{ Integer capacity = 0; public EarCorn earCorn () { diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Crop.java b/src/main/java/com/zipcodewilmington/froilansfarm/Crop.java index 93b15a85..25d745c0 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Crop.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Crop.java @@ -1,6 +1,14 @@ package com.zipcodewilmington.froilansfarm; public class Crop { + private Boolean fertilized = false; + public Crop(){ + + } + + public void fertilize(){ + this.fertilized = true; + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/CropRow.java b/src/main/java/com/zipcodewilmington/froilansfarm/CropRow.java index a6a48999..d4869fd1 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/CropRow.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/CropRow.java @@ -1,5 +1,17 @@ package com.zipcodewilmington.froilansfarm; -public class CropRow { +import java.util.Arrays; +public class CropRow extends Crop{ + private Integer amount; + private Crop crop; + + public CropRow(Crop crop, Integer amount){ + this.crop = crop; + this.amount = amount; + } + + public void fertilize(){ + super.fertilize(); + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/TomatoPlant.java b/src/main/java/com/zipcodewilmington/froilansfarm/TomatoPlant.java index 496a60bc..aae499fd 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/TomatoPlant.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/TomatoPlant.java @@ -1,6 +1,6 @@ package com.zipcodewilmington.froilansfarm; -public class TomatoPlant extends Produce{ +public class TomatoPlant extends Crop{ public Tomato yield() { From 331b851a831a4b767ec32585ff2d58c508646d88 Mon Sep 17 00:00:00 2001 From: Jeremy Date: Tue, 20 Jul 2021 21:29:45 -0400 Subject: [PATCH 020/100] changed the edible to an interface --- src/main/java/com/zipcodewilmington/froilansfarm/Chicken.java | 2 +- src/main/java/com/zipcodewilmington/froilansfarm/Crop.java | 1 - src/main/java/com/zipcodewilmington/froilansfarm/EarCorn.java | 3 ++- src/main/java/com/zipcodewilmington/froilansfarm/Edible.java | 2 +- src/main/java/com/zipcodewilmington/froilansfarm/Egg.java | 2 +- src/main/java/com/zipcodewilmington/froilansfarm/Tomato.java | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Chicken.java b/src/main/java/com/zipcodewilmington/froilansfarm/Chicken.java index e857bfb5..369d3079 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Chicken.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Chicken.java @@ -1,6 +1,6 @@ package com.zipcodewilmington.froilansfarm; -public class Chicken extends Animal { +public class Chicken extends Animal implements Edible { public Chicken(String name) { super(name); diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Crop.java b/src/main/java/com/zipcodewilmington/froilansfarm/Crop.java index 93b15a85..f87820d8 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Crop.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Crop.java @@ -2,5 +2,4 @@ public class Crop { - } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/EarCorn.java b/src/main/java/com/zipcodewilmington/froilansfarm/EarCorn.java index e17c36a1..b7291340 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/EarCorn.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/EarCorn.java @@ -1,4 +1,5 @@ package com.zipcodewilmington.froilansfarm; -public class EarCorn { +public class EarCorn implements Edible { + } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Edible.java b/src/main/java/com/zipcodewilmington/froilansfarm/Edible.java index 1de95c08..ac82f7ad 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Edible.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Edible.java @@ -1,5 +1,5 @@ package com.zipcodewilmington.froilansfarm; -public class Edible { +public interface Edible { } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Egg.java b/src/main/java/com/zipcodewilmington/froilansfarm/Egg.java index 116d2492..b625fce6 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Egg.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Egg.java @@ -1,5 +1,5 @@ package com.zipcodewilmington.froilansfarm; -public class Egg { +public class Egg implements Edible { boolean isFertlized = false; } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Tomato.java b/src/main/java/com/zipcodewilmington/froilansfarm/Tomato.java index b3b1ddda..7b0ce971 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Tomato.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Tomato.java @@ -1,5 +1,5 @@ package com.zipcodewilmington.froilansfarm; -public class Tomato extends TomatoPlant { +public class Tomato implements Edible { } From a69f0947e1a6271acc12668709f2ff92527d9513 Mon Sep 17 00:00:00 2001 From: Jeremy Date: Tue, 20 Jul 2021 21:41:06 -0400 Subject: [PATCH 021/100] test --- src/main/java/com/zipcodewilmington/froilansfarm/Egg.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Egg.java b/src/main/java/com/zipcodewilmington/froilansfarm/Egg.java index b625fce6..4efa616d 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Egg.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Egg.java @@ -1,5 +1,6 @@ package com.zipcodewilmington.froilansfarm; public class Egg implements Edible { + boolean isFertlized = false; } From 284081d9737f0a4244f0aa93a147f628b47d1ad6 Mon Sep 17 00:00:00 2001 From: jgiroso Date: Tue, 20 Jul 2021 21:55:27 -0400 Subject: [PATCH 022/100] added stable and chickenCoop tests --- .../froilansfarm/ChickenCoop.java | 5 ++++ .../froilansfarm/Stable.java | 3 +++ .../froilansfarm/ChickenCoopTest.java | 26 +++++++++++++++++++ .../froilansfarm/StableTest.java | 26 +++++++++++++++++++ 4 files changed, 60 insertions(+) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/ChickenCoop.java b/src/main/java/com/zipcodewilmington/froilansfarm/ChickenCoop.java index af6551f8..dbc940a6 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/ChickenCoop.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/ChickenCoop.java @@ -12,6 +12,11 @@ public ChickenCoop(Chicken chicken) { this.chicken = chicken; this.chickenList = chickenList; } + + public ChickenCoop() { + + } + public void add(Chicken chicken) { chickenList.add(chicken); } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Stable.java b/src/main/java/com/zipcodewilmington/froilansfarm/Stable.java index 85085398..b6bfc85b 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Stable.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Stable.java @@ -12,6 +12,9 @@ public Stable(Horse horse) { this.horse = horse; this.horseList = horseList; } + + public Stable() {} + public void add(Horse horse) { horseList.add(horse); } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/ChickenCoopTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/ChickenCoopTest.java index 4ddb3606..f305b522 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/ChickenCoopTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/ChickenCoopTest.java @@ -1,6 +1,32 @@ package com.zipcodewilmington.froilansfarm; +import org.junit.Assert; +import org.junit.Test; + public class ChickenCoopTest { + @Test + public void testAdd() { + //given + Chicken chicken = new Chicken("Harry"); + //when + ChickenCoop chickenCoop = new ChickenCoop(); + chickenCoop.add(chicken); + //then + Assert.assertTrue(chickenCoop.chickenList.contains(chicken)); + } + @Test + public void testRemove() { + //given + Chicken chicken1 = new Chicken("Harry"); + Chicken chicken2 = new Chicken("Megan"); + //when + ChickenCoop chickenCoop = new ChickenCoop(); + chickenCoop.add(chicken1); + chickenCoop.add(chicken2); + chickenCoop.remove(chicken1); + //then + Assert.assertFalse(chickenCoop.chickenList.contains(chicken1)); + } } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/StableTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/StableTest.java index ab094e92..8714fd18 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/StableTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/StableTest.java @@ -1,6 +1,32 @@ package com.zipcodewilmington.froilansfarm; +import org.junit.Assert; +import org.junit.Test; + public class StableTest { + @Test + public void testAdd() { + //given + Horse horse = new Horse("Annabell"); + //when + Stable stable = new Stable(); + stable.add(horse); + //then + Assert.assertTrue(stable.horseList.contains(horse)); + } + @Test + public void testRemove() { + //given + Horse horse1 = new Horse("Annabell"); + Horse horse2 = new Horse("Ruth"); + //when + Stable stable = new Stable(); + stable.add(horse1); + stable.add(horse2); + stable.remove(horse1); + //then + Assert.assertFalse(stable.horseList.contains(horse1)); + } } From 004b70dd1a0167bcf96cf13c4b3347d843abda0d Mon Sep 17 00:00:00 2001 From: Jeremy Date: Tue, 20 Jul 2021 22:05:38 -0400 Subject: [PATCH 023/100] added constructors to food --- .../java/com/zipcodewilmington/froilansfarm/CornStalk.java | 2 ++ .../java/com/zipcodewilmington/froilansfarm/EarCorn.java | 4 ++++ src/main/java/com/zipcodewilmington/froilansfarm/Egg.java | 5 +++++ src/main/java/com/zipcodewilmington/froilansfarm/Tomato.java | 4 ++++ 4 files changed, 15 insertions(+) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/CornStalk.java b/src/main/java/com/zipcodewilmington/froilansfarm/CornStalk.java index bee6e867..aa1aa23a 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/CornStalk.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/CornStalk.java @@ -3,6 +3,8 @@ public class CornStalk extends Crop{ Integer capacity = 0; + + public EarCorn earCorn () { EarCorn earCorn = new EarCorn(); diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/EarCorn.java b/src/main/java/com/zipcodewilmington/froilansfarm/EarCorn.java index b7291340..82628b9b 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/EarCorn.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/EarCorn.java @@ -2,4 +2,8 @@ public class EarCorn implements Edible { + public EarCorn() { + + } + } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Egg.java b/src/main/java/com/zipcodewilmington/froilansfarm/Egg.java index 4efa616d..d3939685 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Egg.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Egg.java @@ -3,4 +3,9 @@ public class Egg implements Edible { boolean isFertlized = false; + + public Egg() { + + } + } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Tomato.java b/src/main/java/com/zipcodewilmington/froilansfarm/Tomato.java index 7b0ce971..26be5f9c 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Tomato.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Tomato.java @@ -2,4 +2,8 @@ public class Tomato implements Edible { + public Tomato() { + + } + } From b157327f3338c6f6ad9af9a0c212687d5130b5f9 Mon Sep 17 00:00:00 2001 From: Jeremy Date: Tue, 20 Jul 2021 22:11:12 -0400 Subject: [PATCH 024/100] changed pom --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 5e326510..af746b18 100644 --- a/pom.xml +++ b/pom.xml @@ -13,8 +13,8 @@ org.apache.maven.plugins maven-compiler-plugin - 15 - 15 + 8 + 8 From 73b86bfcb52abd9828f20f74df36cf6cddc52bf8 Mon Sep 17 00:00:00 2001 From: jgiroso Date: Tue, 20 Jul 2021 23:01:28 -0400 Subject: [PATCH 025/100] person tests --- .../froilansfarm/Botanist.java | 6 ++++ .../froilansfarm/Farmer.java | 7 ++++- .../froilansfarm/PersonTest.java | 29 +++++++++++++++++++ 3 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Botanist.java create mode 100644 src/test/java/com/zipcodewilmington/froilansfarm/PersonTest.java diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Botanist.java b/src/main/java/com/zipcodewilmington/froilansfarm/Botanist.java new file mode 100644 index 00000000..3347c436 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Botanist.java @@ -0,0 +1,6 @@ +package com.zipcodewilmington.froilansfarm; + +public interface Botanist { + + void plant(Crop crop, CropRow cropRow); +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Farmer.java b/src/main/java/com/zipcodewilmington/froilansfarm/Farmer.java index 8a4174c0..b893880f 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Farmer.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Farmer.java @@ -1,8 +1,13 @@ package com.zipcodewilmington.froilansfarm; -public class Farmer extends Person{ +public class Farmer extends Person implements Botanist{ public Farmer(String name) { super(name); } + + @Override + public void plant(Crop crop, CropRow cropRow) { + + } } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/PersonTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/PersonTest.java new file mode 100644 index 00000000..416d2226 --- /dev/null +++ b/src/test/java/com/zipcodewilmington/froilansfarm/PersonTest.java @@ -0,0 +1,29 @@ +package com.zipcodewilmington.froilansfarm; + +import org.junit.Assert; +import org.junit.Test; + +public class PersonTest { + + @Test + public void testConstructor() { + //given + String expected = "Sophia"; + Person person = new Person(expected); + //when + String actual = person.getName(); + //then + Assert.assertEquals(expected, actual); + } + + @Test + public void testSetName() { + //given + String expected = "Tyler"; + //when + Person person = new Person(expected); + String actual = person.getName(); + //then + Assert.assertEquals(expected, actual); + } +} From 071108b07a6e0283ad3511cedd52f0380e9554b4 Mon Sep 17 00:00:00 2001 From: Nathan Date: Wed, 21 Jul 2021 14:24:24 -0400 Subject: [PATCH 026/100] made eater generic --- .../com/zipcodewilmington/froilansfarm/Animal.java | 5 +++-- .../com/zipcodewilmington/froilansfarm/Chicken.java | 10 +++++++++- .../java/com/zipcodewilmington/froilansfarm/Eater.java | 5 ++--- .../java/com/zipcodewilmington/froilansfarm/Horse.java | 5 ++++- .../com/zipcodewilmington/froilansfarm/Produce.java | 2 +- 5 files changed, 19 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Animal.java b/src/main/java/com/zipcodewilmington/froilansfarm/Animal.java index 60a2ed1d..427a171a 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Animal.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Animal.java @@ -1,13 +1,13 @@ package com.zipcodewilmington.froilansfarm; -public class Animal implements Eater, NoiseMaker { +public abstract class Animal implements Eater, NoiseMaker { private String name; public Animal() { name = ""; } - public void eat(Edible edible) { + public void eat(T edible) { } @@ -26,4 +26,5 @@ public String getName() { public void setName(String name) { this.name = name; } + } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Chicken.java b/src/main/java/com/zipcodewilmington/froilansfarm/Chicken.java index 17c3be11..815d7378 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Chicken.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Chicken.java @@ -1,6 +1,6 @@ package com.zipcodewilmington.froilansfarm; -public class Chicken extends Animal implements Edible { +public class Chicken extends Animal implements Edible { public Chicken(String name) { super(name); @@ -8,5 +8,13 @@ public Chicken(String name) { public Chicken() { } + boolean isFertlized = false; + + public Egg yield() { + if (isFertlized){ + return new Egg(); + } + return null; + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Eater.java b/src/main/java/com/zipcodewilmington/froilansfarm/Eater.java index 76a876bc..72b4bcf4 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Eater.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Eater.java @@ -1,6 +1,5 @@ package com.zipcodewilmington.froilansfarm; -public interface Eater { - void eat(Edible edible); +public interface Eater < T extends Edible > { + void eat(T edible); } -// \ No newline at end of file diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Horse.java b/src/main/java/com/zipcodewilmington/froilansfarm/Horse.java index 68af14ae..fb4929b0 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Horse.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Horse.java @@ -1,6 +1,9 @@ package com.zipcodewilmington.froilansfarm; -public class Horse extends Animal implements Ridable { +//Horse can only eat Earcorn right now +// < Parameter type goes in here, "extends" - limits what the parameter type can be > + +public class Horse extends Animal implements Ridable { public Horse(String name) { super(name); diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Produce.java b/src/main/java/com/zipcodewilmington/froilansfarm/Produce.java index 32d955a4..b61ead8b 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Produce.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Produce.java @@ -1,6 +1,6 @@ package com.zipcodewilmington.froilansfarm; -public class Produce { +public class Produce implements Edible { private Boolean hasBeenFertilized; private Produce yield() { From 13fbcc529a39371a3a1ce6bfc64b2825d43616bd Mon Sep 17 00:00:00 2001 From: jgiroso Date: Wed, 21 Jul 2021 17:43:24 -0400 Subject: [PATCH 027/100] implemented Eater on Person. added Farmer Test --- .../froilansfarm/Botanist.java | 1 + .../zipcodewilmington/froilansfarm/Farmer.java | 2 +- .../zipcodewilmington/froilansfarm/Person.java | 7 ++++++- .../froilansfarm/FarmerTest.java | 18 ++++++++++++++++++ 4 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 src/test/java/com/zipcodewilmington/froilansfarm/FarmerTest.java diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Botanist.java b/src/main/java/com/zipcodewilmington/froilansfarm/Botanist.java index 3347c436..2b375d02 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Botanist.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Botanist.java @@ -3,4 +3,5 @@ public interface Botanist { void plant(Crop crop, CropRow cropRow); + } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Farmer.java b/src/main/java/com/zipcodewilmington/froilansfarm/Farmer.java index b893880f..4539d876 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Farmer.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Farmer.java @@ -1,6 +1,6 @@ package com.zipcodewilmington.froilansfarm; -public class Farmer extends Person implements Botanist{ +public class Farmer extends Person implements Botanist{ public Farmer(String name) { super(name); diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Person.java b/src/main/java/com/zipcodewilmington/froilansfarm/Person.java index 4f602978..e0bcbf34 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Person.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Person.java @@ -1,6 +1,6 @@ package com.zipcodewilmington.froilansfarm; -public class Person { +public class Person implements Eater{ private String name; @@ -19,4 +19,9 @@ public String getName() { public void setName(String name) { this.name = name; } + + @Override + public void eat(T edible) { + + } } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/FarmerTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/FarmerTest.java new file mode 100644 index 00000000..1d3ccee6 --- /dev/null +++ b/src/test/java/com/zipcodewilmington/froilansfarm/FarmerTest.java @@ -0,0 +1,18 @@ +package com.zipcodewilmington.froilansfarm; + +import org.junit.Assert; +import org.junit.Test; + +public class FarmerTest { + + @Test + public void testSetName() { + //given + String expected = "Froiland"; + Person person = new Farmer(expected); + //when + String actual = person.getName(); + //then + Assert.assertEquals(expected, actual); + } +} From 2c87d829bfd49d80162301d11af7ea2a844f881a Mon Sep 17 00:00:00 2001 From: jgiroso Date: Wed, 21 Jul 2021 19:24:29 -0400 Subject: [PATCH 028/100] added packages --- src/main/java/Vehicles/FarmVehicle.java | 8 ------- .../froilansfarm/Botanist.java | 3 +++ .../froilansfarm/Chicken.java | 20 ---------------- .../froilansfarm/EarCorn.java | 9 ------- .../zipcodewilmington/froilansfarm/Eater.java | 4 +++- .../zipcodewilmington/froilansfarm/Farm.java | 4 ++++ .../froilansfarm/Farmer.java | 13 ---------- .../froilansfarm/{ => Food}/CornStalk.java | 4 ++-- .../froilansfarm/{ => Food}/Crop.java | 2 +- .../froilansfarm/{ => Food}/CropRow.java | 6 ++--- .../froilansfarm/Food/EarCorn.java | 11 +++++++++ .../froilansfarm/{ => Food}/Egg.java | 4 +++- .../froilansfarm/{ => Food}/Produce.java | 4 +++- .../froilansfarm/Food/Tomato.java | 11 +++++++++ .../froilansfarm/Food/TomatoPlant.java | 15 ++++++++++++ .../zipcodewilmington/froilansfarm/Horse.java | 17 ------------- .../froilansfarm/MainApplication.java | 6 ++++- .../froilansfarm/{ => Mammal}/Animal.java | 6 ++++- .../froilansfarm/Mammal/Chicken.java | 24 +++++++++++++++++++ .../froilansfarm/Mammal/Farmer.java | 18 ++++++++++++++ .../froilansfarm/Mammal/Horse.java | 21 ++++++++++++++++ .../froilansfarm/{ => Mammal}/Person.java | 7 ++++-- .../{ => Structure}/ChickenCoop.java | 9 ++++++- .../{ => Structure}/FarmHouse.java | 9 ++++++- .../froilansfarm/{ => Structure}/Stable.java | 9 ++++++- .../froilansfarm/Tomato.java | 9 ------- .../froilansfarm/TomatoPlant.java | 12 ---------- .../froilansfarm}/Vehicles/Aircraft.java | 4 +--- .../froilansfarm}/Vehicles/CropDuster.java | 4 ++-- .../froilansfarm/Vehicles/FarmVehicle.java | 5 ++++ .../froilansfarm}/Vehicles/Tractor.java | 4 ++-- .../froilansfarm}/Vehicles/Vehicle.java | 2 +- .../froilansfarm/ChickenCoopTest.java | 6 +++-- .../froilansfarm/FarmHouseTest.java | 7 ++++-- .../froilansfarm/FarmerTest.java | 2 ++ .../froilansfarm/PersonTest.java | 1 + .../froilansfarm/StableTest.java | 6 +++-- 37 files changed, 188 insertions(+), 118 deletions(-) delete mode 100644 src/main/java/Vehicles/FarmVehicle.java delete mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Chicken.java delete mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/EarCorn.java delete mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Farmer.java rename src/main/java/com/zipcodewilmington/froilansfarm/{ => Food}/CornStalk.java (60%) rename src/main/java/com/zipcodewilmington/froilansfarm/{ => Food}/Crop.java (76%) rename src/main/java/com/zipcodewilmington/froilansfarm/{ => Food}/CropRow.java (62%) create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Food/EarCorn.java rename src/main/java/com/zipcodewilmington/froilansfarm/{ => Food}/Egg.java (50%) rename src/main/java/com/zipcodewilmington/froilansfarm/{ => Food}/Produce.java (69%) create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Food/Tomato.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Food/TomatoPlant.java delete mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Horse.java rename src/main/java/com/zipcodewilmington/froilansfarm/{ => Mammal}/Animal.java (68%) create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Chicken.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Farmer.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Horse.java rename src/main/java/com/zipcodewilmington/froilansfarm/{ => Mammal}/Person.java (60%) rename src/main/java/com/zipcodewilmington/froilansfarm/{ => Structure}/ChickenCoop.java (76%) rename src/main/java/com/zipcodewilmington/froilansfarm/{ => Structure}/FarmHouse.java (75%) rename src/main/java/com/zipcodewilmington/froilansfarm/{ => Structure}/Stable.java (75%) delete mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Tomato.java delete mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/TomatoPlant.java rename src/main/java/{ => com/zipcodewilmington/froilansfarm}/Vehicles/Aircraft.java (74%) rename src/main/java/{ => com/zipcodewilmington/froilansfarm}/Vehicles/CropDuster.java (52%) create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/FarmVehicle.java rename src/main/java/{ => com/zipcodewilmington/froilansfarm}/Vehicles/Tractor.java (69%) rename src/main/java/{ => com/zipcodewilmington/froilansfarm}/Vehicles/Vehicle.java (75%) diff --git a/src/main/java/Vehicles/FarmVehicle.java b/src/main/java/Vehicles/FarmVehicle.java deleted file mode 100644 index 8f471b93..00000000 --- a/src/main/java/Vehicles/FarmVehicle.java +++ /dev/null @@ -1,8 +0,0 @@ -package Vehicles; - -import com.zipcodewilmington.froilansfarm.Crop; -import com.zipcodewilmington.froilansfarm.CropRow; - -public interface FarmVehicle extends Vehicle{ - void operate(); // -} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Botanist.java b/src/main/java/com/zipcodewilmington/froilansfarm/Botanist.java index 2b375d02..0620f731 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Botanist.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Botanist.java @@ -1,5 +1,8 @@ package com.zipcodewilmington.froilansfarm; +import com.zipcodewilmington.froilansfarm.Food.Crop; +import com.zipcodewilmington.froilansfarm.Food.CropRow; + public interface Botanist { void plant(Crop crop, CropRow cropRow); diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Chicken.java b/src/main/java/com/zipcodewilmington/froilansfarm/Chicken.java deleted file mode 100644 index 815d7378..00000000 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Chicken.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.zipcodewilmington.froilansfarm; - -public class Chicken extends Animal implements Edible { - - public Chicken(String name) { - super(name); - } - - public Chicken() { } - - boolean isFertlized = false; - - public Egg yield() { - if (isFertlized){ - return new Egg(); - } - return null; - } - -} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/EarCorn.java b/src/main/java/com/zipcodewilmington/froilansfarm/EarCorn.java deleted file mode 100644 index 82628b9b..00000000 --- a/src/main/java/com/zipcodewilmington/froilansfarm/EarCorn.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.zipcodewilmington.froilansfarm; - -public class EarCorn implements Edible { - - public EarCorn() { - - } - -} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Eater.java b/src/main/java/com/zipcodewilmington/froilansfarm/Eater.java index 72b4bcf4..6e0d9ed4 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Eater.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Eater.java @@ -1,5 +1,7 @@ package com.zipcodewilmington.froilansfarm; -public interface Eater < T extends Edible > { +import com.zipcodewilmington.froilansfarm.Edible; + +public interface Eater < T extends Edible> { void eat(T edible); } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Farm.java b/src/main/java/com/zipcodewilmington/froilansfarm/Farm.java index 01f4cde6..098a89f5 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Farm.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Farm.java @@ -1,5 +1,9 @@ package com.zipcodewilmington.froilansfarm; +import com.zipcodewilmington.froilansfarm.Mammal.Chicken; +import com.zipcodewilmington.froilansfarm.Mammal.Horse; +import com.zipcodewilmington.froilansfarm.Mammal.Person; + public class Farm { private static Shelter farmhouse; private static Shelter stable; diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Farmer.java b/src/main/java/com/zipcodewilmington/froilansfarm/Farmer.java deleted file mode 100644 index 4539d876..00000000 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Farmer.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.zipcodewilmington.froilansfarm; - -public class Farmer extends Person implements Botanist{ - - public Farmer(String name) { - super(name); - } - - @Override - public void plant(Crop crop, CropRow cropRow) { - - } -} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/CornStalk.java b/src/main/java/com/zipcodewilmington/froilansfarm/Food/CornStalk.java similarity index 60% rename from src/main/java/com/zipcodewilmington/froilansfarm/CornStalk.java rename to src/main/java/com/zipcodewilmington/froilansfarm/Food/CornStalk.java index aa1aa23a..29993b37 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/CornStalk.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Food/CornStalk.java @@ -1,6 +1,6 @@ -package com.zipcodewilmington.froilansfarm; +package com.zipcodewilmington.froilansfarm.Food; -public class CornStalk extends Crop{ +public class CornStalk extends Crop { Integer capacity = 0; diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Crop.java b/src/main/java/com/zipcodewilmington/froilansfarm/Food/Crop.java similarity index 76% rename from src/main/java/com/zipcodewilmington/froilansfarm/Crop.java rename to src/main/java/com/zipcodewilmington/froilansfarm/Food/Crop.java index b3685297..25124bf8 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Crop.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Food/Crop.java @@ -1,4 +1,4 @@ -package com.zipcodewilmington.froilansfarm; +package com.zipcodewilmington.froilansfarm.Food; public class Crop { private Boolean fertilized = false; diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/CropRow.java b/src/main/java/com/zipcodewilmington/froilansfarm/Food/CropRow.java similarity index 62% rename from src/main/java/com/zipcodewilmington/froilansfarm/CropRow.java rename to src/main/java/com/zipcodewilmington/froilansfarm/Food/CropRow.java index d4869fd1..dfab4744 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/CropRow.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Food/CropRow.java @@ -1,8 +1,8 @@ -package com.zipcodewilmington.froilansfarm; +package com.zipcodewilmington.froilansfarm.Food; -import java.util.Arrays; +import com.zipcodewilmington.froilansfarm.Food.Crop; -public class CropRow extends Crop{ +public class CropRow extends Crop { private Integer amount; private Crop crop; diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Food/EarCorn.java b/src/main/java/com/zipcodewilmington/froilansfarm/Food/EarCorn.java new file mode 100644 index 00000000..ab88db0d --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Food/EarCorn.java @@ -0,0 +1,11 @@ +package com.zipcodewilmington.froilansfarm.Food; + +import com.zipcodewilmington.froilansfarm.Edible; + +public class EarCorn implements Edible { + + public EarCorn() { + + } + +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Egg.java b/src/main/java/com/zipcodewilmington/froilansfarm/Food/Egg.java similarity index 50% rename from src/main/java/com/zipcodewilmington/froilansfarm/Egg.java rename to src/main/java/com/zipcodewilmington/froilansfarm/Food/Egg.java index d3939685..ae09d05c 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Egg.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Food/Egg.java @@ -1,4 +1,6 @@ -package com.zipcodewilmington.froilansfarm; +package com.zipcodewilmington.froilansfarm.Food; + +import com.zipcodewilmington.froilansfarm.Edible; public class Egg implements Edible { diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Produce.java b/src/main/java/com/zipcodewilmington/froilansfarm/Food/Produce.java similarity index 69% rename from src/main/java/com/zipcodewilmington/froilansfarm/Produce.java rename to src/main/java/com/zipcodewilmington/froilansfarm/Food/Produce.java index b61ead8b..f193fff0 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Produce.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Food/Produce.java @@ -1,4 +1,6 @@ -package com.zipcodewilmington.froilansfarm; +package com.zipcodewilmington.froilansfarm.Food; + +import com.zipcodewilmington.froilansfarm.Edible; public class Produce implements Edible { private Boolean hasBeenFertilized; diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Food/Tomato.java b/src/main/java/com/zipcodewilmington/froilansfarm/Food/Tomato.java new file mode 100644 index 00000000..faf87834 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Food/Tomato.java @@ -0,0 +1,11 @@ +package com.zipcodewilmington.froilansfarm.Food; + +import com.zipcodewilmington.froilansfarm.Edible; + +public class Tomato implements Edible { + + public Tomato() { + + } + +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Food/TomatoPlant.java b/src/main/java/com/zipcodewilmington/froilansfarm/Food/TomatoPlant.java new file mode 100644 index 00000000..ff976201 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Food/TomatoPlant.java @@ -0,0 +1,15 @@ +package com.zipcodewilmington.froilansfarm.Food; + +import com.zipcodewilmington.froilansfarm.Food.Crop; +import com.zipcodewilmington.froilansfarm.Food.Tomato; + +public class TomatoPlant extends Crop { + + public Tomato yield() { + + Tomato tomato = new Tomato(); + + return tomato; + + } +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Horse.java b/src/main/java/com/zipcodewilmington/froilansfarm/Horse.java deleted file mode 100644 index fb4929b0..00000000 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Horse.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.zipcodewilmington.froilansfarm; - -//Horse can only eat Earcorn right now -// < Parameter type goes in here, "extends" - limits what the parameter type can be > - -public class Horse extends Animal implements Ridable { - - public Horse(String name) { - super(name); - } - - public Horse() { } - - public void ride() { - - } -} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/MainApplication.java b/src/main/java/com/zipcodewilmington/froilansfarm/MainApplication.java index fd743ffc..3b7cd3b6 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/MainApplication.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/MainApplication.java @@ -3,6 +3,10 @@ /** * Created by leon on 2/26/18. */ -public class MainApplication { +public class MainApplication implements Runnable { + @Override + public void run() { + + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Animal.java b/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Animal.java similarity index 68% rename from src/main/java/com/zipcodewilmington/froilansfarm/Animal.java rename to src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Animal.java index 427a171a..f87d8f67 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Animal.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Animal.java @@ -1,4 +1,8 @@ -package com.zipcodewilmington.froilansfarm; +package com.zipcodewilmington.froilansfarm.Mammal; + +import com.zipcodewilmington.froilansfarm.Eater; +import com.zipcodewilmington.froilansfarm.Edible; +import com.zipcodewilmington.froilansfarm.NoiseMaker; public abstract class Animal implements Eater, NoiseMaker { private String name; diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Chicken.java b/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Chicken.java new file mode 100644 index 00000000..b20c49c7 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Chicken.java @@ -0,0 +1,24 @@ +package com.zipcodewilmington.froilansfarm.Mammal; + +import com.zipcodewilmington.froilansfarm.Food.EarCorn; +import com.zipcodewilmington.froilansfarm.Edible; +import com.zipcodewilmington.froilansfarm.Food.Egg; + +public class Chicken extends Animal implements Edible { + + public Chicken(String name) { + super(name); + } + + public Chicken() { } + + boolean isFertlized = false; + + public Egg yield() { + if (isFertlized){ + return new Egg(); + } + return null; + } + +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Farmer.java b/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Farmer.java new file mode 100644 index 00000000..2d1a53bf --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Farmer.java @@ -0,0 +1,18 @@ +package com.zipcodewilmington.froilansfarm.Mammal; + +import com.zipcodewilmington.froilansfarm.Botanist; +import com.zipcodewilmington.froilansfarm.Food.Crop; +import com.zipcodewilmington.froilansfarm.Food.CropRow; +import com.zipcodewilmington.froilansfarm.Food.Produce; + +public class Farmer extends Person implements Botanist { + + public Farmer(String name) { + super(name); + } + + @Override + public void plant(Crop crop, CropRow cropRow) { + + } +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Horse.java b/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Horse.java new file mode 100644 index 00000000..2678e6c9 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Horse.java @@ -0,0 +1,21 @@ +package com.zipcodewilmington.froilansfarm.Mammal; + +//Horse can only eat Earcorn right now +// < Parameter type goes in here, "extends" - limits what the parameter type can be > + +import com.zipcodewilmington.froilansfarm.Food.EarCorn; +import com.zipcodewilmington.froilansfarm.Mammal.Animal; +import com.zipcodewilmington.froilansfarm.Ridable; + +public class Horse extends Animal implements Ridable { + + public Horse(String name) { + super(name); + } + + public Horse() { } + + public void ride() { + + } +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Person.java b/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Person.java similarity index 60% rename from src/main/java/com/zipcodewilmington/froilansfarm/Person.java rename to src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Person.java index e0bcbf34..4ae044a2 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Person.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Person.java @@ -1,6 +1,9 @@ -package com.zipcodewilmington.froilansfarm; +package com.zipcodewilmington.froilansfarm.Mammal; -public class Person implements Eater{ +import com.zipcodewilmington.froilansfarm.Edible; +import com.zipcodewilmington.froilansfarm.Eater; + +public class Person implements Eater { private String name; diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/ChickenCoop.java b/src/main/java/com/zipcodewilmington/froilansfarm/Structure/ChickenCoop.java similarity index 76% rename from src/main/java/com/zipcodewilmington/froilansfarm/ChickenCoop.java rename to src/main/java/com/zipcodewilmington/froilansfarm/Structure/ChickenCoop.java index dbc940a6..92266ef8 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/ChickenCoop.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Structure/ChickenCoop.java @@ -1,4 +1,7 @@ -package com.zipcodewilmington.froilansfarm; +package com.zipcodewilmington.froilansfarm.Structure; + +import com.zipcodewilmington.froilansfarm.Mammal.Chicken; +import com.zipcodewilmington.froilansfarm.Shelter; import java.util.ArrayList; import java.util.List; @@ -34,4 +37,8 @@ public Chicken getObjectByName(String name) { public void remove(Chicken chicken) { chickenList.remove(chicken); } + + public List getChickenList() { + return chickenList; + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/FarmHouse.java b/src/main/java/com/zipcodewilmington/froilansfarm/Structure/FarmHouse.java similarity index 75% rename from src/main/java/com/zipcodewilmington/froilansfarm/FarmHouse.java rename to src/main/java/com/zipcodewilmington/froilansfarm/Structure/FarmHouse.java index d85e7972..9f262bad 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/FarmHouse.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Structure/FarmHouse.java @@ -1,4 +1,7 @@ -package com.zipcodewilmington.froilansfarm; +package com.zipcodewilmington.froilansfarm.Structure; + +import com.zipcodewilmington.froilansfarm.Mammal.Person; +import com.zipcodewilmington.froilansfarm.Shelter; import java.util.ArrayList; import java.util.List; @@ -32,4 +35,8 @@ public Person getObjectByName(String name) { public void remove(Person person) { personList.remove(person); } + + public List getPersonList() { + return personList; + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Stable.java b/src/main/java/com/zipcodewilmington/froilansfarm/Structure/Stable.java similarity index 75% rename from src/main/java/com/zipcodewilmington/froilansfarm/Stable.java rename to src/main/java/com/zipcodewilmington/froilansfarm/Structure/Stable.java index b6bfc85b..14877f4c 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Stable.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Structure/Stable.java @@ -1,4 +1,7 @@ -package com.zipcodewilmington.froilansfarm; +package com.zipcodewilmington.froilansfarm.Structure; + +import com.zipcodewilmington.froilansfarm.Mammal.Horse; +import com.zipcodewilmington.froilansfarm.Shelter; import java.util.ArrayList; import java.util.List; @@ -32,4 +35,8 @@ public Horse getObjectByName(String name) { public void remove(Horse horse) { horseList.remove(horse); } + + public List getHorseList() { + return horseList; + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Tomato.java b/src/main/java/com/zipcodewilmington/froilansfarm/Tomato.java deleted file mode 100644 index 26be5f9c..00000000 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Tomato.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.zipcodewilmington.froilansfarm; - -public class Tomato implements Edible { - - public Tomato() { - - } - -} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/TomatoPlant.java b/src/main/java/com/zipcodewilmington/froilansfarm/TomatoPlant.java deleted file mode 100644 index aae499fd..00000000 --- a/src/main/java/com/zipcodewilmington/froilansfarm/TomatoPlant.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.zipcodewilmington.froilansfarm; - -public class TomatoPlant extends Crop{ - - public Tomato yield() { - - Tomato tomato = new Tomato(); - - return tomato; - - } -} diff --git a/src/main/java/Vehicles/Aircraft.java b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Aircraft.java similarity index 74% rename from src/main/java/Vehicles/Aircraft.java rename to src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Aircraft.java index 28651a45..90951966 100644 --- a/src/main/java/Vehicles/Aircraft.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Aircraft.java @@ -1,6 +1,4 @@ -package Vehicles; - -import com.zipcodewilmington.froilansfarm.Farm; +package com.zipcodewilmington.froilansfarm.Vehicles; public class Aircraft implements Vehicle{ void fly(){} diff --git a/src/main/java/Vehicles/CropDuster.java b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDuster.java similarity index 52% rename from src/main/java/Vehicles/CropDuster.java rename to src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDuster.java index 19568559..6234449e 100644 --- a/src/main/java/Vehicles/CropDuster.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDuster.java @@ -1,6 +1,6 @@ -package Vehicles; +package com.zipcodewilmington.froilansfarm.Vehicles; -import com.zipcodewilmington.froilansfarm.CropRow; +import com.zipcodewilmington.froilansfarm.Food.CropRow; public abstract class CropDuster extends Aircraft{ public void fertilize(CropRow row){ 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..d9227959 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/FarmVehicle.java @@ -0,0 +1,5 @@ +package com.zipcodewilmington.froilansfarm.Vehicles; + +public interface FarmVehicle extends Vehicle{ + void operate(); // +} diff --git a/src/main/java/Vehicles/Tractor.java b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Tractor.java similarity index 69% rename from src/main/java/Vehicles/Tractor.java rename to src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Tractor.java index 0e459070..09fc332f 100644 --- a/src/main/java/Vehicles/Tractor.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Tractor.java @@ -1,6 +1,6 @@ -package Vehicles; +package com.zipcodewilmington.froilansfarm.Vehicles; -import com.zipcodewilmington.froilansfarm.Crop; +import com.zipcodewilmington.froilansfarm.Food.Crop; public class Tractor implements FarmVehicle{ public Crop harvest(Crop crop){ diff --git a/src/main/java/Vehicles/Vehicle.java b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Vehicle.java similarity index 75% rename from src/main/java/Vehicles/Vehicle.java rename to src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Vehicle.java index c49a3d3f..48ce9250 100644 --- a/src/main/java/Vehicles/Vehicle.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Vehicle.java @@ -1,4 +1,4 @@ -package Vehicles; +package com.zipcodewilmington.froilansfarm.Vehicles; import com.zipcodewilmington.froilansfarm.NoiseMaker; import com.zipcodewilmington.froilansfarm.Ridable; diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/ChickenCoopTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/ChickenCoopTest.java index f305b522..074bda69 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/ChickenCoopTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/ChickenCoopTest.java @@ -1,5 +1,7 @@ package com.zipcodewilmington.froilansfarm; +import com.zipcodewilmington.froilansfarm.Mammal.Chicken; +import com.zipcodewilmington.froilansfarm.Structure.ChickenCoop; import org.junit.Assert; import org.junit.Test; @@ -13,7 +15,7 @@ public void testAdd() { ChickenCoop chickenCoop = new ChickenCoop(); chickenCoop.add(chicken); //then - Assert.assertTrue(chickenCoop.chickenList.contains(chicken)); + Assert.assertTrue(chickenCoop.getChickenList().contains(chicken)); } @Test @@ -27,6 +29,6 @@ public void testRemove() { chickenCoop.add(chicken2); chickenCoop.remove(chicken1); //then - Assert.assertFalse(chickenCoop.chickenList.contains(chicken1)); + Assert.assertFalse(chickenCoop.getChickenList().contains(chicken1)); } } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/FarmHouseTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/FarmHouseTest.java index 6576f2de..3998eaae 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/FarmHouseTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/FarmHouseTest.java @@ -1,5 +1,8 @@ package com.zipcodewilmington.froilansfarm; +import com.zipcodewilmington.froilansfarm.Mammal.Farmer; +import com.zipcodewilmington.froilansfarm.Mammal.Person; +import com.zipcodewilmington.froilansfarm.Structure.FarmHouse; import org.junit.Assert; import org.junit.Test; @@ -14,7 +17,7 @@ public void testAdd() { FarmHouse farmhouse = new FarmHouse(); farmhouse.add(person); //then - Assert.assertTrue(farmhouse.personList.contains(person)); + Assert.assertTrue(farmhouse.getPersonList().contains(person)); } @Test @@ -28,7 +31,7 @@ public void testRemove() { farmhouse.add(person2); farmhouse.remove(person1); //then - Assert.assertFalse(farmhouse.personList.contains(person1)); + Assert.assertFalse(farmhouse.getPersonList().contains(person1)); } // @Test diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/FarmerTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/FarmerTest.java index 1d3ccee6..fc79b78e 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/FarmerTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/FarmerTest.java @@ -1,5 +1,7 @@ package com.zipcodewilmington.froilansfarm; +import com.zipcodewilmington.froilansfarm.Mammal.Farmer; +import com.zipcodewilmington.froilansfarm.Mammal.Person; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/PersonTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/PersonTest.java index 416d2226..8569eb78 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/PersonTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/PersonTest.java @@ -1,5 +1,6 @@ package com.zipcodewilmington.froilansfarm; +import com.zipcodewilmington.froilansfarm.Mammal.Person; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/StableTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/StableTest.java index 8714fd18..277eeb95 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/StableTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/StableTest.java @@ -1,5 +1,7 @@ package com.zipcodewilmington.froilansfarm; +import com.zipcodewilmington.froilansfarm.Mammal.Horse; +import com.zipcodewilmington.froilansfarm.Structure.Stable; import org.junit.Assert; import org.junit.Test; @@ -13,7 +15,7 @@ public void testAdd() { Stable stable = new Stable(); stable.add(horse); //then - Assert.assertTrue(stable.horseList.contains(horse)); + Assert.assertTrue(stable.getHorseList().contains(horse)); } @Test @@ -27,6 +29,6 @@ public void testRemove() { stable.add(horse2); stable.remove(horse1); //then - Assert.assertFalse(stable.horseList.contains(horse1)); + Assert.assertFalse(stable.getHorseList().contains(horse1)); } } From fdad0d55b4284d2ec0a94a7eba0a03ac75deae4d Mon Sep 17 00:00:00 2001 From: Nathan Date: Wed, 21 Jul 2021 19:33:34 -0400 Subject: [PATCH 029/100] makeNoise override --- .../com/zipcodewilmington/froilansfarm/Mammal/Animal.java | 4 +--- .../com/zipcodewilmington/froilansfarm/Mammal/Chicken.java | 5 +++++ .../com/zipcodewilmington/froilansfarm/Mammal/Horse.java | 7 +++++-- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Animal.java b/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Animal.java index f87d8f67..199c816f 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Animal.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Animal.java @@ -15,9 +15,7 @@ public void eat(T edible) { } - public String makeNoise() { - return null; - } + public abstract String makeNoise(); public Animal(String name) { this.name = name; diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Chicken.java b/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Chicken.java index b20c49c7..14d5695a 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Chicken.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Chicken.java @@ -12,6 +12,11 @@ public Chicken(String name) { public Chicken() { } + @Override + public String makeNoise() { + return "Cluck CLuck"; + } + boolean isFertlized = false; public Egg yield() { diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Horse.java b/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Horse.java index 2678e6c9..5163c3f6 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Horse.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Horse.java @@ -13,9 +13,12 @@ public Horse(String name) { super(name); } - public Horse() { } + public Horse() {} - public void ride() { + public void ride() {} + @Override + public String makeNoise(){ + return "Neigh"; } } From 30a7a7ca811812ed0e20b48f43b75e6c2c5f8296 Mon Sep 17 00:00:00 2001 From: Jeremy Date: Wed, 21 Jul 2021 19:52:53 -0400 Subject: [PATCH 030/100] added Rideable --- .../java/com/zipcodewilmington/froilansfarm/Rider.java | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Rider.java diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Rider.java b/src/main/java/com/zipcodewilmington/froilansfarm/Rider.java new file mode 100644 index 00000000..1b465f53 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Rider.java @@ -0,0 +1,8 @@ +package com.zipcodewilmington.froilansfarm; + +public interface Rider { + + void mount(R rideable); + void dismount(R rideable); + +} From 8bd83a01186155471cc8b144eea41f5fba968c80 Mon Sep 17 00:00:00 2001 From: Nathan Date: Wed, 21 Jul 2021 19:55:30 -0400 Subject: [PATCH 031/100] hello --- .../com/zipcodewilmington/froilansfarm/Mammal/Person.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Person.java b/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Person.java index 4ae044a2..5fea563b 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Person.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Person.java @@ -2,8 +2,9 @@ import com.zipcodewilmington.froilansfarm.Edible; import com.zipcodewilmington.froilansfarm.Eater; +import com.zipcodewilmington.froilansfarm.NoiseMaker; -public class Person implements Eater { +public class Person implements Eater, NoiseMaker { private String name; @@ -27,4 +28,9 @@ public void setName(String name) { public void eat(T edible) { } + + @Override + public String makeNoise() { + return "Hello"; + } } From ca86be57dbbf26eea23880917a1de09c34a92584 Mon Sep 17 00:00:00 2001 From: jgiroso Date: Wed, 21 Jul 2021 19:57:30 -0400 Subject: [PATCH 032/100] added instanceof tests --- .../froilansfarm/ChickenCoopTest.java | 6 ++++++ .../froilansfarm/FarmHouseTest.java | 6 ++++++ .../zipcodewilmington/froilansfarm/FarmerTest.java | 12 ++++++++++++ .../zipcodewilmington/froilansfarm/PersonTest.java | 6 ++++++ .../zipcodewilmington/froilansfarm/StableTest.java | 6 ++++++ 5 files changed, 36 insertions(+) diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/ChickenCoopTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/ChickenCoopTest.java index 074bda69..51a1f5b2 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/ChickenCoopTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/ChickenCoopTest.java @@ -31,4 +31,10 @@ public void testRemove() { //then Assert.assertFalse(chickenCoop.getChickenList().contains(chicken1)); } + + @Test + public void testImplementation() { + ChickenCoop chickenCoop = new ChickenCoop(); + Assert.assertTrue(chickenCoop instanceof Shelter); + } } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/FarmHouseTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/FarmHouseTest.java index 3998eaae..bcd09776 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/FarmHouseTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/FarmHouseTest.java @@ -34,6 +34,12 @@ public void testRemove() { Assert.assertFalse(farmhouse.getPersonList().contains(person1)); } + @Test + public void testImplementation() { + FarmHouse farmhouse = new FarmHouse(); + Assert.assertTrue(farmhouse instanceof Shelter); + } + // @Test // public void testGetName() { // //given diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/FarmerTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/FarmerTest.java index fc79b78e..be9b1895 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/FarmerTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/FarmerTest.java @@ -17,4 +17,16 @@ public void testSetName() { //then Assert.assertEquals(expected, actual); } + + @Test + public void testInheritance() { + Farmer farmer = new Farmer("Annette"); + Assert.assertTrue(farmer instanceof Person); + } + + @Test + public void testImplementation() { + Farmer farmer = new Farmer("Joe"); + Assert.assertTrue(farmer instanceof Botanist); + } } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/PersonTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/PersonTest.java index 8569eb78..a134f426 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/PersonTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/PersonTest.java @@ -27,4 +27,10 @@ public void testSetName() { //then Assert.assertEquals(expected, actual); } + + @Test + public void testImplementation() { + Person person = new Person("Jonah"); + Assert.assertTrue(person instanceof Eater); + } } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/StableTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/StableTest.java index 277eeb95..3661d8c9 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/StableTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/StableTest.java @@ -31,4 +31,10 @@ public void testRemove() { //then Assert.assertFalse(stable.getHorseList().contains(horse1)); } + + @Test + public void testImplementation() { + Stable stable = new Stable(); + Assert.assertTrue(stable instanceof Shelter); + } } From 13d55d2d2fa2d8b9341b4dcefb6d5f823ad6f627 Mon Sep 17 00:00:00 2001 From: Nathan Date: Wed, 21 Jul 2021 19:59:43 -0400 Subject: [PATCH 033/100] finished farmer class --- .../froilansfarm/Mammal/Farmer.java | 21 ++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Farmer.java b/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Farmer.java index 2d1a53bf..8e831b02 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Farmer.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Farmer.java @@ -4,8 +4,12 @@ import com.zipcodewilmington.froilansfarm.Food.Crop; import com.zipcodewilmington.froilansfarm.Food.CropRow; import com.zipcodewilmington.froilansfarm.Food.Produce; +import com.zipcodewilmington.froilansfarm.Ridable; +import com.zipcodewilmington.froilansfarm.Rider; -public class Farmer extends Person implements Botanist { +public class Farmer extends Person implements Botanist, Rider { + + private Ridable isRiding = null; public Farmer(String name) { super(name); @@ -15,4 +19,19 @@ public Farmer(String name) { public void plant(Crop crop, CropRow cropRow) { } + + @Override + public String makeNoise(){ + return "Howdy"; + } + + @Override + public void mount(Ridable rideable) { + this.isRiding = rideable; + } + + @Override + public void dismount(Ridable rideable) { + this.isRiding = null; + } } From 5addea1e7dab96aa1ab6749270c8c4194847cf73 Mon Sep 17 00:00:00 2001 From: Nathan Date: Wed, 21 Jul 2021 20:38:19 -0400 Subject: [PATCH 034/100] made changes to interfaces --- .../froilansfarm/MainApplication.java | 18 +++++++++++++++--- .../froilansfarm/Mammal/Animal.java | 4 +++- .../froilansfarm/Mammal/Person.java | 6 +++--- .../froilansfarm/NoiseMaker.java | 4 +++- 4 files changed, 24 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/MainApplication.java b/src/main/java/com/zipcodewilmington/froilansfarm/MainApplication.java index 3b7cd3b6..154558ff 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/MainApplication.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/MainApplication.java @@ -1,12 +1,24 @@ package com.zipcodewilmington.froilansfarm; +import com.zipcodewilmington.froilansfarm.Mammal.Animal; +import com.zipcodewilmington.froilansfarm.Mammal.Chicken; +import com.zipcodewilmington.froilansfarm.Mammal.Person; + /** * Created by leon on 2/26/18. */ -public class MainApplication implements Runnable { +public class MainApplication{ - @Override - public void run() { + public static void main(String[] args) { + run(); + } + public static void run() { + Person person1 = new Person(); + System.out.println(person1.makeNoise()); + Animal chicken1 = new Chicken(); + System.out.println(chicken1.makeNoise()); } + + } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Animal.java b/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Animal.java index 199c816f..f87d8f67 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Animal.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Animal.java @@ -15,7 +15,9 @@ public void eat(T edible) { } - public abstract String makeNoise(); + public String makeNoise() { + return null; + } public Animal(String name) { this.name = name; diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Person.java b/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Person.java index 5fea563b..121fab7f 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Person.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Person.java @@ -26,11 +26,11 @@ public void setName(String name) { @Override public void eat(T edible) { - } @Override - public String makeNoise() { - return "Hello"; + public String makeNoise(){ + return "Hello, im suffering"; } + } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/NoiseMaker.java b/src/main/java/com/zipcodewilmington/froilansfarm/NoiseMaker.java index ba1f1e20..32c142d1 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/NoiseMaker.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/NoiseMaker.java @@ -1,5 +1,7 @@ package com.zipcodewilmington.froilansfarm; public interface NoiseMaker { - String makeNoise(); + default String makeNoise() { + return "Ahhhhhhh"; + } } From 56c7a5a5d57138719f7de7a20f8f25d9e385fc7e Mon Sep 17 00:00:00 2001 From: Jeremy Date: Wed, 21 Jul 2021 20:52:46 -0400 Subject: [PATCH 035/100] added method --- .../froilansfarm/Food/Produce.java | 13 +++---------- .../froilansfarm/Mammal/Horse.java | 4 +++- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Food/Produce.java b/src/main/java/com/zipcodewilmington/froilansfarm/Food/Produce.java index f193fff0..c2423d62 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Food/Produce.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Food/Produce.java @@ -2,14 +2,7 @@ import com.zipcodewilmington.froilansfarm.Edible; -public class Produce implements Edible { - private Boolean hasBeenFertilized; - - private Produce yield() { - if(this.hasBeenFertilized){ - return this; - } else { - return null; - } - } +public interface Produce { + Boolean isFertilized = null; + Edible yield(); } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Horse.java b/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Horse.java index 5163c3f6..e89d975e 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Horse.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Horse.java @@ -15,7 +15,9 @@ public Horse(String name) { public Horse() {} - public void ride() {} + public void ride() { + + } @Override public String makeNoise(){ From 861f2539c74967566f50ad5b77d98def68fda2f0 Mon Sep 17 00:00:00 2001 From: Nathan Date: Wed, 21 Jul 2021 20:52:52 -0400 Subject: [PATCH 036/100] new stuff --- .../com/zipcodewilmington/froilansfarm/MainApplication.java | 4 ++++ .../com/zipcodewilmington/froilansfarm/Mammal/Farmer.java | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/MainApplication.java b/src/main/java/com/zipcodewilmington/froilansfarm/MainApplication.java index 154558ff..21cef2cc 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/MainApplication.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/MainApplication.java @@ -2,6 +2,7 @@ import com.zipcodewilmington.froilansfarm.Mammal.Animal; import com.zipcodewilmington.froilansfarm.Mammal.Chicken; +import com.zipcodewilmington.froilansfarm.Mammal.Farmer; import com.zipcodewilmington.froilansfarm.Mammal.Person; /** @@ -18,6 +19,9 @@ public static void run() { System.out.println(person1.makeNoise()); Animal chicken1 = new Chicken(); System.out.println(chicken1.makeNoise()); + Person farmer1 = new Farmer(); + System.out.println(farmer1.makeNoise()); + } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Farmer.java b/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Farmer.java index 8e831b02..37af3aaa 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Farmer.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Farmer.java @@ -15,6 +15,10 @@ public Farmer(String name) { super(name); } + public Farmer() { + super("Froilan"); + } + @Override public void plant(Crop crop, CropRow cropRow) { From 062d722830802b2bd687dfdb0777aa57dfd961ac Mon Sep 17 00:00:00 2001 From: Nathan Date: Wed, 21 Jul 2021 22:58:08 -0400 Subject: [PATCH 037/100] added lotsa codes --- .../zipcodewilmington/froilansfarm/Eater.java | 2 +- .../zipcodewilmington/froilansfarm/Field.java | 5 +++- .../froilansfarm/Food/CornStalk.java | 16 +++++++------ .../froilansfarm/Food/Crop.java | 24 +++++++++++++++---- .../froilansfarm/Food/CropRow.java | 22 ++++++++++++++--- .../froilansfarm/Food/TomatoPlant.java | 12 +++++----- .../froilansfarm/Mammal/Chicken.java | 8 ++++--- .../froilansfarm/Mammal/Farmer.java | 15 +++++++----- .../froilansfarm/Mammal/Horse.java | 17 +++++++------ .../froilansfarm/Ridable.java | 5 ---- .../froilansfarm/Rideable.java | 6 +++++ .../zipcodewilmington/froilansfarm/Rider.java | 2 +- .../froilansfarm/Structure/FarmHouse.java | 2 -- .../froilansfarm/Vehicles/Aircraft.java | 14 ++++++++++- .../froilansfarm/Vehicles/CropDuster.java | 6 +++-- .../froilansfarm/Vehicles/FarmVehicle.java | 4 +++- .../froilansfarm/Vehicles/Tractor.java | 15 ++++++++---- .../froilansfarm/Vehicles/Vehicle.java | 4 ++-- 18 files changed, 123 insertions(+), 56 deletions(-) delete mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Ridable.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 index 6e0d9ed4..c89071f0 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Eater.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Eater.java @@ -2,6 +2,6 @@ import com.zipcodewilmington.froilansfarm.Edible; -public interface Eater < T extends Edible> { +public interface Eater < T extends Edible > { void eat(T edible); } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Field.java b/src/main/java/com/zipcodewilmington/froilansfarm/Field.java index 6358c3d8..59185d5d 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Field.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Field.java @@ -1,5 +1,8 @@ package com.zipcodewilmington.froilansfarm; +import com.zipcodewilmington.froilansfarm.Food.CropRow; + +import java.util.List; public class Field { - + private List myField; } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Food/CornStalk.java b/src/main/java/com/zipcodewilmington/froilansfarm/Food/CornStalk.java index 29993b37..8ee7420b 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Food/CornStalk.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Food/CornStalk.java @@ -1,14 +1,16 @@ package com.zipcodewilmington.froilansfarm.Food; public class CornStalk extends Crop { - Integer capacity = 0; + public CornStalk(){ + } - - public EarCorn earCorn () { - - EarCorn earCorn = new EarCorn(); - - return earCorn; + @Override + public EarCorn yield () { + if(this.checkFertilized() && this.checkHarvested()){ + return new EarCorn(); + } + return null; } + } \ No newline at end of file diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Food/Crop.java b/src/main/java/com/zipcodewilmington/froilansfarm/Food/Crop.java index 25124bf8..e976e50a 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Food/Crop.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Food/Crop.java @@ -1,13 +1,29 @@ package com.zipcodewilmington.froilansfarm.Food; -public class Crop { - private Boolean fertilized = false; +import com.zipcodewilmington.froilansfarm.Edible; - public Crop(){ - } +public abstract class Crop implements Produce { + private Boolean fertilized = false; + private Boolean isHarvested = false; public void fertilize(){ this.fertilized = true; } + @Override + public Edible yield() { + return null; + } + + public Boolean checkFertilized() { + return fertilized; + } + + public Boolean checkHarvested() { + return isHarvested; + } + + public void setHarvested(Boolean harvested) { + isHarvested = harvested; + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Food/CropRow.java b/src/main/java/com/zipcodewilmington/froilansfarm/Food/CropRow.java index dfab4744..0dd30b47 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Food/CropRow.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Food/CropRow.java @@ -6,12 +6,28 @@ public class CropRow extends Crop { private Integer amount; private Crop crop; - public CropRow(Crop crop, Integer amount){ - this.crop = crop; - this.amount = amount; + public CropRow(){ + this.amount = 0; + this.crop = null; } public void fertilize(){ super.fertilize(); } + + public Integer getAmount() { + return amount; + } + + public void setAmount(Integer amount) { + this.amount = amount; + } + + public Crop getCrop() { + return crop; + } + + public void setCrop(Crop crop) { + this.crop = crop; + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Food/TomatoPlant.java b/src/main/java/com/zipcodewilmington/froilansfarm/Food/TomatoPlant.java index ff976201..567bb3ba 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Food/TomatoPlant.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Food/TomatoPlant.java @@ -5,11 +5,11 @@ public class TomatoPlant extends Crop { - public Tomato yield() { - - Tomato tomato = new Tomato(); - - return tomato; - + @Override + public Tomato yield() { + if(this.checkFertilized() && this.checkHarvested()){ + return new Tomato(); } + return null; + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Chicken.java b/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Chicken.java index 14d5695a..34144ba0 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Chicken.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Chicken.java @@ -3,8 +3,9 @@ import com.zipcodewilmington.froilansfarm.Food.EarCorn; import com.zipcodewilmington.froilansfarm.Edible; import com.zipcodewilmington.froilansfarm.Food.Egg; +import com.zipcodewilmington.froilansfarm.Food.Produce; -public class Chicken extends Animal implements Edible { +public class Chicken extends Animal implements Edible, Produce { public Chicken(String name) { super(name); @@ -17,10 +18,11 @@ public String makeNoise() { return "Cluck CLuck"; } - boolean isFertlized = false; + boolean isFertilized = false; + @Override public Egg yield() { - if (isFertlized){ + if (isFertilized){ return new Egg(); } return null; diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Farmer.java b/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Farmer.java index 37af3aaa..4bdf1a5d 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Farmer.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Farmer.java @@ -1,15 +1,16 @@ package com.zipcodewilmington.froilansfarm.Mammal; import com.zipcodewilmington.froilansfarm.Botanist; +import com.zipcodewilmington.froilansfarm.Edible; import com.zipcodewilmington.froilansfarm.Food.Crop; import com.zipcodewilmington.froilansfarm.Food.CropRow; import com.zipcodewilmington.froilansfarm.Food.Produce; -import com.zipcodewilmington.froilansfarm.Ridable; +import com.zipcodewilmington.froilansfarm.Rideable; import com.zipcodewilmington.froilansfarm.Rider; -public class Farmer extends Person implements Botanist, Rider { +public class Farmer extends Person implements Botanist, Rider { - private Ridable isRiding = null; + private Rideable isRiding = null; public Farmer(String name) { super(name); @@ -21,7 +22,9 @@ public Farmer() { @Override public void plant(Crop crop, CropRow cropRow) { - + cropRow.setCrop(crop); + Integer current = cropRow.getAmount(); + cropRow.setAmount(current + 1); } @Override @@ -30,12 +33,12 @@ public String makeNoise(){ } @Override - public void mount(Ridable rideable) { + public void mount(Rideable rideable) { this.isRiding = rideable; } @Override - public void dismount(Ridable rideable) { + public void dismount(Rideable rideable) { this.isRiding = null; } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Horse.java b/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Horse.java index e89d975e..c27cfbd0 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Horse.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Horse.java @@ -4,10 +4,12 @@ // < Parameter type goes in here, "extends" - limits what the parameter type can be > import com.zipcodewilmington.froilansfarm.Food.EarCorn; -import com.zipcodewilmington.froilansfarm.Mammal.Animal; -import com.zipcodewilmington.froilansfarm.Ridable; +import com.zipcodewilmington.froilansfarm.Rideable; +import com.zipcodewilmington.froilansfarm.Rider; -public class Horse extends Animal implements Ridable { +public class Horse extends Animal implements Rideable { + + private Farmer rider; public Horse(String name) { super(name); @@ -15,12 +17,13 @@ public Horse(String name) { public Horse() {} - public void ride() { - - } - @Override public String makeNoise(){ return "Neigh"; } + + @Override + public void ride(Farmer rider) { + this.rider = rider; + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Ridable.java b/src/main/java/com/zipcodewilmington/froilansfarm/Ridable.java deleted file mode 100644 index 3a8a0975..00000000 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Ridable.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.zipcodewilmington.froilansfarm; - -public interface Ridable { - void ride(); -} 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..351d9af1 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Rideable.java @@ -0,0 +1,6 @@ +package com.zipcodewilmington.froilansfarm; + +public interface Rideable { + + void ride(R rider); +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Rider.java b/src/main/java/com/zipcodewilmington/froilansfarm/Rider.java index 1b465f53..d63747fe 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Rider.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Rider.java @@ -1,6 +1,6 @@ package com.zipcodewilmington.froilansfarm; -public interface Rider { +public interface Rider { void mount(R rideable); void dismount(R rideable); diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Structure/FarmHouse.java b/src/main/java/com/zipcodewilmington/froilansfarm/Structure/FarmHouse.java index 9f262bad..36677fa4 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Structure/FarmHouse.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Structure/FarmHouse.java @@ -9,10 +9,8 @@ public class FarmHouse implements Shelter { List personList = new ArrayList(); - Person person; public FarmHouse(Person person) { - this.person = person; this.personList = personList; } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Aircraft.java b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Aircraft.java index 90951966..031ee8a6 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Aircraft.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Aircraft.java @@ -1,13 +1,25 @@ package com.zipcodewilmington.froilansfarm.Vehicles; +import com.zipcodewilmington.froilansfarm.Rider; + public class Aircraft implements Vehicle{ - void fly(){} + + public void fly(){} public String makeNoise() { return "Bzzzzeewwwwwwwwwww Rat-tat-tat-tat-tat"; } + public String shoot(){ + return "BULLETS"; + } + public void ride() { } + + @Override + public void ride(Rider rider) { + + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDuster.java b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDuster.java index 6234449e..c09c63e2 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDuster.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDuster.java @@ -2,8 +2,10 @@ import com.zipcodewilmington.froilansfarm.Food.CropRow; -public abstract class CropDuster extends Aircraft{ - public void fertilize(CropRow row){ +public abstract class CropDuster extends Aircraft implements FarmVehicle{ + + public void fertilizeCrop(CropRow row){ row.fertilize(); } + } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/FarmVehicle.java b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/FarmVehicle.java index d9227959..95694db0 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/FarmVehicle.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/FarmVehicle.java @@ -1,5 +1,7 @@ package com.zipcodewilmington.froilansfarm.Vehicles; +import com.zipcodewilmington.froilansfarm.Farm; + public interface FarmVehicle extends Vehicle{ - void operate(); // + void operate(Farm farm); // } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Tractor.java b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Tractor.java index 09fc332f..e4881574 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Tractor.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Tractor.java @@ -1,21 +1,28 @@ package com.zipcodewilmington.froilansfarm.Vehicles; +import com.zipcodewilmington.froilansfarm.Farm; import com.zipcodewilmington.froilansfarm.Food.Crop; +import com.zipcodewilmington.froilansfarm.Rider; public class Tractor implements FarmVehicle{ + public Crop harvest(Crop crop){ return null; } - public void operate() { - - } public String makeNoise() { return null; } - public void ride() { + + @Override + public void ride(Rider rider) { + + } + + @Override + public void operate(Farm farm) { } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Vehicle.java b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Vehicle.java index 48ce9250..931ff10c 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Vehicle.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Vehicle.java @@ -1,7 +1,7 @@ package com.zipcodewilmington.froilansfarm.Vehicles; import com.zipcodewilmington.froilansfarm.NoiseMaker; -import com.zipcodewilmington.froilansfarm.Ridable; +import com.zipcodewilmington.froilansfarm.Rideable; -public interface Vehicle extends NoiseMaker, Ridable { +public interface Vehicle extends NoiseMaker, Rideable { } From 80fa18e962701629cc38725c316515ab3830bcd1 Mon Sep 17 00:00:00 2001 From: jgiroso Date: Wed, 21 Jul 2021 23:15:20 -0400 Subject: [PATCH 038/100] Mammal tests done --- .../froilansfarm/Mammal/Farmer.java | 3 +- .../froilansfarm/MammalTests/ChickenTest.java | 44 +++++++++++++++++++ .../{ => MammalTests}/FarmerTest.java | 3 +- .../froilansfarm/MammalTests/HorseTest.java | 37 ++++++++++++++++ .../{ => MammalTests}/PersonTest.java | 3 +- .../{ => StructureTests}/ChickenCoopTest.java | 3 +- .../{ => StructureTests}/FarmHouseTest.java | 3 +- .../{ => StructureTests}/StableTest.java | 3 +- 8 files changed, 93 insertions(+), 6 deletions(-) create mode 100644 src/test/java/com/zipcodewilmington/froilansfarm/MammalTests/ChickenTest.java rename src/test/java/com/zipcodewilmington/froilansfarm/{ => MammalTests}/FarmerTest.java (87%) create mode 100644 src/test/java/com/zipcodewilmington/froilansfarm/MammalTests/HorseTest.java rename src/test/java/com/zipcodewilmington/froilansfarm/{ => MammalTests}/PersonTest.java (88%) rename src/test/java/com/zipcodewilmington/froilansfarm/{ => StructureTests}/ChickenCoopTest.java (90%) rename src/test/java/com/zipcodewilmington/froilansfarm/{ => StructureTests}/FarmHouseTest.java (93%) rename src/test/java/com/zipcodewilmington/froilansfarm/{ => StructureTests}/StableTest.java (89%) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Farmer.java b/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Farmer.java index 37af3aaa..71101670 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Farmer.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Farmer.java @@ -1,13 +1,14 @@ package com.zipcodewilmington.froilansfarm.Mammal; import com.zipcodewilmington.froilansfarm.Botanist; +import com.zipcodewilmington.froilansfarm.Edible; import com.zipcodewilmington.froilansfarm.Food.Crop; import com.zipcodewilmington.froilansfarm.Food.CropRow; import com.zipcodewilmington.froilansfarm.Food.Produce; import com.zipcodewilmington.froilansfarm.Ridable; import com.zipcodewilmington.froilansfarm.Rider; -public class Farmer extends Person implements Botanist, Rider { +public class Farmer extends Person implements Botanist, Rider { private Ridable isRiding = null; diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/MammalTests/ChickenTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/MammalTests/ChickenTest.java new file mode 100644 index 00000000..b4311b4a --- /dev/null +++ b/src/test/java/com/zipcodewilmington/froilansfarm/MammalTests/ChickenTest.java @@ -0,0 +1,44 @@ +package com.zipcodewilmington.froilansfarm.MammalTests; + +import com.zipcodewilmington.froilansfarm.Edible; +import com.zipcodewilmington.froilansfarm.Mammal.Animal; +import com.zipcodewilmington.froilansfarm.Mammal.Chicken; +import org.junit.Assert; +import org.junit.Test; + +public class ChickenTest { + + @Test + public void testConstructor() { + //given + String expected = "Franklin"; + //when + Chicken chicken = new Chicken(expected); + String actual = chicken.getName(); + //then + Assert.assertEquals(expected, actual); + } + + @Test + public void testSetName() { + //given + String expected = "Theodore"; + //when + Chicken chicken = new Chicken(expected); + String actual = chicken.getName(); + //then + Assert.assertEquals(expected, actual); + } + + @Test + public void testInheritance() { + Chicken chicken = new Chicken("Clucks"); + Assert.assertTrue(chicken instanceof Animal); + } + + @Test + public void testImplementation() { + Chicken chicken = new Chicken("Fluffers"); + Assert.assertTrue(chicken instanceof Edible); + } +} diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/FarmerTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/MammalTests/FarmerTest.java similarity index 87% rename from src/test/java/com/zipcodewilmington/froilansfarm/FarmerTest.java rename to src/test/java/com/zipcodewilmington/froilansfarm/MammalTests/FarmerTest.java index be9b1895..8f41b32a 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/FarmerTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/MammalTests/FarmerTest.java @@ -1,5 +1,6 @@ -package com.zipcodewilmington.froilansfarm; +package com.zipcodewilmington.froilansfarm.MammalTests; +import com.zipcodewilmington.froilansfarm.Botanist; import com.zipcodewilmington.froilansfarm.Mammal.Farmer; import com.zipcodewilmington.froilansfarm.Mammal.Person; import org.junit.Assert; diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/MammalTests/HorseTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/MammalTests/HorseTest.java new file mode 100644 index 00000000..a3499f48 --- /dev/null +++ b/src/test/java/com/zipcodewilmington/froilansfarm/MammalTests/HorseTest.java @@ -0,0 +1,37 @@ +package com.zipcodewilmington.froilansfarm.MammalTests; + +import com.zipcodewilmington.froilansfarm.Edible; +import com.zipcodewilmington.froilansfarm.Mammal.Horse; +import org.junit.Assert; +import org.junit.Test; + +public class HorseTest { + + @Test + public void testConstructor() { + //given + String expected = "Cyan"; + //when + Horse horse = new Horse(expected); + String actual = horse.getName(); + //then + Assert.assertEquals(expected, actual); + } + + @Test + public void testSetName() { + //given + String expected = "Spring"; + //when + Horse horse = new Horse(expected); + String actual = horse.getName(); + //then + Assert.assertEquals(expected, actual); + } + + @Test + public void testInheritance() { + Horse horse = new Horse("Harvey"); + Assert.assertTrue(horse instanceof Edible); + } +} diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/PersonTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/MammalTests/PersonTest.java similarity index 88% rename from src/test/java/com/zipcodewilmington/froilansfarm/PersonTest.java rename to src/test/java/com/zipcodewilmington/froilansfarm/MammalTests/PersonTest.java index a134f426..048d22b6 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/PersonTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/MammalTests/PersonTest.java @@ -1,5 +1,6 @@ -package com.zipcodewilmington.froilansfarm; +package com.zipcodewilmington.froilansfarm.MammalTests; +import com.zipcodewilmington.froilansfarm.Eater; import com.zipcodewilmington.froilansfarm.Mammal.Person; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/ChickenCoopTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/StructureTests/ChickenCoopTest.java similarity index 90% rename from src/test/java/com/zipcodewilmington/froilansfarm/ChickenCoopTest.java rename to src/test/java/com/zipcodewilmington/froilansfarm/StructureTests/ChickenCoopTest.java index 51a1f5b2..ae4a6df2 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/ChickenCoopTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/StructureTests/ChickenCoopTest.java @@ -1,6 +1,7 @@ -package com.zipcodewilmington.froilansfarm; +package com.zipcodewilmington.froilansfarm.StructureTests; import com.zipcodewilmington.froilansfarm.Mammal.Chicken; +import com.zipcodewilmington.froilansfarm.Shelter; import com.zipcodewilmington.froilansfarm.Structure.ChickenCoop; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/FarmHouseTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/StructureTests/FarmHouseTest.java similarity index 93% rename from src/test/java/com/zipcodewilmington/froilansfarm/FarmHouseTest.java rename to src/test/java/com/zipcodewilmington/froilansfarm/StructureTests/FarmHouseTest.java index bcd09776..e09b250c 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/FarmHouseTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/StructureTests/FarmHouseTest.java @@ -1,7 +1,8 @@ -package com.zipcodewilmington.froilansfarm; +package com.zipcodewilmington.froilansfarm.StructureTests; import com.zipcodewilmington.froilansfarm.Mammal.Farmer; import com.zipcodewilmington.froilansfarm.Mammal.Person; +import com.zipcodewilmington.froilansfarm.Shelter; import com.zipcodewilmington.froilansfarm.Structure.FarmHouse; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/StableTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/StructureTests/StableTest.java similarity index 89% rename from src/test/java/com/zipcodewilmington/froilansfarm/StableTest.java rename to src/test/java/com/zipcodewilmington/froilansfarm/StructureTests/StableTest.java index 3661d8c9..0341f1d8 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/StableTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/StructureTests/StableTest.java @@ -1,6 +1,7 @@ -package com.zipcodewilmington.froilansfarm; +package com.zipcodewilmington.froilansfarm.StructureTests; import com.zipcodewilmington.froilansfarm.Mammal.Horse; +import com.zipcodewilmington.froilansfarm.Shelter; import com.zipcodewilmington.froilansfarm.Structure.Stable; import org.junit.Assert; import org.junit.Test; From 4c82989747bcc14a716ed74f75e3c102d180f7fb Mon Sep 17 00:00:00 2001 From: jgiroso Date: Wed, 21 Jul 2021 23:36:35 -0400 Subject: [PATCH 039/100] edited horse Test --- .../zipcodewilmington/froilansfarm/MammalTests/HorseTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/MammalTests/HorseTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/MammalTests/HorseTest.java index a3499f48..f752953c 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/MammalTests/HorseTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/MammalTests/HorseTest.java @@ -32,6 +32,6 @@ public void testSetName() { @Test public void testInheritance() { Horse horse = new Horse("Harvey"); - Assert.assertTrue(horse instanceof Edible); + Assert.assertTrue(horse instanceof Animal); } } From a780caebb805f389e0ceb38cca6570db7029bf98 Mon Sep 17 00:00:00 2001 From: Zach Date: Thu, 22 Jul 2021 00:37:39 -0400 Subject: [PATCH 040/100] Added a few tests --- .../froilansfarm/Vehicles/Tractor.java | 2 +- src/test/java/Vehicles/AircraftTest.java | 28 ++++++++++++++ src/test/java/Vehicles/CropDusterTest.java | 15 ++++++++ src/test/java/Vehicles/TractorTest.java | 38 +++++++++++++++++++ 4 files changed, 82 insertions(+), 1 deletion(-) create mode 100644 src/test/java/Vehicles/AircraftTest.java create mode 100644 src/test/java/Vehicles/CropDusterTest.java create mode 100644 src/test/java/Vehicles/TractorTest.java diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Tractor.java b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Tractor.java index e4881574..b16623ba 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Tractor.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Tractor.java @@ -12,7 +12,7 @@ public Crop harvest(Crop crop){ public String makeNoise() { - return null; + return "Chuggumgumgumgumgum"; } diff --git a/src/test/java/Vehicles/AircraftTest.java b/src/test/java/Vehicles/AircraftTest.java new file mode 100644 index 00000000..a049e648 --- /dev/null +++ b/src/test/java/Vehicles/AircraftTest.java @@ -0,0 +1,28 @@ +package Vehicles; + +import com.zipcodewilmington.froilansfarm.Vehicles.Aircraft; +import com.zipcodewilmington.froilansfarm.Vehicles.Vehicle; +import org.junit.Assert; +import org.junit.Test; + +public class AircraftTest { + + @Test + public void constructor(){ + Vehicle aircraft = new Aircraft(); + + Boolean actual = aircraft instanceof Vehicle; + + Assert.assertTrue(actual); + } + + @Test + public void aircraftTest(){ + Vehicle aircraft = new Aircraft(); + + String actual = aircraft.makeNoise(); + String expected = "Bzzzzeewwwwwwwwwww Rat-tat-tat-tat-tat"; + + Assert.assertEquals(expected, actual); + } +} diff --git a/src/test/java/Vehicles/CropDusterTest.java b/src/test/java/Vehicles/CropDusterTest.java new file mode 100644 index 00000000..18076409 --- /dev/null +++ b/src/test/java/Vehicles/CropDusterTest.java @@ -0,0 +1,15 @@ +package Vehicles; + +import com.zipcodewilmington.froilansfarm.Farm; +import com.zipcodewilmington.froilansfarm.Vehicles.Aircraft; +import com.zipcodewilmington.froilansfarm.Vehicles.CropDuster; +import com.zipcodewilmington.froilansfarm.Vehicles.Vehicle; +import org.junit.Test; + +public class CropDusterTest { + + @Test + public void constructor(){ + + } +} diff --git a/src/test/java/Vehicles/TractorTest.java b/src/test/java/Vehicles/TractorTest.java new file mode 100644 index 00000000..c2d4a9b4 --- /dev/null +++ b/src/test/java/Vehicles/TractorTest.java @@ -0,0 +1,38 @@ +package Vehicles; + +import com.zipcodewilmington.froilansfarm.Vehicles.FarmVehicle; +import com.zipcodewilmington.froilansfarm.Vehicles.Vehicle; +import com.zipcodewilmington.froilansfarm.Vehicles.Tractor; +import org.junit.Assert; +import org.junit.Test; + +public class TractorTest { + + @Test + public void constructorTest1(){ + Vehicle tractor = new Tractor(); + + Boolean instance = tractor instanceof Vehicle; + + Assert.assertTrue(instance); + } + + @Test + public void constructorTest2(){ + Vehicle tractor = new Tractor(); + + Boolean instance = tractor instanceof FarmVehicle; + + Assert.assertTrue(instance); + } + + @Test + public void constructorMakeNoise(){ + Vehicle tractor = new Tractor(); + + String actual = tractor.makeNoise(); + String expected = "Chuggumgumgumgumgum"; + + Assert.assertEquals(expected, actual); + } +} From f93211aea0c60f4345f6d161c24d5002668d7fed Mon Sep 17 00:00:00 2001 From: Jeremy Date: Thu, 22 Jul 2021 08:42:30 -0400 Subject: [PATCH 041/100] added a gew tests --- .../froilansfarm/Food/CornStalk.java | 2 +- .../froilansfarm/CornStalkTest.java | 45 +++++++++++++++++++ 2 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 src/test/java/com/zipcodewilmington/froilansfarm/CornStalkTest.java diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Food/CornStalk.java b/src/main/java/com/zipcodewilmington/froilansfarm/Food/CornStalk.java index 8ee7420b..42c1ddda 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Food/CornStalk.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Food/CornStalk.java @@ -7,7 +7,7 @@ public CornStalk(){ @Override public EarCorn yield () { - if(this.checkFertilized() && this.checkHarvested()){ + if(this.checkFertilized() && this.checkHarvested()){ // does check harvested have to be false in order to harvest th corn? return new EarCorn(); } return null; diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/CornStalkTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/CornStalkTest.java new file mode 100644 index 00000000..70f6ca80 --- /dev/null +++ b/src/test/java/com/zipcodewilmington/froilansfarm/CornStalkTest.java @@ -0,0 +1,45 @@ +package com.zipcodewilmington.froilansfarm; + +import com.zipcodewilmington.froilansfarm.Food.CornStalk; +import org.junit.Assert; +import org.junit.Test; + +public class CornStalkTest { + + @Test + public void setHarvestedTest() { + CornStalk cornStalk = new CornStalk(); + cornStalk.setHarvested(true); + + boolean actual = cornStalk.checkHarvested(); + + Assert.assertEquals(true, actual); + + } + + @Test + public void checkHarvestedTest() { + + CornStalk cornStalk = new CornStalk(); + + boolean actual = cornStalk.checkHarvested(); + + Assert.assertEquals(false, actual); + + } + + @Test + public void yieldTest() { + + CornStalk cornStalk = new CornStalk(); + + + } + + @Test + public void fertilizeTest() { + + } + + // fertilize, check yield, inheritance test +} From a2b1a472a26579de11077cac5e5ae899d56be6e9 Mon Sep 17 00:00:00 2001 From: Jeremy Date: Thu, 22 Jul 2021 09:02:11 -0400 Subject: [PATCH 042/100] added all test names for food --- .../froilansfarm/{ => FoodTests}/CornStalkTest.java | 2 +- .../zipcodewilmington/froilansfarm/FoodTests/CropRowTest.java | 4 ++++ .../zipcodewilmington/froilansfarm/FoodTests/CropTest.java | 4 ++++ .../zipcodewilmington/froilansfarm/FoodTests/EarCornTest.java | 4 ++++ .../com/zipcodewilmington/froilansfarm/FoodTests/EggTest.java | 4 ++++ .../zipcodewilmington/froilansfarm/FoodTests/ProduceTest.java | 4 ++++ .../froilansfarm/FoodTests/TomatoPlantTest.java | 4 ++++ .../zipcodewilmington/froilansfarm/FoodTests/TomatoTest.java | 4 ++++ 8 files changed, 29 insertions(+), 1 deletion(-) rename src/test/java/com/zipcodewilmington/froilansfarm/{ => FoodTests}/CornStalkTest.java (93%) create mode 100644 src/test/java/com/zipcodewilmington/froilansfarm/FoodTests/CropRowTest.java create mode 100644 src/test/java/com/zipcodewilmington/froilansfarm/FoodTests/CropTest.java create mode 100644 src/test/java/com/zipcodewilmington/froilansfarm/FoodTests/EarCornTest.java create mode 100644 src/test/java/com/zipcodewilmington/froilansfarm/FoodTests/EggTest.java create mode 100644 src/test/java/com/zipcodewilmington/froilansfarm/FoodTests/ProduceTest.java create mode 100644 src/test/java/com/zipcodewilmington/froilansfarm/FoodTests/TomatoPlantTest.java create mode 100644 src/test/java/com/zipcodewilmington/froilansfarm/FoodTests/TomatoTest.java diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/CornStalkTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/FoodTests/CornStalkTest.java similarity index 93% rename from src/test/java/com/zipcodewilmington/froilansfarm/CornStalkTest.java rename to src/test/java/com/zipcodewilmington/froilansfarm/FoodTests/CornStalkTest.java index 70f6ca80..4b87eae0 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/CornStalkTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/FoodTests/CornStalkTest.java @@ -1,4 +1,4 @@ -package com.zipcodewilmington.froilansfarm; +package com.zipcodewilmington.froilansfarm.FoodTests; import com.zipcodewilmington.froilansfarm.Food.CornStalk; import org.junit.Assert; diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/FoodTests/CropRowTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/FoodTests/CropRowTest.java new file mode 100644 index 00000000..e24b0e16 --- /dev/null +++ b/src/test/java/com/zipcodewilmington/froilansfarm/FoodTests/CropRowTest.java @@ -0,0 +1,4 @@ +package com.zipcodewilmington.froilansfarm.FoodTests; + +public class CropRowTest { +} diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/FoodTests/CropTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/FoodTests/CropTest.java new file mode 100644 index 00000000..53146c7b --- /dev/null +++ b/src/test/java/com/zipcodewilmington/froilansfarm/FoodTests/CropTest.java @@ -0,0 +1,4 @@ +package com.zipcodewilmington.froilansfarm.FoodTests; + +public class CropTest { +} diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/FoodTests/EarCornTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/FoodTests/EarCornTest.java new file mode 100644 index 00000000..4e3f04ab --- /dev/null +++ b/src/test/java/com/zipcodewilmington/froilansfarm/FoodTests/EarCornTest.java @@ -0,0 +1,4 @@ +package com.zipcodewilmington.froilansfarm.FoodTests; + +public class EarCornTest { +} diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/FoodTests/EggTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/FoodTests/EggTest.java new file mode 100644 index 00000000..79a2acdf --- /dev/null +++ b/src/test/java/com/zipcodewilmington/froilansfarm/FoodTests/EggTest.java @@ -0,0 +1,4 @@ +package com.zipcodewilmington.froilansfarm.FoodTests; + +public class EggTest { +} diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/FoodTests/ProduceTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/FoodTests/ProduceTest.java new file mode 100644 index 00000000..f31ecf9f --- /dev/null +++ b/src/test/java/com/zipcodewilmington/froilansfarm/FoodTests/ProduceTest.java @@ -0,0 +1,4 @@ +package com.zipcodewilmington.froilansfarm.FoodTests; + +public class ProduceTest { +} diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/FoodTests/TomatoPlantTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/FoodTests/TomatoPlantTest.java new file mode 100644 index 00000000..16290517 --- /dev/null +++ b/src/test/java/com/zipcodewilmington/froilansfarm/FoodTests/TomatoPlantTest.java @@ -0,0 +1,4 @@ +package com.zipcodewilmington.froilansfarm.FoodTests; + +public class TomatoPlantTest { +} diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/FoodTests/TomatoTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/FoodTests/TomatoTest.java new file mode 100644 index 00000000..c1858fda --- /dev/null +++ b/src/test/java/com/zipcodewilmington/froilansfarm/FoodTests/TomatoTest.java @@ -0,0 +1,4 @@ +package com.zipcodewilmington.froilansfarm.FoodTests; + +public class TomatoTest { +} From b418771b1fb42ac2b94e409fd6ec7a3889d364a3 Mon Sep 17 00:00:00 2001 From: Zach Date: Thu, 22 Jul 2021 13:01:46 -0400 Subject: [PATCH 043/100] Added tests for Tractor --- src/test/java/Vehicles/CropDusterTest.java | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/src/test/java/Vehicles/CropDusterTest.java b/src/test/java/Vehicles/CropDusterTest.java index 18076409..9c826732 100644 --- a/src/test/java/Vehicles/CropDusterTest.java +++ b/src/test/java/Vehicles/CropDusterTest.java @@ -1,15 +1,27 @@ package Vehicles; import com.zipcodewilmington.froilansfarm.Farm; -import com.zipcodewilmington.froilansfarm.Vehicles.Aircraft; -import com.zipcodewilmington.froilansfarm.Vehicles.CropDuster; -import com.zipcodewilmington.froilansfarm.Vehicles.Vehicle; +import com.zipcodewilmington.froilansfarm.Vehicles.*; +import org.junit.Assert; import org.junit.Test; public class CropDusterTest { @Test - public void constructor(){ - + public void constructorTest1(){ + Tractor tractor = new Tractor(); + + Boolean actual = tractor instanceof Vehicle; + + Assert.assertTrue(actual); + } + + @Test + public void constructorTest2(){ + Tractor tractor = new Tractor(); + + Boolean actual = tractor instanceof FarmVehicle; + + Assert.assertTrue(actual); } } From a39d1f7e72f939565d34ab893feecb77d92dfe4d Mon Sep 17 00:00:00 2001 From: Jeremy Date: Thu, 22 Jul 2021 13:29:50 -0400 Subject: [PATCH 044/100] Added some food tests --- .../froilansfarm/FoodTests/CornStalkTest.java | 15 +++++++++++++-- .../froilansfarm/FoodTests/CropTest.java | 13 ++++++++++++- .../froilansfarm/FoodTests/EarCornTest.java | 18 ++++++++++++++++++ .../froilansfarm/FoodTests/EggTest.java | 18 ++++++++++++++++++ .../froilansfarm/FoodTests/TomatoTest.java | 18 ++++++++++++++++++ 5 files changed, 79 insertions(+), 3 deletions(-) diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/FoodTests/CornStalkTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/FoodTests/CornStalkTest.java index 4b87eae0..fa09ec80 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/FoodTests/CornStalkTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/FoodTests/CornStalkTest.java @@ -1,6 +1,8 @@ package com.zipcodewilmington.froilansfarm.FoodTests; import com.zipcodewilmington.froilansfarm.Food.CornStalk; +import com.zipcodewilmington.froilansfarm.Food.Crop; + import org.junit.Assert; import org.junit.Test; @@ -32,7 +34,8 @@ public void checkHarvestedTest() { public void yieldTest() { CornStalk cornStalk = new CornStalk(); - + cornStalk.checkFertilized(); + cornStalk.checkHarvested(); } @@ -41,5 +44,13 @@ public void fertilizeTest() { } - // fertilize, check yield, inheritance test + + @Test + public void testCornStalkInheritance() { + + CornStalk cornStalk = new CornStalk(); + Assert.assertTrue(cornStalk instanceof Crop); + } + + } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/FoodTests/CropTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/FoodTests/CropTest.java index 53146c7b..bb39b5a6 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/FoodTests/CropTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/FoodTests/CropTest.java @@ -1,4 +1,15 @@ package com.zipcodewilmington.froilansfarm.FoodTests; +import com.zipcodewilmington.froilansfarm.Food.CornStalk; +import com.zipcodewilmington.froilansfarm.Food.Crop; +import org.junit.Assert; +import org.junit.Test; + public class CropTest { -} + + @Test + public void fertilizeTest() {} + + } + + diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/FoodTests/EarCornTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/FoodTests/EarCornTest.java index 4e3f04ab..d1bf8261 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/FoodTests/EarCornTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/FoodTests/EarCornTest.java @@ -1,4 +1,22 @@ package com.zipcodewilmington.froilansfarm.FoodTests; +import com.zipcodewilmington.froilansfarm.Edible; +import com.zipcodewilmington.froilansfarm.Food.EarCorn; +import com.zipcodewilmington.froilansfarm.Food.Egg; +import org.junit.Assert; +import org.junit.Test; + public class EarCornTest { + + @Test + public void eggTest() { + EarCorn earCorn = new EarCorn(); + + } + + @Test + public void testEarCornImplementation() { + EarCorn earCorn = new EarCorn(); + Assert.assertTrue(earCorn instanceof Edible); + } } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/FoodTests/EggTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/FoodTests/EggTest.java index 79a2acdf..6617617c 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/FoodTests/EggTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/FoodTests/EggTest.java @@ -1,4 +1,22 @@ package com.zipcodewilmington.froilansfarm.FoodTests; +import com.zipcodewilmington.froilansfarm.Edible; +import com.zipcodewilmington.froilansfarm.Food.Egg; +import com.zipcodewilmington.froilansfarm.Mammal.Chicken; +import org.junit.Assert; +import org.junit.Test; + public class EggTest { + + @Test + public void eggTest() { + Egg egg = new Egg(); + + } + + @Test + public void testEggImplementation() { + Egg egg = new Egg(); + Assert.assertTrue(egg instanceof Edible); + } } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/FoodTests/TomatoTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/FoodTests/TomatoTest.java index c1858fda..ee3a90d9 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/FoodTests/TomatoTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/FoodTests/TomatoTest.java @@ -1,4 +1,22 @@ package com.zipcodewilmington.froilansfarm.FoodTests; +import com.zipcodewilmington.froilansfarm.Edible; +import com.zipcodewilmington.froilansfarm.Food.Egg; +import com.zipcodewilmington.froilansfarm.Food.Tomato; +import org.junit.Assert; +import org.junit.Test; + public class TomatoTest { + + @Test + public void tomatoTest() { + Tomato tomato = new Tomato(); + } + + @Test + public void testTomatoImplementation() { + Tomato tomato = new Tomato(); + Assert.assertTrue(tomato instanceof Edible); + } + } From 15cae181cf8a8034f22f797a0df4873469fb193c Mon Sep 17 00:00:00 2001 From: Jeremy Date: Thu, 22 Jul 2021 13:49:20 -0400 Subject: [PATCH 045/100] added some more food tests --- .../com/zipcodewilmington/froilansfarm/Food/CornStalk.java | 3 ++- .../com/zipcodewilmington/froilansfarm/Food/TomatoPlant.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Food/CornStalk.java b/src/main/java/com/zipcodewilmington/froilansfarm/Food/CornStalk.java index 42c1ddda..47a01fa2 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Food/CornStalk.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Food/CornStalk.java @@ -7,7 +7,8 @@ public CornStalk(){ @Override public EarCorn yield () { - if(this.checkFertilized() && this.checkHarvested()){ // does check harvested have to be false in order to harvest th corn? + if(this.checkFertilized() && !this.checkHarvested()){ // does check harvested have to be false in order to harvest th corn? + this.setHarvested(true); return new EarCorn(); } return null; diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Food/TomatoPlant.java b/src/main/java/com/zipcodewilmington/froilansfarm/Food/TomatoPlant.java index 567bb3ba..764ab7b0 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Food/TomatoPlant.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Food/TomatoPlant.java @@ -7,7 +7,8 @@ public class TomatoPlant extends Crop { @Override public Tomato yield() { - if(this.checkFertilized() && this.checkHarvested()){ + if(this.checkFertilized() && !this.checkHarvested()){ + this.setHarvested(true); return new Tomato(); } return null; From 9b589889083fa139cce16491895d32e645365387 Mon Sep 17 00:00:00 2001 From: jgiroso Date: Thu, 22 Jul 2021 14:24:27 -0400 Subject: [PATCH 046/100] chickenTests, chicken Class, and egg Class updated --- .../froilansfarm/Food/Egg.java | 13 +++++- .../froilansfarm/Mammal/Chicken.java | 19 +++++++-- .../froilansfarm/MammalTests/ChickenTest.java | 42 +++++++++++++++++++ .../froilansfarm/MammalTests/HorseTest.java | 1 + 4 files changed, 70 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Food/Egg.java b/src/main/java/com/zipcodewilmington/froilansfarm/Food/Egg.java index ae09d05c..c49971bb 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Food/Egg.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Food/Egg.java @@ -4,10 +4,21 @@ public class Egg implements Edible { - boolean isFertlized = false; + public static boolean isFertilized; + + public Egg(boolean isFertilized) { + this.isFertilized = isFertilized; + } public Egg() { + isFertilized = false; + } + public static boolean isIsFertilized() { + return isFertilized; } + public static void setIsFertilized(boolean isFertilized) { + Egg.isFertilized = isFertilized; + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Chicken.java b/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Chicken.java index 34144ba0..07c88fa2 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Chicken.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Chicken.java @@ -5,27 +5,38 @@ import com.zipcodewilmington.froilansfarm.Food.Egg; import com.zipcodewilmington.froilansfarm.Food.Produce; +import java.util.ArrayList; +import java.util.List; + public class Chicken extends Animal implements Edible, Produce { + public List meals = new ArrayList<>(); + public Chicken(String name) { super(name); + this.meals = meals; } public Chicken() { } @Override public String makeNoise() { - return "Cluck CLuck"; + return "Cluck Cluck"; } - boolean isFertilized = false; - @Override public Egg yield() { - if (isFertilized){ + if (!Egg.isFertilized){ return new Egg(); } return null; } + public void eat(EarCorn earCorn) { + meals.add(earCorn); + //need a way to remove EarCorn count as well + } + + public List getMealList() { return meals; } + } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/MammalTests/ChickenTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/MammalTests/ChickenTest.java index b4311b4a..b3fc004f 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/MammalTests/ChickenTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/MammalTests/ChickenTest.java @@ -1,6 +1,9 @@ package com.zipcodewilmington.froilansfarm.MammalTests; import com.zipcodewilmington.froilansfarm.Edible; +import com.zipcodewilmington.froilansfarm.Food.EarCorn; +import com.zipcodewilmington.froilansfarm.Food.Egg; +import com.zipcodewilmington.froilansfarm.Food.Produce; import com.zipcodewilmington.froilansfarm.Mammal.Animal; import com.zipcodewilmington.froilansfarm.Mammal.Chicken; import org.junit.Assert; @@ -30,6 +33,39 @@ public void testSetName() { Assert.assertEquals(expected, actual); } + @Test + public void testMakeNoise() { + //given + String expected = "Cluck Cluck"; + //when + Chicken chicken = new Chicken(); + String actual = chicken.makeNoise(); + //then + Assert.assertEquals(expected, actual); + } + + @Test + public void testYield() { + //given + Chicken chicken = new Chicken(); + //when + Egg egg = chicken.yield(); + //then + Assert.assertTrue(egg instanceof Edible); + } + + @Test + public void testEat() { + //given + Chicken chicken = new Chicken(); + //when + EarCorn earCorn = new EarCorn(); + chicken.eat(earCorn); + chicken.getMealList(); + //then + Assert.assertTrue(chicken.meals.contains(earCorn)); + } + @Test public void testInheritance() { Chicken chicken = new Chicken("Clucks"); @@ -41,4 +77,10 @@ public void testImplementation() { Chicken chicken = new Chicken("Fluffers"); Assert.assertTrue(chicken instanceof Edible); } + + @Test + public void testImplementationProduce() { + Chicken chicken = new Chicken(); + Assert.assertTrue(chicken instanceof Produce); + } } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/MammalTests/HorseTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/MammalTests/HorseTest.java index f752953c..46ad0a58 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/MammalTests/HorseTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/MammalTests/HorseTest.java @@ -1,6 +1,7 @@ package com.zipcodewilmington.froilansfarm.MammalTests; import com.zipcodewilmington.froilansfarm.Edible; +import com.zipcodewilmington.froilansfarm.Mammal.Animal; import com.zipcodewilmington.froilansfarm.Mammal.Horse; import org.junit.Assert; import org.junit.Test; From d1bb877fe22a5eed6f1b4b3f2bd2a5edacc163da Mon Sep 17 00:00:00 2001 From: Nathan Date: Thu, 22 Jul 2021 14:57:34 -0400 Subject: [PATCH 047/100] changed cropRow --- .../froilansfarm/Food/Crop.java | 19 ++++++++-- .../froilansfarm/Food/CropRow.java | 35 ++++++++++--------- .../froilansfarm/Food/TomatoPlant.java | 4 +++ .../froilansfarm/Vehicles/CropDuster.java | 2 +- .../froilansfarm/Food/CropRowTest.java | 7 ++++ .../froilansfarm/FoodTests/CropRowTest.java | 25 +++++++++++++ 6 files changed, 73 insertions(+), 19 deletions(-) create mode 100644 src/test/java/com/zipcodewilmington/froilansfarm/Food/CropRowTest.java diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Food/Crop.java b/src/main/java/com/zipcodewilmington/froilansfarm/Food/Crop.java index e976e50a..d356f987 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Food/Crop.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Food/Crop.java @@ -3,8 +3,15 @@ import com.zipcodewilmington.froilansfarm.Edible; public abstract class Crop implements Produce { - private Boolean fertilized = false; - private Boolean isHarvested = false; + private Boolean fertilized; + private Boolean isHarvested; + private Integer id; + + public Crop(Integer id) { + this.fertilized = false; + this.isHarvested = false; + this.id = id; + } public void fertilize(){ this.fertilized = true; @@ -26,4 +33,12 @@ public Boolean checkHarvested() { public void setHarvested(Boolean harvested) { isHarvested = harvested; } + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Food/CropRow.java b/src/main/java/com/zipcodewilmington/froilansfarm/Food/CropRow.java index 0dd30b47..54ed1548 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Food/CropRow.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Food/CropRow.java @@ -2,32 +2,35 @@ import com.zipcodewilmington.froilansfarm.Food.Crop; -public class CropRow extends Crop { - private Integer amount; - private Crop crop; +import java.util.ArrayList; +import java.util.List; + +public class CropRow { + private List cropList; public CropRow(){ - this.amount = 0; - this.crop = null; + cropList = new ArrayList<>(); } - public void fertilize(){ - super.fertilize(); + public void plantCrop(Crop crop){ + this.cropList.add(crop); } - public Integer getAmount() { - return amount; + public Integer getNumberOfCrops(){ + return cropList.size(); } - public void setAmount(Integer amount) { - this.amount = amount; + public Crop getCropById(Integer id){ + Crop result = null; + for(Crop crop: cropList){ + result = id == crop.getId() ? crop : null; + } + return result; } - public Crop getCrop() { - return crop; + public void fertilizeRow(){ + cropList.forEach(Crop::fertilize); } - public void setCrop(Crop crop) { - this.crop = crop; - } + } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Food/TomatoPlant.java b/src/main/java/com/zipcodewilmington/froilansfarm/Food/TomatoPlant.java index 764ab7b0..a45545f0 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Food/TomatoPlant.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Food/TomatoPlant.java @@ -5,6 +5,10 @@ public class TomatoPlant extends Crop { + public TomatoPlant(Integer id) { + super(id); + } + @Override public Tomato yield() { if(this.checkFertilized() && !this.checkHarvested()){ diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDuster.java b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDuster.java index c09c63e2..133ce7e7 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDuster.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDuster.java @@ -5,7 +5,7 @@ public abstract class CropDuster extends Aircraft implements FarmVehicle{ public void fertilizeCrop(CropRow row){ - row.fertilize(); + row.fertilizeRow(); } } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/Food/CropRowTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/Food/CropRowTest.java new file mode 100644 index 00000000..f5811a03 --- /dev/null +++ b/src/test/java/com/zipcodewilmington/froilansfarm/Food/CropRowTest.java @@ -0,0 +1,7 @@ +package com.zipcodewilmington.froilansfarm.Food; + +import junit.framework.TestCase; + +public class CropRowTest extends TestCase { + +} \ No newline at end of file diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/FoodTests/CropRowTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/FoodTests/CropRowTest.java index e24b0e16..6b2fdb07 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/FoodTests/CropRowTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/FoodTests/CropRowTest.java @@ -1,4 +1,29 @@ package com.zipcodewilmington.froilansfarm.FoodTests; +import com.zipcodewilmington.froilansfarm.Food.CornStalk; +import com.zipcodewilmington.froilansfarm.Food.Crop; +import com.zipcodewilmington.froilansfarm.Food.CropRow; +import com.zipcodewilmington.froilansfarm.Food.Produce; +import org.junit.Assert; +import org.junit.Test; + public class CropRowTest { + + @Test + public void cropRowConstructorTest(){ + //given + CropRow myCropRow = new CropRow(); + //then + Assert.assertTrue(myCropRow instanceof Produce); + } + + + @Test + public void yieldTest() { + //given + CropRow myCropRow = new CropRow(); + + //when + } + } From d0ff6278f3a1cada6de4d3665e6d2d1bde5e6db2 Mon Sep 17 00:00:00 2001 From: jgiroso Date: Thu, 22 Jul 2021 15:03:35 -0400 Subject: [PATCH 048/100] added tests to mammal class --- .../froilansfarm/Mammal/Chicken.java | 1 - .../froilansfarm/Mammal/Farmer.java | 9 ++++ .../froilansfarm/Mammal/Person.java | 3 +- .../froilansfarm/MammalTests/FarmerTest.java | 44 ++++++++++++++++++- .../froilansfarm/MammalTests/HorseTest.java | 31 +++++++++++++ .../froilansfarm/MammalTests/PersonTest.java | 11 +++++ 6 files changed, 96 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Chicken.java b/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Chicken.java index 07c88fa2..baec71c6 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Chicken.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Chicken.java @@ -34,7 +34,6 @@ public Egg yield() { public void eat(EarCorn earCorn) { meals.add(earCorn); - //need a way to remove EarCorn count as well } public List getMealList() { return meals; } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Farmer.java b/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Farmer.java index 4bdf1a5d..ea368bc7 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Farmer.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Farmer.java @@ -8,9 +8,13 @@ import com.zipcodewilmington.froilansfarm.Rideable; import com.zipcodewilmington.froilansfarm.Rider; +import java.util.ArrayList; +import java.util.List; + public class Farmer extends Person implements Botanist, Rider { private Rideable isRiding = null; + public List meals = new ArrayList<>(); public Farmer(String name) { super(name); @@ -41,4 +45,9 @@ public void mount(Rideable rideable) { public void dismount(Rideable rideable) { this.isRiding = null; } + + @Override + public void eat(Edible edible) { meals.add(edible); } + + public List getMealList() { return meals; } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Person.java b/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Person.java index 121fab7f..491f8f65 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Person.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Person.java @@ -30,7 +30,8 @@ public void eat(T edible) { @Override public String makeNoise(){ - return "Hello, im suffering"; + return "Hello"; } + } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/MammalTests/FarmerTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/MammalTests/FarmerTest.java index 8f41b32a..05c46929 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/MammalTests/FarmerTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/MammalTests/FarmerTest.java @@ -1,13 +1,26 @@ package com.zipcodewilmington.froilansfarm.MammalTests; import com.zipcodewilmington.froilansfarm.Botanist; +import com.zipcodewilmington.froilansfarm.Food.Tomato; import com.zipcodewilmington.froilansfarm.Mammal.Farmer; import com.zipcodewilmington.froilansfarm.Mammal.Person; +import com.zipcodewilmington.froilansfarm.Rider; import org.junit.Assert; import org.junit.Test; public class FarmerTest { + @Test + public void testconstructor() { + //given + String expected = "Froilanda"; + //when + Farmer farmer = new Farmer(expected); + String actual = farmer.getName(); + //then + Assert.assertEquals(expected, actual); + } + @Test public void testSetName() { //given @@ -19,6 +32,29 @@ public void testSetName() { Assert.assertEquals(expected, actual); } + @Test + public void testMakeNoise() { + //given + String expected = "Howdy"; + //when + Farmer farmer = new Farmer(); + String actual = farmer.makeNoise(); + //then + Assert.assertEquals(expected, actual); + } + + @Test + public void testEat() { + //given + Farmer farmer = new Farmer(); + //when + Tomato tomato = new Tomato(); + farmer.eat(tomato); + farmer.getMealList(); + //then + Assert.assertTrue(farmer.meals.contains(tomato)); + } + @Test public void testInheritance() { Farmer farmer = new Farmer("Annette"); @@ -26,8 +62,14 @@ public void testInheritance() { } @Test - public void testImplementation() { + public void testImplementationBotanist() { Farmer farmer = new Farmer("Joe"); Assert.assertTrue(farmer instanceof Botanist); } + + @Test + public void testImplementationRider() { + Farmer farmer = new Farmer("Joe"); + Assert.assertTrue(farmer instanceof Rider); + } } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/MammalTests/HorseTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/MammalTests/HorseTest.java index 46ad0a58..6ab76109 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/MammalTests/HorseTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/MammalTests/HorseTest.java @@ -2,7 +2,9 @@ import com.zipcodewilmington.froilansfarm.Edible; import com.zipcodewilmington.froilansfarm.Mammal.Animal; +import com.zipcodewilmington.froilansfarm.Mammal.Farmer; import com.zipcodewilmington.froilansfarm.Mammal.Horse; +import com.zipcodewilmington.froilansfarm.Rideable; import org.junit.Assert; import org.junit.Test; @@ -30,9 +32,38 @@ public void testSetName() { Assert.assertEquals(expected, actual); } + @Test + public void testMakeNoise() { + //given + String expected = "Neigh"; + //when + Horse horse = new Horse(); + String actual = horse.makeNoise(); + //then + Assert.assertEquals(expected, actual); + } + + @Test + public void testRide() { + //given + Horse horse = new Horse(); + Farmer farmer = new Farmer(); + //when + horse.ride(farmer); + //then + + + } + @Test public void testInheritance() { Horse horse = new Horse("Harvey"); Assert.assertTrue(horse instanceof Animal); } + + @Test + public void testImplementation() { + Horse horse = new Horse(); + Assert.assertTrue(horse instanceof Rideable); + } } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/MammalTests/PersonTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/MammalTests/PersonTest.java index 048d22b6..8caa0388 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/MammalTests/PersonTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/MammalTests/PersonTest.java @@ -29,6 +29,17 @@ public void testSetName() { Assert.assertEquals(expected, actual); } + @Test + public void testMakeNoise() { + //given + String expected = "Hello"; + Person person = new Person(); + //when + String actual = person.makeNoise(); + //then + Assert.assertEquals(expected, actual); + } + @Test public void testImplementation() { Person person = new Person("Jonah"); From f91ebf9ada11c9060307dc32d4e4c0c08d6e9f37 Mon Sep 17 00:00:00 2001 From: Nathan Date: Thu, 22 Jul 2021 15:09:02 -0400 Subject: [PATCH 049/100] fixed cornstalk --- .../com/zipcodewilmington/froilansfarm/Food/CornStalk.java | 1 + .../java/com/zipcodewilmington/froilansfarm/Food/Crop.java | 7 +++++++ .../com/zipcodewilmington/froilansfarm/Mammal/Farmer.java | 4 +--- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Food/CornStalk.java b/src/main/java/com/zipcodewilmington/froilansfarm/Food/CornStalk.java index 47a01fa2..ba8f8699 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Food/CornStalk.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Food/CornStalk.java @@ -3,6 +3,7 @@ public class CornStalk extends Crop { public CornStalk(){ + super(); } @Override diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Food/Crop.java b/src/main/java/com/zipcodewilmington/froilansfarm/Food/Crop.java index d356f987..ba348d71 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Food/Crop.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Food/Crop.java @@ -13,6 +13,13 @@ public Crop(Integer id) { this.id = id; } + public Crop() { + this.fertilized = false; + this.isHarvested = false; + this.id = null; + } + + public void fertilize(){ this.fertilized = true; } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Farmer.java b/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Farmer.java index ea368bc7..70f4d4f7 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Farmer.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Farmer.java @@ -26,9 +26,7 @@ public Farmer() { @Override public void plant(Crop crop, CropRow cropRow) { - cropRow.setCrop(crop); - Integer current = cropRow.getAmount(); - cropRow.setAmount(current + 1); + cropRow.plantCrop(crop); } @Override From 615b48bc42850940fe930fca80bdceefd054dc6b Mon Sep 17 00:00:00 2001 From: jgiroso Date: Thu, 22 Jul 2021 15:33:28 -0400 Subject: [PATCH 050/100] Farmer Tests Complete --- .../froilansfarm/Mammal/Farmer.java | 2 + .../froilansfarm/MammalTests/FarmerTest.java | 42 +++++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Farmer.java b/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Farmer.java index 70f4d4f7..7714e36a 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Farmer.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Farmer.java @@ -44,6 +44,8 @@ public void dismount(Rideable rideable) { this.isRiding = null; } + public Rideable getIsRiding() { return isRiding; } + @Override public void eat(Edible edible) { meals.add(edible); } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/MammalTests/FarmerTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/MammalTests/FarmerTest.java index 05c46929..30d67df9 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/MammalTests/FarmerTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/MammalTests/FarmerTest.java @@ -1,9 +1,14 @@ package com.zipcodewilmington.froilansfarm.MammalTests; import com.zipcodewilmington.froilansfarm.Botanist; +import com.zipcodewilmington.froilansfarm.Food.Crop; +import com.zipcodewilmington.froilansfarm.Food.CropRow; import com.zipcodewilmington.froilansfarm.Food.Tomato; +import com.zipcodewilmington.froilansfarm.Food.TomatoPlant; import com.zipcodewilmington.froilansfarm.Mammal.Farmer; +import com.zipcodewilmington.froilansfarm.Mammal.Horse; import com.zipcodewilmington.froilansfarm.Mammal.Person; +import com.zipcodewilmington.froilansfarm.Rideable; import com.zipcodewilmington.froilansfarm.Rider; import org.junit.Assert; import org.junit.Test; @@ -32,6 +37,18 @@ public void testSetName() { Assert.assertEquals(expected, actual); } + @Test + public void testPlant() { + //given + TomatoPlant tomatoPlant = new TomatoPlant(0); + CropRow cropRow = new CropRow(); + Farmer farmer = new Farmer(); + //when + farmer.plant(tomatoPlant, cropRow); + //then + Assert.assertTrue(tomatoPlant.equals(cropRow.getCropById(0))); + } + @Test public void testMakeNoise() { //given @@ -43,6 +60,31 @@ public void testMakeNoise() { Assert.assertEquals(expected, actual); } + @Test + public void testMount() { + //given + Horse horse = new Horse(); + Rideable expected = horse; + //when + Farmer farmer = new Farmer(); + farmer.mount(horse); + Rideable actual = farmer.getIsRiding(); + //then + Assert.assertEquals(expected, actual); + } + + @Test + public void testDismount() { + //given + Horse horse = new Horse(); + //when + Farmer farmer = new Farmer(); + farmer.mount(horse); + farmer.dismount(horse); + //then + Assert.assertNull(farmer.getIsRiding()); + } + @Test public void testEat() { //given From c956498862021120eb3885b05a33a672be4ef026 Mon Sep 17 00:00:00 2001 From: Nathan Date: Thu, 22 Jul 2021 15:40:04 -0400 Subject: [PATCH 051/100] cornstalk and croprow tests finished --- .../froilansfarm/Food/CornStalk.java | 5 +- .../froilansfarm/Food/CropRow.java | 2 - .../froilansfarm/Food/TomatoPlant.java | 3 ++ .../froilansfarm/FoodTests/CornStalkTest.java | 41 +++++++++------ .../froilansfarm/FoodTests/CropRowTest.java | 51 ++++++++++++++++--- 5 files changed, 77 insertions(+), 25 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Food/CornStalk.java b/src/main/java/com/zipcodewilmington/froilansfarm/Food/CornStalk.java index ba8f8699..f950a279 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Food/CornStalk.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Food/CornStalk.java @@ -2,8 +2,11 @@ public class CornStalk extends Crop { + public CornStalk(Integer id){ + super(id); + } + public CornStalk(){ - super(); } @Override diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Food/CropRow.java b/src/main/java/com/zipcodewilmington/froilansfarm/Food/CropRow.java index 54ed1548..3b9fac91 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Food/CropRow.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Food/CropRow.java @@ -1,7 +1,5 @@ package com.zipcodewilmington.froilansfarm.Food; -import com.zipcodewilmington.froilansfarm.Food.Crop; - import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Food/TomatoPlant.java b/src/main/java/com/zipcodewilmington/froilansfarm/Food/TomatoPlant.java index a45545f0..7961dcb4 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Food/TomatoPlant.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Food/TomatoPlant.java @@ -9,6 +9,9 @@ public TomatoPlant(Integer id) { super(id); } + public TomatoPlant() { + } + @Override public Tomato yield() { if(this.checkFertilized() && !this.checkHarvested()){ diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/FoodTests/CornStalkTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/FoodTests/CornStalkTest.java index fa09ec80..cd259065 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/FoodTests/CornStalkTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/FoodTests/CornStalkTest.java @@ -1,8 +1,10 @@ package com.zipcodewilmington.froilansfarm.FoodTests; +import com.zipcodewilmington.froilansfarm.Edible; import com.zipcodewilmington.froilansfarm.Food.CornStalk; import com.zipcodewilmington.froilansfarm.Food.Crop; +import com.zipcodewilmington.froilansfarm.Food.EarCorn; import org.junit.Assert; import org.junit.Test; @@ -10,47 +12,54 @@ public class CornStalkTest { @Test public void setHarvestedTest() { - CornStalk cornStalk = new CornStalk(); + CornStalk cornStalk = new CornStalk(2); cornStalk.setHarvested(true); - boolean actual = cornStalk.checkHarvested(); - Assert.assertEquals(true, actual); } @Test public void checkHarvestedTest() { - - CornStalk cornStalk = new CornStalk(); - + CornStalk cornStalk = new CornStalk(2); boolean actual = cornStalk.checkHarvested(); - Assert.assertEquals(false, actual); } @Test - public void yieldTest() { - - CornStalk cornStalk = new CornStalk(); - cornStalk.checkFertilized(); - cornStalk.checkHarvested(); - + public void setFertilizedTest(){ + CornStalk cornStalk = new CornStalk(2); + cornStalk.fertilize(); + Boolean stalkIsFertilized = cornStalk.checkFertilized(); + Assert.assertTrue(stalkIsFertilized); } @Test - public void fertilizeTest() { + public void checkFertilizedTest() { + CornStalk cornStalk = new CornStalk(2); + Boolean stalkIsFertilized = cornStalk.checkFertilized(); + Assert.assertFalse(stalkIsFertilized); } @Test public void testCornStalkInheritance() { - - CornStalk cornStalk = new CornStalk(); + CornStalk cornStalk = new CornStalk(2); Assert.assertTrue(cornStalk instanceof Crop); } + @Test + public void yieldTest(){ + CornStalk cornStalk = new CornStalk(); + cornStalk.fertilize(); + //when + Edible harvest = cornStalk.yield(); + Boolean harvested = cornStalk.checkHarvested(); + //then + Assert.assertTrue(harvest instanceof EarCorn); + Assert.assertTrue(harvested); + } } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/FoodTests/CropRowTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/FoodTests/CropRowTest.java index 6b2fdb07..824d4bb1 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/FoodTests/CropRowTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/FoodTests/CropRowTest.java @@ -1,9 +1,6 @@ package com.zipcodewilmington.froilansfarm.FoodTests; -import com.zipcodewilmington.froilansfarm.Food.CornStalk; -import com.zipcodewilmington.froilansfarm.Food.Crop; -import com.zipcodewilmington.froilansfarm.Food.CropRow; -import com.zipcodewilmington.froilansfarm.Food.Produce; +import com.zipcodewilmington.froilansfarm.Food.*; import org.junit.Assert; import org.junit.Test; @@ -13,17 +10,59 @@ public class CropRowTest { public void cropRowConstructorTest(){ //given CropRow myCropRow = new CropRow(); + Integer exp = 0; + Integer act = myCropRow.getNumberOfCrops(); //then - Assert.assertTrue(myCropRow instanceof Produce); + Assert.assertEquals(exp,act); } + @Test + public void plantCropTest() { + //given + CropRow myCropRow = new CropRow(); + Crop tomatoPlant = new TomatoPlant(); + //when + myCropRow.plantCrop(tomatoPlant); + Integer exp = 1; + Integer act = myCropRow.getNumberOfCrops(); + //then + Assert.assertEquals(exp,act); + } @Test - public void yieldTest() { + public void getCropByIdTest(){ //given CropRow myCropRow = new CropRow(); + Crop tomato1 = new TomatoPlant(1); + Crop corn = new CornStalk(2); + Crop tomato2 = new TomatoPlant(3); + //when + myCropRow.plantCrop(corn); + myCropRow.plantCrop(tomato1); + myCropRow.plantCrop(tomato2); + Crop retrieved = myCropRow.getCropById(3); + //then + Assert.assertEquals(tomato2,retrieved); + } + @Test + public void fertilizeRowTest(){ + //given + CropRow myCropRow = new CropRow(); + Crop tomato1 = new TomatoPlant(1); + Crop corn = new CornStalk(2); + Crop tomato2 = new TomatoPlant(3); + myCropRow.plantCrop(corn); + myCropRow.plantCrop(tomato1); + myCropRow.plantCrop(tomato2); //when + myCropRow.fertilizeRow(); + Boolean cornIsFertilized = corn.checkFertilized(); + Boolean tomato1IsFertilized = tomato1.checkFertilized(); + //then + Assert.assertTrue(cornIsFertilized); + Assert.assertTrue(tomato1IsFertilized); + } } From c429a475647b87fb51e9c7cc799e453a212837c3 Mon Sep 17 00:00:00 2001 From: jgiroso Date: Thu, 22 Jul 2021 15:57:11 -0400 Subject: [PATCH 052/100] Structure tests complete --- .../froilansfarm/Structure/ChickenCoop.java | 10 +++---- .../froilansfarm/Structure/FarmHouse.java | 11 ++++---- .../froilansfarm/Structure/Stable.java | 9 +++---- .../StructureTests/ChickenCoopTest.java | 25 +++++++++++++++++ .../StructureTests/FarmHouseTest.java | 27 +++++++++++++++++++ .../StructureTests/StableTest.java | 27 +++++++++++++++++++ 6 files changed, 93 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Structure/ChickenCoop.java b/src/main/java/com/zipcodewilmington/froilansfarm/Structure/ChickenCoop.java index 92266ef8..5fdc229f 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Structure/ChickenCoop.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Structure/ChickenCoop.java @@ -17,7 +17,6 @@ public ChickenCoop(Chicken chicken) { } public ChickenCoop() { - } public void add(Chicken chicken) { @@ -25,13 +24,12 @@ public void add(Chicken chicken) { } public Chicken getObjectByName(String name) { - Chicken thisChicken = new Chicken(); - for(Chicken chicken : chickenList) { - if(chicken.equals(name)) { - thisChicken = chicken; + for(Chicken element : chickenList) { + if(element.equals(name)) { + chicken = element; } } - return thisChicken; + return chicken; } public void remove(Chicken chicken) { diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Structure/FarmHouse.java b/src/main/java/com/zipcodewilmington/froilansfarm/Structure/FarmHouse.java index 36677fa4..65a0b891 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Structure/FarmHouse.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Structure/FarmHouse.java @@ -9,8 +9,10 @@ public class FarmHouse implements Shelter { List personList = new ArrayList(); + Person person; public FarmHouse(Person person) { + this.person = person; this.personList = personList; } @@ -21,13 +23,12 @@ public void add(Person person) { } public Person getObjectByName(String name) { - Person thisPerson = new Person(); - for(Person person : personList) { - if(person.equals(name)) { - thisPerson = person; + for(Person element : personList) { + if(element.equals(name)) { + person = element; } } - return thisPerson; + return person; } public void remove(Person person) { diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Structure/Stable.java b/src/main/java/com/zipcodewilmington/froilansfarm/Structure/Stable.java index 14877f4c..22d058df 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Structure/Stable.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Structure/Stable.java @@ -23,13 +23,12 @@ public void add(Horse horse) { } public Horse getObjectByName(String name) { - Horse thisHorse = new Horse(); - for(Horse horse : horseList) { - if(horse.equals(name)) { - thisHorse = horse; + for(Horse element : horseList) { + if(element.equals(name)) { + horse = element; } } - return thisHorse; + return horse; } public void remove(Horse horse) { diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/StructureTests/ChickenCoopTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/StructureTests/ChickenCoopTest.java index ae4a6df2..80383f25 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/StructureTests/ChickenCoopTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/StructureTests/ChickenCoopTest.java @@ -8,6 +8,31 @@ public class ChickenCoopTest { + @Test + public void testConstructor() { + //given + String expected = "Frank"; + Chicken chicken = new Chicken(expected); + //when + ChickenCoop chickenCoop = new ChickenCoop(chicken); + chickenCoop.add(chicken); + //then + Assert.assertTrue(chickenCoop.getChickenList().contains(chicken)); + } + + @Test + public void testGetObjectByName() { + //given + String name = "Frank"; + Chicken expected = new Chicken(name); + //when + ChickenCoop chickenCoop = new ChickenCoop(expected); + chickenCoop.add(expected); + Chicken actual = chickenCoop.getObjectByName(name); + //then + Assert.assertTrue(expected.equals(actual)); + } + @Test public void testAdd() { //given diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/StructureTests/FarmHouseTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/StructureTests/FarmHouseTest.java index e09b250c..3adb2ccc 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/StructureTests/FarmHouseTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/StructureTests/FarmHouseTest.java @@ -1,14 +1,41 @@ package com.zipcodewilmington.froilansfarm.StructureTests; +import com.zipcodewilmington.froilansfarm.Mammal.Chicken; import com.zipcodewilmington.froilansfarm.Mammal.Farmer; import com.zipcodewilmington.froilansfarm.Mammal.Person; import com.zipcodewilmington.froilansfarm.Shelter; +import com.zipcodewilmington.froilansfarm.Structure.ChickenCoop; import com.zipcodewilmington.froilansfarm.Structure.FarmHouse; import org.junit.Assert; import org.junit.Test; public class FarmHouseTest { + @Test + public void testConstructor() { + //given + String expected = "Froiland"; + Farmer farmer = new Farmer(expected); + //when + FarmHouse farmhouse = new FarmHouse(farmer); + farmhouse.add(farmer); + //then + Assert.assertTrue(farmhouse.getPersonList().contains(farmer)); + } + + @Test + public void testGetObjectByName() { + //given + String name = "Frank"; + Person expected = new Farmer(name); + //when + FarmHouse farmhouse = new FarmHouse(expected); + farmhouse.add(expected); + Person actual = farmhouse.getObjectByName(name); + //then + Assert.assertTrue(expected.equals(actual)); + } + @Test public void testAdd() { diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/StructureTests/StableTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/StructureTests/StableTest.java index 0341f1d8..4cde60c5 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/StructureTests/StableTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/StructureTests/StableTest.java @@ -1,13 +1,40 @@ package com.zipcodewilmington.froilansfarm.StructureTests; +import com.zipcodewilmington.froilansfarm.Mammal.Chicken; import com.zipcodewilmington.froilansfarm.Mammal.Horse; import com.zipcodewilmington.froilansfarm.Shelter; +import com.zipcodewilmington.froilansfarm.Structure.ChickenCoop; import com.zipcodewilmington.froilansfarm.Structure.Stable; import org.junit.Assert; import org.junit.Test; public class StableTest { + @Test + public void testConstructor() { + //given + String expected = "Judy"; + Horse horse = new Horse(expected); + //when + Stable stable = new Stable(horse); + stable.add(horse); + //then + Assert.assertTrue(stable.getHorseList().contains(horse)); + } + + @Test + public void testGetObjectByName() { + //given + String name = "Frank"; + Horse expected = new Horse(name); + //when + Stable stable = new Stable(expected); + stable.add(expected); + Horse actual = stable.getObjectByName(name); + //then + Assert.assertTrue(expected.equals(actual)); + } + @Test public void testAdd() { //given From 980ed564295e8d733d2feda4ed4c98f8c953c401 Mon Sep 17 00:00:00 2001 From: Nathan Date: Thu, 22 Jul 2021 16:17:53 -0400 Subject: [PATCH 053/100] the plot chickens --- .../froilansfarm/Food/Egg.java | 12 ++++------- .../froilansfarm/Mammal/Chicken.java | 8 ++++++-- .../froilansfarm/FoodTests/EggTest.java | 20 +++++++++++++++++-- .../froilansfarm/MammalTests/ChickenTest.java | 6 ++++-- 4 files changed, 32 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Food/Egg.java b/src/main/java/com/zipcodewilmington/froilansfarm/Food/Egg.java index c49971bb..bde67efa 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Food/Egg.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Food/Egg.java @@ -4,21 +4,17 @@ public class Egg implements Edible { - public static boolean isFertilized; - - public Egg(boolean isFertilized) { - this.isFertilized = isFertilized; - } + private boolean isFertilized; public Egg() { isFertilized = false; } - public static boolean isIsFertilized() { + public boolean isItFertilized() { return isFertilized; } - public static void setIsFertilized(boolean isFertilized) { - Egg.isFertilized = isFertilized; + public void setIsFertilized(boolean fertilize) { + this.isFertilized = fertilize; } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Chicken.java b/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Chicken.java index baec71c6..f17d1d4d 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Chicken.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Chicken.java @@ -9,7 +9,7 @@ import java.util.List; public class Chicken extends Animal implements Edible, Produce { - + private Boolean isFertilized; public List meals = new ArrayList<>(); public Chicken(String name) { @@ -24,9 +24,13 @@ public String makeNoise() { return "Cluck Cluck"; } + public void fertilize(){ + this.isFertilized = true; + } + @Override public Egg yield() { - if (!Egg.isFertilized){ + if (isFertilized){ return new Egg(); } return null; diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/FoodTests/EggTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/FoodTests/EggTest.java index 6617617c..76fc8f92 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/FoodTests/EggTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/FoodTests/EggTest.java @@ -10,8 +10,8 @@ public class EggTest { @Test public void eggTest() { - Egg egg = new Egg(); - + Edible egg = new Egg(); + Assert.assertTrue(egg instanceof Egg); } @Test @@ -19,4 +19,20 @@ public void testEggImplementation() { Egg egg = new Egg(); Assert.assertTrue(egg instanceof Edible); } + + @Test + public void isItFertilizedTest(){ + Egg egg = new Egg(); + Boolean fertilized = egg.isItFertilized(); + Assert.assertFalse(fertilized); + } + + @Test + public void setIsFertilizedTest(){ + Egg egg = new Egg(); + egg.setIsFertilized(true); + Boolean fertilized = egg.isItFertilized(); + Assert.assertTrue(fertilized); + } + } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/MammalTests/ChickenTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/MammalTests/ChickenTest.java index b3fc004f..7357610c 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/MammalTests/ChickenTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/MammalTests/ChickenTest.java @@ -44,14 +44,16 @@ public void testMakeNoise() { Assert.assertEquals(expected, actual); } + @Test public void testYield() { //given Chicken chicken = new Chicken(); //when - Egg egg = chicken.yield(); + chicken.fertilize(); + Edible egg = chicken.yield(); //then - Assert.assertTrue(egg instanceof Edible); + Assert.assertTrue(egg instanceof Egg); } @Test From 361156698308b6e25fce918ceb0c6e017d17459b Mon Sep 17 00:00:00 2001 From: jgiroso Date: Thu, 22 Jul 2021 16:18:11 -0400 Subject: [PATCH 054/100] edited person and farmer methods --- .../froilansfarm/Mammal/Farmer.java | 6 +----- .../froilansfarm/Mammal/Person.java | 9 +++++++-- .../froilansfarm/MammalTests/PersonTest.java | 14 ++++++++++++++ 3 files changed, 22 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Farmer.java b/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Farmer.java index 7714e36a..1055dfaa 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Farmer.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Farmer.java @@ -14,7 +14,7 @@ public class Farmer extends Person implements Botanist, Rider { private Rideable isRiding = null; - public List meals = new ArrayList<>(); + public Farmer(String name) { super(name); @@ -46,8 +46,4 @@ public void dismount(Rideable rideable) { public Rideable getIsRiding() { return isRiding; } - @Override - public void eat(Edible edible) { meals.add(edible); } - - public List getMealList() { return meals; } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Person.java b/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Person.java index 491f8f65..2a3abfa2 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Person.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Person.java @@ -4,9 +4,13 @@ import com.zipcodewilmington.froilansfarm.Eater; import com.zipcodewilmington.froilansfarm.NoiseMaker; +import java.util.ArrayList; +import java.util.List; + public class Person implements Eater, NoiseMaker { private String name; + public List meals = new ArrayList<>(); public Person(String name) { this.name = name; @@ -25,8 +29,9 @@ public void setName(String name) { } @Override - public void eat(T edible) { - } + public void eat(T edible) { meals.add(edible); } + + public List getMealList() { return meals; } @Override public String makeNoise(){ diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/MammalTests/PersonTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/MammalTests/PersonTest.java index 8caa0388..f1607e0e 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/MammalTests/PersonTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/MammalTests/PersonTest.java @@ -1,6 +1,8 @@ package com.zipcodewilmington.froilansfarm.MammalTests; import com.zipcodewilmington.froilansfarm.Eater; +import com.zipcodewilmington.froilansfarm.Food.Tomato; +import com.zipcodewilmington.froilansfarm.Mammal.Farmer; import com.zipcodewilmington.froilansfarm.Mammal.Person; import org.junit.Assert; import org.junit.Test; @@ -40,6 +42,18 @@ public void testMakeNoise() { Assert.assertEquals(expected, actual); } + @Test + public void testEat() { + //given + Person person = new Person(); + //when + Tomato tomato = new Tomato(); + person.eat(tomato); + person.getMealList(); + //then + Assert.assertTrue(person.meals.contains(tomato)); + } + @Test public void testImplementation() { Person person = new Person("Jonah"); From b35cf7b01bc16e7defe9aa686202f6f619ea3227 Mon Sep 17 00:00:00 2001 From: jgiroso Date: Thu, 22 Jul 2021 16:23:58 -0400 Subject: [PATCH 055/100] moved eat method from chicken and horse to Animal class only --- .../froilansfarm/Mammal/Animal.java | 8 ++++++-- .../froilansfarm/Mammal/Chicken.java | 9 --------- .../froilansfarm/MammalTests/HorseTest.java | 14 ++++++++++++++ 3 files changed, 20 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Animal.java b/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Animal.java index f87d8f67..a4b44795 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Animal.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Animal.java @@ -4,16 +4,20 @@ import com.zipcodewilmington.froilansfarm.Edible; import com.zipcodewilmington.froilansfarm.NoiseMaker; +import java.util.ArrayList; +import java.util.List; + public abstract class Animal implements Eater, NoiseMaker { private String name; + public List meals = new ArrayList<>(); public Animal() { name = ""; } - public void eat(T edible) { + public void eat(T edible) { meals.add(edible); } - } + public List getMealList() { return meals; } public String makeNoise() { return null; diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Chicken.java b/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Chicken.java index f17d1d4d..ff0817e2 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Chicken.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Chicken.java @@ -5,12 +5,9 @@ import com.zipcodewilmington.froilansfarm.Food.Egg; import com.zipcodewilmington.froilansfarm.Food.Produce; -import java.util.ArrayList; -import java.util.List; public class Chicken extends Animal implements Edible, Produce { private Boolean isFertilized; - public List meals = new ArrayList<>(); public Chicken(String name) { super(name); @@ -36,10 +33,4 @@ public Egg yield() { return null; } - public void eat(EarCorn earCorn) { - meals.add(earCorn); - } - - public List getMealList() { return meals; } - } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/MammalTests/HorseTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/MammalTests/HorseTest.java index 6ab76109..e5590a8d 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/MammalTests/HorseTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/MammalTests/HorseTest.java @@ -1,7 +1,9 @@ package com.zipcodewilmington.froilansfarm.MammalTests; import com.zipcodewilmington.froilansfarm.Edible; +import com.zipcodewilmington.froilansfarm.Food.EarCorn; import com.zipcodewilmington.froilansfarm.Mammal.Animal; +import com.zipcodewilmington.froilansfarm.Mammal.Chicken; import com.zipcodewilmington.froilansfarm.Mammal.Farmer; import com.zipcodewilmington.froilansfarm.Mammal.Horse; import com.zipcodewilmington.froilansfarm.Rideable; @@ -55,6 +57,18 @@ public void testRide() { } + @Test + public void testEat() { + //given + Horse horse = new Horse(); + //when + EarCorn earCorn = new EarCorn(); + horse.eat(earCorn); + horse.getMealList(); + //then + Assert.assertTrue(horse.meals.contains(earCorn)); + } + @Test public void testInheritance() { Horse horse = new Horse("Harvey"); From 1c10ce3d41a064eadf7c5ce5ff2bea83049a08ec Mon Sep 17 00:00:00 2001 From: jgiroso Date: Thu, 22 Jul 2021 16:42:38 -0400 Subject: [PATCH 056/100] added implementation test to PersonTests --- .../froilansfarm/MammalTests/PersonTest.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/MammalTests/PersonTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/MammalTests/PersonTest.java index f1607e0e..f00af7a0 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/MammalTests/PersonTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/MammalTests/PersonTest.java @@ -4,6 +4,7 @@ import com.zipcodewilmington.froilansfarm.Food.Tomato; import com.zipcodewilmington.froilansfarm.Mammal.Farmer; import com.zipcodewilmington.froilansfarm.Mammal.Person; +import com.zipcodewilmington.froilansfarm.NoiseMaker; import org.junit.Assert; import org.junit.Test; @@ -55,8 +56,14 @@ public void testEat() { } @Test - public void testImplementation() { - Person person = new Person("Jonah"); + public void testImplementationEater() { + Person person = new Person(); Assert.assertTrue(person instanceof Eater); } + + @Test + public void testImplementationNoiseMaker() { + Person person = new Person(); + Assert.assertTrue(person instanceof NoiseMaker); + } } From 3264514d802582e583aa8e51df3d354421eafaf5 Mon Sep 17 00:00:00 2001 From: Zach Date: Thu, 22 Jul 2021 17:04:18 -0400 Subject: [PATCH 057/100] Further testing on vehicles --- .../zipcodewilmington/froilansfarm/Farm.java | 25 +++++++++-- .../zipcodewilmington/froilansfarm/Field.java | 8 ++++ .../froilansfarm/Vehicles/CropDuster.java | 7 ++- src/test/java/Vehicles/CropDusterTest.java | 43 ++++++++++++++++--- src/test/java/Vehicles/TractorTest.java | 10 +++++ 5 files changed, 83 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Farm.java b/src/main/java/com/zipcodewilmington/froilansfarm/Farm.java index 098a89f5..59e7e779 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Farm.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Farm.java @@ -1,16 +1,29 @@ package com.zipcodewilmington.froilansfarm; +import com.zipcodewilmington.froilansfarm.Food.CropRow; import com.zipcodewilmington.froilansfarm.Mammal.Chicken; +import com.zipcodewilmington.froilansfarm.Mammal.Farmer; import com.zipcodewilmington.froilansfarm.Mammal.Horse; import com.zipcodewilmington.froilansfarm.Mammal.Person; +import com.zipcodewilmington.froilansfarm.Structure.ChickenCoop; +import com.zipcodewilmington.froilansfarm.Structure.FarmHouse; +import com.zipcodewilmington.froilansfarm.Structure.Stable; public class Farm { - private static Shelter farmhouse; - private static Shelter stable; - private static Shelter chickenCoop; + private static Shelter farmhouse = new FarmHouse(); + private static Shelter stable = new Stable(); + private static Shelter chickenCoop = new ChickenCoop(); + private static Field field = new Field(); public Farm(){ - + farmhouse.add(new Farmer("Froilan")); + farmhouse.add(new Farmer("Froilanda")); + stable.add(new Horse("Fork")); + stable.add(new Horse("Spoon")); + chickenCoop.add(new Chicken("Chicolate")); + chickenCoop.add(new Chicken("Eggward")); + field.add(new CropRow()); + field.add(new CropRow()); } public static Shelter getFarmhouse() { @@ -24,4 +37,8 @@ public static Shelter getStable() { public static Shelter getChickenCoop() { return chickenCoop; } + + public static Field getField(){ + return field; + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Field.java b/src/main/java/com/zipcodewilmington/froilansfarm/Field.java index 59185d5d..7882c49d 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Field.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Field.java @@ -5,4 +5,12 @@ public class Field { private List myField; + + public void add(CropRow row){ + myField.add(row); + } + + public List getMyField() { + return myField; + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDuster.java b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDuster.java index c09c63e2..0b9d2691 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDuster.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDuster.java @@ -1,11 +1,16 @@ package com.zipcodewilmington.froilansfarm.Vehicles; +import com.zipcodewilmington.froilansfarm.Farm; import com.zipcodewilmington.froilansfarm.Food.CropRow; -public abstract class CropDuster extends Aircraft implements FarmVehicle{ +public class CropDuster extends Aircraft implements FarmVehicle{ public void fertilizeCrop(CropRow row){ row.fertilize(); } + @Override + public void operate(Farm farm) { + + } } diff --git a/src/test/java/Vehicles/CropDusterTest.java b/src/test/java/Vehicles/CropDusterTest.java index 9c826732..26fa5064 100644 --- a/src/test/java/Vehicles/CropDusterTest.java +++ b/src/test/java/Vehicles/CropDusterTest.java @@ -1,6 +1,8 @@ package Vehicles; import com.zipcodewilmington.froilansfarm.Farm; +import com.zipcodewilmington.froilansfarm.Food.Crop; +import com.zipcodewilmington.froilansfarm.Food.CropRow; import com.zipcodewilmington.froilansfarm.Vehicles.*; import org.junit.Assert; import org.junit.Test; @@ -9,19 +11,50 @@ public class CropDusterTest { @Test public void constructorTest1(){ - Tractor tractor = new Tractor(); + CropDuster duster = new CropDuster(); - Boolean actual = tractor instanceof Vehicle; + Boolean actual = duster instanceof Vehicle; Assert.assertTrue(actual); } - + @Test public void constructorTest2(){ - Tractor tractor = new Tractor(); + CropDuster duster = new CropDuster(); + + Boolean actual = duster instanceof FarmVehicle; + + Assert.assertTrue(actual); + } - Boolean actual = tractor instanceof FarmVehicle; + @Test + public void constructorTest3(){ + CropDuster duster = new CropDuster(); + + Boolean actual = duster instanceof Aircraft; Assert.assertTrue(actual); } + + @Test + public void fertilizeTest(){ + CropDuster duster = new CropDuster(); + + CropRow row = new CropRow(); + duster.fertilizeCrop(row); + + Boolean actual = row.checkFertilized(); + + Assert.assertTrue(actual); + } + + @Test + public void shootTest(){ + Aircraft duster = new CropDuster(); + + String actual = duster.shoot(); + String expected = "BULLETS"; + + Assert.assertEquals(expected, actual); + } } diff --git a/src/test/java/Vehicles/TractorTest.java b/src/test/java/Vehicles/TractorTest.java index c2d4a9b4..3c927612 100644 --- a/src/test/java/Vehicles/TractorTest.java +++ b/src/test/java/Vehicles/TractorTest.java @@ -1,5 +1,6 @@ package Vehicles; +import com.zipcodewilmington.froilansfarm.Mammal.Farmer; import com.zipcodewilmington.froilansfarm.Vehicles.FarmVehicle; import com.zipcodewilmington.froilansfarm.Vehicles.Vehicle; import com.zipcodewilmington.froilansfarm.Vehicles.Tractor; @@ -35,4 +36,13 @@ public void constructorMakeNoise(){ Assert.assertEquals(expected, actual); } + + @Test + public void tractorHarvestTest(){ + Vehicle tractor = new Tractor(); + Farmer farmer = new Farmer(); + + //Needs something testable in regards to tractor.ride + tractor.ride(farmer); + } } From a06a99233c5ff12d9bb933f184883afa6da94dd6 Mon Sep 17 00:00:00 2001 From: Nathan Date: Thu, 22 Jul 2021 17:16:21 -0400 Subject: [PATCH 058/100] took out some tests --- .../froilansfarm/Food/Crop.java | 8 +------ src/test/java/Vehicles/CropDusterTest.java | 22 +++++++++---------- .../froilansfarm/FoodTests/CornStalkTest.java | 11 ++++++++++ .../froilansfarm/FoodTests/CropTest.java | 15 ------------- 4 files changed, 23 insertions(+), 33 deletions(-) delete mode 100644 src/test/java/com/zipcodewilmington/froilansfarm/FoodTests/CropTest.java diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Food/Crop.java b/src/main/java/com/zipcodewilmington/froilansfarm/Food/Crop.java index ba348d71..be77d15e 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Food/Crop.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Food/Crop.java @@ -25,9 +25,7 @@ public void fertilize(){ } @Override - public Edible yield() { - return null; - } + abstract public Edible yield(); public Boolean checkFertilized() { return fertilized; @@ -44,8 +42,4 @@ public void setHarvested(Boolean harvested) { public Integer getId() { return id; } - - public void setId(Integer id) { - this.id = id; - } } diff --git a/src/test/java/Vehicles/CropDusterTest.java b/src/test/java/Vehicles/CropDusterTest.java index 26fa5064..5b703cc7 100644 --- a/src/test/java/Vehicles/CropDusterTest.java +++ b/src/test/java/Vehicles/CropDusterTest.java @@ -36,17 +36,17 @@ public void constructorTest3(){ Assert.assertTrue(actual); } - @Test - public void fertilizeTest(){ - CropDuster duster = new CropDuster(); - - CropRow row = new CropRow(); - duster.fertilizeCrop(row); - - Boolean actual = row.checkFertilized(); - - Assert.assertTrue(actual); - } +// @Test +// public void fertilizeTest(){ +// CropDuster duster = new CropDuster(); +// +// CropRow row = new CropRow(); +// duster.fertilizeCrop(row); +// +// Boolean actual = row.checkFertilized(); +// +// Assert.assertTrue(actual); +// } @Test public void shootTest(){ diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/FoodTests/CornStalkTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/FoodTests/CornStalkTest.java index cd259065..b5e59541 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/FoodTests/CornStalkTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/FoodTests/CornStalkTest.java @@ -62,4 +62,15 @@ public void yieldTest(){ Assert.assertTrue(harvested); } + @Test + public void yieldNullTest(){ + CornStalk cornStalk = new CornStalk(); + //when + Edible harvest = cornStalk.yield(); + Boolean harvested = cornStalk.checkHarvested(); + //then + Assert.assertNull(harvest); + Assert.assertFalse(harvested); + } + } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/FoodTests/CropTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/FoodTests/CropTest.java deleted file mode 100644 index bb39b5a6..00000000 --- a/src/test/java/com/zipcodewilmington/froilansfarm/FoodTests/CropTest.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.zipcodewilmington.froilansfarm.FoodTests; - -import com.zipcodewilmington.froilansfarm.Food.CornStalk; -import com.zipcodewilmington.froilansfarm.Food.Crop; -import org.junit.Assert; -import org.junit.Test; - -public class CropTest { - - @Test - public void fertilizeTest() {} - - } - - From e6bcc2354dbe9230cc1715ac9e6062901eb0226c Mon Sep 17 00:00:00 2001 From: Nathan Date: Thu, 22 Jul 2021 17:22:10 -0400 Subject: [PATCH 059/100] food package is done --- .../FoodTests/TomatoPlantTest.java | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/FoodTests/TomatoPlantTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/FoodTests/TomatoPlantTest.java index 16290517..6169dcba 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/FoodTests/TomatoPlantTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/FoodTests/TomatoPlantTest.java @@ -1,4 +1,25 @@ package com.zipcodewilmington.froilansfarm.FoodTests; +import com.zipcodewilmington.froilansfarm.Edible; +import com.zipcodewilmington.froilansfarm.Food.Tomato; +import com.zipcodewilmington.froilansfarm.Food.TomatoPlant; +import org.junit.Assert; +import org.junit.Test; + public class TomatoPlantTest { + + @Test + public void yieldTest(){ + TomatoPlant tomatoPlant = new TomatoPlant(); + tomatoPlant.fertilize(); + Edible food = tomatoPlant.yield(); + Assert.assertTrue(food instanceof Tomato); + } + + @Test + public void yieldNullTest(){ + TomatoPlant tomatoPlant = new TomatoPlant(); + Edible food = tomatoPlant.yield(); + Assert.assertNull(food); + } } From 0afbf430a45540283785f8e0a375dc00f04ba709 Mon Sep 17 00:00:00 2001 From: Jeremy Date: Thu, 22 Jul 2021 17:32:35 -0400 Subject: [PATCH 060/100] woo --- .../zipcodewilmington/froilansfarm/Field.java | 2 ++ .../froilansfarm/Simulation.java | 16 ++++++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Simulation.java diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Field.java b/src/main/java/com/zipcodewilmington/froilansfarm/Field.java index 59185d5d..d6f4e604 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Field.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Field.java @@ -4,5 +4,7 @@ import java.util.List; public class Field { + private List myField; + } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Simulation.java b/src/main/java/com/zipcodewilmington/froilansfarm/Simulation.java new file mode 100644 index 00000000..40c27410 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Simulation.java @@ -0,0 +1,16 @@ +package com.zipcodewilmington.froilansfarm; + +import com.zipcodewilmington.froilansfarm.Food.CropRow; + +public class Simulation { + public static void main(String[] args) { + run(); + } + + public static void run() { + Field field = new Field(); + CropRow cropRow = new CropRow(); + + } + +} From 4c6604beb657ccce3404411a831ab134785bb51b Mon Sep 17 00:00:00 2001 From: Jeremy Date: Thu, 22 Jul 2021 17:47:04 -0400 Subject: [PATCH 061/100] Started Simulation --- .../froilansfarm/Simulation.java | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Simulation.java b/src/main/java/com/zipcodewilmington/froilansfarm/Simulation.java index 40c27410..07351e95 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Simulation.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Simulation.java @@ -1,6 +1,13 @@ package com.zipcodewilmington.froilansfarm; + import com.zipcodewilmington.froilansfarm.Food.CropRow; +import com.zipcodewilmington.froilansfarm.Mammal.Chicken; +import com.zipcodewilmington.froilansfarm.Mammal.Horse; +import com.zipcodewilmington.froilansfarm.Structure.ChickenCoop; +import com.zipcodewilmington.froilansfarm.Vehicles.Aircraft; +import com.zipcodewilmington.froilansfarm.Vehicles.FarmVehicle; +import com.zipcodewilmington.froilansfarm.Vehicles.Tractor; public class Simulation { public static void main(String[] args) { @@ -8,9 +15,16 @@ public static void main(String[] args) { } public static void run() { + + Farm farm = new Farm(); Field field = new Field(); CropRow cropRow = new CropRow(); + ChickenCoop chickenCoop = new ChickenCoop(); + Chicken chicken = new Chicken(); + Horse horse = new Horse(); + FarmVehicle tractor = new Tractor(); + Aircraft cropDuster = new Aircraft(); - } + } } From 90a8eff552f2f11f8bceb11b639bab314f87bd02 Mon Sep 17 00:00:00 2001 From: Zach Date: Thu, 22 Jul 2021 17:48:28 -0400 Subject: [PATCH 062/100] Testing stuff --- .../froilansfarm/Vehicles/Tractor.java | 12 ++++++++++-- 1 file changed, 10 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 b16623ba..2e2e0b78 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Tractor.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Tractor.java @@ -2,9 +2,14 @@ import com.zipcodewilmington.froilansfarm.Farm; import com.zipcodewilmington.froilansfarm.Food.Crop; +import com.zipcodewilmington.froilansfarm.Food.CropRow; import com.zipcodewilmington.froilansfarm.Rider; +import java.util.List; + public class Tractor implements FarmVehicle{ + private Rider rider; + public Crop harvest(Crop crop){ return null; @@ -18,11 +23,14 @@ public String makeNoise() { @Override public void ride(Rider rider) { - + this.rider = rider; } @Override public void operate(Farm farm) { - + List rows = farm.getField().getMyField(); + for(int i = 0; i < rows.size(); i++){ + rows.get(i).fertilizeRow(); + } } } From fe9e13f152d2e02dd51782bd4bd8edf252c3eaa6 Mon Sep 17 00:00:00 2001 From: Zach Date: Thu, 22 Jul 2021 18:45:32 -0400 Subject: [PATCH 063/100] oops --- .../zipcodewilmington/froilansfarm/Vehicles/Tractor.java | 7 ++++--- src/test/java/Vehicles/TractorTest.java | 6 ++++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Tractor.java b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Tractor.java index 2e2e0b78..70abf84d 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Tractor.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Tractor.java @@ -5,14 +5,15 @@ import com.zipcodewilmington.froilansfarm.Food.CropRow; import com.zipcodewilmington.froilansfarm.Rider; +import java.util.ArrayList; import java.util.List; public class Tractor implements FarmVehicle{ private Rider rider; + private List aList = new ArrayList<>(); - - public Crop harvest(Crop crop){ - return null; + public void harvest(Crop crop){ + aList.add(crop); } diff --git a/src/test/java/Vehicles/TractorTest.java b/src/test/java/Vehicles/TractorTest.java index 3c927612..7066a6e9 100644 --- a/src/test/java/Vehicles/TractorTest.java +++ b/src/test/java/Vehicles/TractorTest.java @@ -1,5 +1,7 @@ package Vehicles; +import com.zipcodewilmington.froilansfarm.Food.Crop; +import com.zipcodewilmington.froilansfarm.Food.TomatoPlant; import com.zipcodewilmington.froilansfarm.Mammal.Farmer; import com.zipcodewilmington.froilansfarm.Vehicles.FarmVehicle; import com.zipcodewilmington.froilansfarm.Vehicles.Vehicle; @@ -41,8 +43,12 @@ public void constructorMakeNoise(){ public void tractorHarvestTest(){ Vehicle tractor = new Tractor(); Farmer farmer = new Farmer(); + Crop crop = new TomatoPlant(); //Needs something testable in regards to tractor.ride tractor.ride(farmer); + + } + } From e822d2fe6394a47e3e023fe85833002d30292d19 Mon Sep 17 00:00:00 2001 From: Zach Date: Thu, 22 Jul 2021 19:01:15 -0400 Subject: [PATCH 064/100] did on dev again --- .../com/zipcodewilmington/froilansfarm/Food/CropRow.java | 2 ++ .../zipcodewilmington/froilansfarm/Vehicles/Tractor.java | 2 +- src/test/java/Vehicles/TractorTest.java | 6 ++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Food/CropRow.java b/src/main/java/com/zipcodewilmington/froilansfarm/Food/CropRow.java index 3b9fac91..31d3b186 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Food/CropRow.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Food/CropRow.java @@ -26,6 +26,8 @@ public Crop getCropById(Integer id){ return result; } + + public void fertilizeRow(){ cropList.forEach(Crop::fertilize); } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Tractor.java b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Tractor.java index 70abf84d..d7ed95b1 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Tractor.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Tractor.java @@ -31,7 +31,7 @@ public void ride(Rider rider) { public void operate(Farm farm) { List rows = farm.getField().getMyField(); for(int i = 0; i < rows.size(); i++){ - rows.get(i).fertilizeRow(); + //aList.add(rows.get(i)); } } } diff --git a/src/test/java/Vehicles/TractorTest.java b/src/test/java/Vehicles/TractorTest.java index 7066a6e9..889d7c8c 100644 --- a/src/test/java/Vehicles/TractorTest.java +++ b/src/test/java/Vehicles/TractorTest.java @@ -1,6 +1,7 @@ package Vehicles; import com.zipcodewilmington.froilansfarm.Food.Crop; +import com.zipcodewilmington.froilansfarm.Food.CropRow; import com.zipcodewilmington.froilansfarm.Food.TomatoPlant; import com.zipcodewilmington.froilansfarm.Mammal.Farmer; import com.zipcodewilmington.froilansfarm.Vehicles.FarmVehicle; @@ -44,10 +45,11 @@ public void tractorHarvestTest(){ Vehicle tractor = new Tractor(); Farmer farmer = new Farmer(); Crop crop = new TomatoPlant(); - + CropRow rows = new CropRow(); + rows.plantCrop(crop); //Needs something testable in regards to tractor.ride tractor.ride(farmer); - + //tractor; } From 8640b743dcf37491e56b1bcf15a7e9659cbf0ef9 Mon Sep 17 00:00:00 2001 From: Jeremy Date: Thu, 22 Jul 2021 19:03:42 -0400 Subject: [PATCH 065/100] Simulation stuff? --- .../froilansfarm/Simulation.java | 39 +++++++++++++++++-- 1 file changed, 36 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Simulation.java b/src/main/java/com/zipcodewilmington/froilansfarm/Simulation.java index 07351e95..7d6a6a7d 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Simulation.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Simulation.java @@ -3,7 +3,9 @@ import com.zipcodewilmington.froilansfarm.Food.CropRow; import com.zipcodewilmington.froilansfarm.Mammal.Chicken; +import com.zipcodewilmington.froilansfarm.Mammal.Farmer; import com.zipcodewilmington.froilansfarm.Mammal.Horse; +import com.zipcodewilmington.froilansfarm.Mammal.Person; import com.zipcodewilmington.froilansfarm.Structure.ChickenCoop; import com.zipcodewilmington.froilansfarm.Vehicles.Aircraft; import com.zipcodewilmington.froilansfarm.Vehicles.FarmVehicle; @@ -17,12 +19,43 @@ public static void main(String[] args) { public static void run() { Farm farm = new Farm(); + + Person froilan = new Farmer("Froilan"); + Person froilanda = new Person("Froilanda"); + Field field = new Field(); CropRow cropRow = new CropRow(); ChickenCoop chickenCoop = new ChickenCoop(); - Chicken chicken = new Chicken(); - Horse horse = new Horse(); - FarmVehicle tractor = new Tractor(); + + Chicken chicken1 = new Chicken(); + Chicken chicken2 = new Chicken(); + Chicken chicken3 = new Chicken(); + Chicken chicken4 = new Chicken(); + Chicken chicken5 = new Chicken(); + Chicken chicken6 = new Chicken(); + Chicken chicken7 = new Chicken(); + Chicken chicken8 = new Chicken(); + Chicken chicken9 = new Chicken(); + Chicken chicken10 = new Chicken(); + Chicken chicken11 = new Chicken(); + Chicken chicken12 = new Chicken(); + Chicken chicken13 = new Chicken(); + Chicken chicken14 = new Chicken(); + Chicken chicken15 = new Chicken(); + + Horse horse1 = new Horse(); + Horse horse2 = new Horse(); + Horse horse3 = new Horse(); + Horse horse4 = new Horse(); + Horse horse5 = new Horse(); + Horse horse6 = new Horse(); + Horse horse7 = new Horse(); + Horse horse8 = new Horse(); + Horse horse9 = new Horse(); + Horse horse10 = new Horse(); + + FarmVehicle tractor1 = new Tractor(); + FarmVehicle tractor2 = new Tractor(); Aircraft cropDuster = new Aircraft(); From c9da7914ecec7246b99784d0e69f07f52fd8dd3a Mon Sep 17 00:00:00 2001 From: jgiroso Date: Thu, 22 Jul 2021 19:21:36 -0400 Subject: [PATCH 066/100] Carrot classes and tests added --- .../froilansfarm/Food/Carrot.java | 8 +++ .../froilansfarm/Food/CarrotFlower.java | 20 ++++++ .../FoodTests/CarrotFlowerTest.java | 72 +++++++++++++++++++ .../froilansfarm/FoodTests/CarrotTest.java | 22 ++++++ 4 files changed, 122 insertions(+) create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Food/Carrot.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Food/CarrotFlower.java create mode 100644 src/test/java/com/zipcodewilmington/froilansfarm/FoodTests/CarrotFlowerTest.java create mode 100644 src/test/java/com/zipcodewilmington/froilansfarm/FoodTests/CarrotTest.java diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Food/Carrot.java b/src/main/java/com/zipcodewilmington/froilansfarm/Food/Carrot.java new file mode 100644 index 00000000..af57f801 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Food/Carrot.java @@ -0,0 +1,8 @@ +package com.zipcodewilmington.froilansfarm.Food; + +import com.zipcodewilmington.froilansfarm.Edible; + +public class Carrot implements Edible { + + public Carrot() {} +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Food/CarrotFlower.java b/src/main/java/com/zipcodewilmington/froilansfarm/Food/CarrotFlower.java new file mode 100644 index 00000000..641ae675 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Food/CarrotFlower.java @@ -0,0 +1,20 @@ +package com.zipcodewilmington.froilansfarm.Food; + +public class CarrotFlower extends Crop{ + + public CarrotFlower(Integer id){ + super(id); + } + + public CarrotFlower(){ + } + + @Override + public Carrot yield () { + if(this.checkFertilized() && !this.checkHarvested()){ // does check harvested have to be false in order to harvest th corn? + this.setHarvested(true); + return new Carrot(); + } + return null; + } +} diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/FoodTests/CarrotFlowerTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/FoodTests/CarrotFlowerTest.java new file mode 100644 index 00000000..7e6d57f3 --- /dev/null +++ b/src/test/java/com/zipcodewilmington/froilansfarm/FoodTests/CarrotFlowerTest.java @@ -0,0 +1,72 @@ +package com.zipcodewilmington.froilansfarm.FoodTests; + +import com.zipcodewilmington.froilansfarm.Edible; +import com.zipcodewilmington.froilansfarm.Food.*; +import org.junit.Assert; +import org.junit.Test; + +public class CarrotFlowerTest { + + @Test + public void setHarvestedTest() { + CarrotFlower carrotFlower = new CarrotFlower(2); + carrotFlower.setHarvested(true); + boolean actual = carrotFlower.checkHarvested(); + Assert.assertEquals(true, actual); + + } + + @Test + public void checkHarvestedTest() { + CarrotFlower carrotFlower = new CarrotFlower(2); + boolean actual = carrotFlower.checkHarvested(); + Assert.assertEquals(false, actual); + + } + + @Test + public void setFertilizedTest(){ + CarrotFlower carrotFlower = new CarrotFlower(2); + carrotFlower.fertilize(); + Boolean stalkIsFertilized = carrotFlower.checkFertilized(); + Assert.assertTrue(stalkIsFertilized); + } + + @Test + public void checkFertilizedTest() { + CarrotFlower carrotFlower = new CarrotFlower(2); + Boolean stalkIsFertilized = carrotFlower.checkFertilized(); + Assert.assertFalse(stalkIsFertilized); + + } + + + @Test + public void testCornStalkInheritance() { + CarrotFlower carrotFlower = new CarrotFlower(2); + Assert.assertTrue(carrotFlower instanceof Crop); + } + + @Test + public void yieldTest(){ + CarrotFlower carrotFlower = new CarrotFlower(); + carrotFlower.fertilize(); + //when + Edible harvest = carrotFlower.yield(); + Boolean harvested = carrotFlower.checkHarvested(); + //then + Assert.assertTrue(harvest instanceof Carrot); + Assert.assertTrue(harvested); + } + + @Test + public void yieldNullTest(){ + CarrotFlower carrotFlower = new CarrotFlower(); + //when + Edible harvest = carrotFlower.yield(); + Boolean harvested = carrotFlower.checkHarvested(); + //then + Assert.assertNull(harvest); + Assert.assertFalse(harvested); + } +} diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/FoodTests/CarrotTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/FoodTests/CarrotTest.java new file mode 100644 index 00000000..9ae858bf --- /dev/null +++ b/src/test/java/com/zipcodewilmington/froilansfarm/FoodTests/CarrotTest.java @@ -0,0 +1,22 @@ +package com.zipcodewilmington.froilansfarm.FoodTests; + +import com.zipcodewilmington.froilansfarm.Edible; +import com.zipcodewilmington.froilansfarm.Food.Carrot; +import com.zipcodewilmington.froilansfarm.Food.EarCorn; +import org.junit.Assert; +import org.junit.Test; + +public class CarrotTest { + + @Test + public void carrotTest() { + Carrot carrot = new Carrot(); + + } + + @Test + public void testEarCornImplementation() { + Carrot carrot = new Carrot(); + Assert.assertTrue(carrot instanceof Edible); + } +} From 50bfa3dc955906a91981419a30853dce1dd59f03 Mon Sep 17 00:00:00 2001 From: Nathan Date: Thu, 22 Jul 2021 19:23:45 -0400 Subject: [PATCH 067/100] croprow harvest method --- .../froilansfarm/Food/CropRow.java | 13 ++++++++++ .../froilansfarm/Food/EarCorn.java | 3 ++- .../froilansfarm/Food/Tomato.java | 1 - .../froilansfarm/Vehicles/Tractor.java | 1 + .../froilansfarm/FoodTests/CropRowTest.java | 25 +++++++++++++++++++ 5 files changed, 41 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Food/CropRow.java b/src/main/java/com/zipcodewilmington/froilansfarm/Food/CropRow.java index 3b9fac91..78313e05 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Food/CropRow.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Food/CropRow.java @@ -1,5 +1,7 @@ package com.zipcodewilmington.froilansfarm.Food; +import com.zipcodewilmington.froilansfarm.Edible; + import java.util.ArrayList; import java.util.List; @@ -30,5 +32,16 @@ public void fertilizeRow(){ cropList.forEach(Crop::fertilize); } + public ArrayList harvestRow(){ + ArrayList harvest = new ArrayList<>(); + for (Crop crop: cropList){ + harvest.add(crop.yield()); + crop.setHarvested(true); + } + return harvest; + } + + + } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Food/EarCorn.java b/src/main/java/com/zipcodewilmington/froilansfarm/Food/EarCorn.java index ab88db0d..f4d6d050 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Food/EarCorn.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Food/EarCorn.java @@ -5,7 +5,8 @@ public class EarCorn implements Edible { public EarCorn() { - } + + } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Food/Tomato.java b/src/main/java/com/zipcodewilmington/froilansfarm/Food/Tomato.java index faf87834..46822591 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Food/Tomato.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Food/Tomato.java @@ -5,7 +5,6 @@ public class Tomato implements Edible { public Tomato() { - } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Tractor.java b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Tractor.java index 70abf84d..7b9096f9 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Tractor.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Tractor.java @@ -34,4 +34,5 @@ public void operate(Farm farm) { rows.get(i).fertilizeRow(); } } + } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/FoodTests/CropRowTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/FoodTests/CropRowTest.java index 824d4bb1..0eb42af6 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/FoodTests/CropRowTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/FoodTests/CropRowTest.java @@ -1,9 +1,13 @@ package com.zipcodewilmington.froilansfarm.FoodTests; +import com.zipcodewilmington.froilansfarm.Edible; import com.zipcodewilmington.froilansfarm.Food.*; import org.junit.Assert; import org.junit.Test; +import java.util.ArrayList; +import java.util.Arrays; + public class CropRowTest { @Test @@ -65,4 +69,25 @@ public void fertilizeRowTest(){ } + @Test + public void harvestRowTest(){ + //given + CropRow myCropRow = new CropRow(); + Crop tomato1 = new TomatoPlant(1); + Crop corn = new CornStalk(2); + Crop tomato2 = new TomatoPlant(3); + myCropRow.plantCrop(corn); + myCropRow.plantCrop(tomato1); + myCropRow.plantCrop(tomato2); + myCropRow.fertilizeRow(); + //when + ArrayList basket = myCropRow.harvestRow(); + for(Edible item: basket){ + System.out.println(item.getClass().getSimpleName()); + } + //then + + } + + } From b853e376e510a09073e831afcb5e0b78313383d3 Mon Sep 17 00:00:00 2001 From: Jeremy Date: Thu, 22 Jul 2021 19:25:28 -0400 Subject: [PATCH 068/100] heyo --- .../java/com/zipcodewilmington/froilansfarm/Simulation.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Simulation.java b/src/main/java/com/zipcodewilmington/froilansfarm/Simulation.java index 7d6a6a7d..eca16441 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Simulation.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Simulation.java @@ -2,6 +2,7 @@ import com.zipcodewilmington.froilansfarm.Food.CropRow; +import com.zipcodewilmington.froilansfarm.Food.EarCorn; import com.zipcodewilmington.froilansfarm.Mammal.Chicken; import com.zipcodewilmington.froilansfarm.Mammal.Farmer; import com.zipcodewilmington.froilansfarm.Mammal.Horse; @@ -24,9 +25,14 @@ public static void run() { Person froilanda = new Person("Froilanda"); Field field = new Field(); + + EarCorn earCorn = new EarCorn(); + CropRow cropRow = new CropRow(); ChickenCoop chickenCoop = new ChickenCoop(); + + Chicken chicken1 = new Chicken(); Chicken chicken2 = new Chicken(); Chicken chicken3 = new Chicken(); From 8935fff14cf1752e66a84558f367ca7d6e663466 Mon Sep 17 00:00:00 2001 From: Zach Date: Thu, 22 Jul 2021 20:16:02 -0400 Subject: [PATCH 069/100] Edits to farm, tractor, tractorHarvestTest --- .../zipcodewilmington/froilansfarm/Farm.java | 16 +++++------ .../zipcodewilmington/froilansfarm/Field.java | 3 ++- .../froilansfarm/Vehicles/CropDuster.java | 7 +++-- .../froilansfarm/Vehicles/Tractor.java | 16 +++++++---- src/test/java/Vehicles/CropDusterTest.java | 6 +++++ src/test/java/Vehicles/TractorTest.java | 27 +++++++++++-------- 6 files changed, 48 insertions(+), 27 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Farm.java b/src/main/java/com/zipcodewilmington/froilansfarm/Farm.java index 59e7e779..7a3ea212 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Farm.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Farm.java @@ -10,10 +10,10 @@ import com.zipcodewilmington.froilansfarm.Structure.Stable; public class Farm { - private static Shelter farmhouse = new FarmHouse(); - private static Shelter stable = new Stable(); - private static Shelter chickenCoop = new ChickenCoop(); - private static Field field = new Field(); + private Shelter farmhouse = new FarmHouse(); + private Shelter stable = new Stable(); + private Shelter chickenCoop = new ChickenCoop(); + private Field field = new Field(); public Farm(){ farmhouse.add(new Farmer("Froilan")); @@ -26,19 +26,19 @@ public Farm(){ field.add(new CropRow()); } - public static Shelter getFarmhouse() { + public Shelter getFarmhouse() { return farmhouse; } - public static Shelter getStable() { + public Shelter getStable() { return stable; } - public static Shelter getChickenCoop() { + public Shelter getChickenCoop() { return chickenCoop; } - public static Field getField(){ + public Field getField(){ return field; } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Field.java b/src/main/java/com/zipcodewilmington/froilansfarm/Field.java index 021f78c5..d0e912ce 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Field.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Field.java @@ -1,11 +1,12 @@ package com.zipcodewilmington.froilansfarm; import com.zipcodewilmington.froilansfarm.Food.CropRow; +import java.util.ArrayList; import java.util.List; public class Field { - private List myField; + private List myField = new ArrayList<>(); public void add(CropRow row){ diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDuster.java b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDuster.java index 58176f8d..b9c80281 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDuster.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDuster.java @@ -1,6 +1,7 @@ package com.zipcodewilmington.froilansfarm.Vehicles; import com.zipcodewilmington.froilansfarm.Farm; +import com.zipcodewilmington.froilansfarm.Field; import com.zipcodewilmington.froilansfarm.Food.CropRow; public class CropDuster extends Aircraft implements FarmVehicle{ @@ -9,8 +10,10 @@ public void fertilizeCrop(CropRow row){ row.fertilizeRow(); } - @Override - public void operate(Farm farm) { + public void operate(Farm farm) { + for(CropRow element : farm.getField().getMyField()){ + element.fertilizeRow(); + } } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Tractor.java b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Tractor.java index 4853efa5..1f909684 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Tractor.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Tractor.java @@ -1,5 +1,6 @@ package com.zipcodewilmington.froilansfarm.Vehicles; +import com.zipcodewilmington.froilansfarm.Edible; import com.zipcodewilmington.froilansfarm.Farm; import com.zipcodewilmington.froilansfarm.Food.Crop; import com.zipcodewilmington.froilansfarm.Food.CropRow; @@ -10,9 +11,9 @@ public class Tractor implements FarmVehicle{ private Rider rider; - private List aList = new ArrayList<>(); + private List aList = new ArrayList<>(); - public void harvest(Crop crop){ + public void harvest(Edible crop){ aList.add(crop); } @@ -22,17 +23,22 @@ public String makeNoise() { } - @Override + public void ride(Rider rider) { this.rider = rider; } - @Override public void operate(Farm farm) { List rows = farm.getField().getMyField(); for(int i = 0; i < rows.size(); i++){ - //aList.add(rows.get(i)); + ArrayList listOfCrops = rows.get(i).harvestRow(); + for(int j = 0; j < listOfCrops.size(); j++){ + harvest(listOfCrops.get(j)); + } } } + public List getaList() { + return aList; + } } diff --git a/src/test/java/Vehicles/CropDusterTest.java b/src/test/java/Vehicles/CropDusterTest.java index 5b703cc7..9a888e60 100644 --- a/src/test/java/Vehicles/CropDusterTest.java +++ b/src/test/java/Vehicles/CropDusterTest.java @@ -1,12 +1,16 @@ package Vehicles; import com.zipcodewilmington.froilansfarm.Farm; +import com.zipcodewilmington.froilansfarm.Field; import com.zipcodewilmington.froilansfarm.Food.Crop; import com.zipcodewilmington.froilansfarm.Food.CropRow; +import com.zipcodewilmington.froilansfarm.Food.TomatoPlant; import com.zipcodewilmington.froilansfarm.Vehicles.*; import org.junit.Assert; import org.junit.Test; +import java.util.ArrayList; + public class CropDusterTest { @Test @@ -57,4 +61,6 @@ public void shootTest(){ Assert.assertEquals(expected, actual); } + + } diff --git a/src/test/java/Vehicles/TractorTest.java b/src/test/java/Vehicles/TractorTest.java index 889d7c8c..ff752265 100644 --- a/src/test/java/Vehicles/TractorTest.java +++ b/src/test/java/Vehicles/TractorTest.java @@ -1,15 +1,17 @@ package Vehicles; +import com.zipcodewilmington.froilansfarm.Farm; +import com.zipcodewilmington.froilansfarm.Field; import com.zipcodewilmington.froilansfarm.Food.Crop; import com.zipcodewilmington.froilansfarm.Food.CropRow; import com.zipcodewilmington.froilansfarm.Food.TomatoPlant; import com.zipcodewilmington.froilansfarm.Mammal.Farmer; -import com.zipcodewilmington.froilansfarm.Vehicles.FarmVehicle; -import com.zipcodewilmington.froilansfarm.Vehicles.Vehicle; -import com.zipcodewilmington.froilansfarm.Vehicles.Tractor; +import com.zipcodewilmington.froilansfarm.Vehicles.*; import org.junit.Assert; import org.junit.Test; +import java.util.ArrayList; + public class TractorTest { @Test @@ -42,15 +44,18 @@ public void constructorMakeNoise(){ @Test public void tractorHarvestTest(){ - Vehicle tractor = new Tractor(); - Farmer farmer = new Farmer(); - Crop crop = new TomatoPlant(); - CropRow rows = new CropRow(); - rows.plantCrop(crop); - //Needs something testable in regards to tractor.ride - tractor.ride(farmer); - //tractor; + Tractor tractor = new Tractor(); + + Farm farm = new Farm(); + CropRow row = new CropRow(); + row.plantCrop(new TomatoPlant()); + farm.getField().add(row); + tractor.operate(farm); + Integer actual = tractor.getaList().size(); + Integer expected = 1; + + Assert.assertEquals(expected, actual); } } From 926bc43d6c5456dd43c63195ba9884286c12284f Mon Sep 17 00:00:00 2001 From: Jeremy Date: Thu, 22 Jul 2021 20:16:12 -0400 Subject: [PATCH 070/100] Finished Establishing the plot --- .../zipcodewilmington/froilansfarm/Pilot.java | 10 ++++ .../froilansfarm/Simulation.java | 58 +++++++------------ .../froilansfarm/Vehicles/CropDuster.java | 11 +++- 3 files changed, 41 insertions(+), 38 deletions(-) create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Pilot.java diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Pilot.java b/src/main/java/com/zipcodewilmington/froilansfarm/Pilot.java new file mode 100644 index 00000000..1a683880 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Pilot.java @@ -0,0 +1,10 @@ +package com.zipcodewilmington.froilansfarm; + +import com.zipcodewilmington.froilansfarm.Mammal.Farmer; + +public class Pilot extends Farmer { + + public void fly() { + + } +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Simulation.java b/src/main/java/com/zipcodewilmington/froilansfarm/Simulation.java index eca16441..46d7f5e3 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Simulation.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Simulation.java @@ -8,62 +8,46 @@ import com.zipcodewilmington.froilansfarm.Mammal.Horse; import com.zipcodewilmington.froilansfarm.Mammal.Person; import com.zipcodewilmington.froilansfarm.Structure.ChickenCoop; +import com.zipcodewilmington.froilansfarm.Structure.Stable; import com.zipcodewilmington.froilansfarm.Vehicles.Aircraft; import com.zipcodewilmington.froilansfarm.Vehicles.FarmVehicle; import com.zipcodewilmington.froilansfarm.Vehicles.Tractor; +import java.util.Arrays; + public class Simulation { public static void main(String[] args) { - run(); + run(); } public static void run() { Farm farm = new Farm(); - Person froilan = new Farmer("Froilan"); - Person froilanda = new Person("Froilanda"); - + Person froilanda = new Pilot(); Field field = new Field(); - EarCorn earCorn = new EarCorn(); - CropRow cropRow = new CropRow(); - ChickenCoop chickenCoop = new ChickenCoop(); - - - - Chicken chicken1 = new Chicken(); - Chicken chicken2 = new Chicken(); - Chicken chicken3 = new Chicken(); - Chicken chicken4 = new Chicken(); - Chicken chicken5 = new Chicken(); - Chicken chicken6 = new Chicken(); - Chicken chicken7 = new Chicken(); - Chicken chicken8 = new Chicken(); - Chicken chicken9 = new Chicken(); - Chicken chicken10 = new Chicken(); - Chicken chicken11 = new Chicken(); - Chicken chicken12 = new Chicken(); - Chicken chicken13 = new Chicken(); - Chicken chicken14 = new Chicken(); - Chicken chicken15 = new Chicken(); - - Horse horse1 = new Horse(); - Horse horse2 = new Horse(); - Horse horse3 = new Horse(); - Horse horse4 = new Horse(); - Horse horse5 = new Horse(); - Horse horse6 = new Horse(); - Horse horse7 = new Horse(); - Horse horse8 = new Horse(); - Horse horse9 = new Horse(); - Horse horse10 = new Horse(); - FarmVehicle tractor1 = new Tractor(); FarmVehicle tractor2 = new Tractor(); Aircraft cropDuster = new Aircraft(); + + Stable stable = new Stable(); + ChickenCoop chickenCoop = new ChickenCoop(); + Arrays + .asList("Felipe", "Oscar", "Marvey", "Lorraine", "Sally", + "Eggetha Christie", "Dr. Bawk", "Chicklette", "Mz. Cluck", + "Lil peep", "Harry", "Meghen", "Amantha", "Christephanie", "Henrietta") + .forEach(name ->chickenCoop.add(new Chicken(name))); + + Arrays + .asList("Party Skips Frank Greta Harry Milo Hoovey Yorgle Tom Sarah".split(" ")) + .forEach(name -> stable.add(new Horse(name))); + } } + + +// list.string.map diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDuster.java b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDuster.java index 58176f8d..62dce919 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDuster.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDuster.java @@ -2,13 +2,22 @@ import com.zipcodewilmington.froilansfarm.Farm; import com.zipcodewilmington.froilansfarm.Food.CropRow; +import com.zipcodewilmington.froilansfarm.Pilot; +import com.zipcodewilmington.froilansfarm.Rider; + +public class CropDuster extends Aircraft implements FarmVehicle { + private Pilot pilot; -public class CropDuster extends Aircraft implements FarmVehicle{ public void fertilizeCrop(CropRow row){ row.fertilizeRow(); } + @Override + public void ride(Rider rider) { + this.pilot = pilot; + } + @Override public void operate(Farm farm) { From 6d30531ed4fd735ca3da05195e8e7f72f3a88010 Mon Sep 17 00:00:00 2001 From: Nathan Date: Thu, 22 Jul 2021 20:19:53 -0400 Subject: [PATCH 071/100] changed croprow --- .../froilansfarm/Food/CropRow.java | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Food/CropRow.java b/src/main/java/com/zipcodewilmington/froilansfarm/Food/CropRow.java index 17649689..58ef4eca 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Food/CropRow.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Food/CropRow.java @@ -8,42 +8,43 @@ public class CropRow { private List cropList; - public CropRow(){ + public CropRow() { cropList = new ArrayList<>(); } - public void plantCrop(Crop crop){ + public void plantCrop(Crop crop) { this.cropList.add(crop); } - public Integer getNumberOfCrops(){ + public Integer getNumberOfCrops() { return cropList.size(); } - public Crop getCropById(Integer id){ + public Crop getCropById(Integer id) { Crop result = null; - for(Crop crop: cropList){ + for (Crop crop : cropList) { result = id == crop.getId() ? crop : null; } return result; } - - public void fertilizeRow(){ + public void fertilizeRow() { cropList.forEach(Crop::fertilize); } - public ArrayList harvestRow(){ + public ArrayList harvestRow() { ArrayList harvest = new ArrayList<>(); - for (Crop crop: cropList){ + + cropList.forEach(crop -> { harvest.add(crop.yield()); crop.setHarvested(true); - } + }); + return harvest; - } + } } From b2fc84977aea0559e9a40a4af025e66eeb9773e6 Mon Sep 17 00:00:00 2001 From: Jeremy Date: Thu, 22 Jul 2021 20:29:29 -0400 Subject: [PATCH 072/100] help me --- .../zipcodewilmington/froilansfarm/Simulation.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Simulation.java b/src/main/java/com/zipcodewilmington/froilansfarm/Simulation.java index 46d7f5e3..066f0f4f 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Simulation.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Simulation.java @@ -10,21 +10,22 @@ import com.zipcodewilmington.froilansfarm.Structure.ChickenCoop; import com.zipcodewilmington.froilansfarm.Structure.Stable; import com.zipcodewilmington.froilansfarm.Vehicles.Aircraft; +import com.zipcodewilmington.froilansfarm.Vehicles.CropDuster; import com.zipcodewilmington.froilansfarm.Vehicles.FarmVehicle; import com.zipcodewilmington.froilansfarm.Vehicles.Tractor; import java.util.Arrays; -public class Simulation { +public class Simulation implements Runnable { public static void main(String[] args) { - run(); + new Simulation().run(); } - public static void run() { + public void run() { Farm farm = new Farm(); Person froilan = new Farmer("Froilan"); - Person froilanda = new Pilot(); + Rider froilanda = new Pilot(); Field field = new Field(); EarCorn earCorn = new EarCorn(); CropRow cropRow = new CropRow(); @@ -40,7 +41,7 @@ public static void run() { .asList("Felipe", "Oscar", "Marvey", "Lorraine", "Sally", "Eggetha Christie", "Dr. Bawk", "Chicklette", "Mz. Cluck", "Lil peep", "Harry", "Meghen", "Amantha", "Christephanie", "Henrietta") - .forEach(name ->chickenCoop.add(new Chicken(name))); + .forEach(name -> chickenCoop.add(new Chicken(name))); Arrays .asList("Party Skips Frank Greta Harry Milo Hoovey Yorgle Tom Sarah".split(" ")) From dda5b2948c61c0595d15d7aca2b6b783dba92a40 Mon Sep 17 00:00:00 2001 From: Jeremy Date: Thu, 22 Jul 2021 20:35:41 -0400 Subject: [PATCH 073/100] help --- .../com/zipcodewilmington/froilansfarm/Mammal/Froilan.java | 5 +++++ .../com/zipcodewilmington/froilansfarm/Mammal/Froilanda.java | 5 +++++ 2 files changed, 10 insertions(+) create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Froilan.java create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Froilanda.java diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Froilan.java b/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Froilan.java new file mode 100644 index 00000000..6c17313b --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Froilan.java @@ -0,0 +1,5 @@ +package com.zipcodewilmington.froilansfarm.Mammal; + +public class Froilan { + +} diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Froilanda.java b/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Froilanda.java new file mode 100644 index 00000000..5fcc9a31 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Froilanda.java @@ -0,0 +1,5 @@ +package com.zipcodewilmington.froilansfarm.Mammal; + +public class Froilanda { + +} From 3513174e3ed00eaac896c43ef53debdff6e36827 Mon Sep 17 00:00:00 2001 From: Nathan Date: Thu, 22 Jul 2021 20:42:27 -0400 Subject: [PATCH 074/100] split chickens and horses --- .../froilansfarm/Simulation.java | 33 ++++++++++++++----- 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Simulation.java b/src/main/java/com/zipcodewilmington/froilansfarm/Simulation.java index 46d7f5e3..7f0cdfa5 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Simulation.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Simulation.java @@ -32,19 +32,36 @@ public static void run() { FarmVehicle tractor2 = new Tractor(); Aircraft cropDuster = new Aircraft(); + Stable stable1 = new Stable(); + Stable stable2 = new Stable(); + Stable stable3 = new Stable(); + ChickenCoop chickenCoop1 = new ChickenCoop(); + ChickenCoop chickenCoop2 = new ChickenCoop(); + ChickenCoop chickenCoop3 = new ChickenCoop(); + Arrays + .asList("Felipe", "Oscar", "Marvey", "Lorraine", "Sally", "Lil peep") + .forEach(name ->chickenCoop1.add(new Chicken(name))); + + Arrays + .asList("Eggetha Christie Dr. Bawk Chicklette Mz. Cluck".split("")) + .forEach(name -> chickenCoop2.add(new Chicken(name))); + + Arrays + .asList("Harry Meghen Amantha Christephanie Henrietta".split(" ")) + .forEach(name -> chickenCoop3.add(new Chicken(name))); + + Arrays + .asList("Party Skips Frank Greta".split(" ")) + .forEach(name -> stable1.add(new Horse(name))); - Stable stable = new Stable(); - ChickenCoop chickenCoop = new ChickenCoop(); Arrays - .asList("Felipe", "Oscar", "Marvey", "Lorraine", "Sally", - "Eggetha Christie", "Dr. Bawk", "Chicklette", "Mz. Cluck", - "Lil peep", "Harry", "Meghen", "Amantha", "Christephanie", "Henrietta") - .forEach(name ->chickenCoop.add(new Chicken(name))); + .asList("Yorgle Tom Sarah".split(" ")) + .forEach(name -> stable2.add(new Horse(name))); Arrays - .asList("Party Skips Frank Greta Harry Milo Hoovey Yorgle Tom Sarah".split(" ")) - .forEach(name -> stable.add(new Horse(name))); + .asList("Harry Milo Hoovey".split(" ")) + .forEach(name -> stable3.add(new Horse(name))); } } From 7cd3210545c6a22a61be574ded2d08bffbe32646 Mon Sep 17 00:00:00 2001 From: Jeremy Date: Thu, 22 Jul 2021 20:49:46 -0400 Subject: [PATCH 075/100] hello --- .../froilansfarm/Mammal/Froilanda.java | 25 ++++++++++++++++++- .../zipcodewilmington/froilansfarm/Pilot.java | 7 +++--- .../froilansfarm/Simulation.java | 5 ++-- 3 files changed, 30 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Froilanda.java b/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Froilanda.java index 5fcc9a31..06231612 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Froilanda.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Froilanda.java @@ -1,5 +1,28 @@ package com.zipcodewilmington.froilansfarm.Mammal; -public class Froilanda { +import com.zipcodewilmington.froilansfarm.Pilot; +import com.zipcodewilmington.froilansfarm.Rideable; +import com.zipcodewilmington.froilansfarm.Rider; +public class Froilanda extends Person implements Rider, Pilot { + + Froilanda froilanda = new Froilanda(); + + + + + @Override + public void mount(Rideable rideable) { + + } + + @Override + public void dismount(Rideable rideable) { + + } + + @Override + public void fly() { + + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Pilot.java b/src/main/java/com/zipcodewilmington/froilansfarm/Pilot.java index 1a683880..4449563c 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Pilot.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Pilot.java @@ -1,10 +1,9 @@ package com.zipcodewilmington.froilansfarm; import com.zipcodewilmington.froilansfarm.Mammal.Farmer; +import com.zipcodewilmington.froilansfarm.Mammal.Person; -public class Pilot extends Farmer { +public interface Pilot { - public void fly() { - - } + public void fly(); } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Simulation.java b/src/main/java/com/zipcodewilmington/froilansfarm/Simulation.java index 066f0f4f..f2f25655 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Simulation.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Simulation.java @@ -23,9 +23,10 @@ public static void main(String[] args) { public void run() { + + // Person froilan = new Farmer("Froilan"); + // Rider froilanda = new Pilot(); Farm farm = new Farm(); - Person froilan = new Farmer("Froilan"); - Rider froilanda = new Pilot(); Field field = new Field(); EarCorn earCorn = new EarCorn(); CropRow cropRow = new CropRow(); From 3e01090b5a52517c760999a3f5e94f1447c3988d Mon Sep 17 00:00:00 2001 From: jgiroso Date: Thu, 22 Jul 2021 20:50:20 -0400 Subject: [PATCH 076/100] Froilan class added --- .../froilansfarm/Mammal/Farmer.java | 6 +- .../froilansfarm/Mammal/Froilan.java | 15 ++- .../froilansfarm/Vehicles/CropDuster.java | 2 - .../froilansfarm/MammalTests/FarmerTest.java | 12 -- .../froilansfarm/MammalTests/FroilanTest.java | 112 ++++++++++++++++++ 5 files changed, 127 insertions(+), 20 deletions(-) create mode 100644 src/test/java/com/zipcodewilmington/froilansfarm/MammalTests/FroilanTest.java diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Farmer.java b/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Farmer.java index 1055dfaa..a587e9b8 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Farmer.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Farmer.java @@ -11,7 +11,7 @@ import java.util.ArrayList; import java.util.List; -public class Farmer extends Person implements Botanist, Rider { +public class Farmer extends Person implements Rider { private Rideable isRiding = null; @@ -24,10 +24,6 @@ public Farmer() { super("Froilan"); } - @Override - public void plant(Crop crop, CropRow cropRow) { - cropRow.plantCrop(crop); - } @Override public String makeNoise(){ diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Froilan.java b/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Froilan.java index 6c17313b..56b6204b 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Froilan.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Froilan.java @@ -1,5 +1,18 @@ package com.zipcodewilmington.froilansfarm.Mammal; -public class Froilan { +import com.zipcodewilmington.froilansfarm.Botanist; +import com.zipcodewilmington.froilansfarm.Food.Crop; +import com.zipcodewilmington.froilansfarm.Food.CropRow; +public class Froilan extends Farmer implements Botanist { + + String name; + + public Froilan(String name) { super(name); } + + public Froilan() { name = "Froilan"; } + + public void plant(Crop crop, CropRow cropRow) { + cropRow.plantCrop(crop); + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDuster.java b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDuster.java index b2e974ff..7c044251 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDuster.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDuster.java @@ -20,8 +20,6 @@ public void ride(Rider rider) { } @Override - public void operate(Farm farm) { - public void operate(Farm farm) { for(CropRow element : farm.getField().getMyField()){ element.fertilizeRow(); diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/MammalTests/FarmerTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/MammalTests/FarmerTest.java index 30d67df9..5f427385 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/MammalTests/FarmerTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/MammalTests/FarmerTest.java @@ -37,18 +37,6 @@ public void testSetName() { Assert.assertEquals(expected, actual); } - @Test - public void testPlant() { - //given - TomatoPlant tomatoPlant = new TomatoPlant(0); - CropRow cropRow = new CropRow(); - Farmer farmer = new Farmer(); - //when - farmer.plant(tomatoPlant, cropRow); - //then - Assert.assertTrue(tomatoPlant.equals(cropRow.getCropById(0))); - } - @Test public void testMakeNoise() { //given diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/MammalTests/FroilanTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/MammalTests/FroilanTest.java new file mode 100644 index 00000000..35acdfb9 --- /dev/null +++ b/src/test/java/com/zipcodewilmington/froilansfarm/MammalTests/FroilanTest.java @@ -0,0 +1,112 @@ +package com.zipcodewilmington.froilansfarm.MammalTests; + +import com.zipcodewilmington.froilansfarm.Botanist; +import com.zipcodewilmington.froilansfarm.Food.CropRow; +import com.zipcodewilmington.froilansfarm.Food.Tomato; +import com.zipcodewilmington.froilansfarm.Food.TomatoPlant; +import com.zipcodewilmington.froilansfarm.Mammal.Farmer; +import com.zipcodewilmington.froilansfarm.Mammal.Froilan; +import com.zipcodewilmington.froilansfarm.Mammal.Horse; +import com.zipcodewilmington.froilansfarm.Mammal.Person; +import com.zipcodewilmington.froilansfarm.Rideable; +import com.zipcodewilmington.froilansfarm.Rider; +import org.junit.Assert; +import org.junit.Test; + +public class FroilanTest { + + @Test + public void testconstructor() { + //given + String expected = "Froilan"; + //when + Froilan froilan = new Froilan(expected); + String actual = froilan.getName(); + //then + Assert.assertEquals(expected, actual); + } + + @Test + public void testSetName() { + //given + String expected = "Froiland"; + Froilan froilan = new Froilan(expected); + //when + String actual = froilan.getName(); + //then + Assert.assertEquals(expected, actual); + } + + @Test + public void testPlant() { + //given + TomatoPlant tomatoPlant = new TomatoPlant(0); + CropRow cropRow = new CropRow(); + Froilan farmer = new Froilan(); + //when + farmer.plant(tomatoPlant, cropRow); + //then + Assert.assertTrue(tomatoPlant.equals(cropRow.getCropById(0))); + } + + @Test + public void testMakeNoise() { + //given + String expected = "Howdy"; + //when + Froilan froilan = new Froilan(); + String actual = froilan.makeNoise(); + //then + Assert.assertEquals(expected, actual); + } + + @Test + public void testMount() { + //given + Horse horse = new Horse(); + Rideable expected = horse; + //when + Froilan froilan = new Froilan(); + froilan.mount(horse); + Rideable actual = froilan.getIsRiding(); + //then + Assert.assertEquals(expected, actual); + } + + @Test + public void testDismount() { + //given + Horse horse = new Horse(); + //when + Froilan froilan = new Froilan(); + froilan.mount(horse); + froilan.dismount(horse); + //then + Assert.assertNull(froilan.getIsRiding()); + } + + @Test + public void testEat() { + //given + Froilan froilan = new Froilan(); + //when + Tomato tomato = new Tomato(); + froilan.eat(tomato); + froilan.getMealList(); + //then + Assert.assertTrue(froilan.meals.contains(tomato)); + } + + @Test + public void testInheritance() { + Froilan froilan = new Froilan(); + Assert.assertTrue(froilan instanceof Farmer); + } + + @Test + public void testImplementationBotanist() { + Froilan froilan = new Froilan("Joe"); + Assert.assertTrue(froilan instanceof Botanist); + } + +} From 688308fc257a5e493e8104c1607c9d935b4a367a Mon Sep 17 00:00:00 2001 From: jgiroso Date: Thu, 22 Jul 2021 20:55:03 -0400 Subject: [PATCH 077/100] moved VehicleTests --- .../froilansfarm/MammalTests/FarmerTest.java | 6 ------ .../froilansfarm}/Vehicles/AircraftTest.java | 4 +--- .../froilansfarm}/Vehicles/CropDusterTest.java | 12 ++---------- .../froilansfarm}/Vehicles/TractorTest.java | 8 +------- 4 files changed, 4 insertions(+), 26 deletions(-) rename src/test/java/{ => com/zipcodewilmington/froilansfarm}/Vehicles/AircraftTest.java (78%) rename src/test/java/{ => com/zipcodewilmington/froilansfarm}/Vehicles/CropDusterTest.java (75%) rename src/test/java/{ => com/zipcodewilmington/froilansfarm}/Vehicles/TractorTest.java (82%) diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/MammalTests/FarmerTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/MammalTests/FarmerTest.java index 5f427385..36570181 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/MammalTests/FarmerTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/MammalTests/FarmerTest.java @@ -91,12 +91,6 @@ public void testInheritance() { Assert.assertTrue(farmer instanceof Person); } - @Test - public void testImplementationBotanist() { - Farmer farmer = new Farmer("Joe"); - Assert.assertTrue(farmer instanceof Botanist); - } - @Test public void testImplementationRider() { Farmer farmer = new Farmer("Joe"); diff --git a/src/test/java/Vehicles/AircraftTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/AircraftTest.java similarity index 78% rename from src/test/java/Vehicles/AircraftTest.java rename to src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/AircraftTest.java index a049e648..b2f5e8b7 100644 --- a/src/test/java/Vehicles/AircraftTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/AircraftTest.java @@ -1,7 +1,5 @@ -package Vehicles; +package com.zipcodewilmington.froilansfarm.Vehicles; -import com.zipcodewilmington.froilansfarm.Vehicles.Aircraft; -import com.zipcodewilmington.froilansfarm.Vehicles.Vehicle; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/Vehicles/CropDusterTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDusterTest.java similarity index 75% rename from src/test/java/Vehicles/CropDusterTest.java rename to src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDusterTest.java index 9a888e60..f66a61b4 100644 --- a/src/test/java/Vehicles/CropDusterTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDusterTest.java @@ -1,16 +1,8 @@ -package Vehicles; - -import com.zipcodewilmington.froilansfarm.Farm; -import com.zipcodewilmington.froilansfarm.Field; -import com.zipcodewilmington.froilansfarm.Food.Crop; -import com.zipcodewilmington.froilansfarm.Food.CropRow; -import com.zipcodewilmington.froilansfarm.Food.TomatoPlant; -import com.zipcodewilmington.froilansfarm.Vehicles.*; +package com.zipcodewilmington.froilansfarm.Vehicles; + import org.junit.Assert; import org.junit.Test; -import java.util.ArrayList; - public class CropDusterTest { @Test diff --git a/src/test/java/Vehicles/TractorTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/TractorTest.java similarity index 82% rename from src/test/java/Vehicles/TractorTest.java rename to src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/TractorTest.java index ff752265..76630b4c 100644 --- a/src/test/java/Vehicles/TractorTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/TractorTest.java @@ -1,17 +1,11 @@ -package Vehicles; +package com.zipcodewilmington.froilansfarm.Vehicles; import com.zipcodewilmington.froilansfarm.Farm; -import com.zipcodewilmington.froilansfarm.Field; -import com.zipcodewilmington.froilansfarm.Food.Crop; import com.zipcodewilmington.froilansfarm.Food.CropRow; import com.zipcodewilmington.froilansfarm.Food.TomatoPlant; -import com.zipcodewilmington.froilansfarm.Mammal.Farmer; -import com.zipcodewilmington.froilansfarm.Vehicles.*; import org.junit.Assert; import org.junit.Test; -import java.util.ArrayList; - public class TractorTest { @Test From d3835b23a7bc95d5ca7d67a3a07acd6c63552366 Mon Sep 17 00:00:00 2001 From: Zach Date: Thu, 22 Jul 2021 21:09:15 -0400 Subject: [PATCH 078/100] Tests added for vehicles --- .../froilansfarm/Vehicles/Aircraft.java | 10 +++---- .../froilansfarm/Vehicles/AircraftTest.java | 9 ++++++ .../froilansfarm/Vehicles/CropDusterTest.java | 28 +++++++++++-------- 3 files changed, 31 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Aircraft.java b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Aircraft.java index 031ee8a6..28798ff9 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Aircraft.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Aircraft.java @@ -3,7 +3,7 @@ import com.zipcodewilmington.froilansfarm.Rider; public class Aircraft implements Vehicle{ - + Rider rider; public void fly(){} public String makeNoise() { @@ -14,12 +14,12 @@ public String shoot(){ return "BULLETS"; } - public void ride() { - - } - @Override public void ride(Rider rider) { + rider = rider; + } + public Rider getRider() { + return rider; } } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/AircraftTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/AircraftTest.java index b2f5e8b7..dc6daa4b 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/AircraftTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/AircraftTest.java @@ -1,8 +1,15 @@ package com.zipcodewilmington.froilansfarm.Vehicles; +import com.zipcodewilmington.froilansfarm.Mammal.Farmer; +import com.zipcodewilmington.froilansfarm.Mammal.Froilan; +import com.zipcodewilmington.froilansfarm.Mammal.Froilanda; +import com.zipcodewilmington.froilansfarm.Pilot; +import com.zipcodewilmington.froilansfarm.Rider; import org.junit.Assert; import org.junit.Test; +import java.awt.*; + public class AircraftTest { @Test @@ -23,4 +30,6 @@ public void aircraftTest(){ Assert.assertEquals(expected, actual); } + + } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDusterTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDusterTest.java index f66a61b4..a482cf96 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDusterTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDusterTest.java @@ -1,5 +1,8 @@ package com.zipcodewilmington.froilansfarm.Vehicles; +import com.zipcodewilmington.froilansfarm.Farm; +import com.zipcodewilmington.froilansfarm.Food.CropRow; +import com.zipcodewilmington.froilansfarm.Food.TomatoPlant; import org.junit.Assert; import org.junit.Test; @@ -32,17 +35,20 @@ public void constructorTest3(){ Assert.assertTrue(actual); } -// @Test -// public void fertilizeTest(){ -// CropDuster duster = new CropDuster(); -// -// CropRow row = new CropRow(); -// duster.fertilizeCrop(row); -// -// Boolean actual = row.checkFertilized(); -// -// Assert.assertTrue(actual); -// } + @Test + public void fertilizeTest(){ + CropDuster duster = new CropDuster(); + Farm farm = new Farm(); + TomatoPlant plant = new TomatoPlant(); + CropRow row = new CropRow(); + row.plantCrop(plant); + farm.getField().add(row); + duster.operate(farm); + + Boolean actual = plant.checkFertilized(); + + Assert.assertTrue(actual); + } @Test public void shootTest(){ From 3a04befca81fd6c6b1478f779b6321cdbd6956e3 Mon Sep 17 00:00:00 2001 From: Jeremy Date: Thu, 22 Jul 2021 21:16:53 -0400 Subject: [PATCH 079/100] hello there --- .../zipcodewilmington/froilansfarm/Mammal/Froilanda.java | 9 ++++++++- .../froilansfarm/Vehicles/Aircraft.java | 6 ------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Froilanda.java b/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Froilanda.java index 06231612..c0be9987 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Froilanda.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Froilanda.java @@ -1,14 +1,21 @@ package com.zipcodewilmington.froilansfarm.Mammal; +import com.zipcodewilmington.froilansfarm.Food.EarCorn; +import com.zipcodewilmington.froilansfarm.Food.Egg; +import com.zipcodewilmington.froilansfarm.Food.Tomato; import com.zipcodewilmington.froilansfarm.Pilot; import com.zipcodewilmington.froilansfarm.Rideable; import com.zipcodewilmington.froilansfarm.Rider; -public class Froilanda extends Person implements Rider, Pilot { +public class Froilanda extends Farmer implements Rider, Pilot { Froilanda froilanda = new Froilanda(); + public void eatBreakfast(EarCorn earCorn, Tomato tomato, Egg egg){ + + } + @Override diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Aircraft.java b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Aircraft.java index 031ee8a6..4a3df264 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Aircraft.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Aircraft.java @@ -4,8 +4,6 @@ public class Aircraft implements Vehicle{ - public void fly(){} - public String makeNoise() { return "Bzzzzeewwwwwwwwwww Rat-tat-tat-tat-tat"; } @@ -14,10 +12,6 @@ public String shoot(){ return "BULLETS"; } - public void ride() { - - } - @Override public void ride(Rider rider) { From 7c383a283c2e482897352dd66d3242499a08bb0c Mon Sep 17 00:00:00 2001 From: Jeremy Date: Thu, 22 Jul 2021 21:21:39 -0400 Subject: [PATCH 080/100] . --- .../com/zipcodewilmington/froilansfarm/Vehicles/Aircraft.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Aircraft.java b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Aircraft.java index 8bf08829..630a255c 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Aircraft.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Aircraft.java @@ -4,6 +4,8 @@ public class Aircraft implements Vehicle{ + Rider rider; + public String makeNoise() { return "Bzzzzeewwwwwwwwwww Rat-tat-tat-tat-tat"; From b76bc0ad18a2f707d6fe4fe769c4fdbe4f491349 Mon Sep 17 00:00:00 2001 From: jgiroso Date: Thu, 22 Jul 2021 22:50:57 -0400 Subject: [PATCH 081/100] changes to CropDuster --- .../froilansfarm/Vehicles/CropDuster.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDuster.java b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDuster.java index 7c044251..6f4d3f79 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDuster.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDuster.java @@ -9,6 +9,11 @@ public class CropDuster extends Aircraft implements FarmVehicle { private Pilot pilot; + public void fly(Field field) { + for(CropRow element : field.getMyField()){ + element.fertilizeRow(); + } + } public void fertilizeCrop(CropRow row){ row.fertilizeRow(); @@ -21,8 +26,6 @@ public void ride(Rider rider) { @Override public void operate(Farm farm) { - for(CropRow element : farm.getField().getMyField()){ - element.fertilizeRow(); - } + this.fly(farm.getField()); } } From 66de0456b51ce0dc78a52fea4db7778c2ea2ace0 Mon Sep 17 00:00:00 2001 From: Nathan Date: Thu, 22 Jul 2021 23:19:41 -0400 Subject: [PATCH 082/100] farm house --- .../zipcodewilmington/froilansfarm/Farm.java | 110 +++++++++++++++--- 1 file changed, 93 insertions(+), 17 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Farm.java b/src/main/java/com/zipcodewilmington/froilansfarm/Farm.java index 7a3ea212..037f364a 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Farm.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Farm.java @@ -1,6 +1,9 @@ package com.zipcodewilmington.froilansfarm; +import com.zipcodewilmington.froilansfarm.Food.CarrotFlower; +import com.zipcodewilmington.froilansfarm.Food.CornStalk; import com.zipcodewilmington.froilansfarm.Food.CropRow; +import com.zipcodewilmington.froilansfarm.Food.TomatoPlant; import com.zipcodewilmington.froilansfarm.Mammal.Chicken; import com.zipcodewilmington.froilansfarm.Mammal.Farmer; import com.zipcodewilmington.froilansfarm.Mammal.Horse; @@ -9,36 +12,109 @@ import com.zipcodewilmington.froilansfarm.Structure.FarmHouse; import com.zipcodewilmington.froilansfarm.Structure.Stable; +import java.util.Arrays; + public class Farm { - private Shelter farmhouse = new FarmHouse(); - private Shelter stable = new Stable(); - private Shelter chickenCoop = new ChickenCoop(); - private Field field = new Field(); + private Shelter farmhouse = new FarmHouse(); + + private Shelter stable1 = new Stable(); + private Shelter stable2 = new Stable(); + private Shelter stable3 = new Stable(); + + private Shelter chickenCoop1 = new ChickenCoop(); + private Shelter chickenCoop2 = new ChickenCoop(); + private Shelter chickenCoop3 = new ChickenCoop(); + + private Field field = new Field(); public Farm(){ - farmhouse.add(new Farmer("Froilan")); - farmhouse.add(new Farmer("Froilanda")); - stable.add(new Horse("Fork")); - stable.add(new Horse("Spoon")); - chickenCoop.add(new Chicken("Chicolate")); - chickenCoop.add(new Chicken("Eggward")); - field.add(new CropRow()); - field.add(new CropRow()); + populateFarmHouse(); + populateAllChickenCoops(); + populateAllStables(); + populateField(); } - public Shelter getFarmhouse() { + public Shelter getFarmhouse() { return farmhouse; } - public Shelter getStable() { - return stable; + public Shelter getStable1() { + return stable1; + } + + public Shelter getStable2() { + return stable2; } - public Shelter getChickenCoop() { - return chickenCoop; + public Shelter getStable3() { + return stable3; + } + + public Shelter getChickenCoop1() { + return chickenCoop1; + } + + public Shelter getChickenCoop2() { + return chickenCoop2; + } + + public Shelter getChickenCoop3() { + return chickenCoop3; } public Field getField(){ return field; } + + private void populateAllStables(){ + Arrays + .asList("Party Skips Frank Greta".split(" ")) + .forEach(name -> stable1.add(new Horse(name))); + Arrays + .asList("Yorgle Spoon Fork".split(" ")) + .forEach(name -> stable2.add(new Horse(name))); + Arrays + .asList("Harry Milo Hoovey".split(" ")) + .forEach(name -> stable3.add(new Horse(name))); + } + + private void populateAllChickenCoops(){ + Arrays + .asList("Felipe", "Oscar", "Marvey", "Lorraine", "Sally", "Lil peep") + .forEach(name ->chickenCoop1.add(new Chicken(name))); + Arrays + .asList("Eggetha Christie Dr. Bawk Chicklette Mz. Cluck Chicolate".split("")) + .forEach(name -> chickenCoop2.add(new Chicken(name))); + Arrays + .asList("Harry Meghen Amantha Christephanie Henrietta Eggward".split(" ")) + .forEach(name -> chickenCoop3.add(new Chicken(name))); + } + + private void populateField(){ + CropRow row1 = new CropRow(); + row1.plantCrop(new CornStalk()); + field.add(row1); + + CropRow row2 = new CropRow(); + row2.plantCrop(new TomatoPlant()); + field.add(row2); + + CropRow row3 = new CropRow(); + row3.plantCrop(new CarrotFlower()); + field.add(row3); + + CropRow row4 = new CropRow(); + row4.plantCrop(new CornStalk()); + field.add(row4); + + CropRow row5 = new CropRow(); + row5.plantCrop(new TomatoPlant()); + field.add(row5); + + } + + public void populateFarmHouse(){ + farmhouse.add(new Farmer("Froilan")); + farmhouse.add(new Farmer("Froilanda")); + } } From deefe8cd4ad4b35ca36c58479ad611c2f21502b6 Mon Sep 17 00:00:00 2001 From: Nathan Date: Thu, 22 Jul 2021 23:25:06 -0400 Subject: [PATCH 083/100] better populate field --- .../zipcodewilmington/froilansfarm/Farm.java | 27 +++++-------------- 1 file changed, 7 insertions(+), 20 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Farm.java b/src/main/java/com/zipcodewilmington/froilansfarm/Farm.java index 037f364a..3413a674 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Farm.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Farm.java @@ -91,26 +91,13 @@ private void populateAllChickenCoops(){ } private void populateField(){ - CropRow row1 = new CropRow(); - row1.plantCrop(new CornStalk()); - field.add(row1); - - CropRow row2 = new CropRow(); - row2.plantCrop(new TomatoPlant()); - field.add(row2); - - CropRow row3 = new CropRow(); - row3.plantCrop(new CarrotFlower()); - field.add(row3); - - CropRow row4 = new CropRow(); - row4.plantCrop(new CornStalk()); - field.add(row4); - - CropRow row5 = new CropRow(); - row5.plantCrop(new TomatoPlant()); - field.add(row5); - + Arrays + .asList(new CornStalk(),new TomatoPlant(), new CarrotFlower(), new CornStalk(), new TomatoPlant()) + .forEach(crop -> { + CropRow row = new CropRow(); + row.plantCrop(crop); + field.add(row); + }); } public void populateFarmHouse(){ From 2da283cf5e70b5337d444dec26faf8dbed32b5a3 Mon Sep 17 00:00:00 2001 From: Nathan Date: Thu, 22 Jul 2021 23:45:15 -0400 Subject: [PATCH 084/100] froilanda is a singleton --- .../zipcodewilmington/froilansfarm/Farm.java | 64 ++++++++++--------- .../froilansfarm/Mammal/Froilanda.java | 17 ++--- .../froilansfarm/Simulation.java | 2 +- .../froilansfarm/Vehicles/Aircraft.java | 2 +- .../froilansfarm/Vehicles/AircraftTest.java | 4 +- 5 files changed, 46 insertions(+), 43 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Farm.java b/src/main/java/com/zipcodewilmington/froilansfarm/Farm.java index 3413a674..b1a462d0 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Farm.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Farm.java @@ -11,21 +11,27 @@ import com.zipcodewilmington.froilansfarm.Structure.ChickenCoop; import com.zipcodewilmington.froilansfarm.Structure.FarmHouse; import com.zipcodewilmington.froilansfarm.Structure.Stable; +import com.zipcodewilmington.froilansfarm.Vehicles.Aircraft; +import com.zipcodewilmington.froilansfarm.Vehicles.CropDuster; +import com.zipcodewilmington.froilansfarm.Vehicles.Tractor; import java.util.Arrays; +import java.util.List; public class Farm { private Shelter farmhouse = new FarmHouse(); - - private Shelter stable1 = new Stable(); - private Shelter stable2 = new Stable(); - private Shelter stable3 = new Stable(); - - private Shelter chickenCoop1 = new ChickenCoop(); - private Shelter chickenCoop2 = new ChickenCoop(); - private Shelter chickenCoop3 = new ChickenCoop(); - + private List> stables = Arrays.asList( + new Stable(), + new Stable(), + new Stable()); + private List> chickenCoops = Arrays.asList( + new ChickenCoop(), + new ChickenCoop(), + new ChickenCoop()); private Field field = new Field(); + private CropDuster cropDuster = new CropDuster(); + private Tractor tractor = new Tractor(); + private Tractor johnDeer = new Tractor(); public Farm(){ populateFarmHouse(); @@ -38,56 +44,52 @@ public Shelter getFarmhouse() { return farmhouse; } - public Shelter getStable1() { - return stable1; - } - - public Shelter getStable2() { - return stable2; + public List> getStables() { + return stables; } - public Shelter getStable3() { - return stable3; + public List> getChickenCoops() { + return chickenCoops; } - public Shelter getChickenCoop1() { - return chickenCoop1; + public Field getField(){ + return field; } - public Shelter getChickenCoop2() { - return chickenCoop2; + public CropDuster getCropDuster() { + return cropDuster; } - public Shelter getChickenCoop3() { - return chickenCoop3; + public Tractor getTractor() { + return tractor; } - public Field getField(){ - return field; + public Tractor getJohnDeer() { + return johnDeer; } private void populateAllStables(){ Arrays .asList("Party Skips Frank Greta".split(" ")) - .forEach(name -> stable1.add(new Horse(name))); + .forEach(name -> stables.get(0).add(new Horse(name))); Arrays .asList("Yorgle Spoon Fork".split(" ")) - .forEach(name -> stable2.add(new Horse(name))); + .forEach(name -> stables.get(1).add(new Horse(name))); Arrays .asList("Harry Milo Hoovey".split(" ")) - .forEach(name -> stable3.add(new Horse(name))); + .forEach(name -> stables.get(2).add(new Horse(name))); } private void populateAllChickenCoops(){ Arrays .asList("Felipe", "Oscar", "Marvey", "Lorraine", "Sally", "Lil peep") - .forEach(name ->chickenCoop1.add(new Chicken(name))); + .forEach(name ->chickenCoops.get(0).add(new Chicken(name))); Arrays .asList("Eggetha Christie Dr. Bawk Chicklette Mz. Cluck Chicolate".split("")) - .forEach(name -> chickenCoop2.add(new Chicken(name))); + .forEach(name -> chickenCoops.get(1).add(new Chicken(name))); Arrays .asList("Harry Meghen Amantha Christephanie Henrietta Eggward".split(" ")) - .forEach(name -> chickenCoop3.add(new Chicken(name))); + .forEach(name -> chickenCoops.get(2).add(new Chicken(name))); } private void populateField(){ diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Froilanda.java b/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Froilanda.java index c0be9987..0c5fe3d4 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Froilanda.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Froilanda.java @@ -7,29 +7,30 @@ import com.zipcodewilmington.froilansfarm.Rideable; import com.zipcodewilmington.froilansfarm.Rider; -public class Froilanda extends Farmer implements Rider, Pilot { +public class Froilanda extends Farmer implements Pilot { + private static final Froilanda froilanda = new Froilanda(); - Froilanda froilanda = new Froilanda(); + public static Froilanda getInstance(){ + return froilanda; + } + private Froilanda() { + super("Froilanda"); + } +//this is a singleton public void eatBreakfast(EarCorn earCorn, Tomato tomato, Egg egg){ - } - - @Override public void mount(Rideable rideable) { - } @Override public void dismount(Rideable rideable) { - } @Override public void fly() { - } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Simulation.java b/src/main/java/com/zipcodewilmington/froilansfarm/Simulation.java index 57d3daf4..020690f4 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Simulation.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Simulation.java @@ -32,7 +32,7 @@ public void run() { CropRow cropRow = new CropRow(); FarmVehicle tractor1 = new Tractor(); FarmVehicle tractor2 = new Tractor(); - Aircraft cropDuster = new Aircraft(); + Aircraft cropDuster = new CropDuster<>(); Stable stable1 = new Stable(); Stable stable2 = new Stable(); diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Aircraft.java b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Aircraft.java index 630a255c..91d3276e 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Aircraft.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Aircraft.java @@ -2,7 +2,7 @@ import com.zipcodewilmington.froilansfarm.Rider; -public class Aircraft implements Vehicle{ +public abstract class Aircraft implements Vehicle{ Rider rider; diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/AircraftTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/AircraftTest.java index dc6daa4b..269c4d1f 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/AircraftTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/AircraftTest.java @@ -14,7 +14,7 @@ public class AircraftTest { @Test public void constructor(){ - Vehicle aircraft = new Aircraft(); + Vehicle aircraft = new CropDuster<>(); Boolean actual = aircraft instanceof Vehicle; @@ -23,7 +23,7 @@ public void constructor(){ @Test public void aircraftTest(){ - Vehicle aircraft = new Aircraft(); + Vehicle aircraft = new CropDuster<>(); String actual = aircraft.makeNoise(); String expected = "Bzzzzeewwwwwwwwwww Rat-tat-tat-tat-tat"; From 9ed3054057c8ba8682a10d24efc20681078bf5f6 Mon Sep 17 00:00:00 2001 From: Nathan Date: Thu, 22 Jul 2021 23:53:22 -0400 Subject: [PATCH 085/100] new stuff --- .../zipcodewilmington/froilansfarm/Farm.java | 8 ++- .../froilansfarm/Simulation.java | 50 ++----------------- 2 files changed, 8 insertions(+), 50 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Farm.java b/src/main/java/com/zipcodewilmington/froilansfarm/Farm.java index b1a462d0..bb34270f 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Farm.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Farm.java @@ -4,10 +4,7 @@ import com.zipcodewilmington.froilansfarm.Food.CornStalk; import com.zipcodewilmington.froilansfarm.Food.CropRow; import com.zipcodewilmington.froilansfarm.Food.TomatoPlant; -import com.zipcodewilmington.froilansfarm.Mammal.Chicken; -import com.zipcodewilmington.froilansfarm.Mammal.Farmer; -import com.zipcodewilmington.froilansfarm.Mammal.Horse; -import com.zipcodewilmington.froilansfarm.Mammal.Person; +import com.zipcodewilmington.froilansfarm.Mammal.*; import com.zipcodewilmington.froilansfarm.Structure.ChickenCoop; import com.zipcodewilmington.froilansfarm.Structure.FarmHouse; import com.zipcodewilmington.froilansfarm.Structure.Stable; @@ -103,7 +100,8 @@ private void populateField(){ } public void populateFarmHouse(){ + Froilanda msFroid = Froilanda.getInstance(); + farmhouse.add(msFroid); farmhouse.add(new Farmer("Froilan")); - farmhouse.add(new Farmer("Froilanda")); } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Simulation.java b/src/main/java/com/zipcodewilmington/froilansfarm/Simulation.java index 020690f4..ed6d2a4d 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Simulation.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Simulation.java @@ -3,10 +3,7 @@ import com.zipcodewilmington.froilansfarm.Food.CropRow; import com.zipcodewilmington.froilansfarm.Food.EarCorn; -import com.zipcodewilmington.froilansfarm.Mammal.Chicken; -import com.zipcodewilmington.froilansfarm.Mammal.Farmer; -import com.zipcodewilmington.froilansfarm.Mammal.Horse; -import com.zipcodewilmington.froilansfarm.Mammal.Person; +import com.zipcodewilmington.froilansfarm.Mammal.*; import com.zipcodewilmington.froilansfarm.Structure.ChickenCoop; import com.zipcodewilmington.froilansfarm.Structure.Stable; import com.zipcodewilmington.froilansfarm.Vehicles.Aircraft; @@ -23,51 +20,14 @@ public static void main(String[] args) { public void run() { + CropDuster cropDuster = new CropDuster(); - // Person froilan = new Farmer("Froilan"); - // Rider froilanda = new Pilot(); - Farm farm = new Farm(); - Field field = new Field(); - EarCorn earCorn = new EarCorn(); - CropRow cropRow = new CropRow(); - FarmVehicle tractor1 = new Tractor(); - FarmVehicle tractor2 = new Tractor(); - Aircraft cropDuster = new CropDuster<>(); + Froilanda msFroid = Froilanda.getInstance(); - Stable stable1 = new Stable(); - Stable stable2 = new Stable(); - Stable stable3 = new Stable(); - ChickenCoop chickenCoop1 = new ChickenCoop(); - ChickenCoop chickenCoop2 = new ChickenCoop(); - ChickenCoop chickenCoop3 = new ChickenCoop(); + msFroid.mount(cropDuster); - Arrays - .asList("Felipe", "Oscar", "Marvey", "Lorraine", "Sally", "Lil peep") - .forEach(name ->chickenCoop1.add(new Chicken(name))); - - Arrays - .asList("Eggetha Christie Dr. Bawk Chicklette Mz. Cluck".split("")) - .forEach(name -> chickenCoop2.add(new Chicken(name))); - - Arrays - .asList("Harry Meghen Amantha Christephanie Henrietta".split(" ")) - .forEach(name -> chickenCoop3.add(new Chicken(name))); - - Arrays - .asList("Party Skips Frank Greta".split(" ")) - .forEach(name -> stable1.add(new Horse(name))); - - Arrays - .asList("Yorgle Tom Sarah".split(" ")) - .forEach(name -> stable2.add(new Horse(name))); - - - Arrays - .asList("Harry Milo Hoovey".split(" ")) - .forEach(name -> stable3.add(new Horse(name))); + msFroid.fly(); } } - -// list.string.map From bc1af778a0cdba3efb213301f40dc4ec27e7666e Mon Sep 17 00:00:00 2001 From: Nathan Date: Fri, 23 Jul 2021 00:05:50 -0400 Subject: [PATCH 086/100] can fly --- .../froilansfarm/Mammal/Froilanda.java | 11 ++++++++++- .../com/zipcodewilmington/froilansfarm/Pilot.java | 2 +- .../zipcodewilmington/froilansfarm/Simulation.java | 3 ++- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Froilanda.java b/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Froilanda.java index 0c5fe3d4..f57ef14d 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Froilanda.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Froilanda.java @@ -1,14 +1,18 @@ package com.zipcodewilmington.froilansfarm.Mammal; +import com.zipcodewilmington.froilansfarm.Farm; import com.zipcodewilmington.froilansfarm.Food.EarCorn; import com.zipcodewilmington.froilansfarm.Food.Egg; import com.zipcodewilmington.froilansfarm.Food.Tomato; import com.zipcodewilmington.froilansfarm.Pilot; import com.zipcodewilmington.froilansfarm.Rideable; import com.zipcodewilmington.froilansfarm.Rider; +import com.zipcodewilmington.froilansfarm.Vehicles.CropDuster; +import com.zipcodewilmington.froilansfarm.Vehicles.Vehicle; public class Froilanda extends Farmer implements Pilot { private static final Froilanda froilanda = new Froilanda(); + private Rideable rideable; public static Froilanda getInstance(){ return froilanda; @@ -24,13 +28,18 @@ public void eatBreakfast(EarCorn earCorn, Tomato tomato, Egg egg){ @Override public void mount(Rideable rideable) { + this.rideable = rideable; } @Override public void dismount(Rideable rideable) { + this.rideable = null; } @Override - public void fly() { + public void fly(Farm farm) { + if(rideable instanceof CropDuster){ + ((CropDuster) rideable).fly(farm.getField()); + } } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Pilot.java b/src/main/java/com/zipcodewilmington/froilansfarm/Pilot.java index 4449563c..1e7dab73 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Pilot.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Pilot.java @@ -5,5 +5,5 @@ public interface Pilot { - public void fly(); + public void fly(Farm farm); } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Simulation.java b/src/main/java/com/zipcodewilmington/froilansfarm/Simulation.java index ed6d2a4d..8e050057 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Simulation.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Simulation.java @@ -20,13 +20,14 @@ public static void main(String[] args) { public void run() { + Farm farm = new Farm(); CropDuster cropDuster = new CropDuster(); Froilanda msFroid = Froilanda.getInstance(); msFroid.mount(cropDuster); - msFroid.fly(); + msFroid.fly(farm); } } From 0284b25ea593da510eda0d8a019f6da398fd1d5b Mon Sep 17 00:00:00 2001 From: Zach Date: Fri, 23 Jul 2021 00:45:59 -0400 Subject: [PATCH 087/100] 100 percent test coverage on Vehicles --- pom.xml | 6 ++++++ .../froilansfarm/Vehicles/Aircraft.java | 10 +--------- .../froilansfarm/Vehicles/CropDuster.java | 9 +++++---- .../froilansfarm/Vehicles/Tractor.java | 4 ++++ .../froilansfarm/MammalTests/ChickenTest.java | 2 ++ .../froilansfarm/Vehicles/CropDusterTest.java | 17 +++++++++++++++++ .../froilansfarm/Vehicles/TractorTest.java | 19 +++++++++++++++---- 7 files changed, 50 insertions(+), 17 deletions(-) diff --git a/pom.xml b/pom.xml index af746b18..747602e5 100644 --- a/pom.xml +++ b/pom.xml @@ -26,6 +26,12 @@ 4.12 test + + junit + junit + 4.13.1 + test + diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Aircraft.java b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Aircraft.java index 91d3276e..ae54baf7 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Aircraft.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Aircraft.java @@ -4,7 +4,6 @@ public abstract class Aircraft implements Vehicle{ - Rider rider; public String makeNoise() { @@ -15,12 +14,5 @@ public String shoot(){ return "BULLETS"; } - @Override - public void ride(Rider rider) { - rider = rider; - } - - public Rider getRider() { - return rider; - } + } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDuster.java b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDuster.java index 6f4d3f79..6b03a6e0 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDuster.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDuster.java @@ -15,17 +15,18 @@ public void fly(Field field) { } } - public void fertilizeCrop(CropRow row){ - row.fertilizeRow(); - } @Override public void ride(Rider rider) { - this.pilot = pilot; + this.pilot = (Pilot)rider; } @Override public void operate(Farm farm) { this.fly(farm.getField()); } + + public Pilot getPilot() { + return pilot; + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Tractor.java b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Tractor.java index 1f909684..cbafb362 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Tractor.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Tractor.java @@ -41,4 +41,8 @@ public void operate(Farm farm) { public List getaList() { return aList; } + + public Rider getRider() { + return rider; + } } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/MammalTests/ChickenTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/MammalTests/ChickenTest.java index 7357610c..76550874 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/MammalTests/ChickenTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/MammalTests/ChickenTest.java @@ -1,5 +1,6 @@ package com.zipcodewilmington.froilansfarm.MammalTests; + import com.zipcodewilmington.froilansfarm.Edible; import com.zipcodewilmington.froilansfarm.Food.EarCorn; import com.zipcodewilmington.froilansfarm.Food.Egg; @@ -85,4 +86,5 @@ public void testImplementationProduce() { Chicken chicken = new Chicken(); Assert.assertTrue(chicken instanceof Produce); } + } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDusterTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDusterTest.java index a482cf96..35102fc7 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDusterTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/CropDusterTest.java @@ -3,6 +3,8 @@ import com.zipcodewilmington.froilansfarm.Farm; import com.zipcodewilmington.froilansfarm.Food.CropRow; import com.zipcodewilmington.froilansfarm.Food.TomatoPlant; +import com.zipcodewilmington.froilansfarm.Mammal.Froilanda; +import com.zipcodewilmington.froilansfarm.Rider; import org.junit.Assert; import org.junit.Test; @@ -60,5 +62,20 @@ public void shootTest(){ Assert.assertEquals(expected, actual); } + @Test + public void rideTest(){ + CropDuster duster = new CropDuster(); + + Farm farm = new Farm(); + + Froilanda froilanda = Froilanda.getInstance(); + froilanda.mount(duster); + + duster.ride(froilanda); + + Boolean actual = duster.getPilot() != null; + + Assert.assertTrue(actual); + } } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/TractorTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/TractorTest.java index 76630b4c..71949d75 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/TractorTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/Vehicles/TractorTest.java @@ -3,6 +3,7 @@ import com.zipcodewilmington.froilansfarm.Farm; import com.zipcodewilmington.froilansfarm.Food.CropRow; import com.zipcodewilmington.froilansfarm.Food.TomatoPlant; +import com.zipcodewilmington.froilansfarm.Mammal.Froilan; import org.junit.Assert; import org.junit.Test; @@ -41,15 +42,25 @@ public void tractorHarvestTest(){ Tractor tractor = new Tractor(); Farm farm = new Farm(); - CropRow row = new CropRow(); - row.plantCrop(new TomatoPlant()); - farm.getField().add(row); tractor.operate(farm); Integer actual = tractor.getaList().size(); - Integer expected = 1; + Integer expected = 5; Assert.assertEquals(expected, actual); } + @Test + public void rideTest(){ + Froilan froi = new Froilan(); + Tractor tractor = new Tractor(); + + tractor.ride(froi); + + Boolean actual = tractor.getRider() != null; + + Assert.assertTrue(actual); + } + + } From 37114d60f7a8f2087e00f5d6d8c3cf789fa8db43 Mon Sep 17 00:00:00 2001 From: Jeremy Date: Fri, 23 Jul 2021 00:53:13 -0400 Subject: [PATCH 088/100] finished farm test --- .../froilansfarm/FarmTest.java | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 src/test/java/com/zipcodewilmington/froilansfarm/FarmTest.java diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/FarmTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/FarmTest.java new file mode 100644 index 00000000..9d8d934e --- /dev/null +++ b/src/test/java/com/zipcodewilmington/froilansfarm/FarmTest.java @@ -0,0 +1,41 @@ +package com.zipcodewilmington.froilansfarm; + +import com.zipcodewilmington.froilansfarm.Mammal.Chicken; +import com.zipcodewilmington.froilansfarm.Mammal.Horse; +import com.zipcodewilmington.froilansfarm.Mammal.Person; +import com.zipcodewilmington.froilansfarm.Structure.ChickenCoop; +import com.zipcodewilmington.froilansfarm.Structure.FarmHouse; +import com.zipcodewilmington.froilansfarm.Structure.Stable; +import com.zipcodewilmington.froilansfarm.Vehicles.CropDuster; +import com.zipcodewilmington.froilansfarm.Vehicles.Tractor; +import org.junit.Assert; +import org.junit.Test; + +import java.util.Arrays; +import java.util.List; + +public class FarmTest { + + @Test + public void farmConstructorTest() { + Farm farm = new Farm(); + + boolean actualFarm = farm.getFarmhouse() != null; + boolean actualCoops = farm.getChickenCoops() != null; + boolean actualDuster = farm.getCropDuster() != null; + boolean actualStables = farm.getStables() != null; + boolean actualTractor = farm.getTractor() != null; + boolean actualField = farm.getField() != null; + boolean actualJohnDeer = farm.getJohnDeer() != null; + + + Assert.assertTrue(actualFarm); + Assert.assertTrue(actualCoops); + Assert.assertTrue(actualDuster); + Assert.assertTrue(actualStables); + Assert.assertTrue(actualTractor); + Assert.assertTrue(actualField); + Assert.assertTrue(actualJohnDeer); + + } +} From 46c5789e7384c292b961612fc982564718b242de Mon Sep 17 00:00:00 2001 From: jgiroso Date: Fri, 23 Jul 2021 02:00:58 -0400 Subject: [PATCH 089/100] FroilandaTests --- .../froilansfarm/Food/CropRow.java | 4 +- .../froilansfarm/Mammal/Froilanda.java | 14 +-- .../MammalTests/FroilandaTest.java | 115 ++++++++++++++++++ 3 files changed, 120 insertions(+), 13 deletions(-) create mode 100644 src/test/java/com/zipcodewilmington/froilansfarm/MammalTests/FroilandaTest.java diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Food/CropRow.java b/src/main/java/com/zipcodewilmington/froilansfarm/Food/CropRow.java index 6e23d355..fddbb10e 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Food/CropRow.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Food/CropRow.java @@ -42,5 +42,7 @@ public ArrayList harvestRow() { return harvest; } - + public List getCropList() { + return cropList; + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Froilanda.java b/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Froilanda.java index f57ef14d..621f0437 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Froilanda.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Froilanda.java @@ -12,7 +12,6 @@ public class Froilanda extends Farmer implements Pilot { private static final Froilanda froilanda = new Froilanda(); - private Rideable rideable; public static Froilanda getInstance(){ return froilanda; @@ -26,20 +25,11 @@ private Froilanda() { public void eatBreakfast(EarCorn earCorn, Tomato tomato, Egg egg){ } - @Override - public void mount(Rideable rideable) { - this.rideable = rideable; - } - - @Override - public void dismount(Rideable rideable) { - this.rideable = null; - } @Override public void fly(Farm farm) { - if(rideable instanceof CropDuster){ - ((CropDuster) rideable).fly(farm.getField()); + if(getIsRiding() instanceof CropDuster){ + ((CropDuster) getIsRiding()).fly(farm.getField()); } } } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/MammalTests/FroilandaTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/MammalTests/FroilandaTest.java new file mode 100644 index 00000000..3031b7cc --- /dev/null +++ b/src/test/java/com/zipcodewilmington/froilansfarm/MammalTests/FroilandaTest.java @@ -0,0 +1,115 @@ +package com.zipcodewilmington.froilansfarm.MammalTests; + +import com.zipcodewilmington.froilansfarm.Botanist; +import com.zipcodewilmington.froilansfarm.Farm; +import com.zipcodewilmington.froilansfarm.Food.CropRow; +import com.zipcodewilmington.froilansfarm.Food.Tomato; +import com.zipcodewilmington.froilansfarm.Food.TomatoPlant; +import com.zipcodewilmington.froilansfarm.Mammal.Farmer; +import com.zipcodewilmington.froilansfarm.Mammal.Froilan; +import com.zipcodewilmington.froilansfarm.Mammal.Froilanda; +import com.zipcodewilmington.froilansfarm.Mammal.Horse; +import com.zipcodewilmington.froilansfarm.Pilot; +import com.zipcodewilmington.froilansfarm.Rideable; +import com.zipcodewilmington.froilansfarm.Vehicles.CropDuster; +import org.junit.Assert; +import org.junit.Test; + +public class FroilandaTest { + @Test + public void testconstructor() { + //given + String expected = "Froilanda"; + //when + Froilanda froilanda = Froilanda.getInstance(); + String actual = froilanda.getName(); + //then + Assert.assertEquals(expected, actual); + } + + @Test + public void testSetName() { + //given + String expected = "Froilanda"; + Froilanda froilanda = Froilanda.getInstance(); + //when + String actual = froilanda.getName(); + //then + Assert.assertEquals(expected, actual); + } + + @Test + public void testMakeNoise() { + //given + String expected = "Howdy"; + //when + Froilanda froilanda = Froilanda.getInstance(); + String actual = froilanda.makeNoise(); + //then + Assert.assertEquals(expected, actual); + } + + @Test + public void testMount() { + //given + Horse horse = new Horse(); + Rideable expected = horse; + //when + Froilanda froilanda = Froilanda.getInstance(); + froilanda.mount(horse); + + Rideable actual = froilanda.getIsRiding(); + //then + Assert.assertEquals(expected, actual); + } + + @Test + public void testDismount() { + //given + Horse horse = new Horse(); + //when + Froilanda froilanda = Froilanda.getInstance(); + froilanda.mount(horse); + froilanda.dismount(horse); + //then + Assert.assertNull(froilanda.getIsRiding()); + } + + @Test + public void testEat() { + //given + Froilanda froilanda = Froilanda.getInstance(); + //when + Tomato tomato = new Tomato(); + froilanda.eat(tomato); + froilanda.getMealList(); + //then + Assert.assertTrue(froilanda.meals.contains(tomato)); + } + + @Test + public void testFly() { + //given + Froilanda froilanda = Froilanda.getInstance(); + CropDuster cropDuster = new CropDuster(); + Farm farm = new Farm(); + Assert.assertFalse(farm.getField().getMyField().get(0).getCropList().get(0).checkFertilized()); + //when + froilanda.mount(cropDuster); + froilanda.fly(farm); + //then + Assert.assertTrue(farm.getField().getMyField().get(0).getCropList().get(0).checkFertilized()); + } + + @Test + public void testInheritance() { + Froilanda froilanda = Froilanda.getInstance(); + Assert.assertTrue(froilanda instanceof Farmer); + } + + @Test + public void testImplementationBotanist() { + Froilanda froilanda = Froilanda.getInstance(); + Assert.assertTrue(froilanda instanceof Pilot); + } +} From ff16aabfb68a00e9a4dffc1fab799ebc32e9d7a1 Mon Sep 17 00:00:00 2001 From: jgiroso Date: Fri, 23 Jul 2021 02:31:24 -0400 Subject: [PATCH 090/100] test test --- .../froilansfarm/Food/CropRowTest.java | 7 ------- .../froilansfarm/MammalTests/FroilandaTest.java | 16 ++++++++++++++-- 2 files changed, 14 insertions(+), 9 deletions(-) delete mode 100644 src/test/java/com/zipcodewilmington/froilansfarm/Food/CropRowTest.java diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/Food/CropRowTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/Food/CropRowTest.java deleted file mode 100644 index f5811a03..00000000 --- a/src/test/java/com/zipcodewilmington/froilansfarm/Food/CropRowTest.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.zipcodewilmington.froilansfarm.Food; - -import junit.framework.TestCase; - -public class CropRowTest extends TestCase { - -} \ No newline at end of file diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/MammalTests/FroilandaTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/MammalTests/FroilandaTest.java index 3031b7cc..d9a4057f 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/MammalTests/FroilandaTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/MammalTests/FroilandaTest.java @@ -93,12 +93,24 @@ public void testFly() { Froilanda froilanda = Froilanda.getInstance(); CropDuster cropDuster = new CropDuster(); Farm farm = new Farm(); - Assert.assertFalse(farm.getField().getMyField().get(0).getCropList().get(0).checkFertilized()); + Assert.assertFalse(farm + .getField() + .getMyField() + .get(0) + .getCropList() + .get(0) + .checkFertilized()); //when froilanda.mount(cropDuster); froilanda.fly(farm); //then - Assert.assertTrue(farm.getField().getMyField().get(0).getCropList().get(0).checkFertilized()); + Assert.assertTrue(farm + .getField() + .getMyField() + .get(0) + .getCropList() + .get(0) + .checkFertilized()); } @Test From b06f5f977c5d8ea406d4cf24dbfe41192a584865 Mon Sep 17 00:00:00 2001 From: Jeremy Date: Fri, 23 Jul 2021 11:21:48 -0400 Subject: [PATCH 091/100] woopsie --- .../froilansfarm/Structure/ChickenCoop.java | 14 +++++-------- .../froilansfarm/Structure/FarmHouse.java | 14 ++++--------- .../froilansfarm/Structure/Stable.java | 14 ++++--------- .../StructureTests/ChickenCoopTest.java | 21 +++++++++++++++++-- .../StructureTests/FarmHouseTest.java | 20 ++++++++++++++++-- .../StructureTests/StableTest.java | 19 +++++++++++++++-- 6 files changed, 67 insertions(+), 35 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Structure/ChickenCoop.java b/src/main/java/com/zipcodewilmington/froilansfarm/Structure/ChickenCoop.java index 5fdc229f..73147fac 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Structure/ChickenCoop.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Structure/ChickenCoop.java @@ -9,12 +9,8 @@ public class ChickenCoop implements Shelter { List chickenList = new ArrayList(); - Chicken chicken; - public ChickenCoop(Chicken chicken) { - this.chicken = chicken; - this.chickenList = chickenList; - } + public ChickenCoop() { } @@ -24,12 +20,12 @@ public void add(Chicken chicken) { } public Chicken getObjectByName(String name) { - for(Chicken element : chickenList) { - if(element.equals(name)) { - chicken = element; + for(Chicken chicken : chickenList) { + if(chicken.getName().equals(name)) { + return chicken; } } - return chicken; + return null; } public void remove(Chicken chicken) { diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Structure/FarmHouse.java b/src/main/java/com/zipcodewilmington/froilansfarm/Structure/FarmHouse.java index 65a0b891..522a1a04 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Structure/FarmHouse.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Structure/FarmHouse.java @@ -9,12 +9,6 @@ public class FarmHouse implements Shelter { List personList = new ArrayList(); - Person person; - - public FarmHouse(Person person) { - this.person = person; - this.personList = personList; - } public FarmHouse() {} @@ -23,12 +17,12 @@ public void add(Person person) { } public Person getObjectByName(String name) { - for(Person element : personList) { - if(element.equals(name)) { - person = element; + for(Person person : personList) { + if(person.getName().equals(name)) { + return person; } } - return person; + return null; } public void remove(Person person) { diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Structure/Stable.java b/src/main/java/com/zipcodewilmington/froilansfarm/Structure/Stable.java index 22d058df..493cc41f 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Structure/Stable.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Structure/Stable.java @@ -9,12 +9,6 @@ public class Stable implements Shelter { List horseList = new ArrayList(); - Horse horse; - - public Stable(Horse horse) { - this.horse = horse; - this.horseList = horseList; - } public Stable() {} @@ -23,12 +17,12 @@ public void add(Horse horse) { } public Horse getObjectByName(String name) { - for(Horse element : horseList) { - if(element.equals(name)) { - horse = element; + for(Horse horse : horseList) { + if(horse.getName().equals(name)) { + return horse; } } - return horse; + return null; } public void remove(Horse horse) { diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/StructureTests/ChickenCoopTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/StructureTests/ChickenCoopTest.java index 80383f25..92faab34 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/StructureTests/ChickenCoopTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/StructureTests/ChickenCoopTest.java @@ -1,5 +1,6 @@ package com.zipcodewilmington.froilansfarm.StructureTests; +import com.zipcodewilmington.froilansfarm.Farm; import com.zipcodewilmington.froilansfarm.Mammal.Chicken; import com.zipcodewilmington.froilansfarm.Shelter; import com.zipcodewilmington.froilansfarm.Structure.ChickenCoop; @@ -14,7 +15,7 @@ public void testConstructor() { String expected = "Frank"; Chicken chicken = new Chicken(expected); //when - ChickenCoop chickenCoop = new ChickenCoop(chicken); + ChickenCoop chickenCoop = new ChickenCoop(); chickenCoop.add(chicken); //then Assert.assertTrue(chickenCoop.getChickenList().contains(chicken)); @@ -26,7 +27,7 @@ public void testGetObjectByName() { String name = "Frank"; Chicken expected = new Chicken(name); //when - ChickenCoop chickenCoop = new ChickenCoop(expected); + ChickenCoop chickenCoop = new ChickenCoop(); chickenCoop.add(expected); Chicken actual = chickenCoop.getObjectByName(name); //then @@ -63,4 +64,20 @@ public void testImplementation() { ChickenCoop chickenCoop = new ChickenCoop(); Assert.assertTrue(chickenCoop instanceof Shelter); } + + @Test + public void elementTest() { + + //Given + ChickenCoop chickenCoop = new ChickenCoop(); + Chicken actual = chickenCoop.getObjectByName("Felipe"); + Assert.assertNull(actual); + chickenCoop.add(new Chicken("Felipe")); + + //When + actual = chickenCoop.getObjectByName("Felipe"); + + //Then + Assert.assertNotNull(actual); + } } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/StructureTests/FarmHouseTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/StructureTests/FarmHouseTest.java index 3adb2ccc..602e366b 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/StructureTests/FarmHouseTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/StructureTests/FarmHouseTest.java @@ -17,7 +17,7 @@ public void testConstructor() { String expected = "Froiland"; Farmer farmer = new Farmer(expected); //when - FarmHouse farmhouse = new FarmHouse(farmer); + FarmHouse farmhouse = new FarmHouse(); farmhouse.add(farmer); //then Assert.assertTrue(farmhouse.getPersonList().contains(farmer)); @@ -29,7 +29,7 @@ public void testGetObjectByName() { String name = "Frank"; Person expected = new Farmer(name); //when - FarmHouse farmhouse = new FarmHouse(expected); + FarmHouse farmhouse = new FarmHouse(); farmhouse.add(expected); Person actual = farmhouse.getObjectByName(name); //then @@ -68,6 +68,22 @@ public void testImplementation() { Assert.assertTrue(farmhouse instanceof Shelter); } + @Test + public void elementTest() { + + //Given + FarmHouse farmHouse = new FarmHouse(); + Person actual = farmHouse.getObjectByName("Froilan"); + Assert.assertNull(actual); + farmHouse.add(new Person("Froilan")); + + //When + actual = farmHouse.getObjectByName("Froilan"); + + //Then + Assert.assertNotNull(actual); + } + // @Test // public void testGetName() { // //given diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/StructureTests/StableTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/StructureTests/StableTest.java index 4cde60c5..cb3161a2 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/StructureTests/StableTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/StructureTests/StableTest.java @@ -16,7 +16,7 @@ public void testConstructor() { String expected = "Judy"; Horse horse = new Horse(expected); //when - Stable stable = new Stable(horse); + Stable stable = new Stable(); stable.add(horse); //then Assert.assertTrue(stable.getHorseList().contains(horse)); @@ -28,7 +28,7 @@ public void testGetObjectByName() { String name = "Frank"; Horse expected = new Horse(name); //when - Stable stable = new Stable(expected); + Stable stable = new Stable(); stable.add(expected); Horse actual = stable.getObjectByName(name); //then @@ -65,4 +65,19 @@ public void testImplementation() { Stable stable = new Stable(); Assert.assertTrue(stable instanceof Shelter); } + @Test + public void elementTest() { + + //Given + Stable stable = new Stable(); + Horse actual = stable.getObjectByName("Spoon"); + Assert.assertNull(actual); + stable.add(new Horse("Spoon")); + + //When + actual = stable.getObjectByName("Spoon"); + + //Then + Assert.assertNotNull(actual); + } } From cf3baa501c381211553a95b8a8fb35603e042c4a Mon Sep 17 00:00:00 2001 From: jgiroso Date: Fri, 23 Jul 2021 17:26:06 -0400 Subject: [PATCH 092/100] weekdays changes --- .../froilansfarm/Mammal/Animal.java | 7 ++ .../froilansfarm/Mammal/Froilan.java | 5 ++ .../froilansfarm/Mammal/Person.java | 8 ++ .../froilansfarm/Vehicles/Tractor.java | 1 - .../froilansfarm/Weekdays.java | 80 +++++++++++++++++++ .../MammalTests/FroilandaTest.java | 4 - 6 files changed, 100 insertions(+), 5 deletions(-) create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Weekdays.java diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Animal.java b/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Animal.java index a4b44795..a10c9cd5 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Animal.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Animal.java @@ -15,6 +15,13 @@ public Animal() { name = ""; } + public void eat(T ... edibles) { + for (int i = 0; i < edibles.length; i++) { + T edible = edibles[i]; + eat(edible); + } + } + public void eat(T edible) { meals.add(edible); } public List getMealList() { return meals; } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Froilan.java b/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Froilan.java index 56b6204b..3656332a 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Froilan.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Froilan.java @@ -1,6 +1,7 @@ package com.zipcodewilmington.froilansfarm.Mammal; import com.zipcodewilmington.froilansfarm.Botanist; +import com.zipcodewilmington.froilansfarm.Field; import com.zipcodewilmington.froilansfarm.Food.Crop; import com.zipcodewilmington.froilansfarm.Food.CropRow; @@ -15,4 +16,8 @@ public class Froilan extends Farmer implements Botanist { public void plant(Crop crop, CropRow cropRow) { cropRow.plantCrop(crop); } + + public void plantRows(Field field) { + field.getMyField().get(0); + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Person.java b/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Person.java index 2a3abfa2..cb3118f7 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Person.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Person.java @@ -5,6 +5,7 @@ import com.zipcodewilmington.froilansfarm.NoiseMaker; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; public class Person implements Eater, NoiseMaker { @@ -28,6 +29,13 @@ public void setName(String name) { this.name = name; } + public void eat(T ... edibles) { + for (int i = 0; i < edibles.length; i++) { + T edible = edibles[i]; + eat(edible); + } + } + @Override public void eat(T edible) { meals.add(edible); } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Tractor.java b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Tractor.java index cbafb362..bf423b9e 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Tractor.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Tractor.java @@ -2,7 +2,6 @@ import com.zipcodewilmington.froilansfarm.Edible; import com.zipcodewilmington.froilansfarm.Farm; -import com.zipcodewilmington.froilansfarm.Food.Crop; import com.zipcodewilmington.froilansfarm.Food.CropRow; import com.zipcodewilmington.froilansfarm.Rider; diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Weekdays.java b/src/main/java/com/zipcodewilmington/froilansfarm/Weekdays.java new file mode 100644 index 00000000..5efa38ab --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Weekdays.java @@ -0,0 +1,80 @@ +package com.zipcodewilmington.froilansfarm; + +import com.sun.org.apache.bcel.internal.generic.INSTANCEOF; +import com.zipcodewilmington.froilansfarm.Food.*; +import com.zipcodewilmington.froilansfarm.Mammal.Chicken; +import com.zipcodewilmington.froilansfarm.Mammal.Froilan; +import com.zipcodewilmington.froilansfarm.Mammal.Froilanda; +import com.zipcodewilmington.froilansfarm.Mammal.Horse; +import com.zipcodewilmington.froilansfarm.Structure.ChickenCoop; +import com.zipcodewilmington.froilansfarm.Structure.Stable; +import org.graalvm.compiler.hotspot.replacements.InstanceOfSnippets; + +import java.util.Arrays; + +public class Weekdays { + + Froilan froilan = new Froilan(); + Froilanda froilanda = Froilanda.getInstance(); + + Stable stable = new Stable(); + ChickenCoop chickenCoop = new ChickenCoop(); + + EarCorn earCorn = new EarCorn(); + CornStalk cornStalk = new CornStalk(); + + public void sunday() { + morningRoutine(); + froilan.plant(cornStalk, ); + } + + public void monday() { + + } + + public void tuesday() { + + } + + public void wednesday() { + + } + + public void thursday() { + + } + + public void friday() { + + } + + public void saturday() { + + } + + public void morningRoutine() { + for(Horse horse : stable.getHorseList()) { + froilan.mount(horse); + horse.ride(froilan); + } + for(Horse horse : stable.getHorseList()) { + horse.eat(new EarCorn(), new EarCorn(), new EarCorn()); + } + for(Chicken chicken : chickenCoop.getChickenList()) { + chicken.eat(earCorn); + } + froilan.eat(new EarCorn(), new Tomato(), new Tomato(), new Egg(), new Egg(), new Egg(), new Egg(), new Egg()); + froilanda.eat(new EarCorn(), new EarCorn(), new Tomato(), new Egg(), new Egg()); + + } + + public void lunch() { + froilan.eat(new Carrot(), new Carrot(), new Tomato(), new Tomato(), new Tomato(), new Egg(), new Egg(), new Egg()); + froilanda.eat(new EarCorn(), new Carrot(), new Carrot(), new Carrot(), new Egg(), new Egg()); + } + + public void dinner() { + froilan.eat(new EarCorn(), new Tomato(), new Tomato(), new Carrot(), new Egg(), new Egg()); + froilanda.eat(new EarCorn(), new Tomato(), new Tomato(), new Carrot(), new Egg(), new Egg()); + } +} diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/MammalTests/FroilandaTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/MammalTests/FroilandaTest.java index d9a4057f..dc2dcd67 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/MammalTests/FroilandaTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/MammalTests/FroilandaTest.java @@ -1,12 +1,8 @@ package com.zipcodewilmington.froilansfarm.MammalTests; -import com.zipcodewilmington.froilansfarm.Botanist; import com.zipcodewilmington.froilansfarm.Farm; -import com.zipcodewilmington.froilansfarm.Food.CropRow; import com.zipcodewilmington.froilansfarm.Food.Tomato; -import com.zipcodewilmington.froilansfarm.Food.TomatoPlant; import com.zipcodewilmington.froilansfarm.Mammal.Farmer; -import com.zipcodewilmington.froilansfarm.Mammal.Froilan; import com.zipcodewilmington.froilansfarm.Mammal.Froilanda; import com.zipcodewilmington.froilansfarm.Mammal.Horse; import com.zipcodewilmington.froilansfarm.Pilot; From cd87b43a79bcf95c8f3faf7cd60031a9c6d24992 Mon Sep 17 00:00:00 2001 From: jgiroso Date: Fri, 23 Jul 2021 18:02:35 -0400 Subject: [PATCH 093/100] weekday schedule --- .../froilansfarm/Mammal/Froilan.java | 9 ++-- .../froilansfarm/Mammal/Froilanda.java | 2 +- .../froilansfarm/Weekdays.java | 50 ++++++++++++++++--- 3 files changed, 50 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Froilan.java b/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Froilan.java index 3656332a..37e1924f 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Froilan.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Froilan.java @@ -2,8 +2,7 @@ import com.zipcodewilmington.froilansfarm.Botanist; import com.zipcodewilmington.froilansfarm.Field; -import com.zipcodewilmington.froilansfarm.Food.Crop; -import com.zipcodewilmington.froilansfarm.Food.CropRow; +import com.zipcodewilmington.froilansfarm.Food.*; public class Froilan extends Farmer implements Botanist { @@ -18,6 +17,10 @@ public void plant(Crop crop, CropRow cropRow) { } public void plantRows(Field field) { - field.getMyField().get(0); + this.plant(new CornStalk(), field.getMyField().get(0)); + this.plant(new TomatoPlant(), field.getMyField().get(1)); + this.plant(new CarrotFlower(), field.getMyField().get(2)); + this.plant(new CornStalk(), field.getMyField().get(3)); + this.plant(new TomatoPlant(), field.getMyField().get(4)); } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Froilanda.java b/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Froilanda.java index 621f0437..c44e195e 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Froilanda.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Froilanda.java @@ -29,7 +29,7 @@ public void eatBreakfast(EarCorn earCorn, Tomato tomato, Egg egg){ @Override public void fly(Farm farm) { if(getIsRiding() instanceof CropDuster){ - ((CropDuster) getIsRiding()).fly(farm.getField()); + ((CropDuster) getIsRiding()).operate(farm); } } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Weekdays.java b/src/main/java/com/zipcodewilmington/froilansfarm/Weekdays.java index 5efa38ab..3423da75 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Weekdays.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Weekdays.java @@ -8,12 +8,18 @@ import com.zipcodewilmington.froilansfarm.Mammal.Horse; import com.zipcodewilmington.froilansfarm.Structure.ChickenCoop; import com.zipcodewilmington.froilansfarm.Structure.Stable; +import com.zipcodewilmington.froilansfarm.Vehicles.CropDuster; +import com.zipcodewilmington.froilansfarm.Vehicles.Tractor; import org.graalvm.compiler.hotspot.replacements.InstanceOfSnippets; +import java.util.ArrayList; import java.util.Arrays; +import java.util.List; public class Weekdays { + Farm farm = new Farm(); + Froilan froilan = new Froilan(); Froilanda froilanda = Froilanda.getInstance(); @@ -22,34 +28,64 @@ public class Weekdays { EarCorn earCorn = new EarCorn(); CornStalk cornStalk = new CornStalk(); + TomatoPlant tomatoPlant = new TomatoPlant(); + CropRow cropRow = new CropRow(); + + CropDuster cropDuster = new CropDuster(); + Tractor tractor = new Tractor(); public void sunday() { + List cropRows = farm.getField().getMyField(); morningRoutine(); - froilan.plant(cornStalk, ); + froilan.plantRows(farm.getField()); + lunch(); + dinner(); } public void monday() { - + morningRoutine(); + froilanda.mount(cropDuster); + froilanda.fly(farm); + lunch(); + dinner(); } public void tuesday() { - + morningRoutine(); + froilan.mount(tractor); + tractor.operate(farm); + lunch(); + dinner(); } public void wednesday() { - + List cropRows = farm.getField().getMyField(); + morningRoutine(); + froilan.plantRows(farm.getField()); + lunch(); + dinner(); } public void thursday() { - + morningRoutine(); + froilan.mount(tractor); + tractor.operate(farm); + lunch(); + dinner(); } public void friday() { - + List cropRows = farm.getField().getMyField(); + morningRoutine(); + froilan.plantRows(farm.getField()); + lunch(); + dinner(); } public void saturday() { - + morningRoutine(); + lunch(); + dinner(); } public void morningRoutine() { From 02fb476532bc4367b57bdd664e0b4a15aa16add8 Mon Sep 17 00:00:00 2001 From: jgiroso Date: Fri, 23 Jul 2021 18:10:52 -0400 Subject: [PATCH 094/100] deleted apache --- .../java/com/zipcodewilmington/froilansfarm/Weekdays.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Weekdays.java b/src/main/java/com/zipcodewilmington/froilansfarm/Weekdays.java index 3423da75..3763940e 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Weekdays.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Weekdays.java @@ -1,6 +1,6 @@ package com.zipcodewilmington.froilansfarm; -import com.sun.org.apache.bcel.internal.generic.INSTANCEOF; + import com.zipcodewilmington.froilansfarm.Food.*; import com.zipcodewilmington.froilansfarm.Mammal.Chicken; import com.zipcodewilmington.froilansfarm.Mammal.Froilan; @@ -10,7 +10,7 @@ import com.zipcodewilmington.froilansfarm.Structure.Stable; import com.zipcodewilmington.froilansfarm.Vehicles.CropDuster; import com.zipcodewilmington.froilansfarm.Vehicles.Tractor; -import org.graalvm.compiler.hotspot.replacements.InstanceOfSnippets; + import java.util.ArrayList; import java.util.Arrays; From 3c7cb0cad13f7fde5b1cba7468f4cd586bcec12f Mon Sep 17 00:00:00 2001 From: Nathan Date: Sun, 25 Jul 2021 16:13:00 -0400 Subject: [PATCH 095/100] pantry --- .../froilansfarm/Structure/Pantry.java | 79 +++++++++++++++++++ 1 file changed, 79 insertions(+) create mode 100644 src/main/java/com/zipcodewilmington/froilansfarm/Structure/Pantry.java diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Structure/Pantry.java b/src/main/java/com/zipcodewilmington/froilansfarm/Structure/Pantry.java new file mode 100644 index 00000000..03699739 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Structure/Pantry.java @@ -0,0 +1,79 @@ +package com.zipcodewilmington.froilansfarm.Structure; + +import com.zipcodewilmington.froilansfarm.Edible; +import com.zipcodewilmington.froilansfarm.Food.Carrot; +import com.zipcodewilmington.froilansfarm.Food.EarCorn; +import com.zipcodewilmington.froilansfarm.Food.Egg; +import com.zipcodewilmington.froilansfarm.Food.Tomato; + +import java.util.ArrayList; +import java.util.List; + +public class Pantry { + private List carrotsBasket = new ArrayList<>(); + private List earCornsBasket = new ArrayList<>(); + private List eggsBasket = new ArrayList<>(); + private List tomatoesBasket = new ArrayList<>(); + + public Pantry(){ + populateCarrots(); + populateEarCorns(); + populateEggs(); + populateTomatoes(); + } + + public Integer countCarrots() { + return carrotsBasket.size(); + } + + public void storeCarrot(Carrot carrot) { + this.carrotsBasket.add(carrot); + } + + public Integer countEarCorns() { + return earCornsBasket.size(); + } + + public void storeEarCorn(EarCorn earCorn) { + this.earCornsBasket.add(earCorn); + } + + public Integer countEggs() { + return eggsBasket.size(); + } + + public void storeEgg(Egg egg) { + this.eggsBasket.add(egg); + } + + public Integer countTomatoes() { + return tomatoesBasket.size(); + } + + public void storeTomato(Tomato tomato) { + this.tomatoesBasket.add(tomato); + } + + public void populateCarrots(){ + for (int i = 0; i < 10; i++) { + this.storeCarrot(new Carrot()); + } + } + public void populateEarCorns(){ + for (int i = 0; i < 10; i++) { + this.storeEarCorn(new EarCorn()); + } + } + public void populateEggs(){ + for (int i = 0; i < 10; i++) { + this.storeEgg(new Egg()); + } + } + public void populateTomatoes(){ + for (int i = 0; i < 10; i++) { + this.storeTomato(new Tomato()); + } + } +} + +// \ No newline at end of file From 5c7db7ec2813c7ae7dc9dad7f08edf0a3b26e2f4 Mon Sep 17 00:00:00 2001 From: Nathan Date: Sun, 25 Jul 2021 17:54:36 -0400 Subject: [PATCH 096/100] dinnger --- .../zipcodewilmington/froilansfarm/Farm.java | 7 +++ .../froilansfarm/Mammal/Animal.java | 17 ++++-- .../froilansfarm/Mammal/Person.java | 22 ++++++-- .../froilansfarm/Simulation.java | 8 --- .../froilansfarm/Structure/Pantry.java | 41 ++++++++++++-- .../froilansfarm/Weekdays.java | 55 +++++++++++++------ .../StructureTests/PantryTest.java | 26 +++++++++ 7 files changed, 137 insertions(+), 39 deletions(-) create mode 100644 src/test/java/com/zipcodewilmington/froilansfarm/StructureTests/PantryTest.java diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Farm.java b/src/main/java/com/zipcodewilmington/froilansfarm/Farm.java index bb34270f..e8158180 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Farm.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Farm.java @@ -7,6 +7,7 @@ import com.zipcodewilmington.froilansfarm.Mammal.*; import com.zipcodewilmington.froilansfarm.Structure.ChickenCoop; import com.zipcodewilmington.froilansfarm.Structure.FarmHouse; +import com.zipcodewilmington.froilansfarm.Structure.Pantry; import com.zipcodewilmington.froilansfarm.Structure.Stable; import com.zipcodewilmington.froilansfarm.Vehicles.Aircraft; import com.zipcodewilmington.froilansfarm.Vehicles.CropDuster; @@ -29,12 +30,14 @@ public class Farm { private CropDuster cropDuster = new CropDuster(); private Tractor tractor = new Tractor(); private Tractor johnDeer = new Tractor(); + private Pantry pantry; public Farm(){ populateFarmHouse(); populateAllChickenCoops(); populateAllStables(); populateField(); + this.pantry = new Pantry(); } public Shelter getFarmhouse() { @@ -104,4 +107,8 @@ public void populateFarmHouse(){ farmhouse.add(msFroid); farmhouse.add(new Farmer("Froilan")); } + + public Pantry getPantry() { + return pantry; + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Animal.java b/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Animal.java index a10c9cd5..8cfce7f1 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Animal.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Animal.java @@ -5,6 +5,7 @@ import com.zipcodewilmington.froilansfarm.NoiseMaker; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; public abstract class Animal implements Eater, NoiseMaker { @@ -15,14 +16,22 @@ public Animal() { name = ""; } - public void eat(T ... edibles) { - for (int i = 0; i < edibles.length; i++) { - T edible = edibles[i]; + public void eat(List edibles) { + for (T edible : edibles) { eat(edible); } } - public void eat(T edible) { meals.add(edible); } + + public void eat(T edible){ + getMealList().add(edible); + } + + public void eat(T... edible) { + eat(Arrays.asList(edible)); + } + + //public void eat(T edible) { meals.add(edible); } public List getMealList() { return meals; } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Person.java b/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Person.java index cb3118f7..aa157b68 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Person.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Person.java @@ -29,20 +29,30 @@ public void setName(String name) { this.name = name; } - public void eat(T ... edibles) { - for (int i = 0; i < edibles.length; i++) { - T edible = edibles[i]; + public void eat(List edibles) { + for (T edible : edibles) { eat(edible); } } + @Override - public void eat(T edible) { meals.add(edible); } + public void eat(T edible){ + getMealList().add(edible); + } + + public void eat(T... edible) { + eat(Arrays.asList(edible)); + } - public List getMealList() { return meals; } + + + public List getMealList() { + return meals; + } @Override - public String makeNoise(){ + public String makeNoise() { return "Hello"; } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Simulation.java b/src/main/java/com/zipcodewilmington/froilansfarm/Simulation.java index 8e050057..f843b4a2 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Simulation.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Simulation.java @@ -20,14 +20,6 @@ public static void main(String[] args) { public void run() { - Farm farm = new Farm(); - CropDuster cropDuster = new CropDuster(); - - Froilanda msFroid = Froilanda.getInstance(); - - msFroid.mount(cropDuster); - - msFroid.fly(farm); } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Structure/Pantry.java b/src/main/java/com/zipcodewilmington/froilansfarm/Structure/Pantry.java index 03699739..04cf5e10 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Structure/Pantry.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Structure/Pantry.java @@ -7,6 +7,7 @@ import com.zipcodewilmington.froilansfarm.Food.Tomato; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; public class Pantry { @@ -30,6 +31,14 @@ public void storeCarrot(Carrot carrot) { this.carrotsBasket.add(carrot); } + public List takeCarrot(Integer count){ + Carrot[] result = new Carrot[count]; + for (int i = 0; i < count; i++) { + result[i] = this.carrotsBasket.remove(0); + } + return Arrays.asList(result); + } + public Integer countEarCorns() { return earCornsBasket.size(); } @@ -38,6 +47,14 @@ public void storeEarCorn(EarCorn earCorn) { this.earCornsBasket.add(earCorn); } + public List takeEarCorn(Integer count){ + EarCorn[] result = new EarCorn[count]; + for (int i = 0; i < count; i++) { + result[i] = this.earCornsBasket.remove(0); + } + return Arrays.asList(result); + } + public Integer countEggs() { return eggsBasket.size(); } @@ -46,6 +63,14 @@ public void storeEgg(Egg egg) { this.eggsBasket.add(egg); } + public List takeEgg(Integer count){ + Egg[] result = new Egg[count]; + for (int i = 0; i < count; i++) { + result[i] = this.eggsBasket.remove(0); + } + return Arrays.asList(result); + } + public Integer countTomatoes() { return tomatoesBasket.size(); } @@ -54,23 +79,31 @@ public void storeTomato(Tomato tomato) { this.tomatoesBasket.add(tomato); } + public List takeTomato(Integer count){ + Tomato[] result = new Tomato[count]; + for (int i = 0; i < count; i++) { + result[i] = this.tomatoesBasket.remove(0); + } + return Arrays.asList(result); + } + public void populateCarrots(){ - for (int i = 0; i < 10; i++) { + for (int i = 0; i < 100; i++) { this.storeCarrot(new Carrot()); } } public void populateEarCorns(){ - for (int i = 0; i < 10; i++) { + for (int i = 0; i < 100; i++) { this.storeEarCorn(new EarCorn()); } } public void populateEggs(){ - for (int i = 0; i < 10; i++) { + for (int i = 0; i < 100; i++) { this.storeEgg(new Egg()); } } public void populateTomatoes(){ - for (int i = 0; i < 10; i++) { + for (int i = 0; i < 100; i++) { this.storeTomato(new Tomato()); } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Weekdays.java b/src/main/java/com/zipcodewilmington/froilansfarm/Weekdays.java index 3763940e..9f131ed6 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Weekdays.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Weekdays.java @@ -36,14 +36,14 @@ public class Weekdays { public void sunday() { List cropRows = farm.getField().getMyField(); - morningRoutine(); + morningRoutine(farm); froilan.plantRows(farm.getField()); lunch(); dinner(); } public void monday() { - morningRoutine(); + morningRoutine(farm); froilanda.mount(cropDuster); froilanda.fly(farm); lunch(); @@ -51,7 +51,7 @@ public void monday() { } public void tuesday() { - morningRoutine(); + morningRoutine(farm); froilan.mount(tractor); tractor.operate(farm); lunch(); @@ -60,14 +60,14 @@ public void tuesday() { public void wednesday() { List cropRows = farm.getField().getMyField(); - morningRoutine(); + morningRoutine(farm); froilan.plantRows(farm.getField()); lunch(); dinner(); } public void thursday() { - morningRoutine(); + morningRoutine(farm); froilan.mount(tractor); tractor.operate(farm); lunch(); @@ -76,19 +76,19 @@ public void thursday() { public void friday() { List cropRows = farm.getField().getMyField(); - morningRoutine(); + morningRoutine(farm); froilan.plantRows(farm.getField()); lunch(); dinner(); } public void saturday() { - morningRoutine(); + morningRoutine(farm); lunch(); dinner(); } - public void morningRoutine() { + public void morningRoutine(Farm farm) { for(Horse horse : stable.getHorseList()) { froilan.mount(horse); horse.ride(froilan); @@ -96,21 +96,42 @@ public void morningRoutine() { for(Horse horse : stable.getHorseList()) { horse.eat(new EarCorn(), new EarCorn(), new EarCorn()); } - for(Chicken chicken : chickenCoop.getChickenList()) { - chicken.eat(earCorn); - } - froilan.eat(new EarCorn(), new Tomato(), new Tomato(), new Egg(), new Egg(), new Egg(), new Egg(), new Egg()); - froilanda.eat(new EarCorn(), new EarCorn(), new Tomato(), new Egg(), new Egg()); + List x = farm.getPantry().takeEarCorn(1); + chickenCoop.getChickenList().forEach(chicken -> chicken.eat((EarCorn) x)); + + + List breakFast = farm.getPantry().takeEarCorn(1); + breakFast.addAll(farm.getPantry().takeTomato(2)); + breakFast.addAll(farm.getPantry().takeEgg(5)); + froilan.eat(breakFast); + breakFast = farm.getPantry().takeEarCorn(2); + breakFast.addAll(farm.getPantry().takeTomato(1)); + breakFast.addAll(farm.getPantry().takeEgg(2)); + froilanda.eat(breakFast); } public void lunch() { - froilan.eat(new Carrot(), new Carrot(), new Tomato(), new Tomato(), new Tomato(), new Egg(), new Egg(), new Egg()); - froilanda.eat(new EarCorn(), new Carrot(), new Carrot(), new Carrot(), new Egg(), new Egg()); + List lunch = farm.getPantry().takeCarrot(2); + lunch.addAll(farm.getPantry().takeTomato(3)); + lunch.addAll(farm.getPantry().takeEgg(3)); + froilan.eat(lunch); + lunch = farm.getPantry().takeEarCorn(1); + lunch.addAll(farm.getPantry().takeCarrot(3)); + lunch.addAll(farm.getPantry().takeEgg(2)); + froilanda.eat(lunch); } public void dinner() { - froilan.eat(new EarCorn(), new Tomato(), new Tomato(), new Carrot(), new Egg(), new Egg()); - froilanda.eat(new EarCorn(), new Tomato(), new Tomato(), new Carrot(), new Egg(), new Egg()); + List dinner = farm.getPantry().takeCarrot(1); + dinner.addAll(farm.getPantry().takeEarCorn(1)); + dinner.addAll(farm.getPantry().takeTomato(2)); + dinner.addAll(farm.getPantry().takeEgg(2)); + froilan.eat(dinner); + dinner = farm.getPantry().takeCarrot(1); + dinner.addAll(farm.getPantry().takeEarCorn(1)); + dinner.addAll(farm.getPantry().takeTomato(2)); + dinner.addAll(farm.getPantry().takeEgg(2)); + froilanda.eat(dinner); } } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/StructureTests/PantryTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/StructureTests/PantryTest.java new file mode 100644 index 00000000..b6bcc3a6 --- /dev/null +++ b/src/test/java/com/zipcodewilmington/froilansfarm/StructureTests/PantryTest.java @@ -0,0 +1,26 @@ +package com.zipcodewilmington.froilansfarm.StructureTests; + +import com.zipcodewilmington.froilansfarm.Farm; +import com.zipcodewilmington.froilansfarm.Food.Carrot; +import com.zipcodewilmington.froilansfarm.Structure.Pantry; +import org.junit.Assert; +import org.junit.Test; + +import java.util.Arrays; + +public class PantryTest { + @Test + public void takeTest(){ + //given + Pantry myPantry = new Pantry(); + //when + //Carrot[] twoCarrots = myPantry.takeCarrot(2); + Integer expected = 8; + Integer actual = myPantry.countCarrots(); + //then + Assert.assertEquals(expected,actual); + + //System.out.println(twoCarrots.length + " " + twoCarrots.getClass().getSimpleName()); + + } +} From 8381c4ad04e2c85f2ee4dbb0aa2d6c9c3f25913a Mon Sep 17 00:00:00 2001 From: Zach Date: Sun, 25 Jul 2021 18:16:15 -0400 Subject: [PATCH 097/100] Chickens and Horses and Chickens tho --- .../froilansfarm/Structure/FarmHouse.java | 6 +++ .../froilansfarm/Weekdays.java | 39 +++++++++++-------- 2 files changed, 28 insertions(+), 17 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Structure/FarmHouse.java b/src/main/java/com/zipcodewilmington/froilansfarm/Structure/FarmHouse.java index 522a1a04..becfe640 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Structure/FarmHouse.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Structure/FarmHouse.java @@ -1,5 +1,6 @@ package com.zipcodewilmington.froilansfarm.Structure; +import com.zipcodewilmington.froilansfarm.Mammal.Froilan; import com.zipcodewilmington.froilansfarm.Mammal.Person; import com.zipcodewilmington.froilansfarm.Shelter; @@ -32,4 +33,9 @@ public void remove(Person person) { public List getPersonList() { return personList; } + + public Person getFroi(){ + Froilan froi = (Froilan) getObjectByName("Froilan"); + return froi; + } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Weekdays.java b/src/main/java/com/zipcodewilmington/froilansfarm/Weekdays.java index 9f131ed6..47e592aa 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Weekdays.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Weekdays.java @@ -2,10 +2,7 @@ import com.zipcodewilmington.froilansfarm.Food.*; -import com.zipcodewilmington.froilansfarm.Mammal.Chicken; -import com.zipcodewilmington.froilansfarm.Mammal.Froilan; -import com.zipcodewilmington.froilansfarm.Mammal.Froilanda; -import com.zipcodewilmington.froilansfarm.Mammal.Horse; +import com.zipcodewilmington.froilansfarm.Mammal.*; import com.zipcodewilmington.froilansfarm.Structure.ChickenCoop; import com.zipcodewilmington.froilansfarm.Structure.Stable; import com.zipcodewilmington.froilansfarm.Vehicles.CropDuster; @@ -17,22 +14,25 @@ import java.util.List; public class Weekdays { + private Farm farm; - Farm farm = new Farm(); + public Weekdays(Farm farm){ + this.farm = farm; + } - Froilan froilan = new Froilan(); + Froilan froilan = (Froilan) farm.getFarmhouse().getObjectByName("Froilan"); Froilanda froilanda = Froilanda.getInstance(); - Stable stable = new Stable(); - ChickenCoop chickenCoop = new ChickenCoop(); + List> stables = farm.getStables(); + List> chickenCoops = farm.getChickenCoops(); EarCorn earCorn = new EarCorn(); CornStalk cornStalk = new CornStalk(); TomatoPlant tomatoPlant = new TomatoPlant(); CropRow cropRow = new CropRow(); - CropDuster cropDuster = new CropDuster(); - Tractor tractor = new Tractor(); + CropDuster cropDuster = farm.getCropDuster(); + Tractor tractor = farm.getTractor(); public void sunday() { List cropRows = farm.getField().getMyField(); @@ -89,15 +89,20 @@ public void saturday() { } public void morningRoutine(Farm farm) { - for(Horse horse : stable.getHorseList()) { - froilan.mount(horse); - horse.ride(froilan); + for (int i = 0; i < stables.size(); i++) { + Stable stable = (Stable) stables.get(i); + for (Horse horse : stable.getHorseList()) { + horse.eat(new EarCorn(), new EarCorn(), new EarCorn()); + froilan.mount(horse); + horse.ride(froilan); + } } - for(Horse horse : stable.getHorseList()) { - horse.eat(new EarCorn(), new EarCorn(), new EarCorn()); + + for(int i = 0; i < chickenCoops.size(); i++) { + ChickenCoop coop = (ChickenCoop) chickenCoops.get(i); + List x = farm.getPantry().takeEarCorn(1); + coop.getChickenList().forEach(chicken -> chicken.eat((EarCorn) x)); } - List x = farm.getPantry().takeEarCorn(1); - chickenCoop.getChickenList().forEach(chicken -> chicken.eat((EarCorn) x)); List breakFast = farm.getPantry().takeEarCorn(1); From 329d9ac7ce5f6c35539c91ac0b5b47886dc4fcd8 Mon Sep 17 00:00:00 2001 From: Zach Date: Sun, 25 Jul 2021 18:22:53 -0400 Subject: [PATCH 098/100] Chicken Chocolate Cheesecake --- .../zipcodewilmington/froilansfarm/Simulation.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Simulation.java b/src/main/java/com/zipcodewilmington/froilansfarm/Simulation.java index f843b4a2..53d3750b 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Simulation.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Simulation.java @@ -19,8 +19,16 @@ public static void main(String[] args) { } public void run() { - - + Weekdays weekdays = new Weekdays(new Farm()); + weekdays.tuesday(); + weekdays.wednesday(); + weekdays.thursday(); + weekdays.friday(); + weekdays.saturday(); + weekdays.sunday(); + weekdays.monday(); + + System.out.println("some stuff"); } } From 34ccac16dceccf2c5b2de5c4fa0e8749364d1074 Mon Sep 17 00:00:00 2001 From: Nathan Date: Sun, 25 Jul 2021 18:38:28 -0400 Subject: [PATCH 099/100] blah blah --- .../froilansfarm/Simulation.java | 8 ++++++ .../froilansfarm/Structure/Pantry.java | 26 +++++++++---------- .../froilansfarm/Vehicles/Tractor.java | 19 +++++++++++++- .../StructureTests/PantryTest.java | 15 +++++++++++ 4 files changed, 54 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Simulation.java b/src/main/java/com/zipcodewilmington/froilansfarm/Simulation.java index f843b4a2..8e050057 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Simulation.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Simulation.java @@ -20,6 +20,14 @@ public static void main(String[] args) { public void run() { + Farm farm = new Farm(); + CropDuster cropDuster = new CropDuster(); + + Froilanda msFroid = Froilanda.getInstance(); + + msFroid.mount(cropDuster); + + msFroid.fly(farm); } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Structure/Pantry.java b/src/main/java/com/zipcodewilmington/froilansfarm/Structure/Pantry.java index 04cf5e10..8a39355f 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Structure/Pantry.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Structure/Pantry.java @@ -10,7 +10,7 @@ import java.util.Arrays; import java.util.List; -public class Pantry { +public class Pantry { private List carrotsBasket = new ArrayList<>(); private List earCornsBasket = new ArrayList<>(); private List eggsBasket = new ArrayList<>(); @@ -27,8 +27,8 @@ public Integer countCarrots() { return carrotsBasket.size(); } - public void storeCarrot(Carrot carrot) { - this.carrotsBasket.add(carrot); + public void storeCarrot(T carrot) { + this.carrotsBasket.add((Carrot) carrot); } public List takeCarrot(Integer count){ @@ -43,8 +43,8 @@ public Integer countEarCorns() { return earCornsBasket.size(); } - public void storeEarCorn(EarCorn earCorn) { - this.earCornsBasket.add(earCorn); + public void storeEarCorn(T earCorn) { + this.earCornsBasket.add((EarCorn) earCorn); } public List takeEarCorn(Integer count){ @@ -59,8 +59,8 @@ public Integer countEggs() { return eggsBasket.size(); } - public void storeEgg(Egg egg) { - this.eggsBasket.add(egg); + public void storeEgg(T egg) { + this.eggsBasket.add((Egg) egg); } public List takeEgg(Integer count){ @@ -75,8 +75,8 @@ public Integer countTomatoes() { return tomatoesBasket.size(); } - public void storeTomato(Tomato tomato) { - this.tomatoesBasket.add(tomato); + public void storeTomato(T tomato) { + this.tomatoesBasket.add((Tomato) tomato); } public List takeTomato(Integer count){ @@ -89,22 +89,22 @@ public List takeTomato(Integer count){ public void populateCarrots(){ for (int i = 0; i < 100; i++) { - this.storeCarrot(new Carrot()); + this.storeCarrot((T) new Carrot()); } } public void populateEarCorns(){ for (int i = 0; i < 100; i++) { - this.storeEarCorn(new EarCorn()); + this.storeEarCorn((T) new EarCorn()); } } public void populateEggs(){ for (int i = 0; i < 100; i++) { - this.storeEgg(new Egg()); + this.storeEgg((T) new Egg()); } } public void populateTomatoes(){ for (int i = 0; i < 100; i++) { - this.storeTomato(new Tomato()); + this.storeTomato((T) new Tomato()); } } } diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Tractor.java b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Tractor.java index bf423b9e..8ed67a29 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Tractor.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Vehicles/Tractor.java @@ -2,7 +2,7 @@ import com.zipcodewilmington.froilansfarm.Edible; import com.zipcodewilmington.froilansfarm.Farm; -import com.zipcodewilmington.froilansfarm.Food.CropRow; +import com.zipcodewilmington.froilansfarm.Food.*; import com.zipcodewilmington.froilansfarm.Rider; import java.util.ArrayList; @@ -37,6 +37,23 @@ public void operate(Farm farm) { } } + public void storeHarvest(Farm farm){ + for(Edible edible: aList){ + if(edible instanceof EarCorn){ + farm.getPantry().storeEarCorn(edible); + } + if(edible instanceof Egg){ + farm.getPantry().storeEgg(edible); + } + if(edible instanceof Tomato){ + farm.getPantry().storeTomato(edible); + } + if(edible instanceof Carrot){ + farm.getPantry().storeCarrot(edible); + } + } + } + public List getaList() { return aList; } diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/StructureTests/PantryTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/StructureTests/PantryTest.java index b6bcc3a6..a3fdc372 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/StructureTests/PantryTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/StructureTests/PantryTest.java @@ -1,5 +1,6 @@ package com.zipcodewilmington.froilansfarm.StructureTests; +import com.zipcodewilmington.froilansfarm.Edible; import com.zipcodewilmington.froilansfarm.Farm; import com.zipcodewilmington.froilansfarm.Food.Carrot; import com.zipcodewilmington.froilansfarm.Structure.Pantry; @@ -23,4 +24,18 @@ public void takeTest(){ //System.out.println(twoCarrots.length + " " + twoCarrots.getClass().getSimpleName()); } + + @Test + public void storeCarrotTest(){ + //given + Pantry myPantry = new Pantry(); + Edible myCarrot = new Carrot(); + //when + myPantry.storeCarrot(myCarrot); + Integer actual = myPantry.countCarrots(); + Integer expected = 101; + //then + Assert.assertEquals(expected,actual); + + } } From f78ff4faf6b6a82dacb367f7a784ffa463f6d148 Mon Sep 17 00:00:00 2001 From: jgiroso Date: Sun, 25 Jul 2021 18:55:19 -0400 Subject: [PATCH 100/100] Froilan singleton --- .../zipcodewilmington/froilansfarm/Farm.java | 3 ++- .../froilansfarm/Mammal/Froilan.java | 6 +++--- .../froilansfarm/Weekdays.java | 2 +- .../froilansfarm/MammalTests/FroilanTest.java | 20 +++++++++---------- 4 files changed, 16 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Farm.java b/src/main/java/com/zipcodewilmington/froilansfarm/Farm.java index e8158180..442822fc 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Farm.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Farm.java @@ -104,8 +104,9 @@ private void populateField(){ public void populateFarmHouse(){ Froilanda msFroid = Froilanda.getInstance(); + Froilan mrFroid = Froilan.getInstance(); farmhouse.add(msFroid); - farmhouse.add(new Farmer("Froilan")); + farmhouse.add(mrFroid); } public Pantry getPantry() { diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Froilan.java b/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Froilan.java index 37e1924f..27afb962 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Froilan.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Mammal/Froilan.java @@ -5,12 +5,12 @@ import com.zipcodewilmington.froilansfarm.Food.*; public class Froilan extends Farmer implements Botanist { + private static final Froilan froilan = new Froilan(); - String name; + public static Froilan getInstance() { return froilan; } - public Froilan(String name) { super(name); } + public Froilan() { super("Froilan"); } - public Froilan() { name = "Froilan"; } public void plant(Crop crop, CropRow cropRow) { cropRow.plantCrop(crop); diff --git a/src/main/java/com/zipcodewilmington/froilansfarm/Weekdays.java b/src/main/java/com/zipcodewilmington/froilansfarm/Weekdays.java index 47e592aa..2f015547 100644 --- a/src/main/java/com/zipcodewilmington/froilansfarm/Weekdays.java +++ b/src/main/java/com/zipcodewilmington/froilansfarm/Weekdays.java @@ -14,7 +14,7 @@ import java.util.List; public class Weekdays { - private Farm farm; + private Farm farm = new Farm(); public Weekdays(Farm farm){ this.farm = farm; diff --git a/src/test/java/com/zipcodewilmington/froilansfarm/MammalTests/FroilanTest.java b/src/test/java/com/zipcodewilmington/froilansfarm/MammalTests/FroilanTest.java index 35acdfb9..b9178190 100644 --- a/src/test/java/com/zipcodewilmington/froilansfarm/MammalTests/FroilanTest.java +++ b/src/test/java/com/zipcodewilmington/froilansfarm/MammalTests/FroilanTest.java @@ -20,7 +20,7 @@ public void testconstructor() { //given String expected = "Froilan"; //when - Froilan froilan = new Froilan(expected); + Froilan froilan = Froilan.getInstance(); String actual = froilan.getName(); //then Assert.assertEquals(expected, actual); @@ -29,8 +29,8 @@ public void testconstructor() { @Test public void testSetName() { //given - String expected = "Froiland"; - Froilan froilan = new Froilan(expected); + String expected = "Froilan"; + Froilan froilan = Froilan.getInstance(); //when String actual = froilan.getName(); //then @@ -42,7 +42,7 @@ public void testPlant() { //given TomatoPlant tomatoPlant = new TomatoPlant(0); CropRow cropRow = new CropRow(); - Froilan farmer = new Froilan(); + Froilan farmer = Froilan.getInstance(); //when farmer.plant(tomatoPlant, cropRow); //then @@ -54,7 +54,7 @@ public void testMakeNoise() { //given String expected = "Howdy"; //when - Froilan froilan = new Froilan(); + Froilan froilan = Froilan.getInstance(); String actual = froilan.makeNoise(); //then Assert.assertEquals(expected, actual); @@ -66,7 +66,7 @@ public void testMount() { Horse horse = new Horse(); Rideable expected = horse; //when - Froilan froilan = new Froilan(); + Froilan froilan = Froilan.getInstance(); froilan.mount(horse); Rideable actual = froilan.getIsRiding(); //then @@ -78,7 +78,7 @@ public void testDismount() { //given Horse horse = new Horse(); //when - Froilan froilan = new Froilan(); + Froilan froilan = Froilan.getInstance(); froilan.mount(horse); froilan.dismount(horse); //then @@ -88,7 +88,7 @@ public void testDismount() { @Test public void testEat() { //given - Froilan froilan = new Froilan(); + Froilan froilan = Froilan.getInstance(); //when Tomato tomato = new Tomato(); froilan.eat(tomato); @@ -99,13 +99,13 @@ public void testEat() { @Test public void testInheritance() { - Froilan froilan = new Froilan(); + Froilan froilan = Froilan.getInstance(); Assert.assertTrue(froilan instanceof Farmer); } @Test public void testImplementationBotanist() { - Froilan froilan = new Froilan("Joe"); + Froilan froilan = Froilan.getInstance(); Assert.assertTrue(froilan instanceof Botanist); }