[weld-commits] Weld SVN: r5602 - in cdi-tck/trunk/impl/src/main: resources/org/jboss/jsr299/tck/tests/implementation/simple/definition and 1 other directory.

Author: pete.muir(a)jboss.org Date: 2010-01-22 11:48:55 -0500 (Fri, 22 Jan 2010) New Revision: 5602 Added: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/EnterpriseBeanNotDiscoveredAsManagedBeanTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/EnterpriseBeanObserver.java cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/simple/definition/javax.enterprise.inject.spi.Extension Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanDefinitionTest.java Log: port CDITCK-93 to trunk Added: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/EnterpriseBeanNotDiscoveredAsManagedBeanTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/EnterpriseBeanNotDiscoveredAsManagedBeanTest.java (rev 0) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/EnterpriseBeanNotDiscoveredAsManagedBeanTest.java 2010-01-22 16:48:55 UTC (rev 5602) @@ -0,0 +1,26 @@ +package org.jboss.jsr299.tck.tests.implementation.simple.definition; + +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.IntegrationTest; +import org.jboss.testharness.impl.packaging.jsr299.Extension; +import org.testng.annotations.Test; + +@Artifact +@SpecVersion(spec="cdi", version="20091101") +(a)Extension(&quot;javax.enterprise.inject.spi.Extension&quot;) +@IntegrationTest +public class EnterpriseBeanNotDiscoveredAsManagedBeanTest extends AbstractJSR299Test +{ + + @Test + @SpecAssertion(section="3.1.1", id="f") + public void testClassesImplementingEnterpriseBeanInterfaceNotDiscoveredAsSimpleBean() + { + assert !EnterpriseBeanObserver.observedEnterpriseBean; + assert EnterpriseBeanObserver.observedAnotherBean; + } + +} Property changes on: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/EnterpriseBeanNotDiscoveredAsManagedBeanTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Added: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/EnterpriseBeanObserver.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/EnterpriseBeanObserver.java (rev 0) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/EnterpriseBeanObserver.java 2010-01-22 16:48:55 UTC (rev 5602) @@ -0,0 +1,23 @@ +package org.jboss.jsr299.tck.tests.implementation.simple.definition; + +import javax.enterprise.event.Observes; +import javax.enterprise.inject.spi.Extension; +import javax.enterprise.inject.spi.ProcessManagedBean; + +public class EnterpriseBeanObserver implements Extension +{ + + public static boolean observedEnterpriseBean; + public static boolean observedAnotherBean; + + public void observeAnotherBean(@Observes ProcessManagedBean<Sheep> event) + { + observedAnotherBean = true; + } + + public void observeEnterpriseBean(@Observes ProcessManagedBean<MockEnterpriseBean> event) + { + observedEnterpriseBean = true; + } + +} Property changes on: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/EnterpriseBeanObserver.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanDefinitionTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanDefinitionTest.java 2010-01-22 16:48:19 UTC (rev 5601) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanDefinitionTest.java 2010-01-22 16:48:55 UTC (rev 5602) @@ -62,14 +62,6 @@ assert getBeans(Car.class).size() == 0; } - @Test(groups = "broken") - // TODO The bean will be discovered, just not as a managed bean. This test is doesn't check that *at all* - @SpecAssertion(section="3.1.1", id="f") - public void testClassesImplementingEnterpriseBeanInterfaceNotDiscoveredAsSimpleBean() - { - assert getBeans(MockEnterpriseBean.class).size() == 0; - } - @Test @SpecAssertion(section="3.1.1", id="p") public void testSimpleBeanOnlyIfConstructorParameterless() Added: cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/simple/definition/javax.enterprise.inject.spi.Extension =================================================================== --- cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/simple/definition/javax.enterprise.inject.spi.Extension (rev 0) +++ cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/simple/definition/javax.enterprise.inject.spi.Extension 2010-01-22 16:48:55 UTC (rev 5602) @@ -0,0 +1 @@ +org.jboss.jsr299.tck.tests.implementation.simple.definition.EnterpriseBeanObserver