Changeset 26 in tmcsimulator for trunk/test

Timestamp:

04/26/2016 06:50:09 PM (10 years ago)

Author:

jdalbey

Message:

CADSimulatorNetworkTest added, modifed ParamicsCommunicator? to check for a property if it should run without a GUI (for testing).

Location:

trunk/test/tmcsim/cadsimulator

Files:

• CADSimulatorFixture.java (modified) (3 diffs)
• CADSimulatorNetworkTest.java (copied) (copied from trunk/test/tmcsim/cadsimulator/CADSimulatorGUITest.java) (8 diffs)

trunk/test/tmcsim/cadsimulator/CADSimulatorFixture.java

@@ -34 +34 @@
             + "ATMSProperties         = empty.txt\n"
             + "MediaProperties        = empty.txt\n";
-    static final String paramicsData = "ParamicsCommHost       = 192.168.251.45\n"
+    static final String configpData = "ParamicsCommHost = 192.168.251.45\n"
             + "ParamicsCommPort       = 4450\n"
             + "IncidentUpdateInterval = 30\n"
@@ -42 +42 @@
             + "CameraStatusInterval   = 30\n"
             + "CameraStatusFile       = camera_status.xml\n";
+    static final String paramConfig    = "SocketPort=4450\n"
+            +"WorkingDirectory=.\nGUIvisible=false";
     static final String cardfileURL = "http://pastebin.com/raw/Yr26nfp7";
     static final String smallXMLURL = "http://pastebin.com/raw/Eqj2N5qD";
@@ -58 +60 @@
         System.setOut(ps);
         writedata("config.txt", configData);
-        writedata("pconfig.txt", paramicsData);
+        writedata("pconfig.txt", configpData);
+        writedata("pmcprops.txt", paramConfig);
         writedata("empty.txt", "");
         writeScriptfiles();

trunk/test/tmcsim/cadsimulator/CADSimulatorNetworkTest.java

@@ -16 +16 @@
 import tmcsim.interfaces.CADClientInterface;
 import tmcsim.interfaces.SimulationManagerInterface;
+import tmcsim.paramicscommunicator.ParamicsCommunicator;
 
 /**
@@ -22 +23 @@
  * @author jdalbey
  */
-public class CADSimulatorGUITest extends UISpecTestCase
+public class CADSimulatorNetworkTest extends UISpecTestCase
 {
 
@@ -34 +35 @@
             + "MediaProperties        = empty.txt\n";
 
-    public CADSimulatorGUITest(String testName)
+    public CADSimulatorNetworkTest(String testName)
     {
         super(testName);
@@ -47 +48 @@
         removeMe.delete();
         removeMe = new File("empty.txt");
+        removeMe.delete();
+        removeMe = new File("pmcprops.txt");
         removeMe.delete();
     }
@@ -111 +114 @@
         assertEquals("0:00:00", mainPanel.getTextBox("simulationClockLabel").getText());
 
-        CADClientInterface ci = new FakeClient();
+        CADClientInterface ci = mock (CADClientInterface.class);
         app.theCoordinator.registerForCallback(ci);
         assertEquals("1", terminals.getText().trim());
@@ -121 +124 @@
         assertEquals("Yes", mainPanel.getTextBox("managerConnectedTF").getText().trim());
 
-        Logger cadSimLogger = Logger.getLogger("tmcsim.cadsimulator");
-        cadSimLogger.logp(Level.INFO, "", "", "Sample Info Message.");
-
-        Panel infoPane = mainPanel.getPanel("infoMessagesPane");
-        TextBox infoText = infoPane.getTextBox("infoMessagesTA");
-        assertEquals(". = Sample Info Message.", infoText.getText().trim());
-
-        cadSimLogger.logp(Level.SEVERE, "", "", "Sample Error Message.");
-
-        Panel errPane = mainPanel.getPanel("errorMessagesPane");
-        TextBox errText = errPane.getTextBox("errorMessagesTA");
-        assertEquals(". = Sample Error Message.", errText.getText().trim());
 
         app.theCoordinator.setParamicsStatus(CADEnums.PARAMICS_STATUS.CONNECTED);
@@ -139 +130 @@
         assertEquals("None", mainPanel.getTextBox("networkLoadedTF").getText().trim());
 
-//        app.theCoordinator.setScriptStatus(CADEnums.SCRIPT_STATUS.SCRIPT_RUNNING);
-//        assertEquals("Running", mainPanel.getTextBox("simulationStatus").getText().trim());
+String loadedXML = "<Paramics>\n"
+    + "<Network_Status>LOADED</Network_Status>"
+    + "<Network_ID>1</Network_ID>"
+    + "</Paramics>";
 
+//         Thread pmc = new Thread(new ParamicsCommunicator("pmcprops.txt"));
+//        pmc.start();
+//        pmc.stop();
+        /*
+         * Start Paramics Controller.
+         * app.theCoordinator.connectToParamics();
+        CADSimulatorFixture.pause(500);
+        assertEquals("Yes", mainPanel.getTextBox("paramicsConnectedTF").getText().trim());
+           theCoorInt.loadParamicsNetwork(networkID);
+         * Optional: assert Status is "Sending Network ID" in Sim Mgr
+         * When "
+         * paramics_status.xml becomes 
+<Paramics>
+<Network_Status>WARMING</Network_Status>
+<Network_ID>1</Network_ID>
+</Paramics>
+*          then Sim Mgr status becomes "Warming up"
+ When paramics_status.xml becomes loadedXML
+CADSimulatorFixture.writedata(loadedXML, "paramics_status.xml");
+pause()
+       then Sim MGr status becomes Network Loaded and
+ CADSimulator Netowrk Loaded field says "1".
+* 
+         */
+        ParamicsSimulationManager psm = mock(ParamicsSimulationManager.class);
+        when(psm.isConnected()).thenReturn(Boolean.TRUE);
+        app.theParamicsSimMgr = psm;
+        app.theCoordinator.loadParamicsNetwork(1);
         // Load a script file
         String autoloadScriptname = "scripts/one-incident.xml";
@@ -147 +168 @@
         // The status should now say Ready
         assertEquals("Ready", mainPanel.getTextBox("simulationStatus").getText().trim());
-
-        app.theCoordinator.startSimulation();
-        CADSimulatorFixture.pause(500);
-        assertEquals("Running", mainPanel.getTextBox("simulationStatus").getText().trim());
-        assertEquals("0:00:01", mainPanel.getTextBox("simulationClockLabel").getText());
-
-        ParamicsSimulationManager psm = mock(ParamicsSimulationManager.class);
-        when(psm.isConnected()).thenReturn(Boolean.TRUE);
-        app.theParamicsSimMgr = psm;
-        app.theCoordinator.loadParamicsNetwork(1);
-
-//        app.theViewer.dispose();
-//        Window confirmPopup = null;
-//        confirmPopup = WindowInterceptor.run(new Trigger()
-//        {
-//            public void run()
-//            {
-//                app.theViewer.closeViewer();
-//            }
-//        });
-//        confirmPopup.getButton("OK").click();
     }
 
-    class FakeClient implements CADClientInterface
-    {
-
-        @Override
-        public void refresh() throws RemoteException
-        {
-        }
-    }
 }