Index: trunk/test/tmcsim/cadsimulator/CADSimulatorConsoleTest.java =================================================================== --- trunk/test/tmcsim/cadsimulator/CADSimulatorConsoleTest.java (revision 653) +++ trunk/test/tmcsim/cadsimulator/CADSimulatorConsoleTest.java (revision 655) @@ -30,5 +30,14 @@ private CADConsoleViewer console; private StringWriter sw; - + // Setup a path for temp files + static String tmpPath = "/tmp/";// default path is for linux + static + { + String myOs = System.getProperty("os.name").toLowerCase(); + if (myOs.indexOf("win") >= 0) + { + tmpPath = "C:/TEMP/"; // alt path for Windows + } + } public CADSimulatorConsoleTest(String testName) { @@ -70,7 +79,7 @@ /** - * compare StringWriter contents against expected + * obsolete: compare StringWriter contents against expected */ - private void verify(String msg, String expect) + private void verify0(String msg, String expect) { String result = sw.toString().trim(); @@ -85,5 +94,20 @@ assertTrue(msg + ": " + result, match); } - + /** compare StringWriter contents against expected + * @param expected contains just the most recent lines of output + * @param errmsg message to be displayed if test fails + * improved to verify line by line + */ + private void verify(String errmsg, String expect) + { + String[] results = sw.toString().trim().split("\n"); // split into lines + String[] expecteds = expect.trim().split("\n"); + // Work backwards from the most recent line of output + for (int item=expecteds.length-1; item >= 0; item--) + { + //System.out.println("Verifying "+expecteds[item]+" against "+results[item]); + assertEquals(errmsg + " line "+item, expecteds[item], results[item]); + } + } public static void pause(int millis) { @@ -134,4 +158,5 @@ CADClientInterface ci = mock(CADClientInterface.class); app.theCoordinator.registerForCallback(ci); + pause(500); verify("connected 1 terminal output incorrect: ", expected2); String expected3 = @@ -286,5 +311,5 @@ +"FEPSim_IP_addr = localhost\n" +"Output_Destination = Console\n" - +"Highway_Status_File = /tmp/highway_status.json\n"; + +"Highway_Status_File = "+tmpPath+"highway_status.json\n"; static final String paramicsData = "ParamicsCommHost = 127.0.0.1\n" + "ParamicsCommPort = 4450\n" Index: trunk/test/tmcsim/highwaymodel/HighwaysTest.java =================================================================== --- trunk/test/tmcsim/highwaymodel/HighwaysTest.java (revision 653) +++ trunk/test/tmcsim/highwaymodel/HighwaysTest.java (revision 655) @@ -22,4 +22,16 @@ public class HighwaysTest extends TestCase { + // Setup a path for temp files + static String tmpPath = "/tmp/";// default path is for linux + static + { + String myOs = System.getProperty("os.name").toLowerCase(); + if (myOs.indexOf("win") >= 0) + { + tmpPath = "C:/TEMP/"; // alt path for Windows + } + } + + public HighwaysTest(String testName) { super(testName); @@ -31,5 +43,5 @@ PrintWriter writer = null; try { - writer = new PrintWriter(new FileWriter("/tmp/postmiles1.txt")); + writer = new PrintWriter(new FileWriter(tmpPath + "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"); @@ -37,5 +49,5 @@ writer.close(); - writer = new PrintWriter(new FileWriter("/tmp/postmiles2.txt")); + writer = new PrintWriter(new FileWriter(tmpPath + "postmiles2.txt")); writer.println("5 N 5.89,33.459637,-117.657305,ESTRELLA2,0,0"); writer.println("5 S 6.47,33.464281,-117.665631,SACRAMENTO,-0.56275,-0.826627"); @@ -47,5 +59,5 @@ writer.close(); - writer = new PrintWriter(new FileWriter("/tmp/postmiles3.txt")); + writer = new PrintWriter(new FileWriter(tmpPath + "/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"); @@ -63,9 +75,9 @@ protected void tearDown() throws Exception { super.tearDown(); - Path path = FileSystems.getDefault().getPath("/tmp/", "postmiles1.txt"); + Path path = FileSystems.getDefault().getPath(tmpPath, "postmiles1.txt"); Files.delete(path); - path = FileSystems.getDefault().getPath("/tmp/", "postmiles2.txt"); + path = FileSystems.getDefault().getPath(tmpPath, "postmiles2.txt"); Files.delete(path); - path = FileSystems.getDefault().getPath("/tmp/", "postmiles3.txt"); + path = FileSystems.getDefault().getPath(tmpPath, "postmiles3.txt"); Files.delete(path); } @@ -74,5 +86,5 @@ System.out.println("test FindStation()"); Highways highways = new Highways( - "/tmp/postmiles1.txt"); + tmpPath + "postmiles1.txt"); assertTrue(null != highways.findStation(5, DIRECTION.SOUTH, 0.9)); assertTrue(null != highways.findStation(5, DIRECTION.SOUTH, 1.49)); @@ -86,5 +98,5 @@ System.out.println("toString"); Highways highways = new Highways( - "/tmp/postmiles2.txt"); + tmpPath + "postmiles2.txt"); highways.getHighwayByRouteNumber(5).stations.get(0).loops.get(0).vol = 1; String result = highways.toString(); @@ -108,5 +120,5 @@ System.out.println("toJson"); Highways highways = new Highways( - "/tmp/postmiles1.txt"); + tmpPath + "postmiles1.txt"); String result = highways.toJson(); System.out.println(result); @@ -130,5 +142,5 @@ System.out.println("stationSort"); Highways highways = new Highways( - "/tmp/postmiles3.txt"); + tmpPath + "postmiles3.txt"); String result = highways.toJson(); JSONParser parser = new JSONParser(); @@ -155,5 +167,5 @@ System.out.println("routeSort"); Highways highways = new Highways( - "/tmp/postmiles3.txt"); + tmpPath + "postmiles3.txt"); String result = highways.toJson(); JSONParser parser = new JSONParser(); @@ -180,5 +192,5 @@ System.out.println("apply color"); Highways highways = new Highways( - "/tmp/postmiles1.txt"); + tmpPath + "postmiles1.txt"); highways.applyColorToHighwayStretch(5, Station.DIRECTION.SOUTH, 0.9, 2.0, LoopDetector.DOTCOLOR.RED); Index: trunk/src/tmcsim/highwaymodel/Highways.java =================================================================== --- trunk/src/tmcsim/highwaymodel/Highways.java (revision 457) +++ trunk/src/tmcsim/highwaymodel/Highways.java (revision 655) @@ -74,7 +74,9 @@ } } + scanner.close(); }catch (FileNotFoundException e) { e.printStackTrace(); } + // get the set of highway numbers Set hwyKeys = highwayMap.keySet(); Index: trunk/src/tmcsim/cadsimulator/viewer/model/CADSimulatorStatus.java =================================================================== --- trunk/src/tmcsim/cadsimulator/viewer/model/CADSimulatorStatus.java (revision 44) +++ trunk/src/tmcsim/cadsimulator/viewer/model/CADSimulatorStatus.java (revision 655) @@ -89,5 +89,5 @@ /** - * Method is called when a CAD Client disconnects from the CAD Simulator. + * Method is called when a CAD Client connects to the Server. * The displayed number of connected clients is incremented by one. */