Index: trunk/test/atmsdriver/model/LoadHighwaysTest.java =================================================================== --- trunk/test/atmsdriver/model/LoadHighwaysTest.java (revision 185) +++ trunk/test/atmsdriver/model/LoadHighwaysTest.java (revision 205) @@ -26,20 +26,40 @@ 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.println("2"); + writer.println("32 0 2"); + writer.println("1210831 1 5 S 0.9 8 CALAFIA"); + writer.println("1210832 ML_1"); + writer.println("1210833 ML_2"); + writer.println("1210834 ML_3"); + writer.println("1210835 ML_4"); + writer.println("1210836 PASSAGE"); + writer.println("1210837 DEMAND"); + writer.println("1210838 QUEUE"); + writer.println("1210839 RAMP_OFF"); + writer.println("1210845 2 5 S 1.49 9 EL CAMINO REAL"); + writer.println("1210846 ML_1"); + writer.println("1210847 ML_2"); + writer.println("1210848 ML_3"); + writer.println("1210849 ML_4"); + writer.println("1210850 RAMP_ON"); + writer.println("1210851 PASSAGE"); + writer.println("1210853 DEMAND"); + writer.println("1210854 QUEUE"); + writer.println("1210855 RAMP_OFF"); + writer.println("74 0 1"); + writer.println("1204203 2 5 N 1.26 13 MAGDALENA"); + writer.println("1204205 RAMP_ON"); + writer.println("1204206 QUEUE"); + writer.println("1204207 DEMAND"); + writer.println("1204208 PASSAGE"); + writer.println("1204210 RAMP_OFF"); + writer.println("1204212 ML_1"); + writer.println("1204213 ML_2"); + writer.println("1204214 ML_3"); + writer.println("1204215 ML_4"); + writer.println("1204217 OS_1"); + writer.println("1204218 OS_2"); + writer.println("1204219 OS_3"); + writer.println("1204220 OS_4"); writer.close(); } catch (Exception e) { @@ -61,17 +81,20 @@ System.out.println("toXML"); Highways highways = new Highways( - "config/vds_data/highways_fullmap.txt", + "test/atmsdriver/model/lds_loadhighways_sample.txt", "localhost", 8080); // Test for correct number of highways ArrayList result = highways.highways; - assertEquals(2, result.size()); + assertEquals(1, result.size()); - // Test 55 N was loaded - Highway fiftyfiveN = result.get(0); - assertEquals(new Integer(55), fiftyfiveN.routeNumber); + // Test 5 was loaded + Highway fiveS = result.get(0); + assertEquals(new Integer(5), fiveS.routeNumber); - // Test 55 N stations are sorted by postmile - ArrayList stations = fiftyfiveN.stations; + // Test for correct number of stations + assertEquals(new Integer(3), new Integer(fiveS.stations.size())); + + // Test 5 stations are sorted by postmile + ArrayList stations = fiveS.stations; ArrayList stationsPostmiles = new ArrayList<>(); for(Station station : stations) @@ -82,33 +105,8 @@ // Create expected station postmile list (sorted) ArrayList expectedStationsPostmiles = new ArrayList<>(); - expectedStationsPostmiles.add(new Double(4.58)); - expectedStationsPostmiles.add(new Double(4.7)); - expectedStationsPostmiles.add(new Double(5.06)); - expectedStationsPostmiles.add(new Double(5.51)); - expectedStationsPostmiles.add(new Double(9.41)); - expectedStationsPostmiles.add(new Double(10)); - expectedStationsPostmiles.add(new Double(10.4)); - expectedStationsPostmiles.add(new Double(10.5)); - for(int i = 0; i < 8; i++) - { - assertEquals(expectedStationsPostmiles.get(i), - stationsPostmiles.get(i)); - } - - // Test 55 S was loaded - Highway fiftyfiveS = result.get(1); - assertEquals(new Integer(5), fiftyfiveS.routeNumber); - - // Test 55 S stations are sorted by postmile - stations = fiftyfiveS.stations; - stationsPostmiles.clear(); - for(Station station : stations) - { - stationsPostmiles.add(station.postmile); - } - expectedStationsPostmiles.clear(); - expectedStationsPostmiles.add(new Double(31.6)); - expectedStationsPostmiles.add(new Double(32.25)); - expectedStationsPostmiles.add(new Double(33)); + expectedStationsPostmiles.add(new Double(0.9)); + expectedStationsPostmiles.add(new Double(1.26)); + expectedStationsPostmiles.add(new Double(1.49)); + for(int i = 0; i < 3; i++) {