Changeset 34 in tmcsimulator for trunk/test/tmcsim

Timestamp:

04/29/2016 12:56:43 AM (10 years ago)

Author:

bokumura

Message:

Change unit tests to work with the new config directory restructure.

Location:

trunk/test/tmcsim

Files:

• cadsimulator/CADSimulatorGUITest.java (modified) (4 diffs)
• cadsimulator/CADSimulatorTest.java (modified) (3 diffs)
• simulationmanager/SimulationManagerSmokeTest.java (modified) (6 diffs)

trunk/test/tmcsim/cadsimulator/CADSimulatorGUITest.java

@@ -5 +5 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
+
 import static junit.framework.Assert.assertEquals;
 import static junit.framework.Assert.fail;
@@ -81 +82 @@
         CADSimulatorFixture.writedata("config.txt", configData);
         System.out.println("CADSimulator constructor");
-        System.setProperty("CAD_SIM_PROPERTIES", "config.txt");
+        System.setProperty("CONFIG_DIR", "config/testConfig");
         Window cadwindow = null;
-        if (System.getProperty("CAD_SIM_PROPERTIES") != null)
+        if (System.getProperty("CONFIG_DIR") != null)
         {
             cadwindow = WindowInterceptor.run(new Trigger()
@@ -91 +92 @@
                     try
                     {
-                        app = new CADSimulator(System.getProperty("CAD_SIM_PROPERTIES"));
+                        app = new CADSimulator(System.getProperty("CONFIG_DIR") + System.getProperty("file.separator") + "cad_simulator_config.properties");
+
                     } catch (Exception e)
                     {
@@ -100 +102 @@
         } else
         {
-            fail("CAD_SIM_PROPERTIES system property not defined.");
+            fail("CONFIG_DIR system property not defined.");
         }
         assertEquals("CAD Simulator", cadwindow.getTitle());

trunk/test/tmcsim/cadsimulator/CADSimulatorTest.java

@@ -59 +59 @@
     {
         System.out.println("CADSimulator constructor");
-        System.setProperty("CAD_SIM_PROPERTIES", "config/cad_simulator_config.properties");
+        System.setProperty("CONFIG_DIR", "config/testConfig");
         Window cadwindow = null;
-        if (System.getProperty("CAD_SIM_PROPERTIES") != null)
+        if (System.getProperty("CONFIG_DIR") != null)
         {
             cadwindow = WindowInterceptor.run(new Trigger()
@@ -69 +69 @@
                     try
                     {
-                        app = new CADSimulator(System.getProperty("CAD_SIM_PROPERTIES"));
+                        app = new CADSimulator(System.getProperty("CONFIG_DIR") + System.getProperty("file.separator") + "cad_simulator_config.properties");
                     }
                     catch (Exception e)
@@ -80 +80 @@
         else
         {
-            fail("CAD_SIM_PROPERTIES system property not defined.");
+            fail("CONFIG_DIR system property not defined.");
         }
         assertEquals("CAD Simulator", cadwindow.getTitle());

trunk/test/tmcsim/simulationmanager/SimulationManagerSmokeTest.java

@@ -35 +35 @@
 
         Window cadwindow = null;
-        System.setProperty("CAD_SIM_PROPERTIES", "config/cad_simulator_smoketest_config.properties");
-        if (System.getProperty("CAD_SIM_PROPERTIES") != null)
+        System.setProperty("CONFIG_DIR", "config/testConfig");
+        if (System.getProperty("CONFIG_DIR") != null)
         {
             cadwindow = WindowInterceptor.run(new Trigger()
@@ -44 +44 @@
                     try
                     {
-                        engine = new CADSimulator(System.getProperty("CAD_SIM_PROPERTIES"));
+                        engine = new CADSimulator(System.getProperty("CONFIG_DIR") + System.getProperty("file.separator") + "cad_simulator_config.properties");
+
                     } catch (Exception e)
                     {
@@ -53 +54 @@
         } else
         {
-            fail("CAD_SIM_PROPERTIES system property not defined.");
+            fail("CONFIG_DIR system property not defined.");
         }
 
@@ -66 +67 @@
 
         Window simMgrWindow = null;
-        System.setProperty("SIM_MGR_PROPERTIES", "config/sim_manager_smoketest_config.properties");
-        if (System.getProperty("SIM_MGR_PROPERTIES") != null)
+        System.setProperty("CONFIG_DIR", "config/testConfig");
+        if (System.getProperty("CONFIG_DIR") != null)
         {
             simMgrWindow = WindowInterceptor.run(new Trigger()
@@ -75 +76 @@
                     try
                     {
-                        simMgrApp = new SimulationManager(System.getProperty("SIM_MGR_PROPERTIES"));
+                        //simMgrApp = new SimulationManager(System.getProperty("SIM_MGR_PROPERTIES"));
+                        simMgrApp = new SimulationManager(System.getProperty("CONFIG_DIR") + System.getProperty("file.separator") + "sim_manager_config.properties");
                     } catch (Exception ex)
                     {
@@ -84 +86 @@
         } else
         {
-            fail("SIM_MGR_PROPERTIES system property not defined.");
+            fail("CONFIG_DIR system property not defined.");
         }