Author: akazakov Date: 2011-08-24 20:51:51 -0400 (Wed, 24 Aug 2011) New Revision: 34273 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/DependentProjectsTestSetup.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/extension/ExtensionsInSrsAndUsedProjectTest.java Log: https://issues.jboss.org/browse/JBIDE-9583 CDI validator doesn't validate project if it is a dependency of another not-CDI project 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 2011-08-25 00:46:40 UTC (rev 34272) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/DependentProjectTest.java 2011-08-25 00:51:51 UTC (rev 34273) @@ -32,7 +32,6 @@ import org.jboss.tools.jst.web.kb.IKbProject; import org.jboss.tools.jst.web.kb.KbProjectFactory; import org.jboss.tools.jst.web.kb.internal.KbProject; -import org.jboss.tools.test.util.JobUtils; import org.jboss.tools.test.util.ResourcesUtils; /** @@ -46,32 +45,13 @@ IProject project2 = null; IProject project3 = null; - public DependentProjectTest() { - project1 = getTestProject(project1, "/projects/CDITest1", "CDITest1"); - project2 = getTestProject(project2, "/projects/CDITest2", "CDITest2"); - project3 = getTestProject(project3, "/projects/CDITest3", "CDITest3"); + @Override + protected void setUp() throws Exception { + project1 = ResourcesPlugin.getWorkspace().getRoot().getProject("CDITest1"); + project2 = ResourcesPlugin.getWorkspace().getRoot().getProject("CDITest2"); + project3 = ResourcesPlugin.getWorkspace().getRoot().getProject("CDITest3"); } - public static IProject getTestProject(IProject project, String projectPath, String projectName) { - if(project==null) { - try { - project = findTestProject(projectName); - if(project==null || !project.exists()) { - project = ResourcesUtils.importProject(PLUGIN_ID, projectPath); - project.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, null); - } - } catch (Exception e) { - e.printStackTrace(); - fail("Can't import CDI test project: " + e.getMessage()); - } - } - return project; - } - - public static IProject findTestProject(String projectName) { - return ResourcesPlugin.getWorkspace().getRoot().getProject(projectName); - } - public void testProjectDependencyLoading() throws CoreException, IOException { IKbProject kb2 = KbProjectFactory.getKbProject(project2, true); ((KbProject)kb2).store(); @@ -125,7 +105,7 @@ scope2File.setContents(scope21File.getContents(), IFile.FORCE, new NullProgressMonitor()); project1.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, null); ResourcesUtils.setBuildAutomatically(saveAutoBuild); - + producer = getProducer("/CDITest2/src/test/Test1.java"); scope = producer.getScope(); ns = scope.getAnnotationDeclaration(CDIConstants.NORMAL_SCOPE_ANNOTATION_TYPE_NAME); @@ -327,18 +307,17 @@ CDICoreNature n3 = CDICorePlugin.getCDI(project3, true); assertTrue(n1.getDependentProjects().contains(n2)); assertTrue(n3.getCDIProjects().contains(n2)); - + CDIUtil.disableCDI(project2); - JobUtils.waitForIdle(); + project2.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, null); assertTrue(n1.getDependentProjects().isEmpty()); assertTrue(n3.getCDIProjects().isEmpty()); CDIUtil.enableCDI(project2, false, new NullProgressMonitor()); - JobUtils.waitForIdle(); + project2.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, null); n2 = CDICorePlugin.getCDI(project2, true); assertTrue(n1.getDependentProjects().contains(n2)); assertTrue(n3.getCDIProjects().contains(n2)); - } public void testCleanDependentProject() throws CoreException, IOException { Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/DependentProjectsTestSetup.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/DependentProjectsTestSetup.java 2011-08-25 00:46:40 UTC (rev 34272) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/DependentProjectsTestSetup.java 2011-08-25 00:51:51 UTC (rev 34273) @@ -10,12 +10,15 @@ ******************************************************************************/ package org.jboss.tools.cdi.core.test; +import java.io.IOException; +import java.lang.reflect.InvocationTargetException; + import junit.extensions.TestSetup; import junit.framework.Test; import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.core.resources.IncrementalProjectBuilder; +import org.eclipse.core.runtime.CoreException; import org.jboss.tools.test.util.JobUtils; import org.jboss.tools.test.util.ResourcesUtils; @@ -34,20 +37,24 @@ @Override protected void setUp() throws Exception { - project1 = DependentProjectTest.getTestProject(project1, "/projects/CDITest1", "CDITest1"); - project2 = DependentProjectTest.getTestProject(project2, "/projects/CDITest2", "CDITest2"); - project3 = DependentProjectTest.getTestProject(project3, "/projects/CDITest3", "CDITest3"); + project1 = getTestProject("/projects/CDITest1", "CDITest1"); + project2 = getTestProject("/projects/CDITest2", "CDITest2"); + project3 = getTestProject("/projects/CDITest3", "CDITest3"); } + private static IProject getTestProject(String projectPath, String projectName) throws IOException, CoreException, InvocationTargetException, InterruptedException { + IProject project = ResourcesUtils.importProject(PLUGIN_ID, projectPath); + project.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, null); + return project; + } + @Override 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); } - } \ No newline at end of file Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/extension/ExtensionsInSrsAndUsedProjectTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/extension/ExtensionsInSrsAndUsedProjectTest.java 2011-08-25 00:46:40 UTC (rev 34272) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/extension/ExtensionsInSrsAndUsedProjectTest.java 2011-08-25 00:51:51 UTC (rev 34273) @@ -1,12 +1,11 @@ package org.jboss.tools.cdi.core.test.extension; -import junit.extensions.TestSetup; import junit.framework.TestCase; import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.ResourcesPlugin; import org.jboss.tools.cdi.core.CDICoreNature; import org.jboss.tools.cdi.core.CDICorePlugin; -import org.jboss.tools.cdi.core.test.DependentProjectTest; public class ExtensionsInSrsAndUsedProjectTest extends TestCase { protected static String PLUGIN_ID = "org.jboss.tools.cdi.core.test"; @@ -14,10 +13,11 @@ IProject project2 = null; IProject project3 = null; - public ExtensionsInSrsAndUsedProjectTest() { - project1 = DependentProjectTest.getTestProject(project1, "/projects/CDITest1", "CDITest1"); - project2 = DependentProjectTest.getTestProject(project2, "/projects/CDITest2", "CDITest2"); - project3 = DependentProjectTest.getTestProject(project3, "/projects/CDITest3", "CDITest3"); + @Override + protected void setUp() throws Exception { + project1 = ResourcesPlugin.getWorkspace().getRoot().getProject("CDITest1"); + project2 = ResourcesPlugin.getWorkspace().getRoot().getProject("CDITest2"); + project3 = ResourcesPlugin.getWorkspace().getRoot().getProject("CDITest3"); } public void testRuntimes() { @@ -33,5 +33,4 @@ //Extension declared in src of project1 assertTrue(cdi3.getExtensionManager().isCDIExtensionAvailable("a.b.c")); } - -} +} \ No newline at end of file