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

2 files changed, 18 insertions, 18 deletions

diff --git a/org.eclipse.core.filebuffers.tests/META-INF/MANIFEST.MF b/org.eclipse.core.filebuffers.tests/META-INF/MANIFEST.MF
index 1287b94cc60..e9efaa5980a 100644
--- a/org.eclipse.core.filebuffers.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.core.filebuffers.tests/META-INF/MANIFEST.MF
@@ -14,6 +14,6 @@ Require-Bundle:
  org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)";resolution:=optional,
  org.eclipse.core.filebuffers;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
diff --git a/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileBuffersTestSuite.java b/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileBuffersTestSuite.java
index b3f3331440e..a84d7550c67 100644
--- a/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileBuffersTestSuite.java
+++ b/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileBuffersTestSuite.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
@@ -23,21 +23,21 @@ import org.junit.runners.Suite.SuiteClasses;
  * @since 3.0
  */
 @RunWith(Suite.class)
-@SuiteClasses({FileBufferCreation.class,
-	FileBuffersForWorkspaceFiles.class, 
-	FileBuffersForExternalFiles.class,
-	FileBuffersForLinkedFiles.class,
-	FileBuffersForFilesInLinkedFolders.class,
-	FileBuffersForNonExistingExternalFiles.class,
-	FileBuffersForNonExistingWorkspaceFiles.class,
-	FileBuffersForNonAccessibleWorkspaceFiles.class,
-	FileStoreFileBuffersForWorkspaceFiles.class,
-	FileStoreFileBuffersForExternalFiles.class,
-	FileStoreFileBuffersForNonExistingExternalFiles.class,
-	FileStoreFileBuffersForNonExistingWorkspaceFiles.class,
-	TextFileManagerDocCreationTests.class,
-	ResourceTextFileManagerDocCreationTests.class
-	})
+@SuiteClasses({ FileBufferCreation.class,
+		FileBuffersForWorkspaceFiles.class,
+		FileBuffersForExternalFiles.class,
+		FileBuffersForLinkedFiles.class,
+		FileBuffersForFilesInLinkedFolders.class,
+		FileBuffersForNonExistingExternalFiles.class,
+		FileBuffersForNonExistingWorkspaceFiles.class,
+		FileBuffersForNonAccessibleWorkspaceFiles.class,
+		FileStoreFileBuffersForWorkspaceFiles.class,
+		FileStoreFileBuffersForExternalFiles.class,
+		FileStoreFileBuffersForNonExistingExternalFiles.class,
+		FileStoreFileBuffersForNonExistingWorkspaceFiles.class,
+		TextFileManagerDocCreationTests.class,
+		ResourceTextFileManagerDocCreationTests.class
+})
 public class FileBuffersTestSuite {
-	//intentionally left empty
+	// see @SuiteClasses
 }