Author: scabanovich Date: 2010-12-21 11:39:09 -0500 (Tue, 21 Dec 2010) New Revision: 27644 Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest3/ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest3/.classpath trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest3/.project trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest3/.settings/ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest3/.settings/org.eclipse.jdt.core.prefs trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest3/bin/ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest3/bin/cdi/ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest3/bin/cdi/test3/ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest3/bin/cdi/test3/C.class trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest3/src/ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest3/src/cdi/ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest3/src/cdi/test3/ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest3/src/cdi/test3/C.java Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest2/.classpath trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/DependentProjectTest.java Log: JBIDE-7946 https://issues.jboss.org/browse/JBIDE-7946 Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest2/.classpath =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest2/.classpath 2010-12-21 16:00:19 UTC (rev 27643) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest2/.classpath 2010-12-21 16:39:09 UTC (rev 27644) @@ -2,8 +2,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 exported="true" kind="lib" path="lib/cdi-api.jar"/> + <classpathentry exported="true" kind="lib" path="lib/javax.inject.jar"/> + <classpathentry combineaccessrules="false" exported="true" kind="src" path="/CDITest1"/> <classpathentry kind="output" path="bin"/> </classpath> Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest3/.classpath =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest3/.classpath (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest3/.classpath 2010-12-21 16:39:09 UTC (rev 27644) @@ -0,0 +1,7 @@ +<?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 combineaccessrules="false" kind="src" path="/CDITest2"/> + <classpathentry kind="output" path="bin"/> +</classpath> Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest3/.classpath ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest3/.project =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest3/.project (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest3/.project 2010-12-21 16:39:09 UTC (rev 27644) @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>CDITest3</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.jst.web.kb.kbbuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.jboss.tools.cdi.core.cdibuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.jboss.tools.jst.web.kb.kbnature</nature> + <nature>org.jboss.tools.cdi.core.cdinature</nature> + </natures> +</projectDescription> Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest3/.project ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest3/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest3/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest3/.settings/org.eclipse.jdt.core.prefs 2010-12-21 16:39:09 UTC (rev 27644) @@ -0,0 +1,12 @@ +#Tue Dec 21 19:01:41 MSK 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/CDITest3/.settings/org.eclipse.jdt.core.prefs ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest3/bin/cdi/test3/C.class =================================================================== (Binary files differ) Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest3/bin/cdi/test3/C.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest3/src/cdi/test3/C.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest3/src/cdi/test3/C.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest3/src/cdi/test3/C.java 2010-12-21 16:39:09 UTC (rev 27644) @@ -0,0 +1,10 @@ +package cdi.test3; + +import javax.inject.Inject; + +import cdi.test.MyBean; +import cdi.test.MyQualifier; + +public class C { + @Inject @MyQualifier MyBean bean; +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest3/src/cdi/test3/C.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: 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 2010-12-21 16:00:19 UTC (rev 27643) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/DependentProjectTest.java 2010-12-21 16:39:09 UTC (rev 27644) @@ -20,6 +20,7 @@ import org.jboss.tools.cdi.core.ICDIProject; import org.jboss.tools.cdi.core.IClassBean; import org.jboss.tools.cdi.core.IProducer; +import org.jboss.tools.cdi.core.IQualifier; import org.jboss.tools.cdi.core.IScope; import org.jboss.tools.test.util.JobUtils; import org.jboss.tools.test.util.ResourcesUtils; @@ -33,6 +34,7 @@ protected static String PLUGIN_ID = "org.jboss.tools.cdi.core.test"; IProject project1 = null; IProject project2 = null; + IProject project3 = null; public DependentProjectTest() {} @@ -44,6 +46,10 @@ project2 = ResourcesUtils.importProject(PLUGIN_ID, "/projects/CDITest2"); project2.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor()); JobUtils.waitForIdle(); + + project3 = ResourcesUtils.importProject(PLUGIN_ID, "/projects/CDITest3"); + project3.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor()); + JobUtils.waitForIdle(); } public void testDependentProject() throws CoreException, IOException { @@ -94,10 +100,16 @@ assertNotNull(ns); assertNull(sd); + boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false); + JobUtils.waitForIdle(); IFile scope2File = project1.getFile(new Path("src/cdi/test/Scope2.java")); IFile scope21File = project1.getFile(new Path("src/cdi/test/Scope2.1")); scope2File.setContents(scope21File.getContents(), IFile.FORCE, new NullProgressMonitor()); JobUtils.waitForIdle(); + project1.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new NullProgressMonitor()); + JobUtils.waitForIdle(); + ResourcesUtils.setBuildAutomatically(saveAutoBuild); + JobUtils.waitForIdle(); producer = getProducer("/CDITest2/src/test/Test1.java"); scope = producer.getScope(); @@ -121,11 +133,20 @@ return producer; } + public void testIndirectDependency() throws CoreException, IOException { + ICDIProject cdi3 = CDICorePlugin.getCDIProject(project3, true); + Set<IBean> beans = cdi3.getBeans(new Path("/CDITest1/src/cdi/test/MyBean.java")); + assertFalse(beans.isEmpty()); + IQualifier q = cdi3.getQualifier("cdi.test.MyQualifier"); + assertNotNull(q); + } + public void tearDown() throws Exception { boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false); JobUtils.waitForIdle(); project1.delete(true, true, null); project2.delete(true, true, null); + project3.delete(true, true, null); JobUtils.waitForIdle(); ResourcesUtils.setBuildAutomatically(saveAutoBuild); }