Index: trunk/test/atmsdriver/model/HighwaysTest.java
===================================================================
--- trunk/test/atmsdriver/model/HighwaysTest.java (revision 89)
+++ trunk/test/atmsdriver/model/HighwaysTest.java (revision 89)
@@ -0,0 +1,261 @@
+package atmsdriver.model;
+
+import atmsdriver.ATMSDriver;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.PrintWriter;
+import java.nio.file.FileSystems;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import junit.framework.TestCase;
+
+/**
+ *
+ * @author jdalbey
+ */
+public class HighwaysTest extends TestCase {
+
+ public HighwaysTest(String testName) {
+ super(testName);
+ }
+
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+ PrintWriter writer = null;
+ try {
+ writer = new PrintWriter(new FileWriter("test/atmsdriver/model/ldssample.txt"));
+ writer.println("lds_id line drop sch lineinfo system_key sch_seq glo_seq count freeway Dir ca_pm lds_name");
+ writer.println("1205270 5 19 1 1 1123005673 26492 1357648 20 5 S 33 MAIN 1 ");
+ writer.println("1208933 6 15 2 2 1123005691 26491 1357639 19 73 S 26.3 S OF 55 ");
+ writer.close();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ super.tearDown();
+ Path path = FileSystems.getDefault().getPath("test/atmsdriver/model", "ldssample.txt");
+ Files.delete(path);
+ }
+
+ /**
+ * Test of toXML method, of class Network.
+ */
+ public void testToXML() {
+ System.out.println("toXML");
+ Highways highways = new Highways(
+ "test/atmsdriver/model/ldssample.txt",
+ "config/vds_data/loop.txt",
+ "config/vds_data/highwaysMeta.txt",
+ "localhost", 8080);
+ String result = highways.toXML();
+ assertEquals(expResult, result);
+ }
+String expResult =
+"\n"
++"\n"
++" \n"
++" 5\n"
++" 20\n"
++" 1\n"
++" 1\n"
++" 1123005673\n"
++" 1357648\n"
++" 26492\n"
++" \n"
++" \n"
++" 1205270\n"
++" 5\n"
++" 19\n"
++" MAIN 1\n"
++" 33.0\n"
++" S\n"
++" 5\n"
++" 0\n"
++" 0\n"
++" \n"
++" \n"
++" 1205272\n"
++" RAMP_ON\n"
++" 1\n"
++" 0\n"
++" 0\n"
++" 0\n"
++" \n"
++" \n"
++" 1205273\n"
++" QUEUE\n"
++" 2\n"
++" 0\n"
++" 0\n"
++" 0\n"
++" \n"
++" \n"
++" 1205274\n"
++" DEMAND\n"
++" 3\n"
++" 0\n"
++" 0\n"
++" 0\n"
++" \n"
++" \n"
++" 1205275\n"
++" PASSAGE\n"
++" 4\n"
++" 0\n"
++" 0\n"
++" 0\n"
++" \n"
++" \n"
++" 1205277\n"
++" ML_1\n"
++" 1\n"
++" 0\n"
++" 0\n"
++" 0\n"
++" \n"
++" \n"
++" 1205278\n"
++" ML_2\n"
++" 2\n"
++" 0\n"
++" 0\n"
++" 0\n"
++" \n"
++" \n"
++" 1205279\n"
++" ML_3\n"
++" 3\n"
++" 0\n"
++" 0\n"
++" 0\n"
++" \n"
++" \n"
++" 1209945\n"
++" ML_4\n"
++" 4\n"
++" 0\n"
++" 0\n"
++" 0\n"
++" \n"
++" \n"
++" 1209947\n"
++" ML_5\n"
++" 5\n"
++" 0\n"
++" 0\n"
++" 0\n"
++" \n"
++" \n"
++" 1209948\n"
++" SD_1\n"
++" 1\n"
++" 0\n"
++" 0\n"
++" 0\n"
++" \n"
++" \n"
++" 1209949\n"
++" SD_2\n"
++" 1\n"
++" 0\n"
++" 0\n"
++" 0\n"
++" \n"
++" \n"
++" \n"
++" \n"
++" \n"
++" \n"
++" 6\n"
++" 19\n"
++" 2\n"
++" 2\n"
++" 1123005691\n"
++" 1357639\n"
++" 26491\n"
++" \n"
++" \n"
++" 1208933\n"
++" 6\n"
++" 15\n"
++" S OF 55\n"
++" 26.3\n"
++" S\n"
++" 73\n"
++" 0\n"
++" 0\n"
++" \n"
++" \n"
++" 1212466\n"
++" ML_1\n"
++" 2\n"
++" 0\n"
++" 0\n"
++" 0\n"
++" \n"
++" \n"
++" 1212467\n"
++" ML_2\n"
++" 3\n"
++" 0\n"
++" 0\n"
++" 0\n"
++" \n"
++" \n"
++" 1212468\n"
++" ML_3\n"
++" 1\n"
++" 0\n"
++" 0\n"
++" 0\n"
++" \n"
++" \n"
++" 1212469\n"
++" OS_1\n"
++" 1\n"
++" 0\n"
++" 0\n"
++" 0\n"
++" \n"
++" \n"
++" 1212470\n"
++" OS_2\n"
++" 2\n"
++" 0\n"
++" 0\n"
++" 0\n"
++" \n"
++" \n"
++" 1212471\n"
++" OS_3\n"
++" 3\n"
++" 0\n"
++" 0\n"
++" 0\n"
++" \n"
++" \n"
++" 1212516\n"
++" SD_4\n"
++" 1\n"
++" 0\n"
++" 0\n"
++" 0\n"
++" \n"
++" \n"
++" 1212517\n"
++" SD_5\n"
++" 2\n"
++" 0\n"
++" 0\n"
++" 0\n"
++" \n"
++" \n"
++" \n"
++" \n"
++" \n"
++"\n";
+}
Index: trunk/test/atmsdriver/model/LoadHighwaysTest.java
===================================================================
--- trunk/test/atmsdriver/model/LoadHighwaysTest.java (revision 89)
+++ trunk/test/atmsdriver/model/LoadHighwaysTest.java (revision 89)
@@ -0,0 +1,142 @@
+package atmsdriver.model;
+
+import atmsdriver.ATMSDriver;
+import atmsdriver.model.Station.DIRECTION;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.PrintWriter;
+import java.nio.file.FileSystems;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import junit.framework.TestCase;
+
+/**
+ *
+ * @author jdalbey
+ */
+public class LoadHighwaysTest extends TestCase {
+
+ public LoadHighwaysTest(String testName) {
+ super(testName);
+ }
+
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+ PrintWriter writer = null;
+ try {
+ writer = new PrintWriter(new FileWriter("test/atmsdriver/model/lds_loadhighways_sample.txt"));
+
+ writer.println("lds_id line drop sch lineinfo system_key sch_seq glo_seq count freeway Dir ca_pm lds_name");
+ writer.println("1203081 6 17 2 2 1123005691 26491 1357639 19 55 N 4.58 BRISTOL");
+ writer.println("1210163 6 20 2 2 1123005691 26491 1357639 19 55 N 5.51 PAULARINO 1");
+ writer.println("1203244 50 4 13 13 1123005873 24148 1357650 19 55 N 10 MCFADDEN");
+ writer.println("1203211 50 5 13 13 1123005873 24148 1357650 19 55 N 9.41 EDINGER 2");
+
+ writer.println("1203261 23 14 23 21 1123005995 26479 1357626 18 55 S 10.4 S OF 5");
+ writer.println("1203083 6 18 2 2 1123005691 26491 1357639 19 55 S 4.7 BAKER 1");
+ writer.println("1210174 6 19 2 2 1123005691 26491 1357639 19 55 S 5.06 BAKER 2");
+ writer.println("1203270 23 15 23 21 1123005995 26479 1357626 18 55 S 10.5 N OF 5");
+
+ writer.println("1205238 22 16 4 4 1123005726 26490 1357624 19 5 S 32.25 17TH 1");
+ writer.println("1205208 22 17 4 4 1123005726 26490 1357624 19 5 S 31.6 GRAND 1");
+ writer.println("1205270 5 19 1 1 1123005673 26492 1357648 20 5 S 33 MAIN 1 ");
+
+
+ writer.close();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ super.tearDown();
+ Path path = FileSystems.getDefault().getPath("test/atmsdriver/model", "lds_loadhighways_sample.txt");
+ Files.delete(path);
+ }
+
+ /**
+ * Test of toXML method, of class Network.
+ */
+ public void testLoadHighways() {
+ System.out.println("toXML");
+ Highways highways = new Highways(
+ "test/atmsdriver/model/lds_loadhighways_sample.txt",
+ "config/vds_data/loop.txt",
+ "config/vds_data/highwaysMeta.txt",
+ "localhost", 8080);
+
+ // Test for correct number of highways
+ ArrayList result = highways.getHighways();
+ assertEquals(3, result.size());
+
+ // Test 55 N was loaded
+ Highway fiftyfiveN = result.get(2);
+ assertEquals(new Integer(55), fiftyfiveN.getRouteNumber());
+ assertEquals(DIRECTION.NORTH, fiftyfiveN.getDirection());
+
+ // Test 55 N stations are sorted by postmile
+ ArrayList stations = fiftyfiveN.getStations();
+ ArrayList stationsPostmiles = new ArrayList<>();
+ for(Station station : stations)
+ {
+ stationsPostmiles.add(station.getPostmile());
+ }
+ ArrayList expectedStationsPostmiles = new ArrayList<>();
+ expectedStationsPostmiles.add(new Double(4.58));
+ expectedStationsPostmiles.add(new Double(5.51));
+ expectedStationsPostmiles.add(new Double(9.41));
+ expectedStationsPostmiles.add(new Double(10));
+ for(int i = 0; i < 4; i++)
+ {
+ assertEquals(expectedStationsPostmiles.get(i),
+ stationsPostmiles.get(i));
+ }
+
+ // Test 55 S was loaded
+ Highway fiftyfiveS = result.get(0);
+ assertEquals(new Integer(55), fiftyfiveS.getRouteNumber());
+ assertEquals(DIRECTION.SOUTH, fiftyfiveS.getDirection());
+
+ // Test 55 S stations are sorted by postmile
+ stations = fiftyfiveS.getStations();
+ stationsPostmiles.clear();
+ for(Station station : stations)
+ {
+ stationsPostmiles.add(station.getPostmile());
+ }
+ expectedStationsPostmiles.clear();
+ expectedStationsPostmiles.add(new Double(4.7));
+ expectedStationsPostmiles.add(new Double(5.06));
+ expectedStationsPostmiles.add(new Double(10.4));
+ expectedStationsPostmiles.add(new Double(10.5));
+ for(int i = 0; i < 4; i++)
+ {
+ assertEquals(expectedStationsPostmiles.get(i),
+ stationsPostmiles.get(i));
+ }
+
+ Highway fiveS = result.get(1);
+ assertEquals(new Integer(5), fiveS.getRouteNumber());
+ assertEquals(DIRECTION.SOUTH, fiveS.getDirection());
+
+ // Test 5 S stations are sorted by postmile
+ stations = fiveS.getStations();
+ stationsPostmiles.clear();
+ for(Station station : stations)
+ {
+ stationsPostmiles.add(station.getPostmile());
+ }
+ expectedStationsPostmiles.clear();
+ expectedStationsPostmiles.add(new Double(31.6));
+ expectedStationsPostmiles.add(new Double(32.25));
+ expectedStationsPostmiles.add(new Double(33));
+ for(int i = 0; i < 2; i++)
+ {
+ assertEquals(expectedStationsPostmiles.get(i),
+ stationsPostmiles.get(i));
+ }
+ }
+}
Index: trunk/test/atmsdriver/model/NetworkTest.java
===================================================================
--- trunk/test/atmsdriver/model/NetworkTest.java (revision 87)
+++ (revision )
@@ -1,261 +1,0 @@
-package atmsdriver.model;
-
-import atmsdriver.ATMSDriver;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.PrintWriter;
-import java.nio.file.FileSystems;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import junit.framework.TestCase;
-
-/**
- *
- * @author jdalbey
- */
-public class NetworkTest extends TestCase {
-
- public NetworkTest(String testName) {
- super(testName);
- }
-
- @Override
- protected void setUp() throws Exception {
- super.setUp();
- PrintWriter writer = null;
- try {
- writer = new PrintWriter(new FileWriter("test/atmsdriver/model/ldssample.txt"));
- writer.println("lds_id line drop sch lineinfo system_key sch_seq glo_seq count freeway Dir ca_pm lds_name");
- writer.println("1205270 5 19 1 1 1123005673 26492 1357648 20 5 S 33 MAIN 1 ");
- writer.println("1208933 6 15 2 2 1123005691 26491 1357639 19 73 S 26.3 S OF 55 ");
- writer.close();
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- @Override
- protected void tearDown() throws Exception {
- super.tearDown();
- Path path = FileSystems.getDefault().getPath("test/atmsdriver/model", "ldssample.txt");
- Files.delete(path);
- }
-
- /**
- * Test of toXML method, of class Network.
- */
- public void testToXML() {
- System.out.println("toXML");
- Highways highways = new Highways(
- "test/atmsdriver/model/ldssample.txt",
- "config/vds_data/loop.txt",
- "config/vds_data/highwaysMeta.txt",
- "localhost", 8080);
- String result = highways.toXML();
- assertEquals(expResult, result);
- }
-String expResult =
-"\n"
-+"\n"
-+" \n"
-+" 5\n"
-+" 20\n"
-+" 1\n"
-+" 1\n"
-+" 1123005673\n"
-+" 1357648\n"
-+" 26492\n"
-+" \n"
-+" \n"
-+" 1205270\n"
-+" 5\n"
-+" 19\n"
-+" MAIN 1\n"
-+" 33.0\n"
-+" S\n"
-+" 5\n"
-+" 0\n"
-+" 0\n"
-+" \n"
-+" \n"
-+" 1205272\n"
-+" RAMP_ON\n"
-+" 1\n"
-+" 0\n"
-+" 0\n"
-+" 0\n"
-+" \n"
-+" \n"
-+" 1205273\n"
-+" QUEUE\n"
-+" 2\n"
-+" 0\n"
-+" 0\n"
-+" 0\n"
-+" \n"
-+" \n"
-+" 1205274\n"
-+" DEMAND\n"
-+" 3\n"
-+" 0\n"
-+" 0\n"
-+" 0\n"
-+" \n"
-+" \n"
-+" 1205275\n"
-+" PASSAGE\n"
-+" 4\n"
-+" 0\n"
-+" 0\n"
-+" 0\n"
-+" \n"
-+" \n"
-+" 1205277\n"
-+" ML_1\n"
-+" 1\n"
-+" 0\n"
-+" 0\n"
-+" 0\n"
-+" \n"
-+" \n"
-+" 1205278\n"
-+" ML_2\n"
-+" 2\n"
-+" 0\n"
-+" 0\n"
-+" 0\n"
-+" \n"
-+" \n"
-+" 1205279\n"
-+" ML_3\n"
-+" 3\n"
-+" 0\n"
-+" 0\n"
-+" 0\n"
-+" \n"
-+" \n"
-+" 1209945\n"
-+" ML_4\n"
-+" 4\n"
-+" 0\n"
-+" 0\n"
-+" 0\n"
-+" \n"
-+" \n"
-+" 1209947\n"
-+" ML_5\n"
-+" 5\n"
-+" 0\n"
-+" 0\n"
-+" 0\n"
-+" \n"
-+" \n"
-+" 1209948\n"
-+" SD_1\n"
-+" 1\n"
-+" 0\n"
-+" 0\n"
-+" 0\n"
-+" \n"
-+" \n"
-+" 1209949\n"
-+" SD_2\n"
-+" 1\n"
-+" 0\n"
-+" 0\n"
-+" 0\n"
-+" \n"
-+" \n"
-+" \n"
-+" \n"
-+" \n"
-+" \n"
-+" 6\n"
-+" 19\n"
-+" 2\n"
-+" 2\n"
-+" 1123005691\n"
-+" 1357639\n"
-+" 26491\n"
-+" \n"
-+" \n"
-+" 1208933\n"
-+" 6\n"
-+" 15\n"
-+" S OF 55\n"
-+" 26.3\n"
-+" S\n"
-+" 73\n"
-+" 0\n"
-+" 0\n"
-+" \n"
-+" \n"
-+" 1212466\n"
-+" ML_1\n"
-+" 2\n"
-+" 0\n"
-+" 0\n"
-+" 0\n"
-+" \n"
-+" \n"
-+" 1212467\n"
-+" ML_2\n"
-+" 3\n"
-+" 0\n"
-+" 0\n"
-+" 0\n"
-+" \n"
-+" \n"
-+" 1212468\n"
-+" ML_3\n"
-+" 1\n"
-+" 0\n"
-+" 0\n"
-+" 0\n"
-+" \n"
-+" \n"
-+" 1212469\n"
-+" OS_1\n"
-+" 1\n"
-+" 0\n"
-+" 0\n"
-+" 0\n"
-+" \n"
-+" \n"
-+" 1212470\n"
-+" OS_2\n"
-+" 2\n"
-+" 0\n"
-+" 0\n"
-+" 0\n"
-+" \n"
-+" \n"
-+" 1212471\n"
-+" OS_3\n"
-+" 3\n"
-+" 0\n"
-+" 0\n"
-+" 0\n"
-+" \n"
-+" \n"
-+" 1212516\n"
-+" SD_4\n"
-+" 1\n"
-+" 0\n"
-+" 0\n"
-+" 0\n"
-+" \n"
-+" \n"
-+" 1212517\n"
-+" SD_5\n"
-+" 2\n"
-+" 0\n"
-+" 0\n"
-+" 0\n"
-+" \n"
-+" \n"
-+" \n"
-+" \n"
-+" \n"
-+"\n";
-}