Skip to content

Migrate PluginWalkerTest from JUnit 4 to JUnit 5 in #3425

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
merged 3 commits into from
Oct 23, 2025
+16 −15
Merged

Migrate PluginWalkerTest from JUnit 4 to JUnit 5 in #3425

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
90b9eb8
Migrate PluginWalkerTest from JUnit 4 to JUnit 5 in
vogella Oct 22, 2025
e43185b
Version bump(s) for 4.38 stream
eclipse-platform-bot Oct 22, 2025
40ab2c4
Fix JUnit 5 migration in org.eclipse.ui.tests.pluginchecks
vogella Oct 23, 2025
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
11 changes: 7 additions & 4 deletions tests/org.eclipse.ui.tests.pluginchecks/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,10 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Pluginchecks
Bundle-SymbolicName: org.eclipse.ui.tests.pluginchecks;singleton:=true
Bundle-Version: 1.2.400.qualifier
Bundle-Version: 1.2.500.qualifier
Automatic-Module-Name: org.eclipse.ui.tests.pluginchecks
Bundle-RequiredExecutionEnvironment: JavaSE-17
Require-Bundle: org.junit;bundle-version="4.12.0",
org.eclipse.core.runtime;bundle-version="3.29.0",
Require-Bundle: org.eclipse.core.runtime;bundle-version="3.29.0",
org.eclipse.e4.ui.css.swt;bundle-version="0.13.200",
org.eclipse.e4.ui.model.workbench;bundle-version="2.1.100",
org.eclipse.e4.ui.workbench.swt;bundle-version="0.14.300",
Expand All @@ -28,4 +27,8 @@ Require-Bundle: org.junit;bundle-version="4.12.0",
org.eclipse.ui.monitoring;bundle-version="1.1.300"
Bundle-ActivationPolicy: lazy
Bundle-Vendor: Eclipse.org
Import-Package: org.eclipse.ui.internal
Import-Package: org.eclipse.ui.internal,
org.junit.jupiter.api;version="[5.14.0,6.0.0)",
org.junit.jupiter.api.function;version="[5.14.0,6.0.0)",
org.junit.platform.commons.function;version="[1.14.0,2.0.0)",
org.junit.platform.suite.api;version="[1.14.0,2.0.0)"
20 changes: 9 additions & 11 deletions ...eclipse.ui.tests.pluginchecks/src/org/eclipse/ui/tests/pluginchecks/PluginWalkerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@

package org.eclipse.ui.tests.pluginchecks;

import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;

import java.io.IOException;
import java.io.InputStream;
Expand All @@ -37,8 +37,8 @@
import org.eclipse.core.runtime.IExtensionPoint;
import org.eclipse.core.runtime.IExtensionRegistry;
import org.eclipse.core.runtime.RegistryFactory;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
Expand Down Expand Up @@ -66,10 +66,10 @@ public class PluginWalkerTest {
private BundleContext bundleContext;
private List<String> bundlesWithPluginXml;

@Before
@BeforeEach
public void setup() throws Exception {
Bundle bundle = FrameworkUtil.getBundle(PluginWalkerTest.class);
assertNotNull("Make sure you're running this as a plugin test", bundle);
assertNotNull(bundle, "Make sure you're running this as a plugin test");
assertNotNull(bundle);
bundleContext = bundle.getBundleContext();
bundlesWithPluginXml = List.of("org.eclipse.e4.ui.css.swt", "org.eclipse.e4.ui.model.workbench",
Expand Down Expand Up @@ -101,10 +101,8 @@ public void ensurePluginxmlContainsAtLeastOneEntry() throws Exception {
boolean hasExtension = extensions.getLength() > 0;
boolean hasExtensionPoint = extensionpoint.getLength() > 0;

assertTrue(
"plugin.xml from " + bundleSymbolicName
+ " must contain at least one extension point or extension",
hasExtension || hasExtensionPoint);
assertTrue(hasExtension || hasExtensionPoint, "plugin.xml from " + bundleSymbolicName
+ " must contain at least one extension point or extension");
}

}
Expand Down
Loading