Changeset 664 in tmcsimulator for trunk/test

Timestamp:

09/14/2022 03:31:54 PM (4 years ago)

Author:

jdalbey

Message:

Multifile commit - revise source to match revisions to config filenames. Fix broken system tests. Fix defect #160.

Location:

trunk/test/tmcsim

Files:

• cadsimulator/CADSimulatorConsoleDriver.java (modified) (1 diff)
• cadsimulator/CADSimulatorGUITest.java (modified) (1 diff)
• cadsimulator/SystemConsoleTest.java (modified) (2 diffs)
• cadsimulator/SystemTest.java (modified) (3 diffs)
• cadsimulator/VisibleSystemDemoDriver.java (deleted)
• cadsimulator/viewer/CADConsoleViewerTest.java (modified) (1 diff)
• cadsimulator/viewer/CADSimulatorViewModelTest.java (modified) (1 diff)
• highwaymodel/ConsoleTrafficDriver.java (modified) (1 diff)
• highwaymodel/runtraffic.bash (modified) (1 diff)
• paramicslog/ParamicsLogFileHandlerTest.java (modified) (2 diffs)
• paramicslog/ParamicsLogRMITestSkeleton.java (modified) (2 diffs)
• simulationmanager/SimulationManagerSmokeTest.java (modified) (4 diffs)

trunk/test/tmcsim/cadsimulator/CADSimulatorConsoleDriver.java

@@ -31 +31 @@
             + "ParamicsProperties     = pconfig.txt\n"
             + "ATMSProperties         = empty.txt\n"
-            + "MediaProperties        = empty.txt\n";
+            + "MediaProperties        = empty.txt\n"
+            + "TrafficMgrProperties   = config/traffic_model_config/traffic_model_config.properties\n"
+            + "ElapsedTimeFile        = webapps/dynamicdata/sim_elapsedtime.json\n"
+            + "CADcommentsLog         = webapps/dynamicdata/CADcomments.log\n";
     static final String paramicsData = "ParamicsCommHost       = 192.168.251.45\n"
             + "ParamicsCommPort       = 4450\n"

trunk/test/tmcsim/cadsimulator/CADSimulatorGUITest.java

@@ -78 +78 @@
                     try
                     {
-                        app = new CADServer(System.getProperty("CONFIG_DIR") + System.getProperty("file.separator") + "cad_simulator_config.properties");
+                        app = new CADServer(System.getProperty("CONFIG_DIR") + System.getProperty("file.separator") + "cad_server.properties");
 
                     } catch (Exception e)

trunk/test/tmcsim/cadsimulator/SystemConsoleTest.java

@@ -53 +53 @@
         try
         {
-            engine = new CADServer("config/cad_simulator_console_config.properties");
+            engine = new CADServer("config/cad_server_console.properties");
         } catch (Exception e)
         {
@@ -74 +74 @@
                 try
                 {
-                    simMgrApp = new SimulationManager("config/sim_manager_systest_config.properties");
+                    simMgrApp = new SimulationManager("config/sim_manager.properties");
                 } catch (Exception ex)
                 {

trunk/test/tmcsim/cadsimulator/SystemTest.java

@@ -19 +19 @@
 /**
  * System test (include CADSimulator) with emulated Paramics Modeler NO ATMS
- * server captures GUI display using UISpec4J.
+ * server. Captures GUI display using UISpec4J.
  *
  * @author jdalbey
@@ -54 +54 @@
                 try
                 {
-                    engine = new CADServer("config/cad_simulator_config.properties");
+                    engine = new CADServer("config/cad_server.properties");
                 } catch (Exception e)
                 {
@@ -82 +82 @@
                 try
                 {
-                    simMgrApp = new SimulationManager("config/sim_manager_systest_config.properties");
+                    simMgrApp = new SimulationManager("config/sim_manager.properties");
                 } catch (Exception ex)
                 {

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

@@ -28 +28 @@
     {
         super.setUp();
-        console = new CADConsoleViewer("config/cad_simulator_config.properties");
+        console = new CADConsoleViewer("config/cad_server.properties");
         cadmodel = new CADSimulatorState();
         cadmodel.addObserver(console);

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

@@ -30 +30 @@
     {
         super.setUp();
-        viewer = new CADServerViewer("config/cad_simulator_config.properties");
+        viewer = new CADServerViewer("config/cad_server.properties");
         cadwindow = new Window(viewer);
         model = new CADSimulatorState();

trunk/test/tmcsim/highwaymodel/ConsoleTrafficDriver.java

@@ -19 +19 @@
 
 /**
- * A console application to drive the ATMS Server.
+ * A console application to drive the ATMS Server (is this really CPTMS now?).
  * Use for test driving the Highway Model.
  *

trunk/test/tmcsim/highwaymodel/runtraffic.bash

@@ -1 +1 @@
 #!/bin/bash
 
-java -DATMSDRIVER_PROPERTIES=config/console_driver_config.properties -jar deploy/ConsoleTrafficDriver.jar << EOF
+java -DATMSDRIVER_PROPERTIES=config/test_trafficdriver.properties -jar deploy/ConsoleTrafficDriver.jar << EOF
 5 S 10 24.0 Y
 A

trunk/test/tmcsim/paramicslog/ParamicsLogFileHandlerTest.java

@@ -33 +33 @@
         super.setUp();
     }
-    String propsfile = "config/paramics_communicator_logging.properties";
+    String propsfile = "config/logging_paramics_communicator.properties";
 
     /**
@@ -43 +43 @@
         try
         {
-            new CADServer("config/cad_simulator_console_config.properties");
+            new CADServer("config/cad_server_console.properties");
         } catch (Exception e)
         {

trunk/test/tmcsim/paramicslog/ParamicsLogRMITestSkeleton.java

@@ -34 +34 @@
         super.setUp();
     }
-    String propsfile = "config/paramics_communicator_logging.properties";
+    String propsfile = "config/logging_paramics_communicator.properties";
 
     /**
@@ -44 +44 @@
         try
         {
-            CADServer engine = new CADServer("config/cad_simulator_console_config.properties");
+            CADServer engine = new CADServer("config/cad_server_console.properties");
         } catch (Exception e)
         {

trunk/test/tmcsim/simulationmanager/SimulationManagerSmokeTest.java

@@ -3 +3 @@
 import java.awt.Component;
 import java.io.File;
+import java.util.Arrays;
 import javax.swing.JButton;
 import static junit.framework.Assert.assertEquals;
@@ -39 +40 @@
      * Call constructors for both classes
      */
-    public void testBothGUIs() throws ScriptException, SimulationException
+    public void testBothGUIs() throws ScriptException, SimulationException, InterruptedException
     {
         System.out.println("Smoke Test Sim Mgr & CADSimulator");
 
         Window cadwindow = null;
-        System.setProperty("CAD_SIM_PROPERTIES", "config/cad_simulator_smoketest_config.properties");
+        System.setProperty("CAD_SIM_PROPERTIES", "config/cad_server.properties"); 
         if (System.getProperty("CAD_SIM_PROPERTIES") != null)
         {
@@ -77 +78 @@
 
         Window simMgrWindow = null;
-        System.setProperty("SIM_MGR_PROPERTIES", "config/sim_manager_smoketest_config.properties");
+        System.setProperty("SIM_MGR_PROPERTIES", "config/sim_manager.properties");
         if (System.getProperty("SIM_MGR_PROPERTIES") != null)
         {
@@ -118 +119 @@
         // Click "Start"
         win.getButton("Start").click();
-        try
-        {
-            Thread.sleep(200);
-        } catch (Exception ex)
-        {
-            ex.printStackTrace();
-        }
+        Thread.sleep(200);
         assertEquals("Running", txtSimStatus.getText());
 
-        //List all available buttons
-        Component[] buttons = win.getSwingComponents(JButton.class);
-        for (Component comp : buttons)
-        {
-            System.out.println(comp);
-        }
+        java.util.ArrayList<String> expectedButtons = new java.util.ArrayList<String>(Arrays.asList("Load Script","Start","Pause","Reset","Connect to Paramics",
+                "Load Network","Reschedule","Trigger","Delete","Add New Incident","Divert Traffic"));
+        // Check for appearance of buttons in the GUI
         win.getButton("Load Script");
-        win.getButton("Pause");
-        win.getButton("Disconnect from Paramics");
         win.getButton("Reset");
-        win.getButton("Load Network");
+        win.getButton("Add New Incident");
+        win.getButton("Reschedule");
+        win.getButton("Trigger");
+        win.getButton("Delete");
+        //Find all available buttons - obsolete, replaced by stmts above
+//        Component[] buttons = win.getSwingComponents(JButton.class);
+//        java.util.List<Component> actualButtons = Arrays.asList(buttons);
+//        for (Component actualBtn: actualButtons)
+//        {
+//            if (actualBtn instanceof JButton)
+//            {
+//                String btnName = ((JButton) actualBtn).getText();
+//                if (btnName.length()>0)
+//                {
+//                    if (expectedButtons.contains(btnName))
+//                    {
+//                        expectedButtons.remove(btnName);
+//                    }
+//                    else
+//                    {
+//                        fail("GUI has an unexpected button: "+btnName);
+//                    }
+//                }
+//            }
+//        }
+//        if (expectedButtons.size() > 0)
+//        {
+//            fail("GUI is missing a button: "+expectedButtons);
+//        }
+
+        // Pause the simulation    
+        win.getButton("Pause").click();
+        Thread.sleep(200);
+        win.getButton("Resume");    // resume should appear when paused
         // Quit
         engine = null;