Bug 487095: Move test bundles to JUnit 4Y20160407-1000I20160405-0800

- implement JUnitSourceSetup as ExternalResource
- clean up test suites
- update manifests
- use @Rule TestName to access test method names

FindReplaceDialogTest:
- fix test order
- fix wrong @Before tearDown()

Change-Id: Ibae60f592ea81dbbf2fab0db8daf64f92301dcdd

5 files changed, 39 insertions, 34 deletions

diff --git a/org.eclipse.text.tests/META-INF/MANIFEST.MF b/org.eclipse.text.tests/META-INF/MANIFEST.MF
index 2df2f20f11d..c831a188653 100644
--- a/org.eclipse.text.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.text.tests/META-INF/MANIFEST.MF
@@ -13,7 +13,7 @@ Require-Bundle:
  org.eclipse.core.commands;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.text;bundle-version="[3.5.0,4.0.0)",
- org.junit;bundle-version="3.8.2"
+ org.junit;bundle-version="4.12.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Eclipse-BundleShape: dir
 Import-Package: com.ibm.icu.text,
diff --git a/org.eclipse.text.tests/projection/org/eclipse/text/tests/ProjectionTestSuite.java b/org.eclipse.text.tests/projection/org/eclipse/text/tests/ProjectionTestSuite.java
index 1106d0d4662..8297a078f4e 100644
--- a/org.eclipse.text.tests/projection/org/eclipse/text/tests/ProjectionTestSuite.java
+++ b/org.eclipse.text.tests/projection/org/eclipse/text/tests/ProjectionTestSuite.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2016 IBM Corporation 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
@@ -21,8 +21,10 @@ import org.junit.runners.Suite.SuiteClasses;
  * @since 3.0
  */
 @RunWith(Suite.class)
-@SuiteClasses({ProjectionDocumentTest.class,
-	ProjectionMappingTest.class})
+@SuiteClasses({
+		ProjectionDocumentTest.class,
+		ProjectionMappingTest.class
+})
 public class ProjectionTestSuite {
-	//intentionally left blank
+	// see @SuiteClasses
 }
diff --git a/org.eclipse.text.tests/src/org/eclipse/text/tests/EclipseTextTestSuite.java b/org.eclipse.text.tests/src/org/eclipse/text/tests/EclipseTextTestSuite.java
index 0e64d4b4120..2cc55413102 100644
--- a/org.eclipse.text.tests/src/org/eclipse/text/tests/EclipseTextTestSuite.java
+++ b/org.eclipse.text.tests/src/org/eclipse/text/tests/EclipseTextTestSuite.java
@@ -26,25 +26,25 @@ import org.eclipse.text.tests.templates.TemplatesTestSuite;
  */
 @RunWith(Suite.class)
 @SuiteClasses({
-	LineTrackerTest4.class,
-	DocumentExtensionTest.class,
-	LineTrackerTest3.class,
-	DocumentTest.class,
-	FindReplaceDocumentAdapterTest.class,
-	PositionUpdatingCornerCasesTest.class,
-	ExclusivePositionUpdaterTest.class,
-	TextEditTests.class,
-	GapTextTest.class,
-	GapTextStoreTest.class,
-	ChildDocumentTest.class,
-	ProjectionTestSuite.class,
-	LinkTestSuite.class,
-	CopyOnWriteTextStoreTest.class,
-	TextUtilitiesTest.class,
-	AnnotationModelStressTest.class,
-	AnnotationModelExtension2Test.class,
-	TemplatesTestSuite.class
+		LineTrackerTest4.class,
+		DocumentExtensionTest.class,
+		LineTrackerTest3.class,
+		DocumentTest.class,
+		FindReplaceDocumentAdapterTest.class,
+		PositionUpdatingCornerCasesTest.class,
+		ExclusivePositionUpdaterTest.class,
+		TextEditTests.class,
+		GapTextTest.class,
+		GapTextStoreTest.class,
+		ChildDocumentTest.class,
+		ProjectionTestSuite.class,
+		LinkTestSuite.class,
+		CopyOnWriteTextStoreTest.class,
+		TextUtilitiesTest.class,
+		AnnotationModelStressTest.class,
+		AnnotationModelExtension2Test.class,
+		TemplatesTestSuite.class
 })
 public class EclipseTextTestSuite {
-	//intentionally left blank
+	// see @SuiteClasses
 }
diff --git a/org.eclipse.text.tests/src/org/eclipse/text/tests/link/LinkTestSuite.java b/org.eclipse.text.tests/src/org/eclipse/text/tests/link/LinkTestSuite.java
index 8aaeb10c5f5..f7dd208e7c2 100644
--- a/org.eclipse.text.tests/src/org/eclipse/text/tests/link/LinkTestSuite.java
+++ b/org.eclipse.text.tests/src/org/eclipse/text/tests/link/LinkTestSuite.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2016 IBM Corporation 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
@@ -22,10 +22,12 @@ import org.junit.runners.Suite.SuiteClasses;
  * @since 3.0
  */
 @RunWith(Suite.class)
-@SuiteClasses({LinkedPositionGroupTest.class,
-	LinkedPositionTest.class,
-	InclusivePositionUpdaterTest.class,
-	LinkedModeModelTest.class})
+@SuiteClasses({
+		LinkedPositionGroupTest.class,
+		LinkedPositionTest.class,
+		InclusivePositionUpdaterTest.class,
+		LinkedModeModelTest.class
+})
 public class LinkTestSuite {
-	//intentionally left blank
+	// see @SuiteClasses
 }
diff --git a/org.eclipse.text.tests/src/org/eclipse/text/tests/templates/TemplatesTestSuite.java b/org.eclipse.text.tests/src/org/eclipse/text/tests/templates/TemplatesTestSuite.java
index 422bf62be70..ca4a046269d 100755
--- a/org.eclipse.text.tests/src/org/eclipse/text/tests/templates/TemplatesTestSuite.java
+++ b/org.eclipse.text.tests/src/org/eclipse/text/tests/templates/TemplatesTestSuite.java
@@ -23,9 +23,10 @@ import org.junit.runners.Suite.SuiteClasses;
  */
 @RunWith(Suite.class)
 @SuiteClasses({
-	TemplateTranslatorTest.class,
-	TemplateVariablesWordSelectionTest.class,
-	GlobalTemplateVariablesDateTest.class})
+		TemplateTranslatorTest.class,
+		TemplateVariablesWordSelectionTest.class,
+		GlobalTemplateVariablesDateTest.class
+})
 public class TemplatesTestSuite {
-	// intentionally empty
+	// see @SuiteClasses
 }