Merge remote-tracking branch 'origin/master'

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
+    public static boolean createNew = false;//constructor variables for action
-    ArrayList<Airline> airlines;
+    private ArrayList<Airline> airlines;
-    ArrayList<Airport> airports;
+    private ArrayList<Airport> airports;
-    ArrayList<Route> routes;
+    private ArrayList<Route> routes;
-    ArrayList<FlightPath> flightPaths;
+    private ArrayList<FlightPath> flightPaths;
-    ArrayList<Country> countries;
+    private ArrayList<Country> countries;
-    ArrayList<City> cities;
+    private ArrayList<City> cities;
-    LinkedHashMap<String, Airline> airlineDictionary;
+    private LinkedHashMap<String, Airline> airlineDictionary;
-    LinkedHashMap<String, Airport> airportDictionary;
+    private LinkedHashMap<String, Airport> airportDictionary;
-    LinkedHashMap<String, Route> routeDictionary;
+    private LinkedHashMap<String, Route> routeDictionary;
-    LinkedHashMap<Integer, FlightPath> flightPathDictionary;
+    private LinkedHashMap<Integer, FlightPath> flightPathDictionary;
-    LinkedHashMap<String, Country> countryDictionary;
+    private LinkedHashMap<String, Country> countryDictionary;
-    LinkedHashMap<String, City> cityDictionary;
+    private LinkedHashMap<String, City> cityDictionary;
 
     /**
      *

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;
 	}
 	
 }

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");
+		//name + ", IATA:" + IATA + ", ICAO: " + ICAO
-    	assertEquals(allNipponAirways + "" ,"All Nippon Airways");
+		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");
     }
 }