Bug 569839: Ensure that behaviour is same running tests without suites
This change renames all suites to be called ...TestSuite so that
the default includes don't pick them up. With the name ...Tests it
means that those tests referenced by the suite are run multiple times.
Tests which relied on being run as part of a TestSuite have been
refactored to run as individual tests by moving the logic from
the suite into the test (e.g. CommentHandlingTestSuite)
Tests that were not runnable have been renamed from ...Test to ...Tester
to match a convention already used in CDT.
Lots of tests did not use standard name (i.e. didn't end in no Test) so
this was fixed.
Many tests were really abstract tests, so the missing abstract was added,
e.g. ArrayTests
The default excludes in Maven behaviour differently than may be expected,
so rather than remove static inner test classes, update the excludes,
see pom.xml change
Change-Id: Ia91e12fe76c3ec2d914463a28400d21b9daf1910
diff --git a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/errorparsers/tests/ErrorParserTests.java b/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/errorparsers/tests/ErrorParserTestSuite.java
similarity index 84%
rename from core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/errorparsers/tests/ErrorParserTests.java
rename to core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/errorparsers/tests/ErrorParserTestSuite.java
index b2c9e07..1fa2c47 100644
--- a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/errorparsers/tests/ErrorParserTests.java
+++ b/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/errorparsers/tests/ErrorParserTestSuite.java
@@ -16,10 +16,14 @@
import junit.framework.Test;
import junit.framework.TestSuite;
-public class ErrorParserTests {
+/**
+ * @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(ErrorParserTests.class.getName());
+ TestSuite suite = new TestSuite(ErrorParserTestSuite.class.getName());
// Just add more test cases here as you create them for
// each class being tested
diff --git a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/preferences/tests/TestScopeOfBuildConfigResourceChangesPreference.java b/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/preferences/tests/ScopeOfBuildConfigResourceChangesPreferenceTests.java
similarity index 93%
rename from core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/preferences/tests/TestScopeOfBuildConfigResourceChangesPreference.java
rename to core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/preferences/tests/ScopeOfBuildConfigResourceChangesPreferenceTests.java
index 8d681ce..e65d53c 100644
--- a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/preferences/tests/TestScopeOfBuildConfigResourceChangesPreference.java
+++ b/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/preferences/tests/ScopeOfBuildConfigResourceChangesPreferenceTests.java
@@ -29,7 +29,7 @@
*
* @author Simeon Andreev
*/
-public class TestScopeOfBuildConfigResourceChangesPreference extends TestCase {
+public class ScopeOfBuildConfigResourceChangesPreferenceTests extends TestCase {
private static final String PREFERENCE_NAME = CCorePreferenceConstants.PREF_BUILD_CONFIGS_RESOURCE_CHANGES;
@@ -37,7 +37,7 @@
private boolean oldDefaultScopeValue;
public static Test suite() {
- return new TestSuite(TestScopeOfBuildConfigResourceChangesPreference.class);
+ return new TestSuite(ScopeOfBuildConfigResourceChangesPreferenceTests.class);
}
@Override
diff --git a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/winreg/tests/WinRegTests.java b/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/winreg/tests/WinRegTests.java
index b0c3d00..d9be3a2 100644
--- a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/winreg/tests/WinRegTests.java
+++ b/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/winreg/tests/WinRegTests.java
@@ -30,7 +30,7 @@
assertEquals("C:\\Program Files", value);
} else {
// Should be null on non-Windows platforms
- assertNotNull(registry);
+ assertNull(registry);
}
}
@@ -43,7 +43,7 @@
assertNull(value);
} else {
// Should be null on non-Windows platforms
- assertNotNull(registry);
+ assertNull(registry);
}
}
}
diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/AllLanguageTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/AllLanguageTestSuite.java
similarity index 78%
rename from core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/AllLanguageTests.java
rename to core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/AllLanguageTestSuite.java
index 79c5dc7..2301e0d 100644
--- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/AllLanguageTests.java
+++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/AllLanguageTestSuite.java
@@ -18,11 +18,12 @@
/**
* @author crecoskie
- *
+ * @deprecated In preparation for moving to JUnit5 test suites are deprecated. See Bug 569839
*/
-public class AllLanguageTests extends TestSuite {
+@Deprecated
+public class AllLanguageTestSuite extends TestSuite {
public static Test suite() {
- TestSuite suite = new AllLanguageTests();
+ TestSuite suite = new AllLanguageTestSuite();
suite.addTest(LanguageInheritanceTests.suite());
diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/settings/providers/AllLanguageSettingsProvidersCoreTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/settings/providers/AllLanguageSettingsProvidersCoreTestSuite.java
similarity index 87%
rename from core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/settings/providers/AllLanguageSettingsProvidersCoreTests.java
rename to core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/settings/providers/AllLanguageSettingsProvidersCoreTestSuite.java
index 126b115..412b114 100644
--- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/settings/providers/AllLanguageSettingsProvidersCoreTests.java
+++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/settings/providers/AllLanguageSettingsProvidersCoreTestSuite.java
@@ -18,14 +18,16 @@
/**
* Test suite to cover core Language Settings Providers functionality.
+ * @deprecated In preparation for moving to JUnit5 test suites are deprecated. See Bug 569839
*/
-public class AllLanguageSettingsProvidersCoreTests {
+@Deprecated
+public class AllLanguageSettingsProvidersCoreTestSuite {
public static void main(String[] args) {
junit.textui.TestRunner.run(suite());
}
public static Test suite() {
- TestSuite suite = new TestSuite(AllLanguageSettingsProvidersCoreTests.class.getName());
+ TestSuite suite = new TestSuite(AllLanguageSettingsProvidersCoreTestSuite.class.getName());
suite.addTest(LanguageSettingsExtensionsTests.suite());
suite.addTest(LanguageSettingsManagerTests.suite());
diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/AllCoreTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/AllCoreTestSuite.java
similarity index 82%
rename from core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/AllCoreTests.java
rename to core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/AllCoreTestSuite.java
index 9cd2ac2..997bf01 100644
--- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/AllCoreTests.java
+++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/AllCoreTestSuite.java
@@ -14,8 +14,8 @@
*******************************************************************************/
package org.eclipse.cdt.core.model.tests;
-import org.eclipse.cdt.core.language.settings.providers.AllLanguageSettingsProvidersCoreTests;
-import org.eclipse.cdt.core.settings.model.AllCProjectDescriptionTests;
+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;
@@ -29,19 +29,21 @@
*
* @author Judy N. Green
* @since Jul 19, 2002
+ * @deprecated In preparation for moving to JUnit5 test suites are deprecated. See Bug 569839
*/
-public class AllCoreTests {
+@Deprecated
+public class AllCoreTestSuite {
public static void main(String[] args) {
junit.textui.TestRunner.run(suite());
}
public static Test suite() {
- TestSuite suite = new TestSuite(AllCoreTests.class.getName());
+ TestSuite suite = new TestSuite(AllCoreTestSuite.class.getName());
// Just add more test cases here as you create them for
// each class being tested
- suite.addTest(AllLanguageInterfaceTests.suite());
+ suite.addTest(AllLanguageInterfaceTestSuite.suite());
suite.addTest(CModelTests.suite());
suite.addTest(CModelElementsTests.suite());
suite.addTest(CModelIdentifierTests.suite());
@@ -57,14 +59,14 @@
suite.addTest(CPathEntryTest.suite());
//the CProjectDescriptionTests now groups all New Project Model related tests
//which includes the CConfigurationDescriptionReferenceTests
- suite.addTest(AllCProjectDescriptionTests.suite());
+ suite.addTest(AllCProjectDescriptionTestSuite.suite());
suite.addTest(PathSettingsContainerTests.suite());
suite.addTest(ASTCacheTests.suite());
suite.addTest(AsmModelBuilderTest.suite());
suite.addTest(CModelBuilderBugsTest.suite());
- suite.addTest(Bug311189.suite());
+ suite.addTest(Bug311189Tests.suite());
- suite.addTest(AllLanguageSettingsProvidersCoreTests.suite());
+ suite.addTest(AllLanguageSettingsProvidersCoreTestSuite.suite());
return suite;
}
diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/AllLanguageInterfaceTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/AllLanguageInterfaceTestSuite.java
similarity index 84%
rename from core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/AllLanguageInterfaceTests.java
rename to core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/AllLanguageInterfaceTestSuite.java
index 795a7d8..32ce592 100644
--- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/AllLanguageInterfaceTests.java
+++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/AllLanguageInterfaceTestSuite.java
@@ -26,14 +26,16 @@
* to be tested.
* @author bnicolle
*
+ * @deprecated In preparation for moving to JUnit5 test suites are deprecated. See Bug 569839
*/
-public class AllLanguageInterfaceTests {
+@Deprecated
+public class AllLanguageInterfaceTestSuite {
/**
*
*/
public static Test suite() {
- TestSuite suite = new TestSuite(AllLanguageInterfaceTests.class.getName());
+ TestSuite suite = new TestSuite(AllLanguageInterfaceTestSuite.class.getName());
// Just add more test cases here as you create them for
// each class being tested
diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/Bug311189.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/Bug311189Tests.java
similarity index 96%
rename from core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/Bug311189.java
rename to core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/Bug311189Tests.java
index 4370373..e696740 100644
--- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/Bug311189.java
+++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/Bug311189Tests.java
@@ -39,10 +39,10 @@
* we must ensure that we don't corrupt the set of includes in the incoming
* project's metadata
*/
-public class Bug311189 extends BaseTestCase {
+public class Bug311189Tests extends BaseTestCase {
public static Test suite() {
- return suite(Bug311189.class, "_");
+ return suite(Bug311189Tests.class, "_");
}
private IProject project;
diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/AllCProjectDescriptionTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/AllCProjectDescriptionTestSuite.java
similarity index 80%
rename from core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/AllCProjectDescriptionTests.java
rename to core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/AllCProjectDescriptionTestSuite.java
index 632ec26..8019a4a 100644
--- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/AllCProjectDescriptionTests.java
+++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/AllCProjectDescriptionTestSuite.java
@@ -16,18 +16,22 @@
import junit.framework.Test;
import junit.framework.TestSuite;
-public class AllCProjectDescriptionTests {
+/**
+ * @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(AllCProjectDescriptionTests.class.getName());
+ 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(CConfigurationDescriptionExportSettings.suite());
+ suite.addTest(CConfigurationDescriptionExportSettingsTests.suite());
suite.addTest(ExternalSettingsProviderTests.suite());
suite.addTest(CfgSettingsTests.suite());
suite.addTest(CProjectDescriptionDeltaTests.suite());
diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/CConfigurationDescriptionExportSettings.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/CConfigurationDescriptionExportSettingsTests.java
similarity index 98%
rename from core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/CConfigurationDescriptionExportSettings.java
rename to core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/CConfigurationDescriptionExportSettingsTests.java
index a5a3751..add611d 100644
--- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/CConfigurationDescriptionExportSettings.java
+++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/CConfigurationDescriptionExportSettingsTests.java
@@ -40,12 +40,12 @@
* This functionality is provided by the CfgExportSettingContainerFactory which plugins
* into the CExternalSettingsManager
*/
-public class CConfigurationDescriptionExportSettings extends BaseTestCase {
+public class CConfigurationDescriptionExportSettingsTests extends BaseTestCase {
CoreModel coreModel = CoreModel.getDefault();
public static TestSuite suite() {
- return suite(CConfigurationDescriptionExportSettings.class, "_");
+ return suite(CConfigurationDescriptionExportSettingsTests.class, "_");
}
// Setting entries 1
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
index f74906d..753508e 100644
--- 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
@@ -27,7 +27,9 @@
/**
* 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());
diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2FileBasePluginTestCase.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2FileBasePluginTestCase.java
index 66b7a24..0f5f7a7 100644
--- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2FileBasePluginTestCase.java
+++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2FileBasePluginTestCase.java
@@ -38,7 +38,7 @@
/**
* @author dsteffle
*/
-public class AST2FileBasePluginTestCase extends TestCase {
+public abstract class AST2FileBasePluginTestCase extends TestCase {
static NullProgressMonitor monitor;
static IWorkspace workspace;
static IProject project;
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
index e07a843..577a116 100644
--- 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
@@ -19,8 +19,9 @@
/**
* @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() {
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
index 5f17ae7..dbe0749 100644
--- 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
@@ -31,7 +31,9 @@
/**
* @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());
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
new file mode 100644
index 0000000..2909cec
--- /dev/null
+++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/AllConstexprEvalTestSuite.java
@@ -0,0 +1,76 @@
+/*******************************************************************************
+* 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/ast2/cxx14/constexpr/AllConstexprEvalTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/AllConstexprEvalTests.java
deleted file mode 100644
index 79eb731..0000000
--- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/AllConstexprEvalTests.java
+++ /dev/null
@@ -1,72 +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;
-
-public class AllConstexprEvalTests {
- public static Test suite() throws Exception {
- final TestSuite suite = new TestSuite();
- suite.addTest(ConstructorTests.NonIndexing.suite());
- suite.addTest(ConstructorTests.SingleProject.suite());
- suite.addTest(MemberFunctionTests.NonIndexing.suite());
- suite.addTest(MemberFunctionTests.SingleProject.suite());
- suite.addTest(MemberVariableTests.NonIndexing.suite());
- suite.addTest(MemberVariableTests.SingleProject.suite());
- suite.addTest(FunctionTests.NonIndexing.suite());
- suite.addTest(FunctionTests.SingleProject.suite());
- suite.addTest(FunctionTemplateTests.NonIndexing.suite());
- suite.addTest(FunctionTemplateTests.SingleProject.suite());
- suite.addTest(ClassTemplateTests.NonIndexing.suite());
- suite.addTest(ClassTemplateTests.SingleProject.suite());
- suite.addTest(IfStatementTests.NonIndexing.suite());
- suite.addTest(IfStatementTests.SingleProject.suite());
- suite.addTest(SwitchStatementTests.NonIndexing.suite());
- suite.addTest(SwitchStatementTests.SingleProject.suite());
- suite.addTest(WhileStatementTests.NonIndexing.suite());
- suite.addTest(WhileStatementTests.SingleProject.suite());
- suite.addTest(DoWhileStatementTests.NonIndexing.suite());
- suite.addTest(DoWhileStatementTests.SingleProject.suite());
- suite.addTest(ForStatementTests.NonIndexing.suite());
- suite.addTest(ForStatementTests.SingleProject.suite());
- suite.addTest(RangeBasedForStatementTests.NonIndexing.suite());
- suite.addTest(RangeBasedForStatementTests.SingleProject.suite());
- suite.addTest(BinaryOperatorOverloadingTests.NonIndexing.suite());
- suite.addTest(BinaryOperatorOverloadingTests.SingleProject.suite());
- suite.addTest(UnaryOperatorOverloadingTests.NonIndexing.suite());
- suite.addTest(UnaryOperatorOverloadingTests.SingleProject.suite());
- suite.addTest(ArrayTests.NonIndexing.suite());
- suite.addTest(ArrayTests.SingleProject.suite());
- suite.addTest(BinaryExpressionTests.NonIndexing.suite());
- suite.addTest(BinaryExpressionTests.SingleProject.suite());
- suite.addTest(UnaryExpressionTests.NonIndexing.suite());
- suite.addTest(UnaryExpressionTests.SingleProject.suite());
- suite.addTest(ReferenceTests.NonIndexing.suite());
- suite.addTest(ReferenceTests.SingleProject.suite());
- suite.addTest(TypeAliasTests.NonIndexing.suite());
- suite.addTest(TypeAliasTests.SingleProject.suite());
- suite.addTest(PointerTests.NonIndexing.suite());
- suite.addTest(PointerTests.SingleProject.suite());
- suite.addTest(UserDefinedLiteralTests.NonIndexing.suite());
- suite.addTest(UserDefinedLiteralTests.SingleProject.suite());
- suite.addTest(IntegralValueTests.NonIndexing.suite());
- suite.addTest(IntegralValueTests.SingleProject.suite());
- suite.addTest(FloatingPointValueTests.NonIndexing.suite());
- suite.addTest(FloatingPointValueTests.SingleProject.suite());
- suite.addTest(CStringValueTests.NonIndexing.suite());
- suite.addTest(CStringValueTests.SingleProject.suite());
- suite.addTest(StructuredBindingTests.NonIndexing.suite());
- suite.addTest(StructuredBindingTests.SingleProject.suite());
- return suite;
- }
-}
diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/ArrayTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/ArrayTests.java
index 7d33789..929b6d2 100644
--- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/ArrayTests.java
+++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/ArrayTests.java
@@ -13,24 +13,24 @@
import junit.framework.TestSuite;
-public class ArrayTests extends TestBase {
- public static class NonIndexing extends ArrayTests {
- public NonIndexing() {
+public abstract class ArrayTests extends TestBase {
+ public static class NonIndexingTests extends ArrayTests {
+ public NonIndexingTests() {
setStrategy(new NonIndexingTestStrategy());
}
public static TestSuite suite() {
- return suite(NonIndexing.class);
+ return suite(NonIndexingTests.class);
}
}
- public static class SingleProject extends ArrayTests {
- public SingleProject() {
+ public static class SingleProjectTests extends ArrayTests {
+ public SingleProjectTests() {
setStrategy(new SinglePDOMTestStrategy(true, false));
}
public static TestSuite suite() {
- return suite(SingleProject.class);
+ return suite(SingleProjectTests.class);
}
}
diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/BinaryExpressionTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/BinaryExpressionTests.java
index abe0a57..5a675a9 100644
--- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/BinaryExpressionTests.java
+++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/BinaryExpressionTests.java
@@ -13,24 +13,24 @@
import junit.framework.TestSuite;
-public class BinaryExpressionTests extends TestBase {
- public static class NonIndexing extends BinaryExpressionTests {
- public NonIndexing() {
+public abstract class BinaryExpressionTests extends TestBase {
+ public static class NonIndexingTests extends BinaryExpressionTests {
+ public NonIndexingTests() {
setStrategy(new NonIndexingTestStrategy());
}
public static TestSuite suite() {
- return suite(NonIndexing.class);
+ return suite(NonIndexingTests.class);
}
}
- public static class SingleProject extends BinaryExpressionTests {
- public SingleProject() {
+ public static class SingleProjectTests extends BinaryExpressionTests {
+ public SingleProjectTests() {
setStrategy(new SinglePDOMTestStrategy(true, false));
}
public static TestSuite suite() {
- return suite(SingleProject.class);
+ return suite(SingleProjectTests.class);
}
}
diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/BinaryOperatorOverloadingTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/BinaryOperatorOverloadingTests.java
index 2052811..7b9b1b2 100644
--- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/BinaryOperatorOverloadingTests.java
+++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/BinaryOperatorOverloadingTests.java
@@ -13,24 +13,24 @@
import junit.framework.TestSuite;
-public class BinaryOperatorOverloadingTests extends TestBase {
- public static class NonIndexing extends BinaryOperatorOverloadingTests {
- public NonIndexing() {
+public abstract class BinaryOperatorOverloadingTests extends TestBase {
+ public static class NonIndexingTests extends BinaryOperatorOverloadingTests {
+ public NonIndexingTests() {
setStrategy(new NonIndexingTestStrategy());
}
public static TestSuite suite() {
- return suite(NonIndexing.class);
+ return suite(NonIndexingTests.class);
}
}
- public static class SingleProject extends BinaryOperatorOverloadingTests {
- public SingleProject() {
+ public static class SingleProjectTests extends BinaryOperatorOverloadingTests {
+ public SingleProjectTests() {
setStrategy(new SinglePDOMTestStrategy(true, false));
}
public static TestSuite suite() {
- return suite(SingleProject.class);
+ return suite(SingleProjectTests.class);
}
}
diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/CStringValueTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/CStringValueTests.java
index 12cf893..1c5c084 100644
--- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/CStringValueTests.java
+++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/CStringValueTests.java
@@ -13,24 +13,24 @@
import junit.framework.TestSuite;
-public class CStringValueTests extends TestBase {
- public static class NonIndexing extends CStringValueTests {
- public NonIndexing() {
+public abstract class CStringValueTests extends TestBase {
+ public static class NonIndexingTests extends CStringValueTests {
+ public NonIndexingTests() {
setStrategy(new NonIndexingTestStrategy());
}
public static TestSuite suite() {
- return suite(NonIndexing.class);
+ return suite(NonIndexingTests.class);
}
}
- public static class SingleProject extends CStringValueTests {
- public SingleProject() {
+ public static class SingleProjectTests extends CStringValueTests {
+ public SingleProjectTests() {
setStrategy(new SinglePDOMTestStrategy(true, false));
}
public static TestSuite suite() {
- return suite(SingleProject.class);
+ return suite(SingleProjectTests.class);
}
}
diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/ClassTemplateTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/ClassTemplateTests.java
index 85853da..56f7f71 100644
--- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/ClassTemplateTests.java
+++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/ClassTemplateTests.java
@@ -13,24 +13,24 @@
import junit.framework.TestSuite;
-public class ClassTemplateTests extends TestBase {
- public static class NonIndexing extends ClassTemplateTests {
- public NonIndexing() {
+public abstract class ClassTemplateTests extends TestBase {
+ public static class NonIndexingTests extends ClassTemplateTests {
+ public NonIndexingTests() {
setStrategy(new NonIndexingTestStrategy());
}
public static TestSuite suite() {
- return suite(NonIndexing.class);
+ return suite(NonIndexingTests.class);
}
}
- public static class SingleProject extends ClassTemplateTests {
- public SingleProject() {
+ public static class SingleProjectTests extends ClassTemplateTests {
+ public SingleProjectTests() {
setStrategy(new SinglePDOMTestStrategy(true, false));
}
public static TestSuite suite() {
- return suite(SingleProject.class);
+ return suite(SingleProjectTests.class);
}
}
diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/ConstructorTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/ConstructorTests.java
index bd597e7..4f3f393 100644
--- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/ConstructorTests.java
+++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/ConstructorTests.java
@@ -15,24 +15,24 @@
import junit.framework.TestSuite;
-public class ConstructorTests extends TestBase {
- public static class NonIndexing extends ConstructorTests {
- public NonIndexing() {
+public abstract class ConstructorTests extends TestBase {
+ public static class NonIndexingTests extends ConstructorTests {
+ public NonIndexingTests() {
setStrategy(new NonIndexingTestStrategy());
}
public static TestSuite suite() {
- return suite(NonIndexing.class);
+ return suite(NonIndexingTests.class);
}
}
- public static class SingleProject extends ConstructorTests {
- public SingleProject() {
+ public static class SingleProjectTests extends ConstructorTests {
+ public SingleProjectTests() {
setStrategy(new SinglePDOMTestStrategy(true, false));
}
public static TestSuite suite() {
- return suite(SingleProject.class);
+ return suite(SingleProjectTests.class);
}
}
@@ -41,7 +41,7 @@
}
public static TestSuite suite() {
- return suite(NonIndexing.class);
+ return suite(NonIndexingTests.class);
}
// struct S {
diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/DoWhileStatementTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/DoWhileStatementTests.java
index c0f21f2..1d1c571 100644
--- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/DoWhileStatementTests.java
+++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/DoWhileStatementTests.java
@@ -15,24 +15,24 @@
import junit.framework.TestSuite;
-public class DoWhileStatementTests extends TestBase {
- public static class NonIndexing extends DoWhileStatementTests {
- public NonIndexing() {
+public abstract class DoWhileStatementTests extends TestBase {
+ public static class NonIndexingTests extends DoWhileStatementTests {
+ public NonIndexingTests() {
setStrategy(new NonIndexingTestStrategy());
}
public static TestSuite suite() {
- return suite(NonIndexing.class);
+ return suite(NonIndexingTests.class);
}
}
- public static class SingleProject extends DoWhileStatementTests {
- public SingleProject() {
+ public static class SingleProjectTests extends DoWhileStatementTests {
+ public SingleProjectTests() {
setStrategy(new SinglePDOMTestStrategy(true, false));
}
public static TestSuite suite() {
- return suite(SingleProject.class);
+ return suite(SingleProjectTests.class);
}
}
diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/FloatingPointValueTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/FloatingPointValueTests.java
index 2727a20..10466ca 100644
--- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/FloatingPointValueTests.java
+++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/FloatingPointValueTests.java
@@ -13,24 +13,24 @@
import junit.framework.TestSuite;
-public class FloatingPointValueTests extends TestBase {
- public static class NonIndexing extends FloatingPointValueTests {
- public NonIndexing() {
+public abstract class FloatingPointValueTests extends TestBase {
+ public static class NonIndexingTests extends FloatingPointValueTests {
+ public NonIndexingTests() {
setStrategy(new NonIndexingTestStrategy());
}
public static TestSuite suite() {
- return suite(NonIndexing.class);
+ return suite(NonIndexingTests.class);
}
}
- public static class SingleProject extends FloatingPointValueTests {
- public SingleProject() {
+ public static class SingleProjectTests extends FloatingPointValueTests {
+ public SingleProjectTests() {
setStrategy(new SinglePDOMTestStrategy(true, false));
}
public static TestSuite suite() {
- return suite(SingleProject.class);
+ return suite(SingleProjectTests.class);
}
}
diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/ForStatementTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/ForStatementTests.java
index 81257e3..f1f15bb 100644
--- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/ForStatementTests.java
+++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/ForStatementTests.java
@@ -15,24 +15,24 @@
import junit.framework.TestSuite;
-public class ForStatementTests extends TestBase {
- public static class NonIndexing extends ForStatementTests {
- public NonIndexing() {
+public abstract class ForStatementTests extends TestBase {
+ public static class NonIndexingTests extends ForStatementTests {
+ public NonIndexingTests() {
setStrategy(new NonIndexingTestStrategy());
}
public static TestSuite suite() {
- return suite(NonIndexing.class);
+ return suite(NonIndexingTests.class);
}
}
- public static class SingleProject extends ForStatementTests {
- public SingleProject() {
+ public static class SingleProjectTests extends ForStatementTests {
+ public SingleProjectTests() {
setStrategy(new SinglePDOMTestStrategy(true, false));
}
public static TestSuite suite() {
- return suite(SingleProject.class);
+ return suite(SingleProjectTests.class);
}
}
diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/FunctionTemplateTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/FunctionTemplateTests.java
index 24e530b..beb16f0 100644
--- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/FunctionTemplateTests.java
+++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/FunctionTemplateTests.java
@@ -13,24 +13,24 @@
import junit.framework.TestSuite;
-public class FunctionTemplateTests extends TestBase {
- public static class NonIndexing extends FunctionTemplateTests {
- public NonIndexing() {
+public abstract class FunctionTemplateTests extends TestBase {
+ public static class NonIndexingTests extends FunctionTemplateTests {
+ public NonIndexingTests() {
setStrategy(new NonIndexingTestStrategy());
}
public static TestSuite suite() {
- return suite(NonIndexing.class);
+ return suite(NonIndexingTests.class);
}
}
- public static class SingleProject extends FunctionTemplateTests {
- public SingleProject() {
+ public static class SingleProjectTests extends FunctionTemplateTests {
+ public SingleProjectTests() {
setStrategy(new SinglePDOMTestStrategy(true, false));
}
public static TestSuite suite() {
- return suite(SingleProject.class);
+ return suite(SingleProjectTests.class);
}
}
diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/FunctionTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/FunctionTests.java
index 90bc538..e93634e 100644
--- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/FunctionTests.java
+++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/FunctionTests.java
@@ -20,24 +20,24 @@
import junit.framework.TestSuite;
-public class FunctionTests extends TestBase {
- public static class NonIndexing extends FunctionTests {
- public NonIndexing() {
+public abstract class FunctionTests extends TestBase {
+ public static class NonIndexingTests extends FunctionTests {
+ public NonIndexingTests() {
setStrategy(new NonIndexingTestStrategy());
}
public static TestSuite suite() {
- return suite(NonIndexing.class);
+ return suite(NonIndexingTests.class);
}
}
- public static class SingleProject extends FunctionTests {
- public SingleProject() {
+ public static class SingleProjectTests extends FunctionTests {
+ public SingleProjectTests() {
setStrategy(new SinglePDOMTestStrategy(true, false));
}
public static TestSuite suite() {
- return suite(SingleProject.class);
+ return suite(SingleProjectTests.class);
}
}
diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/IfStatementTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/IfStatementTests.java
index e8c32fe..cac7188 100644
--- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/IfStatementTests.java
+++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/IfStatementTests.java
@@ -13,24 +13,24 @@
import junit.framework.TestSuite;
-public class IfStatementTests extends TestBase {
- public static class NonIndexing extends IfStatementTests {
- public NonIndexing() {
+public abstract class IfStatementTests extends TestBase {
+ public static class NonIndexingTests extends IfStatementTests {
+ public NonIndexingTests() {
setStrategy(new NonIndexingTestStrategy());
}
public static TestSuite suite() {
- return suite(NonIndexing.class);
+ return suite(NonIndexingTests.class);
}
}
- public static class SingleProject extends IfStatementTests {
- public SingleProject() {
+ public static class SingleProjectTests extends IfStatementTests {
+ public SingleProjectTests() {
setStrategy(new SinglePDOMTestStrategy(true, false));
}
public static TestSuite suite() {
- return suite(SingleProject.class);
+ return suite(SingleProjectTests.class);
}
}
diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/IntegralValueTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/IntegralValueTests.java
index 641fdfc..43bf85a 100644
--- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/IntegralValueTests.java
+++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/IntegralValueTests.java
@@ -15,24 +15,24 @@
import junit.framework.TestSuite;
-public class IntegralValueTests extends TestBase {
- public static class NonIndexing extends IntegralValueTests {
- public NonIndexing() {
+public abstract class IntegralValueTests extends TestBase {
+ public static class NonIndexingTests extends IntegralValueTests {
+ public NonIndexingTests() {
setStrategy(new NonIndexingTestStrategy());
}
public static TestSuite suite() {
- return suite(NonIndexing.class);
+ return suite(NonIndexingTests.class);
}
}
- public static class SingleProject extends IntegralValueTests {
- public SingleProject() {
+ public static class SingleProjectTests extends IntegralValueTests {
+ public SingleProjectTests() {
setStrategy(new SinglePDOMTestStrategy(true, false));
}
public static TestSuite suite() {
- return suite(SingleProject.class);
+ return suite(SingleProjectTests.class);
}
}
diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/MemberFunctionTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/MemberFunctionTests.java
index a9d1927..652c8bf 100644
--- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/MemberFunctionTests.java
+++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/MemberFunctionTests.java
@@ -13,24 +13,24 @@
import junit.framework.TestSuite;
-public class MemberFunctionTests extends TestBase {
- public static class NonIndexing extends MemberFunctionTests {
- public NonIndexing() {
+public abstract class MemberFunctionTests extends TestBase {
+ public static class NonIndexingTests extends MemberFunctionTests {
+ public NonIndexingTests() {
setStrategy(new NonIndexingTestStrategy());
}
public static TestSuite suite() {
- return suite(NonIndexing.class);
+ return suite(NonIndexingTests.class);
}
}
- public static class SingleProject extends MemberFunctionTests {
- public SingleProject() {
+ public static class SingleProjectTests extends MemberFunctionTests {
+ public SingleProjectTests() {
setStrategy(new SinglePDOMTestStrategy(true, false));
}
public static TestSuite suite() {
- return suite(SingleProject.class);
+ return suite(SingleProjectTests.class);
}
}
diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/MemberVariableTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/MemberVariableTests.java
index ab09b0b..cee47b7 100644
--- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/MemberVariableTests.java
+++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/MemberVariableTests.java
@@ -13,24 +13,24 @@
import junit.framework.TestSuite;
-public class MemberVariableTests extends TestBase {
- public static class NonIndexing extends MemberVariableTests {
- public NonIndexing() {
+public abstract class MemberVariableTests extends TestBase {
+ public static class NonIndexingTests extends MemberVariableTests {
+ public NonIndexingTests() {
setStrategy(new NonIndexingTestStrategy());
}
public static TestSuite suite() {
- return suite(NonIndexing.class);
+ return suite(NonIndexingTests.class);
}
}
- public static class SingleProject extends MemberVariableTests {
- public SingleProject() {
+ public static class SingleProjectTests extends MemberVariableTests {
+ public SingleProjectTests() {
setStrategy(new SinglePDOMTestStrategy(true, false));
}
public static TestSuite suite() {
- return suite(SingleProject.class);
+ return suite(SingleProjectTests.class);
}
}
diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/PointerTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/PointerTests.java
index 789684c..4ca449e 100644
--- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/PointerTests.java
+++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/PointerTests.java
@@ -15,24 +15,24 @@
import junit.framework.TestSuite;
-public class PointerTests extends TestBase {
- public static class NonIndexing extends PointerTests {
- public NonIndexing() {
+public abstract class PointerTests extends TestBase {
+ public static class NonIndexingTests extends PointerTests {
+ public NonIndexingTests() {
setStrategy(new NonIndexingTestStrategy());
}
public static TestSuite suite() {
- return suite(NonIndexing.class);
+ return suite(NonIndexingTests.class);
}
}
- public static class SingleProject extends PointerTests {
- public SingleProject() {
+ public static class SingleProjectTests extends PointerTests {
+ public SingleProjectTests() {
setStrategy(new SinglePDOMTestStrategy(true, false));
}
public static TestSuite suite() {
- return suite(SingleProject.class);
+ return suite(SingleProjectTests.class);
}
}
diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/RangeBasedForStatementTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/RangeBasedForStatementTests.java
index 35d5b3a..aebe27f 100644
--- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/RangeBasedForStatementTests.java
+++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/RangeBasedForStatementTests.java
@@ -15,24 +15,24 @@
import junit.framework.TestSuite;
-public class RangeBasedForStatementTests extends TestBase {
- public static class NonIndexing extends RangeBasedForStatementTests {
- public NonIndexing() {
+public abstract class RangeBasedForStatementTests extends TestBase {
+ public static class NonIndexingTests extends RangeBasedForStatementTests {
+ public NonIndexingTests() {
setStrategy(new NonIndexingTestStrategy());
}
public static TestSuite suite() {
- return suite(NonIndexing.class);
+ return suite(NonIndexingTests.class);
}
}
- public static class SingleProject extends RangeBasedForStatementTests {
- public SingleProject() {
+ public static class SingleProjectTests extends RangeBasedForStatementTests {
+ public SingleProjectTests() {
setStrategy(new SinglePDOMTestStrategy(true, false));
}
public static TestSuite suite() {
- return suite(SingleProject.class);
+ return suite(SingleProjectTests.class);
}
}
diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/ReferenceTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/ReferenceTests.java
index 7a79003..35a2ad0 100644
--- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/ReferenceTests.java
+++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/ReferenceTests.java
@@ -13,24 +13,24 @@
import junit.framework.TestSuite;
-public class ReferenceTests extends TestBase {
- public static class NonIndexing extends ReferenceTests {
- public NonIndexing() {
+public abstract class ReferenceTests extends TestBase {
+ public static class NonIndexingTests extends ReferenceTests {
+ public NonIndexingTests() {
setStrategy(new NonIndexingTestStrategy());
}
public static TestSuite suite() {
- return suite(NonIndexing.class);
+ return suite(NonIndexingTests.class);
}
}
- public static class SingleProject extends ReferenceTests {
- public SingleProject() {
+ public static class SingleProjectTests extends ReferenceTests {
+ public SingleProjectTests() {
setStrategy(new SinglePDOMTestStrategy(true, false));
}
public static TestSuite suite() {
- return suite(SingleProject.class);
+ return suite(SingleProjectTests.class);
}
}
diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/StructuredBindingTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/StructuredBindingTests.java
index dd6b20c..93a3eb4 100644
--- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/StructuredBindingTests.java
+++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/StructuredBindingTests.java
@@ -13,24 +13,24 @@
import junit.framework.TestSuite;
-public class StructuredBindingTests extends TestBase {
- public static class NonIndexing extends StructuredBindingTests {
- public NonIndexing() {
+public abstract class StructuredBindingTests extends TestBase {
+ public static class NonIndexingTests extends StructuredBindingTests {
+ public NonIndexingTests() {
setStrategy(new NonIndexingTestStrategy());
}
public static TestSuite suite() {
- return suite(NonIndexing.class);
+ return suite(NonIndexingTests.class);
}
}
- public static class SingleProject extends StructuredBindingTests {
- public SingleProject() {
+ public static class SingleProjectTests extends StructuredBindingTests {
+ public SingleProjectTests() {
setStrategy(new SinglePDOMTestStrategy(true, false));
}
public static TestSuite suite() {
- return suite(SingleProject.class);
+ return suite(SingleProjectTests.class);
}
}
diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/SwitchStatementTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/SwitchStatementTests.java
index 6782630..5712181 100644
--- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/SwitchStatementTests.java
+++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/SwitchStatementTests.java
@@ -13,24 +13,24 @@
import junit.framework.TestSuite;
-public class SwitchStatementTests extends TestBase {
- public static class NonIndexing extends SwitchStatementTests {
- public NonIndexing() {
+public abstract class SwitchStatementTests extends TestBase {
+ public static class NonIndexingTests extends SwitchStatementTests {
+ public NonIndexingTests() {
setStrategy(new NonIndexingTestStrategy());
}
public static TestSuite suite() {
- return suite(NonIndexing.class);
+ return suite(NonIndexingTests.class);
}
}
- public static class SingleProject extends SwitchStatementTests {
- public SingleProject() {
+ public static class SingleProjectTests extends SwitchStatementTests {
+ public SingleProjectTests() {
setStrategy(new SinglePDOMTestStrategy(true, false));
}
public static TestSuite suite() {
- return suite(SingleProject.class);
+ return suite(SingleProjectTests.class);
}
}
diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/TypeAliasTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/TypeAliasTests.java
index f8bfe84..fba57b2 100644
--- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/TypeAliasTests.java
+++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/TypeAliasTests.java
@@ -13,24 +13,24 @@
import junit.framework.TestSuite;
-public class TypeAliasTests extends TestBase {
- public static class NonIndexing extends TypeAliasTests {
- public NonIndexing() {
+public abstract class TypeAliasTests extends TestBase {
+ public static class NonIndexingTests extends TypeAliasTests {
+ public NonIndexingTests() {
setStrategy(new NonIndexingTestStrategy());
}
public static TestSuite suite() {
- return suite(NonIndexing.class);
+ return suite(NonIndexingTests.class);
}
}
- public static class SingleProject extends TypeAliasTests {
- public SingleProject() {
+ public static class SingleProjectTests extends TypeAliasTests {
+ public SingleProjectTests() {
setStrategy(new SinglePDOMTestStrategy(true, false));
}
public static TestSuite suite() {
- return suite(SingleProject.class);
+ return suite(SingleProjectTests.class);
}
}
diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/UnaryExpressionTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/UnaryExpressionTests.java
index d75d427..cf9d410 100644
--- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/UnaryExpressionTests.java
+++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/UnaryExpressionTests.java
@@ -13,24 +13,24 @@
import junit.framework.TestSuite;
-public class UnaryExpressionTests extends TestBase {
- public static class NonIndexing extends UnaryExpressionTests {
- public NonIndexing() {
+public abstract class UnaryExpressionTests extends TestBase {
+ public static class NonIndexingTests extends UnaryExpressionTests {
+ public NonIndexingTests() {
setStrategy(new NonIndexingTestStrategy());
}
public static TestSuite suite() {
- return suite(NonIndexing.class);
+ return suite(NonIndexingTests.class);
}
}
- public static class SingleProject extends UnaryExpressionTests {
- public SingleProject() {
+ public static class SingleProjectTests extends UnaryExpressionTests {
+ public SingleProjectTests() {
setStrategy(new SinglePDOMTestStrategy(true, false));
}
public static TestSuite suite() {
- return suite(SingleProject.class);
+ return suite(SingleProjectTests.class);
}
}
diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/UnaryOperatorOverloadingTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/UnaryOperatorOverloadingTests.java
index 854f2ab..ff78ad1 100644
--- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/UnaryOperatorOverloadingTests.java
+++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/UnaryOperatorOverloadingTests.java
@@ -13,24 +13,24 @@
import junit.framework.TestSuite;
-public class UnaryOperatorOverloadingTests extends TestBase {
- public static class NonIndexing extends UnaryOperatorOverloadingTests {
- public NonIndexing() {
+public abstract class UnaryOperatorOverloadingTests extends TestBase {
+ public static class NonIndexingTests extends UnaryOperatorOverloadingTests {
+ public NonIndexingTests() {
setStrategy(new NonIndexingTestStrategy());
}
public static TestSuite suite() {
- return suite(NonIndexing.class);
+ return suite(NonIndexingTests.class);
}
}
- public static class SingleProject extends UnaryOperatorOverloadingTests {
- public SingleProject() {
+ public static class SingleProjectTests extends UnaryOperatorOverloadingTests {
+ public SingleProjectTests() {
setStrategy(new SinglePDOMTestStrategy(true, false));
}
public static TestSuite suite() {
- return suite(SingleProject.class);
+ return suite(SingleProjectTests.class);
}
}
diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/UserDefinedLiteralTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/UserDefinedLiteralTests.java
index cf32d1a..34ec4b7 100644
--- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/UserDefinedLiteralTests.java
+++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/UserDefinedLiteralTests.java
@@ -15,24 +15,24 @@
import junit.framework.TestSuite;
-public class UserDefinedLiteralTests extends TestBase {
- public static class NonIndexing extends UserDefinedLiteralTests {
- public NonIndexing() {
+public abstract class UserDefinedLiteralTests extends TestBase {
+ public static class NonIndexingTests extends UserDefinedLiteralTests {
+ public NonIndexingTests() {
setStrategy(new NonIndexingTestStrategy());
}
public static TestSuite suite() {
- return suite(NonIndexing.class);
+ return suite(NonIndexingTests.class);
}
}
- public static class SingleProject extends UserDefinedLiteralTests {
- public SingleProject() {
+ public static class SingleProjectTests extends UserDefinedLiteralTests {
+ public SingleProjectTests() {
setStrategy(new SinglePDOMTestStrategy(true, false));
}
public static TestSuite suite() {
- return suite(SingleProject.class);
+ return suite(SingleProjectTests.class);
}
}
diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/WhileStatementTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/WhileStatementTests.java
index ba5c5fe..050cce9 100644
--- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/WhileStatementTests.java
+++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/constexpr/WhileStatementTests.java
@@ -15,24 +15,24 @@
import junit.framework.TestSuite;
-public class WhileStatementTests extends TestBase {
- public static class NonIndexing extends WhileStatementTests {
- public NonIndexing() {
+public abstract class WhileStatementTests extends TestBase {
+ public static class NonIndexingTests extends WhileStatementTests {
+ public NonIndexingTests() {
setStrategy(new NonIndexingTestStrategy());
}
public static TestSuite suite() {
- return suite(NonIndexing.class);
+ return suite(NonIndexingTests.class);
}
}
- public static class SingleProject extends WhileStatementTests {
- public SingleProject() {
+ public static class SingleProjectTests extends WhileStatementTests {
+ public SingleProjectTests() {
setStrategy(new SinglePDOMTestStrategy(true, false));
}
public static TestSuite suite() {
- return suite(SingleProject.class);
+ return suite(SingleProjectTests.class);
}
}
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
index 370a6ef..c21d9d4 100644
--- 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
@@ -17,6 +17,10 @@
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() {
diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/RewriteTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/RewriteTestSuite.java
similarity index 83%
rename from core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/RewriteTests.java
rename to core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/RewriteTestSuite.java
index 61fbef3..27dca43 100644
--- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/RewriteTests.java
+++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/RewriteTestSuite.java
@@ -21,10 +21,14 @@
import junit.framework.Test;
import junit.framework.TestSuite;
-public class RewriteTests extends 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(RewriteTests.class.getName());
+ TestSuite suite = new TestSuite(RewriteTestSuite.class.getName());
suite.addTest(AstWriterTestSuite.suite());
suite.addTest(CommentHandlingTestSuite.suite());
suite.addTest(ChangeGeneratorTestSuite.suite());
diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/astwriter/ASTWriterTest.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/astwriter/ASTWriterTester.java
similarity index 97%
rename from core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/astwriter/ASTWriterTest.java
rename to core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/astwriter/ASTWriterTester.java
index 2cf218d..5818791 100644
--- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/astwriter/ASTWriterTest.java
+++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/astwriter/ASTWriterTester.java
@@ -46,12 +46,12 @@
/**
* @author Guido Zgraggen
*/
-public class ASTWriterTest extends RewriteBaseTest {
+public class ASTWriterTester extends RewriteBaseTest {
private static final IParserLogService NULL_LOG = new NullLogService();
private IFile file;
- public ASTWriterTest(String name, ASTWriterTestSourceFile file) {
+ public ASTWriterTester(String name, ASTWriterTestSourceFile file) {
super(name);
fileMap.put(file.getName(), file);
}
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
index 46215cf..78a4bd6 100644
--- 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
@@ -20,49 +20,14 @@
/**
* @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("AstWriterTests");
- suite.addTest(
- SourceRewriteTester.suite("ExpressionTests", "resources/rewrite/ASTWriterExpressionTestSource.awts"));
-
- suite.addTest(
- SourceRewriteTester.suite("DelcSpecifierTests", "resources/rewrite/ASTWriterDeclSpecTestSource.awts"));
- suite.addTest(SourceRewriteTester.suite("Commented DelcSpecifierTests",
- "resources/rewrite/ASTWriterCommentedDeclSpecTestSource.awts"));
-
- suite.addTest(
- SourceRewriteTester.suite("DeclaratorTests", "resources/rewrite/ASTWriterDeclaratorTestSource.awts"));
- suite.addTest(SourceRewriteTester.suite("Commented DeclaratorTests",
- "resources/rewrite/ASTWriterCommentedDeclaratorTestSource.awts"));
-
- suite.addTest(
- SourceRewriteTester.suite("StatementsTests", "resources/rewrite/ASTWriterStatementTestSource.awts"));
- suite.addTest(SourceRewriteTester.suite("Commented StatementsTests",
- "resources/rewrite/ASTWriterCommentedStatementTestSource.awts"));
-
- suite.addTest(SourceRewriteTester.suite("NameTests", "resources/rewrite/ASTWriterNameTestSource.awts"));
- suite.addTest(SourceRewriteTester.suite("Commented NameTests",
- "resources/rewrite/ASTWriterCommentedNameTestSource.awts"));
-
- suite.addTest(
- SourceRewriteTester.suite("InitializerTests", "resources/rewrite/ASTWriterInitializerTestSource.awts"));
-
- suite.addTest(
- SourceRewriteTester.suite("DeclarationTests", "resources/rewrite/ASTWriterDeclarationTestSource.awts"));
- suite.addTest(SourceRewriteTester.suite("Commented DeclarationTests",
- "resources/rewrite/ASTWriterCommentedDeclarationTestSource.awts"));
-
- suite.addTest(
- SourceRewriteTester.suite("TemplatesTests", "resources/rewrite/ASTWriterTemplateTestSource.awts"));
-
- suite.addTest(SourceRewriteTester.suite("CommentTests", "resources/rewrite/ASTWriterCommentedTestSource.awts"));
- suite.addTest(
- SourceRewriteTester.suite("NewCommentTests", "resources/rewrite/ASTWriterCommentedTestSource2.awts"));
- suite.addTest(
- SourceRewriteTester.suite("AttributeTests", "resources/rewrite/ASTWriterAttributeTestSource.awts"));
+ 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/astwriter/SourceRewriteTester.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/astwriter/SourceRewriteTest.java
similarity index 69%
rename from core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/astwriter/SourceRewriteTester.java
rename to core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/astwriter/SourceRewriteTest.java
index 384f4f0..bcccc29 100644
--- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/astwriter/SourceRewriteTester.java
+++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/astwriter/SourceRewriteTest.java
@@ -32,7 +32,7 @@
import junit.framework.Test;
import junit.framework.TestSuite;
-public class SourceRewriteTester extends TestSuite {
+public class SourceRewriteTest extends TestSuite {
private static final String testRegexp = "//!(.*)\\s*(\\w*)*$"; //$NON-NLS-1$
private static final String codeTypeRegexp = "//%(C|CPP)( GNU)?$"; //$NON-NLS-1$
private static final String resultRegexp = "//=.*$"; //$NON-NLS-1$
@@ -48,6 +48,48 @@
return new BufferedReader(new FileReader(file));
}
+ public static Test suite() throws Exception {
+ TestSuite suite = new TestSuite("AstWriterTests");
+ suite.addTest(
+ SourceRewriteTest.suite("ExpressionTests", "resources/rewrite/ASTWriterExpressionTestSource.awts"));
+
+ suite.addTest(
+ SourceRewriteTest.suite("DelcSpecifierTests", "resources/rewrite/ASTWriterDeclSpecTestSource.awts"));
+ suite.addTest(SourceRewriteTest.suite("Commented DelcSpecifierTests",
+ "resources/rewrite/ASTWriterCommentedDeclSpecTestSource.awts"));
+
+ suite.addTest(
+ SourceRewriteTest.suite("DeclaratorTests", "resources/rewrite/ASTWriterDeclaratorTestSource.awts"));
+ suite.addTest(SourceRewriteTest.suite("Commented DeclaratorTests",
+ "resources/rewrite/ASTWriterCommentedDeclaratorTestSource.awts"));
+
+ suite.addTest(
+ SourceRewriteTest.suite("StatementsTests", "resources/rewrite/ASTWriterStatementTestSource.awts"));
+ suite.addTest(SourceRewriteTest.suite("Commented StatementsTests",
+ "resources/rewrite/ASTWriterCommentedStatementTestSource.awts"));
+
+ suite.addTest(SourceRewriteTest.suite("NameTests", "resources/rewrite/ASTWriterNameTestSource.awts"));
+ suite.addTest(SourceRewriteTest.suite("Commented NameTests",
+ "resources/rewrite/ASTWriterCommentedNameTestSource.awts"));
+
+ suite.addTest(
+ SourceRewriteTest.suite("InitializerTests", "resources/rewrite/ASTWriterInitializerTestSource.awts"));
+
+ suite.addTest(
+ SourceRewriteTest.suite("DeclarationTests", "resources/rewrite/ASTWriterDeclarationTestSource.awts"));
+ suite.addTest(SourceRewriteTest.suite("Commented DeclarationTests",
+ "resources/rewrite/ASTWriterCommentedDeclarationTestSource.awts"));
+
+ suite.addTest(SourceRewriteTest.suite("TemplatesTests", "resources/rewrite/ASTWriterTemplateTestSource.awts"));
+
+ suite.addTest(SourceRewriteTest.suite("CommentTests", "resources/rewrite/ASTWriterCommentedTestSource.awts"));
+ suite.addTest(
+ SourceRewriteTest.suite("NewCommentTests", "resources/rewrite/ASTWriterCommentedTestSource2.awts"));
+ suite.addTest(SourceRewriteTest.suite("AttributeTests", "resources/rewrite/ASTWriterAttributeTestSource.awts"));
+ suite.addTestSuite(ExpressionWriterTest.class);
+ return suite;
+ }
+
public static Test suite(String name, String file) throws Exception {
BufferedReader in = createReader(file);
ArrayList<RewriteBaseTest> testCases = createTests(in);
@@ -157,7 +199,7 @@
}
private static RewriteBaseTest createTestClass(String testName, ASTWriterTestSourceFile file) throws Exception {
- ASTWriterTest test = new ASTWriterTest(testName, file);
+ ASTWriterTester test = new ASTWriterTester(testName, file);
TextSelection sel = file.getSelection();
if (sel != null) {
test.setFileWithSelection(file.getName());
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
index 69cc22d..d6cb197 100644
--- 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
@@ -19,7 +19,9 @@
/**
* @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 {
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 68f0ad6..223e402 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
@@ -29,12 +29,16 @@
import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit;
import org.eclipse.cdt.core.model.ITranslationUnit;
import org.eclipse.cdt.core.parser.tests.rewrite.RewriteBaseTest;
+import org.eclipse.cdt.core.parser.tests.rewrite.RewriteTester;
import org.eclipse.cdt.core.parser.tests.rewrite.TestSourceFile;
import org.eclipse.cdt.internal.core.dom.rewrite.commenthandler.ASTCommenter;
import org.eclipse.cdt.internal.core.dom.rewrite.commenthandler.NodeCommentMap;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.Path;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
/**
* This test tests the behavior of the class ASTCommenter. It checks if the ASTCommenter assigns
* the comments contained in an AST to the right ASTNodes.<br>
@@ -92,6 +96,12 @@
super(name, files);
}
+ public static Test suite() throws Exception {
+ TestSuite suite = new TestSuite(CommentHandlingTestSuite.class.getName());
+ suite.addTest(RewriteTester.suite("CommentTests", "resources/rewrite/CommentHandlingTestSource.rts")); //$NON-NLS-1$
+ return suite;
+ }
+
@Override
protected void runTest() throws Throwable {
if (fileMap.isEmpty()) {
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
index 75cd37f..d851284 100644
--- 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
@@ -14,21 +14,20 @@
******************************************************************************/
package org.eclipse.cdt.core.parser.tests.rewrite.comenthandler;
-import org.eclipse.cdt.core.parser.tests.rewrite.RewriteTester;
-
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(RewriteTester.suite("CommentTests", "resources/rewrite/CommentHandlingTestSource.rts")); //$NON-NLS-1$
- suite.addTest(
- RewriteTester.suite("CommentMultiFileTests", "resources/rewrite/CommentHandlingWithRewriteTest.rts")); //$NON-NLS-1$
+ 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 0e20d7e..0b867d2 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
@@ -20,10 +20,14 @@
import org.eclipse.cdt.core.dom.ast.IASTNode;
import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit;
import org.eclipse.cdt.core.dom.rewrite.ASTRewrite;
+import org.eclipse.cdt.core.parser.tests.rewrite.RewriteTester;
import org.eclipse.cdt.core.parser.tests.rewrite.TestSourceFile;
import org.eclipse.cdt.internal.core.dom.rewrite.commenthandler.NodeCommentMap;
import org.eclipse.text.edits.TextEditGroup;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
public class CommentHandlingWithRewriteTest extends CommentHandlingTest {
private ASTRewrite newRewrite;
@@ -31,6 +35,13 @@
super(name, files);
}
+ public static Test suite() throws Exception {
+ TestSuite suite = new TestSuite(CommentHandlingTestSuite.class.getName());
+ suite.addTest(
+ RewriteTester.suite("CommentMultiFileTests", "resources/rewrite/CommentHandlingWithRewriteTest.rts")); //$NON-NLS-1$
+ return suite;
+ }
+
@Override
protected void runTest() throws Throwable {
IASTTranslationUnit tu = getUnit("main.cpp");
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
index 66430a1..8c00d61 100644
--- 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
@@ -16,6 +16,10 @@
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() {
diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexCBindingResolutionBugs.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexCBindingResolutionBugsTest.java
similarity index 96%
rename from core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexCBindingResolutionBugs.java
rename to core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexCBindingResolutionBugsTest.java
index d65e0fc..ef8a437 100644
--- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexCBindingResolutionBugs.java
+++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexCBindingResolutionBugsTest.java
@@ -36,31 +36,31 @@
/**
* For testing PDOM binding resolution
*/
-public class IndexCBindingResolutionBugs extends IndexBindingResolutionTestBase {
+public abstract class IndexCBindingResolutionBugsTest extends IndexBindingResolutionTestBase {
- public static class SingleProject extends IndexCBindingResolutionBugs {
- public SingleProject() {
+ public static class SingleProjectTest extends IndexCBindingResolutionBugsTest {
+ public SingleProjectTest() {
setStrategy(new SinglePDOMTestStrategy(false));
}
public static TestSuite suite() {
- return suite(SingleProject.class);
+ return suite(SingleProjectTest.class);
}
}
- public static class ProjectWithDepProj extends IndexCBindingResolutionBugs {
- public ProjectWithDepProj() {
+ public static class ProjectWithDepProjTest extends IndexCBindingResolutionBugsTest {
+ public ProjectWithDepProjTest() {
setStrategy(new ReferencedProject(false));
}
public static TestSuite suite() {
- return suite(ProjectWithDepProj.class);
+ return suite(ProjectWithDepProjTest.class);
}
}
public static void addTests(TestSuite suite) {
- suite.addTest(SingleProject.suite());
- suite.addTest(ProjectWithDepProj.suite());
+ suite.addTest(SingleProjectTest.suite());
+ suite.addTest(ProjectWithDepProjTest.suite());
}
// #include <stdio.h>
diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexCBindingResolutionTest.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexCBindingResolutionTest.java
index 75812e0..f0ef997 100644
--- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexCBindingResolutionTest.java
+++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexCBindingResolutionTest.java
@@ -38,31 +38,31 @@
* additionally check that the binding obtained has characteristics as
* expected (type,name,etc..)
*/
-public class IndexCBindingResolutionTest extends IndexBindingResolutionTestBase {
+public abstract class IndexCBindingResolutionTest extends IndexBindingResolutionTestBase {
- public static class SingleProject extends IndexCBindingResolutionTest {
- public SingleProject() {
+ public static class SingleProjectTest extends IndexCBindingResolutionTest {
+ public SingleProjectTest() {
setStrategy(new SinglePDOMTestStrategy(false));
}
public static TestSuite suite() {
- return suite(SingleProject.class);
+ return suite(SingleProjectTest.class);
}
}
- public static class ProjectWithDepProj extends IndexCBindingResolutionTest {
- public ProjectWithDepProj() {
+ public static class ProjectWithDepProjTest extends IndexCBindingResolutionTest {
+ public ProjectWithDepProjTest() {
setStrategy(new ReferencedProject(false));
}
public static TestSuite suite() {
- return suite(ProjectWithDepProj.class);
+ return suite(ProjectWithDepProjTest.class);
}
}
public static void addTests(TestSuite suite) {
- suite.addTest(SingleProject.suite());
- suite.addTest(ProjectWithDepProj.suite());
+ suite.addTest(SingleProjectTest.suite());
+ suite.addTest(ProjectWithDepProjTest.suite());
}
public IndexCBindingResolutionTest() {
diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexCPPBindingResolutionBugsSingleProjectFirstAST.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexCPPBindingResolutionBugsSingleProjectFirstASTTest.java
similarity index 86%
rename from core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexCPPBindingResolutionBugsSingleProjectFirstAST.java
rename to core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexCPPBindingResolutionBugsSingleProjectFirstASTTest.java
index dc8a280..df06455 100644
--- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexCPPBindingResolutionBugsSingleProjectFirstAST.java
+++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexCPPBindingResolutionBugsSingleProjectFirstASTTest.java
@@ -15,13 +15,13 @@
import junit.framework.TestSuite;
-public class IndexCPPBindingResolutionBugsSingleProjectFirstAST extends IndexCPPBindingResolutionBugs {
- public IndexCPPBindingResolutionBugsSingleProjectFirstAST() {
+public class IndexCPPBindingResolutionBugsSingleProjectFirstASTTest extends IndexCPPBindingResolutionBugsTest {
+ public IndexCPPBindingResolutionBugsSingleProjectFirstASTTest() {
setStrategy(new SinglePDOMTestFirstASTStrategy(true));
}
public static TestSuite suite() {
- return suite(IndexCPPBindingResolutionBugsSingleProjectFirstAST.class);
+ return suite(IndexCPPBindingResolutionBugsSingleProjectFirstASTTest.class);
}
/* Invalid tests for this strategy, they assume that the second file is already indexed. */
diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexCPPBindingResolutionBugs.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexCPPBindingResolutionBugsTest.java
similarity index 98%
rename from core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexCPPBindingResolutionBugs.java
rename to core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexCPPBindingResolutionBugsTest.java
index d1f4f6c..75c2e29 100644
--- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexCPPBindingResolutionBugs.java
+++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexCPPBindingResolutionBugsTest.java
@@ -70,39 +70,39 @@
/**
* For testing PDOM binding resolution
*/
-public class IndexCPPBindingResolutionBugs extends IndexBindingResolutionTestBase {
+public abstract class IndexCPPBindingResolutionBugsTest extends IndexBindingResolutionTestBase {
- public static class SingleProject extends IndexCPPBindingResolutionBugs {
- public SingleProject() {
+ public static class SingleProjectTest extends IndexCPPBindingResolutionBugsTest {
+ public SingleProjectTest() {
setStrategy(new SinglePDOMTestStrategy(true));
}
public static TestSuite suite() {
- return suite(SingleProject.class);
+ return suite(SingleProjectTest.class);
}
}
- public static class ProjectWithDepProj extends IndexCPPBindingResolutionBugs {
- public ProjectWithDepProj() {
+ public static class ProjectWithDepProjTest extends IndexCPPBindingResolutionBugsTest {
+ public ProjectWithDepProjTest() {
setStrategy(new ReferencedProject(true));
}
public static TestSuite suite() {
- return suite(ProjectWithDepProj.class);
+ return suite(ProjectWithDepProjTest.class);
}
}
public static void addTests(TestSuite suite) {
- suite.addTest(IndexCPPBindingResolutionBugsSingleProjectFirstAST.suite());
- suite.addTest(SingleProject.suite());
- suite.addTest(ProjectWithDepProj.suite());
+ suite.addTest(IndexCPPBindingResolutionBugsSingleProjectFirstASTTest.suite());
+ suite.addTest(SingleProjectTest.suite());
+ suite.addTest(ProjectWithDepProjTest.suite());
}
public static TestSuite suite() {
- return suite(IndexCPPBindingResolutionBugs.class);
+ return suite(IndexCPPBindingResolutionBugsTest.class);
}
- public IndexCPPBindingResolutionBugs() {
+ public IndexCPPBindingResolutionBugsTest() {
setStrategy(new SinglePDOMTestStrategy(true));
}
diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexCPPBindingResolutionTest.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexCPPBindingResolutionTest.java
index 5385a97..96c2b0a 100644
--- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexCPPBindingResolutionTest.java
+++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexCPPBindingResolutionTest.java
@@ -65,31 +65,31 @@
* additionally check that the binding obtained has characteristics as
* expected (type,name,etc..)
*/
-public class IndexCPPBindingResolutionTest extends IndexBindingResolutionTestBase {
+public abstract class IndexCPPBindingResolutionTest extends IndexBindingResolutionTestBase {
- public static class SingleProject extends IndexCPPBindingResolutionTest {
- public SingleProject() {
+ public static class SingleProjectTest extends IndexCPPBindingResolutionTest {
+ public SingleProjectTest() {
setStrategy(new SinglePDOMTestStrategy(true));
}
public static TestSuite suite() {
- return suite(SingleProject.class);
+ return suite(SingleProjectTest.class);
}
}
- public static class ProjectWithDepProj extends IndexCPPBindingResolutionTest {
- public ProjectWithDepProj() {
+ public static class ProjectWithDepProjTest extends IndexCPPBindingResolutionTest {
+ public ProjectWithDepProjTest() {
setStrategy(new ReferencedProject(true));
}
public static TestSuite suite() {
- return suite(ProjectWithDepProj.class);
+ return suite(ProjectWithDepProjTest.class);
}
}
public static void addTests(TestSuite suite) {
- suite.addTest(SingleProject.suite());
- suite.addTest(ProjectWithDepProj.suite());
+ suite.addTest(SingleProjectTest.suite());
+ suite.addTest(ProjectWithDepProjTest.suite());
}
public IndexCPPBindingResolutionTest() {
@@ -97,7 +97,7 @@
}
public static TestSuite suite() {
- return suite(SingleProject.class);
+ return suite(SingleProjectTest.class);
}
/* Assertion helpers */
diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexCPPTemplateResolutionTest.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexCPPTemplateResolutionTest.java
index 6c4e756..74f72fd 100644
--- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexCPPTemplateResolutionTest.java
+++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexCPPTemplateResolutionTest.java
@@ -77,25 +77,25 @@
/**
* Tests for exercising resolution of template bindings against IIndex
*/
-public class IndexCPPTemplateResolutionTest extends IndexBindingResolutionTestBase {
+public abstract class IndexCPPTemplateResolutionTest extends IndexBindingResolutionTestBase {
- public static class SingleProject extends IndexCPPTemplateResolutionTest {
- public SingleProject() {
+ public static class SingleProjectTest extends IndexCPPTemplateResolutionTest {
+ public SingleProjectTest() {
setStrategy(new SinglePDOMTestStrategy(true));
}
public static TestSuite suite() {
- return suite(SingleProject.class);
+ return suite(SingleProjectTest.class);
}
}
- public static class ProjectWithDepProj extends IndexCPPTemplateResolutionTest {
- public ProjectWithDepProj() {
+ public static class ProjectWithDepProjTest extends IndexCPPTemplateResolutionTest {
+ public ProjectWithDepProjTest() {
setStrategy(new ReferencedProject(true));
}
public static TestSuite suite() {
- return suite(ProjectWithDepProj.class);
+ return suite(ProjectWithDepProjTest.class);
}
@Override
@@ -106,8 +106,8 @@
}
public static void addTests(TestSuite suite) {
- suite.addTest(SingleProject.suite());
- suite.addTest(ProjectWithDepProj.suite());
+ suite.addTest(SingleProjectTest.suite());
+ suite.addTest(ProjectWithDepProjTest.suite());
}
public IndexCPPTemplateResolutionTest() {
diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexCPPVariableTemplateResolutionTest.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexCPPVariableTemplateResolutionTest.java
index d33fb2b..8f82488 100644
--- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexCPPVariableTemplateResolutionTest.java
+++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexCPPVariableTemplateResolutionTest.java
@@ -24,31 +24,31 @@
import junit.framework.TestSuite;
-public class IndexCPPVariableTemplateResolutionTest extends IndexBindingResolutionTestBase {
+public abstract class IndexCPPVariableTemplateResolutionTest extends IndexBindingResolutionTestBase {
- public static class SingleProject extends IndexCPPVariableTemplateResolutionTest {
- public SingleProject() {
+ public static class SingleProjectTest extends IndexCPPVariableTemplateResolutionTest {
+ public SingleProjectTest() {
setStrategy(new SinglePDOMTestStrategy(true));
}
public static TestSuite suite() {
- return suite(SingleProject.class);
+ return suite(SingleProjectTest.class);
}
}
- public static class ProjectWithDepProj extends IndexCPPVariableTemplateResolutionTest {
- public ProjectWithDepProj() {
+ public static class ProjectWithDepProjTest extends IndexCPPVariableTemplateResolutionTest {
+ public ProjectWithDepProjTest() {
setStrategy(new ReferencedProject(true));
}
public static TestSuite suite() {
- return suite(ProjectWithDepProj.class);
+ return suite(ProjectWithDepProjTest.class);
}
}
public static void addTests(TestSuite suite) {
- suite.addTest(SingleProject.suite());
- suite.addTest(ProjectWithDepProj.suite());
+ suite.addTest(SingleProjectTest.suite());
+ suite.addTest(ProjectWithDepProjTest.suite());
}
public IndexCPPVariableTemplateResolutionTest() {
diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexGPPBindingResolutionTest.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexGPPBindingResolutionTest.java
index 1b362f4..0949aba 100644
--- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexGPPBindingResolutionTest.java
+++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexGPPBindingResolutionTest.java
@@ -70,29 +70,29 @@
}
}
- public static class SingleProject extends IndexGPPBindingResolutionTest {
- public SingleProject() {
+ public static class SingleProjectTest extends IndexGPPBindingResolutionTest {
+ public SingleProjectTest() {
setStrategy(new GPPSinglePDOMTestStrategy());
}
public static TestSuite suite() {
- return suite(SingleProject.class);
+ return suite(SingleProjectTest.class);
}
}
- public static class ProjectWithDepProj extends IndexGPPBindingResolutionTest {
- public ProjectWithDepProj() {
+ public static class ProjectWithDepProjTest extends IndexGPPBindingResolutionTest {
+ public ProjectWithDepProjTest() {
setStrategy(new GPPReferencedProject());
}
public static TestSuite suite() {
- return suite(ProjectWithDepProj.class);
+ return suite(ProjectWithDepProjTest.class);
}
}
public static void addTests(TestSuite suite) {
- suite.addTest(SingleProject.suite());
- suite.addTest(ProjectWithDepProj.suite());
+ suite.addTest(SingleProjectTest.suite());
+ suite.addTest(ProjectWithDepProjTest.suite());
}
// struct B {
diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexTestSuite.java
similarity index 87%
rename from core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexTests.java
rename to core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexTestSuite.java
index 12a6ac0..6e970d1 100644
--- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexTests.java
+++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexTestSuite.java
@@ -24,10 +24,12 @@
/**
* Test suite for the indexer tests
+ * @deprecated In preparation for moving to JUnit5 test suites are deprecated. See Bug 569839
*/
-public class IndexTests extends TestSuite {
+@Deprecated
+public class IndexTestSuite extends TestSuite {
public static Test suite() {
- TestSuite suite = new IndexTests();
+ TestSuite suite = new IndexTestSuite();
suite.addTest(IndexCompositeTests.suite());
suite.addTest(IndexListenerTest.suite());
@@ -51,11 +53,11 @@
suite.addTestSuite(TemplateAutoIndexTests.class);
suite.addTestSuite(StructuredBindingIndexTests.class);
- IndexCPPBindingResolutionBugs.addTests(suite);
+ IndexCPPBindingResolutionBugsTest.addTests(suite);
IndexCPPBindingResolutionTest.addTests(suite);
IndexGPPBindingResolutionTest.addTests(suite);
IndexCPPTemplateResolutionTest.addTests(suite);
- IndexCBindingResolutionBugs.addTests(suite);
+ IndexCBindingResolutionBugsTest.addTests(suite);
IndexCBindingResolutionTest.addTests(suite);
IndexCPPVariableTemplateResolutionTest.addTests(suite);
diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMTestSuite.java
similarity index 91%
rename from core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMTests.java
rename to core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMTestSuite.java
index 8f5f824..c3f70a8 100644
--- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMTests.java
+++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMTestSuite.java
@@ -21,11 +21,13 @@
/**
* @author Doug Schaefer
+ * @deprecated In preparation for moving to JUnit5 test suites are deprecated. See Bug 569839
*/
-public class PDOMTests extends TestSuite {
+@Deprecated
+public class PDOMTestSuite extends TestSuite {
public static Test suite() {
- TestSuite suite = new PDOMTests();
+ TestSuite suite = new PDOMTestSuite();
suite.addTest(DatabaseTest.suite());
suite.addTest(DBPropertiesTests.suite());
diff --git a/core/org.eclipse.cdt.core.tests/pom.xml b/core/org.eclipse.cdt.core.tests/pom.xml
index e42b353..b1f2b70 100644
--- a/core/org.eclipse.cdt.core.tests/pom.xml
+++ b/core/org.eclipse.cdt.core.tests/pom.xml
@@ -44,9 +44,14 @@
<!-- Core tests actually use eclipse.ui classes, see CProjectHelper -->
<argLine>${tycho.testArgLine} ${base.ui.test.vmargs} ${extra.vmargs}</argLine>
<appArgLine>-pluginCustomization ${basedir}/../../disable_intro_in_tests.ini</appArgLine>
- <includes>
- <include>**/AutomatedIntegrationSuite.*</include>
- </includes>
+ <excludes>
+ <!-- The default Excludes omits nested static classes, this reenables them.
+ See org.eclipse.cdt.core.parser.tests.ast2.cxx14.constexpr.ArrayTests.NonIndexingTests
+ for an example of a test that would not be run otherwise.
+ For reference, the default exclude is "**/*$*"
+ -->
+ <exclude></exclude>
+ </excludes>
</configuration>
</plugin>
<plugin>
diff --git a/core/org.eclipse.cdt.core.tests/regression/org/eclipse/cdt/core/tests/FailingTest.java b/core/org.eclipse.cdt.core.tests/regression/org/eclipse/cdt/core/tests/FailingTester.java
similarity index 92%
rename from core/org.eclipse.cdt.core.tests/regression/org/eclipse/cdt/core/tests/FailingTest.java
rename to core/org.eclipse.cdt.core.tests/regression/org/eclipse/cdt/core/tests/FailingTester.java
index 0273378..492b245 100644
--- a/core/org.eclipse.cdt.core.tests/regression/org/eclipse/cdt/core/tests/FailingTest.java
+++ b/core/org.eclipse.cdt.core.tests/regression/org/eclipse/cdt/core/tests/FailingTester.java
@@ -27,11 +27,11 @@
* Wraps a test case to check for its failure.
* @author aniefer
*/
-public class FailingTest extends TestCase {
+public class FailingTester extends TestCase {
private TestCase test = null;
private int bugNum = -1;
- public FailingTest(TestCase test, int bugNumber) {
+ public FailingTester(TestCase test, int bugNumber) {
this.test = test;
this.bugNum = bugNumber;
String name = "Failing " + test.getName();
@@ -41,7 +41,7 @@
setName(name);
}
- public FailingTest(TestCase test) {
+ public FailingTester(TestCase test) {
this(test, -1);
}
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
index 1e36b0c..df36f5a 100644
--- 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
@@ -20,21 +20,21 @@
import org.eclipse.cdt.core.cdescriptor.tests.CDescriptorTests;
import org.eclipse.cdt.core.envvar.IEnvironmentVariableManagerTests;
import org.eclipse.cdt.core.internal.efsextension.tests.EFSExtensionTests;
-import org.eclipse.cdt.core.internal.errorparsers.tests.ErrorParserTests;
+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.AllLanguageTests;
-import org.eclipse.cdt.core.model.tests.AllCoreTests;
+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.AllConstexprEvalTests;
-import org.eclipse.cdt.core.parser.tests.rewrite.RewriteTests;
-import org.eclipse.cdt.core.preferences.tests.TestScopeOfBuildConfigResourceChangesPreference;
+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.IndexTests;
-import org.eclipse.cdt.internal.pdom.tests.PDOMTests;
+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;
@@ -52,7 +52,9 @@
/**
* @author vhirsl
+ * @deprecated In preparation for moving to JUnit5 test suites are deprecated. See Bug 569839
*/
+@Deprecated
public class AutomatedIntegrationSuite extends TestSuite {
public AutomatedIntegrationSuite() {
@@ -77,19 +79,19 @@
if (System.getProperty("cdt.skip.known.test.failures") == null) {
suite.addTest(CDescriptorTests.suite());
}
- suite.addTest(AllConstexprEvalTests.suite());
+ suite.addTest(AllConstexprEvalTestSuite.suite());
suite.addTest(ParserTestSuite.suite());
suite.addTest(CDescriptorOldTests.suite());
suite.addTest(IEnvironmentVariableManagerTests.suite());
- suite.addTest(ErrorParserTests.suite());
- suite.addTest(AllCoreTests.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(AllLanguageTests.suite());
- suite.addTest(RewriteTests.suite());
+ suite.addTest(AllLanguageTestSuite.suite());
+ suite.addTest(RewriteTestSuite.suite());
suite.addTest(CdtVariableResolverTest.suite());
suite.addTest(StorableCdtVariablesTest.suite());
suite.addTest(CommandLineUtilTest.suite());
@@ -98,13 +100,13 @@
suite.addTest(EFSExtensionTests.suite());
suite.addTest(ByteUtilsTest.suite());
suite.addTest(UNCPathConverterTest.suite());
- suite.addTest(TestScopeOfBuildConfigResourceChangesPreference.suite());
+ suite.addTest(ScopeOfBuildConfigResourceChangesPreferenceTests.suite());
suite.addTest(ElfParserTest.suite());
suite.addTest(new JUnit4TestAdapter(ElfTest.class));
// Add in PDOM tests
- suite.addTest(PDOMTests.suite());
- suite.addTest(IndexTests.suite());
+ suite.addTest(PDOMTestSuite.suite());
+ suite.addTest(IndexTestSuite.suite());
suite.addTest(RefreshScopeTests.suite());
diff --git a/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/util/OneSourceMultipleHeadersTestCase.java b/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/util/OneSourceMultipleHeadersTestCase.java
index 75d45a4..80f5515 100644
--- a/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/util/OneSourceMultipleHeadersTestCase.java
+++ b/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/util/OneSourceMultipleHeadersTestCase.java
@@ -34,7 +34,7 @@
* header1.h, header2.h, etc. The AST is created for the source file only and can be obtained
* by calling getAst().
*/
-public class OneSourceMultipleHeadersTestCase extends BaseTestCase {
+public abstract class OneSourceMultipleHeadersTestCase extends BaseTestCase {
private static final boolean DEBUG = false;
private final TestSourceReader testSourceReader;
diff --git a/core/org.eclipse.cdt.ui.tests/pom.xml b/core/org.eclipse.cdt.ui.tests/pom.xml
index bd94317..49841a0 100644
--- a/core/org.eclipse.cdt.ui.tests/pom.xml
+++ b/core/org.eclipse.cdt.ui.tests/pom.xml
@@ -66,10 +66,14 @@
<useUIThread>true</useUIThread>
<argLine>${tycho.testArgLine} ${base.ui.test.vmargs} ${extra.vmargs.indexer.timeout} ${extra.vmargs.displayhelper.timeoutmultipler}</argLine>
<appArgLine>-pluginCustomization ${basedir}/../../disable_intro_in_tests.ini</appArgLine>
- <includes>
-<!-- Workatound for Bug 565063: test execution outcome is order dependent -->
- <include>**/AutomatedSuite.*</include>
- </includes>
+ <excludes>
+ <!-- The default Excludes omits nested static classes, this reenables them.
+ See org.eclipse.cdt.core.parser.tests.ast2.cxx14.constexpr.ArrayTests.NonIndexingTests
+ for an example of a test that would not be run otherwise.
+ For reference, the default exclude is "**/*$*"
+ -->
+ <exclude></exclude>
+ </excludes>
</configuration>
</plugin>
<plugin>
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/CallHierarchyBugs.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/CallHierarchyBugsTest.java
similarity index 98%
rename from core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/CallHierarchyBugs.java
rename to core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/CallHierarchyBugsTest.java
index f3399fc..fd21f03 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/CallHierarchyBugs.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/CallHierarchyBugsTest.java
@@ -27,14 +27,14 @@
import junit.framework.Test;
-public class CallHierarchyBugs extends CallHierarchyBaseTest {
+public class CallHierarchyBugsTest extends CallHierarchyBaseTest {
- public CallHierarchyBugs(String name) {
+ public CallHierarchyBugsTest(String name) {
super(name);
}
public static Test suite() {
- return suite(CallHierarchyBugs.class);
+ return suite(CallHierarchyBugsTest.class);
}
@Override
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
index 9f029d3..cafe8c4 100644
--- 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
@@ -21,7 +21,7 @@
@RunWith(Suite.class)
@Suite.SuiteClasses({ BasicCallHierarchyTest.class, BasicCppCallHierarchyTest.class,
InitializersInCallHierarchyTest.class, CppCallHierarchyTest.class, CallHierarchyAcrossProjectsTest.class,
- CallHierarchyBugs.class, })
+ CallHierarchyBugsTest.class, })
public class CallHierarchyTestSuite {
}
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
index c8a5731..e5eaf90 100644
--- 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
@@ -25,7 +25,14 @@
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;
@@ -38,7 +45,9 @@
@Suite.SuiteClasses({ UtilTestSuite.class, RenameRegressionTests.class, ExtractFunctionRefactoringTest.class,
ExtractConstantRefactoringTest.class, HideMethodRefactoringTest.class, GenerateGettersAndSettersTest.class,
ImplementMethodRefactoringTest.class, ExtractLocalVariableRefactoringTest.class, ToggleRefactoringTest.class,
- IncludesTestSuite.class, OverrideMethodsRefactoringTest.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/rename/RenameRegressionTests.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/rename/RenameRegressionTests.java
index f8a84ae..beebc65 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/rename/RenameRegressionTests.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/rename/RenameRegressionTests.java
@@ -17,7 +17,7 @@
import java.io.StringWriter;
import org.eclipse.cdt.core.dom.ast.IBinding;
-import org.eclipse.cdt.core.tests.FailingTest;
+import org.eclipse.cdt.core.tests.FailingTester;
import org.eclipse.core.resources.IFile;
import org.eclipse.ltk.core.refactoring.Change;
import org.eclipse.ltk.core.refactoring.RefactoringStatus;
@@ -42,15 +42,10 @@
public static Test suite(boolean cleanup) {
TestSuite innerSuite = new TestSuite(RenameRegressionTests.class);
- innerSuite.addTest(new FailingTest(new RenameRegressionTests("_testMethod_35_72726"), 72726));
+ innerSuite.addTest(new FailingTester(new RenameRegressionTests("_testMethod_35_72726"), 72726));
TestSuite suite = new TestSuite("RenameRegressionTests");
suite.addTest(innerSuite);
- suite.addTest(RenameVariableTests.suite(false));
- suite.addTest(RenameFunctionTests.suite(false));
- suite.addTest(RenameTypeTests.suite(false));
- suite.addTest(RenameMacroTests.suite(false));
- suite.addTest(RenameTemplatesTests.suite(false));
if (cleanup)
suite.addTest(new RenameRegressionTests("cleanupProject"));
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/togglefunction/ToggleRefactoringTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/togglefunction/ToggleRefactoringTest.java
index 3a0c764..60f9601 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/togglefunction/ToggleRefactoringTest.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/togglefunction/ToggleRefactoringTest.java
@@ -40,8 +40,6 @@
public static Test suite() {
TestSuite suite = suite(ToggleRefactoringTest.class);
- suite.addTestSuite(ToggleRefactoringCTest.class);
- suite.addTestSuite(ToggleNodeHelperTest.class);
return suite;
}
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
index 9bc26ec..c66b932 100644
--- 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
@@ -61,6 +61,11 @@
AddBlockCommentTest.class, RemoveBlockCommentTest.class, SortLinesTest.class,
// add include
- AddIncludeTest.class, })
+ 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/contentassist2/CompletionTest_AnonymousTypes.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/AnonymousTypes_CompletionTest.java
similarity index 91%
rename from core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_AnonymousTypes.java
rename to core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/AnonymousTypes_CompletionTest.java
index fffac1f..7313510 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_AnonymousTypes.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/AnonymousTypes_CompletionTest.java
@@ -19,7 +19,7 @@
/**
* Test that anonymous types are not returned as possibilities.
*/
-public class CompletionTest_AnonymousTypes extends CompletionProposalsBaseTest {
+public class AnonymousTypes_CompletionTest extends CompletionProposalsBaseTest {
private final String fileName = "CompletionTestStart40.cpp";
private final String fileFullPath = "resources/contentassist/" + fileName;
private final String headerFileName = "CompletionTestStart40.h";
@@ -27,15 +27,15 @@
private final String expectedPrefix = "";
private final String[] expectedResults = { "notAnonymousEnum", "notAnonymousClass", "xOtherClass" };
- public CompletionTest_AnonymousTypes(String name) {
+ public AnonymousTypes_CompletionTest(String name) {
super(name);
// see https://bugs.eclipse.org/bugs/show_bug.cgi?id=174809
// setExpectFailure(174809);
}
public static Test suite() {
- TestSuite suite = new TestSuite(CompletionTest_AnonymousTypes.class.getName());
- suite.addTest(new CompletionTest_AnonymousTypes("testCompletionProposals"));
+ TestSuite suite = new TestSuite(AnonymousTypes_CompletionTest.class.getName());
+ suite.addTest(new AnonymousTypes_CompletionTest("testCompletionProposals"));
return suite;
}
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ArgumentType_Prefix2.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/ArgumentType_Prefix2_CompletionTest.java
similarity index 90%
rename from core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ArgumentType_Prefix2.java
rename to core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/ArgumentType_Prefix2_CompletionTest.java
index 0e282d4..2828bc1 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ArgumentType_Prefix2.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/ArgumentType_Prefix2_CompletionTest.java
@@ -23,7 +23,7 @@
* Bug#50642 : Wrong completion kind when declaring an argument type
*
*/
-public class CompletionTest_ArgumentType_Prefix2 extends CompletionProposalsBaseTest {
+public class ArgumentType_Prefix2_CompletionTest extends CompletionProposalsBaseTest {
private final String fileName = "CompletionTestStart18.cpp";
private final String fileFullPath = "resources/contentassist/" + fileName;
private final String headerFileName = "CompletionTestStart.h";
@@ -32,15 +32,15 @@
private final String[] expectedResults = { "aClass", "anotherClass", "aNamespace", "anEnumeration", "AStruct",
"AMacro(x)" };
- public CompletionTest_ArgumentType_Prefix2(String name) {
+ public ArgumentType_Prefix2_CompletionTest(String name) {
super(name);
// see https://bugs.eclipse.org/bugs/show_bug.cgi?id=109724
// setExpectFailure(109724);
}
public static Test suite() {
- TestSuite suite = new TestSuite(CompletionTest_ArgumentType_Prefix2.class.getName());
- suite.addTest(new CompletionTest_ArgumentType_Prefix2("testCompletionProposals"));
+ TestSuite suite = new TestSuite(ArgumentType_Prefix2_CompletionTest.class.getName());
+ suite.addTest(new ArgumentType_Prefix2_CompletionTest("testCompletionProposals"));
return suite;
}
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ArgumentType_Prefix.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/ArgumentType_Prefix_CompletionTest.java
similarity index 91%
rename from core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ArgumentType_Prefix.java
rename to core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/ArgumentType_Prefix_CompletionTest.java
index 2e9eef5..af74a84 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ArgumentType_Prefix.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/ArgumentType_Prefix_CompletionTest.java
@@ -23,7 +23,7 @@
* Bug#50642 : Wrong completion kind when declaring an argument type
*
*/
-public class CompletionTest_ArgumentType_Prefix extends CompletionProposalsBaseTest {
+public class ArgumentType_Prefix_CompletionTest extends CompletionProposalsBaseTest {
private final String fileName = "CompletionTestStart16.cpp";
private final String fileFullPath = "resources/contentassist/" + fileName;
private final String headerFileName = "CompletionTestStart.h";
@@ -32,15 +32,15 @@
private final String[] expectedResults = { "aClass", "anotherClass", "aNamespace", "anEnumeration", "AStruct",
"AMacro(x)" };
- public CompletionTest_ArgumentType_Prefix(String name) {
+ public ArgumentType_Prefix_CompletionTest(String name) {
super(name);
// see https://bugs.eclipse.org/bugs/show_bug.cgi?id=109724
// setExpectFailure(109724);
}
public static Test suite() {
- TestSuite suite = new TestSuite(CompletionTest_ArgumentType_Prefix.class.getName());
- suite.addTest(new CompletionTest_ArgumentType_Prefix("testCompletionProposals"));
+ TestSuite suite = new TestSuite(ArgumentType_Prefix_CompletionTest.class.getName());
+ suite.addTest(new ArgumentType_Prefix_CompletionTest("testCompletionProposals"));
return suite;
}
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ClassReference_NoPrefix.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/ClassReference_NoPrefix_CompletionTest.java
similarity index 87%
rename from core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ClassReference_NoPrefix.java
rename to core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/ClassReference_NoPrefix_CompletionTest.java
index 4940fd1..fa846e1 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ClassReference_NoPrefix.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/ClassReference_NoPrefix_CompletionTest.java
@@ -24,7 +24,7 @@
* https://bugs.eclipse.org/bugs/show_bug.cgi?id=50621
* https://bugs.eclipse.org/bugs/show_bug.cgi?id=169860
*/
-public class CompletionTest_ClassReference_NoPrefix extends CompletionProposalsBaseTest {
+public class ClassReference_NoPrefix_CompletionTest extends CompletionProposalsBaseTest {
private final String fileName = "CompletionTestStart21.h";
private final String fileFullPath = "resources/contentassist/" + fileName;
private final String headerFileName = "CompletionTestStart.h";
@@ -32,13 +32,13 @@
private final String expectedPrefix = "";
private final String[] expectedResults = { "aClass", "anotherClass", "xOtherClass", "AStruct", "XStruct" };
- public CompletionTest_ClassReference_NoPrefix(String name) {
+ public ClassReference_NoPrefix_CompletionTest(String name) {
super(name);
}
public static Test suite() {
- TestSuite suite = new TestSuite(CompletionTest_ClassReference_NoPrefix.class.getName());
- suite.addTest(new CompletionTest_ClassReference_NoPrefix("testCompletionProposals"));
+ TestSuite suite = new TestSuite(ClassReference_NoPrefix_CompletionTest.class.getName());
+ suite.addTest(new ClassReference_NoPrefix_CompletionTest("testCompletionProposals"));
return suite;
}
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ClassReference_Prefix.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/ClassReference_Prefix_CompletionTest.java
similarity index 87%
rename from core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ClassReference_Prefix.java
rename to core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/ClassReference_Prefix_CompletionTest.java
index 644dd7d..bc29d19 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ClassReference_Prefix.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/ClassReference_Prefix_CompletionTest.java
@@ -24,7 +24,7 @@
* https://bugs.eclipse.org/bugs/show_bug.cgi?id=50621
* https://bugs.eclipse.org/bugs/show_bug.cgi?id=169860
*/
-public class CompletionTest_ClassReference_Prefix extends CompletionProposalsBaseTest {
+public class ClassReference_Prefix_CompletionTest extends CompletionProposalsBaseTest {
private final String fileName = "CompletionTestStart20.h";
private final String fileFullPath = "resources/contentassist/" + fileName;
private final String headerFileName = "CompletionTestStart.h";
@@ -32,13 +32,13 @@
private final String expectedPrefix = "a";
private final String[] expectedResults = { "aClass", "anotherClass", "AStruct" };
- public CompletionTest_ClassReference_Prefix(String name) {
+ public ClassReference_Prefix_CompletionTest(String name) {
super(name);
}
public static Test suite() {
- TestSuite suite = new TestSuite(CompletionTest_ClassReference_Prefix.class.getName());
- suite.addTest(new CompletionTest_ClassReference_Prefix("testCompletionProposals"));
+ TestSuite suite = new TestSuite(ClassReference_Prefix_CompletionTest.class.getName());
+ suite.addTest(new ClassReference_Prefix_CompletionTest("testCompletionProposals"));
return suite;
}
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ConstructorReference.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/ConstructorReference_CompletionTest.java
similarity index 91%
rename from core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ConstructorReference.java
rename to core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/ConstructorReference_CompletionTest.java
index c3bf451..a5417b0 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ConstructorReference.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/ConstructorReference_CompletionTest.java
@@ -23,7 +23,7 @@
* Bug#
*
*/
-public class CompletionTest_ConstructorReference extends CompletionProposalsBaseTest {
+public class ConstructorReference_CompletionTest extends CompletionProposalsBaseTest {
private final String fileName = "CompletionTestStart35.cpp";
private final String fileFullPath = "resources/contentassist/" + fileName;
@@ -34,15 +34,15 @@
// missing proposals:
"xOtherClass(char*)", "xOtherClass(int)" };
- public CompletionTest_ConstructorReference(String name) {
+ public ConstructorReference_CompletionTest(String name) {
super(name);
// unknown failure
setExpectFailure(77777);
}
public static Test suite() {
- TestSuite suite = new TestSuite(CompletionTest_ConstructorReference.class.getName());
- suite.addTest(new CompletionTest_ConstructorReference("testCompletionProposals"));
+ TestSuite suite = new TestSuite(ConstructorReference_CompletionTest.class.getName());
+ suite.addTest(new ConstructorReference_CompletionTest("testCompletionProposals"));
return suite;
}
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
index ec655b4..71f2087 100644
--- 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
@@ -26,33 +26,77 @@
@RunWith(Suite.class)
@Suite.SuiteClasses({
- CompletionTest_AnonymousTypes.class, CompletionTest_ArgumentType_Prefix.class,
- CompletionTest_ArgumentType_Prefix2.class, CompletionTest_ClassReference_NoPrefix.class,
- CompletionTest_ClassReference_Prefix.class, CompletionTest_ConstructorReference.class,
- CompletionTest_ExceptionReference_NoPrefix.class, CompletionTest_ExceptionReference_Prefix.class,
- CompletionTest_FieldType_NoPrefix.class, CompletionTest_FieldType_NoPrefix2.class,
- CompletionTest_FieldType_Prefix.class, CompletionTest_FunctionReference_Prefix.class,
- CompletionTest_MacroRef_NoPrefix.class, CompletionTest_MacroRef_Prefix.class,
- CompletionTest_MemberReference_Arrow_NoPrefix.class, CompletionTest_MemberReference_Arrow_NoPrefix2.class,
- CompletionTest_MemberReference_Arrow_NoPrefix3.class, CompletionTest_MemberReference_Arrow_Prefix.class,
- CompletionTest_MemberReference_Arrow_Prefix2.class, CompletionTest_MemberReference_Dot_NoPrefix.class,
- CompletionTest_MemberReference_Dot_Prefix.class, CompletionTest_NamespaceRef_NoPrefix.class,
- CompletionTest_NamespaceRef_Prefix.class, CompletionTest_NewTypeReference_NoPrefix.class,
- CompletionTest_NewTypeReference_Prefix.class, CompletionTest_ScopedReference_NonCodeScope.class,
- CompletionTest_ScopedReference_NoPrefix.class, CompletionTest_ScopedReference_Prefix.class,
- CompletionTest_SingleName_Method_NoPrefix.class, CompletionTest_SingleName_Method_Prefix.class,
- CompletionTest_SingleName_NoPrefix.class, CompletionTest_SingleName_Prefix.class,
- CompletionTest_SingleName_Prefix2.class, CompletionTest_TypeDef_NoPrefix.class,
- CompletionTest_TypeDef_Prefix.class, CompletionTest_TypeRef_NoPrefix.class, CompletionTest_TypeRef_Prefix.class,
- CompletionTest_VariableType_NestedPrefix.class, CompletionTest_VariableType_NoPrefix.class,
- CompletionTest_VariableType_Prefix.class,
+ AnonymousTypes_CompletionTest.class, //
+ ArgumentType_Prefix_CompletionTest.class, //
- CompletionTests.class, HelpProposalTests.class, CompletionTests_PlainC.class, ParameterHintTests.class,
- CPPParameterGuessingTests.class, CParameterGuessingTests.class,
+ ArgumentType_Prefix2_CompletionTest.class, //
+ ClassReference_NoPrefix_CompletionTest.class, //
- ShowCamelCasePreferenceTest.class,
+ ClassReference_Prefix_CompletionTest.class, //
+ ConstructorReference_CompletionTest.class, //
- TemplateProposalTest.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/contentassist2/CompletionTest_ExceptionReference_NoPrefix.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/ExceptionReference_NoPrefix_CompletionTest.java
similarity index 90%
rename from core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ExceptionReference_NoPrefix.java
rename to core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/ExceptionReference_NoPrefix_CompletionTest.java
index 4d6375a..abedb4a 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ExceptionReference_NoPrefix.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/ExceptionReference_NoPrefix_CompletionTest.java
@@ -24,7 +24,7 @@
* Bug#50640 : Wrong completion kind when expecting an exception
*
*/
-public class CompletionTest_ExceptionReference_NoPrefix extends CompletionProposalsBaseTest {
+public class ExceptionReference_NoPrefix_CompletionTest extends CompletionProposalsBaseTest {
private final String fileName = "CompletionTestStart23.cpp";
private final String fileFullPath = "resources/contentassist/" + fileName;
@@ -34,14 +34,14 @@
private final String[] expectedResults = { "AStruct", "XStruct", "aClass", "aNamespace", "anEnumeration",
"anotherClass", "xEnumeration", "xNamespace", "xOtherClass" };
- public CompletionTest_ExceptionReference_NoPrefix(String name) {
+ public ExceptionReference_NoPrefix_CompletionTest(String name) {
super(name);
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=169860
}
public static Test suite() {
- TestSuite suite = new TestSuite(CompletionTest_ExceptionReference_NoPrefix.class.getName());
- suite.addTest(new CompletionTest_ExceptionReference_NoPrefix("testCompletionProposals"));
+ TestSuite suite = new TestSuite(ExceptionReference_NoPrefix_CompletionTest.class.getName());
+ suite.addTest(new ExceptionReference_NoPrefix_CompletionTest("testCompletionProposals"));
return suite;
}
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ExceptionReference_Prefix.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/ExceptionReference_Prefix_CompletionTest.java
similarity index 90%
rename from core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ExceptionReference_Prefix.java
rename to core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/ExceptionReference_Prefix_CompletionTest.java
index 4da2de2..8f3b06c 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ExceptionReference_Prefix.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/ExceptionReference_Prefix_CompletionTest.java
@@ -23,7 +23,7 @@
* Bug#50640 : Wrong completion kind when expecting an exception
*
*/
-public class CompletionTest_ExceptionReference_Prefix extends CompletionProposalsBaseTest {
+public class ExceptionReference_Prefix_CompletionTest extends CompletionProposalsBaseTest {
private final String fileName = "CompletionTestStart22.cpp";
private final String fileFullPath = "resources/contentassist/" + fileName;
@@ -33,15 +33,15 @@
private final String[] expectedResults = { "aClass", "anotherClass", "aNamespace", "anEnumeration", "AStruct",
"AMacro(x)" };
- public CompletionTest_ExceptionReference_Prefix(String name) {
+ public ExceptionReference_Prefix_CompletionTest(String name) {
super(name);
// see https://bugs.eclipse.org/bugs/show_bug.cgi?id=109724
// setExpectFailure(109724);
}
public static Test suite() {
- TestSuite suite = new TestSuite(CompletionTest_ExceptionReference_Prefix.class.getName());
- suite.addTest(new CompletionTest_ExceptionReference_Prefix("testCompletionProposals"));
+ TestSuite suite = new TestSuite(ExceptionReference_Prefix_CompletionTest.class.getName());
+ suite.addTest(new ExceptionReference_Prefix_CompletionTest("testCompletionProposals"));
return suite;
}
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_FieldType_NoPrefix2.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/FieldType_NoPrefix2_CompletionTest.java
similarity index 91%
rename from core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_FieldType_NoPrefix2.java
rename to core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/FieldType_NoPrefix2_CompletionTest.java
index fac9b47..ce800db 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_FieldType_NoPrefix2.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/FieldType_NoPrefix2_CompletionTest.java
@@ -24,7 +24,7 @@
* Bug#50344 :Wrong completion in Class scope if before the first declaration
*
*/
-public class CompletionTest_FieldType_NoPrefix2 extends CompletionProposalsBaseTest {
+public class FieldType_NoPrefix2_CompletionTest extends CompletionProposalsBaseTest {
private final String fileName = "CompletionTestStart13.h";
private final String fileFullPath = "resources/contentassist/" + fileName;
@@ -34,14 +34,14 @@
private final String[] expectedResults = { "AStruct", "XStruct", "aClass", "aNamespace", "aThirdClass",
"anEnumeration", "anotherClass", "xEnumeration", "xNamespace", "xOtherClass" };
- public CompletionTest_FieldType_NoPrefix2(String name) {
+ public FieldType_NoPrefix2_CompletionTest(String name) {
super(name);
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=169860
}
public static Test suite() {
- TestSuite suite = new TestSuite(CompletionTest_FieldType_NoPrefix2.class.getName());
- suite.addTest(new CompletionTest_FieldType_NoPrefix2("testCompletionProposals"));
+ TestSuite suite = new TestSuite(FieldType_NoPrefix2_CompletionTest.class.getName());
+ suite.addTest(new FieldType_NoPrefix2_CompletionTest("testCompletionProposals"));
return suite;
}
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_FieldType_NoPrefix.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/FieldType_NoPrefix_CompletionTest.java
similarity index 90%
rename from core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_FieldType_NoPrefix.java
rename to core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/FieldType_NoPrefix_CompletionTest.java
index 44d087f..a81766c 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_FieldType_NoPrefix.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/FieldType_NoPrefix_CompletionTest.java
@@ -23,7 +23,7 @@
* Testing Field_Type, with NO prefix
*
*/
-public class CompletionTest_FieldType_NoPrefix extends CompletionProposalsBaseTest {
+public class FieldType_NoPrefix_CompletionTest extends CompletionProposalsBaseTest {
private final String fileName = "CompletionTestStart12.h";
private final String fileFullPath = "resources/contentassist/" + fileName;
private final String headerFileName = "CompletionTestStart.h";
@@ -32,14 +32,14 @@
private final String[] expectedResults = { "AStruct", "XStruct", "aClass", "aNamespace", "aThirdClass",
"anEnumeration", "anotherClass", "xEnumeration", "xNamespace", "xOtherClass" };
- public CompletionTest_FieldType_NoPrefix(String name) {
+ public FieldType_NoPrefix_CompletionTest(String name) {
super(name);
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=169860
}
public static Test suite() {
- TestSuite suite = new TestSuite(CompletionTest_FieldType_NoPrefix.class.getName());
- suite.addTest(new CompletionTest_FieldType_NoPrefix("testCompletionProposals"));
+ TestSuite suite = new TestSuite(FieldType_NoPrefix_CompletionTest.class.getName());
+ suite.addTest(new FieldType_NoPrefix_CompletionTest("testCompletionProposals"));
return suite;
}
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_FieldType_Prefix.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/FieldType_Prefix_CompletionTest.java
similarity index 91%
rename from core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_FieldType_Prefix.java
rename to core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/FieldType_Prefix_CompletionTest.java
index a3e427b..f215c19 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_FieldType_Prefix.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/FieldType_Prefix_CompletionTest.java
@@ -22,7 +22,7 @@
* Testing Field_Type completion kind , with a prefix
*
*/
-public class CompletionTest_FieldType_Prefix extends CompletionProposalsBaseTest {
+public class FieldType_Prefix_CompletionTest extends CompletionProposalsBaseTest {
private final String fileName = "CompletionTestStart4.h";
private final String fileFullPath = "resources/contentassist/" + fileName;
private final String headerFileName = "CompletionTestStart.h";
@@ -31,15 +31,15 @@
private final String[] expectedResults = { "aClass", "anotherClass", "aThirdClass", "aNamespace", "anEnumeration",
"AStruct", "AMacro(x)" };
- public CompletionTest_FieldType_Prefix(String name) {
+ public FieldType_Prefix_CompletionTest(String name) {
super(name);
// see https://bugs.eclipse.org/bugs/show_bug.cgi?id=109724
// setExpectFailure(109724);
}
public static Test suite() {
- TestSuite suite = new TestSuite(CompletionTest_FieldType_Prefix.class.getName());
- suite.addTest(new CompletionTest_FieldType_Prefix("testCompletionProposals"));
+ TestSuite suite = new TestSuite(FieldType_Prefix_CompletionTest.class.getName());
+ suite.addTest(new FieldType_Prefix_CompletionTest("testCompletionProposals"));
return suite;
}
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_FunctionReference_Prefix.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/FunctionReference_Prefix_CompletionTest.java
similarity index 91%
rename from core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_FunctionReference_Prefix.java
rename to core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/FunctionReference_Prefix_CompletionTest.java
index 052e02a..7468f5b 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_FunctionReference_Prefix.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/FunctionReference_Prefix_CompletionTest.java
@@ -23,7 +23,7 @@
* Bug#
*
*/
-public class CompletionTest_FunctionReference_Prefix extends CompletionProposalsBaseTest {
+public class FunctionReference_Prefix_CompletionTest extends CompletionProposalsBaseTest {
private final String fileName = "CompletionTestStart36.cpp";
private final String fileFullPath = "resources/contentassist/" + fileName;
private final String headerFileName = "CompletionTestStart.h";
@@ -33,15 +33,15 @@
"xAClassMethod(int x) : void", "xFunction(void) : bool", "xOtherFunction(void) : void", "xNamespace",
"xOtherClass", "xFirstEnum", "xSecondEnum", "xThirdEnum", "xEnumeration", "XMacro(x, y)", "XStruct" };
- public CompletionTest_FunctionReference_Prefix(String name) {
+ public FunctionReference_Prefix_CompletionTest(String name) {
super(name);
// see https://bugs.eclipse.org/bugs/show_bug.cgi?id=109724
//setExpectFailure(109724);
}
public static Test suite() {
- TestSuite suite = new TestSuite(CompletionTest_FunctionReference_Prefix.class.getName());
- suite.addTest(new CompletionTest_FunctionReference_Prefix("testCompletionProposals"));
+ TestSuite suite = new TestSuite(FunctionReference_Prefix_CompletionTest.class.getName());
+ suite.addTest(new FunctionReference_Prefix_CompletionTest("testCompletionProposals"));
return suite;
}
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_MacroRef_NoPrefix.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/MacroRef_NoPrefix_CompletionTest.java
similarity index 91%
rename from core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_MacroRef_NoPrefix.java
rename to core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/MacroRef_NoPrefix_CompletionTest.java
index 3cbea62..dbfacb3 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_MacroRef_NoPrefix.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/MacroRef_NoPrefix_CompletionTest.java
@@ -23,7 +23,7 @@
* Bug#50487 :Wrong completion kind and prefix after "#ifdef"
*
*/
-public class CompletionTest_MacroRef_NoPrefix extends CompletionProposalsBaseTest {
+public class MacroRef_NoPrefix_CompletionTest extends CompletionProposalsBaseTest {
private final String fileName = "CompletionTestStart26.cpp";
private final String fileFullPath = "resources/contentassist/" + fileName;
@@ -36,13 +36,13 @@
"__extension__", "__has_include", "__has_include_next", "__imag__", "__null", "__offsetof__(x)", "__real__",
"__stdcall", "__thread", };
- public CompletionTest_MacroRef_NoPrefix(String name) {
+ public MacroRef_NoPrefix_CompletionTest(String name) {
super(name);
}
public static Test suite() {
- TestSuite suite = new TestSuite(CompletionTest_MacroRef_NoPrefix.class.getName());
- suite.addTest(new CompletionTest_MacroRef_NoPrefix("testCompletionProposals"));
+ TestSuite suite = new TestSuite(MacroRef_NoPrefix_CompletionTest.class.getName());
+ suite.addTest(new MacroRef_NoPrefix_CompletionTest("testCompletionProposals"));
return suite;
}
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_MacroRef_Prefix.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/MacroRef_Prefix_CompletionTest.java
similarity index 91%
rename from core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_MacroRef_Prefix.java
rename to core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/MacroRef_Prefix_CompletionTest.java
index ebee868..bef8ab0 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_MacroRef_Prefix.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/MacroRef_Prefix_CompletionTest.java
@@ -23,7 +23,7 @@
* Bug#50487 :Wrong completion kind and prefix after "#ifdef"
*
*/
-public class CompletionTest_MacroRef_Prefix extends CompletionProposalsBaseTest {
+public class MacroRef_Prefix_CompletionTest extends CompletionProposalsBaseTest {
private final String fileName = "CompletionTestStart27.cpp";
private final String fileFullPath = "resources/contentassist/" + fileName;
@@ -32,13 +32,13 @@
private final String expectedPrefix = "D";
private final String[] expectedResults = { "DEBUG" };
- public CompletionTest_MacroRef_Prefix(String name) {
+ public MacroRef_Prefix_CompletionTest(String name) {
super(name);
}
public static Test suite() {
- TestSuite suite = new TestSuite(CompletionTest_MacroRef_Prefix.class.getName());
- suite.addTest(new CompletionTest_MacroRef_Prefix("testCompletionProposals"));
+ TestSuite suite = new TestSuite(MacroRef_Prefix_CompletionTest.class.getName());
+ suite.addTest(new MacroRef_Prefix_CompletionTest("testCompletionProposals"));
return suite;
}
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_MemberReference_Arrow_NoPrefix2.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/MemberReference_Arrow_NoPrefix2_CompletionTest.java
similarity index 88%
rename from core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_MemberReference_Arrow_NoPrefix2.java
rename to core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/MemberReference_Arrow_NoPrefix2_CompletionTest.java
index e945e42..462a7e3 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_MemberReference_Arrow_NoPrefix2.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/MemberReference_Arrow_NoPrefix2_CompletionTest.java
@@ -19,7 +19,7 @@
/**
* Test operator is followed during member reference
*/
-public class CompletionTest_MemberReference_Arrow_NoPrefix2 extends CompletionProposalsBaseTest {
+public class MemberReference_Arrow_NoPrefix2_CompletionTest extends CompletionProposalsBaseTest {
private final String fileName = "CompletionTestStart41.cpp";
private final String fileFullPath = "resources/contentassist/" + fileName;
private final String headerFileName = "CompletionTestStart41.h";
@@ -27,13 +27,13 @@
private final String expectedPrefix = "";
private final String[] expectedResults = { "A", "foo(void) : void", "operator ->(void) : B *" };
- public CompletionTest_MemberReference_Arrow_NoPrefix2(String name) {
+ public MemberReference_Arrow_NoPrefix2_CompletionTest(String name) {
super(name);
}
public static Test suite() {
- TestSuite suite = new TestSuite(CompletionTest_MemberReference_Arrow_NoPrefix2.class.getName());
- suite.addTest(new CompletionTest_MemberReference_Arrow_NoPrefix2("testCompletionProposals"));
+ TestSuite suite = new TestSuite(MemberReference_Arrow_NoPrefix2_CompletionTest.class.getName());
+ suite.addTest(new MemberReference_Arrow_NoPrefix2_CompletionTest("testCompletionProposals"));
return suite;
}
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_MemberReference_Arrow_NoPrefix3.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/MemberReference_Arrow_NoPrefix3_CompletionTest.java
similarity index 88%
rename from core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_MemberReference_Arrow_NoPrefix3.java
rename to core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/MemberReference_Arrow_NoPrefix3_CompletionTest.java
index e765efb..f354e6c 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_MemberReference_Arrow_NoPrefix3.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/MemberReference_Arrow_NoPrefix3_CompletionTest.java
@@ -19,7 +19,7 @@
/**
* Testing operator is not followed on pointer to class with overloaded operator ->
*/
-public class CompletionTest_MemberReference_Arrow_NoPrefix3 extends CompletionProposalsBaseTest {
+public class MemberReference_Arrow_NoPrefix3_CompletionTest extends CompletionProposalsBaseTest {
private final String fileName = "CompletionTestStart42.cpp";
private final String fileFullPath = "resources/contentassist/" + fileName;
private final String headerFileName = "CompletionTestStart41.h";
@@ -27,13 +27,13 @@
private final String expectedPrefix = "";
private final String[] expectedResults = { "B", "bar(void) : void" };
- public CompletionTest_MemberReference_Arrow_NoPrefix3(String name) {
+ public MemberReference_Arrow_NoPrefix3_CompletionTest(String name) {
super(name);
}
public static Test suite() {
- TestSuite suite = new TestSuite(CompletionTest_MemberReference_Arrow_NoPrefix3.class.getName());
- suite.addTest(new CompletionTest_MemberReference_Arrow_NoPrefix3("testCompletionProposals"));
+ TestSuite suite = new TestSuite(MemberReference_Arrow_NoPrefix3_CompletionTest.class.getName());
+ suite.addTest(new MemberReference_Arrow_NoPrefix3_CompletionTest("testCompletionProposals"));
return suite;
}
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_MemberReference_Arrow_NoPrefix.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/MemberReference_Arrow_NoPrefix_CompletionTest.java
similarity index 89%
rename from core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_MemberReference_Arrow_NoPrefix.java
rename to core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/MemberReference_Arrow_NoPrefix_CompletionTest.java
index 8260b99..eec1ac2 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_MemberReference_Arrow_NoPrefix.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/MemberReference_Arrow_NoPrefix_CompletionTest.java
@@ -24,7 +24,7 @@
*
*/
-public class CompletionTest_MemberReference_Arrow_NoPrefix extends CompletionProposalsBaseTest {
+public class MemberReference_Arrow_NoPrefix_CompletionTest extends CompletionProposalsBaseTest {
private final String fileName = "CompletionTestStart10.cpp";
private final String fileFullPath = "resources/contentassist/" + fileName;
private final String headerFileName = "CompletionTestStart.h";
@@ -34,13 +34,13 @@
"xAClassMethod(int x) : void", "aClass" // aClass is valid
};
- public CompletionTest_MemberReference_Arrow_NoPrefix(String name) {
+ public MemberReference_Arrow_NoPrefix_CompletionTest(String name) {
super(name);
}
public static Test suite() {
- TestSuite suite = new TestSuite(CompletionTest_MemberReference_Arrow_NoPrefix.class.getName());
- suite.addTest(new CompletionTest_MemberReference_Arrow_NoPrefix("testCompletionProposals"));
+ TestSuite suite = new TestSuite(MemberReference_Arrow_NoPrefix_CompletionTest.class.getName());
+ suite.addTest(new MemberReference_Arrow_NoPrefix_CompletionTest("testCompletionProposals"));
return suite;
}
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_MemberReference_Arrow_Prefix2.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/MemberReference_Arrow_Prefix2_CompletionTest.java
similarity index 90%
rename from core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_MemberReference_Arrow_Prefix2.java
rename to core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/MemberReference_Arrow_Prefix2_CompletionTest.java
index dd93aa5..40dd431 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_MemberReference_Arrow_Prefix2.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/MemberReference_Arrow_Prefix2_CompletionTest.java
@@ -23,7 +23,7 @@
* Complex Context: Function return value: foo()->a(CTRL+SPACE)
*
*/
-public class CompletionTest_MemberReference_Arrow_Prefix2 extends CompletionProposalsBaseTest {
+public class MemberReference_Arrow_Prefix2_CompletionTest extends CompletionProposalsBaseTest {
private final String fileName = "CompletionTestStart7.cpp";
private final String fileFullPath = "resources/contentassist/" + fileName;
private final String headerFileName = "CompletionTestStart.h";
@@ -32,13 +32,13 @@
private final String[] expectedResults = { "aClass", // aClass is valid
"aField : int", "aMethod(void) : int" };
- public CompletionTest_MemberReference_Arrow_Prefix2(String name) {
+ public MemberReference_Arrow_Prefix2_CompletionTest(String name) {
super(name);
}
public static Test suite() {
- TestSuite suite = new TestSuite(CompletionTest_MemberReference_Arrow_Prefix2.class.getName());
- suite.addTest(new CompletionTest_MemberReference_Arrow_Prefix2("testCompletionProposals"));
+ TestSuite suite = new TestSuite(MemberReference_Arrow_Prefix2_CompletionTest.class.getName());
+ suite.addTest(new MemberReference_Arrow_Prefix2_CompletionTest("testCompletionProposals"));
return suite;
}
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_MemberReference_Arrow_Prefix.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/MemberReference_Arrow_Prefix_CompletionTest.java
similarity index 90%
rename from core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_MemberReference_Arrow_Prefix.java
rename to core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/MemberReference_Arrow_Prefix_CompletionTest.java
index 132717f..5acd64d 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_MemberReference_Arrow_Prefix.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/MemberReference_Arrow_Prefix_CompletionTest.java
@@ -23,7 +23,7 @@
* After an ->
*
*/
-public class CompletionTest_MemberReference_Arrow_Prefix extends CompletionProposalsBaseTest {
+public class MemberReference_Arrow_Prefix_CompletionTest extends CompletionProposalsBaseTest {
private final String fileName = "CompletionTestStart6.cpp";
private final String fileFullPath = "resources/contentassist/" + fileName;
private final String headerFileName = "CompletionTestStart.h";
@@ -32,13 +32,13 @@
private final String[] expectedResults = { "aField : int", "aMethod(void) : int", "aClass" // aClass is valid
};
- public CompletionTest_MemberReference_Arrow_Prefix(String name) {
+ public MemberReference_Arrow_Prefix_CompletionTest(String name) {
super(name);
}
public static Test suite() {
- TestSuite suite = new TestSuite(CompletionTest_MemberReference_Arrow_Prefix.class.getName());
- suite.addTest(new CompletionTest_MemberReference_Arrow_Prefix("testCompletionProposals"));
+ TestSuite suite = new TestSuite(MemberReference_Arrow_Prefix_CompletionTest.class.getName());
+ suite.addTest(new MemberReference_Arrow_Prefix_CompletionTest("testCompletionProposals"));
return suite;
}
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_MemberReference_Dot_NoPrefix.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/MemberReference_Dot_NoPrefix_CompletionTest.java
similarity index 90%
rename from core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_MemberReference_Dot_NoPrefix.java
rename to core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/MemberReference_Dot_NoPrefix_CompletionTest.java
index 83b6f4d..057907a 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_MemberReference_Dot_NoPrefix.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/MemberReference_Dot_NoPrefix_CompletionTest.java
@@ -23,7 +23,7 @@
* After a .
*
*/
-public class CompletionTest_MemberReference_Dot_NoPrefix extends CompletionProposalsBaseTest {
+public class MemberReference_Dot_NoPrefix_CompletionTest extends CompletionProposalsBaseTest {
private final String fileName = "CompletionTestStart9.cpp";
private final String fileFullPath = "resources/contentassist/" + fileName;
private final String headerFileName = "CompletionTestStart.h";
@@ -33,13 +33,13 @@
"xAClassMethod(int x) : void", "aClass" // aClass is valid
};
- public CompletionTest_MemberReference_Dot_NoPrefix(String name) {
+ public MemberReference_Dot_NoPrefix_CompletionTest(String name) {
super(name);
}
public static Test suite() {
- TestSuite suite = new TestSuite(CompletionTest_MemberReference_Dot_NoPrefix.class.getName());
- suite.addTest(new CompletionTest_MemberReference_Dot_NoPrefix("testCompletionProposals"));
+ TestSuite suite = new TestSuite(MemberReference_Dot_NoPrefix_CompletionTest.class.getName());
+ suite.addTest(new MemberReference_Dot_NoPrefix_CompletionTest("testCompletionProposals"));
return suite;
}
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_MemberReference_Dot_Prefix.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/MemberReference_Dot_Prefix_CompletionTest.java
similarity index 90%
rename from core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_MemberReference_Dot_Prefix.java
rename to core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/MemberReference_Dot_Prefix_CompletionTest.java
index 061d0be..fa91ebd 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_MemberReference_Dot_Prefix.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/MemberReference_Dot_Prefix_CompletionTest.java
@@ -23,7 +23,7 @@
* After a .
*
*/
-public class CompletionTest_MemberReference_Dot_Prefix extends CompletionProposalsBaseTest {
+public class MemberReference_Dot_Prefix_CompletionTest extends CompletionProposalsBaseTest {
private final String fileName = "CompletionTestStart2.cpp";
private final String fileFullPath = "resources/contentassist/" + fileName;
private final String headerFileName = "CompletionTestStart.h";
@@ -32,13 +32,13 @@
private final String[] expectedResults = { "aField : int", "aMethod(void) : int", "aClass" // aClass is valid
};
- public CompletionTest_MemberReference_Dot_Prefix(String name) {
+ public MemberReference_Dot_Prefix_CompletionTest(String name) {
super(name);
}
public static Test suite() {
- TestSuite suite = new TestSuite(CompletionTest_MemberReference_Dot_Prefix.class.getName());
- suite.addTest(new CompletionTest_MemberReference_Dot_Prefix("testCompletionProposals"));
+ TestSuite suite = new TestSuite(MemberReference_Dot_Prefix_CompletionTest.class.getName());
+ suite.addTest(new MemberReference_Dot_Prefix_CompletionTest("testCompletionProposals"));
return suite;
}
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_NamespaceRef_NoPrefix.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/NamespaceRef_NoPrefix_CompletionTest.java
similarity index 87%
rename from core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_NamespaceRef_NoPrefix.java
rename to core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/NamespaceRef_NoPrefix_CompletionTest.java
index f113a72..f1b4d3e8 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_NamespaceRef_NoPrefix.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/NamespaceRef_NoPrefix_CompletionTest.java
@@ -23,7 +23,7 @@
* Testing Namespace_Reference, with no prefix
* Bug#50471 : Wrong completion kind after the "using" keyword
*/
-public class CompletionTest_NamespaceRef_NoPrefix extends CompletionProposalsBaseTest {
+public class NamespaceRef_NoPrefix_CompletionTest extends CompletionProposalsBaseTest {
private final String fileName = "CompletionTestStart32.cpp";
private final String fileFullPath = "resources/contentassist/" + fileName;
private final String headerFileName = "CompletionTestStart.h";
@@ -31,14 +31,14 @@
private final String expectedPrefix = "";
private final String[] expectedResults = { "aNamespace", "xNamespace" };
- public CompletionTest_NamespaceRef_NoPrefix(String name) {
+ public NamespaceRef_NoPrefix_CompletionTest(String name) {
super(name);
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=169860
}
public static Test suite() {
- TestSuite suite = new TestSuite(CompletionTest_NamespaceRef_NoPrefix.class.getName());
- suite.addTest(new CompletionTest_NamespaceRef_NoPrefix("testCompletionProposals"));
+ TestSuite suite = new TestSuite(NamespaceRef_NoPrefix_CompletionTest.class.getName());
+ suite.addTest(new NamespaceRef_NoPrefix_CompletionTest("testCompletionProposals"));
return suite;
}
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_NamespaceRef_Prefix.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/NamespaceRef_Prefix_CompletionTest.java
similarity index 90%
rename from core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_NamespaceRef_Prefix.java
rename to core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/NamespaceRef_Prefix_CompletionTest.java
index bb256a7..64873e6 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_NamespaceRef_Prefix.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/NamespaceRef_Prefix_CompletionTest.java
@@ -24,7 +24,7 @@
* Bug#50471 : Wrong completion kind after the "using" keyword
*
*/
-public class CompletionTest_NamespaceRef_Prefix extends CompletionProposalsBaseTest {
+public class NamespaceRef_Prefix_CompletionTest extends CompletionProposalsBaseTest {
private final String fileName = "CompletionTestStart33.cpp";
private final String fileFullPath = "resources/contentassist/" + fileName;
@@ -33,14 +33,14 @@
private final String expectedPrefix = "a";
private final String[] expectedResults = { "aNamespace" };
- public CompletionTest_NamespaceRef_Prefix(String name) {
+ public NamespaceRef_Prefix_CompletionTest(String name) {
super(name);
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=169860
}
public static Test suite() {
- TestSuite suite = new TestSuite(CompletionTest_NamespaceRef_Prefix.class.getName());
- suite.addTest(new CompletionTest_NamespaceRef_Prefix("testCompletionProposals"));
+ TestSuite suite = new TestSuite(NamespaceRef_Prefix_CompletionTest.class.getName());
+ suite.addTest(new NamespaceRef_Prefix_CompletionTest("testCompletionProposals"));
return suite;
}
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_NewTypeReference_NoPrefix.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/NewTypeReference_NoPrefix_CompletionTest.java
similarity index 90%
rename from core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_NewTypeReference_NoPrefix.java
rename to core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/NewTypeReference_NoPrefix_CompletionTest.java
index 053a00c..14c5af2 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_NewTypeReference_NoPrefix.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/NewTypeReference_NoPrefix_CompletionTest.java
@@ -23,7 +23,7 @@
* Bug#50711 : Wrong completion kind in a new expression
*
*/
-public class CompletionTest_NewTypeReference_NoPrefix extends CompletionProposalsBaseTest {
+public class NewTypeReference_NoPrefix_CompletionTest extends CompletionProposalsBaseTest {
private final String fileName = "CompletionTestStart29.cpp";
private final String fileFullPath = "resources/contentassist/" + fileName;
@@ -35,13 +35,13 @@
// enums may not be desired, but valid
"anEnumeration", "xEnumeration" };
- public CompletionTest_NewTypeReference_NoPrefix(String name) {
+ public NewTypeReference_NoPrefix_CompletionTest(String name) {
super(name);
}
public static Test suite() {
- TestSuite suite = new TestSuite(CompletionTest_NewTypeReference_NoPrefix.class.getName());
- suite.addTest(new CompletionTest_NewTypeReference_NoPrefix("testCompletionProposals"));
+ TestSuite suite = new TestSuite(NewTypeReference_NoPrefix_CompletionTest.class.getName());
+ suite.addTest(new NewTypeReference_NoPrefix_CompletionTest("testCompletionProposals"));
return suite;
}
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_NewTypeReference_Prefix.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/NewTypeReference_Prefix_CompletionTest.java
similarity index 90%
rename from core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_NewTypeReference_Prefix.java
rename to core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/NewTypeReference_Prefix_CompletionTest.java
index 992f9cf..24c1d27 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_NewTypeReference_Prefix.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/NewTypeReference_Prefix_CompletionTest.java
@@ -23,7 +23,7 @@
* Bug#50711 : Wrong completion kind in a new expression
*
*/
-public class CompletionTest_NewTypeReference_Prefix extends CompletionProposalsBaseTest {
+public class NewTypeReference_Prefix_CompletionTest extends CompletionProposalsBaseTest {
private final String fileName = "CompletionTestStart28.cpp";
private final String fileFullPath = "resources/contentassist/" + fileName;
@@ -33,13 +33,13 @@
private final String[] expectedResults = { "aClass", "anotherClass", "aNamespace", "AStruct", "anEnumeration",
"AMacro(x)" };
- public CompletionTest_NewTypeReference_Prefix(String name) {
+ public NewTypeReference_Prefix_CompletionTest(String name) {
super(name);
}
public static Test suite() {
- TestSuite suite = new TestSuite(CompletionTest_NewTypeReference_Prefix.class.getName());
- suite.addTest(new CompletionTest_NewTypeReference_Prefix("testCompletionProposals"));
+ TestSuite suite = new TestSuite(NewTypeReference_Prefix_CompletionTest.class.getName());
+ suite.addTest(new NewTypeReference_Prefix_CompletionTest("testCompletionProposals"));
return suite;
}
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTests_PlainC.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/PlainC_CompletionTests.java
similarity index 98%
rename from core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTests_PlainC.java
rename to core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/PlainC_CompletionTests.java
index d058dde..2a9f61a 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTests_PlainC.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/PlainC_CompletionTests.java
@@ -29,7 +29,7 @@
*
* @since 4.0
*/
-public class CompletionTests_PlainC extends AbstractContentAssistTest {
+public class PlainC_CompletionTests extends AbstractContentAssistTest {
private static final String HEADER_FILE_NAME = "CompletionTest.h";
private static final String SOURCE_FILE_NAME = "CompletionTest.c";
@@ -156,13 +156,13 @@
// } gStruct;
public static Test suite() {
- return BaseTestCase.suite(CompletionTests_PlainC.class, "_");
+ return BaseTestCase.suite(PlainC_CompletionTests.class, "_");
}
/**
* @param name
*/
- public CompletionTests_PlainC(String name) {
+ public PlainC_CompletionTests(String name) {
super(name, false);
}
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ScopedReference_NoPrefix.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/ScopedReference_NoPrefix_CompletionTest.java
similarity index 90%
rename from core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ScopedReference_NoPrefix.java
rename to core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/ScopedReference_NoPrefix_CompletionTest.java
index 81fc90f..c9d1982 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ScopedReference_NoPrefix.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/ScopedReference_NoPrefix_CompletionTest.java
@@ -23,7 +23,7 @@
* Bug#50152: Wrong context sent after a "::"
*
*/
-public class CompletionTest_ScopedReference_NoPrefix extends CompletionProposalsBaseTest {
+public class ScopedReference_NoPrefix_CompletionTest extends CompletionProposalsBaseTest {
private final String fileName = "CompletionTestStart30.cpp";
private final String fileFullPath = "resources/contentassist/" + fileName;
@@ -32,13 +32,13 @@
private final String expectedPrefix = "";
private final String[] expectedResults = { "aNamespaceFunction(void) : void" };
- public CompletionTest_ScopedReference_NoPrefix(String name) {
+ public ScopedReference_NoPrefix_CompletionTest(String name) {
super(name);
}
public static Test suite() {
- TestSuite suite = new TestSuite(CompletionTest_ScopedReference_NoPrefix.class.getName());
- suite.addTest(new CompletionTest_ScopedReference_NoPrefix("testCompletionProposals"));
+ TestSuite suite = new TestSuite(ScopedReference_NoPrefix_CompletionTest.class.getName());
+ suite.addTest(new ScopedReference_NoPrefix_CompletionTest("testCompletionProposals"));
return suite;
}
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ScopedReference_NonCodeScope.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/ScopedReference_NonCodeScope_CompletionTest.java
similarity index 90%
rename from core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ScopedReference_NonCodeScope.java
rename to core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/ScopedReference_NonCodeScope_CompletionTest.java
index a1b05c0..9b8a3c2 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ScopedReference_NonCodeScope.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/ScopedReference_NonCodeScope_CompletionTest.java
@@ -23,7 +23,7 @@
* Bug#50152: Wrong context sent after a "::"
*
*/
-public class CompletionTest_ScopedReference_NonCodeScope extends CompletionProposalsBaseTest {
+public class ScopedReference_NonCodeScope_CompletionTest extends CompletionProposalsBaseTest {
private final String fileName = "CompletionTestStart39.cpp";
private final String fileFullPath = "resources/contentassist/" + fileName;
@@ -32,13 +32,13 @@
private final String expectedPrefix = "";
private final String[] expectedResults = { "Foo(void)", "bar(void) : void", "fum(void) : void", "x : int" };
- public CompletionTest_ScopedReference_NonCodeScope(String name) {
+ public ScopedReference_NonCodeScope_CompletionTest(String name) {
super(name);
}
public static Test suite() {
- TestSuite suite = new TestSuite(CompletionTest_ScopedReference_NonCodeScope.class.getName());
- suite.addTest(new CompletionTest_ScopedReference_NonCodeScope("testCompletionProposals"));
+ TestSuite suite = new TestSuite(ScopedReference_NonCodeScope_CompletionTest.class.getName());
+ suite.addTest(new ScopedReference_NonCodeScope_CompletionTest("testCompletionProposals"));
return suite;
}
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ScopedReference_Prefix.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/ScopedReference_Prefix_CompletionTest.java
similarity index 90%
rename from core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ScopedReference_Prefix.java
rename to core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/ScopedReference_Prefix_CompletionTest.java
index d6c2db7..8e6c399 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ScopedReference_Prefix.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/ScopedReference_Prefix_CompletionTest.java
@@ -23,7 +23,7 @@
* Bug#50152: Wrong context sent after a "::"
*
*/
-public class CompletionTest_ScopedReference_Prefix extends CompletionProposalsBaseTest {
+public class ScopedReference_Prefix_CompletionTest extends CompletionProposalsBaseTest {
private final String fileName = "CompletionTestStart31.cpp";
private final String fileFullPath = "resources/contentassist/" + fileName;
@@ -32,13 +32,13 @@
private final String expectedPrefix = "a";
private final String[] expectedResults = { "aNamespaceFunction(void) : void" };
- public CompletionTest_ScopedReference_Prefix(String name) {
+ public ScopedReference_Prefix_CompletionTest(String name) {
super(name);
}
public static Test suite() {
- TestSuite suite = new TestSuite(CompletionTest_ScopedReference_Prefix.class.getName());
- suite.addTest(new CompletionTest_ScopedReference_Prefix("testCompletionProposals"));
+ TestSuite suite = new TestSuite(ScopedReference_Prefix_CompletionTest.class.getName());
+ suite.addTest(new ScopedReference_Prefix_CompletionTest("testCompletionProposals"));
return suite;
}
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_SingleName_Method_NoPrefix.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/SingleName_Method_NoPrefix_CompletionTest.java
similarity index 91%
rename from core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_SingleName_Method_NoPrefix.java
rename to core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/SingleName_Method_NoPrefix_CompletionTest.java
index 3bac5ff..77bf8f2 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_SingleName_Method_NoPrefix.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/SingleName_Method_NoPrefix_CompletionTest.java
@@ -23,7 +23,7 @@
* Lookup.THIS
*
*/
-public class CompletionTest_SingleName_Method_NoPrefix extends CompletionProposalsBaseTest {
+public class SingleName_Method_NoPrefix_CompletionTest extends CompletionProposalsBaseTest {
private final String fileName = "CompletionTestStart5.cpp";
private final String fileFullPath = "resources/contentassist/" + fileName;
private final String headerFileName = "CompletionTestStart.h";
@@ -39,7 +39,7 @@
// "operator =(const anotherClass &) anotherClass &",
};
- public CompletionTest_SingleName_Method_NoPrefix(String name) {
+ public SingleName_Method_NoPrefix_CompletionTest(String name) {
super(name);
// operators should not be proposed
// see https://bugs.eclipse.org/bugs/show_bug.cgi?id=172304
@@ -47,8 +47,8 @@
}
public static Test suite() {
- TestSuite suite = new TestSuite(CompletionTest_SingleName_Method_NoPrefix.class.getName());
- suite.addTest(new CompletionTest_SingleName_Method_NoPrefix("testCompletionProposals"));
+ TestSuite suite = new TestSuite(SingleName_Method_NoPrefix_CompletionTest.class.getName());
+ suite.addTest(new SingleName_Method_NoPrefix_CompletionTest("testCompletionProposals"));
return suite;
}
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_SingleName_Method_Prefix.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/SingleName_Method_Prefix_CompletionTest.java
similarity index 90%
rename from core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_SingleName_Method_Prefix.java
rename to core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/SingleName_Method_Prefix_CompletionTest.java
index 780fa32..fde3ae6 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_SingleName_Method_Prefix.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/SingleName_Method_Prefix_CompletionTest.java
@@ -22,7 +22,7 @@
* Testing statement start completion kind, with a prefix
*
*/
-public class CompletionTest_SingleName_Method_Prefix extends CompletionProposalsBaseTest {
+public class SingleName_Method_Prefix_CompletionTest extends CompletionProposalsBaseTest {
private final String fileName = "CompletionTestStart1.cpp";
private final String fileFullPath = "resources/contentassist/" + fileName;
@@ -34,13 +34,13 @@
"anotherClass(const anotherClass &)", "anotherClass(void)", "aNamespace", "anEnumeration", "aFirstEnum",
"aSecondEnum", "aThirdEnum", "AStruct", "AMacro(x)" };
- public CompletionTest_SingleName_Method_Prefix(String name) {
+ public SingleName_Method_Prefix_CompletionTest(String name) {
super(name);
}
public static Test suite() {
- TestSuite suite = new TestSuite(CompletionTest_SingleName_Method_Prefix.class.getName());
- suite.addTest(new CompletionTest_SingleName_Method_Prefix("testCompletionProposals"));
+ TestSuite suite = new TestSuite(SingleName_Method_Prefix_CompletionTest.class.getName());
+ suite.addTest(new SingleName_Method_Prefix_CompletionTest("testCompletionProposals"));
return suite;
}
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_SingleName_NoPrefix.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/SingleName_NoPrefix_CompletionTest.java
similarity index 91%
rename from core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_SingleName_NoPrefix.java
rename to core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/SingleName_NoPrefix_CompletionTest.java
index 4031c5b..0273b25 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_SingleName_NoPrefix.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/SingleName_NoPrefix_CompletionTest.java
@@ -22,7 +22,7 @@
* Testing Single name reference, with prefix
*
*/
-public class CompletionTest_SingleName_NoPrefix extends CompletionProposalsBaseTest {
+public class SingleName_NoPrefix_CompletionTest extends CompletionProposalsBaseTest {
private final String fileName = "CompletionTestStart15.cpp";
private final String fileFullPath = "resources/contentassist/" + fileName;
private final String headerFileName = "CompletionTestStart.h";
@@ -36,13 +36,13 @@
// note: macros are omitted intentionally
};
- public CompletionTest_SingleName_NoPrefix(String name) {
+ public SingleName_NoPrefix_CompletionTest(String name) {
super(name);
}
public static Test suite() {
- TestSuite suite = new TestSuite(CompletionTest_SingleName_NoPrefix.class.getName());
- suite.addTest(new CompletionTest_SingleName_NoPrefix("testCompletionProposals"));
+ TestSuite suite = new TestSuite(SingleName_NoPrefix_CompletionTest.class.getName());
+ suite.addTest(new SingleName_NoPrefix_CompletionTest("testCompletionProposals"));
return suite;
}
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_SingleName_Prefix2.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/SingleName_Prefix2_CompletionTest.java
similarity index 91%
rename from core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_SingleName_Prefix2.java
rename to core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/SingleName_Prefix2_CompletionTest.java
index 895cda6..ec4b07f 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_SingleName_Prefix2.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/SingleName_Prefix2_CompletionTest.java
@@ -22,7 +22,7 @@
* Testing Single name reference, with prefix
*
*/
-public class CompletionTest_SingleName_Prefix2 extends CompletionProposalsBaseTest {
+public class SingleName_Prefix2_CompletionTest extends CompletionProposalsBaseTest {
private final String fileName = "CompletionTestStart14.cpp";
private final String fileFullPath = "resources/contentassist/" + fileName;
private final String headerFileName = "CompletionTestStart.h";
@@ -32,15 +32,15 @@
"anotherFunction(void) : void", "aClass", "anotherClass", "aNamespace", "anEnumeration", "aFirstEnum",
"aSecondEnum", "aThirdEnum", "AMacro(x)", "AStruct" };
- public CompletionTest_SingleName_Prefix2(String name) {
+ public SingleName_Prefix2_CompletionTest(String name) {
super(name);
// see https://bugs.eclipse.org/bugs/show_bug.cgi?id=109724
//setExpectFailure(109724);
}
public static Test suite() {
- TestSuite suite = new TestSuite(CompletionTest_SingleName_Prefix2.class.getName());
- suite.addTest(new CompletionTest_SingleName_Prefix2("testCompletionProposals"));
+ TestSuite suite = new TestSuite(SingleName_Prefix2_CompletionTest.class.getName());
+ suite.addTest(new SingleName_Prefix2_CompletionTest("testCompletionProposals"));
return suite;
}
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_SingleName_Prefix.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/SingleName_Prefix_CompletionTest.java
similarity index 90%
rename from core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_SingleName_Prefix.java
rename to core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/SingleName_Prefix_CompletionTest.java
index 4c7eff0..71bfc64 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_SingleName_Prefix.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/SingleName_Prefix_CompletionTest.java
@@ -22,7 +22,7 @@
* Testing Single name reference, Macro lookups
*
*/
-public class CompletionTest_SingleName_Prefix extends CompletionProposalsBaseTest {
+public class SingleName_Prefix_CompletionTest extends CompletionProposalsBaseTest {
private final String fileName = "CompletionTestStart8.cpp";
private final String fileFullPath = "resources/contentassist/" + fileName;
private final String headerFileName = "CompletionTestStart.h";
@@ -32,14 +32,14 @@
// missing results
"AMacro(x)" };
- public CompletionTest_SingleName_Prefix(String name) {
+ public SingleName_Prefix_CompletionTest(String name) {
super(name);
// see https://bugs.eclipse.org/bugs/show_bug.cgi?id=171708
}
public static Test suite() {
- TestSuite suite = new TestSuite(CompletionTest_SingleName_Prefix.class.getName());
- suite.addTest(new CompletionTest_SingleName_Prefix("testCompletionProposals"));
+ TestSuite suite = new TestSuite(SingleName_Prefix_CompletionTest.class.getName());
+ suite.addTest(new SingleName_Prefix_CompletionTest("testCompletionProposals"));
return suite;
}
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_TypeDef_NoPrefix.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/TypeDef_NoPrefix_CompletionTest.java
similarity index 90%
rename from core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_TypeDef_NoPrefix.java
rename to core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/TypeDef_NoPrefix_CompletionTest.java
index e2f678a..7ad3d42 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_TypeDef_NoPrefix.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/TypeDef_NoPrefix_CompletionTest.java
@@ -23,7 +23,7 @@
* Bug#52948
*
*/
-public class CompletionTest_TypeDef_NoPrefix extends CompletionProposalsBaseTest {
+public class TypeDef_NoPrefix_CompletionTest extends CompletionProposalsBaseTest {
private final String fileName = "CompletionTestStart37.cpp";
private final String fileFullPath = "resources/contentassist/" + fileName;
@@ -32,13 +32,13 @@
private final String expectedPrefix = "m";
private final String[] expectedResults = { "myType" };
- public CompletionTest_TypeDef_NoPrefix(String name) {
+ public TypeDef_NoPrefix_CompletionTest(String name) {
super(name);
}
public static Test suite() {
- TestSuite suite = new TestSuite(CompletionTest_TypeDef_NoPrefix.class.getName());
- suite.addTest(new CompletionTest_TypeDef_NoPrefix("testCompletionProposals"));
+ TestSuite suite = new TestSuite(TypeDef_NoPrefix_CompletionTest.class.getName());
+ suite.addTest(new TypeDef_NoPrefix_CompletionTest("testCompletionProposals"));
return suite;
}
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_TypeDef_Prefix.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/TypeDef_Prefix_CompletionTest.java
similarity index 91%
rename from core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_TypeDef_Prefix.java
rename to core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/TypeDef_Prefix_CompletionTest.java
index 0a6713a..37f2f7f 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_TypeDef_Prefix.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/TypeDef_Prefix_CompletionTest.java
@@ -23,7 +23,7 @@
* Bug#52948
*
*/
-public class CompletionTest_TypeDef_Prefix extends CompletionProposalsBaseTest {
+public class TypeDef_Prefix_CompletionTest extends CompletionProposalsBaseTest {
private final String fileName = "CompletionTestStart37.cpp";
private final String fileFullPath = "resources/contentassist/" + fileName;
@@ -32,13 +32,13 @@
private final String expectedPrefix = "m";
private final String[] expectedResults = { "myType" };
- public CompletionTest_TypeDef_Prefix(String name) {
+ public TypeDef_Prefix_CompletionTest(String name) {
super(name);
}
public static Test suite() {
- TestSuite suite = new TestSuite(CompletionTest_TypeDef_Prefix.class.getName());
- suite.addTest(new CompletionTest_TypeDef_Prefix("testCompletionProposals"));
+ TestSuite suite = new TestSuite(TypeDef_Prefix_CompletionTest.class.getName());
+ suite.addTest(new TypeDef_Prefix_CompletionTest("testCompletionProposals"));
return suite;
}
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_TypeRef_NoPrefix.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/TypeRef_NoPrefix_CompletionTest.java
similarity index 90%
rename from core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_TypeRef_NoPrefix.java
rename to core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/TypeRef_NoPrefix_CompletionTest.java
index 70386bf..3723ba1 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_TypeRef_NoPrefix.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/TypeRef_NoPrefix_CompletionTest.java
@@ -24,7 +24,7 @@
* Bug#50471 : Wrong completion kind after the "using" keyword
*
*/
-public class CompletionTest_TypeRef_NoPrefix extends CompletionProposalsBaseTest {
+public class TypeRef_NoPrefix_CompletionTest extends CompletionProposalsBaseTest {
private final String fileName = "CompletionTestStart24.cpp";
private final String fileFullPath = "resources/contentassist/" + fileName;
@@ -33,14 +33,14 @@
private final String expectedPrefix = "";
private final String[] expectedResults = { "aNamespace", "xNamespace" };
- public CompletionTest_TypeRef_NoPrefix(String name) {
+ public TypeRef_NoPrefix_CompletionTest(String name) {
super(name);
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=169860
}
public static Test suite() {
- TestSuite suite = new TestSuite(CompletionTest_TypeRef_NoPrefix.class.getName());
- suite.addTest(new CompletionTest_TypeRef_NoPrefix("testCompletionProposals"));
+ TestSuite suite = new TestSuite(TypeRef_NoPrefix_CompletionTest.class.getName());
+ suite.addTest(new TypeRef_NoPrefix_CompletionTest("testCompletionProposals"));
return suite;
}
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_TypeRef_Prefix.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/TypeRef_Prefix_CompletionTest.java
similarity index 91%
rename from core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_TypeRef_Prefix.java
rename to core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/TypeRef_Prefix_CompletionTest.java
index 31c897c..8d11e75 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_TypeRef_Prefix.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/TypeRef_Prefix_CompletionTest.java
@@ -24,7 +24,7 @@
* Bug#50471 : Wrong completion kind after the "using" keyword
*
*/
-public class CompletionTest_TypeRef_Prefix extends CompletionProposalsBaseTest {
+public class TypeRef_Prefix_CompletionTest extends CompletionProposalsBaseTest {
private final String fileName = "CompletionTestStart25.cpp";
private final String fileFullPath = "resources/contentassist/" + fileName;
@@ -33,14 +33,14 @@
private final String expectedPrefix = "a";
private final String[] expectedResults = { "aNamespace" };
- public CompletionTest_TypeRef_Prefix(String name) {
+ public TypeRef_Prefix_CompletionTest(String name) {
super(name);
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=169860
}
public static Test suite() {
- TestSuite suite = new TestSuite(CompletionTest_TypeRef_Prefix.class.getName());
- suite.addTest(new CompletionTest_TypeRef_Prefix("testCompletionProposals"));
+ TestSuite suite = new TestSuite(TypeRef_Prefix_CompletionTest.class.getName());
+ suite.addTest(new TypeRef_Prefix_CompletionTest("testCompletionProposals"));
return suite;
}
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_VariableType_NestedPrefix.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/VariableType_NestedPrefix_CompletionTest.java
similarity index 90%
rename from core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_VariableType_NestedPrefix.java
rename to core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/VariableType_NestedPrefix_CompletionTest.java
index 69d726d6..e416fb0 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_VariableType_NestedPrefix.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/VariableType_NestedPrefix_CompletionTest.java
@@ -23,7 +23,7 @@
* Bug#50152: Wrong context sent after a "::"
*
*/
-public class CompletionTest_VariableType_NestedPrefix extends CompletionProposalsBaseTest {
+public class VariableType_NestedPrefix_CompletionTest extends CompletionProposalsBaseTest {
private final String fileName = "CompletionTestStart38.cpp";
private final String fileFullPath = "resources/contentassist/" + fileName;
@@ -32,13 +32,13 @@
private final String expectedPrefix = "";
private final String[] expectedResults = { "Foo(void)", "bar(void) : void", "fum(void) : void", "DEF", "x : int" };
- public CompletionTest_VariableType_NestedPrefix(String name) {
+ public VariableType_NestedPrefix_CompletionTest(String name) {
super(name);
}
public static Test suite() {
- TestSuite suite = new TestSuite(CompletionTest_VariableType_NestedPrefix.class.getName());
- suite.addTest(new CompletionTest_VariableType_NestedPrefix("testCompletionProposals"));
+ TestSuite suite = new TestSuite(VariableType_NestedPrefix_CompletionTest.class.getName());
+ suite.addTest(new VariableType_NestedPrefix_CompletionTest("testCompletionProposals"));
return suite;
}
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_VariableType_NoPrefix.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/VariableType_NoPrefix_CompletionTest.java
similarity index 90%
rename from core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_VariableType_NoPrefix.java
rename to core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/VariableType_NoPrefix_CompletionTest.java
index 61c8d72..59726b2 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_VariableType_NoPrefix.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/VariableType_NoPrefix_CompletionTest.java
@@ -23,7 +23,7 @@
* Testing Variable_type, with NO prefix
*
*/
-public class CompletionTest_VariableType_NoPrefix extends CompletionProposalsBaseTest {
+public class VariableType_NoPrefix_CompletionTest extends CompletionProposalsBaseTest {
private final String fileName = "CompletionTestStart11.cpp";
private final String fileFullPath = "resources/contentassist/" + fileName;
private final String headerFileName = "CompletionTestStart.h";
@@ -32,14 +32,14 @@
private final String[] expectedResults = { "aClass", "anotherClass", "aNamespace", "anEnumeration", "AStruct",
"xOtherClass", "xNamespace", "xEnumeration", "XStruct", };
- public CompletionTest_VariableType_NoPrefix(String name) {
+ public VariableType_NoPrefix_CompletionTest(String name) {
super(name);
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=169860
}
public static Test suite() {
- TestSuite suite = new TestSuite(CompletionTest_VariableType_NoPrefix.class.getName());
- suite.addTest(new CompletionTest_VariableType_NoPrefix("testCompletionProposals"));
+ TestSuite suite = new TestSuite(VariableType_NoPrefix_CompletionTest.class.getName());
+ suite.addTest(new VariableType_NoPrefix_CompletionTest("testCompletionProposals"));
return suite;
}
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_VariableType_Prefix.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/VariableType_Prefix_CompletionTest.java
similarity index 90%
rename from core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_VariableType_Prefix.java
rename to core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/VariableType_Prefix_CompletionTest.java
index d91768d..08c18e7 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_VariableType_Prefix.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/VariableType_Prefix_CompletionTest.java
@@ -22,7 +22,7 @@
* Testing Variable_type completion kind, with a prefix
*
*/
-public class CompletionTest_VariableType_Prefix extends CompletionProposalsBaseTest {
+public class VariableType_Prefix_CompletionTest extends CompletionProposalsBaseTest {
private final String fileName = "CompletionTestStart3.cpp";
private final String fileFullPath = "resources/contentassist/" + fileName;
private final String headerFileName = "CompletionTestStart.h";
@@ -31,15 +31,15 @@
private final String[] expectedResults = { "aClass", "anotherClass", "aNamespace", "anEnumeration", "AStruct",
"AMacro(x)" };
- public CompletionTest_VariableType_Prefix(String name) {
+ public VariableType_Prefix_CompletionTest(String name) {
super(name);
// see https://bugs.eclipse.org/bugs/show_bug.cgi?id=109724
// setExpectFailure(109724);
}
public static Test suite() {
- TestSuite suite = new TestSuite(CompletionTest_VariableType_Prefix.class.getName());
- suite.addTest(new CompletionTest_VariableType_Prefix("testCompletionProposals"));
+ TestSuite suite = new TestSuite(VariableType_Prefix_CompletionTest.class.getName());
+ suite.addTest(new VariableType_Prefix_CompletionTest("testCompletionProposals"));
return suite;
}
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CPPSelectionTestsIndexer.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CPPSelectionIndexerTests.java
similarity index 99%
rename from core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CPPSelectionTestsIndexer.java
rename to core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CPPSelectionIndexerTests.java
index a66e622..af240ce 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CPPSelectionTestsIndexer.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CPPSelectionIndexerTests.java
@@ -42,17 +42,17 @@
/**
* Test Ctrl-F3/F3 with the DOM Indexer for a C++ project.
*/
-public class CPPSelectionTestsIndexer extends BaseSelectionTestsIndexer {
+public class CPPSelectionIndexerTests extends BaseSelectionTestsIndexer {
protected String sourceIndexerID;
protected IIndex index;
- public CPPSelectionTestsIndexer(String name) {
+ public CPPSelectionIndexerTests(String name) {
super(name);
sourceIndexerID = IPDOMManager.ID_FAST_INDEXER;
}
public static Test suite() {
- return suite(CPPSelectionTestsIndexer.class);
+ return suite(CPPSelectionIndexerTests.class);
}
@Override
@@ -84,7 +84,7 @@
protected StringBuilder[] getContents(int sections) throws IOException {
return TestSourceReader.getContentsForTest(CTestPlugin.getDefault().getBundle(), "ui",
- CPPSelectionTestsIndexer.class, getName(), sections);
+ CPPSelectionIndexerTests.class, getName(), sections);
}
private void assertNode(String name, int offset, IASTNode node) {
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CPPSelectionTestsNoIndexer.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CPPSelectionNoIndexerTests.java
similarity index 99%
rename from core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CPPSelectionTestsNoIndexer.java
rename to core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CPPSelectionNoIndexerTests.java
index 6a96df1..2557b63 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CPPSelectionTestsNoIndexer.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CPPSelectionNoIndexerTests.java
@@ -62,7 +62,7 @@
*
* @author dsteffle
*/
-public class CPPSelectionTestsNoIndexer extends BaseSelectionTests {
+public class CPPSelectionNoIndexerTests extends BaseSelectionTests {
private static final String INDEX_FILE_ID = "2946365241"; //$NON-NLS-1$
static NullProgressMonitor monitor;
static IWorkspace workspace;
@@ -100,20 +100,20 @@
fileManager = new FileManager();
}
- public CPPSelectionTestsNoIndexer() {
+ public CPPSelectionNoIndexerTests() {
super();
}
/**
* @param name
*/
- public CPPSelectionTestsNoIndexer(String name) {
+ public CPPSelectionNoIndexerTests(String name) {
super(name);
}
public static Test suite() {
- TestSuite suite = suite(CPPSelectionTestsNoIndexer.class, "_");
- suite.addTest(new CPPSelectionTestsNoIndexer("cleanupProject")); //$NON-NLS-1$
+ TestSuite suite = suite(CPPSelectionNoIndexerTests.class, "_");
+ suite.addTest(new CPPSelectionNoIndexerTests("cleanupProject")); //$NON-NLS-1$
return suite;
}
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CSelectionTestsIndexer.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CSelectionIndexerTests.java
similarity index 98%
rename from core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CSelectionTestsIndexer.java
rename to core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CSelectionIndexerTests.java
index e088481..b78a540 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CSelectionTestsIndexer.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CSelectionIndexerTests.java
@@ -35,17 +35,17 @@
import junit.framework.Test;
-public class CSelectionTestsIndexer extends BaseSelectionTestsIndexer {
+public class CSelectionIndexerTests extends BaseSelectionTestsIndexer {
private String sourceIndexerID;
private IIndex index;
- public CSelectionTestsIndexer(String name) {
+ public CSelectionIndexerTests(String name) {
super(name);
sourceIndexerID = IPDOMManager.ID_FAST_INDEXER;
}
public static Test suite() {
- return suite(CSelectionTestsIndexer.class);
+ return suite(CSelectionIndexerTests.class);
}
@Override
@@ -74,7 +74,7 @@
protected StringBuilder[] getContents(int sections) throws IOException {
return TestSourceReader.getContentsForTest(CTestPlugin.getDefault().getBundle(), "ui",
- CSelectionTestsIndexer.class, getName(), sections);
+ CSelectionIndexerTests.class, getName(), sections);
}
private void assertNode(String name, int offset, IASTNode node) {
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CSelectionTestsNoIndexer.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CSelectionNoIndexerTests.java
similarity index 98%
rename from core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CSelectionTestsNoIndexer.java
rename to core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CSelectionNoIndexerTests.java
index b033d9b..f892882 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CSelectionTestsNoIndexer.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CSelectionNoIndexerTests.java
@@ -48,7 +48,7 @@
*
* @author dsteffle
*/
-public class CSelectionTestsNoIndexer extends BaseSelectionTests {
+public class CSelectionNoIndexerTests extends BaseSelectionTests {
private static final String INDEX_FILE_ID = "2324852323"; //$NON-NLS-1$
static NullProgressMonitor monitor;
@@ -80,20 +80,20 @@
fileManager = new FileManager();
}
- public CSelectionTestsNoIndexer() {
+ public CSelectionNoIndexerTests() {
super();
}
/**
* @param name
*/
- public CSelectionTestsNoIndexer(String name) {
+ public CSelectionNoIndexerTests(String name) {
super(name);
}
public static Test suite() {
- TestSuite suite = new TestSuite(CSelectionTestsNoIndexer.class);
- suite.addTest(new CSelectionTestsNoIndexer("cleanupProject")); //$NON-NLS-1$
+ TestSuite suite = new TestSuite(CSelectionNoIndexerTests.class);
+ suite.addTest(new CSelectionNoIndexerTests("cleanupProject")); //$NON-NLS-1$
return 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
index f31c354..80e0dc6 100644
--- 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
@@ -22,8 +22,8 @@
@Suite.SuiteClasses({
// selection tests
- ResolveBindingTests.class, CPPSelectionTestsNoIndexer.class, CSelectionTestsNoIndexer.class,
- CPPSelectionTestsIndexer.class, CSelectionTestsIndexer.class,
+ ResolveBindingTests.class, CPPSelectionNoIndexerTests.class, CSelectionNoIndexerTests.class,
+ CPPSelectionIndexerTests.class, CSelectionIndexerTests.class,
})
public class SelectionTestSuite {
