Changeset 123 in tmcsimulator for trunk/test/tmcsim/cadsimulator/viewer

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/cadsimulator/viewer

Files:

• CADConsoleViewerTest.java (modified) (3 diffs)
• CADSimulatorViewModelTest.java (modified) (3 diffs)
• model/CADSimulatorModelTest.java (modified) (2 diffs)

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

@@ -5 +5 @@
 import java.util.logging.Logger;
 import junit.framework.TestCase;
-import tmcsim.cadsimulator.viewer.model.CADSimulatorModel;
+import tmcsim.cadsimulator.viewer.model.CADSimulatorState;
 import tmcsim.common.CADEnums;
 
@@ -16 +16 @@
 
     CADConsoleViewer console;
-    CADSimulatorModel cadmodel;
+    CADSimulatorState cadmodel;
     StringWriter sw;
 
@@ -29 +29 @@
         super.setUp();
         console = new CADConsoleViewer();
-        cadmodel = new CADSimulatorModel();
+        cadmodel = new CADSimulatorState();
         cadmodel.addObserver(console);
         sw = new StringWriter();

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

@@ -6 +6 @@
 import static junit.framework.Assert.assertTrue;
 import org.uispec4j.*;
-import tmcsim.cadsimulator.viewer.model.CADSimulatorModel;
+import tmcsim.cadsimulator.viewer.model.CADSimulatorState;
 import tmcsim.common.CADEnums;
 
@@ -18 +18 @@
     CADSimulatorViewer viewer;
     Window cadwindow;
-    CADSimulatorModel model;
+    CADSimulatorState model;
     Panel mainPanel;
 
@@ -32 +32 @@
         viewer = new CADSimulatorViewer();
         cadwindow = new Window(viewer);
-        model = new CADSimulatorModel();
+        model = new CADSimulatorState();
         model.addObserver(viewer);
         mainPanel = cadwindow.getPanel("contentPane");

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

@@ -18 +18 @@
 {
 
-    private CADSimulatorModel model;
+    private CADSimulatorState model;
     private String currentTest;
 
@@ -28 +28 @@
     public void setUp()
     {
-        model = new CADSimulatorModel();
+        model = new CADSimulatorState();
         model.addObserver(this);
     }