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 expectedButtons = new java.util.ArrayList(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 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; Index: trunk/test/tmcsim/highwaymodel/ConsoleTrafficDriver.java =================================================================== --- trunk/test/tmcsim/highwaymodel/ConsoleTrafficDriver.java (revision 457) +++ trunk/test/tmcsim/highwaymodel/ConsoleTrafficDriver.java (revision 664) @@ -19,5 +19,5 @@ /** - * A console application to drive the ATMS Server. + * A console application to drive the ATMS Server (is this really CPTMS now?). * Use for test driving the Highway Model. * Index: trunk/test/tmcsim/highwaymodel/runtraffic.bash =================================================================== --- trunk/test/tmcsim/highwaymodel/runtraffic.bash (revision 457) +++ trunk/test/tmcsim/highwaymodel/runtraffic.bash (revision 664) @@ -1,5 +1,5 @@ #!/bin/bash -java -DATMSDRIVER_PROPERTIES=config/console_driver_config.properties -jar deploy/ConsoleTrafficDriver.jar << EOF +java -DATMSDRIVER_PROPERTIES=config/test_trafficdriver.properties -jar deploy/ConsoleTrafficDriver.jar << EOF 5 S 10 24.0 Y A Index: trunk/test/tmcsim/paramicslog/ParamicsLogRMITestSkeleton.java =================================================================== --- trunk/test/tmcsim/paramicslog/ParamicsLogRMITestSkeleton.java (revision 422) +++ trunk/test/tmcsim/paramicslog/ParamicsLogRMITestSkeleton.java (revision 664) @@ -34,5 +34,5 @@ super.setUp(); } - String propsfile = "config/paramics_communicator_logging.properties"; + String propsfile = "config/logging_paramics_communicator.properties"; /** @@ -44,5 +44,5 @@ try { - CADServer engine = new CADServer("config/cad_simulator_console_config.properties"); + CADServer engine = new CADServer("config/cad_server_console.properties"); } catch (Exception e) { Index: trunk/test/tmcsim/paramicslog/ParamicsLogFileHandlerTest.java =================================================================== --- trunk/test/tmcsim/paramicslog/ParamicsLogFileHandlerTest.java (revision 422) +++ trunk/test/tmcsim/paramicslog/ParamicsLogFileHandlerTest.java (revision 664) @@ -33,5 +33,5 @@ super.setUp(); } - String propsfile = "config/paramics_communicator_logging.properties"; + String propsfile = "config/logging_paramics_communicator.properties"; /** @@ -43,5 +43,5 @@ try { - new CADServer("config/cad_simulator_console_config.properties"); + new CADServer("config/cad_server_console.properties"); } catch (Exception e) { Index: trunk/test/tmcsim/cadsimulator/CADSimulatorConsoleDriver.java =================================================================== --- trunk/test/tmcsim/cadsimulator/CADSimulatorConsoleDriver.java (revision 658) +++ trunk/test/tmcsim/cadsimulator/CADSimulatorConsoleDriver.java (revision 664) @@ -31,5 +31,8 @@ + "ParamicsProperties = pconfig.txt\n" + "ATMSProperties = empty.txt\n" - + "MediaProperties = empty.txt\n"; + + "MediaProperties = empty.txt\n" + + "TrafficMgrProperties = config/traffic_model_config/traffic_model_config.properties\n" + + "ElapsedTimeFile = webapps/dynamicdata/sim_elapsedtime.json\n" + + "CADcommentsLog = webapps/dynamicdata/CADcomments.log\n"; static final String paramicsData = "ParamicsCommHost = 192.168.251.45\n" + "ParamicsCommPort = 4450\n" Index: trunk/test/tmcsim/cadsimulator/SystemConsoleTest.java =================================================================== --- trunk/test/tmcsim/cadsimulator/SystemConsoleTest.java (revision 658) +++ trunk/test/tmcsim/cadsimulator/SystemConsoleTest.java (revision 664) @@ -53,5 +53,5 @@ try { - engine = new CADServer("config/cad_simulator_console_config.properties"); + engine = new CADServer("config/cad_server_console.properties"); } catch (Exception e) { @@ -74,5 +74,5 @@ try { - simMgrApp = new SimulationManager("config/sim_manager_systest_config.properties"); + simMgrApp = new SimulationManager("config/sim_manager.properties"); } catch (Exception ex) { Index: trunk/test/tmcsim/cadsimulator/CADSimulatorGUITest.java =================================================================== --- trunk/test/tmcsim/cadsimulator/CADSimulatorGUITest.java (revision 658) +++ trunk/test/tmcsim/cadsimulator/CADSimulatorGUITest.java (revision 664) @@ -78,5 +78,5 @@ try { - app = new CADServer(System.getProperty("CONFIG_DIR") + System.getProperty("file.separator") + "cad_simulator_config.properties"); + app = new CADServer(System.getProperty("CONFIG_DIR") + System.getProperty("file.separator") + "cad_server.properties"); } catch (Exception e) Index: trunk/test/tmcsim/cadsimulator/viewer/CADSimulatorViewModelTest.java =================================================================== --- trunk/test/tmcsim/cadsimulator/viewer/CADSimulatorViewModelTest.java (revision 455) +++ trunk/test/tmcsim/cadsimulator/viewer/CADSimulatorViewModelTest.java (revision 664) @@ -30,5 +30,5 @@ { super.setUp(); - viewer = new CADServerViewer("config/cad_simulator_config.properties"); + viewer = new CADServerViewer("config/cad_server.properties"); cadwindow = new Window(viewer); model = new CADSimulatorState(); Index: trunk/test/tmcsim/cadsimulator/viewer/CADConsoleViewerTest.java =================================================================== --- trunk/test/tmcsim/cadsimulator/viewer/CADConsoleViewerTest.java (revision 657) +++ trunk/test/tmcsim/cadsimulator/viewer/CADConsoleViewerTest.java (revision 664) @@ -28,5 +28,5 @@ { super.setUp(); - console = new CADConsoleViewer("config/cad_simulator_config.properties"); + console = new CADConsoleViewer("config/cad_server.properties"); cadmodel = new CADSimulatorState(); cadmodel.addObserver(console); Index: trunk/test/tmcsim/cadsimulator/SystemTest.java =================================================================== --- trunk/test/tmcsim/cadsimulator/SystemTest.java (revision 658) +++ trunk/test/tmcsim/cadsimulator/SystemTest.java (revision 664) @@ -19,5 +19,5 @@ /** * System test (include CADSimulator) with emulated Paramics Modeler NO ATMS - * server captures GUI display using UISpec4J. + * server. Captures GUI display using UISpec4J. * * @author jdalbey @@ -54,5 +54,5 @@ try { - engine = new CADServer("config/cad_simulator_config.properties"); + engine = new CADServer("config/cad_server.properties"); } catch (Exception e) { @@ -82,5 +82,5 @@ try { - simMgrApp = new SimulationManager("config/sim_manager_systest_config.properties"); + simMgrApp = new SimulationManager("config/sim_manager.properties"); } catch (Exception ex) { Index: trunk/test/tmcsim/cadsimulator/VisibleSystemDemoDriver.java =================================================================== --- trunk/test/tmcsim/cadsimulator/VisibleSystemDemoDriver.java (revision 658) +++ (revision ) @@ -1,203 +1,0 @@ -package tmcsim.cadsimulator; - -import java.io.File; -import java.io.FileWriter; -import java.io.PrintWriter; -import java.rmi.RemoteException; -import static junit.framework.Assert.assertEquals; -import static junit.framework.Assert.fail; -import org.uispec4j.*; -import org.uispec4j.interception.WindowInterceptor; -import tmcsim.common.ScriptException; -import tmcsim.common.SimulationException; -import tmcsim.paramicscommunicator.ParamicsCommunicator; -import tmcsim.paramicscommunicator.gui.ParamicsCommunicatorGUI; -import tmcsim.simulationmanager.SimulationManager; -import static tmcsim.simulationmanager.SimulationManager.SCENARIOS_DIR; - -/** - * Requires manual starting CADSimulator before running this test. System test - * with emulated Paramics Modeler NO ATMS server. - * - * @author jdalbey - */ -public class VisibleSystemDemoDriver extends UISpecTestCase -{ - - SimulationManager simMgrApp; - - public VisibleSystemDemoDriver(String testName) - { - super(testName); - } - - @Override - protected void setUp() throws Exception - { - super.setUp(); - } - - /** - * Test of run method, of class ParamicsCommunicator. - */ - public void testRun() throws ScriptException, SimulationException, RemoteException - { - System.out.println("Visible System Test starting."); - // NOTE: CADSimulator must be started prior to running this test, - // because it displays a GUI, and if we try to do it inside this test, - // UISpec will complain about an uncaught window appearing. - - ParamicsCommunicator pc = null; - pc = new ParamicsCommunicator("config/paramics_communicator_config.properties"); - ParamicsCommunicatorGUI theGUI = new ParamicsCommunicatorGUI(); - pc.setGUI(theGUI); - // Note: Don't set visible ANY windows during UISpec test - - // expect pcomm to say "sleeping" - - Window simMgrWindow = null; - simMgrWindow = WindowInterceptor.run(new Trigger() - { - public void run() - { - try - { - simMgrApp = new SimulationManager("config/sim_manager_systest_config.properties"); - } catch (Exception ex) - { - fail("Couldn't launch Simulation Manager, perhaps CADSimulator isn't running."); - } - } - }); - - // Check that the Sim Mgr GUI appears without a script loaded yet - Panel contentPanel = simMgrWindow.getPanel("contentPane"); - TextBox txtSimStatus = contentPanel.getTextBox("simulationStatusText"); - assertEquals("No Script", txtSimStatus.getText()); - TextBox txtParamStatus = contentPanel.getTextBox("paramicsStatusInfoLabel"); - assertEquals("Unknown", txtParamStatus.getText()); - Button loadNetworkBtn = simMgrWindow.getButton("Load Network"); - assertFalse(loadNetworkBtn.isEnabled()); - // Begin actions - Button paramicsBtn = simMgrWindow.getButton("Connect to Paramics"); - paramicsBtn.click(); - try - { - Thread.sleep(200); - } catch (Exception ex) - { - } - assertEquals("Disconnect from Paramics", paramicsBtn.getLabel()); - - assertEquals("Connected", txtParamStatus.getText()); - pc.startReading(); - - loadNetworkBtn.click(); - try - { - Thread.sleep(200); - } catch (Exception ex) - { - } - assertEquals("Sending Network ID", txtParamStatus.getText()); - System.out.println("Sending Network ID"); - assertFalse(loadNetworkBtn.isEnabled()); - String warmingXML = "\n" - + "WARMING\n" - + "1\n" - + ""; - writedata("paramics_status.xml", warmingXML); - try - { - Thread.sleep(2100); - } catch (Exception ex) - { - } - assertEquals("Warming Up", txtParamStatus.getText()); - System.out.println("Warming Up Passed"); - - try - { - Thread.sleep(2100); - } catch (Exception ex) - { - } - String loadedXML = "\n" - + "LOADED" - + "1" - + ""; - writedata("paramics_status.xml", loadedXML); - try - { - Thread.sleep(2100); - } catch (Exception ex) - { - } - assertEquals("Network 1 Loaded", txtParamStatus.getText()); - System.out.println("Network Loaded Passed"); - - // Load a script file - String autoloadScriptname = SCENARIOS_DIR+"/audio_systest.xml"; - simMgrApp.loadScript(new File(autoloadScriptname)); - try - { - Thread.sleep(500); - } catch (Exception ex) - { - } - - // The status should now say Ready - assertEquals("Ready", txtSimStatus.getText()); - - // Click "Start" - simMgrWindow.getButton("Start").click(); - try - { - Thread.sleep(200); - } catch (Exception ex) - { - ex.printStackTrace(); - } - assertEquals("Running", txtSimStatus.getText()); - System.out.println("Running Passed"); - try - { - Thread.sleep(9000); - } catch (InterruptedException ex) - { - } - simMgrWindow.getButton("Pause").click(); - try - { - Thread.sleep(3000); - } catch (InterruptedException ex) - { - } - simMgrWindow.getButton("Start").click(); - try - { - Thread.sleep(3000); - } catch (InterruptedException ex) - { - } - simMgrWindow.getButton("Pause").click(); - simMgrWindow.getMenuBar().getMenu("File").getSubMenu("Exit").click(); - System.out.println("Exiting."); - } - - // Write the test data to a file - public static void writedata(String filename, String data) - { -// System.out.println("writedata called for " + filename); - PrintWriter writer = null; - try - { - writer = new PrintWriter(new FileWriter(filename)); - writer.println(data); - writer.close(); - } catch (Exception ex) - { - ex.printStackTrace(); - } - } -}