Author: scabanovich Date: 2011-08-10 17:56:21 -0400 (Wed, 10 Aug 2011) New Revision: 33793 Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3DependentPersistenceTest/ trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3DependentPersistenceTest/.classpath trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3DependentPersistenceTest/.project trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3DependentPersistenceTest/.settings/ trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3DependentPersistenceTest/.settings/org.eclipse.jdt.core.prefs trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3DependentPersistenceTest/bin/ trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3DependentPersistenceTest/bin/test/ trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3DependentPersistenceTest/bin/test/EntityManager2Test.class trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3DependentPersistenceTest/src/ trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3DependentPersistenceTest/src/test/ trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3DependentPersistenceTest/src/test/EntityManager2Test.java Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/persistence/SeamPersistenceTest.java trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/persistence/SeamPersistenceTestSetup.java Log: JBIDE-9484 https://issues.jboss.org/browse/JBIDE-9484 Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3DependentPersistenceTest/.classpath =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3DependentPersistenceTest/.classpath (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3DependentPersistenceTest/.classpath 2011-08-10 21:56:21 UTC (rev 33793) @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" path="src"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="lib" path="/Seam3PersistenceTest/lib/cdi-api.jar"/> + <classpathentry kind="lib" path="/Seam3PersistenceTest/lib/hibernate-jpa-2.0-api-1.0.1.Final.jar"/> + <classpathentry kind="lib" path="/Seam3PersistenceTest/lib/hibernate3.jar"/> + <classpathentry kind="lib" path="/Seam3PersistenceTest/lib/javax.inject.jar"/> + <classpathentry kind="lib" path="/Seam3PersistenceTest/lib/seam-persistence.jar"/> + <classpathentry kind="lib" path="/Seam3PersistenceTest/lib/seam-solder.jar"/> + <classpathentry combineaccessrules="false" kind="src" path="/Seam3PersistenceTest"/> + <classpathentry kind="output" path="bin"/> +</classpath> Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3DependentPersistenceTest/.classpath ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3DependentPersistenceTest/.project =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3DependentPersistenceTest/.project (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3DependentPersistenceTest/.project 2011-08-10 21:56:21 UTC (rev 33793) @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>Seam3DependentPersistenceTest</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <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> + <buildCommand> + <name>org.eclipse.wst.validation.validationbuilder</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.seam.core.test/projects/Seam3DependentPersistenceTest/.project ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3DependentPersistenceTest/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3DependentPersistenceTest/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3DependentPersistenceTest/.settings/org.eclipse.jdt.core.prefs 2011-08-10 21:56:21 UTC (rev 33793) @@ -0,0 +1,12 @@ +#Wed Aug 10 13:45:00 PDT 2011 +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.seam.core.test/projects/Seam3DependentPersistenceTest/.settings/org.eclipse.jdt.core.prefs ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3DependentPersistenceTest/bin/test/EntityManager2Test.class =================================================================== (Binary files differ) Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3DependentPersistenceTest/bin/test/EntityManager2Test.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3DependentPersistenceTest/src/test/EntityManager2Test.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3DependentPersistenceTest/src/test/EntityManager2Test.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3DependentPersistenceTest/src/test/EntityManager2Test.java 2011-08-10 21:56:21 UTC (rev 33793) @@ -0,0 +1,17 @@ +package test; + +import javax.inject.Inject; +import javax.persistence.EntityManager; + +import org.hibernate.Session; + +public class EntityManager2Test { + + @Inject + @MyQualifier + EntityManager manager; + + @Inject + Session session; + +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3DependentPersistenceTest/src/test/EntityManager2Test.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/persistence/SeamPersistenceTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/persistence/SeamPersistenceTest.java 2011-08-10 21:44:12 UTC (rev 33792) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/persistence/SeamPersistenceTest.java 2011-08-10 21:56:21 UTC (rev 33793) @@ -20,6 +20,7 @@ public class SeamPersistenceTest extends TestCase { protected IProject project; + protected IProject dependentProject; public IProject getTestProject() throws IOException, CoreException, InvocationTargetException, InterruptedException { if(project==null) { @@ -32,6 +33,17 @@ return project; } + public IProject getDependentTestProject() throws IOException, CoreException, InvocationTargetException, InterruptedException { + if(dependentProject==null) { + dependentProject = ResourcesPlugin.getWorkspace().getRoot().getProject(SeamPersistenceTestSetup.DEPENDENT_PROJECT_NAME); + if(!dependentProject.exists()) { + dependentProject = ResourcesUtils.importProject(SeamPersistenceTestSetup.PLUGIN_ID, SeamPersistenceTestSetup.DEPENDENT_PROJECT_PATH); + TestUtil.waitForValidation(); + } + } + return dependentProject; + } + public void testEntityManagerInjection() throws Exception { ICDIProject cdi = CDICorePlugin.getCDIProject(getTestProject(), true); IInjectionPoint p = DependentProjectTest.getInjectionPointField(cdi, "/src/test/EntityManagerTest.java", "manager"); @@ -41,6 +53,15 @@ assertEquals(1, bs.size()); } + public void testEntityManagerInjectionInDependentProject() throws Exception { + ICDIProject cdi = CDICorePlugin.getCDIProject(getDependentTestProject(), true); + IInjectionPoint p = DependentProjectTest.getInjectionPointField(cdi, "/src/test/EntityManager2Test.java", "manager"); + assertNotNull(p); + + Set<IBean> bs = cdi.getBeans(false, p); + assertEquals(1, bs.size()); + } + public void testSessionInjection() throws Exception { ICDIProject cdi = CDICorePlugin.getCDIProject(getTestProject(), true); IInjectionPoint p = DependentProjectTest.getInjectionPointField(cdi, "/src/test/EntityManagerTest.java", "session"); @@ -49,4 +70,13 @@ Set<IBean> bs = cdi.getBeans(false, p); assertFalse(bs.isEmpty()); } -} \ No newline at end of file + + public void testSessionInjectionInDependentProject() throws Exception { + ICDIProject cdi = CDICorePlugin.getCDIProject(getDependentTestProject(), true); + IInjectionPoint p = DependentProjectTest.getInjectionPointField(cdi, "/src/test/EntityManager2Test.java", "session"); + assertNotNull(p); + + Set<IBean> bs = cdi.getBeans(false, p); + assertEquals(1, bs.size()); + } +} Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/persistence/SeamPersistenceTestSetup.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/persistence/SeamPersistenceTestSetup.java 2011-08-10 21:44:12 UTC (rev 33792) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/persistence/SeamPersistenceTestSetup.java 2011-08-10 21:56:21 UTC (rev 33793) @@ -27,8 +27,11 @@ public static final String PLUGIN_ID = "org.jboss.tools.cdi.seam.core.test"; public static final String PROJECT_NAME = "Seam3PersistenceTest"; public static final String PROJECT_PATH = "/projects/Seam3PersistenceTest"; + public static final String DEPENDENT_PROJECT_NAME = "Seam3DependentPersistenceTest"; + public static final String DEPENDENT_PROJECT_PATH = "/projects/" + DEPENDENT_PROJECT_NAME; protected IProject project; + protected IProject dependentProject; public SeamPersistenceTestSetup(Test test) { super(test); @@ -41,12 +44,18 @@ project = ResourcesUtils.importProject(PLUGIN_ID, PROJECT_PATH); project.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, null); } + dependentProject = ResourcesPlugin.getWorkspace().getRoot().getProject(DEPENDENT_PROJECT_NAME); + if(!dependentProject.exists()) { + dependentProject = ResourcesUtils.importProject(PLUGIN_ID, DEPENDENT_PROJECT_PATH); + dependentProject.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, null); + } } @Override protected void tearDown() throws Exception { boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false); project.delete(true, true, null); + dependentProject.delete(true, true, null); JobUtils.waitForIdle(); ResourcesUtils.setBuildAutomatically(saveAutoBuild); }