Changeset 96 in tmcsimulator

Timestamp:

10/11/2017 12:56:24 PM (9 years ago)

Author:

jdalbey

Message:

LoadHighwaysTest?.java: revised to compile with revised Highway.java class. Currently not passing.

File:

• trunk/test/atmsdriver/model/LoadHighwaysTest.java (modified) (3 diffs)

trunk/test/atmsdriver/model/LoadHighwaysTest.java

@@ -75 +75 @@
         // Test 55 N was loaded
         Highway fiftyfiveN = result.get(2);
-        assertEquals(new Integer(55), fiftyfiveN.getRouteNumber());
-        assertEquals(DIRECTION.NORTH, fiftyfiveN.getDirection());
+        assertEquals(new Integer(55), fiftyfiveN.highwayNumber);
         
         // Test 55 N stations are sorted by postmile
-        ArrayList<Station> stations = fiftyfiveN.getStations();
+        ArrayList<Station> stations = fiftyfiveN.stations;
         ArrayList<Double> stationsPostmiles = new ArrayList<>();
         for(Station station : stations)
@@ -98 +97 @@
         // Test 55 S was loaded
         Highway fiftyfiveS = result.get(0);
-        assertEquals(new Integer(55), fiftyfiveS.getRouteNumber());
-        assertEquals(DIRECTION.SOUTH, fiftyfiveS.getDirection());
+        assertEquals(new Integer(55), fiftyfiveS.highwayNumber);
         
         // Test 55 S stations are sorted by postmile
-        stations = fiftyfiveS.getStations();
+        stations = fiftyfiveS.stations;
         stationsPostmiles.clear();
         for(Station station : stations)
@@ -120 +118 @@
         
         Highway fiveS = result.get(1);
-        assertEquals(new Integer(5), fiveS.getRouteNumber());
-        assertEquals(DIRECTION.SOUTH, fiveS.getDirection());
+        assertEquals(new Integer(5), fiveS.highwayNumber);
         
         // Test 5 S stations are sorted by postmile
-        stations = fiveS.getStations();
+        stations = fiveS.stations;
         stationsPostmiles.clear();
         for(Station station : stations)