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

Merged CreateLinks Branch which allowed CreateLinks() function to work along with new Import Messages

Browse Source
This commit is contained in:
YaFedImYaEatIm
2016-09-16 00:13:55 +12:00
parent 16b9a7a8a8 fac5ec79b1
commit a6f5f13c0b
13 changed files with 222 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/java/seng202/group9/AirlineTest.java
+3 -3
View File
@@ -56,7 +56,7 @@ public class AirlineTest extends TestCase {
assertTrue(allNipponAirways.getIATA() == "NH");// test iata
assertTrue(allNipponAirways.getICAO() == "ANA");// test icao
assertTrue(allNipponAirways.getCallSign() == "ALL NIPPON");// test call sign
assertTrue(allNipponAirways.getCountry() == "Japan");// test country
assertTrue(allNipponAirways.getCountryName() == "Japan");// test country
assertTrue(allNipponAirways.getActive() == "Y");// get active
//check set
allNipponAirways.setID(322);//ID
@@ -81,8 +81,8 @@ public class AirlineTest extends TestCase {
allNipponAirways.setCallSign("NIKE RULES");//Call Sign
assertTrue(allNipponAirways.getCallSign() =="NIKE RULES");
allNipponAirways.setCountry("Nikeland");//Country
assertTrue(allNipponAirways.getCountry() == "Nikeland");
allNipponAirways.setCountryName("Nikeland");//Country
assertTrue(allNipponAirways.getCountryName() == "Nikeland");
allNipponAirways.setActive("N");//Active
assertTrue(allNipponAirways.getActive() == "N");
src/test/java/seng202/group9/AirportUnitTest.java
+3 -3
View File
@@ -34,7 +34,7 @@ public class AirportUnitTest {
fail("No Exception should be thrown by the constructor where the ID is already set bye trying to get the ID.");
}
assertEquals(heathrow.getName(), "Heathrow");
assertEquals(heathrow.getCity(), "London");//check city
assertEquals(heathrow.getCityName(), "London");//check city
assertEquals(heathrow.getIATA_FFA(), "LHR");//check IATA/FFA
assertEquals(heathrow.getICAO(), "EGLL");//check ICAO
assertTrue(heathrow.getLatitude() == 51.4775);//check latitude
@@ -51,8 +51,8 @@ public class AirportUnitTest {
}
heathrow.setName("Hearthstone");//check name
assertEquals(heathrow.getName(), "Hearthstone");
heathrow.setCity("Blizzard Servers");//check city
assertEquals(heathrow.getCity(), "Blizzard Servers");
heathrow.setCityName("Blizzard Servers");//check city
assertEquals(heathrow.getCityName(), "Blizzard Servers");
heathrow.setIATA_FFA("HTS");//test set IATA/FFA
assertEquals(heathrow.getIATA_FFA(), "HTS");
heathrow.setICAO("BLIZ");// test set ICAO
src/test/java/seng202/group9/RouteTest.java
+3 -2
View File
@@ -30,21 +30,22 @@ public class RouteTest extends TestCase {
assertEquals(route.getAirline(), "BA");
assertEquals(route.getDepartureAirport(), "SIN");
assertEquals(route.getArrivalAirport(), "LHR");
assertEquals(route.getAirlineName(), "BA");
assertEquals(route.getCode(), "");
assertEquals(route.getEquipment(), "744 777");
///////////////
//test setters
///////////////
route.setAirline("BAH");
route.setAirlineName("BAH");
route.setArrivalAirport("LEFT-HAND-RULE");
route.setDepartureAirport("SING-SONG");
route.setCode("Y");
route.setStops(5);
route.setEquipment("747 840");
assertEquals(route.getAirline(), "BAH");
assertEquals(route.getDepartureAirport(), "SING-SONG");
assertEquals(route.getArrivalAirport(), "LEFT-HAND-RULE");
assertEquals(route.getAirlineName(), "BAH");
assertEquals(route.getCode(), "Y");
assertEquals(route.getEquipment(), "747 840");
////////////////////////////