Author: akazakov Date: 2010-12-24 17:34:36 -0500 (Fri, 24 Dec 2010) New Revision: 27729 Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest2/src/test/TestNormalScope.validation trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest2/src/test/TestScope.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest2/src/test/TestScope.validation trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest3/src/cdi/test3/TestBean3.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest4/ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest4/.classpath trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest4/.project trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest4/.settings/ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest4/.settings/org.eclipse.jdt.core.prefs trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest4/bin/ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest4/src/ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest4/src/cdi/ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest4/src/cdi/test4/ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest4/src/cdi/test4/TestBean4.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest5/ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest5/.classpath trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest5/.project trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest5/.settings/ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest5/.settings/org.eclipse.jdt.core.prefs trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest5/bin/ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest5/src/ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest5/src/cdi/ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest5/src/cdi/test5/ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest5/src/cdi/test5/TestBean5.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DependentProjectValidationTest.java Removed: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/bin/cdi/ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest3/bin/cdi/ Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/DependentProjectTest.java Log: https://issues.jboss.org/browse/JBIDE-7946 Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest2/src/test/TestNormalScope.validation =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest2/src/test/TestNormalScope.validation (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest2/src/test/TestNormalScope.validation 2010-12-24 22:34:36 UTC (rev 27729) @@ -0,0 +1,22 @@ +package test; + +import java.lang.annotation.Documented; +import java.lang.annotation.Inherited; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.enterprise.context.NormalScope; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +@NormalScope +@Inherited +@Target({ TYPE, METHOD, FIELD }) +@Retention(RUNTIME) +@Documented +public @interface TestScope { + +} \ No newline at end of file Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest2/src/test/TestScope.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest2/src/test/TestScope.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest2/src/test/TestScope.java 2010-12-24 22:34:36 UTC (rev 27729) @@ -0,0 +1,22 @@ +package test; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Inherited; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.inject.Scope; + +@Scope +@Inherited +@Target({ TYPE, METHOD, FIELD }) +@Retention(RUNTIME) +@Documented +public @interface TestScope { + +} \ No newline at end of file Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest2/src/test/TestScope.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest2/src/test/TestScope.validation =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest2/src/test/TestScope.validation (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest2/src/test/TestScope.validation 2010-12-24 22:34:36 UTC (rev 27729) @@ -0,0 +1,22 @@ +package test; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Inherited; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.inject.Scope; + +@Scope +@Inherited +@Target({ TYPE, METHOD, FIELD }) +@Retention(RUNTIME) +@Documented +public @interface TestScope { + +} \ No newline at end of file Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest3/src/cdi/test3/TestBean3.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest3/src/cdi/test3/TestBean3.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest3/src/cdi/test3/TestBean3.java 2010-12-24 22:34:36 UTC (rev 27729) @@ -0,0 +1,16 @@ +package cdi.test3; + +import javax.enterprise.inject.Produces; +import javax.inject.Inject; + +import test.TestScope; + +public class TestBean3 { + + @Inject boolean test; + + @TestScope + @Produces boolean foo() { + return true; + } +} \ No newline at end of file Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest3/src/cdi/test3/TestBean3.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest4/.classpath =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest4/.classpath (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest4/.classpath 2010-12-24 22:34:36 UTC (rev 27729) @@ -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" exported="true" kind="src" path="/CDITest2"/> + <classpathentry kind="output" path="bin"/> +</classpath> Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest4/.classpath ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest4/.project =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest4/.project (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest4/.project 2010-12-24 22:34:36 UTC (rev 27729) @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>CDITest4</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/CDITest4/.project ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest4/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest4/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest4/.settings/org.eclipse.jdt.core.prefs 2010-12-24 22:34:36 UTC (rev 27729) @@ -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/CDITest4/.settings/org.eclipse.jdt.core.prefs ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest4/src/cdi/test4/TestBean4.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest4/src/cdi/test4/TestBean4.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest4/src/cdi/test4/TestBean4.java 2010-12-24 22:34:36 UTC (rev 27729) @@ -0,0 +1,16 @@ +package cdi.test4; + +import javax.enterprise.inject.Produces; +import javax.inject.Inject; + +import test.TestScope; + +public class TestBean4 { + + @Inject int test; + + @TestScope + @Produces int foo() { + return 0; + } +} \ No newline at end of file Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest4/src/cdi/test4/TestBean4.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest5/.classpath =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest5/.classpath (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest5/.classpath 2010-12-24 22:34:36 UTC (rev 27729) @@ -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="/CDITest4"/> + <classpathentry kind="output" path="bin"/> +</classpath> Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest5/.classpath ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest5/.project =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest5/.project (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest5/.project 2010-12-24 22:34:36 UTC (rev 27729) @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>CDITest5</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/CDITest5/.project ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest5/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest5/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest5/.settings/org.eclipse.jdt.core.prefs 2010-12-24 22:34:36 UTC (rev 27729) @@ -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/CDITest5/.settings/org.eclipse.jdt.core.prefs ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest5/src/cdi/test5/TestBean5.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest5/src/cdi/test5/TestBean5.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest5/src/cdi/test5/TestBean5.java 2010-12-24 22:34:36 UTC (rev 27729) @@ -0,0 +1,16 @@ +package cdi.test5; + +import javax.enterprise.inject.Produces; +import javax.inject.Inject; + +import test.TestScope; + +public class TestBean5 { + + @Inject boolean test; + + @TestScope + @Produces boolean foo() { + return true; + } +} \ No newline at end of file Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest5/src/cdi/test5/TestBean5.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java 2010-12-24 21:18:57 UTC (rev 27728) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java 2010-12-24 22:34:36 UTC (rev 27729) @@ -44,6 +44,7 @@ import org.jboss.tools.cdi.core.test.tck.validation.BeansXmlValidationTest; import org.jboss.tools.cdi.core.test.tck.validation.CoreValidationTest; import org.jboss.tools.cdi.core.test.tck.validation.DefenitionErrorsValidationTest; +import org.jboss.tools.cdi.core.test.tck.validation.DependentProjectValidationTest; import org.jboss.tools.cdi.core.test.tck.validation.DeploymentProblemsValidationTests; /** @@ -93,6 +94,7 @@ suiteAll.addTestSuite(DependentProjectTest.class); suiteAll.addTestSuite(EnableCDISupportForWarTest.class); suiteAll.addTestSuite(EnableCDISupportForJarTest.class); + suiteAll.addTestSuite(DependentProjectValidationTest.class); suiteAll.addTest(new CDICoreTestSetup(suite)); return suiteAll; 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-24 21:18:57 UTC (rev 27728) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/DependentProjectTest.java 2010-12-24 22:34:36 UTC (rev 27729) @@ -150,5 +150,4 @@ JobUtils.waitForIdle(); ResourcesUtils.setBuildAutomatically(saveAutoBuild); } - -} +} \ No newline at end of file Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DependentProjectValidationTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DependentProjectValidationTest.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DependentProjectValidationTest.java 2010-12-24 22:34:36 UTC (rev 27729) @@ -0,0 +1,122 @@ +/******************************************************************************* + * Copyright (c) 2010 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.cdi.core.test.tck.validation; + +import java.io.IOException; +import java.text.MessageFormat; + +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.resources.IncrementalProjectBuilder; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.core.runtime.Path; +import org.jboss.tools.cdi.internal.core.validation.CDIValidationMessages; +import org.jboss.tools.test.util.JobUtils; +import org.jboss.tools.test.util.ResourcesUtils; + +/** + * @author Alexey Kazakov + */ +public class DependentProjectValidationTest extends ValidationTest { + + protected static String PLUGIN_ID = "org.jboss.tools.cdi.core.test"; + + IProject project1 = null; + IProject project2 = null; + IProject project3 = null; + IProject project4 = null; + IProject project5 = null; + + public void setUp() throws Exception { + project1 = ResourcesUtils.importProject(PLUGIN_ID, "/projects/CDITest1"); + project1.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor()); + JobUtils.waitForIdle(); + + 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(); + + project4 = ResourcesUtils.importProject(PLUGIN_ID, "/projects/CDITest4"); + project4.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor()); + JobUtils.waitForIdle(); + + project5 = ResourcesUtils.importProject(PLUGIN_ID, "/projects/CDITest5"); + project5.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor()); + JobUtils.waitForIdle(); + } + + public void testDependentProjects() throws CoreException, IOException { + boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false); + JobUtils.waitForIdle(); + + IFile testBean3 = project3.getFile("src/cdi/test3/TestBean3.java"); + assertMarkerIsNotCreated(testBean3, MessageFormat.format(CDIValidationMessages.UNPROXYABLE_BEAN_PRIMITIVE_TYPE, "boolean", "TestBean3.foo()"), 10); + + IFile testBean4 = project4.getFile("src/cdi/test4/TestBean4.java"); + assertMarkerIsNotCreated(testBean4, MessageFormat.format(CDIValidationMessages.UNPROXYABLE_BEAN_PRIMITIVE_TYPE, "int", "TestBean4.foo()"), 10); + + IFile testBean5 = project5.getFile("src/cdi/test5/TestBean5.java"); + assertMarkerIsNotCreated(testBean5, MessageFormat.format(CDIValidationMessages.UNPROXYABLE_BEAN_PRIMITIVE_TYPE, "boolean", "TestBean5.foo()"), 10); + + IFile scope = project2.getFile(new Path("src/test/TestScope.java")); + IFile normalScope = project2.getFile(new Path("src/test/TestNormalScope.validation")); + scope.setContents(normalScope.getContents(), IFile.FORCE, new NullProgressMonitor()); + JobUtils.waitForIdle(); + project2.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new NullProgressMonitor()); + JobUtils.waitForIdle(); + + testBean3 = project3.getFile("src/cdi/test3/TestBean3.java"); + assertMarkerIsCreated(testBean3, MessageFormat.format(CDIValidationMessages.UNPROXYABLE_BEAN_PRIMITIVE_TYPE, "boolean", "TestBean3.foo()"), 10); + + testBean4 = project4.getFile("src/cdi/test4/TestBean4.java"); + assertMarkerIsCreated(testBean4, MessageFormat.format(CDIValidationMessages.UNPROXYABLE_BEAN_PRIMITIVE_TYPE, "int", "TestBean4.foo()"), 10); + + testBean5 = project5.getFile("src/cdi/test5/TestBean5.java"); + assertMarkerIsCreated(testBean5, MessageFormat.format(CDIValidationMessages.UNPROXYABLE_BEAN_PRIMITIVE_TYPE, "boolean", "TestBean5.foo()"), 10); + + normalScope = project2.getFile(new Path("src/test/TestScope.java")); + scope = project2.getFile(new Path("src/test/TestScope.validation")); + normalScope.setContents(scope.getContents(), IFile.FORCE, new NullProgressMonitor()); + JobUtils.waitForIdle(); + project2.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new NullProgressMonitor()); + JobUtils.waitForIdle(); + + testBean3 = project3.getFile("src/cdi/test3/TestBean3.java"); + assertMarkerIsNotCreated(testBean3, MessageFormat.format(CDIValidationMessages.UNPROXYABLE_BEAN_PRIMITIVE_TYPE, "boolean", "TestBean3.foo()"), 10); + + testBean4 = project4.getFile("src/cdi/test4/TestBean4.java"); + assertMarkerIsNotCreated(testBean4, MessageFormat.format(CDIValidationMessages.UNPROXYABLE_BEAN_PRIMITIVE_TYPE, "int", "TestBean4.foo()"), 10); + + testBean5 = project5.getFile("src/cdi/test5/TestBean5.java"); + assertMarkerIsNotCreated(testBean5, MessageFormat.format(CDIValidationMessages.UNPROXYABLE_BEAN_PRIMITIVE_TYPE, "boolean", "TestBean5.foo()"), 10); + + ResourcesUtils.setBuildAutomatically(saveAutoBuild); + JobUtils.waitForIdle(); + } + + 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); + project4.delete(true, true, null); + project5.delete(true, true, null); + JobUtils.waitForIdle(); + ResourcesUtils.setBuildAutomatically(saveAutoBuild); + } +} \ No newline at end of file Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DependentProjectValidationTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain