Skip to content

Commit 554e227

Browse files
vogellaclaude
authored andcommitted
Fix JUnit 5 migration issues in org.eclipse.jface.tests
This commit fixes compilation and test failures introduced during the JUnit 4 to JUnit 5 migration in org.eclipse.jface.tests. Changes: - Added missing import for org.junit.jupiter.api.function package in MANIFEST.MF to resolve NoClassDefFoundError for Executable class used by assertThrows() in LabelProviderTest - Fixed assertEquals parameter order in Bug205700TreeViewerTest to match JUnit 5 signature: assertEquals(expected, actual, message) - Fixed assertEquals parameter order in WizardProgressMonitorTest to match JUnit 5 signature: assertEquals(expected, actual, message) The JUnit 5 assertEquals method has a different parameter order than JUnit 4. In JUnit 4 it was assertEquals(message, expected, actual) but in JUnit 5 it is assertEquals(expected, actual, message). All 1298 tests now pass successfully (0 failures, 0 errors, 3 skipped). 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <[email protected]>
1 parent d26df47 commit 554e227

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

tests/org.eclipse.jface.tests/META-INF/MANIFEST.MF

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ Require-Bundle: org.junit;bundle-version="4.12.0",
1313
org.eclipse.ui.tests.harness
1414
Import-Package: org.osgi.framework,
1515
org.junit.jupiter.api;version="[5.14.0,6.0.0)",
16+
org.junit.jupiter.api.function;version="[5.14.0,6.0.0)",
1617
org.junit.platform.suite.api;version="[1.14.0,2.0.0)"
1718
Export-Package: org.eclipse.jface.tests.fieldassist;x-internal:=true,
1819
org.eclipse.jface.tests.preferences;x-internal:=true,

tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/Bug205700TreeViewerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ private void assertItemNames(String[] names) {
8888
}
8989

9090
private void assertItemName(int index, String name) {
91-
assertEquals("at " + index, name, viewer.getTree().getItem(index).getText());
91+
assertEquals(name, viewer.getTree().getItem(index).getText(), "at " + index);
9292
}
9393

9494
@Test

tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/wizards/WizardProgressMonitorTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@ public void testProgressLabelsClearedBug271530() throws Exception {
8484

8585
protected void performAsserts() {
8686

87-
assertEquals("The progress monitor's label should have been cleared", //$NON-NLS-1$
88-
"", dialog.getProgressMonitorLabelText()); //$NON-NLS-1$
87+
assertEquals("", dialog.getProgressMonitorLabelText(), //$NON-NLS-1$
88+
"The progress monitor's label should have been cleared"); //$NON-NLS-1$
8989

9090
String subTask = dialog.getProgressMonitorSubTaskText();
9191
if (subTask != null && !subTask.isEmpty()) {
@@ -97,8 +97,8 @@ protected IRunnableWithProgress getRunnable(final String taskName) {
9797
return monitor -> {
9898

9999
// check that the label is empty
100-
assertEquals("The progress monitor's label is not initially empty", //$NON-NLS-1$
101-
"", dialog.getProgressMonitorLabelText()); //$NON-NLS-1$
100+
assertEquals("", dialog.getProgressMonitorLabelText(), //$NON-NLS-1$
101+
"The progress monitor's label is not initially empty"); //$NON-NLS-1$
102102

103103
// check the subtask as well
104104
String subTask = dialog.getProgressMonitorSubTaskText();

0 commit comments

Comments
 (0)