diff --git a/src/main/java/seng202/group9/Controller/Dataset.java b/src/main/java/seng202/group9/Controller/Dataset.java index 80fc138..15e22bb 100644 --- a/src/main/java/seng202/group9/Controller/Dataset.java +++ b/src/main/java/seng202/group9/Controller/Dataset.java @@ -16,19 +16,19 @@ public class Dataset { String name; public static boolean getExisting = true;//constructor variables for action - static boolean createNew = false;//constructor variables for action - ArrayList airlines; - ArrayList airports; - ArrayList routes; - ArrayList flightPaths; - ArrayList countries; - ArrayList cities; - LinkedHashMap airlineDictionary; - LinkedHashMap airportDictionary; - LinkedHashMap routeDictionary; - LinkedHashMap flightPathDictionary; - LinkedHashMap countryDictionary; - LinkedHashMap cityDictionary; + public static boolean createNew = false;//constructor variables for action + private ArrayList airlines; + private ArrayList airports; + private ArrayList routes; + private ArrayList flightPaths; + private ArrayList countries; + private ArrayList cities; + private LinkedHashMap airlineDictionary; + private LinkedHashMap airportDictionary; + private LinkedHashMap routeDictionary; + private LinkedHashMap flightPathDictionary; + private LinkedHashMap countryDictionary; + private LinkedHashMap cityDictionary; /** * diff --git a/src/main/java/seng202/group9/Core/Airline.java b/src/main/java/seng202/group9/Core/Airline.java index 926b07d..4ab9dbf 100644 --- a/src/main/java/seng202/group9/Core/Airline.java +++ b/src/main/java/seng202/group9/Core/Airline.java @@ -285,7 +285,7 @@ public class Airline{ */ @Override public String toString(){ - return name + ", IATA:" + IATA + ", ICAO: " + ICAO; + return name + ", IATA: " + IATA + ", ICAO: " + ICAO; } } diff --git a/src/test/java/seng202/group9/AirlineTest.java b/src/test/java/seng202/group9/AirlineTest.java index 7afef28..1549f2a 100644 --- a/src/test/java/seng202/group9/AirlineTest.java +++ b/src/test/java/seng202/group9/AirlineTest.java @@ -123,7 +123,9 @@ public class AirlineTest extends TestCase { //324,"All Nippon Airways","ANA All Nippon Airways","NH","ANA","ALL NIPPON","Japan","Y" Airline allNipponAirways = new Airline(324, "All Nippon Airways", "ANA All Nippon Airways", "NH", "ANA", "ALL NIPPON", "Japan", "Y"); - assertTrue(allNipponAirways.toString() == "All Nippon Airways"); - assertEquals(allNipponAirways + "" ,"All Nippon Airways"); + //name + ", IATA:" + IATA + ", ICAO: " + ICAO + System.out.println(allNipponAirways.toString()); + assertTrue(allNipponAirways.toString().equals("All Nippon Airways, IATA: NH, ICAO: ANA")); + assertEquals(allNipponAirways + "" ,"All Nippon Airways, IATA: NH, ICAO: ANA"); } }