Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
akurtakov merged 1 commit into from
Jan 3, 2026
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 17 additions & 25 deletions ...clipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/internal/FileEditorMappingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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");
Expand All @@ -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);
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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);
Expand All @@ -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
Expand All @@ -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
Expand Down
22 changes: 10 additions & 12 deletions ...rg.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/internal/SaveablesListTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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();
Expand Down
Loading