Author: scabanovich Date: 2011-08-10 14:31:00 -0400 (Wed, 10 Aug 2011) New Revision: 33779 Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIDependentConfigTest/ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIDependentConfigTest/.classpath trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIDependentConfigTest/.project trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIDependentConfigTest/.settings/ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIDependentConfigTest/.settings/org.eclipse.jdt.core.prefs trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIDependentConfigTest/bin/ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIDependentConfigTest/bin/org/ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIDependentConfigTest/bin/org/jboss/ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIDependentConfigTest/bin/org/jboss/beans/ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIDependentConfigTest/bin/org/jboss/beans/injection/ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIDependentConfigTest/bin/org/jboss/beans/injection/A.class trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIDependentConfigTest/bin/org/jboss/beans/injection/Injections2.class trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIDependentConfigTest/src/ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIDependentConfigTest/src/org/ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIDependentConfigTest/src/org/jboss/ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIDependentConfigTest/src/org/jboss/beans/ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIDependentConfigTest/src/org/jboss/beans/injection/ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIDependentConfigTest/src/org/jboss/beans/injection/Injections2.java trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/ConfigBeansInjectionTest.java Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/CDISeamConfigCoreAllTests.java trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamBeansTest.java trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamConfigTest.java trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamConfigTestSetup.java Log: JBIDE-9484 https://issues.jboss.org/browse/JBIDE-9484 Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIDependentConfigTest/.classpath =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIDependentConfigTest/.classpath (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIDependentConfigTest/.classpath 2011-08-10 18:31:00 UTC (rev 33779) @@ -0,0 +1,10 @@ +<?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="/CDIConfigTest/lib/cdi-api.jar"/> + <classpathentry kind="lib" path="/CDIConfigTest/lib/javax.inject.jar"/> + <classpathentry kind="lib" path="/CDIConfigTest/lib/seam-config-xml.jar"/> + <classpathentry combineaccessrules="false" kind="src" path="/CDIConfigTest"/> + <classpathentry kind="output" path="bin"/> +</classpath> Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIDependentConfigTest/.classpath ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIDependentConfigTest/.project =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIDependentConfigTest/.project (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIDependentConfigTest/.project 2011-08-10 18:31:00 UTC (rev 33779) @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>CDIDependentConfigTest</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.config.core.test/projects/CDIDependentConfigTest/.project ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIDependentConfigTest/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIDependentConfigTest/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIDependentConfigTest/.settings/org.eclipse.jdt.core.prefs 2011-08-10 18:31:00 UTC (rev 33779) @@ -0,0 +1,12 @@ +#Wed Aug 10 09:48:24 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.config.core.test/projects/CDIDependentConfigTest/.settings/org.eclipse.jdt.core.prefs ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIDependentConfigTest/bin/org/jboss/beans/injection/A.class =================================================================== (Binary files differ) Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIDependentConfigTest/bin/org/jboss/beans/injection/A.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIDependentConfigTest/bin/org/jboss/beans/injection/Injections2.class =================================================================== (Binary files differ) Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIDependentConfigTest/bin/org/jboss/beans/injection/Injections2.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIDependentConfigTest/src/org/jboss/beans/injection/Injections2.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIDependentConfigTest/src/org/jboss/beans/injection/Injections2.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIDependentConfigTest/src/org/jboss/beans/injection/Injections2.java 2011-08-10 18:31:00 UTC (rev 33779) @@ -0,0 +1,32 @@ +package org.jboss.beans.injection; + +import javax.inject.Inject; + +import org.jboss.beans.test04.MyBean5; +import org.jboss.beans.test04.MyQualifier; +import org.jboss.beans.test04.MyType3; +import org.jboss.beans.test05.MyType1; + +public class Injections2 { + + /** + * Class bean defined in seam-config.xml + */ + @Inject MyBean5 b5; + + /** + * Virtual field producer bean defined in seam-config.xml + */ + @Inject @org.jboss.beans.test06.MyQualifier("one") String s; + + /** + * Method producer bean defined in seam-config.xml + */ + @Inject @org.jboss.beans.test05.MyQualifier MyType1 t1; + + /** + * Field producer bean defined in seam-config.xml + */ + @Inject @MyQualifier(kind="kind-04-3") MyType3 t3; + +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIDependentConfigTest/src/org/jboss/beans/injection/Injections2.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/CDISeamConfigCoreAllTests.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/CDISeamConfigCoreAllTests.java 2011-08-10 18:19:26 UTC (rev 33778) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/CDISeamConfigCoreAllTests.java 2011-08-10 18:31:00 UTC (rev 33779) @@ -29,6 +29,7 @@ suiteCore.addTestSuite(ExtensionTest.class); suiteCore.addTestSuite(SeamDefinitionsTest.class); suiteCore.addTestSuite(SeamBeansTest.class); + suiteCore.addTestSuite(ConfigBeansInjectionTest.class); suiteAll.addTest(new SeamConfigTestSetup(suiteCore)); TestSuite suiteValidation = new TestSuite("CDI Config Validation Tests"); Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/ConfigBeansInjectionTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/ConfigBeansInjectionTest.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/ConfigBeansInjectionTest.java 2011-08-10 18:31:00 UTC (rev 33779) @@ -0,0 +1,67 @@ +package org.jboss.tools.cdi.seam.config.core.test; + +import java.util.Set; + +import org.jboss.tools.cdi.core.IBean; +import org.jboss.tools.cdi.core.IClassBean; +import org.jboss.tools.cdi.core.IInjectionPoint; +import org.jboss.tools.cdi.core.IProducerField; +import org.jboss.tools.cdi.core.IProducerMethod; +import org.jboss.tools.cdi.core.test.DependentProjectTest; + +public class ConfigBeansInjectionTest extends SeamConfigTest { + static String INJECTIONS_CLASS_PATH = "src/org/jboss/beans/injection/Injections.java"; + static String INJECTIONS2_CLASS_PATH = "src/org/jboss/beans/injection/Injections2.java"; + + public void testClassBeanInjection() { + IInjectionPoint p = DependentProjectTest.getInjectionPointField(cdiProject, INJECTIONS_CLASS_PATH, "b5"); + Set<IBean> bs = cdiProject.getBeans(false, p); + assertEquals(1, bs.size()); + IBean b = bs.iterator().next(); + assertTrue(b instanceof IClassBean); + + //The same in dependent project + p = DependentProjectTest.getInjectionPointField(cdiDependentProject, INJECTIONS2_CLASS_PATH, "b5"); + bs = cdiDependentProject.getBeans(false, p); + assertEquals(1, bs.size()); + } + + public void testVirtualFieldProducer() { + IInjectionPoint p = DependentProjectTest.getInjectionPointField(cdiProject, INJECTIONS_CLASS_PATH, "s"); + Set<IBean> bs = cdiProject.getBeans(false, p); + assertEquals(1, bs.size()); + IBean b = bs.iterator().next(); + assertTrue(b instanceof IClassBean); + + //The same in dependent project + p = DependentProjectTest.getInjectionPointField(cdiDependentProject, INJECTIONS2_CLASS_PATH, "s"); + bs = cdiDependentProject.getBeans(false, p); + assertEquals(1, bs.size()); + } + + public void testMethodProducer() { + IInjectionPoint p = DependentProjectTest.getInjectionPointField(cdiProject, INJECTIONS_CLASS_PATH, "t1"); + Set<IBean> bs = cdiProject.getBeans(false, p); + assertEquals(1, bs.size()); + IBean b = bs.iterator().next(); + assertTrue(b instanceof IProducerMethod); + + //The same in dependent project + p = DependentProjectTest.getInjectionPointField(cdiDependentProject, INJECTIONS2_CLASS_PATH, "t1"); + bs = cdiDependentProject.getBeans(false, p); + assertEquals(1, bs.size()); + } + + public void testFieldProducer() { + IInjectionPoint p = DependentProjectTest.getInjectionPointField(cdiProject, INJECTIONS_CLASS_PATH, "t3"); + Set<IBean> bs = cdiProject.getBeans(false, p); + assertEquals(1, bs.size()); + IBean b = bs.iterator().next(); + assertTrue(b instanceof IProducerField); + + //The same in dependent project + p = DependentProjectTest.getInjectionPointField(cdiDependentProject, INJECTIONS2_CLASS_PATH, "t3"); + bs = cdiDependentProject.getBeans(false, p); + assertEquals(1, bs.size()); + } +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/ConfigBeansInjectionTest.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamBeansTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamBeansTest.java 2011-08-10 18:19:26 UTC (rev 33778) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamBeansTest.java 2011-08-10 18:31:00 UTC (rev 33779) @@ -81,6 +81,10 @@ public void testCreatingNewTrivialBean() throws CoreException, IOException { Set<IBean> beans = getBeansByClassName("org.jboss.beans.test01.MyBean3"); assertEquals(2, beans.size()); + + //The same in dependent project + beans = getBeansByClassNameInDependentProject("org.jboss.beans.test01.MyBean3"); + assertEquals(2, beans.size()); } /** @@ -97,6 +101,10 @@ public void testCreatingTwoNewTrivialBeans() throws CoreException, IOException { Set<IBean> beans = getBeansByClassName("org.jboss.beans.test01.MyBean4"); assertEquals(3, beans.size()); + + //The same in dependent project + beans = getBeansByClassNameInDependentProject("org.jboss.beans.test01.MyBean4"); + assertEquals(3, beans.size()); } /** @@ -124,6 +132,16 @@ "org.jboss.beans.test02.MyQualifier2"}); assertEquals(1, beans2.size()); assertTrue("Two sets should contain the same bean.", beans1.iterator().next() == beans2.iterator().next()); + + //The same in dependent project + beans1 = cdiDependentProject.getBeans(false, "org.jboss.beans.test02.MyBean1", + new String[]{"org.jboss.beans.test02.MyQualifier1"}); + assertEquals(1, beans1.size()); + beans2 = cdiDependentProject.getBeans(false, "org.jboss.beans.test02.MyBean1", + new String[]{"org.jboss.beans.test02.MyQualifier1", + "org.jboss.beans.test02.MyQualifier2"}); + assertEquals(1, beans2.size()); + assertTrue("Two sets should contain the same bean.", beans1.iterator().next() == beans2.iterator().next()); } /** @@ -146,6 +164,14 @@ Set<IBean> beans2 = cdiProject.getBeans(false, "org.jboss.beans.test02.MyBean2", new String[]{"org.jboss.beans.test02.MyQualifier2"}); assertEquals(1, beans2.size()); + + //The same in dependent project + beans1 = cdiDependentProject.getBeans(false, "org.jboss.beans.test02.MyBean2", + new String[]{"org.jboss.beans.test02.MyQualifier1"}); + assertTrue(beans1.isEmpty()); + beans2 = cdiDependentProject.getBeans(false, "org.jboss.beans.test02.MyBean2", + new String[]{"org.jboss.beans.test02.MyQualifier2"}); + assertEquals(1, beans2.size()); } /** @@ -169,6 +195,10 @@ public void testCreatingTwoNewQualifiedBeans() throws CoreException, IOException { Set<IBean> beans = getBeansByClassName("org.jboss.beans.test01.MyBean4"); assertEquals(3, beans.size()); + + //The same in dependent project + beans = getBeansByClassName("org.jboss.beans.test01.MyBean4"); + assertEquals(3, beans.size()); } /** @@ -188,6 +218,12 @@ assertEquals(1, beans1.size()); IBean b = beans1.iterator().next(); assertEquals("test03-1-b", b.getName()); + + //The same in dependent project + beans1 = cdiDependentProject.getBeans(false, "org.jboss.beans.test03.MyBean1"); + assertEquals(1, beans1.size()); + b = beans1.iterator().next(); + assertEquals("test03-1-b", b.getName()); } /** @@ -207,6 +243,12 @@ assertEquals(1, beans1.size()); IBean b = beans1.iterator().next(); assertEquals("test03-2-b", b.getName()); + + //The same in dependent project + beans1 = cdiDependentProject.getBeans(false, "org.jboss.beans.test03.MyBean2"); + assertEquals(1, beans1.size()); + b = beans1.iterator().next(); + assertEquals("test03-2-b", b.getName()); } /** @@ -232,6 +274,17 @@ assertTrue(names.contains("test03-3-a")); assertTrue(names.contains("test03-3-b")); assertTrue(names.contains("test03-3-c")); + + //The same in dependent project + beans = cdiDependentProject.getBeans(false, "org.jboss.beans.test03.MyBean3"); + assertEquals(3, beans.size()); + names = new HashSet<String>(); + for (IBean b: beans) { + names.add(b.getName()); + } + assertTrue(names.contains("test03-3-a")); + assertTrue(names.contains("test03-3-b")); + assertTrue(names.contains("test03-3-c")); } /** @@ -251,6 +304,12 @@ assertEquals(1, beans.size()); IBean b = beans.iterator().next(); assertTrue(b instanceof IProducerField); + + //The same in dependent project + beans = cdiDependentProject.getBeans(false, "org.jboss.beans.test04.MyType1"); + assertEquals(1, beans.size()); + b = beans.iterator().next(); + assertTrue(b instanceof IProducerField); } /** @@ -701,4 +760,8 @@ return cdiProject.getBeans(false, className, new String[0]); } + protected Set<IBean> getBeansByClassNameInDependentProject(String className) { + return cdiDependentProject.getBeans(false, className, new String[0]); + } + } Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamConfigTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamConfigTest.java 2011-08-10 18:19:26 UTC (rev 33778) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamConfigTest.java 2011-08-10 18:31:00 UTC (rev 33779) @@ -39,20 +39,28 @@ public class SeamConfigTest extends TestCase { protected static String PLUGIN_ID = "org.jboss.tools.cdi.seam.config.core.test"; protected static String PROJECT_NAME = "CDIConfigTest"; - protected static String PROJECT_PATH = "/projects/CDIConfigTest"; + protected static String PROJECT_PATH = "/projects/" + PROJECT_NAME; + protected static String DEPENDENT_PROJECT_NAME = "CDIDependentConfigTest"; + protected static String DEPENDENT_PROJECT_PATH = "/projects/" + DEPENDENT_PROJECT_NAME; + protected IProject project; protected ICDIProject cdiProject; + protected IProject dependentProject; + protected ICDIProject cdiDependentProject; + public SeamConfigTest() { project = getTestProject(); cdiProject = CDICorePlugin.getCDIProject(project, false); + dependentProject = getDependentTestProject(); + cdiDependentProject = CDICorePlugin.getCDIProject(dependentProject, false); } public IProject getTestProject() { if(project==null) { try { - project = findTestProject(); + project = findTestProject(PROJECT_NAME); if(project==null || !project.exists()) { project = ResourcesUtils.importProject(PLUGIN_ID, PROJECT_PATH); project.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, null); @@ -65,10 +73,26 @@ return project; } - public static IProject findTestProject() { - return ResourcesPlugin.getWorkspace().getRoot().getProject(PROJECT_NAME); + public IProject getDependentTestProject() { + if(dependentProject==null) { + try { + dependentProject = findTestProject(DEPENDENT_PROJECT_NAME); + if(dependentProject==null || !dependentProject.exists()) { + dependentProject = ResourcesUtils.importProject(PLUGIN_ID, DEPENDENT_PROJECT_PATH); + dependentProject.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, null); + } + } catch (Exception e) { + e.printStackTrace(); + fail("Can't import CDI test project: " + e.getMessage()); + } + } + return dependentProject; } + public static IProject findTestProject(String name) { + return ResourcesPlugin.getWorkspace().getRoot().getProject(name); + } + protected CDISeamConfigExtension getConfigExtension(ICDIProject cdi) { Set<IBuildParticipantFeature> bp = cdi.getNature().getExtensionManager().getBuildParticipantFeatures(); for (IBuildParticipantFeature p: bp) { Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamConfigTestSetup.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamConfigTestSetup.java 2011-08-10 18:19:26 UTC (rev 33778) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamConfigTestSetup.java 2011-08-10 18:31:00 UTC (rev 33779) @@ -25,6 +25,7 @@ public class SeamConfigTestSetup extends TestSetup { protected IProject project; + protected IProject dependentProject; public SeamConfigTestSetup(Test test) { super(test); @@ -37,6 +38,11 @@ project = ResourcesUtils.importProject(SeamConfigTest.PLUGIN_ID, SeamConfigTest.PROJECT_PATH); project.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, null); } + dependentProject = ResourcesPlugin.getWorkspace().getRoot().getProject(SeamConfigTest.DEPENDENT_PROJECT_NAME); + if(dependentProject == null || !dependentProject.exists()) { + dependentProject = ResourcesUtils.importProject(SeamConfigTest.PLUGIN_ID, SeamConfigTest.DEPENDENT_PROJECT_PATH); + dependentProject.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, null); + } } @Override