Changeset 653 in tmcsimulator for trunk


Ignore:
Timestamp:
09/08/2022 02:22:57 PM (4 years ago)
Author:
jdalbey
Message:

Update unit tests to correct changes in display messages, directory paths, and button names.

Location:
trunk
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/IDE_metadata/NetBeans/TMCSim/nbproject/project.properties

    r650 r653  
     1auxiliary.org-netbeans-spi-editor-hints-projects.perProjectHintSettingsFile=nbproject/cfg_hints.xml 
    12#Fri Oct 06 15:14:08 PDT 2017 
    23excludes= 
    … …  
    56file.reference.trunk-webapps=../../../webapps 
    67file.reference.xercesImpl.jar=../../../lib/xercesImpl.jar 
     8jar.archive.disabled=${jnlp.enabled} 
     9jar.index=${jnlp.enabled} 
    710javac.deprecation=false 
    811file.reference.jaco-mp3-player-0.9.3.jar=../../../lib/jaco-mp3-player-0.9.3.jar 
    912build.test.results.dir=${build.dir}/test/results 
    1013javac.external.vm=false 
     14jnlp.codebase.type=no.codebase 
     15jnlp.descriptor=application 
     16jnlp.enabled=false 
     17jnlp.mixed.code=default 
     18jnlp.offline-allowed=false 
     19jnlp.signed=false 
     20jnlp.signing= 
     21jnlp.signing.alias= 
     22jnlp.signing.keystore= 
     23# Optional override of default Application-Library-Allowable-Codebase attribute identifying the locations where your signed RIA is expected to be found. 
     24manifest.custom.application.library.allowable.codebase= 
     25# Optional override of default Caller-Allowable-Codebase attribute identifying the domains from which JavaScript code can make calls to your RIA without security prompts. 
     26manifest.custom.caller.allowable.codebase= 
     27# Optional override of default Codebase manifest attribute, use to prevent RIAs from being repurposed 
     28manifest.custom.codebase= 
     29# Optional override of default Permissions manifest attribute (supported values: sandbox, all-permissions) 
     30manifest.custom.permissions= 
    1131run.classpath=\ 
    1232    ${javac.classpath}:\ 

  • trunk/test/tmcsim/cadsimulator/CADSimulatorConsoleTest.java

    r558 r653  
    99import java.util.logging.Logger; 
    1010import junit.framework.TestCase; 
     11import org.apache.commons.lang.StringUtils; 
    1112import static org.mockito.Mockito.mock; 
    1213import tmcsim.cadsimulator.viewer.CADConsoleViewer; 
    … …  
    7475    { 
    7576        String result = sw.toString().trim(); 
     77        System.out.println(""+result); 
    7678        result = result.replaceAll("\n", ","); 
    7779        String fullExpect = expect.trim(); 
    … …  
    221223                + "Network Loaded              : None\n" 
    222224                + "-- Info Messages --\n" 
    223                 + ". = Console Info Message.\n" 
     225                + ". = Console Info Message." 
     226                + "tmcsim.cadsimulator.Coordinator.copyXMLfile = Loaded script copied to webapps/dynamicdata/incident_script.xml\n" 
    224227                + "-- Error Messages --\n" 
    225228                + "Someclass.Somemethod = Sample error message.\n"; 
    … …  
    233236                + "Network Loaded              : None\n" 
    234237                + "-- Info Messages --\n" 
    235                 + ". = Console Info Message.\n" 
     238                + ". = Console Info Message." 
     239                + "tmcsim.cadsimulator.Coordinator.copyXMLfile = Loaded script copied to webapps/dynamicdata/incident_script.xml\n" 
    236240                + "-- Error Messages --\n" 
    237241                + "Someclass.Somemethod = Sample error message.\n"; 
    … …  
    240244        String autoloadScriptname = kScenarioFolder+"/one-incident.xml"; 
    241245        app.theCoordinator.loadScriptFile(new File(autoloadScriptname)); 
    242         pause(500); 
     246        pause(2000); 
    243247        verify("Status should be 'ready'", expected8); 
    244248        // startSimulation to put status at Running 

  • trunk/test/tmcsim/cadsimulator/SystemConsoleTest.java

    r558 r653  
    197197        { 
    198198        } 
    199         simMgrWindow.getButton("Start").click(); 
     199        simMgrWindow.getButton("Resume").click(); 
    200200        try 
    201201        { 

  • trunk/test/tmcsim/cadsimulator/SystemTest.java

    r558 r653  
    200200        { 
    201201        } 
    202         simMgrWindow.getButton("Start").click(); 
     202        simMgrWindow.getButton("Resume").click(); 
    203203        try 
    204204        { 

  • trunk/test/tmcsim/highwaymodel/HighwaysTest.java

    r422 r653  
    3131        PrintWriter writer = null; 
    3232        try { 
    33             writer = new PrintWriter(new FileWriter("test/atmsdriver/postmiles1.txt")); 
     33            writer = new PrintWriter(new FileWriter("/tmp/postmiles1.txt")); 
    3434            writer.println("5 S 0.9,33.408425,-117.599923,CALAFIA,0,0"); 
    3535            writer.println("5 N 1.24,33.413051,-117.601964,MAGDALENA,0,0"); 
    … …  
    3737            writer.close(); 
    3838 
    39             writer = new PrintWriter(new FileWriter("test/atmsdriver/postmiles2.txt")); 
     39            writer = new PrintWriter(new FileWriter("/tmp/postmiles2.txt")); 
    4040            writer.println("5 N 5.89,33.459637,-117.657305,ESTRELLA2,0,0"); 
    4141            writer.println("5 S 6.47,33.464281,-117.665631,SACRAMENTO,-0.56275,-0.826627"); 
    … …  
    4747            writer.close(); 
    4848 
    49             writer = new PrintWriter(new FileWriter("test/atmsdriver/postmiles3.txt")); 
     49            writer = new PrintWriter(new FileWriter("/tmp/postmiles3.txt")); 
    5050            writer.println("73 N 23.9,33.643656,-117.859875,BISON 2,0.976131,0.217185"); 
    5151            writer.println("55 S 6.88,33.697495,-117.862677,MACARTHU1,-0.710326,0.703873"); 
    … …  
    6363    protected void tearDown() throws Exception { 
    6464        super.tearDown(); 
    65         Path path = FileSystems.getDefault().getPath("test/atmsdriver", "postmiles1.txt"); 
     65        Path path = FileSystems.getDefault().getPath("/tmp/", "postmiles1.txt"); 
    6666        Files.delete(path); 
    67         path = FileSystems.getDefault().getPath("test/atmsdriver", "postmiles2.txt"); 
     67        path = FileSystems.getDefault().getPath("/tmp/", "postmiles2.txt"); 
    6868        Files.delete(path); 
    69         path = FileSystems.getDefault().getPath("test/atmsdriver", "postmiles3.txt"); 
     69        path = FileSystems.getDefault().getPath("/tmp/", "postmiles3.txt"); 
    7070        Files.delete(path); 
    7171    } 
    … …  
    7474        System.out.println("test FindStation()"); 
    7575        Highways highways = new Highways( 
    76                 "test/atmsdriver/postmiles1.txt"); 
     76                "/tmp/postmiles1.txt"); 
    7777        assertTrue(null != highways.findStation(5, DIRECTION.SOUTH, 0.9)); 
    7878        assertTrue(null != highways.findStation(5, DIRECTION.SOUTH, 1.49)); 
    … …  
    8686        System.out.println("toString"); 
    8787        Highways highways = new Highways( 
    88                 "test/atmsdriver/postmiles2.txt"); 
     88                "/tmp/postmiles2.txt"); 
    8989        highways.getHighwayByRouteNumber(5).stations.get(0).loops.get(0).vol = 1; 
    9090        String result = highways.toString(); 
    … …  
    108108        System.out.println("toJson"); 
    109109        Highways highways = new Highways( 
    110                 "test/atmsdriver/postmiles1.txt"); 
     110                "/tmp/postmiles1.txt"); 
    111111        String result = highways.toJson(); 
    112112        System.out.println(result); 
    … …  
    130130        System.out.println("stationSort"); 
    131131        Highways highways = new Highways( 
    132                 "test/atmsdriver/postmiles3.txt"); 
     132                "/tmp/postmiles3.txt"); 
    133133        String result = highways.toJson(); 
    134134        JSONParser parser = new JSONParser(); 
    … …  
    155155        System.out.println("routeSort"); 
    156156        Highways highways = new Highways( 
    157                 "test/atmsdriver/postmiles3.txt"); 
     157                "/tmp/postmiles3.txt"); 
    158158        String result = highways.toJson(); 
    159159        JSONParser parser = new JSONParser(); 
    … …  
    180180        System.out.println("apply color"); 
    181181        Highways highways = new Highways( 
    182                 "test/atmsdriver/postmiles1.txt"); 
     182                "/tmp/postmiles1.txt"); 
    183183        highways.applyColorToHighwayStretch(5, Station.DIRECTION.SOUTH, 0.9, 2.0, 
    184184                LoopDetector.DOTCOLOR.RED); 

  • trunk/test/tmcsim/highwaymodel/LoadHighwaysTest.java

    r422 r653  
    2828        PrintWriter writer = null; 
    2929        try { 
    30             writer = new PrintWriter(new FileWriter("test/atmsdriver/postmiles1.txt")); 
     30            writer = new PrintWriter(new FileWriter("/tmp/postmiles1.txt")); 
    3131            writer.println("5 S 0.9,33.408425,-117.599923,CALAFIA,0,0"); 
    3232            writer.println("5 N 1.24,33.413051,-117.601964,MAGDALENA,0,0"); 
    3333            writer.println("5 S 1.49,33.416348,-117.603827,EL CAMINO REAL,0,0"); 
    3434            writer.close(); 
    35             writer = new PrintWriter(new FileWriter("test/atmsdriver/postmiles3.txt")); 
     35            writer = new PrintWriter(new FileWriter("/tmp/postmiles3.txt")); 
    3636            writer.println("73 N 23.9,33.643656,-117.859875,BISON 2,0.976131,0.217185"); 
    3737            writer.println("55 S 6.88,33.697495,-117.862677,MACARTHU1,-0.710326,0.703873"); 
    … …  
    4949    protected void tearDown() throws Exception { 
    5050        super.tearDown(); 
    51         Path path = FileSystems.getDefault().getPath("test/atmsdriver", "postmiles1.txt"); 
     51        Path path = FileSystems.getDefault().getPath("/tmp", "postmiles1.txt"); 
    5252        Files.delete(path); 
    53         path = FileSystems.getDefault().getPath("test/atmsdriver", "postmiles3.txt"); 
     53        path = FileSystems.getDefault().getPath("/tmp", "postmiles3.txt"); 
    5454        Files.delete(path); 
    5555    } 
    … …  
    6161        System.out.println("testLoadHighways"); 
    6262        Highways highways = new Highways( 
    63                 "test/atmsdriver/postmiles1.txt"); 
     63                "/tmp/postmiles1.txt"); 
    6464 
    6565        // Test for correct number of highways 
    … …  
    9797        System.out.println("testLoadHighways2"); 
    9898        Highways highways = new Highways( 
    99                 "test/atmsdriver/postmiles3.txt"); 
     99                "/tmp/postmiles3.txt"); 
    100100 
    101101        // Test for correct number of highways 

  • trunk/webapps/dynamicdata/CADcomments.log

    r650 r653  
    11CAD Log, Simulation Paused. 
     2CAD Log, Simulation Paused. 

  • trunk/webapps/dynamicdata/unifiedlog.csv

    r650 r653  
    1 00:07:26, CMS Activated,N SR-55  5.38 Baker Street, 'DRIVE SAFE:::::' 
    2 00:07:26, CMS Activated,N I-405 15.18 MAGNOLIA ST, 'SLOW FOR THE::CONE ZONE:ROAD WORK:AHEAD:' 
    3 00:07:26, CMS Activated,S SR-55  8.64 WARNER AVE, 'ACCIDENT AHEAD:::::' 
    4 00:07:26, CMS Activated,S I-405  4.06 JEFFREY, 'SLOW TRAFFIC:AHEAD::::' 
    5 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.' 
    6 00:07:26, HAR Activated,KNNN868 1620 AM, 'SAMPLE HAR MESSAGE' 
    7 00:07:26, CAD Log, Simulation Started at 2 Sep 2022 15:34:26 with incidents 100 187 188 189 190 191 
    8 00:07:26, CAD Log, Simulation Paused. 
    9 00:07:26, Activity Log,Ha Khanh Duy,001  Per 32-1 NB rte 405 blocked 
    10 00:07:26, Activity Log,Gross Angelo,001  HCC NOTIFIED 
    11 00:07:26, Activity Log,Gross Angelo,001  32-1 Vehicle Disabled S 55@ 405 1308 hours 
    12 00:07:26, Activity Log,Smith Bob,021 10-98 Assignment Completed 75-1 
    13 00:07:26, Activity Log,Jones Mary,021 10-98 Let's get pizza. 75-1 
    14 00:07:26, Activity Log,Tsu Lao,021 10-97 Tomatoes everywhere. 75-1 
    15 00:07:26, Activity Log,Barry Dave,021 10-97 Tribbles everywhere. 75-1 
    16 00:07:26, Activity Log,Jones Mary,021 10-97 Doritos everywhere. 75-1 
    17 00:07:26, Activity Log,Bailey Mary,001  Incident Created 
    18 00:07:26, Activity Log,Hockaday Neil,002  Incident Created 
    19 00:07:26, Activity Log,Quan Ally,002  Incident Created 
    20 00:07:26, Activity Log,Buck Joe,002  Incident Created 
    21 00:07:26, HAR Updated, KNNN868 1620 AM, 'SAMPLE HAR MESSAGE SAMPLE HAR MESSAGE SAMPLE HAR MESSAGE SAMPLE HAR MESSAGE' 
     100:00:01, CMS Activated,N SR-55  5.38 Baker Street, 'DRIVE SAFE:::::' 
     200:00:01, CMS Activated,N I-405 15.18 MAGNOLIA ST, 'SLOW FOR THE::CONE ZONE:ROAD WORK:AHEAD:' 
     300:00:01, CMS Activated,S SR-55  8.64 WARNER AVE, 'ACCIDENT AHEAD:::::' 
     400:00:01, CMS Activated,S I-405  4.06 JEFFREY, 'SLOW TRAFFIC:AHEAD::::' 
     500: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.' 
     600:00:01, HAR Activated,KNNN868 1620 AM, 'SAMPLE HAR MESSAGE SAMPLE HAR MESSAGE SAMPLE HAR MESSAGE SAMPLE HAR MESSAGE' 
     700:00:01, CAD Log, Simulation Paused. 
     800:00:01, Activity Log,Ha Khanh Duy,001  Per 32-1 NB rte 405 blocked 
     900:00:01, Activity Log,Gross Angelo,001  HCC NOTIFIED 
     1000:00:01, Activity Log,Gross Angelo,001  32-1 Vehicle Disabled S 55@ 405 1308 hours 
     1100:00:01, Activity Log,Smith Bob,021 10-98 Assignment Completed 75-1 
     1200:00:01, Activity Log,Jones Mary,021 10-98 Let's get pizza. 75-1 
     1300:00:01, Activity Log,Tsu Lao,021 10-97 Tomatoes everywhere. 75-1 
     1400:00:01, Activity Log,Barry Dave,021 10-97 Tribbles everywhere. 75-1 
     1500:00:01, Activity Log,Jones Mary,021 10-97 Doritos everywhere. 75-1 
     1600:00:01, Activity Log,Bailey Mary,001  Incident Created 
     1700:00:01, Activity Log,Hockaday Neil,002  Incident Created 
     1800:00:01, Activity Log,Quan Ally,002  Incident Created 
     1900:00:01, Activity Log,Buck Joe,002  Incident Created 
Note: See TracChangeset for help on using the changeset viewer.