Migrate org.eclipse.compare.tests to JUnit 5 #903

Migrates the tests in org.eclipse.compare.tests to JUnit 5. This
consists of a replacement of the according annotations, migration of
assertions, and the replacement of the JUnit 4 WorkspaceTestRule with
the JUnit 5 WorkspaceResetExtension. The org.junit dependency is removed
from the test bundle.

Contributes to
#903

Author: HeikoKlare

resources/tests/org.eclipse.core.tests.resources/META-INF/MANIFEST.MF

@@ -27,7 +27,8 @@ Export-Package: org.eclipse.core.tests.filesystem,
  org.eclipse.core.tests.resources.refresh,
  org.eclipse.core.tests.resources.regression,
  org.eclipse.core.tests.resources.session,
- org.eclipse.core.tests.resources.usecase
+ org.eclipse.core.tests.resources.usecase,
+ org.eclipse.core.tests.resources.util
 Require-Bundle: org.eclipse.core.resources,
  org.eclipse.core.tests.harness,
  org.junit,

team/tests/org.eclipse.compare.tests/META-INF/MANIFEST.MF

@@ -3,8 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.compare.tests;singleton:=true
 Bundle-Version: 3.8.400.qualifier
-Require-Bundle: org.junit,
- org.eclipse.compare,
+Require-Bundle: org.eclipse.compare,
  org.eclipse.jface.text,
  org.eclipse.jface,
  org.eclipse.core.runtime;bundle-version="[3.29.0,4.0.0)",
@@ -18,6 +17,7 @@ Require-Bundle: org.junit,
 Import-Package: org.assertj.core.api,
  org.assertj.core.api.iterable,
  org.junit.jupiter.api,
+ org.junit.jupiter.api.extension,
  org.junit.platform.suite.api
 Bundle-Activator: org.eclipse.compare.tests.CompareTestPlugin
 Bundle-ActivationPolicy: lazy

team/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/AllCompareTests.java

@@ -13,17 +13,15 @@
  *******************************************************************************/
 package org.eclipse.compare.tests;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-import org.junit.runners.Suite.SuiteClasses;
+import org.junit.platform.suite.api.SelectClasses;
+import org.junit.platform.suite.api.Suite;
 
 /**
  * Test some non-UI areas of the compare plug-in.
  */
-
-@RunWith(Suite.class)
 @SuppressWarnings("deprecation")
-@SuiteClasses({
+@Suite
+@SelectClasses({
 	TextMergeViewerTest.class,
 	LineReaderTest.class,
 	StreamMergerTest.class,

team/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/AsyncExecTests.java

@@ -14,9 +14,9 @@
 package org.eclipse.compare.tests;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -27,7 +27,7 @@
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.OperationCanceledException;
 import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class AsyncExecTests {
 

team/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/CompareFileRevisionEditorInputTest.java

@@ -21,7 +21,7 @@
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.team.internal.ui.history.CompareFileRevisionEditorInput;
 import org.eclipse.ui.IWorkbenchPage;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class CompareFileRevisionEditorInputTest {
 	@Test

team/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/CompareUIPluginTest.java

@@ -26,7 +26,7 @@
 import org.eclipse.compare.structuremergeviewer.DiffNode;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.swt.graphics.Image;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class CompareUIPluginTest {
 

team/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/ContentMergeViewerTest.java

@@ -13,14 +13,14 @@
  *******************************************************************************/
 package org.eclipse.compare.tests;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.eclipse.compare.CompareConfiguration;
 import org.eclipse.compare.contentmergeviewer.ContentMergeViewer;
 import org.eclipse.swt.widgets.Composite;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class ContentMergeViewerTest  {
 	private MyContentMergeViewer myContentMergeViewer;
@@ -91,7 +91,7 @@ protected void updateContent(Object ancestor, Object left, Object right) {
 		}
 	}
 
-	@Before
+	@BeforeEach
 	public void setUp()  {
 		result = new boolean[] { false, false };
 		myContentMergeViewer = new MyContentMergeViewer();

team/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/DiffTest.java

@@ -23,7 +23,7 @@
 import org.eclipse.core.runtime.SubMonitor;
 import org.eclipse.jface.text.Document;
 import org.eclipse.jface.text.IDocument;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class DiffTest {
 

team/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/DocLineComparatorTest.java

@@ -14,8 +14,8 @@
 package org.eclipse.compare.tests;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.HashMap;
 import java.util.Optional;
@@ -27,7 +27,7 @@
 import org.eclipse.jface.text.IDocument;
 import org.eclipse.jface.text.IRegion;
 import org.eclipse.jface.text.Region;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class DocLineComparatorTest {
 

team/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/FileDiffResultTest.java

@@ -44,15 +44,13 @@
 import org.eclipse.core.resources.IStorage;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.tests.resources.WorkspaceTestRule;
-import org.junit.Rule;
-import org.junit.Test;
+import org.eclipse.core.tests.resources.util.WorkspaceResetExtension;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 
+@ExtendWith(WorkspaceResetExtension.class)
 public class FileDiffResultTest {
 
-	@Rule
-	public WorkspaceTestRule workspaceRule = new WorkspaceTestRule();
-
 	private static final String PATCH_FILE = "patchfile";
 
 	private static final String NEW_FILENAME = "newfile";