diff --git a/core/org.eclipse.cdt.core.tests/.classpath b/core/org.eclipse.cdt.core.tests/.classpath index 71e490e81a7..30f15fb8d9e 100644 --- a/core/org.eclipse.cdt.core.tests/.classpath +++ b/core/org.eclipse.cdt.core.tests/.classpath @@ -5,7 +5,6 @@ - diff --git a/core/org.eclipse.cdt.core.tests/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.core.tests/META-INF/MANIFEST.MF index 24768732e86..34e30a14a40 100644 --- a/core/org.eclipse.cdt.core.tests/META-INF/MANIFEST.MF +++ b/core/org.eclipse.cdt.core.tests/META-INF/MANIFEST.MF @@ -31,7 +31,6 @@ Export-Package: org.eclipse.cdt.core.cdescriptor.tests, org.eclipse.cdt.core.testplugin, org.eclipse.cdt.core.testplugin.util, org.eclipse.cdt.core.tests, - org.eclipse.cdt.core.tests.templateengine, org.eclipse.cdt.core.winreg.tests, org.eclipse.cdt.internal.index.tests;x-internal:=true, org.eclipse.cdt.internal.pdom.tests;x-internal:=true, diff --git a/core/org.eclipse.cdt.core.tests/build.properties b/core/org.eclipse.cdt.core.tests/build.properties index 016d8b57403..4f12cd40852 100644 --- a/core/org.eclipse.cdt.core.tests/build.properties +++ b/core/org.eclipse.cdt.core.tests/build.properties @@ -25,8 +25,7 @@ source.. = model/,\ parser/,\ suite/,\ misc/,\ - regression/,\ - templateengine/ + regression/ jre.compilation.profile=JavaSE-1.6 javacSource=1.6 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 80f2946e55e..c40a37e2dc0 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 @@ -6,9 +6,9 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * IBM Corporation - initial API and implementation - * Markus Schorn (Wind River Systems) - * Norbert Ploett (Siemens AG) + * IBM Corporation - initial API and implementation + * Markus Schorn (Wind River Systems) + * Norbert Ploett (Siemens AG) *******************************************************************************/ package org.eclipse.cdt.core.suite; @@ -30,7 +30,6 @@ import org.eclipse.cdt.core.model.tests.WorkingCopyTests; import org.eclipse.cdt.core.parser.tests.ParserTestSuite; import org.eclipse.cdt.core.parser.tests.rewrite.RewriteTests; import org.eclipse.cdt.core.resources.tests.RefreshScopeTests; -import org.eclipse.cdt.core.tests.templateengine.AllTemplateEngineTests; import org.eclipse.cdt.internal.index.tests.IndexTests; import org.eclipse.cdt.internal.pdom.tests.PDOMTests; import org.eclipse.cdt.utils.CdtVariableResolverTest; @@ -82,12 +81,9 @@ public class AutomatedIntegrationSuite extends TestSuite { // Add in PDOM tests suite.addTest(PDOMTests.suite()); suite.addTest(IndexTests.suite()); - - suite.addTest(AllTemplateEngineTests.suite()); suite.addTest(RefreshScopeTests.suite()); return suite; } - } diff --git a/core/org.eclipse.cdt.core.tests/templateengine/org/eclipse/cdt/core/tests/templateengine/AllTemplateEngineTests.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/AllTemplateEngineTests.java similarity index 93% rename from core/org.eclipse.cdt.core.tests/templateengine/org/eclipse/cdt/core/tests/templateengine/AllTemplateEngineTests.java rename to core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/AllTemplateEngineTests.java index 13b8cd7c4b6..3643398cb32 100644 --- a/core/org.eclipse.cdt.core.tests/templateengine/org/eclipse/cdt/core/tests/templateengine/AllTemplateEngineTests.java +++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/AllTemplateEngineTests.java @@ -6,9 +6,9 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Bala Torati (Symbian) - Initial API and implementation + * Bala Torati (Symbian) - Initial API and implementation *******************************************************************************/ -package org.eclipse.cdt.core.tests.templateengine; +package org.eclipse.cdt.ui.tests.templateengine; import junit.framework.Test; import junit.framework.TestSuite; @@ -20,7 +20,6 @@ import junit.framework.TestSuite; * * @since 4.0 */ - public class AllTemplateEngineTests extends TestSuite { public static void main(String[] args) { @@ -31,7 +30,7 @@ public class AllTemplateEngineTests extends TestSuite { * Since the TemplateEngine consists of UI(Wizard). * A TestWizard is created to which the dynamically generated * UIPages are added. The Wizard is launched from here. - * The TestCases created to test the TemplateEngine is initialised here. + * The TestCases created to test the TemplateEngine is initialized here. * @return * * @since 4.0 diff --git a/core/org.eclipse.cdt.core.tests/templateengine/org/eclipse/cdt/core/tests/templateengine/TemplateEngineTestsHelper.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/TemplateEngineTestsHelper.java similarity index 98% rename from core/org.eclipse.cdt.core.tests/templateengine/org/eclipse/cdt/core/tests/templateengine/TemplateEngineTestsHelper.java rename to core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/TemplateEngineTestsHelper.java index 41fd7ca8ed9..85c01af5ec7 100644 --- a/core/org.eclipse.cdt.core.tests/templateengine/org/eclipse/cdt/core/tests/templateengine/TemplateEngineTestsHelper.java +++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/TemplateEngineTestsHelper.java @@ -8,7 +8,7 @@ * Contributors: * Bala Torati (Symbian) - Initial API and implementation *******************************************************************************/ -package org.eclipse.cdt.core.tests.templateengine; +package org.eclipse.cdt.ui.tests.templateengine; import java.io.IOException; import java.net.URL; diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/TestExtraPagesProvider.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/TestExtraPagesProvider.java index d7258b5dd13..6be562644ac 100644 --- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/TestExtraPagesProvider.java +++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/TestExtraPagesProvider.java @@ -6,7 +6,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Andrew Ferguson (Symbian) - Initial API and implementation + * Andrew Ferguson (Symbian) - Initial API and implementation *******************************************************************************/ package org.eclipse.cdt.ui.tests.templateengine; @@ -49,7 +49,7 @@ public class TestExtraPagesProvider implements IPagesAfterTemplateSelectionProvi * An example implementation of {@link IWizardDataPage} for test purposes. */ static class MyPage extends AbstractWizardDataPage implements IWizardDataPage { - String labelText , dataKey, dataValue; + String labelText, dataKey, dataValue; public MyPage(String labelText, String dataKey, String dataValue) { super("CustomTestPageName", "Title", null); @@ -59,7 +59,7 @@ public class TestExtraPagesProvider implements IPagesAfterTemplateSelectionProvi this.dataValue= dataValue; } - public Map getPageData() { + public Map getPageData() { return Collections.singletonMap(dataKey, dataValue); } diff --git a/core/org.eclipse.cdt.core.tests/templateengine/org/eclipse/cdt/core/tests/templateengine/TestProcesses.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/TestProcesses.java similarity index 99% rename from core/org.eclipse.cdt.core.tests/templateengine/org/eclipse/cdt/core/tests/templateengine/TestProcesses.java rename to core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/TestProcesses.java index 2bb9af58ad6..83842d838e0 100644 --- a/core/org.eclipse.cdt.core.tests/templateengine/org/eclipse/cdt/core/tests/templateengine/TestProcesses.java +++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/TestProcesses.java @@ -8,7 +8,7 @@ * Contributors: * Bala Torati (Symbian) - Initial API and implementation *******************************************************************************/ -package org.eclipse.cdt.core.tests.templateengine; +package org.eclipse.cdt.ui.tests.templateengine; import java.io.File; import java.util.Map; diff --git a/core/org.eclipse.cdt.core.tests/templateengine/org/eclipse/cdt/core/tests/templateengine/TestSharedDefaults.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/TestSharedDefaults.java similarity index 98% rename from core/org.eclipse.cdt.core.tests/templateengine/org/eclipse/cdt/core/tests/templateengine/TestSharedDefaults.java rename to core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/TestSharedDefaults.java index f38821233dd..bbc11e44872 100644 --- a/core/org.eclipse.cdt.core.tests/templateengine/org/eclipse/cdt/core/tests/templateengine/TestSharedDefaults.java +++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/TestSharedDefaults.java @@ -8,7 +8,7 @@ * Contributors: * Bala Torati (Symbian) - Initial API and implementation *******************************************************************************/ -package org.eclipse.cdt.core.tests.templateengine; +package org.eclipse.cdt.ui.tests.templateengine; import java.util.Iterator; diff --git a/core/org.eclipse.cdt.core.tests/templateengine/org/eclipse/cdt/core/tests/templateengine/TestTemplateCore.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/TestTemplateCore.java similarity index 97% rename from core/org.eclipse.cdt.core.tests/templateengine/org/eclipse/cdt/core/tests/templateengine/TestTemplateCore.java rename to core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/TestTemplateCore.java index 6073e8aa739..c4b53a0ef7c 100644 --- a/core/org.eclipse.cdt.core.tests/templateengine/org/eclipse/cdt/core/tests/templateengine/TestTemplateCore.java +++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/TestTemplateCore.java @@ -8,7 +8,7 @@ * Contributors: * Bala Torati (Symbian) - Initial API and implementation *******************************************************************************/ -package org.eclipse.cdt.core.tests.templateengine; +package org.eclipse.cdt.ui.tests.templateengine; import org.eclipse.cdt.core.templateengine.TemplateCore; import org.eclipse.cdt.core.testplugin.util.BaseTestCase; diff --git a/core/org.eclipse.cdt.core.tests/templateengine/org/eclipse/cdt/core/tests/templateengine/TestTemplateEngine.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/TestTemplateEngine.java similarity index 92% rename from core/org.eclipse.cdt.core.tests/templateengine/org/eclipse/cdt/core/tests/templateengine/TestTemplateEngine.java rename to core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/TestTemplateEngine.java index 9c313c66565..85cbaab95b0 100644 --- a/core/org.eclipse.cdt.core.tests/templateengine/org/eclipse/cdt/core/tests/templateengine/TestTemplateEngine.java +++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/TestTemplateEngine.java @@ -6,9 +6,9 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Bala Torati (Symbian) - Initial API and implementation + * Bala Torati (Symbian) - Initial API and implementation *******************************************************************************/ -package org.eclipse.cdt.core.tests.templateengine; +package org.eclipse.cdt.ui.tests.templateengine; import org.eclipse.cdt.core.templateengine.TemplateEngine; import org.eclipse.cdt.core.testplugin.util.BaseTestCase; @@ -17,8 +17,6 @@ import org.eclipse.cdt.core.testplugin.util.BaseTestCase; * Test the functionality of TemplateEngine. */ public class TestTemplateEngine extends BaseTestCase { - - TemplateEngine templateEngine = null; /* @@ -26,7 +24,6 @@ public class TestTemplateEngine extends BaseTestCase { */ protected void setUp() throws Exception { super.setUp(); - templateEngine = TemplateEngine.getDefault(); } @@ -59,5 +56,4 @@ public class TestTemplateEngine extends BaseTestCase { public void testSingleton() { assertSame(templateEngine, TemplateEngine.getDefault()); } - } diff --git a/core/org.eclipse.cdt.core.tests/templateengine/org/eclipse/cdt/core/tests/templateengine/TestTemplateEngineBugs.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/TestTemplateEngineBugs.java similarity index 96% rename from core/org.eclipse.cdt.core.tests/templateengine/org/eclipse/cdt/core/tests/templateengine/TestTemplateEngineBugs.java rename to core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/TestTemplateEngineBugs.java index a11dfebed19..da1edf430b6 100644 --- a/core/org.eclipse.cdt.core.tests/templateengine/org/eclipse/cdt/core/tests/templateengine/TestTemplateEngineBugs.java +++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/TestTemplateEngineBugs.java @@ -8,7 +8,7 @@ * Contributors: * Andrew Ferguson (Symbian) - Initial Implementation *******************************************************************************/ -package org.eclipse.cdt.core.tests.templateengine; +package org.eclipse.cdt.ui.tests.templateengine; import java.util.Arrays; import java.util.HashSet; diff --git a/core/org.eclipse.cdt.core.tests/templateengine/org/eclipse/cdt/core/tests/templateengine/TestValueStore.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/TestValueStore.java similarity index 97% rename from core/org.eclipse.cdt.core.tests/templateengine/org/eclipse/cdt/core/tests/templateengine/TestValueStore.java rename to core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/TestValueStore.java index 42f0e45c710..739e890d603 100644 --- a/core/org.eclipse.cdt.core.tests/templateengine/org/eclipse/cdt/core/tests/templateengine/TestValueStore.java +++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/TestValueStore.java @@ -8,7 +8,7 @@ * Contributors: * Bala Torati (Symbian) - Initial API and implementation *******************************************************************************/ -package org.eclipse.cdt.core.tests.templateengine; +package org.eclipse.cdt.ui.tests.templateengine; import java.util.Iterator; import java.util.Map; diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/AutomatedSuite.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/AutomatedSuite.java index 356fe88b0eb..7b5affd6f35 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/AutomatedSuite.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/AutomatedSuite.java @@ -24,6 +24,7 @@ import org.eclipse.cdt.ui.tests.outline.OutlineTestSuite; import org.eclipse.cdt.ui.tests.quickfix.AssistQuickFixTest; import org.eclipse.cdt.ui.tests.refactoring.RefactoringTestSuite; import org.eclipse.cdt.ui.tests.search.SearchTestSuite; +import org.eclipse.cdt.ui.tests.templateengine.AllTemplateEngineTests; import org.eclipse.cdt.ui.tests.text.TextTestSuite; import org.eclipse.cdt.ui.tests.text.contentassist.ContentAssistTestSuite; import org.eclipse.cdt.ui.tests.text.contentassist2.ContentAssist2TestSuite; @@ -101,5 +102,7 @@ public class AutomatedSuite extends TestSuite { // tests from package org.eclipse.cdt.ui.tests.misc addTest(MiscTestSuite.suite()); + + addTest(AllTemplateEngineTests.suite()); } }