Bug 515373 - Remove legacy JUnit3 artefacts

This commit migrates the changes of
https://git.eclipse.org/r/#/c/104657 to Papyrus Compare.

Change-Id: I7a85c2f3814997596f7d1d47d61f44e2a2a116dd
Signed-off-by: Philip Langer <planger@eclipsesource.com>

3 files changed, 2 insertions, 67 deletions

diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/suite/PapyrusGitTests.java b/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/suite/PapyrusGitTests.java
index 236c0f4f..ac749baa 100644
--- a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/suite/PapyrusGitTests.java
+++ b/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/suite/PapyrusGitTests.java
@@ -40,10 +40,6 @@ import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 import org.junit.runners.Suite.SuiteClasses;
 
-import junit.framework.JUnit4TestAdapter;
-import junit.framework.Test;
-import junit.textui.TestRunner;
-
 @SuppressWarnings("restriction")
 @RunWith(Suite.class)
 @SuiteClasses({AttachmentChangeImplicationTest.class, ResourceAttachmentChangeAdd1GitMergeTest.class,
@@ -54,24 +50,6 @@ import junit.textui.TestRunner;
 		MoveOfDiagramConflictDetectionTest.class, AdditiveMergeDiagramTests.class,
 		MergeResolutionManagerTest.class, })
 public class PapyrusGitTests {
-	/**
-	 * Launches the test with the given arguments.
-	 * 
-	 * @param args
-	 *            Arguments of the testCase.
-	 */
-	public static void main(String[] args) {
-		TestRunner.run(suite());
-	}
-
-	/**
-	 * Creates the {@link junit.framework.TestSuite TestSuite} for all the test.
-	 * 
-	 * @return The test suite containing all the tests
-	 */
-	public static Test suite() {
-		return new JUnit4TestAdapter(PapyrusGitTests.class);
-	}
 
 	@BeforeClass
 	public static void fillEMFRegistries() {
@@ -88,4 +66,5 @@ public class PapyrusGitTests {
 		Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("uml", //$NON-NLS-1$
 				new UMLResourceFactoryImpl());
 	}
+
 }
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/suite/AllTests.java b/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/suite/AllTests.java
index 266b835a..f695305f 100644
--- a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/suite/AllTests.java
+++ b/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/suite/AllTests.java
@@ -15,7 +15,6 @@ package org.eclipse.papyrus.compare.diagram.tests.suite;
 
 import org.eclipse.emf.compare.ComparePackage;
 import org.eclipse.emf.compare.diagram.internal.extensions.ExtensionsPackage;
-import org.eclipse.emf.compare.tests.suite.CompareTestSuite;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.gmf.runtime.emf.core.resources.GMFResourceFactory;
@@ -42,10 +41,6 @@ import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 import org.junit.runners.Suite.SuiteClasses;
 
-import junit.framework.JUnit4TestAdapter;
-import junit.framework.Test;
-import junit.textui.TestRunner;
-
 /**
  * This test suite allows us to launch all tests for EMF Compare at once.
  * 
@@ -60,24 +55,6 @@ import junit.textui.TestRunner;
 		MergeNonConflictingCascadingFilterTest.class, MergeDiffInvolvingRefineDiffTest.class, })
 public class AllTests {
 
-	/**
-	 * Standalone launcher for all of compare's tests.
-	 * 
-	 * @generated
-	 */
-	public static void main(String[] args) {
-		TestRunner.run(suite());
-	}
-
-	/**
-	 * This will return a suite populated with all tests available through this class.
-	 * 
-	 * @generated
-	 */
-	public static Test suite() {
-		return new JUnit4TestAdapter(CompareTestSuite.class);
-	}
-
 	@BeforeClass
 	public static void fillEMFRegistries() {
 		EPackage.Registry.INSTANCE.put(ComparePackage.eNS_URI, ComparePackage.eINSTANCE);
@@ -93,4 +70,5 @@ public class AllTests {
 		Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("uml", //$NON-NLS-1$
 				new UMLResourceFactoryImpl());
 	}
+
 }
diff --git a/plugins/compare/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/suite/AllUITests.java b/plugins/compare/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/suite/AllUITests.java
index 18de2dff..e1c5ce20 100644
--- a/plugins/compare/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/suite/AllUITests.java
+++ b/plugins/compare/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/suite/AllUITests.java
@@ -15,10 +15,6 @@ import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 import org.junit.runners.Suite.SuiteClasses;
 
-import junit.framework.JUnit4TestAdapter;
-import junit.framework.Test;
-import junit.textui.TestRunner;
-
 /**
  * This test suite allows us to launch all tests for EMF Compare for UML at once. This test suite should
  * contain classes that need the UI in order to be executed. Tests that do not need the UI should go to
@@ -30,22 +26,4 @@ import junit.textui.TestRunner;
 @SuiteClasses({ProfileMigrationTest.class })
 public class AllUITests {
 
-	/**
-	 * Standalone launcher for all of compare's tests.
-	 * 
-	 * @generated
-	 */
-	public static void main(final String[] args) {
-		TestRunner.run(suite());
-	}
-
-	/**
-	 * This will return a suite populated with all tests available through this class.
-	 * 
-	 * @generated
-	 */
-	public static Test suite() {
-		return new JUnit4TestAdapter(AllUITests.class);
-	}
-
 }