More test clean-up

miyakowilson · Nov 2, 2016 · 1e3b396 · 1e3b396
1 parent f45e7bc
commit 1e3b396
Show file tree

Hide file tree

Showing 16 changed files with 17 additions and 20 deletions.
diff --git a/...st/tests/ApplicationStartClassRunner.java → ...ramework/ApplicationStartClassRunner.java b/...st/tests/ApplicationStartClassRunner.java → ...ramework/ApplicationStartClassRunner.java
@@ -1,4 +1,4 @@
-package gov.nasa.jpl.mbee.mdk.test.tests;
+package gov.nasa.jpl.mbee.mdk.test.framework;
 
 import com.nomagic.magicdraw.core.Application;
 import com.nomagic.magicdraw.tests.MagicDrawTestRunner;
@@ -22,13 +22,8 @@
  */
 
 public class ApplicationStartClassRunner extends BlockJUnit4ClassRunner {
-    //private static final String FRAMEWORK_LAUNCHER_CLASS = System.getProperty("com.nomagic.osgi.launcher", "com.nomagic.osgi.launcher.ProductionFrameworkLauncher");
-
-    private final Class<?> testClass;
-
     public ApplicationStartClassRunner(Class<?> clazz) throws InitializationError {
         super(clazz);
-        testClass = clazz;
 
         try {
             Application.getInstance().start(true, true, false, new String[]{"TESTER"}, null);

diff --git a/.../jpl/mbee/mdk/test/tests/MDKTestCase.java → .../mbee/mdk/test/framework/MDKTestCase.java b/.../jpl/mbee/mdk/test/tests/MDKTestCase.java → .../mbee/mdk/test/framework/MDKTestCase.java
@@ -1,4 +1,4 @@
-package gov.nasa.jpl.mbee.mdk.test.tests;
+package gov.nasa.jpl.mbee.mdk.test.framework;
 
 import java.io.File;
 import java.io.IOException;
@@ -38,6 +38,7 @@
  * @author Tommy Hang, Aaron Black, Ryan Oillataguerre
  *
  */
+@Deprecated
 public abstract class MDKTestCase extends MagicDrawTestCase {
     protected static String testRoot = "";
     protected static String mdRoot = "";

diff --git a/src/test/java/gov/nasa/jpl/mbee/mdk/test/tests/JUnit4Example.java b/src/test/java/gov/nasa/jpl/mbee/mdk/test/tests/JUnit4Example.java
@@ -2,6 +2,7 @@
 
 import com.nomagic.magicdraw.plugins.Plugin;
 import com.nomagic.magicdraw.plugins.PluginUtils;
+import gov.nasa.jpl.mbee.mdk.test.framework.ApplicationStartClassRunner;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/...ov/nasa/jpl/mbee/mdk/test/tests/integration/CoordinatedSyncConflictMDDeleteMMSUpdate.java b/...ov/nasa/jpl/mbee/mdk/test/tests/integration/CoordinatedSyncConflictMDDeleteMMSUpdate.java
@@ -3,7 +3,7 @@
 import com.nomagic.magicdraw.tests.MagicDrawTestRunner;
 import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Element;
 
-import gov.nasa.jpl.mbee.mdk.test.tests.MDKTestCase;
+import gov.nasa.jpl.mbee.mdk.test.framework.MDKTestCase;
 import junit.framework.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/...ov/nasa/jpl/mbee/mdk/test/tests/integration/CoordinatedSyncConflictMDUpdateMMSDelete.java b/...ov/nasa/jpl/mbee/mdk/test/tests/integration/CoordinatedSyncConflictMDUpdateMMSDelete.java
@@ -1,6 +1,6 @@
 package gov.nasa.jpl.mbee.mdk.test.tests.integration;
 
-import gov.nasa.jpl.mbee.mdk.test.tests.MDKTestCase;
+import gov.nasa.jpl.mbee.mdk.test.framework.MDKTestCase;
 import org.junit.runner.JUnitCore;
 import org.junit.runner.Result;
 

diff --git a/...ov/nasa/jpl/mbee/mdk/test/tests/integration/CoordinatedSyncConflictMDUpdateMMSUpdate.java b/...ov/nasa/jpl/mbee/mdk/test/tests/integration/CoordinatedSyncConflictMDUpdateMMSUpdate.java
@@ -1,6 +1,6 @@
 package gov.nasa.jpl.mbee.mdk.test.tests.integration;
 
-import gov.nasa.jpl.mbee.mdk.test.tests.MDKTestCase;
+import gov.nasa.jpl.mbee.mdk.test.framework.MDKTestCase;
 import org.junit.runner.JUnitCore;
 import org.junit.runner.Result;
 

diff --git a/...l/mbee/mdk/test/tests/integration/CoordinatedSyncExtraneousConflictMDDeleteMMSDelete.java b/...l/mbee/mdk/test/tests/integration/CoordinatedSyncExtraneousConflictMDDeleteMMSDelete.java
@@ -1,6 +1,6 @@
 package gov.nasa.jpl.mbee.mdk.test.tests.integration;
 
-import gov.nasa.jpl.mbee.mdk.test.tests.MDKTestCase;
+import gov.nasa.jpl.mbee.mdk.test.framework.MDKTestCase;
 import org.junit.runner.JUnitCore;
 import org.junit.runner.Result;
 

diff --git a/...l/mbee/mdk/test/tests/integration/CoordinatedSyncExtraneousConflictMDUpdateMMSUpdate.java b/...l/mbee/mdk/test/tests/integration/CoordinatedSyncExtraneousConflictMDUpdateMMSUpdate.java
@@ -1,6 +1,6 @@
 package gov.nasa.jpl.mbee.mdk.test.tests.integration;
 
-import gov.nasa.jpl.mbee.mdk.test.tests.MDKTestCase;
+import gov.nasa.jpl.mbee.mdk.test.framework.MDKTestCase;
 import org.junit.runner.JUnitCore;
 import org.junit.runner.Result;
 

diff --git a/...est/java/gov/nasa/jpl/mbee/mdk/test/tests/integration/CoordinatedSyncMDElementCreate.java b/...est/java/gov/nasa/jpl/mbee/mdk/test/tests/integration/CoordinatedSyncMDElementCreate.java
@@ -1,6 +1,6 @@
 package gov.nasa.jpl.mbee.mdk.test.tests.integration;
 
-import gov.nasa.jpl.mbee.mdk.test.tests.MDKTestCase;
+import gov.nasa.jpl.mbee.mdk.test.framework.MDKTestCase;
 import org.junit.runner.JUnitCore;
 import org.junit.runner.Result;
 

diff --git a/...est/java/gov/nasa/jpl/mbee/mdk/test/tests/integration/CoordinatedSyncMDElementDelete.java b/...est/java/gov/nasa/jpl/mbee/mdk/test/tests/integration/CoordinatedSyncMDElementDelete.java
@@ -1,6 +1,6 @@
 package gov.nasa.jpl.mbee.mdk.test.tests.integration;
 
-import gov.nasa.jpl.mbee.mdk.test.tests.MDKTestCase;
+import gov.nasa.jpl.mbee.mdk.test.framework.MDKTestCase;
 import org.junit.runner.JUnitCore;
 import org.junit.runner.Result;
 

diff --git a/...est/java/gov/nasa/jpl/mbee/mdk/test/tests/integration/CoordinatedSyncMDElementUpdate.java b/...est/java/gov/nasa/jpl/mbee/mdk/test/tests/integration/CoordinatedSyncMDElementUpdate.java
@@ -1,6 +1,6 @@
 package gov.nasa.jpl.mbee.mdk.test.tests.integration;
 
-import gov.nasa.jpl.mbee.mdk.test.tests.MDKTestCase;
+import gov.nasa.jpl.mbee.mdk.test.framework.MDKTestCase;
 import org.junit.runner.JUnitCore;
 import org.junit.runner.Result;
 

diff --git a/...st/java/gov/nasa/jpl/mbee/mdk/test/tests/integration/CoordinatedSyncMMSElementCreate.java b/...st/java/gov/nasa/jpl/mbee/mdk/test/tests/integration/CoordinatedSyncMMSElementCreate.java
@@ -1,6 +1,6 @@
 package gov.nasa.jpl.mbee.mdk.test.tests.integration;
 
-import gov.nasa.jpl.mbee.mdk.test.tests.MDKTestCase;
+import gov.nasa.jpl.mbee.mdk.test.framework.MDKTestCase;
 import org.junit.runner.JUnitCore;
 import org.junit.runner.Result;
 

diff --git a/...st/java/gov/nasa/jpl/mbee/mdk/test/tests/integration/CoordinatedSyncMMSElementDelete.java b/...st/java/gov/nasa/jpl/mbee/mdk/test/tests/integration/CoordinatedSyncMMSElementDelete.java
@@ -5,7 +5,7 @@
 
 import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Element;
 
-import gov.nasa.jpl.mbee.mdk.test.tests.MDKTestCase;
+import gov.nasa.jpl.mbee.mdk.test.framework.MDKTestCase;
 
 
 /**

diff --git a/...st/java/gov/nasa/jpl/mbee/mdk/test/tests/integration/CoordinatedSyncMMSElementUpdate.java b/...st/java/gov/nasa/jpl/mbee/mdk/test/tests/integration/CoordinatedSyncMMSElementUpdate.java
@@ -1,6 +1,6 @@
 package gov.nasa.jpl.mbee.mdk.test.tests.integration;
 
-import gov.nasa.jpl.mbee.mdk.test.tests.MDKTestCase;
+import gov.nasa.jpl.mbee.mdk.test.framework.MDKTestCase;
 import org.junit.runner.JUnitCore;
 import org.junit.runner.Result;
 

diff --git a/...gov/nasa/jpl/mbee/mdk/test/tests/integration/ManualSyncNameViolationResolutionAccept.java b/...gov/nasa/jpl/mbee/mdk/test/tests/integration/ManualSyncNameViolationResolutionAccept.java
@@ -1,6 +1,6 @@
 package gov.nasa.jpl.mbee.mdk.test.tests.integration;
 
-import gov.nasa.jpl.mbee.mdk.test.tests.MDKTestCase;
+import gov.nasa.jpl.mbee.mdk.test.framework.MDKTestCase;
 import org.junit.runner.JUnitCore;
 import org.junit.runner.Result;
 

diff --git a/...gov/nasa/jpl/mbee/mdk/test/tests/integration/ManualSyncNameViolationResolutionCommit.java b/...gov/nasa/jpl/mbee/mdk/test/tests/integration/ManualSyncNameViolationResolutionCommit.java
@@ -1,6 +1,6 @@
 package gov.nasa.jpl.mbee.mdk.test.tests.integration;
 
-import gov.nasa.jpl.mbee.mdk.test.tests.MDKTestCase;
+import gov.nasa.jpl.mbee.mdk.test.framework.MDKTestCase;
 import org.junit.runner.JUnitCore;
 import org.junit.runner.Result;
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,7 @@ @@
     import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Element;
-    import gov.nasa.jpl.mbee.mdk.test.tests.MDKTestCase;
+    import gov.nasa.jpl.mbee.mdk.test.framework.MDKTestCase;
     /**
@@ Expand Down @@