Changeset 47 in tmcsimulator for trunk/test/tmcsim/cadsimulator/CADSimulatorGUITest.java

Timestamp:

06/28/2016 02:25:42 PM (10 years ago)

Author:

jdalbey

Message:

Merge 305 modifications into trunk.

File:

• trunk/test/tmcsim/cadsimulator/CADSimulatorGUITest.java (modified) (6 diffs)

trunk/test/tmcsim/cadsimulator/CADSimulatorGUITest.java

@@ -5 +5 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
-
 import static junit.framework.Assert.assertEquals;
 import static junit.framework.Assert.fail;
@@ -50 +49 @@
         removeMe.delete();
     }
-
-    /**
-     * Test of getCADTime method, of class CADSimulator.
-     */
-    public void testGetCADTime()
-    {
-        System.out.println("getCADTime");
-        String result = CADSimulator.getCADTime();
-        // Just test length for now
-        assertEquals(4, result.length());
-    }
-
-    /**
-     * Test of getCADDate method, of class CADSimulator.
-     */
-    public void testGetCADDate()
-    {
-        System.out.println("getCADDate");
-        String result = CADSimulator.getCADDate();
-        // Just test length for now
-        assertEquals(6, result.length());
-    }
     /**
      * Test of main method, of class CADSimulator.
@@ -79 +56 @@
     public void testConstructor() throws SimulationException, RemoteException, ScriptException
     {
+        System.out.println("CADSimulator constructor");
         CADSimulatorFixture.writeConfigData();
         CADSimulatorFixture.writedata("config.txt", configData);
-        System.out.println("CADSimulator constructor");
+        Window cadwindow = null;
+//        try
+//        {
+//            app = new CADSimulator("config.txt");
+//        } catch (Exception e)
+//        {
+//            fail("Couldn't launch CADSimulator" + e.getMessage());
+//        }
+
         System.setProperty("CONFIG_DIR", "config/testConfig");
-        Window cadwindow = null;
         if (System.getProperty("CONFIG_DIR") != null)
         {
@@ -100 +85 @@
                 }
             });
-        } else
+        }
+        else
         {
             fail("CONFIG_DIR system property not defined.");
         }
-        assertEquals("CAD Simulator", cadwindow.getTitle());
+
+        System.out.println("Tests for text fields.");
+        // 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:"));
         Panel mainPanel = cadwindow.getPanel("contentPane");
         TextBox txtStatus = mainPanel.getTextBox("simulationStatus");
-        assertEquals("No Script", txtStatus.getText());
+        assertEquals("simulation status should say No Script", "No Script", txtStatus.getText().trim());
         TextBox terminals = mainPanel.getTextBox("termConnectedTF");
-        assertEquals("0", terminals.getText().trim());
-        assertEquals("No", mainPanel.getTextBox("managerConnectedTF").getText().trim());
-        assertEquals("0:00:00", mainPanel.getTextBox("simulationClockLabel").getText());
+        assertEquals("should be 0 terminals", "0", terminals.getText().trim());
+        assertEquals("mgr connected should be no", "No", mainPanel.getTextBox("managerConnectedTF").getText().trim());
+        assertEquals("paramics connected should be no", "No", mainPanel.getTextBox("paramicsConnectedTF").getText().trim());
+        assertEquals("initial time should be 0:00:00", "0:00:00", mainPanel.getTextBox("simulationClockLabel").getText().trim());
 
-        CADClientInterface ci = new FakeClient();
+        CADClientInterface ci = mock(CADClientInterface.class);
         app.theCoordinator.registerForCallback(ci);
-        assertEquals("1", terminals.getText().trim());
+        assertEquals("should be 1 terminal", "1", terminals.getText().trim());
         app.theCoordinator.registerForCallback(ci);
-        assertEquals("2", terminals.getText().trim());
+        assertEquals("should be 2 terminals", "2", terminals.getText().trim());
 
         SimulationManagerInterface si = mock(SimulationManagerInterface.class);
+
         app.theCoordinator.registerForCallback(si);
-        assertEquals("Yes", mainPanel.getTextBox("managerConnectedTF").getText().trim());
+        assertEquals("mgr connected should be yes", "Yes", mainPanel.getTextBox("managerConnectedTF").getText().trim());
 
         Logger cadSimLogger = Logger.getLogger("tmcsim.cadsimulator");
         cadSimLogger.logp(Level.INFO, "", "", "Sample Info Message.");
 
+        System.out.println("Tests for message panes.");
         Panel infoPane = mainPanel.getPanel("infoMessagesPane");
         TextBox infoText = infoPane.getTextBox("infoMessagesTA");
-        assertEquals(". = Sample Info Message.", infoText.getText().trim());
+        assertEquals("wrong info msg text", ". = Sample Info Message.", infoText.getText().trim());
 
         cadSimLogger.logp(Level.SEVERE, "", "", "Sample Error Message.");
@@ -134 +127 @@
         Panel errPane = mainPanel.getPanel("errorMessagesPane");
         TextBox errText = errPane.getTextBox("errorMessagesTA");
-        assertEquals(". = Sample Error Message.", errText.getText().trim());
+        assertEquals("wrong error msg text", ". = Sample Error Message.", errText.getText().trim());
 
+        System.out.println("Tests for status changes.");
         app.theCoordinator.setParamicsStatus(CADEnums.PARAMICS_STATUS.CONNECTED);
         CADSimulatorFixture.pause(500);
-        assertEquals("Yes", mainPanel.getTextBox("paramicsConnectedTF").getText().trim());
-        assertEquals("None", mainPanel.getTextBox("networkLoadedTF").getText().trim());
+        assertEquals("paramics connected should be yes", "Yes", mainPanel.getTextBox("paramicsConnectedTF").getText().trim());
+        assertEquals("network id should be None", "None", mainPanel.getTextBox("networkLoadedTF").getText().trim());
 
 //        app.theCoordinator.setScriptStatus(CADEnums.SCRIPT_STATUS.SCRIPT_RUNNING);
@@ -148 +142 @@
         app.theCoordinator.loadScriptFile(new File(autoloadScriptname));
         // The status should now say Ready
-        assertEquals("Ready", mainPanel.getTextBox("simulationStatus").getText().trim());
+        assertEquals("sim status should be ready", "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());
+        CADSimulatorFixture.pause(900);
+        assertEquals("sim status should be running", "Running", mainPanel.getTextBox("simulationStatus").getText().trim());
+        assertEquals("sim time should be 0:00:01", "0:00:01", mainPanel.getTextBox("simulationClockLabel").getText().trim());
 
         ParamicsSimulationManager psm = mock(ParamicsSimulationManager.class);
         when(psm.isConnected()).thenReturn(Boolean.TRUE);
+        when(psm.getParamicsNetworkLoaded()).thenReturn(1); // provide the network ID to return
         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
-        {
-        }
+        // this will tell the model it has a new network ID
+        app.theCoordinator.setParamicsStatus(CADEnums.PARAMICS_STATUS.LOADED);
+        CADSimulatorFixture.pause(500);
+        assertEquals("network id should be 1", "1", mainPanel.getTextBox("networkLoadedTF").getText().trim());
+        //mainPanel.getMenu().getItem("Exit").click();
+        boolean breakpoint = true;
     }
 }