Author: scabanovich Date: 2011-11-01 20:39:43 -0400 (Tue, 01 Nov 2011) New Revision: 36125 Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest/src/org/jboss/defaultbean/Test21.java trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest2/ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest2/.classpath trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest2/.project trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest2/.settings/ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest2/.settings/org.eclipse.jdt.core.prefs trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest2/bin/ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest2/bin/org/ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest2/bin/org/jboss/ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest2/bin/org/jboss/defaultbean/ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest2/bin/org/jboss/defaultbean/Test2.class trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest2/bin/org/jboss/defaultbean/Town2.class trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest2/bin/resources/ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest2/bin/resources/ResourceTest.class trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest2/src/ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest2/src/org/ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest2/src/org/jboss/ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest2/src/org/jboss/defaultbean/ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest2/src/org/jboss/defaultbean/Test22.java trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/validation2/ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/validation2/Q.java trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/validation2/R.java trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/validation2/Test2.java trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/validation2/Test2.modified trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/validation2/Test2.original Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/DefaultBeanValidationTest.java trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/SeamSolderTest.java trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/SeamSolderTestSetup.java Log: JBIDE-9244 https://issues.jboss.org/browse/JBIDE-9244 Provided loading of validation context in dependent projects. Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest/src/org/jboss/defaultbean/Test21.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest/src/org/jboss/defaultbean/Test21.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest/src/org/jboss/defaultbean/Test21.java 2011-11-02 00:39:43 UTC (rev 36125) @@ -0,0 +1,16 @@ +package org.jboss.defaultbean; + +import javax.enterprise.inject.Produces; +import org.jboss.solder.bean.defaultbean.DefaultBean; +import org.jboss.defaultbean.validation2.*; + +public class Test21 { + @Produces + @DefaultBean(String.class) + @Q + @R + String getString() { + return ""; + } + +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest/src/org/jboss/defaultbean/Test21.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest2/.classpath =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest2/.classpath (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest2/.classpath 2011-11-02 00:39:43 UTC (rev 36125) @@ -0,0 +1,11 @@ +<?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="/CDISolderTest/lib/cdi-api.jar"/> + <classpathentry kind="lib" path="/CDISolderTest/lib/javax.inject.jar"/> + <classpathentry kind="lib" path="/CDISolderTest/lib/solder-api.jar"/> + <classpathentry kind="lib" path="/CDISolderTest/lib/solder-impl.jar"/> + <classpathentry combineaccessrules="false" kind="src" path="/CDISolderTest"/> + <classpathentry kind="output" path="bin"/> +</classpath> Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest2/.classpath ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest2/.project =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest2/.project (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest2/.project 2011-11-02 00:39:43 UTC (rev 36125) @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>CDIDependentSolderTest2</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.solder.core.test/projects/CDIDependentSolderTest2/.project ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest2/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest2/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest2/.settings/org.eclipse.jdt.core.prefs 2011-11-02 00:39:43 UTC (rev 36125) @@ -0,0 +1,12 @@ +#Tue Aug 09 10:58:56 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.solder.core.test/projects/CDIDependentSolderTest2/.settings/org.eclipse.jdt.core.prefs ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest2/bin/org/jboss/defaultbean/Test2.class =================================================================== (Binary files differ) Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest2/bin/org/jboss/defaultbean/Test2.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest2/bin/org/jboss/defaultbean/Town2.class =================================================================== (Binary files differ) Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest2/bin/org/jboss/defaultbean/Town2.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest2/bin/resources/ResourceTest.class =================================================================== (Binary files differ) Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest2/bin/resources/ResourceTest.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest2/src/org/jboss/defaultbean/Test22.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest2/src/org/jboss/defaultbean/Test22.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest2/src/org/jboss/defaultbean/Test22.java 2011-11-02 00:39:43 UTC (rev 36125) @@ -0,0 +1,16 @@ +package org.jboss.defaultbean; +import javax.enterprise.inject.Produces; + +import org.jboss.defaultbean.validation2.*; +import org.jboss.solder.bean.defaultbean.DefaultBean; + +public class Test22 { + @Produces + @DefaultBean(String.class) + @Q + @R + String getString() { + return ""; + } + +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest2/src/org/jboss/defaultbean/Test22.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/validation2/Q.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/validation2/Q.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/validation2/Q.java 2011-11-02 00:39:43 UTC (rev 36125) @@ -0,0 +1,21 @@ +package org.jboss.defaultbean.validation2; + +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 Q { + +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/validation2/Q.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/validation2/R.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/validation2/R.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/validation2/R.java 2011-11-02 00:39:43 UTC (rev 36125) @@ -0,0 +1,21 @@ +package org.jboss.defaultbean.validation2; + +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 R { + +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/validation2/R.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/validation2/Test2.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/validation2/Test2.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/validation2/Test2.java 2011-11-02 00:39:43 UTC (rev 36125) @@ -0,0 +1,16 @@ +package org.jboss.defaultbean.validation2; + +import javax.enterprise.inject.Produces; + +import org.jboss.solder.bean.defaultbean.DefaultBean; + +public class Test2 { + @Produces + @DefaultBean(String.class) + @Q + @R + String getString() { + return ""; + } + +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/validation2/Test2.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/validation2/Test2.modified =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/validation2/Test2.modified (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/validation2/Test2.modified 2011-11-02 00:39:43 UTC (rev 36125) @@ -0,0 +1,15 @@ +package org.jboss.defaultbean.validation2; + +import javax.enterprise.inject.Produces; + +import org.jboss.solder.bean.defaultbean.DefaultBean; + +public class Test2 { + @Produces + @DefaultBean(String.class) + @R + String getString() { + return ""; + } + +} Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/validation2/Test2.original =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/validation2/Test2.original (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/validation2/Test2.original 2011-11-02 00:39:43 UTC (rev 36125) @@ -0,0 +1,16 @@ +package org.jboss.defaultbean.validation2; + +import javax.enterprise.inject.Produces; + +import org.jboss.solder.bean.defaultbean.DefaultBean; + +public class Test2 { + @Produces + @DefaultBean(String.class) + @Q + @R + String getString() { + return ""; + } + +} Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/DefaultBeanValidationTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/DefaultBeanValidationTest.java 2011-11-02 00:38:42 UTC (rev 36124) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/DefaultBeanValidationTest.java 2011-11-02 00:39:43 UTC (rev 36125) @@ -61,4 +61,31 @@ AbstractResourceMarkerTest.assertMarkerIsCreated(file2, messageMask, 9); } + public void testIncrementalValidationForIdenticalDefaultBeans2() throws CoreException { + String messageMask = SeamSolderValidationMessages.IDENTICAL_DEFAULT_BEANS.substring(0, 50) + ".*"; + + String path11 = "src/org/jboss/defaultbean/Test21.java"; + String path12 = "src/org/jboss/defaultbean/Test22.java"; + String path2 = "src/org/jboss/defaultbean/validation2/Test2.java"; + String path2modified = "src/org/jboss/defaultbean/validation2/Test2.modified"; + String path2original = "src/org/jboss/defaultbean/validation2/Test2.original"; + + IFile file11 = getDependentTestProject().getFile(path11); + AbstractResourceMarkerTest.assertMarkerIsCreated(file11, messageMask, 9); + IFile file12 = getDependentTestProject2().getFile(path12); + AbstractResourceMarkerTest.assertMarkerIsCreated(file12, messageMask, 9); + IFile file2 = getTestProject().getFile(path2); + AbstractResourceMarkerTest.assertMarkerIsNotCreated(file2, messageMask); + + GenericBeanValidationTest.writeFile(getTestProject(), path2modified, path2); + AbstractResourceMarkerTest.assertMarkerIsNotCreated(file11, messageMask); + AbstractResourceMarkerTest.assertMarkerIsNotCreated(file12, messageMask); + AbstractResourceMarkerTest.assertMarkerIsNotCreated(file2, messageMask); + + GenericBeanValidationTest.writeFile(getTestProject(), path2original, path2); + AbstractResourceMarkerTest.assertMarkerIsCreated(file11, messageMask, 9); + AbstractResourceMarkerTest.assertMarkerIsCreated(file12, messageMask, 9); + AbstractResourceMarkerTest.assertMarkerIsNotCreated(file2, messageMask); + } + } \ No newline at end of file Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/SeamSolderTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/SeamSolderTest.java 2011-11-02 00:38:42 UTC (rev 36124) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/SeamSolderTest.java 2011-11-02 00:39:43 UTC (rev 36125) @@ -30,6 +30,8 @@ protected static String PROJECT_PATH = "/projects/CDISolderTest"; protected static String DEPENDENT_PROJECT_NAME = "CDIDependentSolderTest"; protected static String DEPENDENT_PROJECT_PATH = "/projects/CDIDependentSolderTest"; + protected static String DEPENDENT_PROJECT2_NAME = "CDIDependentSolderTest2"; + protected static String DEPENDENT_PROJECT2_PATH = "/projects/CDIDependentSolderTest2"; private ICDIProject cdiProject; private IProject project; @@ -37,6 +39,9 @@ private IProject dependentProject; private ICDIProject cdiDependentProject; + private IProject dependentProject2; + private ICDIProject cdiDependentProject2; + public IProject getTestProject() { if(cdiProject==null) { project = findTestProject(PROJECT_NAME); @@ -53,6 +58,14 @@ return dependentProject; } + public IProject getDependentTestProject2() { + if(cdiDependentProject2 == null) { + dependentProject2 = findTestProject(DEPENDENT_PROJECT2_NAME); + cdiDependentProject2 = CDICorePlugin.getCDIProject(dependentProject2, true); + } + return dependentProject2; + } + public ICDIProject getCDIProject() { if(cdiProject==null) { getTestProject(); @@ -67,6 +80,13 @@ return cdiDependentProject; } + public ICDIProject getDependentCDIProject2() { + if(cdiDependentProject2 == null) { + getDependentTestProject2(); + } + return cdiDependentProject2; + } + public static IProject findTestProject(String name) { return ResourcesPlugin.getWorkspace().getRoot().getProject(name); } Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/SeamSolderTestSetup.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/SeamSolderTestSetup.java 2011-11-02 00:38:42 UTC (rev 36124) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/SeamSolderTestSetup.java 2011-11-02 00:39:43 UTC (rev 36125) @@ -26,6 +26,7 @@ protected IProject project; protected IProject dependentProject; + protected IProject dependentProject2; public SeamSolderTestSetup(Test test) { super(test); @@ -43,6 +44,11 @@ dependentProject = ResourcesUtils.importProject(SeamSolderTest.PLUGIN_ID, SeamSolderTest.DEPENDENT_PROJECT_PATH); TestUtil._waitForValidation(dependentProject); } + dependentProject2 = ResourcesPlugin.getWorkspace().getRoot().getProject(SeamSolderTest.DEPENDENT_PROJECT2_NAME); + if(dependentProject2 == null || !dependentProject2.exists()) { + dependentProject2 = ResourcesUtils.importProject(SeamSolderTest.PLUGIN_ID, SeamSolderTest.DEPENDENT_PROJECT2_PATH); + TestUtil._waitForValidation(dependentProject2); + } } @Override @@ -50,6 +56,7 @@ boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false); project.delete(true, true, null); dependentProject.delete(true, true, null); + dependentProject2.delete(true, true, null); JobUtils.waitForIdle(); ResourcesUtils.setBuildAutomatically(saveAutoBuild); }