Author: scabanovich Date: 2010-09-03 10:19:04 -0400 (Fri, 03 Sep 2010) New Revision: 24696 Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/.classpath trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/.project trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/.settings/ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/.settings/org.eclipse.jdt.core.prefs trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/META-INF/ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/META-INF/beans.xml trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/bin/ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/bin/cdi/ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/bin/cdi/test/ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/bin/cdi/test/MyBean.class trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/bin/cdi/test/MyQualifier.class trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/lib/ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/lib/cdi-api.jar trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/lib/javax.inject.jar trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/src/ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/src/cdi/ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/src/cdi/test/ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/src/cdi/test/MyBean.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/src/cdi/test/MyQualifier.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest2/ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest2/.classpath trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest2/.project trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest2/.settings/ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest2/.settings/org.eclipse.jdt.core.prefs trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest2/bin/ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest2/lib/ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest2/lib/cdi-api.jar trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest2/lib/javax.inject.jar trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest2/src/ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/DependentProjectTest.java Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java Log: https://jira.jboss.org/browse/JBIDE-6950 Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/.classpath =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/.classpath (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/.classpath 2010-09-03 14:19:04 UTC (rev 24696) @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" path="src"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="lib" path="lib/cdi-api.jar"/> + <classpathentry kind="lib" path="lib/javax.inject.jar"/> + <classpathentry kind="output" path="bin"/> +</classpath> Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/.classpath ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/.project =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/.project (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/.project 2010-09-03 14:19:04 UTC (rev 24696) @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>CDITest1</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.wst.validation.validationbuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.jboss.tools.cdi.core.cdibuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.jboss.tools.jst.web.kb.kbbuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.jboss.tools.cdi.core.cdinature</nature> + <nature>org.jboss.tools.jst.web.kb.kbnature</nature> + </natures> +</projectDescription> Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/.project ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/.settings/org.eclipse.jdt.core.prefs 2010-09-03 14:19:04 UTC (rev 24696) @@ -0,0 +1,12 @@ +#Thu Sep 02 19:40:42 MSD 2010 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.6 Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/.settings/org.eclipse.jdt.core.prefs ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/META-INF/beans.xml =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/META-INF/beans.xml (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/META-INF/beans.xml 2010-09-03 14:19:04 UTC (rev 24696) @@ -0,0 +1,46 @@ +<?xml version="1.0"?> +<beans xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:s="urn:java:ee" + xmlns:drools="urn:java:org.jboss.seam.drools:org.jboss.seam.drools.config" + xmlns:security="urn:java:org.jboss.seam.security.permission" + xmlns:plidm="urn:java:org.jboss.seam.security.management.picketlink" + xsi:schemaLocation=" + http://java.sun.com/xml/ns/javaee + http://jboss.org/schema/cdi/beans_1_0.xsd"> + + <drools:RuleResources> + <s:replaces/> + <security:SecurityRulesConfig/> + <drools:resources> + <s:value>classpath;security-rules.drl;DRL</s:value> + </drools:resources> + </drools:RuleResources> + + <drools:DroolsConfig> + <s:modifies/> + <security:SecurityRulesConfig/> + <drools:ruleResources> + <s:Inject/> + <security:SecurityRulesConfig/> + </drools:ruleResources> + </drools:DroolsConfig> + + <!--security:RuleBasedPermissionResolver> + <s:modifies/> + <security:securityRules> + <s:Inject/> + <security:SecurityRulesConfig/> + <s:Default/> + </security:securityRules> + </security:RuleBasedPermissionResolver--> + + <plidm:JpaIdentityStoreConfiguration> + <s:replaces/> + <plidm:identityClass>org.jboss.seam.example.ticketmonster.model.IdentityObject</plidm:identityClass> + <plidm:credentialClass>org.jboss.seam.example.ticketmonster.model.IdentityObjectCredential</plidm:credentialClass> + <plidm:relationshipClass>org.jboss.seam.example.ticketmonster.model.IdentityObjectRelationship</plidm:relationshipClass> + <plidm:roleTypeClass>org.jboss.seam.example.ticketmonster.model.IdentityRoleName</plidm:roleTypeClass> + </plidm:JpaIdentityStoreConfiguration> + +</beans> \ No newline at end of file Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/META-INF/beans.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/bin/cdi/test/MyBean.class =================================================================== (Binary files differ) Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/bin/cdi/test/MyBean.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/bin/cdi/test/MyQualifier.class =================================================================== (Binary files differ) Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/bin/cdi/test/MyQualifier.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/lib/cdi-api.jar =================================================================== (Binary files differ) Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/lib/cdi-api.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/lib/javax.inject.jar =================================================================== (Binary files differ) Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/lib/javax.inject.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/src/cdi/test/MyBean.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/src/cdi/test/MyBean.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/src/cdi/test/MyBean.java 2010-09-03 14:19:04 UTC (rev 24696) @@ -0,0 +1,6 @@ +package cdi.test; + +@MyQualifier +public class MyBean { + +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/src/cdi/test/MyBean.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/src/cdi/test/MyQualifier.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/src/cdi/test/MyQualifier.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/src/cdi/test/MyQualifier.java 2010-09-03 14:19:04 UTC (rev 24696) @@ -0,0 +1,21 @@ +package cdi.test; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.inject.Qualifier; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +@Qualifier +@Target({ TYPE, METHOD, PARAMETER, FIELD }) +@Retention(RUNTIME) +@Documented +public @interface MyQualifier { + +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/src/cdi/test/MyQualifier.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest2/.classpath =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest2/.classpath (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest2/.classpath 2010-09-03 14:19:04 UTC (rev 24696) @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" path="src"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="lib" path="lib/cdi-api.jar"/> + <classpathentry kind="lib" path="lib/javax.inject.jar"/> + <classpathentry combineaccessrules="false" kind="src" path="/CDITest1"/> + <classpathentry kind="output" path="bin"/> +</classpath> Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest2/.classpath ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest2/.project =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest2/.project (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest2/.project 2010-09-03 14:19:04 UTC (rev 24696) @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>CDITest2</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.wst.validation.validationbuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.jboss.tools.cdi.core.cdibuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.jboss.tools.jst.web.kb.kbbuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.jboss.tools.cdi.core.cdinature</nature> + <nature>org.jboss.tools.jst.web.kb.kbnature</nature> + </natures> +</projectDescription> Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest2/.project ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest2/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest2/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest2/.settings/org.eclipse.jdt.core.prefs 2010-09-03 14:19:04 UTC (rev 24696) @@ -0,0 +1,12 @@ +#Fri Sep 03 17:44:12 MSD 2010 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.6 Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest2/.settings/org.eclipse.jdt.core.prefs ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest2/lib/cdi-api.jar =================================================================== (Binary files differ) Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest2/lib/cdi-api.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest2/lib/javax.inject.jar =================================================================== (Binary files differ) Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest2/lib/javax.inject.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream 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-09-03 13:44:45 UTC (rev 24695) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java 2010-09-03 14:19:04 UTC (rev 24696) @@ -49,8 +49,11 @@ public static Test suite() { // it could be done here because it is not needed to be enabled back JavaModelManager.getIndexManager().disable(); + + + TestSuite suiteAll = new TestSuite("CDI Core Tests"); - TestSuite suite = new TestSuite("CDI Core Tests"); + TestSuite suite = new TestSuite("TCK Tests"); suite.addTestSuite(BeanDefinitionTest.class); suite.addTestSuite(NameDefinitionTest.class); suite.addTestSuite(QualifierDefinitionTest.class); @@ -78,7 +81,10 @@ suite.addTestSuite(BeansXmlValidationTest.class); suite.addTestSuite(AnnotationsValidationTest.class); suite.addTestSuite(CoreValidationTest.class); + + suiteAll.addTestSuite(DependentProjectTest.class); + suiteAll.addTest(new CDICoreTestSetup(suite)); - return new CDICoreTestSetup(suite); + return suiteAll; } } \ No newline at end of file Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/DependentProjectTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/DependentProjectTest.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/DependentProjectTest.java 2010-09-03 14:19:04 UTC (rev 24696) @@ -0,0 +1,61 @@ +package org.jboss.tools.cdi.core.test; + +import java.io.IOException; + +import junit.framework.TestCase; + +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.jboss.tools.cdi.core.CDICorePlugin; +import org.jboss.tools.cdi.core.IBean; +import org.jboss.tools.cdi.core.ICDIProject; +import org.jboss.tools.cdi.core.IClassBean; +import org.jboss.tools.test.util.JobUtils; +import org.jboss.tools.test.util.ResourcesUtils; + +/** + * + * @author V.Kabanovich + * + */ +public class DependentProjectTest extends TestCase { + protected static String PLUGIN_ID = "org.jboss.tools.cdi.core.test"; + IProject project1 = null; + IProject project2 = null; + + public DependentProjectTest() {} + + public void setUp() throws Exception { + project1 = ResourcesUtils.importProject(PLUGIN_ID, "/projects/CDITest1"); + project1.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor()); + JobUtils.waitForIdle(); + + project2 = ResourcesUtils.importProject(PLUGIN_ID, "/projects/CDITest2"); + project2.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor()); + JobUtils.waitForIdle(); + } + + public void testDependentProject() throws CoreException, IOException { + ICDIProject cdi2 = CDICorePlugin.getCDIProject(project2, true); + IBean[] beans = cdi2.getBeans(); + IClassBean cb = null; + for (IBean b: beans) { + if(b instanceof IClassBean) { + cb = (IClassBean)b; + System.out.println(cb.getBeanClass().getFullyQualifiedName()); + } + } + } + + public void tearDown() throws Exception { + boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false); + JobUtils.waitForIdle(); + project1.delete(true, true, null); + project2.delete(true, true, null); + JobUtils.waitForIdle(); + ResourcesUtils.setBuildAutomatically(saveAutoBuild); + } + +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/DependentProjectTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain