Changeset 664 in tmcsimulator for trunk/test/tmcsim/cadsimulator

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/cadsimulator

Files:

• CADSimulatorConsoleDriver.java (modified) (1 diff)
• CADSimulatorGUITest.java (modified) (1 diff)
• SystemConsoleTest.java (modified) (2 diffs)
• SystemTest.java (modified) (3 diffs)
• VisibleSystemDemoDriver.java (deleted)
• viewer/CADConsoleViewerTest.java (modified) (1 diff)
• viewer/CADSimulatorViewModelTest.java (modified) (1 diff)

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();