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, 41 insertions, 22 deletions

diff --git a/org.eclipse.ui.workbench.texteditor.tests/META-INF/MANIFEST.MF b/org.eclipse.ui.workbench.texteditor.tests/META-INF/MANIFEST.MF
index 7127792b3c7..4309663bcec 100644
--- a/org.eclipse.ui.workbench.texteditor.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.ui.workbench.texteditor.tests/META-INF/MANIFEST.MF
@@ -14,7 +14,7 @@ Require-Bundle:
  org.eclipse.jface.text;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.ui.workbench.texteditor;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.ui;bundle-version="[3.5.0,4.0.0)",
- org.junit;bundle-version="3.8.2",
+ org.junit;bundle-version="4.12.0",
  org.eclipse.text.tests;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.test.performance;bundle-version="[3.9.0,4.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/FindReplaceDialogTest.java b/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/FindReplaceDialogTest.java
index 4100efeb9ca..ec025247e0b 100644
--- a/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/FindReplaceDialogTest.java
+++ b/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/FindReplaceDialogTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2015 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
@@ -10,12 +10,19 @@
  *******************************************************************************/
 package org.eclipse.ui.workbench.texteditor.tests;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 import java.util.ResourceBundle;
 
-import org.junit.Before;
+import org.junit.After;
+import org.junit.FixMethodOrder;
+import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.TestName;
+import org.junit.runners.MethodSorters;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Button;
@@ -39,8 +46,12 @@ import org.eclipse.ui.PlatformUI;
  *
  * @since 3.1
  */
+@FixMethodOrder(MethodSorters.NAME_ASCENDING)
 public class FindReplaceDialogTest {
 
+	@Rule
+	public TestName testName = new TestName();
+
 	private Accessor fFindReplaceDialog;
 	private TextViewer fTextViewer;
 
@@ -53,6 +64,7 @@ public class FindReplaceDialogTest {
 			try {
 				Thread.sleep(100);
 			} catch (InterruptedException e) {
+				// do nothing
 			}
 		}
 	}
@@ -80,7 +92,7 @@ public class FindReplaceDialogTest {
 		fFindReplaceDialog= new Accessor(fFindReplaceDialogStubAccessor.invoke("getDialog", null), "org.eclipse.ui.texteditor.FindReplaceDialog", getClass().getClassLoader());
 	}
 
-	@Before
+	@After
 	public void tearDown() throws Exception {
 		if (fFindReplaceDialog != null) {
 			fFindReplaceDialog.invoke("close", null);
@@ -94,7 +106,7 @@ public class FindReplaceDialogTest {
 	}
 
 	@Test
-	public void testInitialButtonState() {
+	public void test01InitialButtonState() {
 		openFindReplaceDialog();
 
 		Boolean value;
@@ -209,7 +221,7 @@ public class FindReplaceDialogTest {
 	}
 
 	private String takeScreenshot() {
-		return ScreenshotTest.takeScreenshot(FindReplaceDialogTest.class, FindReplaceDialogTest.class.getSimpleName(), System.out);
+		return ScreenshotTest.takeScreenshot(FindReplaceDialogTest.class, testName.getMethodName(), System.out);
 	}
 
 	@Test
diff --git a/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/ScreenshotTest.java b/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/ScreenshotTest.java
index 2ad7fef913f..1e8a2bb3468 100644
--- a/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/ScreenshotTest.java
+++ b/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/ScreenshotTest.java
@@ -13,7 +13,9 @@ package org.eclipse.ui.workbench.texteditor.tests;
 import java.io.File;
 import java.io.PrintStream;
 
+import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.TestName;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.GC;
@@ -34,9 +36,12 @@ import org.eclipse.ui.PlatformUI;
 
 public class ScreenshotTest {
 
+	@Rule
+	public TestName testName = new TestName();
+
 	@Test
 	public void testScreenshot() throws Exception {
-		takeScreenshot(ScreenshotTest.class, ScreenshotTest.class.getSimpleName(), System.out);
+		takeScreenshot(ScreenshotTest.class, testName.getMethodName(), System.out);
 	}
 
 	@Test
@@ -65,7 +70,7 @@ public class ScreenshotTest {
         System.out.println("* CTRL up " + display.post(event));
         
         runEventQueue();
-        takeScreenshot(ScreenshotTest.class, ScreenshotTest.class.getSimpleName() + 2, System.out);
+        takeScreenshot(ScreenshotTest.class, testName.getMethodName() + 2, System.out);
         
         event.type= SWT.KeyDown;
         event.character= SWT.ESC;
@@ -75,7 +80,7 @@ public class ScreenshotTest {
         System.out.println("* ESC up " + display.post(event));
         
         runEventQueue();
-        takeScreenshot(ScreenshotTest.class, ScreenshotTest.class.getSimpleName() + 3, System.out);
+        takeScreenshot(ScreenshotTest.class, testName.getMethodName() + 3, System.out);
 	}
 	
 	/**
diff --git a/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/WorkbenchTextEditorTestSuite.java b/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/WorkbenchTextEditorTestSuite.java
index 30cf0893cde..ec8d266777d 100644
--- a/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/WorkbenchTextEditorTestSuite.java
+++ b/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/WorkbenchTextEditorTestSuite.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2012 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
@@ -27,14 +27,14 @@ import org.eclipse.ui.workbench.texteditor.tests.rulers.RulerTestSuite;
  */
 @RunWith(Suite.class)
 @SuiteClasses({
-	FindReplaceDialogTest.class,
-	HippieCompletionTest.class,
-	RangeTest.class,
-	ChangeRegionTest.class,
-	RulerTestSuite.class,
-	HunkComputerTest.class,
-	ScreenshotTest.class
+		FindReplaceDialogTest.class,
+		HippieCompletionTest.class,
+		RangeTest.class,
+		ChangeRegionTest.class,
+		RulerTestSuite.class,
+		HunkComputerTest.class,
+		ScreenshotTest.class
 })
 public class WorkbenchTextEditorTestSuite {
-	//intentionally left blank
+	// see @SuiteClasses
 }
diff --git a/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/rulers/RulerTestSuite.java b/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/rulers/RulerTestSuite.java
index 8c5fc0d7f79..c558bd545ff 100755
--- a/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/rulers/RulerTestSuite.java
+++ b/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/rulers/RulerTestSuite.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2007 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
@@ -19,7 +19,9 @@ import org.junit.runners.Suite.SuiteClasses;
  * @since 3.0
  */
 @RunWith(Suite.class)
-@SuiteClasses(DAGTest.class)
+@SuiteClasses({
+		DAGTest.class
+})
 public class RulerTestSuite {
-	//intentionally left blank
+	// see @SuiteClasses
 }