Changeset 212 in tmcsimulator for trunk/test/atmsdriver/model/LoadHighwaysTest.java

Timestamp:

11/02/2017 01:42:45 PM (9 years ago)

Author:

jtorres

Message:

branches/FEPSimulator/tests/HighwaysParserTest.cpp: Unit test for HighwaysParser?.cpp. HighwaysTest?.java: now passing toXML(), added test for toCondensedFormat() method. LoadHighwaysTest?.java: passing. LoadSadDotsTest?.java: conformed to changes, not passing. Highway.java/Highways.java: converted class attributes to List instead of ArrayList?. Highways.java: corrected toCondensedFormat() method comments and added comments throughout file.

File:

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

trunk/test/atmsdriver/model/LoadHighwaysTest.java

@@ -7 +7 @@
 import java.nio.file.Path;
 import java.util.ArrayList;
+import java.util.List;
 import junit.framework.TestCase;
 
@@ -83 +84 @@
                 "test/atmsdriver/model/lds_loadhighways_sample.txt",
                 "localhost", 8080);
-        System.out.println(highways.toCondensedFormat(false));
+
         // Test for correct number of highways
-        ArrayList<Highway> result = highways.highways;
+        List<Highway> result = (ArrayList) highways.highways;
         assertEquals(1, result.size());
         
@@ -96 +97 @@
         
         // Test 5 stations are sorted by postmile
-        ArrayList<Station> stations = fiveS.stations;
+        List<Station> stations = (ArrayList) fiveS.stations;
         ArrayList<Double> stationsPostmiles = new ArrayList<>();
         for(Station station : stations)