Skip to content

Commit 8046af5

Browse files
vogellaakurtakov
authored andcommitted
Migrate org.eclipse.search.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 fcc3fcc commit 8046af5

File tree

4 files changed

+18
-18
lines changed

4 files changed

+18
-18
lines changed

tests/org.eclipse.search.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: %pluginName
44
Bundle-SymbolicName: org.eclipse.search.tests;singleton:=true
5-
Bundle-Version: 3.11.800.qualifier
5+
Bundle-Version: 3.11.900.qualifier
66
Bundle-Vendor: %providerName
77
Bundle-Localization: plugin
88
Export-Package: org.eclipse.search.core.tests;x-internal:=true,
@@ -19,6 +19,8 @@ Require-Bundle:
1919
org.eclipse.jface.text;bundle-version="[3.24.200,4.0.0)",
2020
org.eclipse.ui.editors;bundle-version="[3.17.100,4.0.0)",
2121
org.eclipse.ltk.core.refactoring;bundle-version="[3.14.100,4.0.0)"
22+
Import-Package: org.junit.jupiter.api,
23+
org.junit.platform.suite.api
2224
Bundle-ActivationPolicy: lazy
2325
Bundle-RequiredExecutionEnvironment: JavaSE-17
2426
Eclipse-BundleShape: dir

tests/org.eclipse.search.tests/src/org/eclipse/search/core/tests/AllSearchModelTests.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,15 @@
1313
*******************************************************************************/
1414
package org.eclipse.search.core.tests;
1515

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

20-
@RunWith(Suite.class)
21-
@SuiteClasses({
19+
@Suite
20+
@SelectClasses({
2221
QueryManagerTest.class,
2322
TestSearchResult.class,
2423
LineConversionTest.class
2524
})
2625
public class AllSearchModelTests {
27-
// see @SuiteClasses
26+
// see @SelectClasses
2827
}

tests/org.eclipse.search.tests/src/org/eclipse/search/tests/AllSearchTests.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,18 @@
1313
*******************************************************************************/
1414
package org.eclipse.search.tests;
1515

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

2019
import org.eclipse.search.core.tests.AllSearchModelTests;
2120
import org.eclipse.search.tests.filesearch.AllFileSearchTests;
2221

23-
@RunWith(Suite.class)
24-
@SuiteClasses({
22+
@Suite
23+
@SelectClasses({
2524
AllFileSearchTests.class,
2625
AllSearchModelTests.class,
2726
TextSearchRegistryTest.class
2827
})
2928
public class AllSearchTests {
30-
// see @SuiteClasses
29+
// see @SelectClasses
3130
}

tests/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/AllFileSearchTests.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414
package org.eclipse.search.tests.filesearch;
1515

1616
import org.junit.ClassRule;
17-
import org.junit.runner.RunWith;
18-
import org.junit.runners.Suite;
19-
import org.junit.runners.Suite.SuiteClasses;
2017

21-
@RunWith(Suite.class)
22-
@SuiteClasses({
18+
import org.junit.platform.suite.api.Suite;
19+
import org.junit.platform.suite.api.SelectClasses;
20+
21+
@Suite
22+
@SelectClasses({
2323
AnnotationManagerTest.class,
2424
FileSearchTests.class,
2525
LineAnnotationManagerTest.class,

0 commit comments

Comments
 (0)