Skip to content
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

Jump to bottom

migrate some junit 4 suites to junit 5 #1669

Merged
merged 7 commits into from
Sep 26, 2024
Merged

migrate some junit 4 suites to junit 5 #1669

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e8a7a60
migrate some more junit 4 suites to junit 5
carstenartur Sep 21, 2024
fbea282
add jupiter imports
carstenartur Sep 21, 2024
3757f3c
bump bundle version
carstenartur Sep 22, 2024
ea57be5
migrate some more suites to junit 5
carstenartur Sep 22, 2024
b8f3b65
Delete org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/jarexport…
carstenartur Sep 24, 2024
b3d24ff
Revert "Delete org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/j…
jjohnstn Sep 26, 2024
d50425f
Restore FatJarExportTests back to original
jjohnstn Sep 26, 2024
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
20 changes: 17 additions & 3 deletions org.eclipse.jdt.text.tests/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Automatic-Module-Name: org.eclipse.jdt.text.tests
Bundle-ManifestVersion: 2
Bundle-Name: %Plugin.name
Bundle-SymbolicName: org.eclipse.jdt.text.tests;singleton:=true
Bundle-Version: 3.14.550.qualifier
Bundle-Version: 3.14.600.qualifier
Bundle-Activator: org.eclipse.jdt.text.tests.JdtTextTestPlugin
Bundle-ActivationPolicy: lazy
Bundle-Vendor: %Plugin.providerName
Expand Down Expand Up @@ -36,7 +36,21 @@ Require-Bundle:
org.eclipse.jdt.ui.tests,
org.eclipse.test.performance,
org.eclipse.jdt.core.manipulation,
org.eclipse.core.expressions
org.eclipse.core.expressions,
org.eclipse.core.tests.harness,
junit-jupiter-api
Bundle-RequiredExecutionEnvironment: JavaSE-17
Eclipse-BundleShape: dir
Import-Package: org.junit.jupiter.api
Import-Package: org.junit.jupiter.api,
org.junit.jupiter.api.extension,
org.junit.jupiter.migrationsupport,
org.junit.jupiter.migrationsupport.conditions,
org.junit.jupiter.migrationsupport.rules,
org.junit.jupiter.params,
org.junit.jupiter.params.aggregator,
org.junit.jupiter.params.converter,
org.junit.jupiter.params.provider,
org.junit.jupiter.params.support,
org.junit.platform.suite.api,
org.junit.platform.suite.commons;status=INTERNAL,
org.junit.platform.suite.engine;status=INTERNAL
2 changes: 1 addition & 1 deletion org.eclipse.jdt.text.tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
</parent>
<groupId>org.eclipse.jdt</groupId>
<artifactId>org.eclipse.jdt.text.tests</artifactId>
<version>3.14.550-SNAPSHOT</version>
<version>3.14.600-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>

<properties>
Expand Down
8 changes: 4 additions & 4 deletions org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/JdtTextTestSuite.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
*******************************************************************************/
package org.eclipse.jdt.text.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;

import org.eclipse.jdt.text.tests.codemining.CodeMiningTriggerTest;
import org.eclipse.jdt.text.tests.codemining.ParameterNamesCodeMiningTest;
Expand All @@ -29,8 +29,8 @@
*
* @since 3.0
*/
@RunWith(Suite.class)
@Suite.SuiteClasses({
@Suite
@SelectClasses({
PluginsNotLoadedTest.class,
CompilationUnitDocumentProviderTest.class,
JavaHeuristicScannerTest.class,
Expand Down
8 changes: 4 additions & 4 deletions ...e.jdt.text.tests/src/org/eclipse/jdt/text/tests/contentassist/ContentAssistTestSuite.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,16 @@
*******************************************************************************/
package org.eclipse.jdt.text.tests.contentassist;

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

/**
* Content assist test suite.
*
* @since 3.2
*/
@RunWith(Suite.class)
@Suite.SuiteClasses({
@Suite
@SelectClasses({
//$JUnit-BEGIN$
CamelCaseCompletionTest.class,
JavadocCompletionTest.class,
Expand Down
9 changes: 4 additions & 5 deletions ...t.text.tests/src/org/eclipse/jdt/text/tests/performance/DocumentPerformanceTestSuite.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,14 @@
*******************************************************************************/
package org.eclipse.jdt.text.tests.performance;

import org.junit.runner.RunWith;
import org.junit.runners.Suite;

import org.junit.platform.suite.api.SelectClasses;
import org.junit.platform.suite.api.Suite;

/**
* @since 3.3
*/
@RunWith(Suite.class)
@Suite.SuiteClasses({
@Suite
@SelectClasses({
DocumentPerformanceTest.class,
GapTextStorePerformanceTest.class,
LineTrackerPerformanceTest.class
Expand Down
8 changes: 4 additions & 4 deletions ...t.text.tests/src/org/eclipse/jdt/text/tests/performance/WordRulePerformanceTestSuite.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@
*******************************************************************************/
package org.eclipse.jdt.text.tests.performance;

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

/**
* @since 3.6
*/
@RunWith(Suite.class)
@Suite.SuiteClasses({
@Suite
@SelectClasses({
WordRulePerformanceTest.class
})
public class WordRulePerformanceTestSuite {
Expand Down
8 changes: 4 additions & 4 deletions org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/templates/TemplatesTestSuite.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@
* IBM Corporation - initial API and implementation
*******************************************************************************/
package org.eclipse.jdt.text.tests.templates;
import org.junit.runner.RunWith;
import org.junit.platform.suite.api.SelectClasses;
import org.junit.platform.suite.api.Suite;
/**
* Template test suite.
*
* @since 3.4
*/
import org.junit.runners.Suite;

@RunWith(Suite.class)
@Suite.SuiteClasses({
@Suite
@SelectClasses({
//$JUnit-BEGIN$
TemplateContributionTest.class,
TemplateCompletionTests.class
Expand Down
19 changes: 16 additions & 3 deletions org.eclipse.jdt.ui.tests.refactoring/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Automatic-Module-Name: org.eclipse.jdt.ui.tests.refactoring
Bundle-ManifestVersion: 2
Bundle-Name: %Plugin.name
Bundle-SymbolicName: org.eclipse.jdt.ui.tests.refactoring; singleton:=true
Bundle-Version: 3.15.600.qualifier
Bundle-Version: 3.15.700.qualifier
Bundle-Activator: org.eclipse.jdt.ui.tests.refactoring.infra.RefactoringTestPlugin
Bundle-ActivationPolicy: lazy
Bundle-Vendor: %Plugin.providerName
Expand Down Expand Up @@ -40,7 +40,20 @@ Require-Bundle:
org.eclipse.ui.ide,
org.eclipse.ui.workbench.texteditor,
org.junit,
org.eclipse.core.tests.harness
org.eclipse.core.tests.harness,
junit-jupiter-api
Bundle-RequiredExecutionEnvironment: JavaSE-17
Eclipse-BundleShape: dir
Import-Package: org.junit.jupiter.api
Import-Package: org.junit.jupiter.api,
org.junit.jupiter.api.extension,
org.junit.jupiter.migrationsupport,
org.junit.jupiter.migrationsupport.conditions,
org.junit.jupiter.migrationsupport.rules,
org.junit.jupiter.params,
org.junit.jupiter.params.aggregator,
org.junit.jupiter.params.converter,
org.junit.jupiter.params.provider,
org.junit.jupiter.params.support,
org.junit.platform.suite.api,
org.junit.platform.suite.commons;status=INTERNAL,
org.junit.platform.suite.engine;status=INTERNAL
2 changes: 1 addition & 1 deletion org.eclipse.jdt.ui.tests.refactoring/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
</parent>
<groupId>org.eclipse.jdt</groupId>
<artifactId>org.eclipse.jdt.ui.tests.refactoring</artifactId>
<version>3.15.600-SNAPSHOT</version>
<version>3.15.700-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<properties>
<testSuite>${project.artifactId}</testSuite>
Expand Down
8 changes: 4 additions & 4 deletions ....ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/AllChangeTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
*******************************************************************************/
package org.eclipse.jdt.ui.tests.refactoring;

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

@RunWith(Suite.class)
@Suite.SuiteClasses({
@Suite
@SelectClasses({
RenameResourceChangeTests.class,
MoveRenameResourceChangeTests.class,
RenameSourceFolderChangeTests.class,
Expand Down
8 changes: 4 additions & 4 deletions ...ests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/AllRefactoringTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
*******************************************************************************/
package org.eclipse.jdt.ui.tests.refactoring;

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

@RunWith(Suite.class)
@Suite.SuiteClasses({
@Suite
@SelectClasses({
RenameTests18.class,
InlineTempTests1d8.class,
InlineConstantTests1d8.class,
Expand Down
8 changes: 4 additions & 4 deletions ...se.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/AllTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
*******************************************************************************/
package org.eclipse.jdt.ui.tests.refactoring;

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

@RunWith(Suite.class)
@Suite.SuiteClasses({
@Suite
@SelectClasses({
AllRefactoringTests.class,
AllChangeTests.class,
UndoManagerTests.class,
Expand Down
8 changes: 4 additions & 4 deletions ...i.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RenameFieldTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
*******************************************************************************/
package org.eclipse.jdt.ui.tests.refactoring;

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

@RunWith(Suite.class)
@Suite.SuiteClasses({
@Suite
@SelectClasses({
RenameNonPrivateFieldTests.class,
RenamePrivateFieldTests.class
})
Expand Down
8 changes: 4 additions & 4 deletions ....tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RenameMethodTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
*******************************************************************************/
package org.eclipse.jdt.ui.tests.refactoring;

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

@RunWith(Suite.class)
@Suite.SuiteClasses({
@Suite
@SelectClasses({
RenameVirtualMethodInClassTests.class,
RenameMethodInInterfaceTests.class,
RenamePrivateMethodTests.class,
Expand Down
8 changes: 4 additions & 4 deletions ...jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RenameTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
*******************************************************************************/
package org.eclipse.jdt.ui.tests.refactoring;

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

@RunWith(Suite.class)
@Suite.SuiteClasses({
@Suite
@SelectClasses({
RefactoringScannerTests.class,
RenamingNameSuggestorTests.class,

Expand Down
8 changes: 4 additions & 4 deletions ...i.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/actions/AllTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
*******************************************************************************/
package org.eclipse.jdt.ui.tests.refactoring.actions;

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

@RunWith(Suite.class)
@Suite.SuiteClasses({
@Suite
@SelectClasses({
StructureSelectionActionTests.class,
GoToNextPreviousMemberActionTests.class
})
Expand Down
8 changes: 4 additions & 4 deletions ...factoring/test cases/org/eclipse/jdt/ui/tests/refactoring/all/AllAllRefactoringTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
*******************************************************************************/
package org.eclipse.jdt.ui.tests.refactoring.all;

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

@RunWith(Suite.class)
@Suite.SuiteClasses({
@Suite
@SelectClasses({
org.eclipse.jdt.ui.tests.refactoring.actions.AllTests.class,
org.eclipse.jdt.ui.tests.refactoring.nls.NLSTestSuite.class,
org.eclipse.jdt.ui.tests.refactoring.AllTests.class,
Expand Down
8 changes: 4 additions & 4 deletions ...g/test cases/org/eclipse/jdt/ui/tests/refactoring/all/AllRefactoringPerformanceTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@
*******************************************************************************/
package org.eclipse.jdt.ui.tests.refactoring.all;

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

import org.eclipse.jdt.ui.tests.refactoring.reorg.AllReorgPerformanceTests;
import org.eclipse.jdt.ui.tests.refactoring.type.AllTypeConstraintsPerformanceTests;

@RunWith(Suite.class)
@Suite.SuiteClasses({
@Suite
@SelectClasses({
AllReorgPerformanceTests.class,
AllTypeConstraintsPerformanceTests.class
})
Expand Down
8 changes: 4 additions & 4 deletions ...dt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/ccp/AllTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
*******************************************************************************/
package org.eclipse.jdt.ui.tests.refactoring.ccp;

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

@RunWith(Suite.class)
@Suite.SuiteClasses({
@Suite
@SelectClasses({
DeleteTest.class,
CopyToClipboardActionTest.class,
PasteActionTest.class,
Expand Down
8 changes: 4 additions & 4 deletions ...i.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/changes/AllTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
*******************************************************************************/
package org.eclipse.jdt.ui.tests.refactoring.changes;

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

@RunWith(Suite.class)
@Suite.SuiteClasses({
@Suite
@SelectClasses({
TrackPositionTest.class,
TextDiffContentTest.class
})
Expand Down
8 changes: 4 additions & 4 deletions ...ests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/extensions/AllTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
*******************************************************************************/
package org.eclipse.jdt.ui.tests.refactoring.extensions;

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

@RunWith(Suite.class)
@Suite.SuiteClasses({
@Suite
@SelectClasses({
ExtensionPointTests.class
})
public class AllTests {
Expand Down
8 changes: 4 additions & 4 deletions ...i.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/nls/NLSTestSuite.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
*******************************************************************************/
package org.eclipse.jdt.ui.tests.refactoring.nls;

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

@RunWith(Suite.class)
@Suite.SuiteClasses({
@Suite
@SelectClasses({
// old
NLSElementTester.class,
NLSScannerTester.class,
Expand Down
Loading