Creates TestUtilCleanupRule based on TestUtil

In #3029 it
was suggested to add a rule, this is the rule. It is applied to the
tests.

TestRule is still necessary, as some tests spin the event loop or wait
for jobs using it.

Some tearDown methods did also spin the event loop, that is not
necessary as the rule does this already.

Author: vogella

tests/org.eclipse.ui.editors.tests/src/org/eclipse/jface/text/tests/codemining/CodeMiningTest.java

@@ -20,6 +20,7 @@
 import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.BeforeClass;
+import org.junit.Rule;
 import org.junit.Test;
 
 import org.eclipse.swt.custom.StyledText;
@@ -55,9 +56,13 @@
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.ide.IDE;
 
-import org.eclipse.ui.editors.tests.TestUtil;
+import org.eclipse.ui.editors.tests.TestUtilCleanupRule;
 
 public class CodeMiningTest {
+
+	@Rule
+	public TestUtilCleanupRule cleanup = new TestUtilCleanupRule();
+
 	private static String PROJECT_NAME = "test_" + new SimpleDateFormat("yyyyMMdd_HHmmss").format(new Date());
 
 	private static IProject project;
@@ -80,7 +85,6 @@ public void after() {
 		drainEventQueue();
 		CodeMiningTestProvider.provideContentMiningAtOffset = -1;
 		CodeMiningTestProvider.provideHeaderMiningAtLine = -1;
-		TestUtil.cleanUp();
 	}
 
 	private static void closeAllEditors() {

tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/CaseActionTest.java

@@ -22,6 +22,7 @@
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
+import org.junit.Rule;
 import org.junit.Test;
 
 import org.eclipse.core.runtime.NullProgressMonitor;
@@ -50,6 +51,9 @@ public class CaseActionTest {
 	private static IFile file;
 	private AbstractTextEditor editor;
 
+	@Rule
+	public TestUtilCleanupRule cleanup = new TestUtilCleanupRule();
+
 	@BeforeClass
 	public static void setUpBeforeClass() throws Exception {
 		project = ResourcesPlugin.getWorkspace().getRoot().getProject("test");
@@ -63,7 +67,6 @@ public static void setUpBeforeClass() throws Exception {
 	public static void tearDownAfterClass() throws Exception {
 		file.delete(true, new NullProgressMonitor());
 		project.delete(true, new NullProgressMonitor());
-		TestUtil.cleanUp();
 	}
 
 	@Before

tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/ChainedPreferenceStoreTest.java

@@ -19,7 +19,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.junit.After;
+import org.junit.Rule;
 import org.junit.Test;
 
 import org.eclipse.jface.preference.IPreferenceStore;
@@ -31,6 +31,9 @@
 
 public class ChainedPreferenceStoreTest {
 
+	@Rule
+	public TestUtilCleanupRule cleanup = new TestUtilCleanupRule();
+
 	private class PropertyChangeListener implements IPropertyChangeListener {
 
 		@Override
@@ -47,10 +50,6 @@ public void propertyChange(PropertyChangeEvent event) {
 	private static final String DEFAULT_VALUE= "4";
 	private static final String DEFAULT_DEFAULT_VALUE= "";
 
-	@After
-	public void tearDown() {
-		TestUtil.cleanUp();
-	}
 
 	/**
 	 * [implementation] ChainedPreferenceStore

tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/DocumentProviderRegistryTest.java

@@ -44,14 +44,16 @@ public class DocumentProviderRegistryTest {
 	@Rule
 	public TemporaryFolder tmp = new TemporaryFolder();
 
+	@Rule
+	public TestUtilCleanupRule cleanup = new TestUtilCleanupRule();
+
 	private IFile file;
 
 	@After
 	public void tearDown() throws Exception {
 		if (file != null) {
 			ResourceHelper.delete(file.getProject());
 		}
-		TestUtil.cleanUp();
 	}
 
 	@Test

tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/EncodingChangeTests.java

@@ -20,6 +20,7 @@
 
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
 
 import org.eclipse.swt.custom.ScrolledComposite;
@@ -61,6 +62,9 @@
  */
 public class EncodingChangeTests {
 
+	@Rule
+	public TestUtilCleanupRule cleanup = new TestUtilCleanupRule();
+
 	private static final String NON_DEFAULT_ENCODING= "US-ASCII".equals(ResourcesPlugin.getEncoding()) ? "ISO-8859-1" : "US-ASCII";
 	private static final String ORIGINAL_CONTENT= "line1\nline2\nline3";
 
@@ -94,7 +98,6 @@ public void tearDown() throws Exception {
 		fEditor= null;
 		fFile= null;
 		ResourceHelper.deleteProject("EncodingChangeTestProject");
-		TestUtil.cleanUp();
 	}
 
 	@Test

tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/FileDocumentProviderTest.java

@@ -24,6 +24,7 @@
 
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
 
 import org.eclipse.swt.widgets.Display;
@@ -73,6 +74,9 @@
  */
 public class FileDocumentProviderTest {
 
+	@Rule
+	public TestUtilCleanupRule cleanup = new TestUtilCleanupRule();
+
 	private File file;
 	private AtomicBoolean stoppedByTest;
 	private AtomicBoolean stopLockingFlag;
@@ -136,8 +140,6 @@ public void tearDown() throws Exception {
 			page.closeEditor(editor, false);
 		}
 		ResourceHelper.deleteProject(file.getProject().getName());
-		TestUtil.runEventLoop();
-		TestUtil.cleanUp();
 	}
 
 	@Test

tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/FindNextActionTest.java

@@ -22,6 +22,7 @@
 import org.hamcrest.Matchers;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
 import org.osgi.framework.FrameworkUtil;
 
@@ -52,6 +53,10 @@
 import org.eclipse.ui.texteditor.FindReplaceAction;
 
 public class FindNextActionTest {
+
+	@Rule
+	public TestUtilCleanupRule cleanup = new TestUtilCleanupRule();
+
 	private static final String TEST_PROJECT_NAME = "TestProject";
 
 	private static final String BUNDLE_FOR_CONSTRUCTED_KEYS_NAME = "org.eclipse.ui.texteditor.ConstructedEditorMessages";//$NON-NLS-1$
@@ -103,7 +108,6 @@ public void tearDown() throws Exception {
 		editor = null;
 		project.delete(true, null);
 		project = null;
-		TestUtil.cleanUp();
 	}
 
 	private void resetInitialSearchSettings() {

tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/GotoLineTest.java

@@ -18,6 +18,7 @@
 
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
 
 import org.eclipse.swt.custom.StyledText;
@@ -53,6 +54,9 @@
  */
 public class GotoLineTest {
 
+	@Rule
+	public TestUtilCleanupRule cleanup = new TestUtilCleanupRule();
+
 	private static final String ORIGINAL_CONTENT= "line1\nline2\nline3";
 
 	private IFile fFile;
@@ -71,7 +75,6 @@ public void setUp() throws Exception {
 	public void tearDown() throws Exception {
 		ResourceHelper.deleteProject("GoToLineTestProject");
 		fFile= null;
-		TestUtil.cleanUp();
 	}
 
 	@Test

tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/LargeFileTest.java

@@ -19,6 +19,7 @@
 
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
 
 import org.eclipse.swt.widgets.Display;
@@ -51,6 +52,9 @@
  */
 public class LargeFileTest {
 
+	@Rule
+	public TestUtilCleanupRule cleanup = new TestUtilCleanupRule();
+
 	private IFile fLargeFile;
 
 	private IPreferenceStore preferenceStore;
@@ -84,7 +88,6 @@ public void tearDown() throws Exception {
 		ResourceHelper.deleteProject("LargeFileTestProject");
 		fLargeFile= null;
 		preferenceStore.setValue(AbstractTextEditor.PREFERENCE_WORD_WRAP_ENABLED, initialWordWrap);
-		TestUtil.cleanUp();
 	}
 
 	@Test

tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/MarkerAnnotationOrderTest.java

@@ -22,6 +22,7 @@
 
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
 import org.osgi.framework.Bundle;
 
@@ -46,6 +47,9 @@
 
 public class MarkerAnnotationOrderTest {
 
+	@Rule
+	public TestUtilCleanupRule cleanup = new TestUtilCleanupRule();
+
 	IContributor pointContributor= null;
 
 	Object masterToken= null;
@@ -81,7 +85,6 @@ public void tearDown() throws Exception {
 				registry.removeExtension(extension, masterToken);
 			}
 		}
-		TestUtil.cleanUp();
 	}
 
 	@Test