[jbosstools-commits] JBoss Tools SVN: r22613 - in trunk/cdi: tests/org.jboss.tools.cdi.core.test and 8 other directories.

Author: dgolovin Date: 2010-06-07 16:35:42 -0400 (Mon, 07 Jun 2010) New Revision: 22613 Removed: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreTestSuite.java Modified: trunk/cdi/features/org.jboss.tools.cdi.feature/feature.xml trunk/cdi/tests/org.jboss.tools.cdi.core.test/META-INF/MANIFEST.MF trunk/cdi/tests/org.jboss.tools.cdi.core.test/build.properties trunk/cdi/tests/org.jboss.tools.cdi.core.test/pom.xml trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreTestSetup.java trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/META-INF/MANIFEST.MF trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/build.properties trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/pom.xml trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/CdiTextExtAllTests.java trunk/cdi/tests/org.jboss.tools.cdi.ui.test/META-INF/MANIFEST.MF trunk/cdi/tests/org.jboss.tools.cdi.ui.test/build.properties trunk/cdi/tests/org.jboss.tools.cdi.ui.test/pom.xml trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/CDIUIAllTests.java Log: https://jira.jboss.org/browse/JBDS-1202 problems running tests fix for CDI tests Modified: trunk/cdi/features/org.jboss.tools.cdi.feature/feature.xml =================================================================== --- trunk/cdi/features/org.jboss.tools.cdi.feature/feature.xml 2010-06-07 18:55:33 UTC (rev 22612) +++ trunk/cdi/features/org.jboss.tools.cdi.feature/feature.xml 2010-06-07 20:35:42 UTC (rev 22613) @@ -21,14 +21,6 @@ %license </license> - <!-- <url> - <update label="%updateSiteName" url="http://download.jboss.org/jbosstools/updates/stable/galileo/&qu... - </url> --> - - <requires> - <import feature="org.jboss.tools.richfaces.feature" version="3.1.0" match="greaterOrEqual"/> - </requires> - <plugin id="org.jboss.tools.cdi.core" download-size="0" @@ -56,12 +48,12 @@ install-size="0" version="0.0.0" unpack="false"/> - + <plugin id="org.jboss.tools.cdi.text.ext" download-size="0" install-size="0" version="0.0.0" unpack="false"/> - + </feature> Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/META-INF/MANIFEST.MF =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/META-INF/MANIFEST.MF 2010-06-07 18:55:33 UTC (rev 22612) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/META-INF/MANIFEST.MF 2010-06-07 20:35:42 UTC (rev 22613) @@ -18,4 +18,3 @@ org.eclipse.ltk.core.refactoring;bundle-version="3.5.0" Export-Package: org.jboss.tools.cdi.core.test, org.jboss.tools.cdi.core.test.tck -Bundle-ClassPath: cdi-core-test.jar Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/build.properties =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/build.properties 2010-06-07 18:55:33 UTC (rev 22612) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/build.properties 2010-06-07 20:35:42 UTC (rev 22613) @@ -1,7 +1,6 @@ source.. = src/ -output.cdi-core-test.jar = bin/ bin.includes = META-INF/,\ - cdi-core-test.jar,\ resources/,\ - projects/ -source.cdi-core-test.jar = src/ + projects/,\ + . +jars.compile.order = . Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/pom.xml =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/pom.xml 2010-06-07 18:55:33 UTC (rev 22612) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/pom.xml 2010-06-07 20:35:42 UTC (rev 22613) @@ -11,4 +11,17 @@ <artifactId>org.jboss.tools.cdi.core.test</artifactId> <version>1.0.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> + <build> + <plugins> + <plugin> + <groupId>org.sonatype.tycho</groupId> + <artifactId>maven-osgi-test-plugin</artifactId> + <configuration> + <explodedBundles> + <bundle>org.jboss.tools.cdi.core.test</bundle> + </explodedBundles> + </configuration> + </plugin> + </plugins> + </build> </project> Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java 2010-06-07 18:55:33 UTC (rev 22612) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java 2010-06-07 20:35:42 UTC (rev 22613) @@ -14,8 +14,24 @@ import junit.framework.Test; import junit.framework.TestSuite; +import org.eclipse.core.runtime.Platform; import org.eclipse.jdt.internal.core.JavaModelManager; //import org.jboss.tools.cdi.core.test.tck.NamedBeanRefactoringTest; +import org.jboss.tools.cdi.core.test.tck.BeanDefinitionTest; +import org.jboss.tools.cdi.core.test.tck.BeanSpecializationTest; +import org.jboss.tools.cdi.core.test.tck.DefaultNamedTest; +import org.jboss.tools.cdi.core.test.tck.EnterpriseQualifierDefinitionTest; +import org.jboss.tools.cdi.core.test.tck.EnterpriseScopeDefinitionTest; +import org.jboss.tools.cdi.core.test.tck.EnterpriseStereotypeDefinitionTest; +import org.jboss.tools.cdi.core.test.tck.InjectionPointTest; +import org.jboss.tools.cdi.core.test.tck.NameDefinitionTest; +import org.jboss.tools.cdi.core.test.tck.ProducerMethodDefinitionTest; +import org.jboss.tools.cdi.core.test.tck.QualifierDefinitionTest; +import org.jboss.tools.cdi.core.test.tck.ResolutionByTypeTest; +import org.jboss.tools.cdi.core.test.tck.ScopeDefinitionTest; +import org.jboss.tools.cdi.core.test.tck.StereotypeDefinitionTest; +import org.jboss.tools.cdi.core.test.tck.StereotypeInheritenceTest; +import org.jboss.tools.cdi.core.test.tck.ValidationTest; import org.jboss.tools.tests.AbstractPluginsLoadTest; /** @@ -24,33 +40,26 @@ public class CDICoreAllTests { public static Test suite() { + // it could be done here because it is not needed to be enabled back + JavaModelManager.getIndexManager().disable(); + TestSuite suite = new TestSuite("CDI Core Tests"); - suite.addTest(new CDICoreTestSetup(CDICoreTestSuite.suite())); - //suite.addTest(NamedBeanRefactoringTest.suite()); - - return new DisableJavaIndexingSetup(suite); + suite.addTestSuite(BeanDefinitionTest.class); + suite.addTestSuite(NameDefinitionTest.class); + suite.addTestSuite(QualifierDefinitionTest.class); + suite.addTestSuite(EnterpriseQualifierDefinitionTest.class); + suite.addTestSuite(ScopeDefinitionTest.class); + suite.addTestSuite(EnterpriseScopeDefinitionTest.class); + suite.addTestSuite(StereotypeDefinitionTest.class); + suite.addTestSuite(DefaultNamedTest.class); + suite.addTestSuite(EnterpriseStereotypeDefinitionTest.class); + suite.addTestSuite(StereotypeInheritenceTest.class); + suite.addTestSuite(ProducerMethodDefinitionTest.class); + suite.addTestSuite(InjectionPointTest.class); + suite.addTestSuite(BeanSpecializationTest.class); + suite.addTestSuite(ResolutionByTypeTest.class); + suite.addTestSuite(ValidationTest.class); + return new CDICoreTestSetup(suite); } - public class CDIPluginsLoadTest extends AbstractPluginsLoadTest { - public void testBundlesAreLoadedForSeamFeature(){ - testBundlesAreLoadedFor("org.jboss.tools.cdi.feature"); - } - } - - public static class DisableJavaIndexingSetup extends TestSetup { - - public DisableJavaIndexingSetup(Test test) { - super(test); - } - - @Override - protected void setUp() throws Exception { - JavaModelManager.getIndexManager().disable(); - } - - @Override - protected void tearDown() throws Exception { - JavaModelManager.getIndexManager().enable(); - } - } } \ No newline at end of file Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreTestSetup.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreTestSetup.java 2010-06-07 18:55:33 UTC (rev 22612) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreTestSetup.java 2010-06-07 20:35:42 UTC (rev 22613) @@ -14,6 +14,9 @@ import junit.framework.Test; import org.eclipse.core.resources.IProject; +import org.eclipse.jdt.core.JavaCore; +import org.eclipse.jdt.internal.core.JavaModelManager; +import org.eclipse.jdt.internal.core.search.indexing.IndexManager; import org.jboss.tools.cdi.core.test.tck.TCKTest; import org.jboss.tools.test.util.JobUtils; import org.jboss.tools.test.util.ResourcesUtils; @@ -31,7 +34,7 @@ @Override protected void setUp() throws Exception { - tckProject = TCKTest.importPreparedProject("/"); + tckProject = TCKTest .importPreparedProject("/"); } @Override Deleted: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreTestSuite.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreTestSuite.java 2010-06-07 18:55:33 UTC (rev 22612) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreTestSuite.java 2010-06-07 20:35:42 UTC (rev 22613) @@ -1,56 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.cdi.core.test; - -import junit.framework.Test; -import junit.framework.TestSuite; - -import org.jboss.tools.cdi.core.test.tck.BeanDefinitionTest; -import org.jboss.tools.cdi.core.test.tck.BeanSpecializationTest; -import org.jboss.tools.cdi.core.test.tck.DefaultNamedTest; -import org.jboss.tools.cdi.core.test.tck.EnterpriseQualifierDefinitionTest; -import org.jboss.tools.cdi.core.test.tck.EnterpriseScopeDefinitionTest; -import org.jboss.tools.cdi.core.test.tck.EnterpriseStereotypeDefinitionTest; -import org.jboss.tools.cdi.core.test.tck.InjectionPointTest; -import org.jboss.tools.cdi.core.test.tck.NameDefinitionTest; -import org.jboss.tools.cdi.core.test.tck.ProducerMethodDefinitionTest; -import org.jboss.tools.cdi.core.test.tck.QualifierDefinitionTest; -import org.jboss.tools.cdi.core.test.tck.ResolutionByTypeTest; -import org.jboss.tools.cdi.core.test.tck.ScopeDefinitionTest; -import org.jboss.tools.cdi.core.test.tck.StereotypeDefinitionTest; -import org.jboss.tools.cdi.core.test.tck.StereotypeInheritenceTest; -import org.jboss.tools.cdi.core.test.tck.ValidationTest; - -/** - * @author Alexey Kazakov - */ -public class CDICoreTestSuite extends TestSuite { - - public static Test suite() { - TestSuite suite = new TestSuite("CDI Core Tests"); - suite.addTestSuite(BeanDefinitionTest.class); - suite.addTestSuite(NameDefinitionTest.class); - suite.addTestSuite(QualifierDefinitionTest.class); - suite.addTestSuite(EnterpriseQualifierDefinitionTest.class); - suite.addTestSuite(ScopeDefinitionTest.class); - suite.addTestSuite(EnterpriseScopeDefinitionTest.class); - suite.addTestSuite(StereotypeDefinitionTest.class); - suite.addTestSuite(DefaultNamedTest.class); - suite.addTestSuite(EnterpriseStereotypeDefinitionTest.class); - suite.addTestSuite(StereotypeInheritenceTest.class); - suite.addTestSuite(ProducerMethodDefinitionTest.class); - suite.addTestSuite(InjectionPointTest.class); - suite.addTestSuite(BeanSpecializationTest.class); - suite.addTestSuite(ResolutionByTypeTest.class); - suite.addTestSuite(ValidationTest.class); - return suite; - } -} \ No newline at end of file Modified: trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/META-INF/MANIFEST.MF =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/META-INF/MANIFEST.MF 2010-06-07 18:55:33 UTC (rev 22612) +++ trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/META-INF/MANIFEST.MF 2010-06-07 20:35:42 UTC (rev 22613) @@ -16,7 +16,7 @@ Bundle-ActivationPolicy: lazy Bundle-Vendor: %Bundle-Vendor.0 Export-Package: org.jboss.tools.cdi.text.ext.test -Bundle-ClassPath: cdi-text-ext-tests.jar Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Import-Package: org.eclipse.jdt.internal.core Modified: trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/build.properties =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/build.properties 2010-06-07 18:55:33 UTC (rev 22612) +++ trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/build.properties 2010-06-07 20:35:42 UTC (rev 22613) @@ -1,9 +1,9 @@ output.. = bin/ bin.includes = META-INF/,\ - cdi-text-ext-tests.jar,\ - plugin.properties -src.includes = test.xml,\ - src/,\ + plugin.properties,\ + . +src.includes = src/,\ META-INF/,\ build.properties -source.cdi-text-ext-tests.jar = src/ +jars.compile.order = . +source.. = src/ Modified: trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/pom.xml =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/pom.xml 2010-06-07 18:55:33 UTC (rev 22612) +++ trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/pom.xml 2010-06-07 20:35:42 UTC (rev 22613) @@ -11,4 +11,17 @@ <artifactId>org.jboss.tools.cdi.text.ext.test</artifactId> <version>1.0.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> + <build> + <plugins> + <plugin> + <groupId>org.sonatype.tycho</groupId> + <artifactId>maven-osgi-test-plugin</artifactId> + <configuration> + <explodedBundles> + <bundle>org.jboss.tools.cdi.core.test</bundle> + </explodedBundles> + </configuration> + </plugin> + </plugins> + </build> </project> Modified: trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/CdiTextExtAllTests.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/CdiTextExtAllTests.java 2010-06-07 18:55:33 UTC (rev 22612) +++ trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/CdiTextExtAllTests.java 2010-06-07 20:35:42 UTC (rev 22613) @@ -1,6 +1,7 @@ package org.jboss.tools.cdi.text.ext.test; +import org.eclipse.jdt.internal.core.JavaModelManager; import org.jboss.tools.cdi.core.test.CDICoreTestSetup; import junit.framework.Test; @@ -8,6 +9,9 @@ public class CdiTextExtAllTests { public static Test suite() { + // it could be done here because it is not needed to be enabled back + JavaModelManager.getIndexManager().disable(); + TestSuite suite = new TestSuite(CdiTextExtAllTests.class.getName()); suite.addTest(new CDICoreTestSetup(CDITextExtTestSuite.suite())); return suite; Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/META-INF/MANIFEST.MF =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/META-INF/MANIFEST.MF 2010-06-07 18:55:33 UTC (rev 22612) +++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/META-INF/MANIFEST.MF 2010-06-07 20:35:42 UTC (rev 22613) @@ -6,17 +6,12 @@ Bundle-Vendor: JBoss by Red Hat Bundle-RequiredExecutionEnvironment: J2SE-1.5 Require-Bundle: org.junit, - org.jboss.tools.cdi.ui, org.jboss.tools.tests, org.jboss.tools.cdi.core.test, org.eclipse.core.resources, org.jboss.tools.jst.jsp.test, - org.eclipse.jface.text, - org.eclipse.wst.sse.ui, - org.eclipse.wst.sse.core, - org.eclipse.jface, org.jboss.tools.common, - org.eclipse.osgi, - org.eclipse.core.runtime -Bundle-ClassPath: cdi-ui-test.jar + org.eclipse.core.runtime, + org.eclipse.jface.text;bundle-version="3.5.2", + org.eclipse.jdt.core;bundle-version="3.5.2" Export-Package: org.jboss.tools.cdi.ui.test Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/build.properties =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/build.properties 2010-06-07 18:55:33 UTC (rev 22612) +++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/build.properties 2010-06-07 20:35:42 UTC (rev 22613) @@ -1,5 +1,6 @@ bin.includes = META-INF/,\ resources/,\ - cdi-ui-test.jar -source.cdi-ui-test.jar = src/ -jars.compile.order = cdi-ui-test.jar + . +jars.compile.order = . +source.. = src/ +output.. = bin/ Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/pom.xml =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/pom.xml 2010-06-07 18:55:33 UTC (rev 22612) +++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/pom.xml 2010-06-07 20:35:42 UTC (rev 22613) @@ -11,4 +11,17 @@ <artifactId>org.jboss.tools.cdi.ui.test</artifactId> <version>1.0.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> + <build> + <plugins> + <plugin> + <groupId>org.sonatype.tycho</groupId> + <artifactId>maven-osgi-test-plugin</artifactId> + <configuration> + <explodedBundles> + <bundle>org.jboss.tools.cdi.core.test</bundle> + </explodedBundles> + </configuration> + </plugin> + </plugins> + </build> </project> Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/CDIUIAllTests.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/CDIUIAllTests.java 2010-06-07 18:55:33 UTC (rev 22612) +++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/CDIUIAllTests.java 2010-06-07 20:35:42 UTC (rev 22613) @@ -10,6 +10,8 @@ ******************************************************************************/ package org.jboss.tools.cdi.ui.test; +import org.eclipse.jdt.internal.core.JavaModelManager; + import junit.framework.Test; import junit.framework.TestSuite; @@ -19,6 +21,9 @@ public class CDIUIAllTests { public static Test suite() { + // it could be done here because it is not needed to be enabled back + JavaModelManager.getIndexManager().disable(); + TestSuite suite = new TestSuite("CDI UI Tests"); suite.addTestSuite(CATest.class); return suite;