Changeset 653 in tmcsimulator for trunk/test


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/test/tmcsim
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • 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 
Note: See TracChangeset for help on using the changeset viewer.