Author: pete.muir(a)jboss.org Date: 2009-02-22 18:54:59 -0500 (Sun, 22 Feb 2009) New Revision: 1652 Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/newSimpleBean/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/newSimpleBean/Lion.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/newSimpleBean/NewSimpleBeanTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/newSimpleBean/Order.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/newSimpleBean/Tame.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/newSimpleBean/WrappedSimpleBean.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/newSimpleBean/newAndOtherBindingType/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/newSimpleBean/newAndOtherBindingType/NewAndOtherBindingTypeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/newSimpleBean/newAndOtherBindingType/NewAndOtherBindingType_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/newSimpleBean/newAndOtherBindingType/WrappedSimpleBean.java Removed: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/NewSimpleBeanTest.java Log: @Artifactify Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/NewSimpleBeanTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/NewSimpleBeanTest.java 2009-02-22 23:29:25 UTC (rev 1651) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/NewSimpleBeanTest.java 2009-02-22 23:54:59 UTC (rev 1652) @@ -1,174 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.simple; - -import java.lang.annotation.Annotation; -import java.lang.annotation.ElementType; -import java.lang.annotation.Target; -import java.util.Set; - -import javax.context.Dependent; -import javax.inject.AnnotationLiteral; -import javax.inject.Current; -import javax.inject.DefinitionException; -import javax.inject.New; -import javax.inject.Standard; -import javax.inject.manager.Bean; - -import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.literals.NewLiteral; -import org.testng.annotations.BeforeMethod; -import org.testng.annotations.Test; - -/** - * - * Spec version: PRD2 - * - */ -public class NewSimpleBeanTest extends AbstractDeclarativeTest -{ - - private static final Annotation TAME_LITERAL = new AnnotationLiteral<Tame>() - { - }; - - private Bean<WrappedSimpleBean> newSimpleBean; - - @BeforeMethod - public void initNewBean() - { - deployBeans(WrappedSimpleBean.class); - Set<Bean<WrappedSimpleBean>> beans = getCurrentManager().resolveByType(WrappedSimpleBean.class, new NewLiteral()); - assert beans.size() == 1; - newSimpleBean = beans.iterator().next(); - } - - @Test(groups = { "new" }) - @SpecAssertion(section = "3.2.5", id = "d") - public void testNewBeanIsDependentScoped() - { - assert Dependent.class.equals(newSimpleBean.getScopeType()); - } - - @Test(groups = { "new" }) - @SpecAssertion(section = "3.2.5", id = "e") - public void testNewBeanIsOfStandardDeploymentType() - { - assert Standard.class.equals(newSimpleBean.getDeploymentType()); - } - - @Test(groups = { "new" }) - @SpecAssertion(section = "3.2.5", id = "f") - public void testNewBeanHasOnlyNewBinding() - { - assert newSimpleBean.getBindings().size() == 1; - assert newSimpleBean.getBindings().iterator().next().annotationType().equals(new NewLiteral().annotationType()); - } - - @Test(groups = { "new" }) - @SpecAssertion(section = "3.2.5", id = "g") - public void testNewBeanHasNoWebBeanName() - { - assert newSimpleBean.getName() == null; - } - - @Test(groups = { "stub", "new" }) - @SpecAssertion(section = "3.2.5", id = "h") - public void testNewBeanHasNoStereotypes() - { - assert false; - } - - @Test(groups = { "new", "stub" }) - @SpecAssertion(section = "3.2.5", id = "i") - public void testNewBeanHasNoObservers() - { - assert false; - } - - @Test(groups = { "new", "stub" }) - @SpecAssertion(section = "3.2.5", id = "k") - public void testNewBeanHasNoProducerFields() - { - assert false; - } - - @Test(groups = { "new", "stub" }) - @SpecAssertion(section = "3.2.5", id = "j") - public void testNewBeanHasNoProducerMethods() - { - assert false; - } - - @Test(groups = { "new", "underInvestigation" }) - @SpecAssertion(section = "3.2.5", id = "l") - public void testNewBeanHasNoDisposalMethods() - { - // Class<?> type = - // TypeInfo.ofTypes(newSimpleBean.getTypes()).getSuperClass(); - // assert manager.resolveDisposalMethods(type, - // newSimpleBean.getBindings().toArray(new Annotation[0])).isEmpty(); - assert false; - } - - @Test(groups = { "stub", "new" }) - @SpecAssertion(section = "3.2.5", id = "c") - public void testNewBeanHasSameInterceptorMethodsAsWrappedBean() - { - assert false; - } - - /** - * If the @New binding type appears in conjunction with some other binding - * type, or is specified for a field or parameter of a type which does not - * satisfy the definition of a simple Web Bean implementation class or - * enterprise Web Bean implementation class, a DefinitionException is thrown - * by the container at deployment time. - * TODO This is not defined behavior in the spec in section 3.2.5 - */ - @Test(groups = { "new" }, expectedExceptions = DefinitionException.class) - @SpecAssertion(section = "review", id = "review") - public void testNewAnnotationCannotAppearInConjunctionWithOtherBindingType() - { - deployBeans(NewAndOtherBindingType_Broken.class); - } - - /** - * No Web Bean defined using annotations or XML may explicitly declare @New - * as a binding type - */ - @Test(groups = { "new" }) - @SpecAssertion(section = "review", id = "review") - public void testNewAnnotationCannotBeExplicitlyDeclared() - { - // All we can really do is make sure the annotation itself - // prevents the compiler from violating the assertion - Target target = New.class.getAnnotation(Target.class); - for (ElementType elementType : target.value()) - { - assert !elementType.equals(ElementType.TYPE); - } - } - - @Test - @SpecAssertion(section = "3.2.5", id = "a") - public void testForEachSimpleBeanANewBeanExists() - { - deployBeans(Order.class, Lion.class); - assert getCurrentManager().resolveByType(Order.class).size() == 1; - assert getCurrentManager().resolveByType(Order.class).iterator().next().getBindings().size() == 1; - assert getCurrentManager().resolveByType(Order.class).iterator().next().getBindings().iterator().next().annotationType().equals(Current.class); - - assert getCurrentManager().resolveByType(Order.class, new NewLiteral()).size() == 1; - assert getCurrentManager().resolveByType(Order.class, new NewLiteral()).iterator().next().getBindings().size() == 1; - assert getCurrentManager().resolveByType(Order.class, new NewLiteral()).iterator().next().getBindings().iterator().next().annotationType().equals(New.class); - - assert getCurrentManager().resolveByType(Lion.class, TAME_LITERAL).size() == 1; - assert getCurrentManager().resolveByType(Lion.class, TAME_LITERAL).iterator().next().getBindings().size() == 1; - assert getCurrentManager().resolveByType(Lion.class, TAME_LITERAL).iterator().next().getBindings().iterator().next().annotationType().equals(Tame.class); - - assert getCurrentManager().resolveByType(Lion.class, new NewLiteral()).size() == 1; - assert getCurrentManager().resolveByType(Lion.class, new NewLiteral()).iterator().next().getBindings().size() == 1; - assert getCurrentManager().resolveByType(Lion.class, new NewLiteral()).iterator().next().getBindings().iterator().next().annotationType().equals(New.class); - } - -} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/newSimpleBean/Lion.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/newSimpleBean/Lion.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/newSimpleBean/Lion.java 2009-02-22 23:54:59 UTC (rev 1652) @@ -0,0 +1,7 @@ +package org.jboss.jsr299.tck.unit.implementation.simple.newSimpleBean; + +@Tame +class Lion +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/newSimpleBean/Lion.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/newSimpleBean/NewSimpleBeanTest.java (from rev 1635, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/NewSimpleBeanTest.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/newSimpleBean/NewSimpleBeanTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/newSimpleBean/NewSimpleBeanTest.java 2009-02-22 23:54:59 UTC (rev 1652) @@ -0,0 +1,155 @@ +package org.jboss.jsr299.tck.unit.implementation.simple.newSimpleBean; + +import java.lang.annotation.Annotation; +import java.lang.annotation.ElementType; +import java.lang.annotation.Target; +import java.util.Set; + +import javax.context.Dependent; +import javax.inject.AnnotationLiteral; +import javax.inject.Current; +import javax.inject.New; +import javax.inject.Standard; +import javax.inject.manager.Bean; + +import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.jsr299.tck.AbstractDeclarativeTest; +import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.literals.NewLiteral; +import org.testng.annotations.Test; + +/** + * + * Spec version: PRD2 + * + */ +@Artifact +public class NewSimpleBeanTest extends AbstractDeclarativeTest +{ + + private static final Annotation TAME_LITERAL = new AnnotationLiteral<Tame>() + { + }; + + @Test(groups = { "new" }) + @SpecAssertion(section = "3.2.5", id = "d") + public void testNewBeanIsDependentScoped() + { + Set<Bean<WrappedSimpleBean>> beans = getCurrentManager().resolveByType(WrappedSimpleBean.class, new NewLiteral()); + assert beans.size() == 1; + Bean<WrappedSimpleBean> newSimpleBean = beans.iterator().next(); + assert Dependent.class.equals(newSimpleBean.getScopeType()); + } + + @Test(groups = { "new" }) + @SpecAssertion(section = "3.2.5", id = "e") + public void testNewBeanIsOfStandardDeploymentType() + { + Set<Bean<WrappedSimpleBean>> beans = getCurrentManager().resolveByType(WrappedSimpleBean.class, new NewLiteral()); + assert beans.size() == 1; + Bean<WrappedSimpleBean> newSimpleBean = beans.iterator().next(); + assert Standard.class.equals(newSimpleBean.getDeploymentType()); + } + + @Test(groups = { "new" }) + @SpecAssertion(section = "3.2.5", id = "f") + public void testNewBeanHasOnlyNewBinding() + { + Set<Bean<WrappedSimpleBean>> beans = getCurrentManager().resolveByType(WrappedSimpleBean.class, new NewLiteral()); + assert beans.size() == 1; + Bean<WrappedSimpleBean> newSimpleBean = beans.iterator().next(); + assert newSimpleBean.getBindings().size() == 1; + assert newSimpleBean.getBindings().iterator().next().annotationType().equals(new NewLiteral().annotationType()); + } + + @Test(groups = { "new" }) + @SpecAssertion(section = "3.2.5", id = "g") + public void testNewBeanHasNoWebBeanName() + { + Set<Bean<WrappedSimpleBean>> beans = getCurrentManager().resolveByType(WrappedSimpleBean.class, new NewLiteral()); + assert beans.size() == 1; + Bean<WrappedSimpleBean> newSimpleBean = beans.iterator().next(); + assert newSimpleBean.getName() == null; + } + + @Test(groups = { "stub", "new" }) + @SpecAssertion(section = "3.2.5", id = "h") + public void testNewBeanHasNoStereotypes() + { + assert false; + } + + @Test(groups = { "new", "stub" }) + @SpecAssertion(section = "3.2.5", id = "i") + public void testNewBeanHasNoObservers() + { + assert false; + } + + @Test(groups = { "new", "stub" }) + @SpecAssertion(section = "3.2.5", id = "k") + public void testNewBeanHasNoProducerFields() + { + assert false; + } + + @Test(groups = { "new", "stub" }) + @SpecAssertion(section = "3.2.5", id = "j") + public void testNewBeanHasNoProducerMethods() + { + assert false; + } + + @Test(groups = { "new", "underInvestigation" }) + @SpecAssertion(section = "3.2.5", id = "l") + public void testNewBeanHasNoDisposalMethods() + { + // Class<?> type = + // TypeInfo.ofTypes(newSimpleBean.getTypes()).getSuperClass(); + // assert manager.resolveDisposalMethods(type, + // newSimpleBean.getBindings().toArray(new Annotation[0])).isEmpty(); + assert false; + } + + @Test(groups = { "stub", "new" }) + @SpecAssertion(section = "3.2.5", id = "c") + public void testNewBeanHasSameInterceptorMethodsAsWrappedBean() + { + assert false; + } + + @Test(groups = { "new" }) + @SpecAssertion(section = "review", id = "review") + public void testNewAnnotationCannotBeExplicitlyDeclared() + { + // All we can really do is make sure the annotation itself + // prevents the compiler from violating the assertion + Target target = New.class.getAnnotation(Target.class); + for (ElementType elementType : target.value()) + { + assert !elementType.equals(ElementType.TYPE); + } + } + + @Test + @SpecAssertion(section = "3.2.5", id = "a") + public void testForEachSimpleBeanANewBeanExists() + { + assert getCurrentManager().resolveByType(Order.class).size() == 1; + assert getCurrentManager().resolveByType(Order.class).iterator().next().getBindings().size() == 1; + assert getCurrentManager().resolveByType(Order.class).iterator().next().getBindings().iterator().next().annotationType().equals(Current.class); + + assert getCurrentManager().resolveByType(Order.class, new NewLiteral()).size() == 1; + assert getCurrentManager().resolveByType(Order.class, new NewLiteral()).iterator().next().getBindings().size() == 1; + assert getCurrentManager().resolveByType(Order.class, new NewLiteral()).iterator().next().getBindings().iterator().next().annotationType().equals(New.class); + + assert getCurrentManager().resolveByType(Lion.class, TAME_LITERAL).size() == 1; + assert getCurrentManager().resolveByType(Lion.class, TAME_LITERAL).iterator().next().getBindings().size() == 1; + assert getCurrentManager().resolveByType(Lion.class, TAME_LITERAL).iterator().next().getBindings().iterator().next().annotationType().equals(Tame.class); + + assert getCurrentManager().resolveByType(Lion.class, new NewLiteral()).size() == 1; + assert getCurrentManager().resolveByType(Lion.class, new NewLiteral()).iterator().next().getBindings().size() == 1; + assert getCurrentManager().resolveByType(Lion.class, new NewLiteral()).iterator().next().getBindings().iterator().next().annotationType().equals(New.class); + } + +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/newSimpleBean/Order.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/newSimpleBean/Order.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/newSimpleBean/Order.java 2009-02-22 23:54:59 UTC (rev 1652) @@ -0,0 +1,11 @@ +package org.jboss.jsr299.tck.unit.implementation.simple.newSimpleBean; + +import javax.inject.Production; + +@Production +class Order +{ + + public static boolean constructed = true; + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/newSimpleBean/Order.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/newSimpleBean/Tame.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/newSimpleBean/Tame.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/newSimpleBean/Tame.java 2009-02-22 23:54:59 UTC (rev 1652) @@ -0,0 +1,22 @@ +package org.jboss.jsr299.tck.unit.implementation.simple.newSimpleBean; + +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.inject.BindingType; + +@Target( { TYPE, METHOD, PARAMETER, FIELD }) +@Retention(RUNTIME) +@Documented +@BindingType +@interface Tame +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/newSimpleBean/Tame.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/newSimpleBean/WrappedSimpleBean.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/newSimpleBean/WrappedSimpleBean.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/newSimpleBean/WrappedSimpleBean.java 2009-02-22 23:54:59 UTC (rev 1652) @@ -0,0 +1,15 @@ +package org.jboss.jsr299.tck.unit.implementation.simple.newSimpleBean; + +import java.io.Serializable; + +import javax.annotation.Named; +import javax.context.SessionScoped; + +@SessionScoped +@Named("Fred") +class WrappedSimpleBean implements Serializable +{ + public WrappedSimpleBean() { + + } +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/newSimpleBean/WrappedSimpleBean.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/newSimpleBean/newAndOtherBindingType/NewAndOtherBindingTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/newSimpleBean/newAndOtherBindingType/NewAndOtherBindingTypeTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/newSimpleBean/newAndOtherBindingType/NewAndOtherBindingTypeTest.java 2009-02-22 23:54:59 UTC (rev 1652) @@ -0,0 +1,23 @@ +package org.jboss.jsr299.tck.unit.implementation.simple.newSimpleBean.newAndOtherBindingType; + +import javax.inject.DefinitionException; + +import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.jsr299.tck.AbstractDeclarativeTest; +import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; +import org.testng.annotations.Test; + +@Artifact +(a)ExpectedDeploymentException(DefinitionException.class) +public class NewAndOtherBindingTypeTest extends AbstractDeclarativeTest +{ + + @Test(groups = { "new" }) + @SpecAssertion(section = "review", id = "review") + public void testNewAnnotationCannotAppearInConjunctionWithOtherBindingType() + { + assert false; + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/newSimpleBean/newAndOtherBindingType/NewAndOtherBindingTypeTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/newSimpleBean/newAndOtherBindingType/NewAndOtherBindingType_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/newSimpleBean/newAndOtherBindingType/NewAndOtherBindingType_Broken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/newSimpleBean/newAndOtherBindingType/NewAndOtherBindingType_Broken.java 2009-02-22 23:54:59 UTC (rev 1652) @@ -0,0 +1,9 @@ +package org.jboss.jsr299.tck.unit.implementation.simple.newSimpleBean.newAndOtherBindingType; + +import javax.inject.Current; +import javax.inject.New; + +class NewAndOtherBindingType_Broken +{ + public @New @Current WrappedSimpleBean violation; +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/newSimpleBean/newAndOtherBindingType/NewAndOtherBindingType_Broken.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/newSimpleBean/newAndOtherBindingType/WrappedSimpleBean.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/newSimpleBean/newAndOtherBindingType/WrappedSimpleBean.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/newSimpleBean/newAndOtherBindingType/WrappedSimpleBean.java 2009-02-22 23:54:59 UTC (rev 1652) @@ -0,0 +1,15 @@ +package org.jboss.jsr299.tck.unit.implementation.simple.newSimpleBean.newAndOtherBindingType; + +import java.io.Serializable; + +import javax.annotation.Named; +import javax.context.SessionScoped; + +@SessionScoped +@Named("Fred") +class WrappedSimpleBean implements Serializable +{ + public WrappedSimpleBean() { + + } +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/newSimpleBean/newAndOtherBindingType/WrappedSimpleBean.java ___________________________________________________________________ Name: svn:mime-type + text/plain