mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

Moved template engine tests to org.eclipse.cdt.ui.tests plug-in since

Browse source 
they fail in headless mode due to loading of
TestExtraPagesProvider.java
This commit is contained in:
Sergey Prigogin 2011-12-23 15:57:35 -08:00
parent 46e94156ee
commit 2ee14c041c
14 changed files with 21 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
core/org.eclipse.cdt.core.tests/.classpath
View file

@ -5,7 +5,6 @@
<classpathentry kind="src" path="parser"/>
<classpathentry kind="src" path="suite"/>
<classpathentry kind="src" path="regression"/>
<classpathentry kind="src" path="templateengine"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/>

1
core/org.eclipse.cdt.core.tests/META-INF/MANIFEST.MF
View file

@ -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,

3
core/org.eclipse.cdt.core.tests/build.properties
View file

@ -25,8 +25,7 @@ source.. = model/,\
parser/,\
suite/,\
misc/,\
regression/,\
templateengine/
regression/
jre.compilation.profile=JavaSE-1.6
javacSource=1.6

4
core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/suite/AutomatedIntegrationSuite.java
View file

@ -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;
@ -83,11 +82,8 @@ public class AutomatedIntegrationSuite extends TestSuite {
suite.addTest(PDOMTests.suite());
suite.addTest(IndexTests.suite());
suite.addTest(AllTemplateEngineTests.suite());
suite.addTest(RefreshScopeTests.suite());
return suite;
}
}

5
core/org.eclipse.cdt.core.tests/templateengine/org/eclipse/cdt/core/tests/templateengine/AllTemplateEngineTests.java → core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/AllTemplateEngineTests.java
View file

@ -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 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

2
core/org.eclipse.cdt.core.tests/templateengine/org/eclipse/cdt/core/tests/templateengine/TemplateEngineTestsHelper.java → core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/TemplateEngineTestsHelper.java
View file

@ -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;

4
core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/TestExtraPagesProvider.java
View file

@ -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<String, String> getPageData() {
return Collections.singletonMap(dataKey, dataValue);
}

2
core/org.eclipse.cdt.core.tests/templateengine/org/eclipse/cdt/core/tests/templateengine/TestProcesses.java → core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/TestProcesses.java
View file

@ -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;

2
core/org.eclipse.cdt.core.tests/templateengine/org/eclipse/cdt/core/tests/templateengine/TestSharedDefaults.java → core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/TestSharedDefaults.java
View file

@ -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;

2
core/org.eclipse.cdt.core.tests/templateengine/org/eclipse/cdt/core/tests/templateengine/TestTemplateCore.java → core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/TestTemplateCore.java
View file

@ -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;

6
core/org.eclipse.cdt.core.tests/templateengine/org/eclipse/cdt/core/tests/templateengine/TestTemplateEngine.java → core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/TestTemplateEngine.java
View file

@ -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.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());
}
}

2
core/org.eclipse.cdt.core.tests/templateengine/org/eclipse/cdt/core/tests/templateengine/TestTemplateEngineBugs.java → core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/TestTemplateEngineBugs.java
View file

@ -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;

2
core/org.eclipse.cdt.core.tests/templateengine/org/eclipse/cdt/core/tests/templateengine/TestValueStore.java → core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/TestValueStore.java
View file

@ -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;

3
core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/AutomatedSuite.java
View file

@ -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());
}
}