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

Timestamp:

07/03/2016 07:27:17 AM (10 years ago)

Author:

jdalbey

Message:

ParamicsCommunicator?.java revised to simplify system testing

Location:

trunk/test/tmcsim/cadsimulator

Files:

• SystemConsoleTest.java (modified) (2 diffs)
• SystemTest.java (modified) (3 diffs)
• VisibleSystemDemoDriver.java (modified) (2 diffs)

trunk/test/tmcsim/cadsimulator/SystemConsoleTest.java

@@ -16 +16 @@
 import tmcsim.common.ScriptException;
 import tmcsim.common.SimulationException;
-import tmcsim.paramicscommunicator.PComm;
+import tmcsim.paramicscommunicator.ParamicsCommunicator;
 import tmcsim.paramicscommunicator.gui.ParamicsCommunicatorGUI;
 import tmcsim.simulationmanager.SimulationManager;
@@ -58 +58 @@
         }
 
-        PComm pc = null;
-        pc = new PComm("config/testConfig/paramics_communicator_config.properties");
+        ParamicsCommunicator pc = null;
+        pc = new ParamicsCommunicator("config/testConfig/paramics_communicator_config.properties");
         ParamicsCommunicatorGUI theGUI = new ParamicsCommunicatorGUI();
         pc.setGUI(theGUI);

trunk/test/tmcsim/cadsimulator/SystemTest.java

@@ -12 +12 @@
 import tmcsim.common.ScriptException;
 import tmcsim.common.SimulationException;
-import tmcsim.paramicscommunicator.PComm;
 import tmcsim.paramicscommunicator.ParamicsCommunicator;
 import tmcsim.paramicscommunicator.gui.ParamicsCommunicatorGUI;
@@ -28 +27 @@
     SimulationManager simMgrApp;
     CADSimulator engine;
-    ParamicsCommunicator paramicscomm;
+//    ParamicsCommunicator paramicscomm;
 
     public SystemTest(String testName)
@@ -72 +71 @@
         assertEquals("network id should be None", "None", mainPanel.getTextBox("networkLoadedTF").getText().trim());
 
-        PComm pc = null;
-        pc = new PComm("config/testConfig/paramics_communicator_config.properties");
+        ParamicsCommunicator pc = null;
+        pc = new ParamicsCommunicator("config/testConfig/paramics_communicator_config.properties");
         ParamicsCommunicatorGUI theGUI = new ParamicsCommunicatorGUI();
         pc.setGUI(theGUI);

trunk/test/tmcsim/cadsimulator/VisibleSystemDemoDriver.java

@@ -11 +11 @@
 import tmcsim.common.ScriptException;
 import tmcsim.common.SimulationException;
-import tmcsim.paramicscommunicator.PComm;
+import tmcsim.paramicscommunicator.ParamicsCommunicator;
 import tmcsim.paramicscommunicator.gui.ParamicsCommunicatorGUI;
 import tmcsim.simulationmanager.SimulationManager;
@@ -47 +47 @@
         // UISpec will complain about an uncaught window appearing.
 
-        PComm pc = null;
-        pc = new PComm("config/testConfig/paramics_communicator_config.properties");
+        ParamicsCommunicator pc = null;
+        pc = new ParamicsCommunicator("config/testConfig/paramics_communicator_config.properties");
         ParamicsCommunicatorGUI theGUI = new ParamicsCommunicatorGUI();
         pc.setGUI(theGUI);