Skip to content

Convert p2 AutomatedTests to junit 5 suite #1063

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
May 3, 2026
Merged

Convert p2 AutomatedTests to junit 5 suite #1063

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
140 changes: 72 additions & 68 deletions bundles/org.eclipse.equinox.p2.tests/All p2 Tests.launch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,71 +1,75 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
<booleanAttribute key="append.args" value="true"/>
<stringAttribute key="application" value="org.eclipse.pde.junit.runtime.coretestapplication"/>
<booleanAttribute key="askclear" value="false"/>
<booleanAttribute key="automaticAdd" value="true"/>
<booleanAttribute key="automaticValidate" value="false"/>
<stringAttribute key="bootstrap" value=""/>
<stringAttribute key="checked" value="[NONE]"/>
<booleanAttribute key="clearConfig" value="true"/>
<booleanAttribute key="clearws" value="true"/>
<booleanAttribute key="clearwslog" value="false"/>
<booleanAttribute key="com.mountainminds.eclemma.core.INPLACE_INSTRUMENTATION" value="true"/>
<listAttribute key="com.mountainminds.eclemma.core.INSTRUMENTATION_PATHS">
<listEntry value="/org.eclipse.equinox.p2.artifact.repository/bin"/>
<listEntry value="/org.eclipse.equinox.p2.touchpoint.eclipse/bin"/>
<listEntry value="/org.eclipse.equinox.p2.metadata.generator/bin"/>
<listEntry value="/org.eclipse.equinox.p2.exemplarysetup/bin"/>
<listEntry value="/org.eclipse.equinox.p2.director.app/bin"/>
<listEntry value="/org.eclipse.equinox.p2.updatesite/bin"/>
<listEntry value="/org.eclipse.equinox.p2.ui.sdk/bin"/>
<listEntry value="/org.eclipse.equinox.p2.jarprocessor/bin"/>
<listEntry value="/org.eclipse.equinox.frameworkadmin.equinox/bin"/>
<listEntry value="/org.eclipse.equinox.p2.reconciler.dropins/bin"/>
<listEntry value="/org.eclipse.equinox.p2.director/bin"/>
<listEntry value="/org.eclipse.equinox.p2.updatechecker/bin"/>
<listEntry value="/org.eclipse.equinox.simpleconfigurator.manipulator/bin"/>
<listEntry value="/org.eclipse.equinox.p2.engine/bin"/>
<listEntry value="/org.eclipse.equinox.p2.ui/bin"/>
<listEntry value="/org.eclipse.equinox.p2.core/bin"/>
<listEntry value="/org.eclipse.equinox.frameworkadmin/bin"/>
<listEntry value="/org.eclipse.equinox.p2.garbagecollector/bin"/>
<listEntry value="/org.eclipse.equinox.p2.directorywatcher/bin"/>
<listEntry value="/org.eclipse.equinox.simpleconfigurator/bin"/>
<listEntry value="/org.eclipse.equinox.p2.installer/bin"/>
<listEntry value="/org.eclipse.equinox.p2.touchpoint.natives/bin"/>
<listEntry value="/org.eclipse.equinox.p2.metadata.repository/bin"/>
<listEntry value="/org.eclipse.equinox.p2.extensionlocation/bin"/>
<listEntry value="/org.eclipse.equinox.p2.publisher/bin"/>
<listEntry value="/org.eclipse.equinox.p2.metadata/bin"/>
</listAttribute>
<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
<booleanAttribute key="default" value="true"/>
<booleanAttribute key="includeOptional" value="true"/>
<stringAttribute key="location" value="${workspace_loc}/../junit2-workspace"/>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
<listEntry value="/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/AutomatedTests.java"/>
</listAttribute>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
<listEntry value="1"/>
</listAttribute>
<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.equinox.p2.tests.AutomatedTests"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consolelog -console"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.equinox.p2.tests"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dorg.eclipse.equinox.p2.reconciler.tests.platform.archive=c:/dev/platform/zips/eclipse-platform-3.6M6-win32.zip&#13;&#10;-Dorg.eclipse.equinox.p2.reconciler.tests.35.platform.archive=c:/dev/platform/zips/eclipse-platform-3.5-win32.zip&#13;&#10;-Dorg.eclipse.equinox.p2.repository&#13;&#10;-Dorg.eclipse.equinox.p2.tests.current.build.repo=http://eclipsebuildserv/3.6-I-builds/&#13;&#13;&#10;-Xmx512m&#10;-Dorg.eclipse.ecf.provider.filetransfer.httpclient.browse.connectTimeout=10000&#10;-Dorg.eclipse.ecf.provider.filetransfer.httpclient.retrieve.connectTimeout=10000&#10;-Dorg.eclipse.ecf.provider.filetransfer.httpclient.retrieve.readTimeout=10000&#10;-Dorg.eclipse.equinox.p2.transport.ecf.retry=5"/>
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="org.eclipse.sdk.ide"/>
<booleanAttribute key="run_in_ui_thread" value="true"/>
<booleanAttribute key="show_selected_only" value="false"/>
<stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/>
<booleanAttribute key="tracing" value="false"/>
<booleanAttribute key="useCustomFeatures" value="false"/>
<booleanAttribute key="useDefaultConfig" value="true"/>
<booleanAttribute key="useDefaultConfigArea" value="false"/>
<booleanAttribute key="useProduct" value="false"/>
<booleanAttribute key="append.args" value="true"/>
<stringAttribute key="application" value="org.eclipse.pde.junit.runtime.coretestapplication"/>
<booleanAttribute key="askclear" value="false"/>
<booleanAttribute key="automaticAdd" value="true"/>
<booleanAttribute key="automaticValidate" value="false"/>
<stringAttribute key="bootstrap" value=""/>
<stringAttribute key="checked" value="[NONE]"/>
<booleanAttribute key="clearConfig" value="true"/>
<booleanAttribute key="clearws" value="true"/>
<booleanAttribute key="clearwslog" value="false"/>
<booleanAttribute key="com.mountainminds.eclemma.core.INPLACE_INSTRUMENTATION" value="true"/>
<listAttribute key="com.mountainminds.eclemma.core.INSTRUMENTATION_PATHS">
<listEntry value="/org.eclipse.equinox.p2.artifact.repository/bin"/>
<listEntry value="/org.eclipse.equinox.p2.touchpoint.eclipse/bin"/>
<listEntry value="/org.eclipse.equinox.p2.metadata.generator/bin"/>
<listEntry value="/org.eclipse.equinox.p2.exemplarysetup/bin"/>
<listEntry value="/org.eclipse.equinox.p2.director.app/bin"/>
<listEntry value="/org.eclipse.equinox.p2.updatesite/bin"/>
<listEntry value="/org.eclipse.equinox.p2.ui.sdk/bin"/>
<listEntry value="/org.eclipse.equinox.p2.jarprocessor/bin"/>
<listEntry value="/org.eclipse.equinox.frameworkadmin.equinox/bin"/>
<listEntry value="/org.eclipse.equinox.p2.reconciler.dropins/bin"/>
<listEntry value="/org.eclipse.equinox.p2.director/bin"/>
<listEntry value="/org.eclipse.equinox.p2.updatechecker/bin"/>
<listEntry value="/org.eclipse.equinox.simpleconfigurator.manipulator/bin"/>
<listEntry value="/org.eclipse.equinox.p2.engine/bin"/>
<listEntry value="/org.eclipse.equinox.p2.ui/bin"/>
<listEntry value="/org.eclipse.equinox.p2.core/bin"/>
<listEntry value="/org.eclipse.equinox.frameworkadmin/bin"/>
<listEntry value="/org.eclipse.equinox.p2.garbagecollector/bin"/>
<listEntry value="/org.eclipse.equinox.p2.directorywatcher/bin"/>
<listEntry value="/org.eclipse.equinox.simpleconfigurator/bin"/>
<listEntry value="/org.eclipse.equinox.p2.installer/bin"/>
<listEntry value="/org.eclipse.equinox.p2.touchpoint.natives/bin"/>
<listEntry value="/org.eclipse.equinox.p2.metadata.repository/bin"/>
<listEntry value="/org.eclipse.equinox.p2.extensionlocation/bin"/>
<listEntry value="/org.eclipse.equinox.p2.publisher/bin"/>
<listEntry value="/org.eclipse.equinox.p2.metadata/bin"/>
</listAttribute>
<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
<booleanAttribute key="default" value="true"/>
<booleanAttribute key="includeOptional" value="true"/>
<stringAttribute key="location" value="${workspace_loc}/../junit2-workspace"/>
<booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
<listEntry value="/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/AutomatedTests.java"/>
</listAttribute>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
<listEntry value="1"/>
</listAttribute>
<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit5"/>
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/>
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_SHOW_CODEDETAILS_IN_EXCEPTION_MESSAGES" value="true"/>
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.equinox.p2.tests.AutomatedTests"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consolelog -console"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.equinox.p2.tests"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dorg.eclipse.equinox.p2.reconciler.tests.platform.archive=c:/dev/platform/zips/eclipse-platform-3.6M6-win32.zip&#13;&#10;-Dorg.eclipse.equinox.p2.reconciler.tests.35.platform.archive=c:/dev/platform/zips/eclipse-platform-3.5-win32.zip&#13;&#10;-Dorg.eclipse.equinox.p2.repository&#13;&#10;-Dorg.eclipse.equinox.p2.tests.current.build.repo=http://eclipsebuildserv/3.6-I-builds/&#13;&#13;&#10;-Xmx512m&#10;-Dorg.eclipse.ecf.provider.filetransfer.httpclient.browse.connectTimeout=10000&#10;-Dorg.eclipse.ecf.provider.filetransfer.httpclient.retrieve.connectTimeout=10000&#10;-Dorg.eclipse.ecf.provider.filetransfer.httpclient.retrieve.readTimeout=10000&#10;-Dorg.eclipse.equinox.p2.transport.ecf.retry=5"/>
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="org.eclipse.sdk.ide"/>
<booleanAttribute key="run_in_ui_thread" value="true"/>
<booleanAttribute key="show_selected_only" value="false"/>
<stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/>
<booleanAttribute key="tracing" value="false"/>
<booleanAttribute key="useCustomFeatures" value="false"/>
<booleanAttribute key="useDefaultConfig" value="true"/>
<booleanAttribute key="useDefaultConfigArea" value="false"/>
<booleanAttribute key="useProduct" value="false"/>
</launchConfiguration>
1 change: 1 addition & 0 deletions bundles/org.eclipse.equinox.p2.tests/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ Require-Bundle: org.eclipse.equinox.frameworkadmin,
org.eclipse.equinox.p2.publisher;bundle-version="1.0.0",
org.eclipse.equinox.frameworkadmin.test;bundle-version="1.0.0",
org.junit;bundle-version="4.8.0",
junit-platform-suite-api;bundle-version="[1.0.0,2.0.0)",
org.eclipse.equinox.p2.installer;bundle-version="[1.0.0,2.0.0)",
org.eclipse.equinox.simpleconfigurator;bundle-version="1.0.100",
org.eclipse.equinox.p2.updatechecker;bundle-version="1.0.0",
Expand Down
10 changes: 5 additions & 5 deletions bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/AutomatedTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2007, 2010 IBM Corporation and others.
* Copyright (c) 2007, 2026 IBM Corporation and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
Expand All @@ -14,8 +14,8 @@
*******************************************************************************/
package org.eclipse.equinox.p2.tests;

import org.junit.runner.RunWith;
import org.junit.runners.Suite;
import org.junit.platform.suite.api.SelectClasses;
import org.junit.platform.suite.api.Suite;

/**
* This is the master test suite for all automated provisioning tests. It runs
Expand All @@ -25,8 +25,8 @@
*
* PLEASE ADD SUITES IN THE PACKAGE NAME ORDER.
*/
@RunWith(Suite.class)
@Suite.SuiteClasses({ org.eclipse.equinox.p2.tests.publisher.AllTests.class,
@Suite
@SelectClasses({ org.eclipse.equinox.p2.tests.publisher.AllTests.class,
org.eclipse.equinox.frameworkadmin.tests.AllTests.class,
org.eclipse.equinox.p2.tests.ant.AllTests.class,
org.eclipse.equinox.p2.tests.artifact.processors.AllTests.class,
Expand Down
Loading