Changeset 43 in tmcsimulator

Timestamp:

06/23/2016 11:34:59 AM (10 years ago)

Author:

jdalbey

Message:

ExitAction?.java Remove confirmation prompt from exiting Sim Mgr. Enhance Sim Mgr smoke test.

Location:

trunk

Files:

• IDE_metadata/NetBeans/TMCSim/nbproject/project.properties (modified) (2 diffs)
• src/tmcsim/simulationmanager/actions/ExitAction.java (modified) (1 diff)
• test/tmcsim/simulationmanager/SimulationManagerSmokeTest.java (modified) (8 diffs)

trunk/IDE_metadata/NetBeans/TMCSim/nbproject/project.properties

@@ -40 +40 @@
     ${file.reference.uispec4j-jdk17.jar}:\
     ${file.reference.mp3plugin.jar}:\
-    ${file.reference.mockito-1.10.19.jar}
+    ${file.reference.mockito-1.10.19.jar}:\
+    ${libs.junit_4.classpath}
 # Space-separated list of extra javac options
 javac.compilerargs=
@@ -51 +52 @@
     ${javac.classpath}:\
     ${build.classes.dir}:\
-    ${libs.junit.classpath}:\
-    ${libs.junit_4.classpath}
+    ${libs.junit.classpath}
 javac.test.processorpath=\
     ${javac.test.classpath}

trunk/src/tmcsim/simulationmanager/actions/ExitAction.java

@@ -2 +2 @@
 
 import java.awt.event.ActionEvent;
+import javax.swing.AbstractAction;
+import tmcsim.simulationmanager.SimulationManagerView;
 
-import javax.swing.AbstractAction;
-import javax.swing.JOptionPane;
-
-import tmcsim.simulationmanager.SimulationManagerView;
 /**
  * ExitAction is an AbstractAction that is used for exiting the Simulation
- * Manager application.  When the action is performed, the action prompts the 
- * user to confirm the exit, and then disposes of the SimulationManagerView class. 
+ * Manager application. When the action is performed, the action prompts the
+ * user to confirm the exit, and then disposes of the SimulationManagerView
+ * class.
+ *
  * @author Matthew Cechini
+ * @author jdalbey 06/23/2016 Removed confirmation prompt to simplify system
+ * testing.
  */
 @SuppressWarnings("serial")
-public class ExitAction extends AbstractAction {    
-    
-    /** Reference to the SimulationManagerView object. */
+public class ExitAction extends AbstractAction
+{
+
+    /**
+     * Reference to the SimulationManagerView object.
+     */
     private SimulationManagerView theSimManagerView = null;
-    
-    /** 
+
+    /**
      * Constructor.
+     *
      * @param view View class object for the Simulation Manager.
      */
-    public ExitAction(SimulationManagerView view) {
+    public ExitAction(SimulationManagerView view)
+    {
         super("Exit");
-        
-        theSimManagerView = view;       
+
+        theSimManagerView = view;
     }
-    
 
-    public void actionPerformed(ActionEvent evt) {
-        
-        if(JOptionPane.showConfirmDialog(
-                null, "Exit Simulation Manager?", "Confirm Exit",
-                JOptionPane.YES_NO_OPTION) == JOptionPane.YES_OPTION) 
-        {   
-            theSimManagerView.dispose();    
-        }   
+    public void actionPerformed(ActionEvent evt)
+    {
+        theSimManagerView.dispose();
+//        if(JOptionPane.showConfirmDialog(
+//                null, "Exit Simulation Manager?", "Confirm Exit",
+//                JOptionPane.YES_NO_OPTION) == JOptionPane.YES_OPTION)
+//        {
+//            theSimManagerView.dispose();
+//        }
     }
 }

trunk/test/tmcsim/simulationmanager/SimulationManagerSmokeTest.java

@@ -1 +1 @@
 package tmcsim.simulationmanager;
 
+import java.awt.Component;
 import java.io.File;
+import javax.swing.JButton;
 import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertFalse;
+import static junit.framework.Assert.assertTrue;
 import static junit.framework.Assert.fail;
-import org.uispec4j.*;
+import org.uispec4j.Panel;
+import org.uispec4j.TextBox;
+import org.uispec4j.Trigger;
+import org.uispec4j.UISpecTestCase;
+import org.uispec4j.Window;
 import org.uispec4j.interception.WindowInterceptor;
 import tmcsim.cadsimulator.CADSimulator;
@@ -35 +43 @@
 
         Window cadwindow = null;
-        System.setProperty("CONFIG_DIR", "config/testConfig");
-        if (System.getProperty("CONFIG_DIR") != null)
+        System.setProperty("CAD_SIM_PROPERTIES", "config/cad_simulator_smoketest_config.properties");
+        if (System.getProperty("CAD_SIM_PROPERTIES") != null)
         {
             cadwindow = WindowInterceptor.run(new Trigger()
@@ -44 +52 @@
                     try
                     {
-                        engine = new CADSimulator(System.getProperty("CONFIG_DIR") + System.getProperty("file.separator") + "cad_simulator_config.properties");
-
+                        engine = new CADSimulator(System.getProperty("CAD_SIM_PROPERTIES"));
                     } catch (Exception e)
                     {
@@ -52 +59 @@
                 }
             });
-        } else
+        }
+        else
         {
-            fail("CONFIG_DIR system property not defined.");
+            fail("CAD_SIM_PROPERTIES system property not defined.");
         }
 
         // Check CAD Simulator appears with no script and nothing connected
-        assertEquals("CAD Simulator", cadwindow.getTitle());
+        assertTrue("Window title incorrect", cadwindow.getTitle().startsWith("CAD Simulator"));
         Panel mainPanel = cadwindow.getPanel("contentPane");
         TextBox txtStatus = mainPanel.getTextBox("simulationStatus");
@@ -67 +75 @@
 
         Window simMgrWindow = null;
-        System.setProperty("CONFIG_DIR", "config/testConfig");
-        if (System.getProperty("CONFIG_DIR") != null)
+        System.setProperty("SIM_MGR_PROPERTIES", "config/sim_manager_smoketest_config.properties");
+        if (System.getProperty("SIM_MGR_PROPERTIES") != null)
         {
             simMgrWindow = WindowInterceptor.run(new Trigger()
@@ -76 +84 @@
                     try
                     {
-                        //simMgrApp = new SimulationManager(System.getProperty("SIM_MGR_PROPERTIES"));
-                        simMgrApp = new SimulationManager(System.getProperty("CONFIG_DIR") + System.getProperty("file.separator") + "sim_manager_config.properties");
+                        simMgrApp = new SimulationManager(System.getProperty("SIM_MGR_PROPERTIES"));
                     } catch (Exception ex)
                     {
@@ -84 +91 @@
                 }
             });
-        } else
+        }
+        else
         {
-            fail("CONFIG_DIR system property not defined.");
+            fail("SIM_MGR_PROPERTIES system property not defined.");
         }
 
@@ -117 +125 @@
         assertEquals("Running", txtSimStatus.getText());
 
+        //List all available buttons
+        Component[] buttons = win.getSwingComponents(JButton.class);
+        for (Component comp : buttons)
+        {
+            System.out.println(comp);
+        }
+        win.getButton("Load Script");
+        win.getButton("Pause");
+        win.getButton("Disconnect from Paramics");
+        win.getButton("Reset");
+        win.getButton("Load Network");
         // Quit
         engine = null;
-        simMgrApp = null;
+        win.getMenuBar().getMenu("File").getSubMenu("Exit").click();
+        //simMgrApp = null;
     }
 }