From b37e9c38120283ec1ec4f478e1516805f409f71b Mon Sep 17 00:00:00 2001 From: Jonah Graham Date: Thu, 27 Oct 2022 14:55:36 -0400 Subject: [PATCH] Delete all the test suites from primary CDT test projects Having the test suites means that tests run multiple times when running in the UI. Most suites just ran the tests in that package, so their value, especially with the transition to JUnit5 is minimal. Note that the suites are not used when running build with Tycho/Maven Part of #117 --- .../core/tests/AutomatedIntegrationSuite.java | 49 -------- .../ScannerDiscoveryTestSuite.java | 32 ----- .../suite/AutomatedIntegrationSuite.java | 111 ----------------- .../core/regressions/RegressionTestSuite.java | 41 ------- ...LanguageSettingsProvidersMBSTestSuite.java | 37 ------ .../tests/AllTemplateEngineTestSuite.java | 50 -------- .../build.properties | 1 - .../tests/ErrorParserTestSuite.java | 41 ------- .../core/language/AllLanguageTestSuite.java | 32 ----- ...anguageSettingsProvidersCoreTestSuite.java | 41 ------- .../core/model/tests/AllCoreTestSuite.java | 73 ----------- .../tests/AllLanguageInterfaceTestSuite.java | 54 --------- .../AllCProjectDescriptionTestSuite.java | 44 ------- .../core/parser/tests/ParserTestSuite.java | 50 -------- .../ast2/DOMGCCParserExtensionTestSuite.java | 36 ------ .../parser/tests/ast2/DOMParserTestSuite.java | 83 ------------- .../constexpr/AllConstexprEvalTestSuite.java | 76 ------------ .../tests/prefix/CompletionTestSuite.java | 31 ----- .../tests/rewrite/RewriteTestSuite.java | 37 ------ .../rewrite/astwriter/AstWriterTestSuite.java | 34 ------ .../ChangeGeneratorTestSuite.java | 37 ------ .../comenthandler/CommentHandlingTest.java | 2 +- .../CommentHandlingTestSuite.java | 34 ------ .../CommentHandlingWithRewriteTest.java | 2 +- .../tests/scanner/ScannerTestSuite.java | 39 ------ .../internal/index/tests/IndexTestSuite.java | 66 ---------- .../internal/pdom/tests/PDOMTestSuite.java | 71 ----------- .../core/suite/AutomatedIntegrationSuite.java | 114 ------------------ core/org.eclipse.cdt.core.tests/test.xml | 56 --------- .../AllTemplateEngineTestSuite.java | 33 ----- .../eclipse/cdt/ui/tests/AutomatedSuite.java | 47 -------- .../callhierarchy/CallHierarchyTestSuite.java | 27 ----- .../cdt/ui/tests/editor/EditorTestSuite.java | 28 ----- .../IncludeBrowserTestSuite.java | 26 ---- .../cdt/ui/tests/misc/MiscTestSuite.java | 29 ----- .../ui/tests/outline/OutlineTestSuite.java | 24 ---- .../refactoring/RefactoringTestSuite.java | 54 --------- .../includes/IncludesTestSuite.java | 28 ----- .../refactoring/utils/UtilTestSuite.java | 34 ------ .../cdt/ui/tests/search/SearchTestSuite.java | 26 ---- .../cdt/ui/tests/text/TextTestSuite.java | 71 ----------- .../contentassist/ContentAssistTestSuite.java | 29 ----- .../ContentAssist2TestSuite.java | 103 ---------------- .../text/doctools/DocCommentTestSuite.java | 35 ------ .../text/selection/SelectionTestSuite.java | 30 ----- .../typehierarchy/TypeHierarchyTestSuite.java | 25 ---- .../viewsupport/ViewSupportTestSuite.java | 29 ----- .../classwizard/ClassWizardTestSuite.java | 25 ---- .../SettingsWizardTestSuite.java | 23 ---- 49 files changed, 2 insertions(+), 2098 deletions(-) delete mode 100644 build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/core/tests/AutomatedIntegrationSuite.java delete mode 100644 build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/scannerdiscovery/ScannerDiscoveryTestSuite.java delete mode 100644 build/org.eclipse.cdt.managedbuilder.core.tests/suite/org/eclipse/cdt/managedbuilder/tests/suite/AutomatedIntegrationSuite.java delete mode 100644 build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/regressions/RegressionTestSuite.java delete mode 100644 build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/language/settings/providers/tests/AllLanguageSettingsProvidersMBSTestSuite.java delete mode 100644 build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/templateengine/tests/AllTemplateEngineTestSuite.java delete mode 100644 core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/errorparsers/tests/ErrorParserTestSuite.java delete mode 100644 core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/AllLanguageTestSuite.java delete mode 100644 core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/settings/providers/AllLanguageSettingsProvidersCoreTestSuite.java delete mode 100644 core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/AllCoreTestSuite.java delete mode 100644 core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/AllLanguageInterfaceTestSuite.java delete mode 100644 core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/AllCProjectDescriptionTestSuite.java delete mode 100644 core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ParserTestSuite.java delete mode 100644 core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/DOMGCCParserExtensionTestSuite.java delete mode 100644 core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/DOMParserTestSuite.java delete mode 100644 core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/AllConstexprEvalTestSuite.java delete mode 100644 core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/prefix/CompletionTestSuite.java delete mode 100644 core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/RewriteTestSuite.java delete mode 100644 core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/astwriter/AstWriterTestSuite.java delete mode 100644 core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/changegenerator/ChangeGeneratorTestSuite.java delete mode 100644 core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/comenthandler/CommentHandlingTestSuite.java delete mode 100644 core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/scanner/ScannerTestSuite.java delete mode 100644 core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexTestSuite.java delete mode 100644 core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMTestSuite.java delete mode 100644 core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/suite/AutomatedIntegrationSuite.java delete mode 100644 core/org.eclipse.cdt.core.tests/test.xml delete mode 100644 core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/AllTemplateEngineTestSuite.java delete mode 100644 core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/AutomatedSuite.java delete mode 100644 core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/CallHierarchyTestSuite.java delete mode 100644 core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/editor/EditorTestSuite.java delete mode 100644 core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/includebrowser/IncludeBrowserTestSuite.java delete mode 100644 core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/misc/MiscTestSuite.java delete mode 100644 core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/outline/OutlineTestSuite.java delete mode 100644 core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/RefactoringTestSuite.java delete mode 100644 core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/includes/IncludesTestSuite.java delete mode 100644 core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/utils/UtilTestSuite.java delete mode 100644 core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/search/SearchTestSuite.java delete mode 100644 core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/TextTestSuite.java delete mode 100644 core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/ContentAssistTestSuite.java delete mode 100644 core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/ContentAssist2TestSuite.java delete mode 100644 core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/doctools/DocCommentTestSuite.java delete mode 100644 core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/SelectionTestSuite.java delete mode 100644 core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/typehierarchy/TypeHierarchyTestSuite.java delete mode 100644 core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/viewsupport/ViewSupportTestSuite.java delete mode 100644 core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/wizards/classwizard/ClassWizardTestSuite.java delete mode 100644 core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/wizards/settingswizards/SettingsWizardTestSuite.java diff --git a/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/core/tests/AutomatedIntegrationSuite.java b/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/core/tests/AutomatedIntegrationSuite.java deleted file mode 100644 index e5fbbf3e410..00000000000 --- a/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/core/tests/AutomatedIntegrationSuite.java +++ /dev/null @@ -1,49 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004, 2013 QNX Software Systems and others. - * - * This program and the accompanying materials - * are made available under the terms of the Eclipse Public License 2.0 - * which accompanies this distribution, and is available at - * https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * QNX Software Systems - initial API and implementation - * Markus Schorn (Wind River Systems) - *******************************************************************************/ -package org.eclipse.cdt.make.core.tests; - -import org.eclipse.cdt.make.builder.tests.StandardBuildTests; -import org.eclipse.cdt.make.scannerdiscovery.ScannerDiscoveryTestSuite; - -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - -public class AutomatedIntegrationSuite extends TestSuite { - - public AutomatedIntegrationSuite() { - } - - public AutomatedIntegrationSuite(Class theClass, String name) { - super(theClass, name); - } - - public AutomatedIntegrationSuite(Class theClass) { - super(theClass); - } - - public AutomatedIntegrationSuite(String name) { - super(name); - } - - public static Test suite() { - final AutomatedIntegrationSuite suite = new AutomatedIntegrationSuite(); - - suite.addTest(StandardBuildTests.suite()); - suite.addTest(ScannerDiscoveryTestSuite.suite()); - suite.addTest(MakefileReaderProviderTests.suite()); - return suite; - } -} diff --git a/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/scannerdiscovery/ScannerDiscoveryTestSuite.java b/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/scannerdiscovery/ScannerDiscoveryTestSuite.java deleted file mode 100644 index 780c02936d1..00000000000 --- a/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/scannerdiscovery/ScannerDiscoveryTestSuite.java +++ /dev/null @@ -1,32 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007, 2009 Wind River Systems, Inc. and others. - * - * This program and the accompanying materials - * are made available under the terms of the Eclipse Public License 2.0 - * which accompanies this distribution, and is available at - * https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Markus Schorn - initial API and implementation - *******************************************************************************/ - -package org.eclipse.cdt.make.scannerdiscovery; - -import junit.framework.TestSuite; - -public class ScannerDiscoveryTestSuite extends TestSuite { - - public static TestSuite suite() { - return new ScannerDiscoveryTestSuite(); - } - - public ScannerDiscoveryTestSuite() { - super(ScannerDiscoveryTestSuite.class.getName()); - addTestSuite(ScannerConfigDiscoveryTests.class); - addTest(GCCScannerInfoConsoleParserTests.suite()); - addTest(GCCPerFileBOPConsoleParserTests.suite()); - addTestSuite(ScannerConfigProfileTests.class); - } -} diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/suite/org/eclipse/cdt/managedbuilder/tests/suite/AutomatedIntegrationSuite.java b/build/org.eclipse.cdt.managedbuilder.core.tests/suite/org/eclipse/cdt/managedbuilder/tests/suite/AutomatedIntegrationSuite.java deleted file mode 100644 index 7c2dae81626..00000000000 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/suite/org/eclipse/cdt/managedbuilder/tests/suite/AutomatedIntegrationSuite.java +++ /dev/null @@ -1,111 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004, 2014 IBM Corporation and others. - * - * This program and the accompanying materials - * are made available under the terms of the Eclipse Public License 2.0 - * which accompanies this distribution, and is available at - * https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * IBM - Initial API and implementation - * Markus Schorn (Wind River Systems) - * James Blackburn (Broadcom Corp.) - *******************************************************************************/ -package org.eclipse.cdt.managedbuilder.tests.suite; - -import org.eclipse.cdt.build.core.scannerconfig.tests.CfgScannerConfigProfileManagerTests; -import org.eclipse.cdt.build.core.scannerconfig.tests.GCCSpecsConsoleParserTest; -import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.cdt.core.dom.IPDOMManager; -import org.eclipse.cdt.managedbuilder.core.regressions.RegressionTestSuite; -import org.eclipse.cdt.managedbuilder.core.tests.BuildDescriptionModelTests; -import org.eclipse.cdt.managedbuilder.core.tests.BuildSystem40Tests; -import org.eclipse.cdt.managedbuilder.core.tests.ManagedBuildCore20Tests; -import org.eclipse.cdt.managedbuilder.core.tests.ManagedBuildCoreTests; -import org.eclipse.cdt.managedbuilder.core.tests.ManagedBuildCore_SharedToolOptionsTests; -import org.eclipse.cdt.managedbuilder.core.tests.ManagedBuildDependencyCalculatorTests; -import org.eclipse.cdt.managedbuilder.core.tests.ManagedBuildEnvironmentTests; -import org.eclipse.cdt.managedbuilder.core.tests.ManagedBuildMacrosTests; -import org.eclipse.cdt.managedbuilder.core.tests.ManagedBuildTCSupportedTest; -import org.eclipse.cdt.managedbuilder.core.tests.ManagedCommandLineGeneratorTest; -import org.eclipse.cdt.managedbuilder.core.tests.ManagedProject21MakefileTests; -import org.eclipse.cdt.managedbuilder.core.tests.ManagedProject30MakefileTests; -import org.eclipse.cdt.managedbuilder.core.tests.ManagedProjectUpdateTests; -import org.eclipse.cdt.managedbuilder.core.tests.MultiVersionSupportTests; -import org.eclipse.cdt.managedbuilder.core.tests.OptionCategoryEnablementTests; -import org.eclipse.cdt.managedbuilder.core.tests.OptionEnablementTests; -import org.eclipse.cdt.managedbuilder.core.tests.PathConverterTest; -import org.eclipse.cdt.managedbuilder.core.tests.ResourceBuildCoreTests; -import org.eclipse.cdt.managedbuilder.language.settings.providers.tests.AllLanguageSettingsProvidersMBSTestSuite; -import org.eclipse.cdt.managedbuilder.templateengine.tests.AllTemplateEngineTestSuite; -import org.eclipse.cdt.projectmodel.tests.BackwardCompatiblityTests; -import org.eclipse.cdt.projectmodel.tests.CProjectDescriptionSerializationTests; -import org.eclipse.cdt.projectmodel.tests.OptionStringListValueTests; -import org.eclipse.cdt.projectmodel.tests.ProjectModelTests; - -import junit.framework.Test; -import junit.framework.TestSuite; - -/** - * Main TestSuite for all the managed build tests - */ -public class AutomatedIntegrationSuite { - public static void main(String[] args) { - junit.textui.TestRunner.run(AutomatedIntegrationSuite.suite()); - } - - public static Test suite() { - CCorePlugin.getDefault().getPluginPreferences().setValue(CCorePlugin.PREF_INDEXER, - IPDOMManager.ID_FAST_INDEXER); - - TestSuite suite = new TestSuite("Test for org.eclipse.cdt.managedbuild.core.tests"); - //$JUnit-BEGIN$ - // Preconditions - suite.addTestSuite(ManagedBuilderPreconditionsTests.class); - - // build.core.scannerconfig.tests - suite.addTest(CfgScannerConfigProfileManagerTests.suite()); - suite.addTestSuite(GCCSpecsConsoleParserTest.class); - - // language settings providers tests - suite.addTest(AllLanguageSettingsProvidersMBSTestSuite.suite()); - - // managedbuilder.core.tests - // Test converted to JUnit5: suite.addTest(ManagedBuildDependencyLibsTests.suite()); - suite.addTest(ManagedBuildCore20Tests.suite()); - suite.addTest(ManagedBuildCoreTests.suite()); - suite.addTest(ManagedProjectUpdateTests.suite()); - suite.addTest(ManagedCommandLineGeneratorTest.suite()); - suite.addTest(ResourceBuildCoreTests.suite()); - suite.addTest(ManagedProject21MakefileTests.suite()); - suite.addTest(ManagedProject30MakefileTests.suite()); - suite.addTest(BuildSystem40Tests.suite()); - suite.addTest(ManagedBuildCore_SharedToolOptionsTests.suite()); - suite.addTest(ManagedBuildEnvironmentTests.suite()); - suite.addTest(ManagedBuildMacrosTests.suite()); - suite.addTest(ManagedBuildTCSupportedTest.suite()); - suite.addTest(MultiVersionSupportTests.suite()); - suite.addTest(OptionEnablementTests.suite()); - suite.addTest(OptionCategoryEnablementTests.suite()); - suite.addTest(ManagedBuildDependencyCalculatorTests.suite()); - suite.addTest(BuildDescriptionModelTests.suite()); - suite.addTest(PathConverterTest.suite()); - - // managedbuilder.templateengine.tests - suite.addTest(AllTemplateEngineTestSuite.suite()); - - // projectmodel.tests - suite.addTest(BackwardCompatiblityTests.suite()); - suite.addTest(CProjectDescriptionSerializationTests.suite()); - suite.addTest(OptionStringListValueTests.suite()); - suite.addTest(ProjectModelTests.suite()); - - // regression tests - suite.addTest(RegressionTestSuite.suite()); - - //$JUnit-END$ - return suite; - } -} diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/regressions/RegressionTestSuite.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/regressions/RegressionTestSuite.java deleted file mode 100644 index 94de1f2a43f..00000000000 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/regressions/RegressionTestSuite.java +++ /dev/null @@ -1,41 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011 Broadcom Corporation and others. - * - * This program and the accompanying materials - * are made available under the terms of the Eclipse Public License 2.0 - * which accompanies this distribution, and is available at - * https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Broadcom Corporation - Initial API and implementation - *******************************************************************************/ -package org.eclipse.cdt.managedbuilder.core.regressions; - -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - -/** - * Regression tests for builder bugs - */ -public class RegressionTestSuite extends TestCase { - - public static Test suite() { - TestSuite suite = new TestSuite(RegressionTestSuite.class.getName()); - - // Test that common builder does the correct amount of work. - // Test converted to JUnit5: suite.addTest(new JUnit4TestAdapter(Bug_303953Test.class)); - - return suite; - } - - public RegressionTestSuite() { - super(null); - } - - public RegressionTestSuite(String name) { - super(name); - } -} diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/language/settings/providers/tests/AllLanguageSettingsProvidersMBSTestSuite.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/language/settings/providers/tests/AllLanguageSettingsProvidersMBSTestSuite.java deleted file mode 100644 index 87fc4cfe990..00000000000 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/language/settings/providers/tests/AllLanguageSettingsProvidersMBSTestSuite.java +++ /dev/null @@ -1,37 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010, 2012 Andrew Gvozdev and others. - * - * This program and the accompanying materials - * are made available under the terms of the Eclipse Public License 2.0 - * which accompanies this distribution, and is available at - * https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Andrew Gvozdev - initial API and implementation - *******************************************************************************/ - -package org.eclipse.cdt.managedbuilder.language.settings.providers.tests; - -import junit.framework.TestSuite; - -/** - * Test suite to test language settings providers defined in cdt.managedbuilder.core. - */ -public class AllLanguageSettingsProvidersMBSTestSuite extends TestSuite { - - public static TestSuite suite() { - return new AllLanguageSettingsProvidersMBSTestSuite(); - } - - public AllLanguageSettingsProvidersMBSTestSuite() { - super(AllLanguageSettingsProvidersMBSTestSuite.class.getName()); - - addTestSuite(LanguageSettingsProvidersMBSTest.class); - addTestSuite(GCCBuildCommandParserTest.class); - addTestSuite(BuiltinSpecsDetectorTest.class); - addTestSuite(GCCBuiltinSpecsDetectorTest.class); - addTestSuite(CompilationDatabaseParserTest.class); - } -} diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/templateengine/tests/AllTemplateEngineTestSuite.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/templateengine/tests/AllTemplateEngineTestSuite.java deleted file mode 100644 index ece48e30e79..00000000000 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/templateengine/tests/AllTemplateEngineTestSuite.java +++ /dev/null @@ -1,50 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007, 2009 2008 Symbian Software Limited and others. - * - * This program and the accompanying materials - * are made available under the terms of the Eclipse Public License 2.0 - * which accompanies this distribution, and is available at - * https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Bala Torati (Symbian) - Initial API and implementation - *******************************************************************************/ -package org.eclipse.cdt.managedbuilder.templateengine.tests; - -import junit.framework.Test; -import junit.framework.TestSuite; - -/** - * This is a TestSuite, the TestCases created to test Template engine are - * added to test-suite. The test suite will execute all the test cases added - * to the Suite. - * - * @since 4.0 - */ -public class AllTemplateEngineTestSuite extends TestSuite { - - public static void main(String[] args) { - junit.textui.TestRunner.run(AllTemplateEngineTestSuite.suite()); - } - - /** - * Since the TemplateEngine consists of UI(Wizard). - * A TestWizard is created to which the dynamically generated - * UIPages are added. The Wizard is launched from here. - * The TestCases created to test the TemplateEngine is initialized here. - * @return - * - * @since 4.0 - */ - public static Test suite() { - TestSuite suite = new TestSuite("Template engine tests"); //$NON-NLS-1$ - //$JUnit-BEGIN$ - - suite.addTestSuite(TestProcesses.class); - - //$JUnit-END$ - return suite; - } -} diff --git a/core/org.eclipse.cdt.core.tests/build.properties b/core/org.eclipse.cdt.core.tests/build.properties index edc11222857..b8f3d1974c6 100644 --- a/core/org.eclipse.cdt.core.tests/build.properties +++ b/core/org.eclipse.cdt.core.tests/build.properties @@ -15,7 +15,6 @@ bin.includes = plugin.xml,\ plugin.properties,\ about.html,\ .,\ - test.xml,\ resources/,\ META-INF/,\ parser/org/eclipse/cdt/internal/index/tests/,\ diff --git a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/errorparsers/tests/ErrorParserTestSuite.java b/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/errorparsers/tests/ErrorParserTestSuite.java deleted file mode 100644 index 1fa2c479292..00000000000 --- a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/errorparsers/tests/ErrorParserTestSuite.java +++ /dev/null @@ -1,41 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2005, 2010 QNX Software Systems - * - * This program and the accompanying materials - * are made available under the terms of the Eclipse Public License 2.0 - * which accompanies this distribution, and is available at - * https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * QNX Software Systems - initial API and implementation - *******************************************************************************/ -package org.eclipse.cdt.core.internal.errorparsers.tests; - -import junit.framework.Test; -import junit.framework.TestSuite; - -/** - * @deprecated In preparation for moving to JUnit5 test suites are deprecated. See Bug 569839 - */ -@Deprecated -public class ErrorParserTestSuite { - - public static Test suite() { - TestSuite suite = new TestSuite(ErrorParserTestSuite.class.getName()); - - // Just add more test cases here as you create them for - // each class being tested - suite.addTest(GCCErrorParserTests.suite()); - suite.addTest(GLDErrorParserTests.suite()); - suite.addTest(MakeErrorParserTests.suite()); - suite.addTest(FileBasedErrorParserTests.suite()); - suite.addTest(ErrorParserManagerTest.suite()); - suite.addTest(ErrorParserFileMatchingTest.suite()); - suite.addTest(ErrorParserEfsFileMatchingTest.suite()); - suite.addTest(RegexErrorParserTests.suite()); - return suite; - } - -} diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/AllLanguageTestSuite.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/AllLanguageTestSuite.java deleted file mode 100644 index 2301e0d436c..00000000000 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/AllLanguageTestSuite.java +++ /dev/null @@ -1,32 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 IBM Corporation and others. - * - * This program and the accompanying materials - * are made available under the terms of the Eclipse Public License 2.0 - * which accompanies this distribution, and is available at - * https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.cdt.core.language; - -import junit.framework.Test; -import junit.framework.TestSuite; - -/** - * @author crecoskie - * @deprecated In preparation for moving to JUnit5 test suites are deprecated. See Bug 569839 - */ -@Deprecated -public class AllLanguageTestSuite extends TestSuite { - public static Test suite() { - TestSuite suite = new AllLanguageTestSuite(); - - suite.addTest(LanguageInheritanceTests.suite()); - - return suite; - } -} diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/settings/providers/AllLanguageSettingsProvidersCoreTestSuite.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/settings/providers/AllLanguageSettingsProvidersCoreTestSuite.java deleted file mode 100644 index 950160ba6c7..00000000000 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/settings/providers/AllLanguageSettingsProvidersCoreTestSuite.java +++ /dev/null @@ -1,41 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010, 2013 Andrew Gvozdev and others. - * - * This program and the accompanying materials - * are made available under the terms of the Eclipse Public License 2.0 - * which accompanies this distribution, and is available at - * https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Andrew Gvozdev - Initial API and implementation - *******************************************************************************/ -package org.eclipse.cdt.core.language.settings.providers; - -import junit.framework.Test; -import junit.framework.TestSuite; - -/** - * Test suite to cover core Language Settings Providers functionality. - * @deprecated In preparation for moving to JUnit5 test suites are deprecated. See Bug 569839 - */ -@Deprecated -public class AllLanguageSettingsProvidersCoreTestSuite { - public static void main(String[] args) { - junit.textui.TestRunner.run(suite()); - } - - public static Test suite() { - TestSuite suite = new TestSuite(AllLanguageSettingsProvidersCoreTestSuite.class.getName()); - - suite.addTest(LanguageSettingsExtensionsTests.suite()); - suite.addTest(LanguageSettingsManagerTests.suite()); - suite.addTest(LanguageSettingsSerializableProviderTests.suite()); - // Test converted to JUnit5: suite.addTest(LanguageSettingsPersistenceProjectTests.suite()); - // Test converted to JUnit5: suite.addTest(LanguageSettingsListenersTests.suite()); - suite.addTest(LanguageSettingsScannerInfoProviderTests.suite()); - suite.addTest(LanguageSettingsProviderReferencedProjectsTests.suite()); - return suite; - } -} diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/AllCoreTestSuite.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/AllCoreTestSuite.java deleted file mode 100644 index 997bf019ad6..00000000000 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/AllCoreTestSuite.java +++ /dev/null @@ -1,73 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2012 QNX Software Systems and others. - * - * This program and the accompanying materials - * are made available under the terms of the Eclipse Public License 2.0 - * which accompanies this distribution, and is available at - * https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * QNX Software Systems - Initial API and implementation - * Markus Schorn (Wind River Systems) - *******************************************************************************/ -package org.eclipse.cdt.core.model.tests; - -import org.eclipse.cdt.core.language.settings.providers.AllLanguageSettingsProvidersCoreTestSuite; -import org.eclipse.cdt.core.settings.model.AllCProjectDescriptionTestSuite; -import org.eclipse.cdt.core.settings.model.PathSettingsContainerTests; - -import junit.framework.Test; -import junit.framework.TestSuite; - -/** - * - * AllTests.java - * This is the main entry point for running this suite of JUnit tests - * for all tests within the package "org.eclipse.cdt.core.model" - * - * @author Judy N. Green - * @since Jul 19, 2002 - * @deprecated In preparation for moving to JUnit5 test suites are deprecated. See Bug 569839 - */ -@Deprecated -public class AllCoreTestSuite { - - public static void main(String[] args) { - junit.textui.TestRunner.run(suite()); - } - - public static Test suite() { - TestSuite suite = new TestSuite(AllCoreTestSuite.class.getName()); - - // Just add more test cases here as you create them for - // each class being tested - suite.addTest(AllLanguageInterfaceTestSuite.suite()); - suite.addTest(CModelTests.suite()); - suite.addTest(CModelElementsTests.suite()); - suite.addTest(CModelIdentifierTests.suite()); - suite.addTest(CModelExceptionTest.suite()); - suite.addTest(CModelBuilderInactiveCodeTest.suite()); - suite.addTest(FlagTests.suite()); - suite.addTest(ArchiveTests.suite()); - suite.addTest(BinaryTests.suite()); - suite.addTest(TranslationUnitTests.suite()); - suite.addTest(DeclaratorsTests.suite()); - suite.addTest(MacroTests.suite()); - // suite.addTest(FailedMacroTests.suite()); - suite.addTest(CPathEntryTest.suite()); - //the CProjectDescriptionTests now groups all New Project Model related tests - //which includes the CConfigurationDescriptionReferenceTests - suite.addTest(AllCProjectDescriptionTestSuite.suite()); - suite.addTest(PathSettingsContainerTests.suite()); - suite.addTest(ASTCacheTests.suite()); - suite.addTest(AsmModelBuilderTest.suite()); - suite.addTest(CModelBuilderBugsTest.suite()); - suite.addTest(Bug311189Tests.suite()); - - suite.addTest(AllLanguageSettingsProvidersCoreTestSuite.suite()); - return suite; - - } -} // End of AllCoreTests.java diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/AllLanguageInterfaceTestSuite.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/AllLanguageInterfaceTestSuite.java deleted file mode 100644 index 32ce5922982..00000000000 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/AllLanguageInterfaceTestSuite.java +++ /dev/null @@ -1,54 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2005 IBM Corporation and others. - * - * This program and the accompanying materials - * are made available under the terms of the Eclipse Public License 2.0 - * which accompanies this distribution, and is available at - * https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -/* - * Created on Jun 9, 2003 - * by bnicolle - */ -package org.eclipse.cdt.core.model.tests; - -import junit.framework.Test; -import junit.framework.TestSuite; - -/** - * LanguageInterfaceTests - * lists all parts of the C/C++ language interface objects - * to be tested. - * @author bnicolle - * - * @deprecated In preparation for moving to JUnit5 test suites are deprecated. See Bug 569839 - */ -@Deprecated -public class AllLanguageInterfaceTestSuite { - - /** - * - */ - public static Test suite() { - TestSuite suite = new TestSuite(AllLanguageInterfaceTestSuite.class.getName()); - - // Just add more test cases here as you create them for - // each class being tested - - suite.addTest(IIncludeTests.suite()); - suite.addTest(IMacroTests.suite()); - suite.addTest(StructuralMacroTests.suite()); - suite.addTest(IStructureTests.suite()); - suite.addTest(StructuralStructureTests.suite()); - suite.addTest(ITemplateTests.suite()); - suite.addTest(StructuralTemplateTests.suite()); - return suite; - - } - -} diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/AllCProjectDescriptionTestSuite.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/AllCProjectDescriptionTestSuite.java deleted file mode 100644 index 8019a4a7733..00000000000 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/AllCProjectDescriptionTestSuite.java +++ /dev/null @@ -1,44 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007, 2010 Intel Corporation and others. - * - * This program and the accompanying materials - * are made available under the terms of the Eclipse Public License 2.0 - * which accompanies this distribution, and is available at - * https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Intel Corporation - Initial API and implementation - *******************************************************************************/ -package org.eclipse.cdt.core.settings.model; - -import junit.framework.Test; -import junit.framework.TestSuite; - -/** - * @deprecated In preparation for moving to JUnit5 test suites are deprecated. See Bug 569839 - */ -@Deprecated -public class AllCProjectDescriptionTestSuite { - public static void main(String[] args) { - junit.textui.TestRunner.run(suite()); - } - - public static Test suite() { - TestSuite suite = new TestSuite(AllCProjectDescriptionTestSuite.class.getName()); - - // Just add more test cases here as you create them for - // each class being tested - suite.addTest(CConfigurationDescriptionReferenceTests.suite()); - suite.addTest(CConfigurationDescriptionExportSettingsTests.suite()); - suite.addTest(ExternalSettingsProviderTests.suite()); - suite.addTest(CfgSettingsTests.suite()); - suite.addTest(CProjectDescriptionDeltaTests.suite()); - suite.addTest(ProjectCreationStateTests.suite()); - suite.addTest(BackwardCompatibilityTests.suite()); - suite.addTest(CProjectDescriptionBasicTests.suite()); - suite.addTest(CProjectDescriptionStorageTests.suite()); - return suite; - } -} diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ParserTestSuite.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ParserTestSuite.java deleted file mode 100644 index 753508e692e..00000000000 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ParserTestSuite.java +++ /dev/null @@ -1,50 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2002, 2012 IBM Corporation and others. - * - * This program and the accompanying materials - * are made available under the terms of the Eclipse Public License 2.0 - * which accompanies this distribution, and is available at - * https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * IBM Rational Software - Initial API and implementation - * Jens Elmenthaler - http://bugs.eclipse.org/173458 (camel case completion) - *******************************************************************************/ -package org.eclipse.cdt.core.parser.tests; - -import org.eclipse.cdt.core.model.tests.CModelElementsTests; -import org.eclipse.cdt.core.model.tests.StructuralCModelElementsTests; -import org.eclipse.cdt.core.parser.tests.ast2.DOMGCCParserExtensionTestSuite; -import org.eclipse.cdt.core.parser.tests.ast2.DOMParserTestSuite; -import org.eclipse.cdt.core.parser.tests.ast2.SemanticsTests; -import org.eclipse.cdt.core.parser.tests.scanner.ScannerTestSuite; - -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - -/** - * Combines all tests for the parsers. - * @deprecated In preparation for moving to JUnit5 test suites are deprecated. See Bug 569839 - */ -@Deprecated -public class ParserTestSuite extends TestCase { - public static Test suite() { - TestSuite suite = new TestSuite(ParserTestSuite.class.getName()); - suite.addTestSuite(ArrayUtilTest.class); - suite.addTestSuite(CharArrayUtilsTest.class); - suite.addTestSuite(SegmentMatcherTest.class); - suite.addTestSuite(ContentAssistMatcherFactoryTest.class); - suite.addTestSuite(CModelElementsTests.class); - suite.addTestSuite(StructuralCModelElementsTests.class); - suite.addTestSuite(CharArrayObjectMapTest.class); - suite.addTestSuite(ObjectMapTest.class); - suite.addTestSuite(SemanticsTests.class); - suite.addTest(ScannerTestSuite.suite()); - suite.addTest(DOMParserTestSuite.suite()); - suite.addTest(DOMGCCParserExtensionTestSuite.suite()); - return suite; - } -} diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/DOMGCCParserExtensionTestSuite.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/DOMGCCParserExtensionTestSuite.java deleted file mode 100644 index 577a1167d78..00000000000 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/DOMGCCParserExtensionTestSuite.java +++ /dev/null @@ -1,36 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004, 2005 IBM Corporation and others. - * - * This program and the accompanying materials - * are made available under the terms of the Eclipse Public License 2.0 - * which accompanies this distribution, and is available at - * https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * IBM Rational Software - Initial API and implementation - *******************************************************************************/ -package org.eclipse.cdt.core.parser.tests.ast2; - -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - -/** - * @author jcamelon - * @deprecated In preparation for moving to JUnit5 test suites are deprecated. See Bug 569839 - */ -@Deprecated -public class DOMGCCParserExtensionTestSuite extends TestCase { - - public static Test suite() { - TestSuite suite = new TestSuite(DOMGCCParserExtensionTestSuite.class.getName()); - // suite.addTestSuite( GCCScannerExtensionsTest.class ); - // suite.addTestSuite( GCCQuickParseExtensionsTest.class ); - // suite.addTestSuite( GCCCompleteParseExtensionsTest.class ); - suite.addTestSuite(DOMGCCSelectionParseExtensionsTest.class); - return suite; - } - -} diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/DOMParserTestSuite.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/DOMParserTestSuite.java deleted file mode 100644 index dbe0749d5b0..00000000000 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/DOMParserTestSuite.java +++ /dev/null @@ -1,83 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004, 2016 IBM Corporation and others. - * - * This program and the accompanying materials - * are made available under the terms of the Eclipse Public License 2.0 - * which accompanies this distribution, and is available at - * https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * IBM - Initial API and implementation - * Markus Schorn (Wind River Systems) - * Emanuel Graf (IFS) - * Thomas Corbat (IFS) - *******************************************************************************/ -package org.eclipse.cdt.core.parser.tests.ast2; - -import org.eclipse.cdt.core.parser.tests.ast2.cxx14.GenericLambdaTests; -import org.eclipse.cdt.core.parser.tests.ast2.cxx14.InitCaptureTests; -import org.eclipse.cdt.core.parser.tests.ast2.cxx14.ReturnTypeDeductionTests; -import org.eclipse.cdt.core.parser.tests.ast2.cxx14.VariableTemplateTests; -import org.eclipse.cdt.core.parser.tests.ast2.cxx17.LambdaExpressionTests; -import org.eclipse.cdt.core.parser.tests.ast2.cxx17.StructuredBindingTests; -import org.eclipse.cdt.core.parser.tests.ast2.cxx17.TemplateAutoTests; -import org.eclipse.cdt.core.parser.tests.prefix.CompletionTestSuite; - -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - -/** - * @author jcamelon - * @deprecated In preparation for moving to JUnit5 test suites are deprecated. See Bug 569839 - */ -@Deprecated -public class DOMParserTestSuite extends TestCase { - public static Test suite() { - TestSuite suite = new TestSuite(DOMParserTestSuite.class.getName()); - suite.addTest(AST2Tests.suite()); - suite.addTestSuite(GCCTests.class); - suite.addTest(AST2CPPTests.suite()); - suite.addTest(ASTCPPSpecDefectTests.suite()); - suite.addTest(AST2CPPImplicitNameTests.suite()); - suite.addTest(AST2TemplateTests.suite()); - suite.addTest(TypeTraitsTests.suite()); - suite.addTestSuite(QuickParser2Tests.class); - suite.addTest(CompleteParser2Tests.suite()); - suite.addTest(DOMLocationTests.suite()); - suite.addTestSuite(DOMLocationMacroTests.class); - suite.addTest(ImageLocationTests.suite()); - suite.addTestSuite(AST2KnRTests.class); - suite.addTestSuite(AST2UtilTests.class); - suite.addTestSuite(AST2UtilOldTests.class); - suite.addTestSuite(AST2SelectionParseTest.class); - suite.addTest(ASTNodeSelectorTest.suite()); - suite.addTest(AST2CPPSpecTest.suite()); - suite.addTestSuite(AST2CSpecTest.class); - suite.addTestSuite(DOMSelectionParseTest.class); - suite.addTestSuite(GCCCompleteParseExtensionsTest.class); - suite.addTestSuite(DOMPreprocessorInformationTest.class); - suite.addTest(CommentTests.suite()); - suite.addTest(TaskParserTest.suite()); - suite.addTest(CompletionTestSuite.suite()); - suite.addTestSuite(CharArrayMapTest.class); - suite.addTest(FaultToleranceTests.suite()); - suite.addTest(LanguageExtensionsTest.suite()); - suite.addTest(ASTInactiveCodeTests.suite()); - suite.addTest(AccessControlTests.suite()); - suite.addTest(VariableReadWriteFlagsTest.suite()); - suite.addTest(AST2CPPAttributeTests.suite()); - // C++14 tests - suite.addTest(VariableTemplateTests.suite()); - suite.addTestSuite(ReturnTypeDeductionTests.class); - suite.addTestSuite(GenericLambdaTests.class); - suite.addTestSuite(InitCaptureTests.class); - // C++17 tests - suite.addTest(TemplateAutoTests.suite()); - suite.addTestSuite(LambdaExpressionTests.class); - suite.addTestSuite(StructuredBindingTests.class); - return suite; - } -} diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/AllConstexprEvalTestSuite.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/AllConstexprEvalTestSuite.java deleted file mode 100644 index 2909cec8fa8..00000000000 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/AllConstexprEvalTestSuite.java +++ /dev/null @@ -1,76 +0,0 @@ -/******************************************************************************* -* Copyright (c) 2016 Institute for Software, HSR Hochschule fuer Technik -* Rapperswil, University of applied sciences and others -* -* This program and the accompanying materials -* are made available under the terms of the Eclipse Public License 2.0 -* which accompanies this distribution, and is available at -* https://www.eclipse.org/legal/epl-2.0/ -* -* SPDX-License-Identifier: EPL-2.0 -*******************************************************************************/ -package org.eclipse.cdt.core.parser.tests.ast2.cxx14.constexpr; - -import junit.framework.Test; -import junit.framework.TestSuite; - -/** - * @deprecated In preparation for moving to JUnit5 test suites are deprecated. See Bug 569839 - */ -@Deprecated -public class AllConstexprEvalTestSuite { - public static Test suite() throws Exception { - final TestSuite suite = new TestSuite(); - suite.addTest(ConstructorTests.NonIndexingTests.suite()); - suite.addTest(ConstructorTests.SingleProjectTests.suite()); - suite.addTest(MemberFunctionTests.NonIndexingTests.suite()); - suite.addTest(MemberFunctionTests.SingleProjectTests.suite()); - suite.addTest(MemberVariableTests.NonIndexingTests.suite()); - suite.addTest(MemberVariableTests.SingleProjectTests.suite()); - suite.addTest(FunctionTests.NonIndexingTests.suite()); - suite.addTest(FunctionTests.SingleProjectTests.suite()); - suite.addTest(FunctionTemplateTests.NonIndexingTests.suite()); - suite.addTest(FunctionTemplateTests.SingleProjectTests.suite()); - suite.addTest(ClassTemplateTests.NonIndexingTests.suite()); - suite.addTest(ClassTemplateTests.SingleProjectTests.suite()); - suite.addTest(IfStatementTests.NonIndexingTests.suite()); - suite.addTest(IfStatementTests.SingleProjectTests.suite()); - suite.addTest(SwitchStatementTests.NonIndexingTests.suite()); - suite.addTest(SwitchStatementTests.SingleProjectTests.suite()); - suite.addTest(WhileStatementTests.NonIndexingTests.suite()); - suite.addTest(WhileStatementTests.SingleProjectTests.suite()); - suite.addTest(DoWhileStatementTests.NonIndexingTests.suite()); - suite.addTest(DoWhileStatementTests.SingleProjectTests.suite()); - suite.addTest(ForStatementTests.NonIndexingTests.suite()); - suite.addTest(ForStatementTests.SingleProjectTests.suite()); - suite.addTest(RangeBasedForStatementTests.NonIndexingTests.suite()); - suite.addTest(RangeBasedForStatementTests.SingleProjectTests.suite()); - suite.addTest(BinaryOperatorOverloadingTests.NonIndexingTests.suite()); - suite.addTest(BinaryOperatorOverloadingTests.SingleProjectTests.suite()); - suite.addTest(UnaryOperatorOverloadingTests.NonIndexingTests.suite()); - suite.addTest(UnaryOperatorOverloadingTests.SingleProjectTests.suite()); - suite.addTest(ArrayTests.NonIndexingTests.suite()); - suite.addTest(ArrayTests.SingleProjectTests.suite()); - suite.addTest(BinaryExpressionTests.NonIndexingTests.suite()); - suite.addTest(BinaryExpressionTests.SingleProjectTests.suite()); - suite.addTest(UnaryExpressionTests.NonIndexingTests.suite()); - suite.addTest(UnaryExpressionTests.SingleProjectTests.suite()); - suite.addTest(ReferenceTests.NonIndexingTests.suite()); - suite.addTest(ReferenceTests.SingleProjectTests.suite()); - suite.addTest(TypeAliasTests.NonIndexingTests.suite()); - suite.addTest(TypeAliasTests.SingleProjectTests.suite()); - suite.addTest(PointerTests.NonIndexingTests.suite()); - suite.addTest(PointerTests.SingleProjectTests.suite()); - suite.addTest(UserDefinedLiteralTests.NonIndexingTests.suite()); - suite.addTest(UserDefinedLiteralTests.SingleProjectTests.suite()); - suite.addTest(IntegralValueTests.NonIndexingTests.suite()); - suite.addTest(IntegralValueTests.SingleProjectTests.suite()); - suite.addTest(FloatingPointValueTests.NonIndexingTests.suite()); - suite.addTest(FloatingPointValueTests.SingleProjectTests.suite()); - suite.addTest(CStringValueTests.NonIndexingTests.suite()); - suite.addTest(CStringValueTests.SingleProjectTests.suite()); - suite.addTest(StructuredBindingTests.NonIndexingTests.suite()); - suite.addTest(StructuredBindingTests.SingleProjectTests.suite()); - return suite; - } -} diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/prefix/CompletionTestSuite.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/prefix/CompletionTestSuite.java deleted file mode 100644 index c21d9d4798a..00000000000 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/prefix/CompletionTestSuite.java +++ /dev/null @@ -1,31 +0,0 @@ -/********************************************************************** - * Copyright (c) 2004, 2005 IBM Corporation and others. - * - * This program and the accompanying materials - * are made available under the terms of the Eclipse Public License 2.0 - * which accompanies this distribution, and is available at - * https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.cdt.core.parser.tests.prefix; - -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - -/** - * @deprecated In preparation for moving to JUnit5 test suites are deprecated. See Bug 569839 - */ -@Deprecated -public class CompletionTestSuite extends TestCase { - - public static Test suite() { - TestSuite suite = new TestSuite(CompletionTestSuite.class.getName()); - suite.addTestSuite(BasicCompletionTest.class); - return suite; - } -} diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/RewriteTestSuite.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/RewriteTestSuite.java deleted file mode 100644 index 27dca43e533..00000000000 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/RewriteTestSuite.java +++ /dev/null @@ -1,37 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2008, 2011 Institute for Software, HSR Hochschule fuer Technik - * Rapperswil, University of applied sciences and others - * - * This program and the accompanying materials - * are made available under the terms of the Eclipse Public License 2.0 - * which accompanies this distribution, and is available at - * https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Institute for Software - initial API and implementation - *******************************************************************************/ -package org.eclipse.cdt.core.parser.tests.rewrite; - -import org.eclipse.cdt.core.parser.tests.rewrite.astwriter.AstWriterTestSuite; -import org.eclipse.cdt.core.parser.tests.rewrite.changegenerator.ChangeGeneratorTestSuite; -import org.eclipse.cdt.core.parser.tests.rewrite.comenthandler.CommentHandlingTestSuite; - -import junit.framework.Test; -import junit.framework.TestSuite; - -/** - * @deprecated In preparation for moving to JUnit5 test suites are deprecated. See Bug 569839 - */ -@Deprecated -public class RewriteTestSuite extends TestSuite { - - public static Test suite() throws Exception { - TestSuite suite = new TestSuite(RewriteTestSuite.class.getName()); - suite.addTest(AstWriterTestSuite.suite()); - suite.addTest(CommentHandlingTestSuite.suite()); - suite.addTest(ChangeGeneratorTestSuite.suite()); - return suite; - } -} diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/astwriter/AstWriterTestSuite.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/astwriter/AstWriterTestSuite.java deleted file mode 100644 index 78a4bd634e7..00000000000 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/astwriter/AstWriterTestSuite.java +++ /dev/null @@ -1,34 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006, 2014 Institute for Software, HSR Hochschule fuer Technik - * Rapperswil, University of applied sciences and others - * - * This program and the accompanying materials - * are made available under the terms of the Eclipse Public License 2.0 - * which accompanies this distribution, and is available at - * https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Institute for Software - initial API and implementation - * Thomas Corbat (IFS) - *******************************************************************************/ -package org.eclipse.cdt.core.parser.tests.rewrite.astwriter; - -import junit.framework.Test; -import junit.framework.TestSuite; - -/** - * @author Emanuel Graf - * @deprecated In preparation for moving to JUnit5 test suites are deprecated. See Bug 569839 - */ -@Deprecated -public class AstWriterTestSuite { - - public static Test suite() throws Exception { - TestSuite suite = new TestSuite("AstWriterTestSuite"); - suite.addTest(SourceRewriteTest.suite()); - suite.addTestSuite(ExpressionWriterTest.class); - return suite; - } -} diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/changegenerator/ChangeGeneratorTestSuite.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/changegenerator/ChangeGeneratorTestSuite.java deleted file mode 100644 index d6cb1974425..00000000000 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/changegenerator/ChangeGeneratorTestSuite.java +++ /dev/null @@ -1,37 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2008, 2014 Institute for Software, HSR Hochschule fuer Technik - * Rapperswil, University of applied sciences and others - * - * This program and the accompanying materials - * are made available under the terms of the Eclipse Public License 2.0 - * which accompanies this distribution, and is available at - * https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Institute for Software - initial API and implementation - *******************************************************************************/ -package org.eclipse.cdt.core.parser.tests.rewrite.changegenerator; - -import junit.framework.Test; -import junit.framework.TestSuite; - -/** - * @author Thomas Corbat - * @deprecated In preparation for moving to JUnit5 test suites are deprecated. See Bug 569839 - */ -@Deprecated -public class ChangeGeneratorTestSuite { - - public static Test suite() throws Exception { - TestSuite suite = new TestSuite(ChangeGeneratorTestSuite.class.getName()); - - suite.addTest(AppendTests.suite()); - suite.addTest(InsertBeforeTests.suite()); - suite.addTest(RemoveTests.suite()); - suite.addTest(ReplaceTests.suite()); - - return suite; - } -} diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/comenthandler/CommentHandlingTest.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/comenthandler/CommentHandlingTest.java index 223e4023b20..183b40c156e 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/comenthandler/CommentHandlingTest.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/comenthandler/CommentHandlingTest.java @@ -97,7 +97,7 @@ public class CommentHandlingTest extends RewriteBaseTest { } public static Test suite() throws Exception { - TestSuite suite = new TestSuite(CommentHandlingTestSuite.class.getName()); + TestSuite suite = new TestSuite(CommentHandlingTest.class.getName()); suite.addTest(RewriteTester.suite("CommentTests", "resources/rewrite/CommentHandlingTestSource.rts")); //$NON-NLS-1$ return suite; } diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/comenthandler/CommentHandlingTestSuite.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/comenthandler/CommentHandlingTestSuite.java deleted file mode 100644 index d851284002a..00000000000 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/comenthandler/CommentHandlingTestSuite.java +++ /dev/null @@ -1,34 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2008, 2014 Institute for Software, HSR Hochschule fuer Technik - * Rapperswil, University of applied sciences and others - * - * This program and the accompanying materials - * are made available under the terms of the Eclipse Public License 2.0 - * which accompanies this distribution, and is available at - * https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Institute for Software - initial API and implementation - ******************************************************************************/ -package org.eclipse.cdt.core.parser.tests.rewrite.comenthandler; - -import junit.framework.Test; -import junit.framework.TestSuite; - -/** - * @author Guido Zgraggen IFS - * @deprecated In preparation for moving to JUnit5 test suites are deprecated. See Bug 569839 - */ -@Deprecated -public class CommentHandlingTestSuite extends TestSuite { - - public static Test suite() throws Exception { - TestSuite suite = new TestSuite(CommentHandlingTestSuite.class.getName()); - suite.addTest(CommentHandlingTest.suite()); - suite.addTest(CommentHandlingWithRewriteTest.suite()); - suite.addTestSuite(NodeCommentMapTest.class); - return suite; - } -} diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/comenthandler/CommentHandlingWithRewriteTest.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/comenthandler/CommentHandlingWithRewriteTest.java index 0b867d23ef2..9d008a452fe 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/comenthandler/CommentHandlingWithRewriteTest.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/comenthandler/CommentHandlingWithRewriteTest.java @@ -36,7 +36,7 @@ public class CommentHandlingWithRewriteTest extends CommentHandlingTest { } public static Test suite() throws Exception { - TestSuite suite = new TestSuite(CommentHandlingTestSuite.class.getName()); + TestSuite suite = new TestSuite(CommentHandlingWithRewriteTest.class.getName()); suite.addTest( RewriteTester.suite("CommentMultiFileTests", "resources/rewrite/CommentHandlingWithRewriteTest.rts")); //$NON-NLS-1$ return suite; diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/scanner/ScannerTestSuite.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/scanner/ScannerTestSuite.java deleted file mode 100644 index 8c00d61e3e6..00000000000 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/scanner/ScannerTestSuite.java +++ /dev/null @@ -1,39 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007, 2010 Wind River Systems, Inc. and others. - * - * This program and the accompanying materials - * are made available under the terms of the Eclipse Public License 2.0 - * which accompanies this distribution, and is available at - * https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Markus Schorn (Wind River Systems) - *******************************************************************************/ -package org.eclipse.cdt.core.parser.tests.scanner; - -import junit.framework.Test; -import junit.framework.TestSuite; - -/** - * @deprecated In preparation for moving to JUnit5 test suites are deprecated. See Bug 569839 - */ -@Deprecated -public class ScannerTestSuite extends TestSuite { - - public static Test suite() { - TestSuite suite = new ScannerTestSuite(); - suite.addTest(LexerTests.suite()); - suite.addTest(LocationMapTests.suite()); - suite.addTest(PortedScannerTests.suite()); - suite.addTest(PreprocessorTests.suite()); - suite.addTest(InclusionTests.suite()); - suite.addTest(PreprocessorBugsTests.suite()); - suite.addTest(ExpansionExplorerTests.suite()); - suite.addTest(InactiveCodeTests.suite()); - suite.addTest(StreamHasherTests.suite()); - suite.addTest(FileCharArrayTests.suite()); - return suite; - } -} diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexTestSuite.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexTestSuite.java deleted file mode 100644 index 6e970d10e30..00000000000 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexTestSuite.java +++ /dev/null @@ -1,66 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006, 2016 Wind River Systems, Inc. and others. - * - * This program and the accompanying materials - * are made available under the terms of the Eclipse Public License 2.0 - * which accompanies this distribution, and is available at - * https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Markus Schorn - initial API and implementation - * Sergey Prigogin (Google) - *******************************************************************************/ -package org.eclipse.cdt.internal.index.tests; - -import org.eclipse.cdt.core.parser.tests.ast2.cxx14.GenericLambdaIndexTests; -import org.eclipse.cdt.core.parser.tests.ast2.cxx14.ReturnTypeDeductionIndexTests; -import org.eclipse.cdt.core.parser.tests.ast2.cxx17.StructuredBindingIndexTests; -import org.eclipse.cdt.core.parser.tests.ast2.cxx17.TemplateAutoIndexTests; - -import junit.framework.Test; -import junit.framework.TestSuite; - -/** - * Test suite for the indexer tests - * @deprecated In preparation for moving to JUnit5 test suites are deprecated. See Bug 569839 - */ -@Deprecated -public class IndexTestSuite extends TestSuite { - public static Test suite() { - TestSuite suite = new IndexTestSuite(); - - suite.addTest(IndexCompositeTests.suite()); - suite.addTest(IndexListenerTest.suite()); - suite.addTest(IndexLocationTest.suite()); - suite.addTest(IndexSearchTest.suite()); - suite.addTest(IndexIncludeTest.suite()); - suite.addTest(IndexUpdateTests.suite()); - suite.addTest(IndexUpdateMultiFileTest.suite()); - suite.addTest(IndexBugsTests.suite()); - suite.addTest(IndexNamesTests.suite()); - suite.addTest(TeamSharedIndexTest.suite()); - suite.addTest(IndexProviderManagerTest.suite()); - suite.addTest(IndexMultiVariantHeaderTest.suite()); - suite.addTest(IndexMultiFileTest.suite()); - - // C++14 index test suites - suite.addTestSuite(ReturnTypeDeductionIndexTests.class); - suite.addTestSuite(GenericLambdaIndexTests.class); - - // C++17 index test suites - suite.addTestSuite(TemplateAutoIndexTests.class); - suite.addTestSuite(StructuredBindingIndexTests.class); - - IndexCPPBindingResolutionBugsTest.addTests(suite); - IndexCPPBindingResolutionTest.addTests(suite); - IndexGPPBindingResolutionTest.addTests(suite); - IndexCPPTemplateResolutionTest.addTests(suite); - IndexCBindingResolutionBugsTest.addTests(suite); - IndexCBindingResolutionTest.addTests(suite); - IndexCPPVariableTemplateResolutionTest.addTests(suite); - - return suite; - } -} diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMTestSuite.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMTestSuite.java deleted file mode 100644 index a751b64317f..00000000000 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMTestSuite.java +++ /dev/null @@ -1,71 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006, 2014 QNX Software Systems and others. - * - * This program and the accompanying materials - * are made available under the terms of the Eclipse Public License 2.0 - * which accompanies this distribution, and is available at - * https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * QNX - Initial API and implementation - * IBM Corporation - * Andrew Ferguson (Symbian) - * Marc-Andre Laperle - *******************************************************************************/ -package org.eclipse.cdt.internal.pdom.tests; - -import junit.framework.Test; -import junit.framework.TestSuite; - -/** - * @author Doug Schaefer - * @deprecated In preparation for moving to JUnit5 test suites are deprecated. See Bug 569839 - */ -@Deprecated -public class PDOMTestSuite extends TestSuite { - - public static Test suite() { - TestSuite suite = new PDOMTestSuite(); - - suite.addTest(DatabaseTest.suite()); - suite.addTest(DBPropertiesTests.suite()); - suite.addTest(PDOMCBugsTest.suite()); - suite.addTest(PDOMCPPBugsTest.suite()); - suite.addTest(PDOMSearchTest.suite()); - suite.addTest(PDOMLocationTests.suite()); - suite.addTest(PDOMNameTests.suite()); - suite.addTest(PDOMProviderTests.suite()); - suite.addTest(EnumerationTests.suite()); - suite.addTest(ClassTests.suite()); - suite.addTest(TypesTests.suite()); - suite.addTest(IncludesTests.suite()); - suite.addTest(OverloadsWithinSingleTUTests.suite()); - suite.addTest(OverloadsWithinCommonHeaderTests.suite()); - // Test converted to JUnit5: suite.addTest(BTreeTests.suite()); - suite.addTest(PDOMStringSetTests.suite()); - suite.addTest(PDOMTagIndexTests.suite()); - suite.addTest(FilesOnReindexTests.suite()); - suite.addTest(GeneratePDOMApplicationTest.suite()); - - suite.addTest(CPPFieldTests.suite()); - suite.addTest(CPPFunctionTests.suite()); - suite.addTest(CPPVariableTests.suite()); - suite.addTest(CPPClassTemplateTests.suite()); - suite.addTest(CPPFunctionTemplateTests.suite()); - suite.addTest(MethodTests.suite()); - suite.addTest(NamespaceTests.suite()); - suite.addTest(ClassMemberVisibilityTests.suite()); - - suite.addTest(CFunctionTests.suite()); - suite.addTest(CVariableTests.suite()); - suite.addTest(CCompositeTypeTests.suite()); - - suite.addTest(DefDeclTests.suite()); - suite.addTest(RaceCondition157992Test.suite()); - suite.addTest(ChangeConfigurationTests.suite()); - - return suite; - } -} diff --git a/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/suite/AutomatedIntegrationSuite.java b/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/suite/AutomatedIntegrationSuite.java deleted file mode 100644 index c6e0b263bb1..00000000000 --- a/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/suite/AutomatedIntegrationSuite.java +++ /dev/null @@ -1,114 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2005, 2020 IBM Corporation and others. - * - * This program and the accompanying materials - * are made available under the terms of the Eclipse Public License 2.0 - * which accompanies this distribution, and is available at - * https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * IBM Corporation - initial API and implementation - * Markus Schorn (Wind River Systems) - * Norbert Ploett (Siemens AG) - * Alexander Fedorov Bug 559193 - *******************************************************************************/ -package org.eclipse.cdt.core.suite; - -import org.eclipse.cdt.core.cdescriptor.tests.CDescriptorOldTests; -import org.eclipse.cdt.core.envvar.IEnvironmentVariableManagerTests; -import org.eclipse.cdt.core.internal.efsextension.tests.EFSExtensionTests; -import org.eclipse.cdt.core.internal.errorparsers.tests.ErrorParserTestSuite; -import org.eclipse.cdt.core.internal.tests.PositionTrackerTests; -import org.eclipse.cdt.core.internal.tests.ResourceLookupTests; -import org.eclipse.cdt.core.internal.tests.StringBuilderTest; -import org.eclipse.cdt.core.language.AllLanguageTestSuite; -import org.eclipse.cdt.core.model.tests.AllCoreTestSuite; -import org.eclipse.cdt.core.model.tests.ElementDeltaTests; -import org.eclipse.cdt.core.model.tests.WorkingCopyTests; -import org.eclipse.cdt.core.parser.tests.ParserTestSuite; -import org.eclipse.cdt.core.parser.tests.ast2.cxx14.constexpr.AllConstexprEvalTestSuite; -import org.eclipse.cdt.core.parser.tests.rewrite.RewriteTestSuite; -import org.eclipse.cdt.core.preferences.tests.ScopeOfBuildConfigResourceChangesPreferenceTests; -import org.eclipse.cdt.core.resources.tests.RefreshScopeTests; -import org.eclipse.cdt.internal.index.tests.IndexTestSuite; -import org.eclipse.cdt.internal.pdom.tests.PDOMTestSuite; -import org.eclipse.cdt.utils.ByteUtilsTest; -import org.eclipse.cdt.utils.CdtVariableResolverTest; -import org.eclipse.cdt.utils.CommandLineUtilTest; -import org.eclipse.cdt.utils.FindProgramLocationTest; -import org.eclipse.cdt.utils.StorableCdtVariablesTest; -import org.eclipse.cdt.utils.UNCPathConverterTest; -import org.eclipse.cdt.utils.WeakHashSetTest; -import org.eclipse.cdt.utils.elf.ElfParserTest; -import org.eclipse.cdt.utils.elf.ElfTest; - -import junit.framework.JUnit4TestAdapter; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - -/** - * @author vhirsl - * @deprecated In preparation for moving to JUnit5 test suites are deprecated. See Bug 569839 - */ -@Deprecated -public class AutomatedIntegrationSuite extends TestSuite { - - public AutomatedIntegrationSuite() { - } - - public AutomatedIntegrationSuite(Class theClass, String name) { - super(theClass, name); - } - - public AutomatedIntegrationSuite(Class theClass) { - super(theClass); - } - - public AutomatedIntegrationSuite(String name) { - super(name); - } - - public static Test suite() throws Exception { - final AutomatedIntegrationSuite suite = new AutomatedIntegrationSuite(); - - // Has intermittent failures - if (System.getProperty("cdt.skip.known.test.failures") == null) { - // Test converted to JUnit5: suite.addTest(CDescriptorTests.suite()); - } - suite.addTest(AllConstexprEvalTestSuite.suite()); - suite.addTest(ParserTestSuite.suite()); - suite.addTest(CDescriptorOldTests.suite()); - suite.addTest(IEnvironmentVariableManagerTests.suite()); - suite.addTest(ErrorParserTestSuite.suite()); - suite.addTest(AllCoreTestSuite.suite()); - suite.addTest(ElementDeltaTests.suite()); - suite.addTest(WorkingCopyTests.suite()); - suite.addTest(PositionTrackerTests.suite()); - suite.addTest(ResourceLookupTests.suite()); - suite.addTest(StringBuilderTest.suite()); - suite.addTest(AllLanguageTestSuite.suite()); - suite.addTest(RewriteTestSuite.suite()); - suite.addTest(CdtVariableResolverTest.suite()); - suite.addTest(StorableCdtVariablesTest.suite()); - suite.addTest(CommandLineUtilTest.suite()); - suite.addTest(WeakHashSetTest.suite()); - suite.addTest(FindProgramLocationTest.suite()); - suite.addTest(EFSExtensionTests.suite()); - suite.addTest(ByteUtilsTest.suite()); - suite.addTest(UNCPathConverterTest.suite()); - suite.addTest(ScopeOfBuildConfigResourceChangesPreferenceTests.suite()); - suite.addTest(ElfParserTest.suite()); - suite.addTest(new JUnit4TestAdapter(ElfTest.class)); - - // Add in PDOM tests - suite.addTest(PDOMTestSuite.suite()); - suite.addTest(IndexTestSuite.suite()); - - suite.addTest(RefreshScopeTests.suite()); - - return suite; - } -} diff --git a/core/org.eclipse.cdt.core.tests/test.xml b/core/org.eclipse.cdt.core.tests/test.xml deleted file mode 100644 index baaed837370..00000000000 --- a/core/org.eclipse.cdt.core.tests/test.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/AllTemplateEngineTestSuite.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/AllTemplateEngineTestSuite.java deleted file mode 100644 index 134283bc2da..00000000000 --- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/AllTemplateEngineTestSuite.java +++ /dev/null @@ -1,33 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007, 2017 Symbian Software Limited and others. - * - * This program and the accompanying materials - * are made available under the terms of the Eclipse Public License 2.0 - * which accompanies this distribution, and is available at - * https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Bala Torati (Symbian) - Initial API and implementation - * Jonah Graham (Kichwa Coders) - converted to new style suite (Bug 515178) - *******************************************************************************/ -package org.eclipse.cdt.ui.tests.templateengine; - -import org.junit.runner.RunWith; -import org.junit.runners.Suite; - -/** - * This is a TestSuite, the TestCases created to test Template engine are - * added to testsuite. - * The test suite will execute all the Testcases added to the Suite. - * - * @since 4.0 - */ -@RunWith(Suite.class) -@Suite.SuiteClasses({ TestTemplateEngine.class, TestTemplateCore.class, TestValueStore.class, TestSharedDefaults.class, - TestProcesses.class, TestTemplateEngineBugs.class, - -}) -public class AllTemplateEngineTestSuite { -} diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/AutomatedSuite.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/AutomatedSuite.java deleted file mode 100644 index cb98bc2b6c2..00000000000 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/AutomatedSuite.java +++ /dev/null @@ -1,47 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2017 IBM Corporation and others. - * - * This program and the accompanying materials - * are made available under the terms of the Eclipse Public License 2.0 - * which accompanies this distribution, and is available at - * https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * IBM - Initial API and implementation - * Anton Leherbauer (Wind River Systems) - * Markus Schorn (Wind River Systems) - * Jonah Graham (Kichwa Coders) - converted to new style suite (Bug 515178) - *******************************************************************************/ -package org.eclipse.cdt.ui.tests; - -import org.junit.runner.RunWith; -import org.junit.runners.Suite; - -/** - * Test all areas of the UI. - */ -@RunWith(Suite.class) -@Suite.SuiteClasses({ org.eclipse.cdt.ui.tests.text.TextTestSuite.class, - org.eclipse.cdt.ui.tests.outline.OutlineTestSuite.class, - org.eclipse.cdt.ui.tests.viewsupport.ViewSupportTestSuite.class, - org.eclipse.cdt.ui.tests.callhierarchy.CallHierarchyTestSuite.class, - org.eclipse.cdt.ui.tests.callhierarchy.extension.CHExtensionTest.class, - org.eclipse.cdt.ui.tests.typehierarchy.TypeHierarchyTestSuite.class, - org.eclipse.cdt.ui.tests.includebrowser.IncludeBrowserTestSuite.class, - org.eclipse.cdt.ui.tests.text.contentassist.ContentAssistTestSuite.class, - org.eclipse.cdt.ui.tests.text.contentassist2.ContentAssist2TestSuite.class, - org.eclipse.cdt.ui.tests.text.selection.SelectionTestSuite.class, - org.eclipse.cdt.ui.tests.quickfix.AssistQuickFixTest.class, - org.eclipse.cdt.ui.tests.buildconsole.BuildConsoleTests.class, - org.eclipse.cdt.ui.tests.search.SearchTestSuite.class, - org.eclipse.cdt.ui.tests.refactoring.RefactoringTestSuite.class, org.eclipse.cdt.ui.tests.chelp.CHelpTest.class, - org.eclipse.cdt.ui.tests.wizards.classwizard.ClassWizardTestSuite.class, - org.eclipse.cdt.ui.tests.wizards.settingswizards.SettingsWizardTestSuite.class, - org.eclipse.cdt.ui.tests.misc.MiscTestSuite.class, org.eclipse.cdt.ui.tests.editor.EditorTestSuite.class, - org.eclipse.cdt.ui.tests.templateengine.AllTemplateEngineTestSuite.class, - -}) -public class AutomatedSuite { -} diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/CallHierarchyTestSuite.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/CallHierarchyTestSuite.java deleted file mode 100644 index cafe8c47931..00000000000 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/CallHierarchyTestSuite.java +++ /dev/null @@ -1,27 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006, 2017 Wind River Systems, Inc. and others. - * - * This program and the accompanying materials - * are made available under the terms of the Eclipse Public License 2.0 - * which accompanies this distribution, and is available at - * https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Markus Schorn - initial API and implementation - * Jonah Graham (Kichwa Coders) - converted to new style suite (Bug 515178) - *******************************************************************************/ - -package org.eclipse.cdt.ui.tests.callhierarchy; - -import org.junit.runner.RunWith; -import org.junit.runners.Suite; - -@RunWith(Suite.class) -@Suite.SuiteClasses({ BasicCallHierarchyTest.class, BasicCppCallHierarchyTest.class, - InitializersInCallHierarchyTest.class, CppCallHierarchyTest.class, CallHierarchyAcrossProjectsTest.class, - CallHierarchyBugsTest.class, }) -public class CallHierarchyTestSuite { - -} diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/editor/EditorTestSuite.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/editor/EditorTestSuite.java deleted file mode 100644 index f75db8e036d..00000000000 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/editor/EditorTestSuite.java +++ /dev/null @@ -1,28 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2015, 2017 Nathan Ridge and others. - * - * This program and the accompanying materials - * are made available under the terms of the Eclipse Public License 2.0 - * which accompanies this distribution, and is available at - * https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Nathan Ridge - initial implementation - * Jonah Graham (Kichwa Coders) - converted to new style suite (Bug 515178) - *******************************************************************************/ -package org.eclipse.cdt.ui.tests.editor; - -import org.junit.runner.RunWith; -import org.junit.runners.Suite; - -/** - * Tests for functionality in the package org.eclipse.cdt.internal.ui.editor. - */ -@RunWith(Suite.class) -@Suite.SuiteClasses({ SourceHeaderPartnerFinderTest.class, - -}) -public class EditorTestSuite { -} diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/includebrowser/IncludeBrowserTestSuite.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/includebrowser/IncludeBrowserTestSuite.java deleted file mode 100644 index cb32c242263..00000000000 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/includebrowser/IncludeBrowserTestSuite.java +++ /dev/null @@ -1,26 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006, 2017 Wind River Systems, Inc. and others. - * - * This program and the accompanying materials - * are made available under the terms of the Eclipse Public License 2.0 - * which accompanies this distribution, and is available at - * https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Markus Schorn - initial API and implementation - * Jonah Graham (Kichwa Coders) - converted to new style suite (Bug 515178) - *******************************************************************************/ - -package org.eclipse.cdt.ui.tests.includebrowser; - -import org.junit.runner.RunWith; -import org.junit.runners.Suite; - -@RunWith(Suite.class) -@Suite.SuiteClasses({ BasicIncludeBrowserTest.class, - -}) -public class IncludeBrowserTestSuite { -} diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/misc/MiscTestSuite.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/misc/MiscTestSuite.java deleted file mode 100644 index 25036d5ff77..00000000000 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/misc/MiscTestSuite.java +++ /dev/null @@ -1,29 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010, 2017 Andrew Gvozdev and others. - * - * This program and the accompanying materials - * are made available under the terms of the Eclipse Public License 2.0 - * which accompanies this distribution, and is available at - * https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Andrew Gvozdev (Quoin Inc.) - initial API and implementation - * Jonah Graham (Kichwa Coders) - converted to new style suite (Bug 515178) - *******************************************************************************/ -package org.eclipse.cdt.ui.tests.misc; - -import org.junit.runner.RunWith; -import org.junit.runners.Suite; - -/** - * Test suite for miscellaneous tests which do not fit neatly to other - * categories. - */ -@RunWith(Suite.class) -@Suite.SuiteClasses({ CDTSharedImagesTests.class, LanguageVerifierTests.class, - -}) -public class MiscTestSuite { -} diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/outline/OutlineTestSuite.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/outline/OutlineTestSuite.java deleted file mode 100644 index ec6331f35bf..00000000000 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/outline/OutlineTestSuite.java +++ /dev/null @@ -1,24 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2009, 2017 Wind River Systems, Inc. and others. - * - * This program and the accompanying materials - * are made available under the terms of the Eclipse Public License 2.0 - * which accompanies this distribution, and is available at - * https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Anton Leherbauer (Wind River Systems) - initial implementation - * Jonah Graham (Kichwa Coders) - converted to new style suite (Bug 515178) - *******************************************************************************/ -package org.eclipse.cdt.ui.tests.outline; - -import org.junit.runner.RunWith; -import org.junit.runners.Suite; - -@RunWith(Suite.class) -@Suite.SuiteClasses({ BasicOutlineTest.class, }) -public class OutlineTestSuite { - -} diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/RefactoringTestSuite.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/RefactoringTestSuite.java deleted file mode 100644 index e5eaf9070fb..00000000000 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/RefactoringTestSuite.java +++ /dev/null @@ -1,54 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2008, 2017 Institute for Software, HSR Hochschule fuer Technik - * Rapperswil, University of applied sciences and others - * - * This program and the accompanying materials - * are made available under the terms of the Eclipse Public License 2.0 - * which accompanies this distribution, and is available at - * https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Institute for Software - initial API and implementation - * Tom Ball (Google) - * Sergey Prigogin (Google) - * Jonah Graham (Kichwa Coders) - converted to new style suite (Bug 515178) - *******************************************************************************/ -package org.eclipse.cdt.ui.tests.refactoring; - -import org.eclipse.cdt.ui.tests.refactoring.extractconstant.ExtractConstantRefactoringTest; -import org.eclipse.cdt.ui.tests.refactoring.extractfunction.ExtractFunctionRefactoringTest; -import org.eclipse.cdt.ui.tests.refactoring.extractlocalvariable.ExtractLocalVariableRefactoringTest; -import org.eclipse.cdt.ui.tests.refactoring.gettersandsetters.GenerateGettersAndSettersTest; -import org.eclipse.cdt.ui.tests.refactoring.hidemethod.HideMethodRefactoringTest; -import org.eclipse.cdt.ui.tests.refactoring.implementmethod.ImplementMethodRefactoringTest; -import org.eclipse.cdt.ui.tests.refactoring.includes.IncludesTestSuite; -import org.eclipse.cdt.ui.tests.refactoring.overridemethods.OverrideMethodsRefactoringTest; -import org.eclipse.cdt.ui.tests.refactoring.rename.RenameFunctionTests; -import org.eclipse.cdt.ui.tests.refactoring.rename.RenameMacroTests; -import org.eclipse.cdt.ui.tests.refactoring.rename.RenameRegressionTests; -import org.eclipse.cdt.ui.tests.refactoring.rename.RenameTemplatesTests; -import org.eclipse.cdt.ui.tests.refactoring.rename.RenameTypeTests; -import org.eclipse.cdt.ui.tests.refactoring.rename.RenameVariableTests; -import org.eclipse.cdt.ui.tests.refactoring.togglefunction.ToggleNodeHelperTest; -import org.eclipse.cdt.ui.tests.refactoring.togglefunction.ToggleRefactoringCTest; -import org.eclipse.cdt.ui.tests.refactoring.togglefunction.ToggleRefactoringTest; -import org.eclipse.cdt.ui.tests.refactoring.utils.UtilTestSuite; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; - -/** - * @author Emanuel Graf - */ -@RunWith(Suite.class) -@Suite.SuiteClasses({ UtilTestSuite.class, RenameRegressionTests.class, ExtractFunctionRefactoringTest.class, - ExtractConstantRefactoringTest.class, HideMethodRefactoringTest.class, GenerateGettersAndSettersTest.class, - ImplementMethodRefactoringTest.class, ExtractLocalVariableRefactoringTest.class, ToggleRefactoringTest.class, - ToggleRefactoringCTest.class, ToggleNodeHelperTest.class, IncludesTestSuite.class, - OverrideMethodsRefactoringTest.class, RenameVariableTests.class, RenameFunctionTests.class, - RenameTypeTests.class, RenameMacroTests.class, RenameTemplatesTests.class - -}) -public class RefactoringTestSuite { -} diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/includes/IncludesTestSuite.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/includes/IncludesTestSuite.java deleted file mode 100644 index 81e5d4404b4..00000000000 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/includes/IncludesTestSuite.java +++ /dev/null @@ -1,28 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2013 Google, Inc and others. - * - * This program and the accompanying materials - * are made available under the terms of the Eclipse Public License 2.0 - * which accompanies this distribution, and is available at - * https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Sergey Prigogin (Google) - initial API and implementation - *******************************************************************************/ -package org.eclipse.cdt.ui.tests.refactoring.includes; - -import junit.framework.Test; -import junit.framework.TestSuite; - -public class IncludesTestSuite extends TestSuite { - - public static Test suite() throws Exception { - IncludesTestSuite suite = new IncludesTestSuite(); - suite.addTestSuite(IncludeMapTest.class); - suite.addTest(BindingClassifierTest.suite()); - suite.addTest(IncludeOrganizerTest.suite()); - return suite; - } -} diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/utils/UtilTestSuite.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/utils/UtilTestSuite.java deleted file mode 100644 index 74e50f24d8b..00000000000 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/utils/UtilTestSuite.java +++ /dev/null @@ -1,34 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2008, 2012 Institute for Software, HSR Hochschule fuer Technik - * Rapperswil, University of applied sciences and others - * - * This program and the accompanying materials - * are made available under the terms of the Eclipse Public License 2.0 - * which accompanies this distribution, and is available at - * https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Institute for Software - initial API and implementation - * Sergey Prigogin (Google) - *******************************************************************************/ -package org.eclipse.cdt.ui.tests.refactoring.utils; - -import junit.framework.Test; -import junit.framework.TestSuite; - -/** - * @author Thomas Corbat - */ -public class UtilTestSuite extends TestSuite { - - public static Test suite() throws Exception { - UtilTestSuite suite = new UtilTestSuite(); - suite.addTestSuite(IdentifierHelperTest.class); - suite.addTestSuite(DefinitionFinderTest.class); - suite.addTestSuite(PseudoNameGeneratorTest.class); - suite.addTestSuite(NameComposerTest.class); - return suite; - } -} diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/search/SearchTestSuite.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/search/SearchTestSuite.java deleted file mode 100644 index 525a59d5cf8..00000000000 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/search/SearchTestSuite.java +++ /dev/null @@ -1,26 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007, 2017 Symbian Software Systems and others. - * - * This program and the accompanying materials - * are made available under the terms of the Eclipse Public License 2.0 - * which accompanies this distribution, and is available at - * https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Andrew Ferguson (Symbian) - Initial implementation - * Jonah Graham (Kichwa Coders) - converted to new style suite (Bug 515178) - *******************************************************************************/ -package org.eclipse.cdt.ui.tests.search; - -import org.junit.runner.RunWith; -import org.junit.runners.Suite; - -@RunWith(Suite.class) -@Suite.SuiteClasses({ BasicSearchTest.class, LinkedNamesFinderTest.class, SearchReferencesAcrossLanguagesTest.class, - FindReferencesTest.class, - -}) -public class SearchTestSuite { -} diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/TextTestSuite.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/TextTestSuite.java deleted file mode 100644 index c66b9324643..00000000000 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/TextTestSuite.java +++ /dev/null @@ -1,71 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006, 2017 Wind River Systems, Inc. and others. - * - * This program and the accompanying materials - * are made available under the terms of the Eclipse Public License 2.0 - * which accompanies this distribution, and is available at - * https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Markus Schorn - initial API and implementation - * Andrew Ferguson (Symbian) - * Sergey Prigogin (Google) - * Jonah Graham (Kichwa Coders) - converted to new style suite (Bug 515178) - *******************************************************************************/ - -package org.eclipse.cdt.ui.tests.text; - -import org.eclipse.cdt.ui.tests.text.doctools.DocCommentTestSuite; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; - -@RunWith(Suite.class) -@Suite.SuiteClasses({ - - // documentation tool extension tests - DocCommentTestSuite.class, - - // partitioning tests - PartitionTokenScannerTest.class, CPartitionerTest.class, AsmTextEditorTest.class, AsmPartitionerTest.class, - - // smart edit tests - AlignConstActionTest.class, CAutoIndentTest.class, CHeuristicScannerTest.class, BracketInserterTest.class, - IndentActionTest.class, FormatActionTest.class, ShiftActionTest.class, CodeFormatterTest.class, - CIndenterTest.class, TemplateFormatterTest.class, DefaultCCommentAutoEditStrategyTest.class, - - // Break iterator tests. - CBreakIteratorTest.class, CWordIteratorTest.class, - - // highlighting tests - SemanticHighlightingTest.class, InactiveCodeHighlightingTest.class, CHeaderRuleTest.class, NumberRuleTest.class, - PairMatcherTest.class, MarkOccurrenceTest.class, - - // folding tests - FoldingTest.class, FoldingCommentsTest.class, - - // basic editing tests - BasicCEditorTest.class, - - // editor hyperlink tests - HyperlinkTest.class, - - // word detection - CWordFinderTest.class, - - // compare tests - CStructureCreatorTest.class, - - // source manipulation tests - AddBlockCommentTest.class, RemoveBlockCommentTest.class, SortLinesTest.class, - - // add include - AddIncludeTest.class, - - // other tests - OverrideIndicatorTest.class, - -}) -public class TextTestSuite { -} diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/ContentAssistTestSuite.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/ContentAssistTestSuite.java deleted file mode 100644 index 290d67c52a4..00000000000 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/ContentAssistTestSuite.java +++ /dev/null @@ -1,29 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006, 2017 Wind River Systems, Inc. and others. - * - * This program and the accompanying materials - * are made available under the terms of the Eclipse Public License 2.0 - * which accompanies this distribution, and is available at - * https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Markus Schorn - initial API and implementation - * Jonah Graham (Kichwa Coders) - converted to new style suite (Bug 515178) - *******************************************************************************/ -package org.eclipse.cdt.ui.tests.text.contentassist; - -import org.junit.runner.RunWith; -import org.junit.runners.Suite; - -@RunWith(Suite.class) -@Suite.SuiteClasses({ - - ContentAssistTests.class, - - CompletionProposalComputerPreferenceParserTest.class, - -}) -public class ContentAssistTestSuite { -} diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/ContentAssist2TestSuite.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/ContentAssist2TestSuite.java deleted file mode 100644 index 71f20875d4d..00000000000 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/ContentAssist2TestSuite.java +++ /dev/null @@ -1,103 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006, 2017 Siemens AG and others. - * - * This content and the accompanying materials - * are made available under the terms of the Eclipse Public License 2.0 - * which accompanies this distribution, and is available at - * https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Norbert Ploett - Initial implementation - * Bryan Wilkinson (QNX) - * Andrew Ferguson (Symbian) - * Mohamed Azab (Mentor Graphics) - Bug 438549. Add mechanism for parameter guessing. - * Jonah Graham (Kichwa Coders) - converted to new style suite (Bug 515178) - *******************************************************************************/ -package org.eclipse.cdt.ui.tests.text.contentassist2; - -import org.junit.runner.RunWith; -import org.junit.runners.Suite; - -/** - * This suite bundles all tests for the CContentAssistProcessor - */ -@RunWith(Suite.class) -@Suite.SuiteClasses({ - - AnonymousTypes_CompletionTest.class, // - ArgumentType_Prefix_CompletionTest.class, // - - ArgumentType_Prefix2_CompletionTest.class, // - ClassReference_NoPrefix_CompletionTest.class, // - - ClassReference_Prefix_CompletionTest.class, // - ConstructorReference_CompletionTest.class, // - - ExceptionReference_NoPrefix_CompletionTest.class, // - ExceptionReference_Prefix_CompletionTest.class, // - - FieldType_NoPrefix_CompletionTest.class, // - FieldType_NoPrefix2_CompletionTest.class, // - - FieldType_Prefix_CompletionTest.class, // - FunctionReference_Prefix_CompletionTest.class, // - - MacroRef_NoPrefix_CompletionTest.class, // - MacroRef_Prefix_CompletionTest.class, // - - MemberReference_Arrow_NoPrefix_CompletionTest.class, // - MemberReference_Arrow_NoPrefix2_CompletionTest.class, // - - MemberReference_Arrow_NoPrefix3_CompletionTest.class, // - MemberReference_Arrow_Prefix_CompletionTest.class, // - - MemberReference_Arrow_Prefix2_CompletionTest.class, // - MemberReference_Dot_NoPrefix_CompletionTest.class, // - - MemberReference_Dot_Prefix_CompletionTest.class, // - NamespaceRef_NoPrefix_CompletionTest.class, // - - NamespaceRef_Prefix_CompletionTest.class, // - NewTypeReference_NoPrefix_CompletionTest.class, // - - NewTypeReference_Prefix_CompletionTest.class, // - ScopedReference_NonCodeScope_CompletionTest.class, // - - ScopedReference_NoPrefix_CompletionTest.class, // - ScopedReference_Prefix_CompletionTest.class, // - - SingleName_Method_NoPrefix_CompletionTest.class, // - SingleName_Method_Prefix_CompletionTest.class, // - - SingleName_NoPrefix_CompletionTest.class, // - SingleName_Prefix_CompletionTest.class, // - - SingleName_Prefix2_CompletionTest.class, // - TypeDef_NoPrefix_CompletionTest.class, // - - TypeDef_Prefix_CompletionTest.class, // - TypeRef_NoPrefix_CompletionTest.class, // - TypeRef_Prefix_CompletionTest.class, // - - VariableType_NestedPrefix_CompletionTest.class, // - VariableType_NoPrefix_CompletionTest.class, // - - VariableType_Prefix_CompletionTest.class, // - - CompletionTests.class, // - HelpProposalTests.class, // - PlainC_CompletionTests.class, // - ParameterHintTests.class, // - - CPPParameterGuessingTests.class, // - CParameterGuessingTests.class, // - - ShowCamelCasePreferenceTest.class, // - - TemplateProposalTest.class, // - -}) -public class ContentAssist2TestSuite { -} diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/doctools/DocCommentTestSuite.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/doctools/DocCommentTestSuite.java deleted file mode 100644 index aebe1ef4f6b..00000000000 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/doctools/DocCommentTestSuite.java +++ /dev/null @@ -1,35 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2008, 2015 Symbian Software Systems and others. - * - * This program and the accompanying materials - * are made available under the terms of the Eclipse Public License 2.0 - * which accompanies this distribution, and is available at - * https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Andrew Ferguson (Symbian) - Initial implementation - *******************************************************************************/ -package org.eclipse.cdt.ui.tests.text.doctools; - -import org.eclipse.cdt.ui.tests.text.doctools.doxygen.DoxygenCCommentAutoEditStrategyTest; -import org.eclipse.cdt.ui.tests.text.doctools.doxygen.DoxygenCCommentSingleAutoEditStrategyTest; - -import junit.framework.TestSuite; - -public class DocCommentTestSuite extends TestSuite { - - public static TestSuite suite() { - return new DocCommentTestSuite(); - } - - public DocCommentTestSuite() { - super(DocCommentTestSuite.class.getName()); - - addTest(CommentOwnerManagerTests.suite()); - addTest(DocCommentHighlightingTest.suite()); - addTest(DoxygenCCommentAutoEditStrategyTest.suite()); - addTest(DoxygenCCommentSingleAutoEditStrategyTest.suite()); - } -} diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/SelectionTestSuite.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/SelectionTestSuite.java deleted file mode 100644 index 80e0dc63b26..00000000000 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/SelectionTestSuite.java +++ /dev/null @@ -1,30 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006, 2017 Wind River Systems, Inc. and others. - * - * This program and the accompanying materials - * are made available under the terms of the Eclipse Public License 2.0 - * which accompanies this distribution, and is available at - * https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Markus Schorn - initial API and implementation - * Jonah Graham (Kichwa Coders) - converted to new style suite (Bug 515178) - *******************************************************************************/ - -package org.eclipse.cdt.ui.tests.text.selection; - -import org.junit.runner.RunWith; -import org.junit.runners.Suite; - -@RunWith(Suite.class) -@Suite.SuiteClasses({ - - // selection tests - ResolveBindingTests.class, CPPSelectionNoIndexerTests.class, CSelectionNoIndexerTests.class, - CPPSelectionIndexerTests.class, CSelectionIndexerTests.class, - -}) -public class SelectionTestSuite { -} diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/typehierarchy/TypeHierarchyTestSuite.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/typehierarchy/TypeHierarchyTestSuite.java deleted file mode 100644 index 9eca08b7d03..00000000000 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/typehierarchy/TypeHierarchyTestSuite.java +++ /dev/null @@ -1,25 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007, 2017 Wind River Systems, Inc. and others. - * - * This program and the accompanying materials - * are made available under the terms of the Eclipse Public License 2.0 - * which accompanies this distribution, and is available at - * https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Markus Schorn - initial API and implementation - * Jonah Graham (Kichwa Coders) - converted to new style suite (Bug 515178) - *******************************************************************************/ - -package org.eclipse.cdt.ui.tests.typehierarchy; - -import org.junit.runner.RunWith; -import org.junit.runners.Suite; - -@RunWith(Suite.class) -@Suite.SuiteClasses({ CTypeHierarchyTest.class, CppTypeHierarchyTest.class, QuickTypeHierarchyTest.class, - TypeHierarchyAcrossProjectsTest.class, }) -public class TypeHierarchyTestSuite { -} diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/viewsupport/ViewSupportTestSuite.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/viewsupport/ViewSupportTestSuite.java deleted file mode 100644 index 96d08372054..00000000000 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/viewsupport/ViewSupportTestSuite.java +++ /dev/null @@ -1,29 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006, 2017 Wind River Systems, Inc. and others. - * - * This program and the accompanying materials - * are made available under the terms of the Eclipse Public License 2.0 - * which accompanies this distribution, and is available at - * https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Markus Schorn - initial API and implementation - * Jonah Graham (Kichwa Coders) - converted to new style suite (Bug 515178) - *******************************************************************************/ - -package org.eclipse.cdt.ui.tests.viewsupport; - -import org.junit.runner.RunWith; -import org.junit.runners.Suite; - -import junit.framework.TestSuite; - -@RunWith(Suite.class) -@Suite.SuiteClasses({ - - AsyncViewerTest.class, }) -public class ViewSupportTestSuite extends TestSuite { - -} diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/wizards/classwizard/ClassWizardTestSuite.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/wizards/classwizard/ClassWizardTestSuite.java deleted file mode 100644 index 58261f26491..00000000000 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/wizards/classwizard/ClassWizardTestSuite.java +++ /dev/null @@ -1,25 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011, 2017 Stefan Ghiaus and others. - * - * This program and the accompanying materials - * are made available under the terms of the Eclipse Public License 2.0 - * which accompanies this distribution, and is available at - * https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Stefan Ghiaus - initial API and implementation - * Jonah Graham (Kichwa Coders) - converted to new style suite (Bug 515178) - *******************************************************************************/ -package org.eclipse.cdt.ui.tests.wizards.classwizard; - -import org.junit.runner.RunWith; -import org.junit.runners.Suite; - -@RunWith(Suite.class) -@Suite.SuiteClasses({ ClassWizardNameTest.class, - -}) -public class ClassWizardTestSuite { -} diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/wizards/settingswizards/SettingsWizardTestSuite.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/wizards/settingswizards/SettingsWizardTestSuite.java deleted file mode 100644 index 5b437b9c046..00000000000 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/wizards/settingswizards/SettingsWizardTestSuite.java +++ /dev/null @@ -1,23 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2008, 2017 IBM Corporation and others. - * - * This program and the accompanying materials - * are made available under the terms of the Eclipse Public License 2.0 - * which accompanies this distribution, and is available at - * https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * IBM Corporation - initial API and implementation - * Jonah Graham (Kichwa Coders) - converted to new style suite (Bug 515178) - *******************************************************************************/ -package org.eclipse.cdt.ui.tests.wizards.settingswizards; - -import org.junit.runner.RunWith; -import org.junit.runners.Suite; - -@RunWith(Suite.class) -@Suite.SuiteClasses({ SettingsImportExportTest.class }) -public class SettingsWizardTestSuite { -}