Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions ui/org.eclipse.pde.ui.tests/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@ Import-Package: jakarta.annotation;version="[2.1.0,3.0.0)",
org.hamcrest,
org.junit,
org.junit.jupiter.api.function;version="5.8.1",
org.junit.jupiter.migrationsupport;version="[5.13.0,6.0.0)",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for this migration!
Is this import really necessary? I don't see it referenced directly or is it implicitly required?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it is so that JUnit5 can run older Junit tests.

I just learned yesterday that JUnit6 is already out. :-)

org.junit.platform.suite.api;version="[1.13.0,2.0.0)",
org.junit.rules,
org.junit.runner,
org.junit.runners,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
package org.eclipse.pde.core.tests.internal;

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

@RunWith(Suite.class)
@SuiteClasses({ //
@Suite
@SelectClasses({ //
DependencyManagerTest.class, //
WorkspaceModelManagerTest.class, //
WorkspaceProductModelManagerTest.class, //
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,11 @@
import org.eclipse.pde.ui.tests.views.log.AllLogViewTests;
import org.eclipse.pde.ui.tests.wizards.AllNewProjectTests;
import org.eclipse.ui.tests.smartimport.ProjectSmartImportTest;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
import org.junit.runners.Suite.SuiteClasses;
import org.junit.platform.suite.api.SelectClasses;
import org.junit.platform.suite.api.Suite;

@RunWith(Suite.class)
@SuiteClasses({ //
@Suite
@SelectClasses({ //
AllTargetTests.class, //
AllNewProjectTests.class, //
AllPreferenceTests.class, //
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,11 @@
package org.eclipse.pde.ui.tests.launcher;

import org.eclipse.pde.ui.tests.launcher.product.ProductEditorLaunchingTest;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
import org.junit.runners.Suite.SuiteClasses;
import org.junit.platform.suite.api.SelectClasses;
import org.junit.platform.suite.api.Suite;

/**
* @since 3.5
*/
@RunWith(Suite.class)
@SuiteClasses({ //
@Suite
@SelectClasses({ //
FeatureBasedLaunchTest.class, //
PluginBasedLaunchTest.class, //
LaunchConfigurationHelperTestCase.class, //
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,12 @@
*******************************************************************************/
package org.eclipse.pde.ui.tests.model.bundle;

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


@RunWith(Suite.class)
@SuiteClasses({ ImportPackageTestCase.class, ExportPackageTestCase.class, BundleClasspathTestCase.class,
@Suite
@SelectClasses({ ImportPackageTestCase.class, ExportPackageTestCase.class, BundleClasspathTestCase.class,
BundleActivatorTestCase.class, BundleNameTestCase.class, BundleLocalizationTestCase.class,
LazyStartTestCase.class, RequireBundleTestCase.class, ExecutionEnvironmentTestCase.class,
BundleSymbolicNameTestCase.class, BundleVendorTestCase.class, BundleVersionTestCase.class,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,11 @@
package org.eclipse.pde.ui.tests.model.xml;

import org.eclipse.pde.core.tests.internal.feature.FeatureDataTestCase;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
import org.junit.runners.Suite.SuiteClasses;
import org.junit.platform.suite.api.SelectClasses;
import org.junit.platform.suite.api.Suite;

@RunWith(Suite.class)
@SuiteClasses({ BasicXMLTestCase.class,
@Suite
@SelectClasses({ BasicXMLTestCase.class,
/*
* Commented out till XMLTextChangeListener#getTextOperations() gets fixed /
* updated (see what InputContext does)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,11 @@
*******************************************************************************/
package org.eclipse.pde.ui.tests.nls;

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

/**
* @since 3.4
*/
@RunWith(Suite.class)
@SuiteClasses({ StringHelperTestCase.class })
@Suite
@SelectClasses({ StringHelperTestCase.class })
public class AllNLSTests {

}
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,11 @@
*******************************************************************************/
package org.eclipse.pde.ui.tests.preferences;

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

/**
* @since 3.5
*/
@RunWith(Suite.class)
@SuiteClasses({
@Suite
@SelectClasses({
PDEPreferencesTestCase.class
})
public class AllPreferenceTests {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,11 @@
*******************************************************************************/
package org.eclipse.pde.ui.tests.runtime;

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


@RunWith(Suite.class)
@SuiteClasses({ LocalModelTest.class })
@Suite
@SelectClasses({ LocalModelTest.class })
public class AllPDERuntimeTests {

}
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,11 @@
*******************************************************************************/
package org.eclipse.pde.ui.tests.target;

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

@RunWith(Suite.class)
@SuiteClasses({ TargetEnvironmentTestCase.class, //
@Suite
@SelectClasses({ TargetEnvironmentTestCase.class, //
TargetPlatformHelperTests.class, //
LocalTargetDefinitionTests.class, //
WorkspaceTargetDefinitionTests.class, //
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,11 @@
*******************************************************************************/
package org.eclipse.pde.ui.tests.views.log;

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

@RunWith(Suite.class)
@SuiteClasses({ LogEntryTest.class })
@Suite
@SelectClasses({ LogEntryTest.class })
public class AllLogViewTests {

}
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,11 @@
package org.eclipse.pde.ui.tests.wizards;

import org.eclipse.pde.ui.tests.ee.ExecutionEnvironmentTests;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
import org.junit.runners.Suite.SuiteClasses;
import org.junit.platform.suite.api.SelectClasses;
import org.junit.platform.suite.api.Suite;

@RunWith(Suite.class)
@SuiteClasses({ NewFeatureProjectTestCase.class, NewSiteProjectTestCase.class, ConvertProjectToPluginTestCase.class,
@Suite
@SelectClasses({ NewFeatureProjectTestCase.class, NewSiteProjectTestCase.class, ConvertProjectToPluginTestCase.class,
ExecutionEnvironmentTests.class })
public class AllNewProjectTests {
}
Loading