Author: pete.muir(a)jboss.org Date: 2009-01-23 10:01:57 -0500 (Fri, 23 Jan 2009) New Revision: 1204 Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Lion.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Order.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Lion.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Tame.java Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/NewEnterpriseBeanTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/NewSimpleBeanTest.java Log: Test that new beans are created Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Lion.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Lion.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Lion.java 2009-01-23 15:01:57 UTC (rev 1204) @@ -0,0 +1,10 @@ +package org.jboss.webbeans.tck.unit.implementation.enterprise; + +import javax.ejb.Stateful; + +@Tame +@Stateful +class Lion +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Lion.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/NewEnterpriseBeanTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/NewEnterpriseBeanTest.java 2009-01-23 14:27:39 UTC (rev 1203) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/NewEnterpriseBeanTest.java 2009-01-23 15:01:57 UTC (rev 1204) @@ -3,11 +3,15 @@ import java.lang.annotation.Annotation; import java.util.Set; +import javax.webbeans.AnnotationLiteral; +import javax.webbeans.Current; import javax.webbeans.DefinitionException; import javax.webbeans.Dependent; +import javax.webbeans.New; import javax.webbeans.Standard; import javax.webbeans.manager.Bean; +import org.jboss.webbeans.literal.NewLiteral; import org.jboss.webbeans.tck.AbstractTest; import org.jboss.webbeans.tck.impl.SpecAssertion; import org.jboss.webbeans.tck.impl.SpecVersion; @@ -20,6 +24,8 @@ { private Bean<WrappedEnterpriseBean> newEnterpriseBean; + private static final Annotation TAME_LITERAL = new AnnotationLiteral<Tame>() {}; + @BeforeMethod public void initNewBean() { deployBeans(WrappedEnterpriseBean.class); @@ -367,5 +373,25 @@ assert false; } + @Test @SpecAssertion(section="3.2.5") + public void testForEachEnterpriseBeanANewBeanExists() + { + deployBeans(Order.class, Lion.class); + assert manager.resolveByType(Order.class).size() == 1; + assert manager.resolveByType(Order.class).iterator().next().getBindings().size() == 1; + assert manager.resolveByType(Order.class).iterator().next().getBindings().iterator().next().annotationType().equals(Current.class); + + assert manager.resolveByType(Order.class, new NewLiteral()).size() == 1; + assert manager.resolveByType(Order.class, new NewLiteral()).iterator().next().getBindings().size() == 1; + assert manager.resolveByType(Order.class, new NewLiteral()).iterator().next().getBindings().iterator().next().annotationType().equals(New.class); + + assert manager.resolveByType(Lion.class, TAME_LITERAL).size() == 1; + assert manager.resolveByType(Lion.class, TAME_LITERAL).iterator().next().getBindings().size() == 1; + assert manager.resolveByType(Lion.class, TAME_LITERAL).iterator().next().getBindings().iterator().next().annotationType().equals(Tame.class); + + assert manager.resolveByType(Lion.class, new NewLiteral()).size() == 1; + assert manager.resolveByType(Lion.class, new NewLiteral()).iterator().next().getBindings().size() == 1; + assert manager.resolveByType(Lion.class, new NewLiteral()).iterator().next().getBindings().iterator().next().annotationType().equals(New.class); + } } Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Order.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Order.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Order.java 2009-01-23 15:01:57 UTC (rev 1204) @@ -0,0 +1,11 @@ +package org.jboss.webbeans.tck.unit.implementation.enterprise; + +import javax.ejb.Stateful; +import javax.webbeans.Production; + +@Production +@Stateful +class Order +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Order.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Lion.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Lion.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Lion.java 2009-01-23 15:01:57 UTC (rev 1204) @@ -0,0 +1,7 @@ +package org.jboss.webbeans.tck.unit.implementation.simple; + +@Tame +class Lion +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Lion.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/NewSimpleBeanTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/NewSimpleBeanTest.java 2009-01-23 14:27:39 UTC (rev 1203) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/NewSimpleBeanTest.java 2009-01-23 15:01:57 UTC (rev 1204) @@ -3,11 +3,15 @@ import java.lang.annotation.Annotation; import java.util.Set; +import javax.webbeans.AnnotationLiteral; +import javax.webbeans.Current; import javax.webbeans.DefinitionException; import javax.webbeans.Dependent; +import javax.webbeans.New; import javax.webbeans.Standard; import javax.webbeans.manager.Bean; +import org.jboss.webbeans.literal.NewLiteral; import org.jboss.webbeans.tck.AbstractTest; import org.jboss.webbeans.tck.impl.SpecAssertion; import org.jboss.webbeans.tck.impl.SpecVersion; @@ -19,6 +23,8 @@ public class NewSimpleBeanTest extends AbstractTest { + private static final Annotation TAME_LITERAL = new AnnotationLiteral<Tame>() {}; + private Bean<WrappedSimpleBean> newSimpleBean; @BeforeMethod @@ -320,5 +326,26 @@ assert false; } + @Test @SpecAssertion(section="3.2.5") + public void testForEachSimpleBeanANewBeanExists() + { + deployBeans(Order.class, Lion.class); + assert manager.resolveByType(Order.class).size() == 1; + assert manager.resolveByType(Order.class).iterator().next().getBindings().size() == 1; + assert manager.resolveByType(Order.class).iterator().next().getBindings().iterator().next().annotationType().equals(Current.class); + + assert manager.resolveByType(Order.class, new NewLiteral()).size() == 1; + assert manager.resolveByType(Order.class, new NewLiteral()).iterator().next().getBindings().size() == 1; + assert manager.resolveByType(Order.class, new NewLiteral()).iterator().next().getBindings().iterator().next().annotationType().equals(New.class); + + assert manager.resolveByType(Lion.class, TAME_LITERAL).size() == 1; + assert manager.resolveByType(Lion.class, TAME_LITERAL).iterator().next().getBindings().size() == 1; + assert manager.resolveByType(Lion.class, TAME_LITERAL).iterator().next().getBindings().iterator().next().annotationType().equals(Tame.class); + + assert manager.resolveByType(Lion.class, new NewLiteral()).size() == 1; + assert manager.resolveByType(Lion.class, new NewLiteral()).iterator().next().getBindings().size() == 1; + assert manager.resolveByType(Lion.class, new NewLiteral()).iterator().next().getBindings().iterator().next().annotationType().equals(New.class); + } + } Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Tame.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Tame.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Tame.java 2009-01-23 15:01:57 UTC (rev 1204) @@ -0,0 +1,22 @@ +package org.jboss.webbeans.tck.unit.implementation.simple; + +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; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.webbeans.BindingType; + +@Target( { TYPE, METHOD, PARAMETER, FIELD }) +@Retention(RUNTIME) +@Documented +@BindingType +@interface Tame +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/Tame.java ___________________________________________________________________ Name: svn:mime-type + text/plain