Skip to content

Commit 5377447

Browse files
akurtakovakurtakov
committed
Convert p2 AutomatedTests to junit 5 suite
1 parent 308fa50 commit 5377447

3 files changed

Lines changed: 78 additions & 73 deletions

File tree

‎bundles/org.eclipse.equinox.p2.tests/All p2 Tests.launch‎

Lines changed: 72 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -1,71 +1,75 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
22
<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
3-
<booleanAttribute key="append.args" value="true"/>
4-
<stringAttribute key="application" value="org.eclipse.pde.junit.runtime.coretestapplication"/>
5-
<booleanAttribute key="askclear" value="false"/>
6-
<booleanAttribute key="automaticAdd" value="true"/>
7-
<booleanAttribute key="automaticValidate" value="false"/>
8-
<stringAttribute key="bootstrap" value=""/>
9-
<stringAttribute key="checked" value="[NONE]"/>
10-
<booleanAttribute key="clearConfig" value="true"/>
11-
<booleanAttribute key="clearws" value="true"/>
12-
<booleanAttribute key="clearwslog" value="false"/>
13-
<booleanAttribute key="com.mountainminds.eclemma.core.INPLACE_INSTRUMENTATION" value="true"/>
14-
<listAttribute key="com.mountainminds.eclemma.core.INSTRUMENTATION_PATHS">
15-
<listEntry value="/org.eclipse.equinox.p2.artifact.repository/bin"/>
16-
<listEntry value="/org.eclipse.equinox.p2.touchpoint.eclipse/bin"/>
17-
<listEntry value="/org.eclipse.equinox.p2.metadata.generator/bin"/>
18-
<listEntry value="/org.eclipse.equinox.p2.exemplarysetup/bin"/>
19-
<listEntry value="/org.eclipse.equinox.p2.director.app/bin"/>
20-
<listEntry value="/org.eclipse.equinox.p2.updatesite/bin"/>
21-
<listEntry value="/org.eclipse.equinox.p2.ui.sdk/bin"/>
22-
<listEntry value="/org.eclipse.equinox.p2.jarprocessor/bin"/>
23-
<listEntry value="/org.eclipse.equinox.frameworkadmin.equinox/bin"/>
24-
<listEntry value="/org.eclipse.equinox.p2.reconciler.dropins/bin"/>
25-
<listEntry value="/org.eclipse.equinox.p2.director/bin"/>
26-
<listEntry value="/org.eclipse.equinox.p2.updatechecker/bin"/>
27-
<listEntry value="/org.eclipse.equinox.simpleconfigurator.manipulator/bin"/>
28-
<listEntry value="/org.eclipse.equinox.p2.engine/bin"/>
29-
<listEntry value="/org.eclipse.equinox.p2.ui/bin"/>
30-
<listEntry value="/org.eclipse.equinox.p2.core/bin"/>
31-
<listEntry value="/org.eclipse.equinox.frameworkadmin/bin"/>
32-
<listEntry value="/org.eclipse.equinox.p2.garbagecollector/bin"/>
33-
<listEntry value="/org.eclipse.equinox.p2.directorywatcher/bin"/>
34-
<listEntry value="/org.eclipse.equinox.simpleconfigurator/bin"/>
35-
<listEntry value="/org.eclipse.equinox.p2.installer/bin"/>
36-
<listEntry value="/org.eclipse.equinox.p2.touchpoint.natives/bin"/>
37-
<listEntry value="/org.eclipse.equinox.p2.metadata.repository/bin"/>
38-
<listEntry value="/org.eclipse.equinox.p2.extensionlocation/bin"/>
39-
<listEntry value="/org.eclipse.equinox.p2.publisher/bin"/>
40-
<listEntry value="/org.eclipse.equinox.p2.metadata/bin"/>
41-
</listAttribute>
42-
<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
43-
<booleanAttribute key="default" value="true"/>
44-
<booleanAttribute key="includeOptional" value="true"/>
45-
<stringAttribute key="location" value="${workspace_loc}/../junit2-workspace"/>
46-
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
47-
<listEntry value="/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/AutomatedTests.java"/>
48-
</listAttribute>
49-
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
50-
<listEntry value="1"/>
51-
</listAttribute>
52-
<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
53-
<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
54-
<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
55-
<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
56-
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.equinox.p2.tests.AutomatedTests"/>
57-
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consolelog -console"/>
58-
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.equinox.p2.tests"/>
59-
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
60-
<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"/>
61-
<stringAttribute key="pde.version" value="3.3"/>
62-
<stringAttribute key="product" value="org.eclipse.sdk.ide"/>
63-
<booleanAttribute key="run_in_ui_thread" value="true"/>
64-
<booleanAttribute key="show_selected_only" value="false"/>
65-
<stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/>
66-
<booleanAttribute key="tracing" value="false"/>
67-
<booleanAttribute key="useCustomFeatures" value="false"/>
68-
<booleanAttribute key="useDefaultConfig" value="true"/>
69-
<booleanAttribute key="useDefaultConfigArea" value="false"/>
70-
<booleanAttribute key="useProduct" value="false"/>
3+
<booleanAttribute key="append.args" value="true"/>
4+
<stringAttribute key="application" value="org.eclipse.pde.junit.runtime.coretestapplication"/>
5+
<booleanAttribute key="askclear" value="false"/>
6+
<booleanAttribute key="automaticAdd" value="true"/>
7+
<booleanAttribute key="automaticValidate" value="false"/>
8+
<stringAttribute key="bootstrap" value=""/>
9+
<stringAttribute key="checked" value="[NONE]"/>
10+
<booleanAttribute key="clearConfig" value="true"/>
11+
<booleanAttribute key="clearws" value="true"/>
12+
<booleanAttribute key="clearwslog" value="false"/>
13+
<booleanAttribute key="com.mountainminds.eclemma.core.INPLACE_INSTRUMENTATION" value="true"/>
14+
<listAttribute key="com.mountainminds.eclemma.core.INSTRUMENTATION_PATHS">
15+
<listEntry value="/org.eclipse.equinox.p2.artifact.repository/bin"/>
16+
<listEntry value="/org.eclipse.equinox.p2.touchpoint.eclipse/bin"/>
17+
<listEntry value="/org.eclipse.equinox.p2.metadata.generator/bin"/>
18+
<listEntry value="/org.eclipse.equinox.p2.exemplarysetup/bin"/>
19+
<listEntry value="/org.eclipse.equinox.p2.director.app/bin"/>
20+
<listEntry value="/org.eclipse.equinox.p2.updatesite/bin"/>
21+
<listEntry value="/org.eclipse.equinox.p2.ui.sdk/bin"/>
22+
<listEntry value="/org.eclipse.equinox.p2.jarprocessor/bin"/>
23+
<listEntry value="/org.eclipse.equinox.frameworkadmin.equinox/bin"/>
24+
<listEntry value="/org.eclipse.equinox.p2.reconciler.dropins/bin"/>
25+
<listEntry value="/org.eclipse.equinox.p2.director/bin"/>
26+
<listEntry value="/org.eclipse.equinox.p2.updatechecker/bin"/>
27+
<listEntry value="/org.eclipse.equinox.simpleconfigurator.manipulator/bin"/>
28+
<listEntry value="/org.eclipse.equinox.p2.engine/bin"/>
29+
<listEntry value="/org.eclipse.equinox.p2.ui/bin"/>
30+
<listEntry value="/org.eclipse.equinox.p2.core/bin"/>
31+
<listEntry value="/org.eclipse.equinox.frameworkadmin/bin"/>
32+
<listEntry value="/org.eclipse.equinox.p2.garbagecollector/bin"/>
33+
<listEntry value="/org.eclipse.equinox.p2.directorywatcher/bin"/>
34+
<listEntry value="/org.eclipse.equinox.simpleconfigurator/bin"/>
35+
<listEntry value="/org.eclipse.equinox.p2.installer/bin"/>
36+
<listEntry value="/org.eclipse.equinox.p2.touchpoint.natives/bin"/>
37+
<listEntry value="/org.eclipse.equinox.p2.metadata.repository/bin"/>
38+
<listEntry value="/org.eclipse.equinox.p2.extensionlocation/bin"/>
39+
<listEntry value="/org.eclipse.equinox.p2.publisher/bin"/>
40+
<listEntry value="/org.eclipse.equinox.p2.metadata/bin"/>
41+
</listAttribute>
42+
<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
43+
<booleanAttribute key="default" value="true"/>
44+
<booleanAttribute key="includeOptional" value="true"/>
45+
<stringAttribute key="location" value="${workspace_loc}/../junit2-workspace"/>
46+
<booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/>
47+
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
48+
<listEntry value="/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/AutomatedTests.java"/>
49+
</listAttribute>
50+
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
51+
<listEntry value="1"/>
52+
</listAttribute>
53+
<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
54+
<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
55+
<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
56+
<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit5"/>
57+
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/>
58+
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_SHOW_CODEDETAILS_IN_EXCEPTION_MESSAGES" value="true"/>
59+
<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"/>
60+
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.equinox.p2.tests.AutomatedTests"/>
61+
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consolelog -console"/>
62+
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.equinox.p2.tests"/>
63+
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
64+
<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"/>
65+
<stringAttribute key="pde.version" value="3.3"/>
66+
<stringAttribute key="product" value="org.eclipse.sdk.ide"/>
67+
<booleanAttribute key="run_in_ui_thread" value="true"/>
68+
<booleanAttribute key="show_selected_only" value="false"/>
69+
<stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/>
70+
<booleanAttribute key="tracing" value="false"/>
71+
<booleanAttribute key="useCustomFeatures" value="false"/>
72+
<booleanAttribute key="useDefaultConfig" value="true"/>
73+
<booleanAttribute key="useDefaultConfigArea" value="false"/>
74+
<booleanAttribute key="useProduct" value="false"/>
7175
</launchConfiguration>

‎bundles/org.eclipse.equinox.p2.tests/META-INF/MANIFEST.MF‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ Require-Bundle: org.eclipse.equinox.frameworkadmin,
103103
org.eclipse.equinox.p2.publisher;bundle-version="1.0.0",
104104
org.eclipse.equinox.frameworkadmin.test;bundle-version="1.0.0",
105105
org.junit;bundle-version="4.8.0",
106+
junit-platform-suite-api;bundle-version="[1.0.0,2.0.0)",
106107
org.eclipse.equinox.p2.installer;bundle-version="[1.0.0,2.0.0)",
107108
org.eclipse.equinox.simpleconfigurator;bundle-version="1.0.100",
108109
org.eclipse.equinox.p2.updatechecker;bundle-version="1.0.0",

‎bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/AutomatedTests.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2007, 2010 IBM Corporation and others.
2+
* Copyright (c) 2007, 2026 IBM Corporation and others.
33
*
44
* This program and the accompanying materials
55
* are made available under the terms of the Eclipse Public License 2.0
@@ -14,8 +14,8 @@
1414
*******************************************************************************/
1515
package org.eclipse.equinox.p2.tests;
1616

17-
import org.junit.runner.RunWith;
18-
import org.junit.runners.Suite;
17+
import org.junit.platform.suite.api.SelectClasses;
18+
import org.junit.platform.suite.api.Suite;
1919

2020
/**
2121
* This is the master test suite for all automated provisioning tests. It runs
@@ -25,8 +25,8 @@
2525
*
2626
* PLEASE ADD SUITES IN THE PACKAGE NAME ORDER.
2727
*/
28-
@RunWith(Suite.class)
29-
@Suite.SuiteClasses({ org.eclipse.equinox.p2.tests.publisher.AllTests.class,
28+
@Suite
29+
@SelectClasses({ org.eclipse.equinox.p2.tests.publisher.AllTests.class,
3030
org.eclipse.equinox.frameworkadmin.tests.AllTests.class,
3131
org.eclipse.equinox.p2.tests.ant.AllTests.class,
3232
org.eclipse.equinox.p2.tests.artifact.processors.AllTests.class,

0 commit comments

Comments
 (0)