Index: trunk/test/tmcsim/highwaymodel/LoadHighwaysTest.java
===================================================================
--- trunk/test/atmsdriver/model/LoadHighwaysTest.java	(revision 343)
+++ trunk/test/tmcsim/highwaymodel/LoadHighwaysTest.java	(revision 422)
@@ -1,4 +1,7 @@
-package atmsdriver.model;
+package tmcsim.highwaymodel;
 
+import tmcsim.highwaymodel.Station;
+import tmcsim.highwaymodel.Highways;
+import tmcsim.highwaymodel.Highway;
 import java.io.FileWriter;
 import java.io.PrintWriter;
@@ -25,25 +28,17 @@
         PrintWriter writer = null;
         try {
-            writer = new PrintWriter(new FileWriter("test/atmsdriver/model/lds_loadhighways_sample.txt"));
-            
-            writer.println("2");
-            writer.println("32 0 2");
-            writer.println("1210831 1 5 S 0.9 4 CALAFIA");
-            writer.println("1210832 ML ML_1");
-            writer.println("1210833 ML ML_2");
-            writer.println("1210834 ML ML_3");
-            writer.println("1210835 ML ML_4");
-            writer.println("1210845 2 5 S 1.49 4 EL CAMINO REAL");
-            writer.println("1210846 ML ML_1");
-            writer.println("1210847 ML ML_2");
-            writer.println("1210848 ML ML_3");
-            writer.println("1210849 ML ML_4");
-            writer.println("74 0 1");
-            writer.println("1204203 2 5 N 1.26 4 MAGDALENA");
-            writer.println("1204212 ML ML_1");
-            writer.println("1204213 ML ML_2");
-            writer.println("1204214 ML ML_3");
-            writer.println("1204215 ML ML_4");
+            writer = new PrintWriter(new FileWriter("test/atmsdriver/postmiles1.txt"));
+            writer.println("5 S 0.9,33.408425,-117.599923,CALAFIA,0,0");
+            writer.println("5 N 1.24,33.413051,-117.601964,MAGDALENA,0,0");
+            writer.println("5 S 1.49,33.416348,-117.603827,EL CAMINO REAL,0,0");
             writer.close();
+            writer = new PrintWriter(new FileWriter("test/atmsdriver/postmiles3.txt"));
+            writer.println("73 N 23.9,33.643656,-117.859875,BISON 2,0.976131,0.217185");
+            writer.println("55 S 6.88,33.697495,-117.862677,MACARTHU1,-0.710326,0.703873");
+            writer.println("5 N 5.73,33.458342,-117.655008,ESTRELLA1,0,0");
+            writer.println("5 N 6.47,33.464404,-117.665509,SACRAMENTO,0.523797,0.851843");
+            writer.println("405 N 6.21,33.672851,-117.832271,HARVARD,0.320278,0.947323");
+            writer.println("405 S 6.8,33.675863,-117.84179,JAMBOREE1,-0.402558,-0.915394");
+            writer.close();            
         } catch (Exception e) {
             e.printStackTrace();
@@ -54,5 +49,7 @@
     protected void tearDown() throws Exception {
         super.tearDown();
-        Path path = FileSystems.getDefault().getPath("test/atmsdriver/model", "lds_loadhighways_sample.txt");
+        Path path = FileSystems.getDefault().getPath("test/atmsdriver", "postmiles1.txt");
+        Files.delete(path);
+        path = FileSystems.getDefault().getPath("test/atmsdriver", "postmiles3.txt");
         Files.delete(path);
     }
@@ -62,8 +59,7 @@
      */
     public void testLoadHighways() {
-        System.out.println("toXML");
+        System.out.println("testLoadHighways");
         Highways highways = new Highways(
-                "test/atmsdriver/model/lds_loadhighways_sample.txt",
-                "localhost", 8080);
+                "test/atmsdriver/postmiles1.txt");
 
         // Test for correct number of highways
@@ -78,5 +74,5 @@
         assertEquals(new Integer(3), new Integer(fiveS.stations.size()));
         
-        // Test 5 stations are sorted by postmile
+        // Test hwy5 stations are sorted by postmile
         List<Station> stations = (ArrayList) fiveS.stations;
         ArrayList<Double> stationsPostmiles = new ArrayList<>();
@@ -89,5 +85,5 @@
         ArrayList<Double> expectedStationsPostmiles = new ArrayList<>();
         expectedStationsPostmiles.add(new Double(0.9));
-        expectedStationsPostmiles.add(new Double(1.26));
+        expectedStationsPostmiles.add(new Double(1.24));
         expectedStationsPostmiles.add(new Double(1.49));
 
@@ -97,8 +93,19 @@
                     stationsPostmiles.get(i));
         }
+    }
+    public void testLoadHighways2() {
+        System.out.println("testLoadHighways2");
+        Highways highways = new Highways(
+                "test/atmsdriver/postmiles3.txt");
+
+        // Test for correct number of highways
+        List<Highway> result = (ArrayList) highways.highways;
+        assertEquals(4, result.size());
         
-        // Test for correct number of loops
-        assertEquals(new Integer(12), new Integer(fiveS.stations.get(0).loops.size()
-            + fiveS.stations.get(1).loops.size() + fiveS.stations.get(2).loops.size()));
+        Highway five = result.get(0);
+        assertEquals(new Integer(5), five.routeNumber);
+        assertEquals(new Integer(405), result.get(1).routeNumber);
+        assertEquals(new Integer(55), result.get(2).routeNumber);
+        assertEquals(new Integer(73), result.get(3).routeNumber);
     }
 }