Merge test suite 'AtLeastLuna' with 'AllTests'

Since we now only support Luna+ eclipse versions.

Change-Id: I795a04002192618b2d7d37aebdb3c180d471f268
Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>

2 files changed, 6 insertions, 67 deletions

diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/suite/AllTests.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/suite/AllTests.java
index e61131af5..69b2cd077 100644
--- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/suite/AllTests.java
+++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/suite/AllTests.java
@@ -18,6 +18,7 @@ import org.eclipse.emf.compare.ComparePackage;
 import org.eclipse.emf.compare.tests.command.CommandStackTestSuite;
 import org.eclipse.emf.compare.tests.conflict.ConflictDetectionTest;
 import org.eclipse.emf.compare.tests.conflict.MultiLineAttributeConflictDetectionTest;
+import org.eclipse.emf.compare.tests.conflict.PseudoConflictDetectionTest;
 import org.eclipse.emf.compare.tests.conflict.data.bug484557.Bug484557ConflictTest;
 import org.eclipse.emf.compare.tests.diff.ComparisonUtilTest;
 import org.eclipse.emf.compare.tests.diff.DiffUtilTest;
@@ -41,6 +42,8 @@ import org.eclipse.emf.compare.tests.match.ProxyMatchingTest;
 import org.eclipse.emf.compare.tests.match.RootIDMatchingTest;
 import org.eclipse.emf.compare.tests.match.XMIMatchingTest;
 import org.eclipse.emf.compare.tests.merge.Bug485266_MoveDeleteConflict_Test;
+import org.eclipse.emf.compare.tests.merge.ComplexMergeTest;
+import org.eclipse.emf.compare.tests.merge.ConflictImplicationsTest_Bug484579;
 import org.eclipse.emf.compare.tests.merge.ConflictMergeTest;
 import org.eclipse.emf.compare.tests.merge.ExtensionMergeTest;
 import org.eclipse.emf.compare.tests.merge.FeatureMaps2wayMergeTest;
@@ -102,7 +105,9 @@ import junit.textui.TestRunner;
 		MatchUtilFeatureContainsTest.class, RefineMergeTest.class, Bug484557ConflictTest.class,
 		Bug485266_MoveDeleteConflict_Test.class, ResourceAttachmentChangeBug492261.class,
 		RankedAdapterFactoryRegistryTest.class, ComparisonScopeAdapterTest.class,
-		EMFComparePredicatesTest.class, ImplicationsMergeTest.class, GraphTest.class, })
+		EMFComparePredicatesTest.class, ImplicationsMergeTest.class, GraphTest.class,
+		ConflictImplicationsTest_Bug484579.class, PseudoConflictDetectionTest.class,
+		ComplexMergeTest.class, })
 public class AllTests {
 	/**
 	 * Standalone launcher for all of compare's tests.
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/suite/AtLeastLunaVersionTests.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/suite/AtLeastLunaVersionTests.java
deleted file mode 100644
index 125bd3abc..000000000
--- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/suite/AtLeastLunaVersionTests.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2012, 2016 Obeo and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     Obeo - initial API and implementation
- *******************************************************************************/
-package org.eclipse.emf.compare.tests.suite;
-
-import junit.framework.JUnit4TestAdapter;
-import junit.framework.Test;
-import junit.textui.TestRunner;
-
-import org.eclipse.emf.compare.ComparePackage;
-import org.eclipse.emf.compare.tests.conflict.PseudoConflictDetectionTest;
-import org.eclipse.emf.compare.tests.merge.ComplexMergeTest;
-import org.eclipse.emf.compare.tests.merge.ConflictImplicationsTest_Bug484579;
-import org.eclipse.emf.compare.tests.nodes.NodesPackage;
-import org.eclipse.emf.compare.tests.nodes.util.NodesResourceFactoryImpl;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.junit.BeforeClass;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-import org.junit.runners.Suite.SuiteClasses;
-
-/**
- * This test suite allows us to launch the test which are only compatible with Eclipse Luna and newer
- * versions.
- * 
- * @author <a href="mailto:mathieu.cartaud@obeo.fr">Mathieu Cartaud</a>
- */
-@RunWith(Suite.class)
-@SuiteClasses({ConflictImplicationsTest_Bug484579.class, PseudoConflictDetectionTest.class,
-		ComplexMergeTest.class, })
-public class AtLeastLunaVersionTests {
-	/**
-	 * 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);
-		EPackage.Registry.INSTANCE.put(NodesPackage.eNS_URI, NodesPackage.eINSTANCE);
-
-		Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("nodes", //$NON-NLS-1$
-				new NodesResourceFactoryImpl());
-	}
-}