Changeset 123 in tmcsimulator for trunk/test/tmcsim


Ignore:
Timestamp:
10/15/2017 03:59:42 PM (9 years ago)
Author:
jdalbey
Message:

Multiple renaming of classes to improve clarity. Remove check for Paramics running before starting sim.

Location:
trunk/test/tmcsim
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/test/tmcsim/cadsimulator/CADSimulatorConsoleDriver.java

    r47 r123  
    2222{ 
    2323 
    24     static CADSimulator app; 
     24    static CADServer app; 
    2525    static final String configData = 
    2626            "CADClientPort          = 4444 \n" 

  • trunk/test/tmcsim/cadsimulator/CADSimulatorConsoleTest.java

    r47 r123  
    2525{ 
    2626 
    27     private static CADSimulator app = null; 
     27    private static CADServer app = null; 
    2828    private CADConsoleViewer console; 
    2929    private StringWriter sw; 
    … …  
    4343            try 
    4444            { 
    45                 app = new CADSimulator("config.txt"); 
     45                app = new CADServer("config.txt"); 
    4646            } catch (Exception ex) 
    4747            { 

  • trunk/test/tmcsim/cadsimulator/CADSimulatorFixture.java

    r47 r123  
    2323{ 
    2424 
    25     static CADSimulator app; 
     25    static CADServer app; 
    2626    static ByteArrayOutputStream bos; 
    2727    static PrintStream ps; 
    … …  
    109109            try 
    110110            { 
    111                 app = new CADSimulator(System.getProperty("CAD_SIM_PROPERTIES")); 
     111                app = new CADServer(System.getProperty("CAD_SIM_PROPERTIES")); 
    112112            } catch (Exception ex) 
    113113            { 

  • trunk/test/tmcsim/cadsimulator/CADSimulatorGUITest.java

    r47 r123  
    5252     * Test of main method, of class CADSimulator. 
    5353     */ 
    54     CADSimulator app; 
     54    CADServer app; 
    5555 
    5656    public void testConstructor() throws SimulationException, RemoteException, ScriptException 
    … …  
    7777                    try 
    7878                    { 
    79                         app = new CADSimulator(System.getProperty("CONFIG_DIR") + System.getProperty("file.separator") + "cad_simulator_config.properties"); 
     79                        app = new CADServer(System.getProperty("CONFIG_DIR") + System.getProperty("file.separator") + "cad_simulator_config.properties"); 
    8080 
    8181                    } catch (Exception e) 

  • trunk/test/tmcsim/cadsimulator/SystemConsoleTest.java

    r52 r123  
    3030 
    3131    SimulationManager simMgrApp; 
    32     CADSimulator engine; 
     32    CADServer engine; 
    3333 
    3434    public SystemConsoleTest(String testName) 
    … …  
    5252        try 
    5353        { 
    54             engine = new CADSimulator("config/testConfig/cad_simulator_console_config.properties"); 
     54            engine = new CADServer("config/testConfig/cad_simulator_console_config.properties"); 
    5555        } catch (Exception e) 
    5656        { 

  • trunk/test/tmcsim/cadsimulator/SystemTest.java

    r52 r123  
    2626 
    2727    SimulationManager simMgrApp; 
    28     CADSimulator engine; 
     28    CADServer engine; 
    2929//    ParamicsCommunicator paramicscomm; 
    3030 
    … …  
    5353                try 
    5454                { 
    55                     engine = new CADSimulator("config/testConfig/cad_simulator_config.properties"); 
     55                    engine = new CADServer("config/testConfig/cad_simulator_config.properties"); 
    5656                } catch (Exception e) 
    5757                { 

  • trunk/test/tmcsim/cadsimulator/viewer/CADConsoleViewerTest.java

    r47 r123  
    55import java.util.logging.Logger; 
    66import junit.framework.TestCase; 
    7 import tmcsim.cadsimulator.viewer.model.CADSimulatorModel; 
     7import tmcsim.cadsimulator.viewer.model.CADSimulatorState; 
    88import tmcsim.common.CADEnums; 
    99 
    … …  
    1616 
    1717    CADConsoleViewer console; 
    18     CADSimulatorModel cadmodel; 
     18    CADSimulatorState cadmodel; 
    1919    StringWriter sw; 
    2020 
    … …  
    2929        super.setUp(); 
    3030        console = new CADConsoleViewer(); 
    31         cadmodel = new CADSimulatorModel(); 
     31        cadmodel = new CADSimulatorState(); 
    3232        cadmodel.addObserver(console); 
    3333        sw = new StringWriter(); 

  • trunk/test/tmcsim/cadsimulator/viewer/CADSimulatorViewModelTest.java

    r49 r123  
    66import static junit.framework.Assert.assertTrue; 
    77import org.uispec4j.*; 
    8 import tmcsim.cadsimulator.viewer.model.CADSimulatorModel; 
     8import tmcsim.cadsimulator.viewer.model.CADSimulatorState; 
    99import tmcsim.common.CADEnums; 
    1010 
    … …  
    1818    CADSimulatorViewer viewer; 
    1919    Window cadwindow; 
    20     CADSimulatorModel model; 
     20    CADSimulatorState model; 
    2121    Panel mainPanel; 
    2222 
    … …  
    3232        viewer = new CADSimulatorViewer(); 
    3333        cadwindow = new Window(viewer); 
    34         model = new CADSimulatorModel(); 
     34        model = new CADSimulatorState(); 
    3535        model.addObserver(viewer); 
    3636        mainPanel = cadwindow.getPanel("contentPane"); 

  • trunk/test/tmcsim/cadsimulator/viewer/model/CADSimulatorModelTest.java

    r47 r123  
    1818{ 
    1919 
    20     private CADSimulatorModel model; 
     20    private CADSimulatorState model; 
    2121    private String currentTest; 
    2222 
    … …  
    2828    public void setUp() 
    2929    { 
    30         model = new CADSimulatorModel(); 
     30        model = new CADSimulatorState(); 
    3131        model.addObserver(this); 
    3232    } 

  • trunk/test/tmcsim/paramicslog/ParamicsLogFileHandlerTest.java

    r50 r123  
    1212import static junit.framework.Assert.fail; 
    1313import junit.framework.TestCase; 
    14 import tmcsim.cadsimulator.CADSimulator; 
     14import tmcsim.cadsimulator.CADServer; 
    1515import tmcsim.common.ScriptException; 
    1616import tmcsim.common.SimulationException; 
    … …  
    4343        try 
    4444        { 
    45             new CADSimulator("config/testConfig/cad_simulator_console_config.properties"); 
     45            new CADServer("config/testConfig/cad_simulator_console_config.properties"); 
    4646        } catch (Exception e) 
    4747        { 

  • trunk/test/tmcsim/paramicslog/ParamicsLogRMITestSkeleton.java

    r47 r123  
    1313import static junit.framework.Assert.fail; 
    1414import junit.framework.TestCase; 
    15 import tmcsim.cadsimulator.CADSimulator; 
     15import tmcsim.cadsimulator.CADServer; 
    1616import tmcsim.common.ScriptException; 
    1717import tmcsim.common.SimulationException; 
    … …  
    4444        try 
    4545        { 
    46             CADSimulator engine = new CADSimulator("config/testConfig/cad_simulator_console_config.properties"); 
     46            CADServer engine = new CADServer("config/testConfig/cad_simulator_console_config.properties"); 
    4747        } catch (Exception e) 
    4848        { 

  • trunk/test/tmcsim/simulationmanager/SimulationManagerSmokeTest.java

    r44 r123  
    1414import org.uispec4j.Window; 
    1515import org.uispec4j.interception.WindowInterceptor; 
    16 import tmcsim.cadsimulator.CADSimulator; 
     16import tmcsim.cadsimulator.CADServer; 
    1717import tmcsim.common.ScriptException; 
    1818import tmcsim.common.SimulationException; 
    … …  
    2828 
    2929    SimulationManager simMgrApp; 
    30     CADSimulator engine; 
     30    CADServer engine; 
    3131 
    3232    public SimulationManagerSmokeTest(String testName) 
    … …  
    5252                    try 
    5353                    { 
    54                         engine = new CADSimulator(System.getProperty("CAD_SIM_PROPERTIES")); 
     54                        engine = new CADServer(System.getProperty("CAD_SIM_PROPERTIES")); 
    5555                    } catch (Exception e) 
    5656                    { 
Note: See TracChangeset for help on using the changeset viewer.