From 12668db4086e29f74a2152075e1b79b81eae77e9 Mon Sep 17 00:00:00 2001 From: Imron Date: Wed, 16 Feb 2022 14:43:33 +0100 Subject: [PATCH] add flight schedule --- .../hs/fulda/de/ci/exam/project/Flight.java | 18 +++++++-- .../de/ci/exam/project/FlightInstance.java | 39 +++++++++++++++++++ .../de/ci/exam/project/FlightStatus.java | 5 +++ .../fulda/de/ci/exam/project/FlightTest.java | 20 +++++----- 4 files changed, 70 insertions(+), 12 deletions(-) create mode 100644 src/main/java/hs/fulda/de/ci/exam/project/FlightStatus.java diff --git a/src/main/java/hs/fulda/de/ci/exam/project/Flight.java b/src/main/java/hs/fulda/de/ci/exam/project/Flight.java index 073d93b..ef70d40 100644 --- a/src/main/java/hs/fulda/de/ci/exam/project/Flight.java +++ b/src/main/java/hs/fulda/de/ci/exam/project/Flight.java @@ -1,7 +1,6 @@ package hs.fulda.de.ci.exam.project; import java.util.HashSet; -import java.util.LinkedList; public class Flight { String flightNumber; @@ -21,12 +20,25 @@ public class Flight { return this.flightInstances; } + public FlightInstance getFlightInstance(FlightInstance fi){ + for (FlightInstance obj : flightInstances) { + if (obj.equals(fi)) + return obj; + } + return null; + } + public boolean cancel() { return true; } - public boolean addFlightSchedule() { - return true; + public boolean addFlightSchedule(FlightInstance fi) { + flightInstances.add(fi); + if (flightInstances.contains(fi)) { + System.out.println("Flight instance is added"); + return true; + } + return false; } public String getFlightNumber() { diff --git a/src/main/java/hs/fulda/de/ci/exam/project/FlightInstance.java b/src/main/java/hs/fulda/de/ci/exam/project/FlightInstance.java index 50672a7..edbcaaf 100644 --- a/src/main/java/hs/fulda/de/ci/exam/project/FlightInstance.java +++ b/src/main/java/hs/fulda/de/ci/exam/project/FlightInstance.java @@ -1,4 +1,43 @@ package hs.fulda.de.ci.exam.project; +import java.sql.Time; + public class FlightInstance { + Time departureTime; + String gate; + FlightStatus status; + + public FlightInstance(Time departureTime, String gate, FlightStatus status) { + this.departureTime = departureTime; + this.gate = gate; + this.status = status; + } + + public FlightInstance(){ + + } + + public Time getDepartureTime() { + return departureTime; + } + + public void setDepartureTime(Time departureTime) { + this.departureTime = departureTime; + } + + public String getGate() { + return gate; + } + + public void setGate(String gate) { + this.gate = gate; + } + + public FlightStatus getStatus() { + return status; + } + + public void setStatus(FlightStatus status) { + this.status = status; + } } diff --git a/src/main/java/hs/fulda/de/ci/exam/project/FlightStatus.java b/src/main/java/hs/fulda/de/ci/exam/project/FlightStatus.java new file mode 100644 index 0000000..68aadf2 --- /dev/null +++ b/src/main/java/hs/fulda/de/ci/exam/project/FlightStatus.java @@ -0,0 +1,5 @@ +package hs.fulda.de.ci.exam.project; + +public enum FlightStatus { + Active, Scheduled, Delayed, Departed, Landed, InAir, Arrived, Cancelled, Diverted, Unknown +} diff --git a/src/test/java/hs/fulda/de/ci/exam/project/FlightTest.java b/src/test/java/hs/fulda/de/ci/exam/project/FlightTest.java index d6efd42..424f074 100644 --- a/src/test/java/hs/fulda/de/ci/exam/project/FlightTest.java +++ b/src/test/java/hs/fulda/de/ci/exam/project/FlightTest.java @@ -2,9 +2,12 @@ package hs.fulda.de.ci.exam.project; import org.junit.jupiter.api.Test; +import java.sql.Time; import java.util.HashSet; -import static org.assertj.core.api.Assertions.*; +import static hs.fulda.de.ci.exam.project.FlightStatus.Active; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertTrue; class FlightTest { @@ -19,7 +22,7 @@ class FlightTest { Flight flight1 = new Flight("1", airport_fr, airport1_ist, 140); Flight flight2 = new Flight("2", airport1_ist, airport_fr, 120); - FlightInstance fInstance1 = new FlightInstance(); + FlightInstance fInstance1 = new FlightInstance(new Time(12,45,00), "4E", Active); @Test void getInstances_no_instance_should_be_equal() { @@ -37,13 +40,12 @@ class FlightTest { } @Test - void cancel() { - // TODO: 26.01.22 discussion needed - } - - @Test - void addFlightSchedule() { - // TODO: 26.01.22 discussion needed + void addFlightScheduleShoudlAddFlightInstanceWithActiveStatus() { + boolean addInstance = flight1.addFlightSchedule(fInstance1); + assertTrue(addInstance); + FlightStatus result = flight1.getFlightInstance(fInstance1).getStatus(); + FlightStatus expected = Active; + assertThat(expected).isEqualTo(result); } @Test