Migrate org.eclipse.ui.tests.internal to JUnit5

Author: vogella

tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/internal/FileEditorMappingTest.java

@@ -13,8 +13,8 @@
  *******************************************************************************/
 package org.eclipse.ui.tests.internal;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -23,22 +23,20 @@
 import org.eclipse.ui.ide.IDE;
 import org.eclipse.ui.internal.registry.EditorDescriptor;
 import org.eclipse.ui.internal.registry.FileEditorMapping;
-import org.eclipse.ui.tests.harness.util.CloseTestWindowsRule;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Rule;
-import org.junit.Test;
-
-@Ignore
+import org.eclipse.ui.tests.harness.util.CloseTestWindowsExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+
+@Disabled
+@ExtendWith(CloseTestWindowsExtension.class)
 public class FileEditorMappingTest {
 
-	@Rule
-	public final CloseTestWindowsRule closeTestWindowsRule = new CloseTestWindowsRule();
-
 	private EditorDescriptor textEditor;
 	private EditorDescriptor pdeEditor;
 
-	@Before
+	@BeforeEach
 	public final void setUp() throws Exception {
 		textEditor = (EditorDescriptor) IDE.getEditorDescriptor("test.txt");
 		pdeEditor = (EditorDescriptor) IDE.getEditorDescriptor("plugin.xml");
@@ -53,8 +51,7 @@ public void testEquals() {
 		assertEquals(textEditor, mappingA.getEditors()[0]);
 
 		FileEditorMapping mappingB = new FileEditorMapping("txt");
-		assertFalse("No editor set for B, should not be equal", mappingA
-				.equals(mappingB));
+		assertFalse(mappingA.equals(mappingB), "No editor set for B, should not be equal");
 
 		mappingA.addEditor(pdeEditor);
 		mappingB.addEditor(textEditor);
@@ -70,8 +67,7 @@ public void testEquals() {
 
 		assertEquals(textEditor, mappingA.getDefaultEditor());
 		assertEquals(pdeEditor, mappingB.getDefaultEditor());
-		assertFalse("Identical except the default editor, should not be equal",
-				mappingA.equals(mappingB));
+		assertFalse(mappingA.equals(mappingB), "Identical except the default editor, should not be equal");
 	}
 
 	@Test
@@ -97,8 +93,7 @@ public void testEquals2() {
 		mappingA.setDefaultEditors(defaultA);
 		mappingB.setDefaultEditors(defaultB);
 
-		assertFalse("Identical except the default editor, should not be equal",
-				mappingA.equals(mappingB));
+		assertFalse(mappingA.equals(mappingB), "Identical except the default editor, should not be equal");
 	}
 
 	@Test
@@ -110,8 +105,7 @@ public void testHashCode() {
 		assertEquals(textEditor, mappingA.getEditors()[0]);
 
 		FileEditorMapping mappingB = new FileEditorMapping("txt");
-		assertFalse("No editor set for B, should not be equal", mappingA
-				.hashCode() == mappingB.hashCode());
+		assertFalse(mappingA.hashCode() == mappingB.hashCode(), "No editor set for B, should not be equal");
 
 		mappingA.addEditor(pdeEditor);
 		mappingB.addEditor(textEditor);
@@ -127,8 +121,7 @@ public void testHashCode() {
 
 		assertEquals(textEditor, mappingA.getDefaultEditor());
 		assertEquals(pdeEditor, mappingB.getDefaultEditor());
-		assertFalse("Identical except the default editor, should not be equal",
-				mappingA.hashCode() == mappingB.hashCode());
+		assertFalse(mappingA.hashCode() == mappingB.hashCode(), "Identical except the default editor, should not be equal");
 	}
 
 	@Test
@@ -154,8 +147,7 @@ public void testHashCode2() {
 		mappingA.setDefaultEditors(defaultA);
 		mappingB.setDefaultEditors(defaultB);
 
-		assertFalse("Identical except the default editor, should not be equal",
-				mappingA.hashCode() == mappingB.hashCode());
+		assertFalse(mappingA.hashCode() == mappingB.hashCode(), "Identical except the default editor, should not be equal");
 	}
 
 	@Test

tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/internal/SaveablesListTest.java

@@ -16,10 +16,10 @@
 
 import static org.eclipse.ui.SaveablesLifecycleEvent.POST_CLOSE;
 import static org.eclipse.ui.SaveablesLifecycleEvent.POST_OPEN;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -40,19 +40,17 @@
 import org.eclipse.ui.Saveable;
 import org.eclipse.ui.SaveablesLifecycleEvent;
 import org.eclipse.ui.internal.SaveablesList;
-import org.eclipse.ui.tests.harness.util.CloseTestWindowsRule;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
+import org.eclipse.ui.tests.harness.util.CloseTestWindowsExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 
 /**
  * @since 3.5
  */
+@ExtendWith(CloseTestWindowsExtension.class)
 public class SaveablesListTest {
 
-	@Rule
-	public final CloseTestWindowsRule closeTestWindowsRule = new CloseTestWindowsRule();
-
 	static class GoodSaveable extends Saveable {
 
 		Object source;
@@ -187,7 +185,7 @@ protected Map<Saveable, Integer> getModelRefCounts() {
 	private DummyPart part2;
 	private DummyPart part3;
 
-	@Before
+	@BeforeEach
 	public final void setUp() throws Exception {
 		slist = new SaveablesListForTest();
 		source = new Object();