Index: trunk/test/tmcsim/simulationmanager/SimulationManagerSmokeTest.java
===================================================================
--- trunk/test/tmcsim/simulationmanager/SimulationManagerSmokeTest.java	(revision 658)
+++ trunk/test/tmcsim/simulationmanager/SimulationManagerSmokeTest.java	(revision 664)
@@ -3,4 +3,5 @@
 import java.awt.Component;
 import java.io.File;
+import java.util.Arrays;
 import javax.swing.JButton;
 import static junit.framework.Assert.assertEquals;
@@ -39,10 +40,10 @@
      * Call constructors for both classes
      */
-    public void testBothGUIs() throws ScriptException, SimulationException
+    public void testBothGUIs() throws ScriptException, SimulationException, InterruptedException
     {
         System.out.println("Smoke Test Sim Mgr & CADSimulator");
 
         Window cadwindow = null;
-        System.setProperty("CAD_SIM_PROPERTIES", "config/cad_simulator_smoketest_config.properties");
+        System.setProperty("CAD_SIM_PROPERTIES", "config/cad_server.properties"); 
         if (System.getProperty("CAD_SIM_PROPERTIES") != null)
         {
@@ -77,5 +78,5 @@
 
         Window simMgrWindow = null;
-        System.setProperty("SIM_MGR_PROPERTIES", "config/sim_manager_smoketest_config.properties");
+        System.setProperty("SIM_MGR_PROPERTIES", "config/sim_manager.properties");
         if (System.getProperty("SIM_MGR_PROPERTIES") != null)
         {
@@ -118,24 +119,46 @@
         // Click "Start"
         win.getButton("Start").click();
-        try
-        {
-            Thread.sleep(200);
-        } catch (Exception ex)
-        {
-            ex.printStackTrace();
-        }
+        Thread.sleep(200);
         assertEquals("Running", txtSimStatus.getText());
 
-        //List all available buttons
-        Component[] buttons = win.getSwingComponents(JButton.class);
-        for (Component comp : buttons)
-        {
-            System.out.println(comp);
-        }
+        java.util.ArrayList<String> expectedButtons = new java.util.ArrayList<String>(Arrays.asList("Load Script","Start","Pause","Reset","Connect to Paramics",
+                "Load Network","Reschedule","Trigger","Delete","Add New Incident","Divert Traffic"));
+        // Check for appearance of buttons in the GUI
         win.getButton("Load Script");
-        win.getButton("Pause");
-        win.getButton("Disconnect from Paramics");
         win.getButton("Reset");
-        win.getButton("Load Network");
+        win.getButton("Add New Incident");
+        win.getButton("Reschedule");
+        win.getButton("Trigger");
+        win.getButton("Delete");
+        //Find all available buttons - obsolete, replaced by stmts above
+//        Component[] buttons = win.getSwingComponents(JButton.class);
+//        java.util.List<Component> actualButtons = Arrays.asList(buttons);
+//        for (Component actualBtn: actualButtons)
+//        {
+//            if (actualBtn instanceof JButton)
+//            {
+//                String btnName = ((JButton) actualBtn).getText();
+//                if (btnName.length()>0)
+//                {
+//                    if (expectedButtons.contains(btnName))
+//                    {
+//                        expectedButtons.remove(btnName);
+//                    }
+//                    else
+//                    {
+//                        fail("GUI has an unexpected button: "+btnName);
+//                    }
+//                }
+//            }
+//        }
+//        if (expectedButtons.size() > 0)
+//        {
+//            fail("GUI is missing a button: "+expectedButtons);
+//        }
+
+        // Pause the simulation    
+        win.getButton("Pause").click();
+        Thread.sleep(200);
+        win.getButton("Resume");    // resume should appear when paused
         // Quit
         engine = null;