diff options
Diffstat (limited to 'bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox')
9 files changed, 71 insertions, 101 deletions
diff --git a/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/importexport/AllTests.java b/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/importexport/AllTests.java index 5eec62a57..9457b7134 100644 --- a/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/importexport/AllTests.java +++ b/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/importexport/AllTests.java @@ -1,17 +1,14 @@ package org.eclipse.equinox.p2.tests.importexport; -import junit.framework.*; +import junit.framework.TestCase; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; /** * Performs all automated importexport tests. */ +@RunWith(Suite.class) +@Suite.SuiteClasses({ImportExportTests.class, ImportExportRemoteTests.class}) public class AllTests extends TestCase { - - public static Test suite() { - TestSuite suite = new TestSuite(AllTests.class.getName()); - suite.addTestSuite(ImportExportTests.class); - // suite.addTestSuite(ImportExportRemoteTests.class); - return suite; - } - + // test suite } diff --git a/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/importexport/ImportExportRemoteTests.java b/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/importexport/ImportExportRemoteTests.java index e4ed54776..b594e02fa 100644 --- a/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/importexport/ImportExportRemoteTests.java +++ b/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/importexport/ImportExportRemoteTests.java @@ -25,8 +25,10 @@ import org.eclipse.equinox.p2.repository.metadata.IMetadataRepositoryManager; import org.eclipse.equinox.p2.tests.AbstractProvisioningTest; import org.eclipse.equinox.p2.tests.TestActivator; import org.eclipse.equinox.p2.tests.metadata.repository.ServerBasedTestCase; +import org.junit.Ignore; import org.osgi.util.tracker.ServiceTracker; +@Ignore public class ImportExportRemoteTests extends ServerBasedTestCase { private P2ImportExport importexportService; diff --git a/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/AutomatedTests.java b/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/AutomatedTests.java index 5ddade740..4e5815bf2 100644 --- a/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/AutomatedTests.java +++ b/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/AutomatedTests.java @@ -10,22 +10,20 @@ *******************************************************************************/ package org.eclipse.equinox.p2.tests.ui; -import junit.framework.*; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; /** - * This is the master test suite for all automated provisioning UI tests. It runs every test - * that is suitable for running in an automated fashion as part of a build. + * This is the master test suite for all automated provisioning UI tests. It + * runs every test that is suitable for running in an automated fashion as part + * of a build. */ -public class AutomatedTests extends TestCase { - public static Test suite() { - TestSuite suite = new TestSuite(AutomatedTests.class.getName()); - suite.addTest(org.eclipse.equinox.p2.tests.ui.operations.AllTests.suite()); - suite.addTest(org.eclipse.equinox.p2.tests.ui.query.AllTests.suite()); - suite.addTest(org.eclipse.equinox.p2.tests.ui.actions.AllTests.suite()); - suite.addTest(org.eclipse.equinox.p2.tests.ui.dialogs.AllTests.suite()); - suite.addTest(org.eclipse.equinox.p2.tests.ui.misc.AllTests.suite()); - suite.addTest(org.eclipse.equinox.p2.tests.ui.repohandling.AllTests.suite()); - suite.addTest(org.eclipse.equinox.p2.tests.importexport.AllTests.suite()); - return suite; - } +@RunWith(Suite.class) +@Suite.SuiteClasses({ org.eclipse.equinox.p2.tests.ui.operations.AllTests.class, + org.eclipse.equinox.p2.tests.ui.query.AllTests.class, org.eclipse.equinox.p2.tests.ui.actions.AllTests.class, + org.eclipse.equinox.p2.tests.ui.dialogs.AllTests.class, org.eclipse.equinox.p2.tests.ui.misc.AllTests.class, + org.eclipse.equinox.p2.tests.ui.repohandling.AllTests.class, + org.eclipse.equinox.p2.tests.importexport.AllTests.class }) +public class AutomatedTests { + // test suite } diff --git a/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/actions/AllTests.java b/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/actions/AllTests.java index 33e716868..478115641 100644 --- a/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/actions/AllTests.java +++ b/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/actions/AllTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2010 IBM Corporation and others. + * Copyright (c) 2008, 2018 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -10,19 +10,15 @@ *******************************************************************************/ package org.eclipse.equinox.p2.tests.ui.actions; -import junit.framework.*; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; /** * Performs all UI action tests. */ -public class AllTests extends TestCase { - - public static Test suite() { - TestSuite suite = new TestSuite(AllTests.class.getName()); - suite.addTestSuite(UninstallActionTest.class); - suite.addTestSuite(UpdateActionTest.class); - suite.addTestSuite(RemoveColocatedRepositoryActionTest.class); - suite.addTestSuite(ElementUtilsTest.class); - return suite; - } +@RunWith(Suite.class) +@Suite.SuiteClasses({ UninstallActionTest.class, UpdateActionTest.class, RemoveColocatedRepositoryActionTest.class, + ElementUtilsTest.class }) +public class AllTests { +// test suite } diff --git a/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/dialogs/AllTests.java b/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/dialogs/AllTests.java index 73737b5bc..50ad9cc68 100644 --- a/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/dialogs/AllTests.java +++ b/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/dialogs/AllTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2009 IBM Corporation and others. + * Copyright (c) 2008, 2018 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -10,24 +10,16 @@ *******************************************************************************/ package org.eclipse.equinox.p2.tests.ui.dialogs; -import junit.framework.*; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; /** * Performs all UI wizard and dialog tests. */ -public class AllTests extends TestCase { - - public static Test suite() { - TestSuite suite = new TestSuite(AllTests.class.getName()); - suite.addTestSuite(InstallWizardTest.class); - suite.addTestSuite(InstalledSoftwarePageTest.class); - suite.addTestSuite(InstallWithRemediationTest.class); - suite.addTestSuite(InstallationHistoryPageTest.class); - suite.addTestSuite(UpdateWizardTest.class); - suite.addTestSuite(UninstallWizardTest.class); - suite.addTestSuite(RepositoryManipulationPageTest.class); - suite.addTestSuite(IUPropertyPagesTest.class); - suite.addTestSuite(PreferencePagesTest.class); - return suite; - } +@RunWith(Suite.class) +@Suite.SuiteClasses({ InstallWizardTest.class, InstalledSoftwarePageTest.class, InstallWithRemediationTest.class, + InstallationHistoryPageTest.class, UpdateWizardTest.class, UninstallWizardTest.class, + RepositoryManipulationPageTest.class, IUPropertyPagesTest.class, PreferencePagesTest.class }) +public class AllTests { + // test suite } diff --git a/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/misc/AllTests.java b/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/misc/AllTests.java index 6930fd662..c43e05698 100644 --- a/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/misc/AllTests.java +++ b/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/misc/AllTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2010 IBM Corporation and others. + * Copyright (c) 2008, 2018 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -10,16 +10,14 @@ *******************************************************************************/ package org.eclipse.equinox.p2.tests.ui.misc; -import junit.framework.*; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; /** * Performs all UI action tests. */ -public class AllTests extends TestCase { - - public static Test suite() { - TestSuite suite = new TestSuite(AllTests.class.getName()); - suite.addTestSuite(LicenseManagerTest.class); - return suite; - } +@RunWith(Suite.class) +@Suite.SuiteClasses({ LicenseManagerTest.class }) +public class AllTests { +// test suite } diff --git a/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/operations/AllTests.java b/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/operations/AllTests.java index 6f9f7725c..9927e45fa 100644 --- a/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/operations/AllTests.java +++ b/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/operations/AllTests.java @@ -10,20 +10,15 @@ *******************************************************************************/ package org.eclipse.equinox.p2.tests.ui.operations; -import junit.framework.*; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; /** * Performs all UI operation tests. */ -public class AllTests extends TestCase { - - public static Test suite() { - TestSuite suite = new TestSuite(AllTests.class.getName()); - suite.addTestSuite(ColocatedRepositoryTrackerTest.class); - suite.addTestSuite(SizingTest.class); - suite.addTestSuite(InstallOperationTests.class); - suite.addTestSuite(UpdateOperationTests.class); - suite.addTestSuite(UninstallOperationTests.class); - return suite; - } +@RunWith(Suite.class) +@Suite.SuiteClasses({ ColocatedRepositoryTrackerTest.class, SizingTest.class, InstallOperationTests.class, + UpdateOperationTests.class, UninstallOperationTests.class }) +public class AllTests { +// test suite } diff --git a/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/query/AllTests.java b/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/query/AllTests.java index 301f2cac0..1a80e4a1e 100644 --- a/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/query/AllTests.java +++ b/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/query/AllTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2010 IBM Corporation and others. + * Copyright (c) 2008, 2018 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -10,25 +10,19 @@ *******************************************************************************/ package org.eclipse.equinox.p2.tests.ui.query; -import junit.framework.*; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; /** * Performs all UI query tests. */ -public class AllTests extends TestCase { - - public static Test suite() { - TestSuite suite = new TestSuite(AllTests.class.getName()); - suite.addTestSuite(AnyRequiredCapabilityTest.class); - suite.addTestSuite(AvailableIUWrapperTest.class); - suite.addTestSuite(CategoryElementWrapperTest.class); - suite.addTestSuite(TranslationSupportTests.class); - suite.addTestSuite(LatestIUVersionElementWrapperTest.class); - suite.addTestSuite(QueryDescriptorTest.class); - suite.addTestSuite(QueryProviderTests.class); - suite.addTestSuite(QueryableMetadataRepositoryManagerTest.class); - // This must come after QueryableMetadataRepositoryManager or it causes side-effects in those tests. - suite.addTestSuite(QueryableArtifactRepositoryManagerTest.class); - return suite; - } +@RunWith(Suite.class) +@Suite.SuiteClasses({ AnyRequiredCapabilityTest.class, AvailableIUWrapperTest.class, CategoryElementWrapperTest.class, + TranslationSupportTests.class, LatestIUVersionElementWrapperTest.class, QueryDescriptorTest.class, + QueryProviderTests.class, QueryableMetadataRepositoryManagerTest.class, + // This must come after QueryableMetadataRepositoryManager or it causes + // side-effects in those tests. + QueryableArtifactRepositoryManagerTest.class }) +public class AllTests { +//test suite } diff --git a/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/repohandling/AllTests.java b/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/repohandling/AllTests.java index cd87a077b..24a28a367 100644 --- a/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/repohandling/AllTests.java +++ b/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/repohandling/AllTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2009 IBM Corporation and others. + * Copyright (c) 2008, 2018 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -10,16 +10,14 @@ *******************************************************************************/ package org.eclipse.equinox.p2.tests.ui.repohandling; -import junit.framework.*; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; /** * Performs all UI action tests. */ -public class AllTests extends TestCase { - - public static Test suite() { - TestSuite suite = new TestSuite(AllTests.class.getName()); - suite.addTestSuite(SiteImportExportTest.class); - return suite; - } +@RunWith(Suite.class) +@Suite.SuiteClasses({ SiteImportExportTest.class }) +public class AllTests { +// test suite } |