Author: pete.muir(a)jboss.org Date: 2009-10-05 14:25:00 -0400 (Mon, 05 Oct 2009) New Revision: 3859 Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/ExplicitConstructor.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/ExplicitConstructorSessionBean.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/SimpleBean.java Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/definitionError/ProcessObserverMethodErrorTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/exception/ProcessObserverMethodExceptionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/exception/ProcessObserverMethodObserver.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanICTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanDefinitionTest.java tck/trunk/impl/src/main/resources/tck-audit-cdi.xml Log: Change tests to jboss-as-broken, split out an assertion Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/definitionError/ProcessObserverMethodErrorTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/definitionError/ProcessObserverMethodErrorTest.java 2009-10-05 18:07:40 UTC (rev 3858) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/definitionError/ProcessObserverMethodErrorTest.java 2009-10-05 18:25:00 UTC (rev 3859) @@ -44,7 +44,7 @@ public class ProcessObserverMethodErrorTest extends AbstractJSR299Test { - @Test(groups = "ri-broken") + @Test(groups = "jboss-as-broken") @SpecAssertion(section = "11.5.9", id = "da") public void testAddDefinitionError() { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/exception/ProcessObserverMethodExceptionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/exception/ProcessObserverMethodExceptionTest.java 2009-10-05 18:07:40 UTC (rev 3858) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/exception/ProcessObserverMethodExceptionTest.java 2009-10-05 18:25:00 UTC (rev 3859) @@ -45,7 +45,7 @@ public class ProcessObserverMethodExceptionTest extends AbstractJSR299Test { - @Test(groups = "ri-broken") + @Test(groups = "jboss-as-broken") @SpecAssertion(section = "11.5.9", id = "db") public void testExceptionIsDefinitionError() { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/exception/ProcessObserverMethodObserver.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/exception/ProcessObserverMethodObserver.java 2009-10-05 18:07:40 UTC (rev 3858) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/exception/ProcessObserverMethodObserver.java 2009-10-05 18:25:00 UTC (rev 3859) @@ -8,6 +8,6 @@ { public void observeObserverMethodForEventC(@Observes ProcessObserverMethod<?, EventC> event) { - new RuntimeException("Definition error for EventC"); + throw new RuntimeException("Definition error for EventC"); } } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java 2009-10-05 18:07:40 UTC (rev 3858) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java 2009-10-05 18:25:00 UTC (rev 3859) @@ -34,6 +34,16 @@ assert getBeans(GiraffeLocal.class).size() == 1; assert getBeans(GiraffeLocal.class).iterator().next().getScope().equals(Dependent.class); } + + + @Test(groups = { "new", "jboss-as-broken" }) + @SpecAssertion(section = "3.7.1", id = "ab") + public void testConstructorAnnotatedInjectCalled() + { + ExplicitConstructor bean = getInstanceByType(ExplicitConstructor.class); + assert bean.getConstructorCalls() == 1; + assert bean.getInjectedSimpleBean() instanceof SimpleBean; + } @Test(groups = { "enterpriseBeans" }) @SpecAssertion(section = "3.2", id = "c") Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/ExplicitConstructor.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/ExplicitConstructor.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/ExplicitConstructor.java 2009-10-05 18:25:00 UTC (rev 3859) @@ -0,0 +1,14 @@ +package org.jboss.jsr299.tck.tests.implementation.enterprise.definition; + +import javax.ejb.Local; + +@Local +public interface ExplicitConstructor +{ + public int getConstructorCalls(); + public void setConstructorCalls(int numCalls); + + public SimpleBean getInjectedSimpleBean(); + public void setInjectedSimpleBean(SimpleBean injectedSimpleBean); + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/ExplicitConstructor.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/ExplicitConstructorSessionBean.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/ExplicitConstructorSessionBean.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/ExplicitConstructorSessionBean.java 2009-10-05 18:25:00 UTC (rev 3859) @@ -0,0 +1,52 @@ +package org.jboss.jsr299.tck.tests.implementation.enterprise.definition; + +import javax.ejb.Stateless; +import javax.enterprise.inject.New; +import javax.inject.Inject; + +import org.jboss.jsr299.tck.literals.NewLiteral; + +@Stateless +public class ExplicitConstructorSessionBean implements ExplicitConstructor +{ + + private static int constructorCalls = 0; + private static SimpleBean injectedSimpleBean; + + public static final New NEW = new NewLiteral() + { + + public Class<?> value() + { + return ExplicitConstructorSessionBean.class; + } + }; + + @Inject + public ExplicitConstructorSessionBean(SimpleBean bean) + { + constructorCalls++; + injectedSimpleBean = bean; + } + + public int getConstructorCalls() + { + return constructorCalls; + } + + public void setConstructorCalls(int numCalls) + { + constructorCalls = numCalls; + } + + public SimpleBean getInjectedSimpleBean() + { + return injectedSimpleBean; + } + + public void setInjectedSimpleBean(SimpleBean injectedSimpleBean) + { + ExplicitConstructorSessionBean.injectedSimpleBean = injectedSimpleBean; + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/ExplicitConstructorSessionBean.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/SimpleBean.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/SimpleBean.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/SimpleBean.java 2009-10-05 18:25:00 UTC (rev 3859) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.tests.implementation.enterprise.definition; + +class SimpleBean +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/SimpleBean.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanICTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanICTest.java 2009-10-05 18:07:40 UTC (rev 3858) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanICTest.java 2009-10-05 18:25:00 UTC (rev 3859) @@ -22,7 +22,7 @@ public class NewEnterpriseBeanICTest extends AbstractJSR299Test { - @Test(groups = { "new", "ri-broken" }) + @Test(groups = { "new", "jboss-as-broken" }) @SpecAssertion(section = "3.12", id = "l") public void testNewBeanHasSameConstructor() { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanDefinitionTest.java 2009-10-05 18:07:40 UTC (rev 3858) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanDefinitionTest.java 2009-10-05 18:25:00 UTC (rev 3859) @@ -70,7 +70,7 @@ } @Test - @SpecAssertion(section = "3.7.1", id = "a") + @SpecAssertion(section = "3.7.1", id = "aa") public void testInitializerAnnotatedConstructor() throws Exception { Sheep.constructedCorrectly = false; @@ -92,7 +92,7 @@ } @Test - @SpecAssertion(section = "3.7.1", id = "a") + @SpecAssertion(section = "3.7.1", id = "aa") public void testInitializerAnnotatedConstructorUsedOverEmptyConstuctor() throws Exception { getInstanceByType(Turkey.class); Modified: tck/trunk/impl/src/main/resources/tck-audit-cdi.xml =================================================================== --- tck/trunk/impl/src/main/resources/tck-audit-cdi.xml 2009-10-05 18:07:40 UTC (rev 3858) +++ tck/trunk/impl/src/main/resources/tck-audit-cdi.xml 2009-10-05 18:25:00 UTC (rev 3859) @@ -1229,14 +1229,21 @@ <section id="3.7" title="Bean constructors"> <assertion id="a"> - <text>When the container instantiates a managed bean, it calls the bean constructor. The bean constructor is a constructor of the bean class</text> + <text>When the container instantiates a bean, it calls the bean constructor. The bean constructor is a constructor of the bean class</text> </assertion> </section> <section id="3.7.1" title="Declaring a bean constructor"> - <assertion id="a"> + <group> <text>The bean constructor may be identified by annotating the constructor |@Inject|</text> - </assertion> + <assertion id="aa"> + <text>Test an @Inject constructor is used on a managed bean</text> + </assertion> + <assertion id="ab"> + <text>Test an @Inject constructor is used on a session bean</text> + </assertion> + </group> + <assertion id="ba"> <text>If a bean class does not explicitly declare a constructor using |@Inject|, the constructor that accepts no parameters is the bean constructor.</text>