Skip to content

Commit 3739f70

Browse files
vogellaakurtakov
authored andcommitted
Migrate org.eclipse.text.tests from JUnit4 to JUnit5
- Convert @RunWith(Suite.class) to @suite - Convert @Suite.SuiteClasses to @SelectClasses - Update imports from org.junit.runners to org.junit.platform.suite.api - Add org.junit.jupiter.api and org.junit.platform.suite.api to Import-Package
1 parent 73d7166 commit 3739f70

File tree

5 files changed

+23
-28
lines changed

5 files changed

+23
-28
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: %Plugin.name
44
Bundle-SymbolicName: org.eclipse.text.tests
5-
Bundle-Version: 3.14.900.qualifier
5+
Bundle-Version: 3.14.1000.qualifier
66
Bundle-Vendor: %Plugin.providerName
77
Bundle-Localization: plugin
88
Export-Package:
@@ -14,6 +14,8 @@ Require-Bundle:
1414
org.eclipse.core.runtime;bundle-version="[3.29.0,4.0.0)",
1515
org.eclipse.text;bundle-version="[3.6.3,4.0.0)",
1616
org.junit;bundle-version="4.12.0"
17+
Import-Package: org.junit.jupiter.api,
18+
org.junit.platform.suite.api
1719
Bundle-RequiredExecutionEnvironment: JavaSE-17
1820
Eclipse-BundleShape: dir
1921
Automatic-Module-Name: org.eclipse.text.tests

tests/org.eclipse.text.tests/projection/org/eclipse/text/tests/ProjectionTestSuite.java

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,18 @@
1414

1515
package org.eclipse.text.tests;
1616

17-
import org.junit.runner.RunWith;
18-
import org.junit.runners.Suite;
19-
import org.junit.runners.Suite.SuiteClasses;
20-
17+
import org.junit.platform.suite.api.Suite;
18+
import org.junit.platform.suite.api.SelectClasses;
2119

2220
/**
2321
*
2422
* @since 3.0
2523
*/
26-
@RunWith(Suite.class)
27-
@SuiteClasses({
24+
@Suite
25+
@SelectClasses({
2826
ProjectionDocumentTest.class,
2927
ProjectionMappingTest.class
3028
})
3129
public class ProjectionTestSuite {
32-
// see @SuiteClasses
30+
// see @SelectClasses
3331
}

tests/org.eclipse.text.tests/src/org/eclipse/text/tests/EclipseTextTestSuite.java

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,21 +14,19 @@
1414
*******************************************************************************/
1515
package org.eclipse.text.tests;
1616

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

2120
import org.eclipse.text.tests.link.LinkTestSuite;
2221
import org.eclipse.text.tests.templates.TemplatesTestSuite;
2322

24-
2523
/**
2624
* Test Suite for org.eclipse.text.
2725
*
2826
* @since 3.0
2927
*/
30-
@RunWith(Suite.class)
31-
@SuiteClasses({
28+
@Suite
29+
@SelectClasses({
3230
MultiStringMatcherTest.class,
3331
ConfigurableLineTrackerTest.class,
3432
LineTrackerTest4.class,
@@ -51,5 +49,5 @@
5149
TemplatesTestSuite.class
5250
})
5351
public class EclipseTextTestSuite {
54-
// see @SuiteClasses
52+
// see @SelectClasses
5553
}

tests/org.eclipse.text.tests/src/org/eclipse/text/tests/link/LinkTestSuite.java

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,23 +14,21 @@
1414

1515
package org.eclipse.text.tests.link;
1616

17-
import org.junit.runner.RunWith;
18-
import org.junit.runners.Suite;
19-
import org.junit.runners.Suite.SuiteClasses;
20-
17+
import org.junit.platform.suite.api.Suite;
18+
import org.junit.platform.suite.api.SelectClasses;
2119

2220
/**
2321
* Test Suite org.eclipse.text.tests.link.
2422
*
2523
* @since 3.0
2624
*/
27-
@RunWith(Suite.class)
28-
@SuiteClasses({
25+
@Suite
26+
@SelectClasses({
2927
LinkedPositionGroupTest.class,
3028
LinkedPositionTest.class,
3129
InclusivePositionUpdaterTest.class,
3230
LinkedModeModelTest.class
3331
})
3432
public class LinkTestSuite {
35-
// see @SuiteClasses
33+
// see @SelectClasses
3634
}

tests/org.eclipse.text.tests/src/org/eclipse/text/tests/templates/TemplatesTestSuite.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,18 @@
1616

1717
package org.eclipse.text.tests.templates;
1818

19-
import org.junit.runner.RunWith;
20-
import org.junit.runners.Suite;
21-
import org.junit.runners.Suite.SuiteClasses;
19+
import org.junit.platform.suite.api.Suite;
20+
import org.junit.platform.suite.api.SelectClasses;
2221

2322
/**
2423
* Test Suite for the org.eclipse.text plug-in
2524
*/
26-
@RunWith(Suite.class)
27-
@SuiteClasses({
25+
@Suite
26+
@SelectClasses({
2827
TemplateTranslatorTest.class,
2928
TemplateVariablesWordSelectionTest.class,
3029
GlobalTemplateVariablesDateTest.class
3130
})
3231
public class TemplatesTestSuite {
33-
// see @SuiteClasses
32+
// see @SelectClasses
3433
}

0 commit comments

Comments
 (0)