Skip to content

Commit 61cbd27

Browse files
committed
Update test launch configuration and migrate to JUnit 5 for pde.ds.tests
1 parent d7659ef commit 61cbd27

File tree

3 files changed

+10
-5
lines changed

3 files changed

+10
-5
lines changed

ds/org.eclipse.pde.ds.tests/All DS Tests.launch

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
<booleanAttribute key="default" value="true"/>
1919
<booleanAttribute key="includeOptional" value="true"/>
2020
<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
21+
<booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/>
2122
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
2223
<listEntry value="/org.eclipse.pde.ds.tests/src/org/eclipse/pde/internal/ds/tests/AllDSModelTests.java"/>
2324
</listAttribute>
@@ -27,7 +28,9 @@
2728
<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
2829
<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
2930
<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
30-
<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
31+
<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit5"/>
32+
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/>
33+
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_SHOW_CODEDETAILS_IN_EXCEPTION_MESSAGES" value="true"/>
3134
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
3235
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.pde.internal.ds.tests.AllDSModelTests"/>
3336
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl}"/>

ds/org.eclipse.pde.ds.tests/META-INF/MANIFEST.MF

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ Bundle-Localization: plugin
1414
Bundle-Vendor: %providerName
1515
Export-Package: org.eclipse.pde.internal.ds.tests;x-internal:=true
1616
Import-Package: org.junit,
17+
org.junit.jupiter.api;version="[5.13.0,6.0.0)",
18+
org.junit.platform.suite.api;version="[1.13.0,2.0.0)",
1719
org.junit.runner,
1820
org.junit.runners
1921
Eclipse-BundleShape: dir

ds/org.eclipse.pde.ds.tests/src/org/eclipse/pde/internal/ds/tests/AllDSModelTests.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
*******************************************************************************/
1515
package org.eclipse.pde.internal.ds.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

20-
@RunWith(Suite.class)
21-
@Suite.SuiteClasses({ DSComponentTestCase.class, DSServiceTestCase.class, DSReferenceTestCase.class,
20+
@Suite
21+
@SelectClasses({ DSComponentTestCase.class, DSServiceTestCase.class, DSReferenceTestCase.class,
2222
DSProvideTestCase.class, DSPropertyTestCase.class, DSPropertiesTestCase.class, DSImplementationTestCase.class,
2323
DSObjectTestCase.class, DSv10tov11TestCase.class })
2424
public class AllDSModelTests {

0 commit comments

Comments
 (0)