Index: /trunk/IDE_metadata/NetBeans/TMCSim/nbproject/project.properties =================================================================== --- /trunk/IDE_metadata/NetBeans/TMCSim/nbproject/project.properties (revision 650) +++ /trunk/IDE_metadata/NetBeans/TMCSim/nbproject/project.properties (revision 653) @@ -1,2 +1,3 @@ +auxiliary.org-netbeans-spi-editor-hints-projects.perProjectHintSettingsFile=nbproject/cfg_hints.xml #Fri Oct 06 15:14:08 PDT 2017 excludes= @@ -5,8 +6,27 @@ file.reference.trunk-webapps=../../../webapps file.reference.xercesImpl.jar=../../../lib/xercesImpl.jar +jar.archive.disabled=${jnlp.enabled} +jar.index=${jnlp.enabled} javac.deprecation=false file.reference.jaco-mp3-player-0.9.3.jar=../../../lib/jaco-mp3-player-0.9.3.jar build.test.results.dir=${build.dir}/test/results javac.external.vm=false +jnlp.codebase.type=no.codebase +jnlp.descriptor=application +jnlp.enabled=false +jnlp.mixed.code=default +jnlp.offline-allowed=false +jnlp.signed=false +jnlp.signing= +jnlp.signing.alias= +jnlp.signing.keystore= +# Optional override of default Application-Library-Allowable-Codebase attribute identifying the locations where your signed RIA is expected to be found. +manifest.custom.application.library.allowable.codebase= +# Optional override of default Caller-Allowable-Codebase attribute identifying the domains from which JavaScript code can make calls to your RIA without security prompts. +manifest.custom.caller.allowable.codebase= +# Optional override of default Codebase manifest attribute, use to prevent RIAs from being repurposed +manifest.custom.codebase= +# Optional override of default Permissions manifest attribute (supported values: sandbox, all-permissions) +manifest.custom.permissions= run.classpath=\ ${javac.classpath}:\ Index: /trunk/webapps/dynamicdata/CADcomments.log =================================================================== --- /trunk/webapps/dynamicdata/CADcomments.log (revision 650) +++ /trunk/webapps/dynamicdata/CADcomments.log (revision 653) @@ -1,1 +1,2 @@ CAD Log, Simulation Paused. +CAD Log, Simulation Paused. Index: /trunk/webapps/dynamicdata/unifiedlog.csv =================================================================== --- /trunk/webapps/dynamicdata/unifiedlog.csv (revision 650) +++ /trunk/webapps/dynamicdata/unifiedlog.csv (revision 653) @@ -1,21 +1,19 @@ -00:07:26, CMS Activated,N SR-55 5.38 Baker Street, 'DRIVE SAFE:::::' -00:07:26, CMS Activated,N I-405 15.18 MAGNOLIA ST, 'SLOW FOR THE::CONE ZONE:ROAD WORK:AHEAD:' -00:07:26, CMS Activated,S SR-55 8.64 WARNER AVE, 'ACCIDENT AHEAD:::::' -00:07:26, CMS Activated,S I-405 4.06 JEFFREY, 'SLOW TRAFFIC:AHEAD::::' -00:07:26, HAR Activated,WPMW407 1620 AM, 'NOW IS THE TIME FOR ALL GOOD MEN TO COME TO THE AID OF THEIR COUNTRY ASK NOT WHAT YOUR COUNTRY CAN DO FOR YOU ASK WHAT YOU CAN DO FOR YOUR COUNTRY.' -00:07:26, HAR Activated,KNNN868 1620 AM, 'SAMPLE HAR MESSAGE' -00:07:26, CAD Log, Simulation Started at 2 Sep 2022 15:34:26 with incidents 100 187 188 189 190 191 -00:07:26, CAD Log, Simulation Paused. -00:07:26, Activity Log,Ha Khanh Duy,001 Per 32-1 NB rte 405 blocked -00:07:26, Activity Log,Gross Angelo,001 HCC NOTIFIED -00:07:26, Activity Log,Gross Angelo,001 32-1 Vehicle Disabled S 55@ 405 1308 hours -00:07:26, Activity Log,Smith Bob,021 10-98 Assignment Completed 75-1 -00:07:26, Activity Log,Jones Mary,021 10-98 Let's get pizza. 75-1 -00:07:26, Activity Log,Tsu Lao,021 10-97 Tomatoes everywhere. 75-1 -00:07:26, Activity Log,Barry Dave,021 10-97 Tribbles everywhere. 75-1 -00:07:26, Activity Log,Jones Mary,021 10-97 Doritos everywhere. 75-1 -00:07:26, Activity Log,Bailey Mary,001 Incident Created -00:07:26, Activity Log,Hockaday Neil,002 Incident Created -00:07:26, Activity Log,Quan Ally,002 Incident Created -00:07:26, Activity Log,Buck Joe,002 Incident Created -00:07:26, HAR Updated, KNNN868 1620 AM, 'SAMPLE HAR MESSAGE SAMPLE HAR MESSAGE SAMPLE HAR MESSAGE SAMPLE HAR MESSAGE' +00:00:01, CMS Activated,N SR-55 5.38 Baker Street, 'DRIVE SAFE:::::' +00:00:01, CMS Activated,N I-405 15.18 MAGNOLIA ST, 'SLOW FOR THE::CONE ZONE:ROAD WORK:AHEAD:' +00:00:01, CMS Activated,S SR-55 8.64 WARNER AVE, 'ACCIDENT AHEAD:::::' +00:00:01, CMS Activated,S I-405 4.06 JEFFREY, 'SLOW TRAFFIC:AHEAD::::' +00:00:01, HAR Activated,WPMW407 1620 AM, 'NOW IS THE TIME FOR ALL GOOD MEN TO COME TO THE AID OF THEIR COUNTRY ASK NOT WHAT YOUR COUNTRY CAN DO FOR YOU ASK WHAT YOU CAN DO FOR YOUR COUNTRY.' +00:00:01, HAR Activated,KNNN868 1620 AM, 'SAMPLE HAR MESSAGE SAMPLE HAR MESSAGE SAMPLE HAR MESSAGE SAMPLE HAR MESSAGE' +00:00:01, CAD Log, Simulation Paused. +00:00:01, Activity Log,Ha Khanh Duy,001 Per 32-1 NB rte 405 blocked +00:00:01, Activity Log,Gross Angelo,001 HCC NOTIFIED +00:00:01, Activity Log,Gross Angelo,001 32-1 Vehicle Disabled S 55@ 405 1308 hours +00:00:01, Activity Log,Smith Bob,021 10-98 Assignment Completed 75-1 +00:00:01, Activity Log,Jones Mary,021 10-98 Let's get pizza. 75-1 +00:00:01, Activity Log,Tsu Lao,021 10-97 Tomatoes everywhere. 75-1 +00:00:01, Activity Log,Barry Dave,021 10-97 Tribbles everywhere. 75-1 +00:00:01, Activity Log,Jones Mary,021 10-97 Doritos everywhere. 75-1 +00:00:01, Activity Log,Bailey Mary,001 Incident Created +00:00:01, Activity Log,Hockaday Neil,002 Incident Created +00:00:01, Activity Log,Quan Ally,002 Incident Created +00:00:01, Activity Log,Buck Joe,002 Incident Created Index: /trunk/test/tmcsim/cadsimulator/SystemTest.java =================================================================== --- /trunk/test/tmcsim/cadsimulator/SystemTest.java (revision 558) +++ /trunk/test/tmcsim/cadsimulator/SystemTest.java (revision 653) @@ -200,5 +200,5 @@ { } - simMgrWindow.getButton("Start").click(); + simMgrWindow.getButton("Resume").click(); try { Index: /trunk/test/tmcsim/cadsimulator/SystemConsoleTest.java =================================================================== --- /trunk/test/tmcsim/cadsimulator/SystemConsoleTest.java (revision 558) +++ /trunk/test/tmcsim/cadsimulator/SystemConsoleTest.java (revision 653) @@ -197,5 +197,5 @@ { } - simMgrWindow.getButton("Start").click(); + simMgrWindow.getButton("Resume").click(); try { Index: /trunk/test/tmcsim/cadsimulator/CADSimulatorConsoleTest.java =================================================================== --- /trunk/test/tmcsim/cadsimulator/CADSimulatorConsoleTest.java (revision 558) +++ /trunk/test/tmcsim/cadsimulator/CADSimulatorConsoleTest.java (revision 653) @@ -9,4 +9,5 @@ import java.util.logging.Logger; import junit.framework.TestCase; +import org.apache.commons.lang.StringUtils; import static org.mockito.Mockito.mock; import tmcsim.cadsimulator.viewer.CADConsoleViewer; @@ -74,4 +75,5 @@ { String result = sw.toString().trim(); + System.out.println(""+result); result = result.replaceAll("\n", ","); String fullExpect = expect.trim(); @@ -221,5 +223,6 @@ + "Network Loaded : None\n" + "-- Info Messages --\n" - + ". = Console Info Message.\n" + + ". = Console Info Message." + + "tmcsim.cadsimulator.Coordinator.copyXMLfile = Loaded script copied to webapps/dynamicdata/incident_script.xml\n" + "-- Error Messages --\n" + "Someclass.Somemethod = Sample error message.\n"; @@ -233,5 +236,6 @@ + "Network Loaded : None\n" + "-- Info Messages --\n" - + ". = Console Info Message.\n" + + ". = Console Info Message." + + "tmcsim.cadsimulator.Coordinator.copyXMLfile = Loaded script copied to webapps/dynamicdata/incident_script.xml\n" + "-- Error Messages --\n" + "Someclass.Somemethod = Sample error message.\n"; @@ -240,5 +244,5 @@ String autoloadScriptname = kScenarioFolder+"/one-incident.xml"; app.theCoordinator.loadScriptFile(new File(autoloadScriptname)); - pause(500); + pause(2000); verify("Status should be 'ready'", expected8); // startSimulation to put status at Running Index: /trunk/test/tmcsim/highwaymodel/HighwaysTest.java =================================================================== --- /trunk/test/tmcsim/highwaymodel/HighwaysTest.java (revision 422) +++ /trunk/test/tmcsim/highwaymodel/HighwaysTest.java (revision 653) @@ -31,5 +31,5 @@ PrintWriter writer = null; try { - writer = new PrintWriter(new FileWriter("test/atmsdriver/postmiles1.txt")); + writer = new PrintWriter(new FileWriter("/tmp/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 +37,5 @@ writer.close(); - writer = new PrintWriter(new FileWriter("test/atmsdriver/postmiles2.txt")); + writer = new PrintWriter(new FileWriter("/tmp/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 +47,5 @@ writer.close(); - writer = new PrintWriter(new FileWriter("test/atmsdriver/postmiles3.txt")); + writer = new PrintWriter(new FileWriter("/tmp/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 +63,9 @@ protected void tearDown() throws Exception { super.tearDown(); - Path path = FileSystems.getDefault().getPath("test/atmsdriver", "postmiles1.txt"); + Path path = FileSystems.getDefault().getPath("/tmp/", "postmiles1.txt"); Files.delete(path); - path = FileSystems.getDefault().getPath("test/atmsdriver", "postmiles2.txt"); + path = FileSystems.getDefault().getPath("/tmp/", "postmiles2.txt"); Files.delete(path); - path = FileSystems.getDefault().getPath("test/atmsdriver", "postmiles3.txt"); + path = FileSystems.getDefault().getPath("/tmp/", "postmiles3.txt"); Files.delete(path); } @@ -74,5 +74,5 @@ System.out.println("test FindStation()"); Highways highways = new Highways( - "test/atmsdriver/postmiles1.txt"); + "/tmp/postmiles1.txt"); assertTrue(null != highways.findStation(5, DIRECTION.SOUTH, 0.9)); assertTrue(null != highways.findStation(5, DIRECTION.SOUTH, 1.49)); @@ -86,5 +86,5 @@ System.out.println("toString"); Highways highways = new Highways( - "test/atmsdriver/postmiles2.txt"); + "/tmp/postmiles2.txt"); highways.getHighwayByRouteNumber(5).stations.get(0).loops.get(0).vol = 1; String result = highways.toString(); @@ -108,5 +108,5 @@ System.out.println("toJson"); Highways highways = new Highways( - "test/atmsdriver/postmiles1.txt"); + "/tmp/postmiles1.txt"); String result = highways.toJson(); System.out.println(result); @@ -130,5 +130,5 @@ System.out.println("stationSort"); Highways highways = new Highways( - "test/atmsdriver/postmiles3.txt"); + "/tmp/postmiles3.txt"); String result = highways.toJson(); JSONParser parser = new JSONParser(); @@ -155,5 +155,5 @@ System.out.println("routeSort"); Highways highways = new Highways( - "test/atmsdriver/postmiles3.txt"); + "/tmp/postmiles3.txt"); String result = highways.toJson(); JSONParser parser = new JSONParser(); @@ -180,5 +180,5 @@ System.out.println("apply color"); Highways highways = new Highways( - "test/atmsdriver/postmiles1.txt"); + "/tmp/postmiles1.txt"); highways.applyColorToHighwayStretch(5, Station.DIRECTION.SOUTH, 0.9, 2.0, LoopDetector.DOTCOLOR.RED); Index: /trunk/test/tmcsim/highwaymodel/LoadHighwaysTest.java =================================================================== --- /trunk/test/tmcsim/highwaymodel/LoadHighwaysTest.java (revision 422) +++ /trunk/test/tmcsim/highwaymodel/LoadHighwaysTest.java (revision 653) @@ -28,10 +28,10 @@ PrintWriter writer = null; try { - writer = new PrintWriter(new FileWriter("test/atmsdriver/postmiles1.txt")); + writer = new PrintWriter(new FileWriter("/tmp/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 = new PrintWriter(new FileWriter("/tmp/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"); @@ -49,7 +49,7 @@ protected void tearDown() throws Exception { super.tearDown(); - Path path = FileSystems.getDefault().getPath("test/atmsdriver", "postmiles1.txt"); + Path path = FileSystems.getDefault().getPath("/tmp", "postmiles1.txt"); Files.delete(path); - path = FileSystems.getDefault().getPath("test/atmsdriver", "postmiles3.txt"); + path = FileSystems.getDefault().getPath("/tmp", "postmiles3.txt"); Files.delete(path); } @@ -61,5 +61,5 @@ System.out.println("testLoadHighways"); Highways highways = new Highways( - "test/atmsdriver/postmiles1.txt"); + "/tmp/postmiles1.txt"); // Test for correct number of highways @@ -97,5 +97,5 @@ System.out.println("testLoadHighways2"); Highways highways = new Highways( - "test/atmsdriver/postmiles3.txt"); + "/tmp/postmiles3.txt"); // Test for correct number of highways