fanwuyang/SENG202
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Made route RD display things in the table and added functionality to the add button

Browse Source
This commit is contained in:
Sunguin Peng
2016-09-15 13:57:56 +12:00
parent 8192c59bb4
commit ae522e14d3
10 changed files with 168 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/java/seng202/group9/AirportUnitTest.java
+14 -14
View File
@@ -90,31 +90,31 @@ public class AirportUnitTest {
heathrow.addArrivalRoutes(route1);
heathrow.addArrivalRoutes(routes);
assertEquals(heathrow.getArrivalRoutes().get(0).arrivesAt(), "LHR1");
assertEquals(heathrow.getArrivalRoutes().get(1).arrivesAt(), "LHR1");
assertEquals(heathrow.getArrivalRoutes().get(2).arrivesAt(), "LHR2");
assertEquals(heathrow.getArrivalRoutes().get(3).arrivesAt(), "LHR3");
assertEquals(heathrow.getArrivalRoutes().get(0).getArrivalAirport(), "LHR1");
assertEquals(heathrow.getArrivalRoutes().get(1).getArrivalAirport(), "LHR1");
assertEquals(heathrow.getArrivalRoutes().get(2).getArrivalAirport(), "LHR2");
assertEquals(heathrow.getArrivalRoutes().get(3).getArrivalAirport(), "LHR3");
//check add departrue routes;
heathrow.addDepartureRoutes(route1);
heathrow.addDepartureRoutes(routes);
assertEquals(heathrow.getDepartureRoutes().get(0).departsFrom(), "SIN1");
assertEquals(heathrow.getDepartureRoutes().get(1).departsFrom(), "SIN1");
assertEquals(heathrow.getDepartureRoutes().get(2).departsFrom(), "SIN2");
assertEquals(heathrow.getDepartureRoutes().get(3).departsFrom(), "SIN3");
assertEquals(heathrow.getDepartureRoutes().get(0).getDepartureAirport(), "SIN1");
assertEquals(heathrow.getDepartureRoutes().get(1).getDepartureAirport(), "SIN1");
assertEquals(heathrow.getDepartureRoutes().get(2).getDepartureAirport(), "SIN2");
assertEquals(heathrow.getDepartureRoutes().get(3).getDepartureAirport(), "SIN3");
//check set
heathrow.setArrivalRoutes(routes);
heathrow.setDepartureRoutes(routes);
//Arrival check
assertEquals(heathrow.getArrivalRoutes().get(0).arrivesAt(), "LHR1");
assertEquals(heathrow.getArrivalRoutes().get(1).arrivesAt(), "LHR2");
assertEquals(heathrow.getArrivalRoutes().get(2).arrivesAt(), "LHR3");
assertEquals(heathrow.getArrivalRoutes().get(0).getArrivalAirport(), "LHR1");
assertEquals(heathrow.getArrivalRoutes().get(1).getArrivalAirport(), "LHR2");
assertEquals(heathrow.getArrivalRoutes().get(2).getArrivalAirport(), "LHR3");
//departure check
assertEquals(heathrow.getDepartureRoutes().get(0).departsFrom(), "SIN1");
assertEquals(heathrow.getDepartureRoutes().get(1).departsFrom(), "SIN2");
assertEquals(heathrow.getDepartureRoutes().get(2).departsFrom(), "SIN3");
assertEquals(heathrow.getDepartureRoutes().get(0).getDepartureAirport(), "SIN1");
assertEquals(heathrow.getDepartureRoutes().get(1).getDepartureAirport(), "SIN2");
assertEquals(heathrow.getDepartureRoutes().get(2).getDepartureAirport(), "SIN3");
}
@Test
src/test/java/seng202/group9/RouteTest.java
+4 -4
View File
@@ -28,8 +28,8 @@ public class RouteTest extends TestCase {
//test getters
//////////////
assertEquals(route.getAirline(), "BA");
assertEquals(route.departsFrom(), "SIN");
assertEquals(route.arrivesAt(), "LHR");
assertEquals(route.getDepartureAirport(), "SIN");
assertEquals(route.getArrivalAirport(), "LHR");
assertEquals(route.getCode(), "");
assertEquals(route.getEquipment(), "744 777");
///////////////
@@ -43,8 +43,8 @@ public class RouteTest extends TestCase {
route.setEquipment("747 840");
assertEquals(route.getAirline(), "BAH");
assertEquals(route.departsFrom(), "SING-SONG");
assertEquals(route.arrivesAt(), "LEFT-HAND-RULE");
assertEquals(route.getDepartureAirport(), "SING-SONG");
assertEquals(route.getArrivalAirport(), "LEFT-HAND-RULE");
assertEquals(route.getCode(), "Y");
assertEquals(route.getEquipment(), "747 840");
////////////////////////////