Changeset 228 in tmcsimulator for trunk/test

Timestamp:

11/06/2017 03:27:20 PM (8 years ago)

Author:

jdalbey

Message:

System Tests updated to work with new integrated Traffic Mgr. All system tests now passing.

Location:

trunk/test

Files:

• atmsdriver/model/HighwaysTest.java (modified) (1 diff)
• atmsdriver/model/LoadSadDotsTest.java (deleted)
• tmcsim/cadsimulator/CADSimulatorConsoleTest.java (modified) (2 diffs)
• tmcsim/cadsimulator/CADSimulatorGUITest.java (modified) (1 diff)
• tmcsim/cadsimulator/viewer/CADSimulatorViewModelTest.java (modified) (1 diff)
• tmcsim/simulationmanager/SimulationManagerSmokeTest.java (modified) (1 diff)

trunk/test/atmsdriver/model/HighwaysTest.java

@@ -86 +86 @@
         String result = highways.toString();
         System.out.println(result);
-        assertEquals(expToString, result);
-    }
-    String expToString = 
-        "241 ------------------------------------------------------------\n"
-       +"  5 @-------------------------------------------------------------------------------------------------------------------------------------------\n"
-       +"405 --------------------------------------------------------------------------------\n"
-       +"133 ----------------\n"
-       +"261 -----------------\n"
-       +" 22 ----------------------------------\n"
-       +" 55 ------------------------------------------\n"
-       +" 73 -----------------------------------------------------\n"
-       +" 57 ------------------------------------------\n"
-       +" 91 --------------------------------------------------------------\n"
-       +"605 ---\n";
+        assertTrue(result.startsWith(expToString1));
+    }
+    String expToString1 = 
+    "241 N -- ------ -- ------- -------------------------------------  \n" +
+"241 S   - --- --  --------- ------------------------------------  \n" +
+"  5 N  - - ------ ---  --- -- --- ----  - -- - -  -- - - -    -- -- - ---- -- -- --- - - -- -  ----- ----- --- -  - -- --  - - ---- - - - ------- \n" +
+"  5 S @--";
+
+   
 
     

trunk/test/tmcsim/cadsimulator/CADSimulatorConsoleTest.java

@@ -271 +271 @@
             + "ParamicsProperties     = pconfig.txt\n"
             + "ATMSProperties         = empty.txt\n"
+            + "TrafficMgrProperties   = tconfig.txt\n"
             + "MediaProperties        = empty.txt\n";
+    static final String trafficMgrData = "Highways_Map_File = config/vds_data/highways_fullmap.txt\n"
+            +"Events_File = config/vds_data/atmsBatchEvents.txt\n"
+            +"FEPSim_IP_addr = localhost\n"
+            +"Output_Destination = Console\n";
     static final String paramicsData = "ParamicsCommHost = 127.0.0.1\n"
             + "ParamicsCommPort       = 4450\n"
@@ -295 +300 @@
         // Redirect the standard output
 //        System.setOut(ps);
+        File cf = new File ("config.txt");
+        cf.delete();
         writedata("config.txt", configData);
+        writedata("tconfig.txt", trafficMgrData);
         writedata("pconfig.txt", paramicsData);
         writedata("empty.txt", "");

trunk/test/tmcsim/cadsimulator/CADSimulatorGUITest.java

@@ -94 +94 @@
         // Create a UISpec window from the CADSimulator's Viewer (gui)
 //        cadwindow = new Window((CADSimulatorViewer) app.theViewer);
-        assertTrue("Title bar incorrect", cadwindow.getTitle().startsWith("CAD Simulator revision:"));
+        assertTrue("Title bar incorrect", cadwindow.getTitle().startsWith("CAD Server revision:"));
         Panel mainPanel = cadwindow.getPanel("contentPane");
         TextBox txtStatus = mainPanel.getTextBox("simulationStatus");

trunk/test/tmcsim/cadsimulator/viewer/CADSimulatorViewModelTest.java

@@ -40 +40 @@
     {
         String actual;
-        assertTrue("Title bar incorrect", cadwindow.getTitle().trim().startsWith("CAD Simulator"));
+        assertTrue("Title bar incorrect", cadwindow.getTitle().trim().startsWith("CAD Server"));
         TextBox txtStatus = mainPanel.getTextBox("simulationStatus");
         actual = txtStatus.getText().trim();

trunk/test/tmcsim/simulationmanager/SimulationManagerSmokeTest.java

@@ -67 +67 @@
 
         // Check CAD Simulator appears with no script and nothing connected
-        assertTrue("Window title incorrect", cadwindow.getTitle().startsWith("CAD Simulator"));
+        assertTrue("Window title incorrect", cadwindow.getTitle().startsWith("CAD Server"));
         Panel mainPanel = cadwindow.getPanel("contentPane");
         TextBox txtStatus = mainPanel.getTextBox("simulationStatus");