diff --git a/resources/tests/org.eclipse.core.tests.resources/META-INF/MANIFEST.MF b/resources/tests/org.eclipse.core.tests.resources/META-INF/MANIFEST.MF index e5b15c9bd46..49e7f0eb7c2 100644 --- a/resources/tests/org.eclipse.core.tests.resources/META-INF/MANIFEST.MF +++ b/resources/tests/org.eclipse.core.tests.resources/META-INF/MANIFEST.MF @@ -35,6 +35,8 @@ Require-Bundle: org.eclipse.core.resources, org.eclipse.core.runtime, org.eclipse.pde.junit.runtime;bundle-version="3.5.0" Import-Package: org.assertj.core.api, + org.junit.jupiter.api, + org.junit.platform.suite.api, org.mockito Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/filesystem/AllFileSystemTests.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/filesystem/AllFileSystemTests.java index 8b34c5b5fa4..f577a29b017 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/filesystem/AllFileSystemTests.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/filesystem/AllFileSystemTests.java @@ -14,14 +14,22 @@ *******************************************************************************/ package org.eclipse.core.tests.filesystem; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; /** * Class for collecting all test classes that deal with the file system API. */ -@RunWith(Suite.class) -@Suite.SuiteClasses({ CreateDirectoryTest.class, DeleteTest.class, EFSTest.class, FileCacheTest.class, - FileStoreTest.class, OpenOutputStreamTest.class, PutInfoTest.class, SymlinkTest.class, URIUtilTest.class }) +@Suite +@SelectClasses({ CreateDirectoryTest.class, // + DeleteTest.class, // + EFSTest.class, // + FileCacheTest.class, // + FileStoreTest.class, // + OpenOutputStreamTest.class, // + PutInfoTest.class, // + SymlinkTest.class, // + URIUtilTest.class, // +}) public class AllFileSystemTests { } diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/alias/AllAliasTests.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/alias/AllAliasTests.java index b93026535b0..303168d97cf 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/alias/AllAliasTests.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/alias/AllAliasTests.java @@ -13,8 +13,8 @@ *******************************************************************************/ package org.eclipse.core.tests.internal.alias; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; /** * Class for collecting all test classes that deal with alias support. An alias @@ -22,7 +22,10 @@ * another resource in the workspace. When a resource changes in a way that * affects the contents on disk, all aliases need to be updated. */ -@RunWith(Suite.class) -@Suite.SuiteClasses({ BasicAliasTest.class, SyncAliasTest.class }) +@Suite +@SelectClasses({ // + BasicAliasTest.class, // + SyncAliasTest.class, // +}) public class AllAliasTests { } diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/AllBuilderTests.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/AllBuilderTests.java index 29dad1e4341..98b0b6b52ac 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/AllBuilderTests.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/AllBuilderTests.java @@ -14,11 +14,11 @@ *******************************************************************************/ package org.eclipse.core.tests.internal.builders; -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({ // AutoBuildJobTest.class, // BuildConfigurationsTest.class, // BuildContextTest.class, // diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/dtree/AllDtreeTests.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/dtree/AllDtreeTests.java index 271f9324669..5b5836f2990 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/dtree/AllDtreeTests.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/dtree/AllDtreeTests.java @@ -13,10 +13,12 @@ *******************************************************************************/ package org.eclipse.core.tests.internal.dtree; -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({ DeltaDataTreeTest.class }) +@Suite +@SelectClasses({ // + DeltaDataTreeTest.class, // +}) public class AllDtreeTests { } diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/events/AllEventsTests.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/events/AllEventsTests.java index 0332d130921..4c06ebf6fef 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/events/AllEventsTests.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/events/AllEventsTests.java @@ -13,10 +13,12 @@ *******************************************************************************/ package org.eclipse.core.tests.internal.events; -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({ BuildProjectFromMultipleJobsTest.class }) +@Suite +@SelectClasses({ // + BuildProjectFromMultipleJobsTest.class, // +}) public class AllEventsTests { } diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/localstore/AllLocalStoreTests.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/localstore/AllLocalStoreTests.java index 506977cbf06..a759fc1a986 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/localstore/AllLocalStoreTests.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/localstore/AllLocalStoreTests.java @@ -14,11 +14,11 @@ *******************************************************************************/ package org.eclipse.core.tests.internal.localstore; -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({ // BlobStoreTest.class, // BucketTreeTests.class, // CaseSensitivityTest.class, // diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/mapping/AllMappingTests.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/mapping/AllMappingTests.java index 1c09da44753..0d73892a4b0 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/mapping/AllMappingTests.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/mapping/AllMappingTests.java @@ -13,8 +13,8 @@ *******************************************************************************/ package org.eclipse.core.tests.internal.mapping; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; /** * Suite containing all tests in the org.eclipse.core.tests.internal.mapping @@ -22,10 +22,10 @@ * * @since 3.2 */ -@RunWith(Suite.class) -@Suite.SuiteClasses({ - ChangeValidationTest.class, - TestProjectDeletion.class - }) +@Suite +@SelectClasses({ // + ChangeValidationTest.class, // + TestProjectDeletion.class, // +}) public class AllMappingTests { } diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/properties/AllPropertiesTests.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/properties/AllPropertiesTests.java index 2c94144c146..276afa73c3b 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/properties/AllPropertiesTests.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/properties/AllPropertiesTests.java @@ -14,11 +14,12 @@ *******************************************************************************/ package org.eclipse.core.tests.internal.properties; -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({ PropertyManagerTest.class }) +@Suite +@SelectClasses({ // + PropertyManagerTest.class, // +}) public class AllPropertiesTests { } diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/propertytester/AllPropertytesterTests.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/propertytester/AllPropertytesterTests.java index 26b01054fd3..e3f8ea61961 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/propertytester/AllPropertytesterTests.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/propertytester/AllPropertytesterTests.java @@ -13,11 +13,13 @@ *******************************************************************************/ package org.eclipse.core.tests.internal.propertytester; -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({ FilePropertyTesterTest.class }) +@Suite +@SelectClasses({ // + FilePropertyTesterTest.class, // +}) public class AllPropertytesterTests { } diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/resources/AllInternalResourcesTests.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/resources/AllInternalResourcesTests.java index 7d2c5a0367a..013b69e6e5b 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/resources/AllInternalResourcesTests.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/resources/AllInternalResourcesTests.java @@ -14,15 +14,15 @@ *******************************************************************************/ package org.eclipse.core.tests.internal.resources; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; /** * The suite method for this class contains test suites for all automated tests * in this test package. */ -@RunWith(Suite.class) -@Suite.SuiteClasses({ // +@Suite +@SelectClasses({ // Bug544975Test.class, // ModelObjectReaderWriterTest.class, // ProjectBuildConfigsTest.class, // @@ -31,6 +31,7 @@ ProjectReferencesTest.class, // ResourceInfoTest.class, // WorkspaceConcurrencyTest.class, // - WorkspacePreferencesTest.class, }) + WorkspacePreferencesTest.class, // +}) public class AllInternalResourcesTests { } diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/utils/AllUtilsTests.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/utils/AllUtilsTests.java index 990c0e85914..274a7bacd6d 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/utils/AllUtilsTests.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/utils/AllUtilsTests.java @@ -14,10 +14,13 @@ *******************************************************************************/ package org.eclipse.core.tests.internal.utils; -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({ ObjectMapTest.class, CacheTest.class, FileUtilTest.class }) +@Suite +@SelectClasses({ // + ObjectMapTest.class, // + CacheTest.class, // + FileUtilTest.class, }) public class AllUtilsTests { } diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/watson/AllWatsonTests.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/watson/AllWatsonTests.java index cf7513255e8..94b08a5054b 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/watson/AllWatsonTests.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/watson/AllWatsonTests.java @@ -13,13 +13,17 @@ *******************************************************************************/ package org.eclipse.core.tests.internal.watson; -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({ - DeltaChainFlatteningTest.class, DeltaFlatteningTest.class, ElementTreeDeltaChainTest.class, - ElementTreeIteratorTest.class, ElementTreeHasChangesTest.class, TreeFlatteningTest.class +@Suite +@SelectClasses({ // + DeltaChainFlatteningTest.class, // + DeltaFlatteningTest.class, // + ElementTreeDeltaChainTest.class, // + ElementTreeIteratorTest.class, // + ElementTreeHasChangesTest.class, // + TreeFlatteningTest.class, // }) public class AllWatsonTests { diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/AllResourcesTests.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/AllResourcesTests.java index 5861437b2ee..7373b63fe7f 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/AllResourcesTests.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/AllResourcesTests.java @@ -14,11 +14,11 @@ *******************************************************************************/ package org.eclipse.core.tests.resources; -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({ // CharsetTest.class, // ContentDescriptionManagerTest.class, // FilteredResourceTest.class, // diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/AutomatedResourceTests.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/AutomatedResourceTests.java index edbea8e901c..38d3f7545fe 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/AutomatedResourceTests.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/AutomatedResourceTests.java @@ -13,28 +13,33 @@ *******************************************************************************/ package org.eclipse.core.tests.resources; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; /** * Runs the sniff tests for the build. All tests listed here should be * automated. */ -@RunWith(Suite.class) -@Suite.SuiteClasses({ org.eclipse.core.tests.filesystem.AllFileSystemTests.class, - org.eclipse.core.tests.internal.alias.AllAliasTests.class, org.eclipse.core.tests.internal.builders.AllBuilderTests.class, - org.eclipse.core.tests.internal.dtree.AllDtreeTests.class, - org.eclipse.core.tests.internal.localstore.AllLocalStoreTests.class, - org.eclipse.core.tests.internal.mapping.AllMappingTests.class, - org.eclipse.core.tests.internal.properties.AllPropertiesTests.class, - org.eclipse.core.tests.internal.propertytester.AllPropertytesterTests.class, - org.eclipse.core.tests.internal.utils.AllUtilsTests.class, org.eclipse.core.tests.internal.watson.AllWatsonTests.class, - org.eclipse.core.tests.resources.AllResourcesTests.class, org.eclipse.core.tests.resources.refresh.AllRefreshTests.class, - org.eclipse.core.tests.resources.regression.AllRegressionTests.class, - org.eclipse.core.tests.resources.usecase.AllUsecaseTests.class, - org.eclipse.core.tests.resources.session.AllSessionTests.class, - org.eclipse.core.tests.resources.content.AllContentTests.class, org.eclipse.core.tests.internal.events.AllEventsTests.class, - org.eclipse.core.tests.internal.resources.AllInternalResourcesTests.class, +@Suite +@SelectClasses({ // + org.eclipse.core.tests.filesystem.AllFileSystemTests.class, // + org.eclipse.core.tests.internal.alias.AllAliasTests.class, // + org.eclipse.core.tests.internal.builders.AllBuilderTests.class, // + org.eclipse.core.tests.internal.dtree.AllDtreeTests.class, // + org.eclipse.core.tests.internal.localstore.AllLocalStoreTests.class, // + org.eclipse.core.tests.internal.mapping.AllMappingTests.class, // + org.eclipse.core.tests.internal.properties.AllPropertiesTests.class, // + org.eclipse.core.tests.internal.propertytester.AllPropertytesterTests.class, // + org.eclipse.core.tests.internal.utils.AllUtilsTests.class, // + org.eclipse.core.tests.internal.watson.AllWatsonTests.class, // + org.eclipse.core.tests.resources.AllResourcesTests.class, // + org.eclipse.core.tests.resources.refresh.AllRefreshTests.class, // + org.eclipse.core.tests.resources.regression.AllRegressionTests.class, // + org.eclipse.core.tests.resources.usecase.AllUsecaseTests.class, // + org.eclipse.core.tests.resources.session.AllSessionTests.class, // + org.eclipse.core.tests.resources.content.AllContentTests.class, // + org.eclipse.core.tests.internal.events.AllEventsTests.class, // + org.eclipse.core.tests.internal.resources.AllInternalResourcesTests.class, // }) public class AutomatedResourceTests { } diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/content/AllContentTests.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/content/AllContentTests.java index 5fa8798a504..0fae4574c55 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/content/AllContentTests.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/content/AllContentTests.java @@ -13,15 +13,22 @@ *******************************************************************************/ package org.eclipse.core.tests.resources.content; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; /** * Runs all content type tests */ -@RunWith(Suite.class) -@Suite.SuiteClasses({ IContentTypeManagerTest.class, SpecificContextTest.class, ContentDescriptionTest.class, - XMLContentDescriberTest.class, LazyInputStreamTest.class, LazyReaderTest.class, TestBug94498.class }) +@Suite +@SelectClasses({ // + IContentTypeManagerTest.class, // + SpecificContextTest.class, // + ContentDescriptionTest.class, // + XMLContentDescriberTest.class, // + LazyInputStreamTest.class, // + LazyReaderTest.class, // + TestBug94498.class, // +}) public class AllContentTests { } diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/perf/AllResourcePerfTests.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/perf/AllResourcePerfTests.java index 7b9aa3b7427..6f239b9ab8f 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/perf/AllResourcePerfTests.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/perf/AllResourcePerfTests.java @@ -13,19 +13,19 @@ *******************************************************************************/ package org.eclipse.core.tests.resources.perf; -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.1 */ -@RunWith(Suite.class) -@Suite.SuiteClasses({ // +@Suite +@SelectClasses({ // BenchCopyFile.class, // BenchElementTree.class, // // BenchFileStore.class, // very long running BenchMiscWorkspace.class, // - BenchWorkspace.class, + BenchWorkspace.class, // BuilderPerformanceTest.class, // ConcurrencyPerformanceTest.class, // ContentDescriptionPerformanceTest.class, // diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/refresh/AllRefreshTests.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/refresh/AllRefreshTests.java index ab3cf2a6cae..666d24041c3 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/refresh/AllRefreshTests.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/refresh/AllRefreshTests.java @@ -13,13 +13,16 @@ *******************************************************************************/ package org.eclipse.core.tests.resources.refresh; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; /** * Runs all tests in this package. */ -@RunWith(Suite.class) -@Suite.SuiteClasses({ RefreshProviderTest.class, RefreshJobTest.class }) +@Suite +@SelectClasses({ // + RefreshProviderTest.class, // + RefreshJobTest.class // +}) public class AllRefreshTests { } diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/AllRegressionTests.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/AllRegressionTests.java index eec427ebfbc..b8321b6cf53 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/AllRegressionTests.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/AllRegressionTests.java @@ -14,14 +14,14 @@ *******************************************************************************/ package org.eclipse.core.tests.resources.regression; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; /** * A suite that runs all regression tests. */ -@RunWith(Suite.class) -@Suite.SuiteClasses({ // +@Suite +@SelectClasses({ // Bug_006708.class, // Bug_025457.class, // Bug_026294.class, // diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/AllSessionTests.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/AllSessionTests.java index 97fa896b60d..9419584f4a1 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/AllSessionTests.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/AllSessionTests.java @@ -13,23 +13,50 @@ *******************************************************************************/ package org.eclipse.core.tests.resources.session; -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({ SampleSessionTest.class, TestBug93473.class, TestSave.class, Test1G1N9GZ.class, - TestCloseNoSave.class, TestMultiSnap.class, TestSaveCreateProject.class, TestSaveSnap.class, - TestSaveWithClosedProject.class, TestSnapSaveSnap.class, TestBug6995.class, - TestInterestingProjectPersistence.class, TestBuilderDeltaSerialization.class, Test1GALH44.class, - TestMissingBuilder.class, TestClosedProjectLocation.class, FindDeletedMembersTest.class, TestBug20127.class, - TestBug12575.class, WorkspaceDescriptionTest.class, TestBug30015.class, - TestMasterTableCleanup.class, - ProjectPreferenceSessionTest.class, TestBug113943.class, TestCreateLinkedResourceInHiddenProject.class, - Bug_266907.class, TestBug323833.class, - org.eclipse.core.tests.resources.regression.TestMultipleBuildersOfSameType.class, - org.eclipse.core.tests.resources.usecase.SnapshotTest.class, ProjectDescriptionDynamicTest.class, - TestBug202384.class, TestBug369177.class, TestBug316182.class, TestBug294854.class, TestBug426263.class, - TestWorkspaceEncodingExistingWorkspace.class, TestWorkspaceEncodingNewWorkspace.class, - TestWorkspaceEncodingWithJvmArgs.class, TestWorkspaceEncodingWithPluginCustomization.class, }) +@Suite +@SelectClasses({ // + SampleSessionTest.class, // + TestBug93473.class, // + TestSave.class, // + Test1G1N9GZ.class, // + TestCloseNoSave.class, // + TestMultiSnap.class, // + TestSaveCreateProject.class, // + TestSaveSnap.class, // + TestSaveWithClosedProject.class, // + TestSnapSaveSnap.class, // + TestBug6995.class, // + TestInterestingProjectPersistence.class, // + TestBuilderDeltaSerialization.class, // + Test1GALH44.class, // + TestMissingBuilder.class, // + TestClosedProjectLocation.class, // + FindDeletedMembersTest.class, // + TestBug20127.class, // + TestBug12575.class, // + WorkspaceDescriptionTest.class, // + TestBug30015.class, // + TestMasterTableCleanup.class, // + ProjectPreferenceSessionTest.class, // + TestBug113943.class, // + TestCreateLinkedResourceInHiddenProject.class, // + Bug_266907.class, // + TestBug323833.class, // + org.eclipse.core.tests.resources.regression.TestMultipleBuildersOfSameType.class, // + org.eclipse.core.tests.resources.usecase.SnapshotTest.class, // + ProjectDescriptionDynamicTest.class, // + TestBug202384.class, // + TestBug369177.class, // + TestBug316182.class, // + TestBug294854.class, // + TestBug426263.class, // + TestWorkspaceEncodingExistingWorkspace.class, // + TestWorkspaceEncodingNewWorkspace.class, // + TestWorkspaceEncodingWithJvmArgs.class, // + TestWorkspaceEncodingWithPluginCustomization.class, // +}) public class AllSessionTests { } diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/usecase/AllUsecaseTests.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/usecase/AllUsecaseTests.java index 3d789fab194..a1e9e3b1735 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/usecase/AllUsecaseTests.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/usecase/AllUsecaseTests.java @@ -13,16 +13,16 @@ *******************************************************************************/ package org.eclipse.core.tests.resources.usecase; -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({ // ConcurrencyTest.class, // IFileTest.class, // IFolderTest.class, // IProjectTest.class, // - IWorkspaceRunnableUseCaseTest.class + IWorkspaceRunnableUseCaseTest.class, // }) public class AllUsecaseTests { }