[webbeans-commits] Webbeans SVN: r989 - in tck/trunk/impl/src/main/java/org/jboss/webbeans/tck: impl/literals and 9 other directories.

Author: pete.muir(a)jboss.org Date: 2009-01-15 13:57:39 -0500 (Thu, 15 Jan 2009) New Revision: 989 Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/literals/ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Animal.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Barn.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/BindingTypeTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Cat.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Cod.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/DefangedTarantula.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Order.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Spider.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/SpiderProducer.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Synchronous.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Tame.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Tarantula.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Tuna.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/common/ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/common/CommonWebBeanTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/BeanWithTooManyDeploymentTypes_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/DefaultDeploymentTypeTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/DeploymentTypeTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/Gazelle_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/name/ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/name/NameTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/scope/ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/type/ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/type/TypeTest.java Removed: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/annotations/ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Animal.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Barn.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/BeanWithTooManyScopeTypes.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/BlackWidow.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Cat.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Cod.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/DaddyLongLegs.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/DeadlyAnimal.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/DeadlySpider.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/DefangedTarantula.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/DependentFinalTuna.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/FunnelWeaver.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Grayling.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Haddock.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/LadybirdSpider.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Minnow.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Moose.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Mullet.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Order.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Pollock.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/RedSnapper.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Reindeer.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Rhinoceros.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/ScottishFish.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/SeaBass.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Spider.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/SpiderProducer.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Tarantula.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/TrapdoorSpider.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Tuna.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/WolfSpider.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/broken/ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/binding/ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/BindingTypeTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/CommonWebBeanTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/DefaultDeploymentTypeTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/DeploymentTypeTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/NameTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/ScopeTypeTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/TypeTest.java Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/WebBeansTCKImpl.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/literals/CurrentBinding.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/AbstractTest.java Log: split out test beans Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/WebBeansTCKImpl.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/WebBeansTCKImpl.java 2009-01-15 18:57:28 UTC (rev 988) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/WebBeansTCKImpl.java 2009-01-15 18:57:39 UTC (rev 989) @@ -134,4 +134,5 @@ } } } + } Copied: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/literals (from rev 984, tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/binding) Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/literals/CurrentBinding.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/binding/CurrentBinding.java 2009-01-15 16:22:44 UTC (rev 984) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/literals/CurrentBinding.java 2009-01-15 18:57:39 UTC (rev 989) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.tck.impl.test.binding; +package org.jboss.webbeans.tck.impl.literals; import javax.webbeans.AnnotationLiteral; import javax.webbeans.Current; Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Animal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Animal.java 2009-01-15 18:57:28 UTC (rev 988) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Animal.java 2009-01-15 18:57:39 UTC (rev 989) @@ -1,6 +0,0 @@ -package org.jboss.webbeans.tck.impl.test.beans; - -public interface Animal -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Barn.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Barn.java 2009-01-15 18:57:28 UTC (rev 988) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Barn.java 2009-01-15 18:57:39 UTC (rev 989) @@ -1,10 +0,0 @@ -package org.jboss.webbeans.tck.impl.test.beans; - -import org.jboss.webbeans.tck.impl.test.annotations.Tame; - -public class Barn -{ - @Tame - public Tarantula petSpider; - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/BeanWithTooManyScopeTypes.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/BeanWithTooManyScopeTypes.java 2009-01-15 18:57:28 UTC (rev 988) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/BeanWithTooManyScopeTypes.java 2009-01-15 18:57:39 UTC (rev 989) @@ -1,11 +0,0 @@ -package org.jboss.webbeans.tck.impl.test.beans; - -import javax.webbeans.ConversationScoped; -import javax.webbeans.RequestScoped; - -@RequestScoped -@ConversationScoped -public class BeanWithTooManyScopeTypes -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/BlackWidow.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/BlackWidow.java 2009-01-15 18:57:28 UTC (rev 988) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/BlackWidow.java 2009-01-15 18:57:39 UTC (rev 989) @@ -1,6 +0,0 @@ -package org.jboss.webbeans.tck.impl.test.beans; - -public class BlackWidow extends Spider implements DeadlySpider -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Cat.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Cat.java 2009-01-15 18:57:28 UTC (rev 988) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Cat.java 2009-01-15 18:57:39 UTC (rev 989) @@ -1,12 +0,0 @@ -package org.jboss.webbeans.tck.impl.test.beans; - -import javax.webbeans.Production; - -import org.jboss.webbeans.tck.impl.test.annotations.Synchronous; - -@Production -@Synchronous -public class Cat -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Cod.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Cod.java 2009-01-15 18:57:28 UTC (rev 988) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Cod.java 2009-01-15 18:57:39 UTC (rev 989) @@ -1,16 +0,0 @@ -package org.jboss.webbeans.tck.impl.test.beans; - -import javax.webbeans.Named; -import javax.webbeans.Production; - -import org.jboss.webbeans.tck.impl.test.annotations.Chunky; -import org.jboss.webbeans.tck.impl.test.annotations.Whitefish; - -@Production -@Whitefish -@Chunky(realChunky=true) -@Named("whitefish") -public class Cod implements ScottishFish -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/DaddyLongLegs.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/DaddyLongLegs.java 2009-01-15 18:57:28 UTC (rev 988) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/DaddyLongLegs.java 2009-01-15 18:57:39 UTC (rev 989) @@ -1,6 +0,0 @@ -package org.jboss.webbeans.tck.impl.test.beans; - -public class DaddyLongLegs extends Spider -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/DeadlyAnimal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/DeadlyAnimal.java 2009-01-15 18:57:28 UTC (rev 988) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/DeadlyAnimal.java 2009-01-15 18:57:39 UTC (rev 989) @@ -1,6 +0,0 @@ -package org.jboss.webbeans.tck.impl.test.beans; - -public interface DeadlyAnimal -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/DeadlySpider.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/DeadlySpider.java 2009-01-15 18:57:28 UTC (rev 988) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/DeadlySpider.java 2009-01-15 18:57:39 UTC (rev 989) @@ -1,6 +0,0 @@ -package org.jboss.webbeans.tck.impl.test.beans; - -public interface DeadlySpider extends DeadlyAnimal -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/DefangedTarantula.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/DefangedTarantula.java 2009-01-15 18:57:28 UTC (rev 988) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/DefangedTarantula.java 2009-01-15 18:57:39 UTC (rev 989) @@ -1,6 +0,0 @@ -package org.jboss.webbeans.tck.impl.test.beans; - -public class DefangedTarantula extends Tarantula -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/DependentFinalTuna.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/DependentFinalTuna.java 2009-01-15 18:57:28 UTC (rev 988) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/DependentFinalTuna.java 2009-01-15 18:57:39 UTC (rev 989) @@ -1,9 +0,0 @@ -package org.jboss.webbeans.tck.impl.test.beans; - -import org.jboss.webbeans.tck.impl.test.annotations.AnotherDeploymentType; - -@AnotherDeploymentType -public final class DependentFinalTuna -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/FunnelWeaver.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/FunnelWeaver.java 2009-01-15 18:57:28 UTC (rev 988) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/FunnelWeaver.java 2009-01-15 18:57:39 UTC (rev 989) @@ -1,6 +0,0 @@ -package org.jboss.webbeans.tck.impl.test.beans; - -public class FunnelWeaver<T> -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Grayling.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Grayling.java 2009-01-15 18:57:28 UTC (rev 988) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Grayling.java 2009-01-15 18:57:39 UTC (rev 989) @@ -1,11 +0,0 @@ -package org.jboss.webbeans.tck.impl.test.beans; - -import org.jboss.webbeans.tck.impl.test.annotations.FishStereotype; -import org.jboss.webbeans.tck.impl.test.annotations.RiverFishStereotype; - -@RiverFishStereotype -@FishStereotype -public class Grayling implements Animal -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Haddock.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Haddock.java 2009-01-15 18:57:28 UTC (rev 988) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Haddock.java 2009-01-15 18:57:39 UTC (rev 989) @@ -1,11 +0,0 @@ -package org.jboss.webbeans.tck.impl.test.beans; - -import javax.webbeans.Named; -import javax.webbeans.Production; - -@Production -@Named -public class Haddock implements Animal -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/LadybirdSpider.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/LadybirdSpider.java 2009-01-15 18:57:28 UTC (rev 988) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/LadybirdSpider.java 2009-01-15 18:57:39 UTC (rev 989) @@ -1,14 +0,0 @@ -package org.jboss.webbeans.tck.impl.test.beans; - -import javax.webbeans.ApplicationScoped; - -@ApplicationScoped -public class LadybirdSpider extends Spider -{ - - public void spinWeb() - { - - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Minnow.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Minnow.java 2009-01-15 18:57:28 UTC (rev 988) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Minnow.java 2009-01-15 18:57:39 UTC (rev 989) @@ -1,12 +0,0 @@ -package org.jboss.webbeans.tck.impl.test.beans; - -import javax.webbeans.RequestScoped; - -import org.jboss.webbeans.tck.impl.test.annotations.RiverFishStereotype; - -@RiverFishStereotype -@RequestScoped -public class Minnow implements Animal -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Moose.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Moose.java 2009-01-15 18:57:28 UTC (rev 988) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Moose.java 2009-01-15 18:57:39 UTC (rev 989) @@ -1,12 +0,0 @@ -package org.jboss.webbeans.tck.impl.test.beans; - -import javax.webbeans.Named; - -import org.jboss.webbeans.tck.impl.test.annotations.MammalStereotype; - -@MammalStereotype -@Named("aMoose") -public class Moose implements Animal -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Mullet.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Mullet.java 2009-01-15 18:57:28 UTC (rev 988) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Mullet.java 2009-01-15 18:57:39 UTC (rev 989) @@ -1,9 +0,0 @@ -package org.jboss.webbeans.tck.impl.test.beans; - -import org.jboss.webbeans.tck.impl.test.annotations.AnotherScopeType; - -@AnotherScopeType -public class Mullet -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Order.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Order.java 2009-01-15 18:57:28 UTC (rev 988) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Order.java 2009-01-15 18:57:39 UTC (rev 989) @@ -1,9 +0,0 @@ -package org.jboss.webbeans.tck.impl.test.beans; - -import javax.webbeans.Production; - -@Production -public class Order -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Pollock.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Pollock.java 2009-01-15 18:57:28 UTC (rev 988) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Pollock.java 2009-01-15 18:57:39 UTC (rev 989) @@ -1,14 +0,0 @@ -package org.jboss.webbeans.tck.impl.test.beans; - -import javax.webbeans.Dependent; - -import org.jboss.webbeans.tck.impl.test.annotations.AnimalStereotype; -import org.jboss.webbeans.tck.impl.test.annotations.FishStereotype; - -@AnimalStereotype -@FishStereotype -@Dependent -public class Pollock implements Animal -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/RedSnapper.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/RedSnapper.java 2009-01-15 18:57:28 UTC (rev 988) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/RedSnapper.java 2009-01-15 18:57:39 UTC (rev 989) @@ -1,12 +0,0 @@ -package org.jboss.webbeans.tck.impl.test.beans; - -import javax.webbeans.RequestScoped; - -import org.jboss.webbeans.tck.impl.test.annotations.FishStereotype; - -@FishStereotype -@RequestScoped -public class RedSnapper implements Animal -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Reindeer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Reindeer.java 2009-01-15 18:57:28 UTC (rev 988) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Reindeer.java 2009-01-15 18:57:39 UTC (rev 989) @@ -1,12 +0,0 @@ -package org.jboss.webbeans.tck.impl.test.beans; - -import javax.webbeans.Production; - -import org.jboss.webbeans.tck.impl.test.annotations.HornedMammalStereotype; - -@HornedMammalStereotype -@Production -public class Reindeer implements Animal -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Rhinoceros.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Rhinoceros.java 2009-01-15 18:57:28 UTC (rev 988) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Rhinoceros.java 2009-01-15 18:57:39 UTC (rev 989) @@ -1,11 +0,0 @@ -package org.jboss.webbeans.tck.impl.test.beans; - -import org.jboss.webbeans.tck.impl.test.annotations.HornedMammalStereotype; -import org.jboss.webbeans.tck.impl.test.annotations.MammalStereotype; - -@HornedMammalStereotype -@MammalStereotype -public class Rhinoceros implements Animal -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/ScottishFish.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/ScottishFish.java 2009-01-15 18:57:28 UTC (rev 988) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/ScottishFish.java 2009-01-15 18:57:39 UTC (rev 989) @@ -1,6 +0,0 @@ -package org.jboss.webbeans.tck.impl.test.beans; - -public interface ScottishFish extends Animal -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/SeaBass.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/SeaBass.java 2009-01-15 18:57:28 UTC (rev 988) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/SeaBass.java 2009-01-15 18:57:39 UTC (rev 989) @@ -1,11 +0,0 @@ -package org.jboss.webbeans.tck.impl.test.beans; - -import javax.webbeans.Production; -import javax.webbeans.RequestScoped; - -@Production -@RequestScoped -public class SeaBass implements Animal -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Spider.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Spider.java 2009-01-15 18:57:28 UTC (rev 988) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Spider.java 2009-01-15 18:57:39 UTC (rev 989) @@ -1,11 +0,0 @@ -package org.jboss.webbeans.tck.impl.test.beans; - -public class Spider implements Animal -{ - - public final void layEggs() - { - - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/SpiderProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/SpiderProducer.java 2009-01-15 18:57:28 UTC (rev 988) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/SpiderProducer.java 2009-01-15 18:57:39 UTC (rev 989) @@ -1,104 +0,0 @@ -package org.jboss.webbeans.tck.impl.test.beans; - -import javax.webbeans.Dependent; -import javax.webbeans.Named; -import javax.webbeans.Produces; -import javax.webbeans.Production; -import javax.webbeans.RequestScoped; - -import org.jboss.webbeans.tck.impl.test.annotations.AnimalStereotype; -import org.jboss.webbeans.tck.impl.test.annotations.AnotherDeploymentType; -import org.jboss.webbeans.tck.impl.test.annotations.Tame; - -@AnotherDeploymentType -public class SpiderProducer -{ - - private static Spider[] ALL_SPIDERS = { new Tarantula(), new LadybirdSpider(), new DaddyLongLegs() }; - - @Produces @Tame public Tarantula produceTameTarantula() - { - return new DefangedTarantula(); - } - - @Produces public Tarantula produceTarantula() - { - return new Tarantula(); - } - - @Produces @Dependent public final TrapdoorSpider produceTrapdoorSpider() - { - return new TrapdoorSpider(); - } - - @Produces @Named("blackWidow") public BlackWidow produceBlackWidow() - { - return new BlackWidow(); - } - - @Produces @Named @RequestScoped public DaddyLongLegs produceDaddyLongLegs() - { - return new DaddyLongLegs(); - } - - @Produces @Named @Production public LadybirdSpider getLadybirdSpider() - { - return new LadybirdSpider(); - } - - @Produces @Named("Shelob") public Tarantula produceShelob() - { - return null; - } - - @Produces @AnimalStereotype public WolfSpider produceWolfSpider() - { - return new WolfSpider(); - } - - @Produces public Animal makeASpider() - { - return new WolfSpider(); - } - - @Produces public int getWolfSpiderSize() - { - return 4; - } - - @Produces public Spider[] getSpiders() - { - return ALL_SPIDERS; - } - - @Produces public String[] getStrings() - { - return new String[0]; - } - - @Produces public <T> FunnelWeaver<T> getFunnelWeaver() - { - return new FunnelWeaver<T>(); - } - - @Produces public FunnelWeaver<?> getAnotherFunnelWeaver() - { - return new FunnelWeaver<Object>(); - } - - @Produces public FunnelWeaver<Spider> getFunnelWeaverSpider() - { - return new FunnelWeaver<Spider>(); - } - - @Produces public Spider getNullSpider() - { - return null; - } - - @Produces public Spider produceSpiderFromInjection(@Tame Tarantula tarantula) - { - return tarantula; - } - -} \ No newline at end of file Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Tarantula.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Tarantula.java 2009-01-15 18:57:28 UTC (rev 988) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Tarantula.java 2009-01-15 18:57:39 UTC (rev 989) @@ -1,6 +0,0 @@ -package org.jboss.webbeans.tck.impl.test.beans; - -public class Tarantula extends Spider implements DeadlySpider -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/TrapdoorSpider.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/TrapdoorSpider.java 2009-01-15 18:57:28 UTC (rev 988) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/TrapdoorSpider.java 2009-01-15 18:57:39 UTC (rev 989) @@ -1,6 +0,0 @@ -package org.jboss.webbeans.tck.impl.test.beans; - -public class TrapdoorSpider -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Tuna.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Tuna.java 2009-01-15 18:57:28 UTC (rev 988) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Tuna.java 2009-01-15 18:57:39 UTC (rev 989) @@ -1,17 +0,0 @@ -package org.jboss.webbeans.tck.impl.test.beans; - -import javax.webbeans.RequestScoped; - -import org.jboss.webbeans.tck.impl.test.annotations.AnotherDeploymentType; - -@AnotherDeploymentType -@RequestScoped -public class Tuna -{ - - public String getName() - { - return "Ophir"; - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/WolfSpider.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/WolfSpider.java 2009-01-15 18:57:28 UTC (rev 988) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/WolfSpider.java 2009-01-15 18:57:39 UTC (rev 989) @@ -1,6 +0,0 @@ -package org.jboss.webbeans.tck.impl.test.beans; - -public class WolfSpider implements Animal -{ - -} Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/AbstractTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/AbstractTest.java 2009-01-15 18:57:28 UTC (rev 988) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/AbstractTest.java 2009-01-15 18:57:39 UTC (rev 989) @@ -7,20 +7,26 @@ import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; +import java.lang.annotation.Annotation; import java.lang.reflect.Method; +import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; +import java.util.List; import javax.webbeans.Production; import javax.webbeans.Standard; import javax.webbeans.manager.Bean; import javax.webbeans.manager.Manager; -import org.jboss.webbeans.tck.impl.test.annotations.AnotherDeploymentType; -import org.jboss.webbeans.tck.impl.test.annotations.HornedAnimalDeploymentType; import org.testng.annotations.BeforeMethod; +@SuppressWarnings("unchecked") public class AbstractTest { + + private static final List<Class<? extends Annotation>> STANDARD_DEPLOYMENT_TYPES = Collections.unmodifiableList(Arrays.asList(Standard.class, Production.class)); + protected static final int BUILT_IN_BEANS = 3; protected Manager manager; @@ -31,7 +37,7 @@ public final void before() { manager = configuration().getManagers().createManager(); - addStandardDeploymentTypesForTests(); + configuration().getManagers().setEnabledDeploymentTypes(getEnabledDeploymentTypes()); } public <T> Bean<T> getSimpleBean(Class<T> beanClass) @@ -72,11 +78,11 @@ */ - @SuppressWarnings("unchecked") - protected void addStandardDeploymentTypesForTests() + protected List<Class<? extends Annotation>> getEnabledDeploymentTypes() { - configuration().getManagers().setEnabledDeploymentTypes(Arrays.asList(Standard.class, Production.class, AnotherDeploymentType.class, HornedAnimalDeploymentType.class)); + return new ArrayList<Class<? extends Annotation>>(STANDARD_DEPLOYMENT_TYPES); } + /* protected <T> void addToEjbCache(Class<T> clazz) { Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/BindingTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/BindingTypeTest.java 2009-01-15 18:57:28 UTC (rev 988) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/BindingTypeTest.java 2009-01-15 18:57:39 UTC (rev 989) @@ -1,169 +0,0 @@ -package org.jboss.webbeans.tck.tests.definition; - - -import java.lang.reflect.Method; - -import javax.webbeans.Production; -import javax.webbeans.manager.Bean; - -import org.jboss.webbeans.tck.impl.SpecAssertion; -import org.jboss.webbeans.tck.impl.SpecVersion; -import org.jboss.webbeans.tck.impl.test.annotations.Synchronous; -import org.jboss.webbeans.tck.impl.test.beans.Barn; -import org.jboss.webbeans.tck.impl.test.beans.Cat; -import org.jboss.webbeans.tck.impl.test.beans.Cod; -import org.jboss.webbeans.tck.impl.test.beans.DefangedTarantula; -import org.jboss.webbeans.tck.impl.test.beans.Order; -import org.jboss.webbeans.tck.impl.test.beans.Spider; -import org.jboss.webbeans.tck.impl.test.beans.SpiderProducer; -import org.jboss.webbeans.tck.impl.test.beans.Tarantula; -import org.jboss.webbeans.tck.impl.test.beans.Tuna; -import org.jboss.webbeans.tck.impl.test.binding.CurrentBinding; -import org.jboss.webbeans.tck.impl.util.Reflections; -import org.jboss.webbeans.tck.tests.AbstractTest; -import org.testng.annotations.Test; - -@SpecVersion("20081206") -public class BindingTypeTest extends AbstractTest -{ - - @Test @SpecAssertion(section={"2.3.3", "2.3.1"}) - public void testDefaultBindingDeclaredInJava() - { - Bean<Order> order = getSimpleBean(Order.class); - assert order.getBindings().size() == 1; - order.getBindings().iterator().next().annotationType().equals(Production.class); - } - - @Test(groups={"stub", "annotationDefinition"}) @SpecAssertion(section="2.3.2") - public void testBindingHasCorrectTarget() - { - assert false; - } - - @Test(groups={"stub", "annotationDefinition"}) @SpecAssertion(section="2.3.2") - public void testBindingHasCorrectRetention() - { - assert false; - } - - @Test(groups={"stub", "annotationDefinition"}) @SpecAssertion(section="2.3.2") - public void testBindingDeclaresBindingAnnotation() - { - assert false; - } - - @SuppressWarnings("unchecked") - @Test @SpecAssertion(section="2.3.3") - public void testBindingsDeclaredInJava() - { - Bean<Cat> cat = getSimpleBean(Cat.class); - assert cat.getBindings().size() == 1; - assert Reflections.annotationSetMatches(cat.getBindings(), Synchronous.class); - } - - @Test @SpecAssertion(section="2.3.3") - public void testMultipleBindings() - { - Bean<?> model = getSimpleBean(Cod.class); - assert model.getBindings().size() == 2; - } - - @Test(groups={"stub", "webbeansxml"}) @SpecAssertion(section="2.3.4") - public void testBindingsDeclaredInXml() - { - //Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>(); - //annotations.put(Asynchronous.class, new AsynchronousAnnotationLiteral()); - //AnnotatedClass annotatedItem = new SimpleAnnotatedClass(Antelope.class, annotations); - - //SimpleBean<Antelope> antelope = createSimpleBean(Antelope.class, annotatedItem, manager); - // assert Reflections.annotationSetMatches(antelope.getBindingTypes(), Asynchronous.class); - assert false; - } - - @Test(groups={"stub", "webbeansxml"}) @SpecAssertion(section="2.3.4") - public void testXmlBindingOverridesAndIgnoresJava() - { - //Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>(); - //annotations.put(Asynchronous.class, new AsynchronousAnnotationLiteral()); - //AnnotatedClass<Cat> annotatedItem = new SimpleAnnotatedClass<Cat>(Cat.class, annotations); - - //SimpleBean<Cat> cat = createSimpleBean(Cat.class, annotatedItem, manager); - //assert cat.getBindingTypes().size() == 1; - //assert cat.getBindingTypes().contains(new AnnotationLiteral<Asynchronous>() {}); - assert false; - } - - @Test(groups={"stub", "webbeansxml"}) @SpecAssertion(section="2.3.4") - public void testNoBindingsDeclaredInXml() - { - //Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>(); - //AnnotatedClass<Cat> annotatedItem = new SimpleAnnotatedClass<Cat>(Cat.class, annotations); - - //SimpleBean<Cat> cat = createSimpleBean(Cat.class, annotatedItem, manager); - //assert cat.getBindingTypes().size() == 1; - //assert cat.getBindingTypes().contains(new AnnotationLiteral<Synchronous>() {}); - assert false; - } - - @Test(groups={"stub", "webbeansxml"}) @SpecAssertion(section={"2.3.4", "2.3.1"}) - public void testDefaultBindingDeclaredInXml() - { - Bean<?> model = getSimpleBean(Tuna.class); - assert model.getBindings().size() == 1; - assert model.getBindings().contains(new CurrentBinding()); - assert false; - } - - @Test(groups={"injection", "producerMethod"}) @SpecAssertion(section="2.3.5") - public void testFieldInjectedFromProducerMethod() throws Exception - { - Bean<SpiderProducer> spiderProducer = getSimpleBean(SpiderProducer.class); - manager.addBean(spiderProducer); - Method method = SpiderProducer.class.getMethod("produceTameTarantula"); - manager.addBean(getProducerMethodBean(method, spiderProducer)); - Barn barn = getSimpleBean(Barn.class).create(); - assert barn.petSpider != null; - assert barn.petSpider instanceof DefangedTarantula; - } - - @Test(groups={"stub", "injection", "webbeansxml"}) @SpecAssertion(section="2.3.5") - public void testFieldWithBindingInXml() - { - assert false; - } - - @Test(groups={"stub", "injection", "webbeansxml"}) @SpecAssertion(section="2.3.5") - public void testFieldWithBindingInXmlIgnoresAnnotations() - { - assert false; - } - - @SuppressWarnings("unchecked") - @Test(groups={"injection", "producerMethod"}) - public void testMethodWithBindingAnnotationsOnParametersAreInjected() throws Exception - { - Bean<SpiderProducer> spiderProducer = getSimpleBean(SpiderProducer.class); - manager.addBean(spiderProducer); - Method method = SpiderProducer.class.getMethod("produceTameTarantula"); - manager.addBean(getProducerMethodBean(method, spiderProducer)); - method = SpiderProducer.class.getMethod("produceSpiderFromInjection", Tarantula.class); - Bean<Spider> spiderBean = (Bean<Spider>) getProducerMethodBean(method, spiderProducer); - Spider spider = spiderBean.create(); - assert spider != null; - assert spider instanceof DefangedTarantula; - } - - @Test(groups={"stub", "injection", "webbeansxml"}) @SpecAssertion(section="2.3.6") - public void testMethodWithBindingAnnotationsOnParametersDeclaredInXml() - { - assert false; - } - - @Test(groups={"stub", "injection", "webbeansxml"}) @SpecAssertion(section="2.3.6") - public void testMethodWithBindingAnnotationsOnParametersDeclaredInXmlIgnoresAnnotations() - { - assert false; - } - -} \ No newline at end of file Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/CommonWebBeanTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/CommonWebBeanTest.java 2009-01-15 18:57:28 UTC (rev 988) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/CommonWebBeanTest.java 2009-01-15 18:57:39 UTC (rev 989) @@ -1,103 +0,0 @@ -package org.jboss.webbeans.tck.tests.definition; - -import java.lang.reflect.Method; - -import javax.webbeans.Production; -import javax.webbeans.RequestScoped; -import javax.webbeans.manager.Bean; - -import org.jboss.webbeans.tck.impl.SpecAssertion; -import org.jboss.webbeans.tck.impl.SpecVersion; -import org.jboss.webbeans.tck.impl.test.beans.Animal; -import org.jboss.webbeans.tck.impl.test.beans.DeadlyAnimal; -import org.jboss.webbeans.tck.impl.test.beans.DeadlySpider; -import org.jboss.webbeans.tck.impl.test.beans.DependentFinalTuna; -import org.jboss.webbeans.tck.impl.test.beans.RedSnapper; -import org.jboss.webbeans.tck.impl.test.beans.Spider; -import org.jboss.webbeans.tck.impl.test.beans.SpiderProducer; -import org.jboss.webbeans.tck.impl.test.beans.Tarantula; -import org.jboss.webbeans.tck.tests.AbstractTest; -import org.testng.annotations.Test; - -/** - * This test class should be used for common assertions about Web Beans - * - * @author Pete Muir - * - */ -@SpecVersion("20081206") -public class CommonWebBeanTest extends AbstractTest -{ - - // TODO This should actually somehow test the reverse - that the container - // throws a definition exception if any of these occur - - @Test - @SpecAssertion(section = "2") - public void testApiTypesNonEmpty() - { - Bean<?> model = getSimpleBean(RedSnapper.class); - assert model.getTypes().size() > 0; - } - - @Test - @SpecAssertion(section = "2") - public void testBindingTypesNonEmpty() - { - Bean<?> model = getSimpleBean(RedSnapper.class); - assert model.getBindings().size() > 0; - } - - @Test - @SpecAssertion(section = "2") - public void testHasScopeType() - { - Bean<?> model = getSimpleBean(RedSnapper.class); - assert model.getScopeType().equals(RequestScoped.class); - } - - @Test - @SpecAssertion(section = "2") - public void testHasDeploymentType() - { - Bean<?> model = getSimpleBean(RedSnapper.class); - assert model.getDeploymentType().equals(Production.class); - } - - @SuppressWarnings("unchecked") - @Test(groups = "producerMethod") - @SpecAssertion(section = "5.2") - public void testIsNullable() throws Exception - { - Bean<SpiderProducer> spiderProducerBean = getSimpleBean(SpiderProducer.class); - manager.addBean(spiderProducerBean); - Method method = SpiderProducer.class.getMethod("getWolfSpiderSize"); - Bean<Integer> bean = (Bean<Integer>) getProducerMethodBean(method, spiderProducerBean); - assert !bean.isNullable(); - method = SpiderProducer.class.getMethod("makeASpider"); - Bean<Spider> spiderBean = (Bean<Spider>) getProducerMethodBean(method, spiderProducerBean); - assert spiderBean.isNullable(); - } - - @Test - @SpecAssertion(section = { "3.2.2", "2.2" }) - public void testApiTypes() - { - Bean<Tarantula> bean = getSimpleBean(Tarantula.class); - assert bean.getTypes().size() == 6; - assert bean.getTypes().contains(Tarantula.class); - assert bean.getTypes().contains(Spider.class); - assert bean.getTypes().contains(Animal.class); - assert bean.getTypes().contains(Object.class); - assert bean.getTypes().contains(DeadlySpider.class); - assert bean.getTypes().contains(DeadlyAnimal.class); - } - - @Test - @SpecAssertion(section = "2.2") - public void testFinalApiType() - { - getSimpleBean(DependentFinalTuna.class); - } - -} \ No newline at end of file Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/DefaultDeploymentTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/DefaultDeploymentTypeTest.java 2009-01-15 18:57:28 UTC (rev 988) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/DefaultDeploymentTypeTest.java 2009-01-15 18:57:39 UTC (rev 989) @@ -1,30 +0,0 @@ -package org.jboss.webbeans.tck.tests.definition; - -import static org.jboss.webbeans.tck.impl.WebBeansTCKImpl.configuration; - -import javax.webbeans.Production; -import javax.webbeans.Standard; - -import org.jboss.webbeans.tck.impl.SpecAssertion; -import org.jboss.webbeans.tck.tests.AbstractTest; -import org.testng.annotations.Test; - - -public class DefaultDeploymentTypeTest extends AbstractTest -{ - - @Override - protected void addStandardDeploymentTypesForTests() - { - // No-op - } - - @Test @SpecAssertion(section={"2.5.6", "2.5.7"}) - public void testDefaultEnabledDeploymentTypes() - { - assert configuration().getManagers().getEnabledDeploymentTypes().size() == 2; - assert configuration().getManagers().getEnabledDeploymentTypes().get(0).equals(Standard.class); - assert configuration().getManagers().getEnabledDeploymentTypes().get(1).equals(Production.class); - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/DeploymentTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/DeploymentTypeTest.java 2009-01-15 18:57:28 UTC (rev 988) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/DeploymentTypeTest.java 2009-01-15 18:57:39 UTC (rev 989) @@ -1,159 +0,0 @@ -package org.jboss.webbeans.tck.tests.definition; - -import static org.jboss.webbeans.tck.impl.WebBeansTCKImpl.configuration; - -import java.lang.reflect.Method; -import java.util.Arrays; - -import javax.webbeans.DefinitionException; -import javax.webbeans.DeploymentException; -import javax.webbeans.Production; -import javax.webbeans.Standard; -import javax.webbeans.UnsatisfiedDependencyException; -import javax.webbeans.manager.Bean; - -import org.jboss.webbeans.tck.impl.SpecAssertion; -import org.jboss.webbeans.tck.impl.SpecVersion; -import org.jboss.webbeans.tck.impl.test.annotations.AnotherDeploymentType; -import org.jboss.webbeans.tck.impl.test.annotations.HornedAnimalDeploymentType; -import org.jboss.webbeans.tck.impl.test.beans.BlackWidow; -import org.jboss.webbeans.tck.impl.test.beans.RedSnapper; -import org.jboss.webbeans.tck.impl.test.beans.Reindeer; -import org.jboss.webbeans.tck.impl.test.beans.Rhinoceros; -import org.jboss.webbeans.tck.impl.test.beans.SpiderProducer; -import org.jboss.webbeans.tck.impl.test.beans.broken.BeanWithTooManyDeploymentTypes; -import org.jboss.webbeans.tck.impl.test.beans.broken.Gazelle; -import org.jboss.webbeans.tck.tests.AbstractTest; -import org.testng.annotations.Test; - -@SpecVersion("20081206") -public class DeploymentTypeTest extends AbstractTest -{ - - @Test(expectedExceptions=DefinitionException.class) @SpecAssertion(section="2.5.1") - public void testNonBuiltInComponentUsesStandard() - { - getSimpleBean(Gazelle.class); - } - - @Test(groups={"stub", "annotationDefinition"}) @SpecAssertion(section="2.5.2") - public void testDeploymentTypeHasCorrectTarget() - { - assert false; - } - - @Test(groups={"stub", "annotationDefinition"}) @SpecAssertion(section="2.5.2") - public void testDeploymentTypeHasCorrectRetention() - { - assert false; - } - - @Test(groups={"stub", "annotationDefinition"}) @SpecAssertion(section="2.5.2") - public void testDeploymentTypeDeclaresScopeTypeAnnotation() - { - assert false; - } - - @Test(expectedExceptions=DefinitionException.class) @SpecAssertion(section="2.5.3") - public void testTooManyDeploymentTypes() - { - getSimpleBean(BeanWithTooManyDeploymentTypes.class); - } - - @SuppressWarnings("unchecked") - @Test @SpecAssertion(section="2.5.3") - public void testDeploymentTypeInhertitedFromDeclaringBean() throws Exception - { - Bean<SpiderProducer> bean = getSimpleBean(SpiderProducer.class); - manager.addBean(bean); - Method method = SpiderProducer.class.getMethod("produceBlackWidow"); - Bean<BlackWidow> blackWidowSpiderModel = (Bean<BlackWidow>) getProducerMethodBean(method, bean); - assert blackWidowSpiderModel.getDeploymentType().equals(AnotherDeploymentType.class); - } - - @Test(groups={"stub", "webbeansxml"}) @SpecAssertion(section="2.5.4") - public void testXmlDeploymentTypeOverridesJava() - { - //Map<Class<? extends Annotation>, Annotation> xmlDefinedDeploymentTypeAnnotations = new HashMap<Class<? extends Annotation>, Annotation>(); - //xmlDefinedDeploymentTypeAnnotations.put(AnotherDeploymentType.class, new AnotherDeploymentTypeAnnotationLiteral()); - //AnnotatedClass<BeanWithTooManyDeploymentTypes> xmlDefinedDeploymentTypeAnnotatedItem = new SimpleAnnotatedClass<BeanWithTooManyDeploymentTypes>(BeanWithTooManyDeploymentTypes.class, xmlDefinedDeploymentTypeAnnotations); - - //SimpleBean<BeanWithTooManyDeploymentTypes> model = createSimpleBean(BeanWithTooManyDeploymentTypes.class, xmlDefinedDeploymentTypeAnnotatedItem, manager); - //assert model.getDeploymentType().equals(AnotherDeploymentType.class); - assert false; - } - - - - @Test(groups={"stub", "webbeansxml"}) @SpecAssertion(section="2.5.4") - public void testXmlRespectsJavaDeploymentType() - { - //AnnotatedClass<Tuna> annotatedItem = new SimpleAnnotatedClass<Tuna>(Tuna.class, new HashMap<Class<? extends Annotation>, Annotation>()); - //SimpleBean<Tuna> tuna = createSimpleBean(Tuna.class, annotatedItem, manager); - //assert tuna.getDeploymentType().equals(AnotherDeploymentType.class); - assert false; - } - - @Test(groups={"stub", "webbeansxml"}) @SpecAssertion(section="2.5.5") - public void testXmlDefaultDeploymentType() - { - //AnnotatedClass<Antelope> antelopeAnnotatedItem = new SimpleAnnotatedClass<Antelope>(Antelope.class, new HashMap<Class<? extends Annotation>, Annotation>()); - //SimpleBean<Antelope> antelope = createSimpleBean(Antelope.class, antelopeAnnotatedItem, manager); - // assert antelope.getDeploymentType().equals(Production.class); - assert false; - } - - @Test @SpecAssertion(section="2.5.5") - public void testHighestPrecedenceDeploymentTypeFromStereotype() - { - Bean<?> bean = getSimpleBean(Rhinoceros.class); - assert bean.getDeploymentType().equals(HornedAnimalDeploymentType.class); - } - - @SuppressWarnings("unchecked") - @Test(groups="beanLifecycle", expectedExceptions=UnsatisfiedDependencyException.class) @SpecAssertion(section="2.5.6") - public void testBeanWithDisabledDeploymentTypeNotInstantiated() - { - configuration().getManagers().setEnabledDeploymentTypes( - Arrays.asList(Standard.class, AnotherDeploymentType.class, - HornedAnimalDeploymentType.class)); - - Bean<RedSnapper> bean = getSimpleBean(RedSnapper.class); - manager.addBean(bean); - manager.getInstanceByType(RedSnapper.class); - } - - @SuppressWarnings("unchecked") - @Test @SpecAssertion(section={"2.5.6", "2.5.7"}) - public void testCustomDeploymentTypes() - { - configuration().getManagers().setEnabledDeploymentTypes( - Arrays.asList(Standard.class, AnotherDeploymentType.class, - HornedAnimalDeploymentType.class)); - assert configuration().getManagers().getEnabledDeploymentTypes().size() == 3; - assert configuration().getManagers().getEnabledDeploymentTypes().get(0).equals(Standard.class); - assert configuration().getManagers().getEnabledDeploymentTypes().get(1).equals(AnotherDeploymentType.class); - assert configuration().getManagers().getEnabledDeploymentTypes().get(2).equals(HornedAnimalDeploymentType.class); - } - - @SuppressWarnings("unchecked") - @Test(expectedExceptions=DeploymentException.class) @SpecAssertion(section="2.5.6") - public void testStandardMustBeDeclared() - { - configuration().getManagers().setEnabledDeploymentTypes( - Arrays.asList(AnotherDeploymentType.class, HornedAnimalDeploymentType.class)); - } - - @Test(groups={"stub", "webbeansxml"}, expectedExceptions=DeploymentException.class) @SpecAssertion(section="2.5.6") - public void testMultipleDeployElementsCannotBeDefined() - { - - } - - @Test @SpecAssertion(section={"2.5.5", "2.7.2"}) - public void testWebBeanDeploymentTypeOverridesStereotype() - { - Bean<Reindeer> bean = getSimpleBean(Reindeer.class); - assert bean.getDeploymentType().equals(Production.class); - } -} \ No newline at end of file Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/NameTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/NameTest.java 2009-01-15 18:57:28 UTC (rev 988) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/NameTest.java 2009-01-15 18:57:39 UTC (rev 989) @@ -1,140 +0,0 @@ -package org.jboss.webbeans.tck.tests.definition; - -import static org.jboss.webbeans.tck.impl.WebBeansTCKImpl.configuration; - -import javax.webbeans.DefinitionException; -import javax.webbeans.manager.Bean; - -import org.jboss.webbeans.tck.impl.SpecAssertion; -import org.jboss.webbeans.tck.impl.SpecVersion; -import org.jboss.webbeans.tck.impl.test.beans.Haddock; -import org.jboss.webbeans.tck.impl.test.beans.Minnow; -import org.jboss.webbeans.tck.impl.test.beans.Moose; -import org.jboss.webbeans.tck.impl.test.beans.RedSnapper; -import org.jboss.webbeans.tck.impl.test.beans.SeaBass; -import org.jboss.webbeans.tck.tests.AbstractTest; -import org.testng.annotations.Test; - -@SpecVersion("20081206") -public class NameTest extends AbstractTest -{ - - @Test(groups="stub", expectedExceptions=DefinitionException.class) @SpecAssertion(section="2.6") - public void testInvalidElIdentifierUsedAsWebBeanName() - { - assert false; - } - - @Test @SpecAssertion(section="2.6.1") - public void testNonDefaultNamed() - { - Bean<Moose> moose = getSimpleBean(Moose.class); - assert moose.getName().equals("aMoose"); - } - - @Test(groups={"stub", "webbeansxml"}) @SpecAssertion(section="2.6.2") - public void testNonDefaultXmlNamed() - { - /*Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>(); - annotations.put(Named.class, new NamedAnnotationLiteral(){ - - public String value() - { - return "aTrout"; - } - - }); - AnnotatedClass<SeaBass> annotatedItem = new SimpleAnnotatedClass<SeaBass>(SeaBass.class, annotations);*/ - //SimpleBean<SeaBass> trout = createSimpleBean(SeaBass.class, annotatedItem, manager); - - //assert trout.getName().equals("aTrout"); - assert false; - } - - @Test(groups={"stub", "webbeansxml"}) @SpecAssertion(section="2.6.2") - public void testXmlNamedOverridesJavaNamed() - { - /*Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>(); - annotations.put(Named.class, new NamedAnnotationLiteral(){ - - public String value() - { - return "aTrout"; - } - - }); - AnnotatedClass<Cod> annotatedItem = new SimpleAnnotatedClass<Cod>(Cod.class, annotations);*/ - //SimpleBean<Cod> cod = createSimpleBean(Cod.class, annotatedItem, manager); - - //assert cod.getName().equals("aTrout"); - assert false; - } - - @Test(groups={"stub", "webbeansxml"}) @SpecAssertion(section={"2.6.2", "2.6.3"}) - public void testJavaNamedUsedWhenNoXmlSpecified() - { - //Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>(); - //AnnotatedClass<Cod> annotatedItem = new SimpleAnnotatedClass<Cod>(Cod.class, annotations); - //SimpleBean<Cod> cod = createSimpleBean(Cod.class, annotatedItem, manager); - - //assert cod.getName().equals("whitefish"); - assert false; - } - - @Test @SpecAssertion(section={"2.6.3", "3.2.7"}) - public void testDefaultNamed() - { - Bean<Haddock> haddock = getSimpleBean(Haddock.class); - assert haddock.getName() != null; - assert haddock.getName().equals("haddock"); - } - - @Test(groups={"stub", "webbeansxml"}) @SpecAssertion(section="2.6.3") - public void testDefaultXmlNamed() - { - /*Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>(); - annotations.put(Named.class, new NamedAnnotationLiteral() { - - public String value() - { - return ""; - } - - }); - AnnotatedClass<SeaBass> annotatedItem = new SimpleAnnotatedClass<SeaBass>(SeaBass.class, annotations);*/ - //SimpleBean<SeaBass> trout = createSimpleBean(SeaBass.class, annotatedItem, manager); - - //assert trout.getName() != null; - //assert trout.getName().equals("seaBass"); - assert false; - } - - @Test @SpecAssertion(section={"2.6.3", "2.7"}) - public void testSterotypeDefaultsName() - { - Bean<RedSnapper> model = getSimpleBean(RedSnapper.class); - assert model.getName().equals("redSnapper"); - } - - @Test @SpecAssertion(section="2.6.4") - public void testNotNamedInJava() - { - Bean<SeaBass> model = getSimpleBean(SeaBass.class); - assert model.getName() == null; - } - - @Test @SpecAssertion(section="2.6.4") - public void testNotNamedInXml() - { - Bean<SeaBass> model = getSimpleBean(SeaBass.class); - assert model.getName() == null; - } - - @Test @SpecAssertion(section="2.6.4") - public void testNotNamedInStereotype() - { - Bean<Minnow> model = getSimpleBean(Minnow.class); - assert model.getName() == null; - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/ScopeTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/ScopeTypeTest.java 2009-01-15 18:57:28 UTC (rev 988) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/ScopeTypeTest.java 2009-01-15 18:57:39 UTC (rev 989) @@ -1,151 +0,0 @@ -package org.jboss.webbeans.tck.tests.definition; - -import javax.webbeans.ApplicationScoped; -import javax.webbeans.DefinitionException; -import javax.webbeans.Dependent; -import javax.webbeans.RequestScoped; -import javax.webbeans.manager.Bean; - -import org.jboss.webbeans.tck.impl.SpecAssertion; -import org.jboss.webbeans.tck.impl.SpecVersion; -import org.jboss.webbeans.tck.impl.test.annotations.AnotherScopeType; -import org.jboss.webbeans.tck.impl.test.beans.BeanWithTooManyScopeTypes; -import org.jboss.webbeans.tck.impl.test.beans.Grayling; -import org.jboss.webbeans.tck.impl.test.beans.Minnow; -import org.jboss.webbeans.tck.impl.test.beans.Mullet; -import org.jboss.webbeans.tck.impl.test.beans.Order; -import org.jboss.webbeans.tck.impl.test.beans.Pollock; -import org.jboss.webbeans.tck.impl.test.beans.RedSnapper; -import org.jboss.webbeans.tck.impl.test.beans.SeaBass; -import org.jboss.webbeans.tck.impl.test.beans.broken.Scallop; -import org.jboss.webbeans.tck.tests.AbstractTest; -import org.testng.annotations.Test; - -@SpecVersion("20081206") -public class ScopeTypeTest extends AbstractTest -{ - - @Test @SpecAssertion(section="2.4") - public void testScopeTypesAreExtensible() - { - Bean<Mullet> mullet = getSimpleBean(Mullet.class); - assert mullet.getScopeType().equals(AnotherScopeType.class); - } - - @Test(groups={"stub", "annotationDefinition"}) @SpecAssertion(section="2.4.2") - public void testScopeTypeHasCorrectTarget() - { - assert false; - } - - @Test(groups={"stub", "annotationDefinition"}) @SpecAssertion(section="2.4.2") - public void testScopeTypeHasCorrectRetention() - { - assert false; - } - - @Test(groups={"stub", "annotationDefinition"}) @SpecAssertion(section="2.4.2") - public void testScopeTypeDeclaresScopeTypeAnnotation() - { - assert false; - } - - @Test @SpecAssertion(section="2.4.3") - public void testScopeDeclaredInJava() - { - Bean<SeaBass> trout = getSimpleBean(SeaBass.class); - assert trout.getScopeType().equals(RequestScoped.class); - } - - @Test(expectedExceptions=DefinitionException.class) @SpecAssertion(section="2.4.3") - public void testTooManyScopesSpecifiedInJava() - { - getSimpleBean(BeanWithTooManyScopeTypes.class); - } - - @Test(expectedExceptions=DefinitionException.class, groups={"stub", "webbeansxml"}) - public void testTooManyScopesSpecifiedInXml() - { - //Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>(); - //annotations.put(RequestScoped.class, new RequestScopedAnnotationLiteral()); - //annotations.put(ConversationScoped.class, new ConversationScopedAnnotationLiteral()); - //AnnotatedClass<Antelope> antelopeAnnotatedItem = new SimpleAnnotatedClass<Antelope>(Antelope.class, annotations); - //createSimpleBean(null, antelopeAnnotatedItem, manager); - } - - @Test(groups={"stub", "webbeansxml"}) @SpecAssertion(section="2.4.4") - public void testScopeDeclaredInXml() - { - //Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>(); - //annotations.put(RequestScoped.class, new RequestScopedAnnotationLiteral()); - //AnnotatedClass<Order> annotatedItem = new SimpleAnnotatedClass<Order>(Order.class, annotations); - - //SimpleBean<Order> order = createSimpleBean(Order.class, annotatedItem, manager); - //assert order.getScopeType().equals(RequestScoped.class); - assert false; - } - - @Test(groups={"stub", "webbeansxml"}) @SpecAssertion(section="2.4.4") - public void testScopeMissingInXml() - { - //Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>(); - //AnnotatedClass<SeaBass> annotatedItem = new SimpleAnnotatedClass<SeaBass>(SeaBass.class, annotations); - - //SimpleBean<SeaBass> trout =createSimpleBean(SeaBass.class, annotatedItem, manager); - //assert trout.getScopeType().equals(RequestScoped.class); - assert false; - } - - @Test(groups={"stub", "webbeansxml"}) @SpecAssertion(section="2.4.4") - public void testScopeDeclaredInXmlOverridesJava() - { - //Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>(); - //annotations.put(ConversationScoped.class, new ConversationScopedAnnotationLiteral()); - //AnnotatedClass<SeaBass> annotatedItem = new SimpleAnnotatedClass<SeaBass>(SeaBass.class, annotations); - //SimpleBean<SeaBass> trout = createSimpleBean(SeaBass.class, annotatedItem, manager); - //assert trout.getScopeType().equals(ConversationScoped.class); - assert false; - } - - @Test @SpecAssertion(section="2.4.5") - public void testDefaultScope() - { - Bean<Order> order = getSimpleBean(Order.class); - assert order.getScopeType().equals(Dependent.class); - } - - @Test @SpecAssertion(section={"2.4.5", "2.7.2"}) - public void testScopeSpecifiedAndStereotyped() - { - Bean<Minnow> minnow = getSimpleBean(Minnow.class); - assert minnow.getScopeType().equals(RequestScoped.class); - } - - @Test(expectedExceptions=DefinitionException.class) @SpecAssertion(section="2.4.5") - public void testMutipleIncompatibleScopeStereotypes() - { - getSimpleBean(Scallop.class); - } - - @Test @SpecAssertion(section="2.4.5") - public void testMutipleIncompatibleScopeStereotypesWithScopeSpecified() - { - Bean<Pollock> pollock = getSimpleBean(Pollock.class); - assert pollock.getScopeType().equals(Dependent.class); - } - - @Test @SpecAssertion(section="2.4.5") - public void testMutipleCompatibleScopeStereotypes() - { - Bean<Grayling> grayling = getSimpleBean(Grayling.class); - assert grayling.getScopeType().equals(ApplicationScoped.class); - } - - @Test @SpecAssertion(section="2.7.2") - public void testWebBeanScopeTypeOverridesStereotype() - { - Bean<RedSnapper> bean = getSimpleBean(RedSnapper.class); - assert bean.getScopeType().equals(RequestScoped.class); - } - -} \ No newline at end of file Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/TypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/TypeTest.java 2009-01-15 18:57:28 UTC (rev 988) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/TypeTest.java 2009-01-15 18:57:39 UTC (rev 989) @@ -1,22 +0,0 @@ -package org.jboss.webbeans.tck.tests.definition; - -import javax.webbeans.manager.Bean; - -import org.jboss.webbeans.tck.impl.SpecAssertion; -import org.jboss.webbeans.tck.impl.test.beans.Haddock; -import org.jboss.webbeans.tck.tests.AbstractTest; -import org.testng.annotations.Test; - -public class TypeTest extends AbstractTest -{ - - @Test @SpecAssertion(section="2.6.3") - public void testDefaultNamed() - { - Bean<Haddock> haddock = getSimpleBean(Haddock.class); - assert haddock.getName() != null; - assert haddock.getName().equals("haddock"); - } - -} - Copied: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Animal.java (from rev 984, tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Animal.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Animal.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Animal.java 2009-01-15 18:57:39 UTC (rev 989) @@ -0,0 +1,6 @@ +package org.jboss.webbeans.tck.tests.definition.binding; + +interface Animal +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Barn.java (from rev 984, tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Barn.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Barn.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Barn.java 2009-01-15 18:57:39 UTC (rev 989) @@ -0,0 +1,9 @@ +package org.jboss.webbeans.tck.tests.definition.binding; + + +class Barn +{ + @Tame + public Tarantula petSpider; + +} Copied: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/BindingTypeTest.java (from rev 986, tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/BindingTypeTest.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/BindingTypeTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/BindingTypeTest.java 2009-01-15 18:57:39 UTC (rev 989) @@ -0,0 +1,169 @@ +package org.jboss.webbeans.tck.tests.definition.binding; + + +import java.lang.annotation.Annotation; +import java.lang.reflect.Method; +import java.util.List; + +import javax.webbeans.Production; +import javax.webbeans.manager.Bean; + +import org.jboss.webbeans.tck.impl.SpecAssertion; +import org.jboss.webbeans.tck.impl.SpecVersion; +import org.jboss.webbeans.tck.impl.literals.CurrentBinding; +import org.jboss.webbeans.tck.impl.util.Reflections; +import org.jboss.webbeans.tck.tests.AbstractTest; +import org.testng.annotations.Test; + +@SpecVersion("20081206") +public class BindingTypeTest extends AbstractTest +{ + + @Override + protected List<Class<? extends Annotation>> getEnabledDeploymentTypes() + { + List<Class<? extends Annotation>> deploymentTypes = super.getEnabledDeploymentTypes(); + deploymentTypes.add(AnotherDeploymentType.class); + return deploymentTypes; + } + + @Test @SpecAssertion(section={"2.3.3", "2.3.1"}) + public void testDefaultBindingDeclaredInJava() + { + Bean<Order> order = getSimpleBean(Order.class); + assert order.getBindings().size() == 1; + order.getBindings().iterator().next().annotationType().equals(Production.class); + } + + @Test(groups={"stub", "annotationDefinition"}) @SpecAssertion(section="2.3.2") + public void testBindingHasCorrectTarget() + { + assert false; + } + + @Test(groups={"stub", "annotationDefinition"}) @SpecAssertion(section="2.3.2") + public void testBindingHasCorrectRetention() + { + assert false; + } + + @Test(groups={"stub", "annotationDefinition"}) @SpecAssertion(section="2.3.2") + public void testBindingDeclaresBindingAnnotation() + { + assert false; + } + + @SuppressWarnings("unchecked") + @Test @SpecAssertion(section="2.3.3") + public void testBindingsDeclaredInJava() + { + Bean<Cat> cat = getSimpleBean(Cat.class); + assert cat.getBindings().size() == 1; + assert Reflections.annotationSetMatches(cat.getBindings(), Synchronous.class); + } + + @Test @SpecAssertion(section="2.3.3") + public void testMultipleBindings() + { + Bean<?> model = getSimpleBean(Cod.class); + assert model.getBindings().size() == 2; + } + + @Test(groups={"stub", "webbeansxml"}) @SpecAssertion(section="2.3.4") + public void testBindingsDeclaredInXml() + { + //Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>(); + //annotations.put(Asynchronous.class, new AsynchronousAnnotationLiteral()); + //AnnotatedClass annotatedItem = new SimpleAnnotatedClass(Antelope.class, annotations); + + //SimpleBean<Antelope> antelope = createSimpleBean(Antelope.class, annotatedItem, manager); + // assert Reflections.annotationSetMatches(antelope.getBindingTypes(), Asynchronous.class); + assert false; + } + + @Test(groups={"stub", "webbeansxml"}) @SpecAssertion(section="2.3.4") + public void testXmlBindingOverridesAndIgnoresJava() + { + //Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>(); + //annotations.put(Asynchronous.class, new AsynchronousAnnotationLiteral()); + //AnnotatedClass<Cat> annotatedItem = new SimpleAnnotatedClass<Cat>(Cat.class, annotations); + + //SimpleBean<Cat> cat = createSimpleBean(Cat.class, annotatedItem, manager); + //assert cat.getBindingTypes().size() == 1; + //assert cat.getBindingTypes().contains(new AnnotationLiteral<Asynchronous>() {}); + assert false; + } + + @Test(groups={"stub", "webbeansxml"}) @SpecAssertion(section="2.3.4") + public void testNoBindingsDeclaredInXml() + { + //Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>(); + //AnnotatedClass<Cat> annotatedItem = new SimpleAnnotatedClass<Cat>(Cat.class, annotations); + + //SimpleBean<Cat> cat = createSimpleBean(Cat.class, annotatedItem, manager); + //assert cat.getBindingTypes().size() == 1; + //assert cat.getBindingTypes().contains(new AnnotationLiteral<Synchronous>() {}); + assert false; + } + + @Test(groups={"stub", "webbeansxml"}) @SpecAssertion(section={"2.3.4", "2.3.1"}) + public void testDefaultBindingDeclaredInXml() + { + Bean<?> model = getSimpleBean(Tuna.class); + assert model.getBindings().size() == 1; + assert model.getBindings().contains(new CurrentBinding()); + assert false; + } + + @Test(groups={"injection", "producerMethod"}) @SpecAssertion(section="2.3.5") + public void testFieldInjectedFromProducerMethod() throws Exception + { + Bean<SpiderProducer> spiderProducer = getSimpleBean(SpiderProducer.class); + manager.addBean(spiderProducer); + Method method = SpiderProducer.class.getMethod("produceTameTarantula"); + manager.addBean(getProducerMethodBean(method, spiderProducer)); + Barn barn = getSimpleBean(Barn.class).create(); + assert barn.petSpider != null; + assert barn.petSpider instanceof DefangedTarantula; + } + + @Test(groups={"stub", "injection", "webbeansxml"}) @SpecAssertion(section="2.3.5") + public void testFieldWithBindingInXml() + { + assert false; + } + + @Test(groups={"stub", "injection", "webbeansxml"}) @SpecAssertion(section="2.3.5") + public void testFieldWithBindingInXmlIgnoresAnnotations() + { + assert false; + } + + @SuppressWarnings("unchecked") + @Test(groups={"injection", "producerMethod"}) + public void testMethodWithBindingAnnotationsOnParametersAreInjected() throws Exception + { + Bean<SpiderProducer> spiderProducer = getSimpleBean(SpiderProducer.class); + manager.addBean(spiderProducer); + Method method = SpiderProducer.class.getMethod("produceTameTarantula"); + manager.addBean(getProducerMethodBean(method, spiderProducer)); + method = SpiderProducer.class.getMethod("produceSpiderFromInjection", Tarantula.class); + Bean<Spider> spiderBean = (Bean<Spider>) getProducerMethodBean(method, spiderProducer); + Spider spider = spiderBean.create(); + assert spider != null; + assert spider instanceof DefangedTarantula; + } + + @Test(groups={"stub", "injection", "webbeansxml"}) @SpecAssertion(section="2.3.6") + public void testMethodWithBindingAnnotationsOnParametersDeclaredInXml() + { + assert false; + } + + @Test(groups={"stub", "injection", "webbeansxml"}) @SpecAssertion(section="2.3.6") + public void testMethodWithBindingAnnotationsOnParametersDeclaredInXmlIgnoresAnnotations() + { + assert false; + } + +} \ No newline at end of file Copied: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Cat.java (from rev 984, tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Cat.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Cat.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Cat.java 2009-01-15 18:57:39 UTC (rev 989) @@ -0,0 +1,11 @@ +package org.jboss.webbeans.tck.tests.definition.binding; + +import javax.webbeans.Production; + + +@Production +@Synchronous +class Cat +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Cod.java (from rev 984, tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Cod.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Cod.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Cod.java 2009-01-15 18:57:39 UTC (rev 989) @@ -0,0 +1,13 @@ +package org.jboss.webbeans.tck.tests.definition.binding; + +import javax.webbeans.Named; +import javax.webbeans.Production; + +@Production +@Whitefish +@Chunky(realChunky=true) +@Named("whitefish") +class Cod implements ScottishFish +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/DefangedTarantula.java (from rev 984, tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/DefangedTarantula.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/DefangedTarantula.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/DefangedTarantula.java 2009-01-15 18:57:39 UTC (rev 989) @@ -0,0 +1,5 @@ +package org.jboss.webbeans.tck.tests.definition.binding; +class DefangedTarantula extends Tarantula +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Order.java (from rev 984, tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Order.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Order.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Order.java 2009-01-15 18:57:39 UTC (rev 989) @@ -0,0 +1,9 @@ +package org.jboss.webbeans.tck.tests.definition.binding; + +import javax.webbeans.Production; + +@Production +class Order +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Spider.java (from rev 984, tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Spider.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Spider.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Spider.java 2009-01-15 18:57:39 UTC (rev 989) @@ -0,0 +1,12 @@ +package org.jboss.webbeans.tck.tests.definition.binding; + + +class Spider implements Animal +{ + + public final void layEggs() + { + + } + +} Copied: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/SpiderProducer.java (from rev 984, tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/SpiderProducer.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/SpiderProducer.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/SpiderProducer.java 2009-01-15 18:57:39 UTC (rev 989) @@ -0,0 +1,21 @@ +package org.jboss.webbeans.tck.tests.definition.binding; + +import javax.webbeans.Produces; + + + +@AnotherDeploymentType +class SpiderProducer +{ + + @Produces @Tame public Tarantula produceTameTarantula() + { + return new DefangedTarantula(); + } + + @Produces public Spider produceSpiderFromInjection(@Tame Tarantula tarantula) + { + return tarantula; + } + +} \ No newline at end of file Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Synchronous.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Synchronous.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Synchronous.java 2009-01-15 18:57:39 UTC (rev 989) @@ -0,0 +1,21 @@ +package org.jboss.webbeans.tck.tests.definition.binding; + +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 }) +@Retention(RUNTIME) +@Documented +@BindingType +@interface Synchronous +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Tame.java (from rev 984, tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/annotations/Tame.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Tame.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Tame.java 2009-01-15 18:57:39 UTC (rev 989) @@ -0,0 +1,22 @@ +package org.jboss.webbeans.tck.tests.definition.binding; + +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 +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Tarantula.java (from rev 984, tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Tarantula.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Tarantula.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Tarantula.java 2009-01-15 18:57:39 UTC (rev 989) @@ -0,0 +1,6 @@ +package org.jboss.webbeans.tck.tests.definition.binding; + +class Tarantula extends Spider implements DeadlySpider +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Tuna.java (from rev 984, tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Tuna.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Tuna.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Tuna.java 2009-01-15 18:57:39 UTC (rev 989) @@ -0,0 +1,15 @@ +package org.jboss.webbeans.tck.tests.definition.binding; + +import javax.webbeans.RequestScoped; + +@AnotherDeploymentType +@RequestScoped +class Tuna +{ + + public String getName() + { + return "Ophir"; + } + +} Copied: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/common/CommonWebBeanTest.java (from rev 984, tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/CommonWebBeanTest.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/common/CommonWebBeanTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/common/CommonWebBeanTest.java 2009-01-15 18:57:39 UTC (rev 989) @@ -0,0 +1,95 @@ +package org.jboss.webbeans.tck.tests.definition.common; + +import java.lang.reflect.Method; + +import javax.webbeans.Production; +import javax.webbeans.RequestScoped; +import javax.webbeans.manager.Bean; + +import org.jboss.webbeans.tck.impl.SpecAssertion; +import org.jboss.webbeans.tck.impl.SpecVersion; +import org.jboss.webbeans.tck.tests.AbstractTest; +import org.testng.annotations.Test; + +/** + * This test class should be used for common assertions about Web Beans + * + * @author Pete Muir + * + */ +@SpecVersion("20081206") +public class CommonWebBeanTest extends AbstractTest +{ + + // TODO This should actually somehow test the reverse - that the container + // throws a definition exception if any of these occur + + @Test + @SpecAssertion(section = "2") + public void testApiTypesNonEmpty() + { + Bean<?> model = getSimpleBean(RedSnapper.class); + assert model.getTypes().size() > 0; + } + + @Test + @SpecAssertion(section = "2") + public void testBindingTypesNonEmpty() + { + Bean<?> model = getSimpleBean(RedSnapper.class); + assert model.getBindings().size() > 0; + } + + @Test + @SpecAssertion(section = "2") + public void testHasScopeType() + { + Bean<?> model = getSimpleBean(RedSnapper.class); + assert model.getScopeType().equals(RequestScoped.class); + } + + @Test + @SpecAssertion(section = "2") + public void testHasDeploymentType() + { + Bean<?> model = getSimpleBean(RedSnapper.class); + assert model.getDeploymentType().equals(Production.class); + } + + @SuppressWarnings("unchecked") + @Test(groups = "producerMethod") + @SpecAssertion(section = "5.2") + public void testIsNullable() throws Exception + { + Bean<SpiderProducer> spiderProducerBean = getSimpleBean(SpiderProducer.class); + manager.addBean(spiderProducerBean); + Method method = SpiderProducer.class.getMethod("getWolfSpiderSize"); + Bean<Integer> bean = (Bean<Integer>) getProducerMethodBean(method, spiderProducerBean); + assert !bean.isNullable(); + method = SpiderProducer.class.getMethod("makeASpider"); + Bean<Spider> spiderBean = (Bean<Spider>) getProducerMethodBean(method, spiderProducerBean); + assert spiderBean.isNullable(); + } + + @Test + @SpecAssertion(section = { "3.2.2", "2.2" }) + public void testApiTypes() + { + Bean<Tarantula> bean = getSimpleBean(Tarantula.class); + assert bean.getTypes().size() == 6; + assert bean.getTypes().contains(Tarantula.class); + assert bean.getTypes().contains(Spider.class); + assert bean.getTypes().contains(Animal.class); + assert bean.getTypes().contains(Object.class); + assert bean.getTypes().contains(DeadlySpider.class); + assert bean.getTypes().contains(DeadlyAnimal.class); + } + + @Test + @SpecAssertion(section = "2.2") + public void testFinalApiType() + { + getSimpleBean(DependentFinalTuna.class); + } + +} \ No newline at end of file Copied: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/BeanWithTooManyDeploymentTypes_Broken.java (from rev 984, tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/broken/BeanWithTooManyDeploymentTypes.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/BeanWithTooManyDeploymentTypes_Broken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/BeanWithTooManyDeploymentTypes_Broken.java 2009-01-15 18:57:39 UTC (rev 989) @@ -0,0 +1,10 @@ +package org.jboss.webbeans.tck.tests.definition.deployment; + +import javax.webbeans.Production; + +@Production +@AnotherDeploymentType +class BeanWithTooManyDeploymentTypes_Broken +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/DefaultDeploymentTypeTest.java (from rev 984, tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/DefaultDeploymentTypeTest.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/DefaultDeploymentTypeTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/DefaultDeploymentTypeTest.java 2009-01-15 18:57:39 UTC (rev 989) @@ -0,0 +1,24 @@ +package org.jboss.webbeans.tck.tests.definition.deployment; + +import static org.jboss.webbeans.tck.impl.WebBeansTCKImpl.configuration; + +import javax.webbeans.Production; +import javax.webbeans.Standard; + +import org.jboss.webbeans.tck.impl.SpecAssertion; +import org.jboss.webbeans.tck.tests.AbstractTest; +import org.testng.annotations.Test; + + +public class DefaultDeploymentTypeTest extends AbstractTest +{ + + @Test @SpecAssertion(section={"2.5.6", "2.5.7"}) + public void testDefaultEnabledDeploymentTypes() + { + assert configuration().getManagers().getEnabledDeploymentTypes().size() == 2; + assert configuration().getManagers().getEnabledDeploymentTypes().get(0).equals(Standard.class); + assert configuration().getManagers().getEnabledDeploymentTypes().get(1).equals(Production.class); + } + +} Copied: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/DeploymentTypeTest.java (from rev 984, tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/DeploymentTypeTest.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/DeploymentTypeTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/DeploymentTypeTest.java 2009-01-15 18:57:39 UTC (rev 989) @@ -0,0 +1,160 @@ +package org.jboss.webbeans.tck.tests.definition.deployment; + +import static org.jboss.webbeans.tck.impl.WebBeansTCKImpl.configuration; + +import java.lang.annotation.Annotation; +import java.lang.reflect.Method; +import java.util.Arrays; +import java.util.List; + +import javax.webbeans.DefinitionException; +import javax.webbeans.DeploymentException; +import javax.webbeans.Production; +import javax.webbeans.Standard; +import javax.webbeans.UnsatisfiedDependencyException; +import javax.webbeans.manager.Bean; + +import org.jboss.webbeans.tck.impl.SpecAssertion; +import org.jboss.webbeans.tck.impl.SpecVersion; +import org.jboss.webbeans.tck.tests.AbstractTest; +import org.testng.annotations.Test; + +@SpecVersion("20081206") +public class DeploymentTypeTest extends AbstractTest +{ + + @Override + protected List<Class<? extends Annotation>> getEnabledDeploymentTypes() + { + List<Class<? extends Annotation>> deploymentTypes = super.getEnabledDeploymentTypes(); + deploymentTypes.add(HornedAnimalDeploymentType.class); + return deploymentTypes; + } + + @Test(expectedExceptions=DefinitionException.class) @SpecAssertion(section="2.5.1") + public void testNonBuiltInComponentUsesStandard() + { + getSimpleBean(Gazelle_Broken.class); + } + + @Test(groups={"stub", "annotationDefinition"}) @SpecAssertion(section="2.5.2") + public void testDeploymentTypeHasCorrectTarget() + { + assert false; + } + + @Test(groups={"stub", "annotationDefinition"}) @SpecAssertion(section="2.5.2") + public void testDeploymentTypeHasCorrectRetention() + { + assert false; + } + + @Test(groups={"stub", "annotationDefinition"}) @SpecAssertion(section="2.5.2") + public void testDeploymentTypeDeclaresScopeTypeAnnotation() + { + assert false; + } + + @Test(expectedExceptions=DefinitionException.class) @SpecAssertion(section="2.5.3") + public void testTooManyDeploymentTypes() + { + getSimpleBean(BeanWithTooManyDeploymentTypes_Broken.class); + } + + @SuppressWarnings("unchecked") + @Test @SpecAssertion(section="2.5.3") + public void testDeploymentTypeInhertitedFromDeclaringBean() throws Exception + { + Bean<SpiderProducer> bean = getSimpleBean(SpiderProducer.class); + manager.addBean(bean); + Method method = SpiderProducer.class.getMethod("produceBlackWidow"); + Bean<BlackWidow> blackWidowSpiderModel = (Bean<BlackWidow>) getProducerMethodBean(method, bean); + assert blackWidowSpiderModel.getDeploymentType().equals(AnotherDeploymentType.class); + } + + @Test(groups={"stub", "webbeansxml"}) @SpecAssertion(section="2.5.4") + public void testXmlDeploymentTypeOverridesJava() + { + //Map<Class<? extends Annotation>, Annotation> xmlDefinedDeploymentTypeAnnotations = new HashMap<Class<? extends Annotation>, Annotation>(); + //xmlDefinedDeploymentTypeAnnotations.put(AnotherDeploymentType.class, new AnotherDeploymentTypeAnnotationLiteral()); + //AnnotatedClass<BeanWithTooManyDeploymentTypes> xmlDefinedDeploymentTypeAnnotatedItem = new SimpleAnnotatedClass<BeanWithTooManyDeploymentTypes>(BeanWithTooManyDeploymentTypes.class, xmlDefinedDeploymentTypeAnnotations); + + //SimpleBean<BeanWithTooManyDeploymentTypes> model = createSimpleBean(BeanWithTooManyDeploymentTypes.class, xmlDefinedDeploymentTypeAnnotatedItem, manager); + //assert model.getDeploymentType().equals(AnotherDeploymentType.class); + assert false; + } + + + + @Test(groups={"stub", "webbeansxml"}) @SpecAssertion(section="2.5.4") + public void testXmlRespectsJavaDeploymentType() + { + //AnnotatedClass<Tuna> annotatedItem = new SimpleAnnotatedClass<Tuna>(Tuna.class, new HashMap<Class<? extends Annotation>, Annotation>()); + //SimpleBean<Tuna> tuna = createSimpleBean(Tuna.class, annotatedItem, manager); + //assert tuna.getDeploymentType().equals(AnotherDeploymentType.class); + assert false; + } + + @Test(groups={"stub", "webbeansxml"}) @SpecAssertion(section="2.5.5") + public void testXmlDefaultDeploymentType() + { + //AnnotatedClass<Antelope> antelopeAnnotatedItem = new SimpleAnnotatedClass<Antelope>(Antelope.class, new HashMap<Class<? extends Annotation>, Annotation>()); + //SimpleBean<Antelope> antelope = createSimpleBean(Antelope.class, antelopeAnnotatedItem, manager); + // assert antelope.getDeploymentType().equals(Production.class); + assert false; + } + + @Test @SpecAssertion(section="2.5.5") + public void testHighestPrecedenceDeploymentTypeFromStereotype() + { + Bean<?> bean = getSimpleBean(Rhinoceros.class); + assert bean.getDeploymentType().equals(HornedAnimalDeploymentType.class); + } + + @SuppressWarnings("unchecked") + @Test(groups="beanLifecycle", expectedExceptions=UnsatisfiedDependencyException.class) @SpecAssertion(section="2.5.6") + public void testBeanWithDisabledDeploymentTypeNotInstantiated() + { + configuration().getManagers().setEnabledDeploymentTypes( + Arrays.asList(Standard.class, AnotherDeploymentType.class, + HornedAnimalDeploymentType.class)); + + Bean<RedSnapper> bean = getSimpleBean(RedSnapper.class); + manager.addBean(bean); + manager.getInstanceByType(RedSnapper.class); + } + + @SuppressWarnings("unchecked") + @Test @SpecAssertion(section={"2.5.6", "2.5.7"}) + public void testCustomDeploymentTypes() + { + configuration().getManagers().setEnabledDeploymentTypes( + Arrays.asList(Standard.class, AnotherDeploymentType.class, + HornedAnimalDeploymentType.class)); + assert configuration().getManagers().getEnabledDeploymentTypes().size() == 3; + assert configuration().getManagers().getEnabledDeploymentTypes().get(0).equals(Standard.class); + assert configuration().getManagers().getEnabledDeploymentTypes().get(1).equals(AnotherDeploymentType.class); + assert configuration().getManagers().getEnabledDeploymentTypes().get(2).equals(HornedAnimalDeploymentType.class); + } + + @SuppressWarnings("unchecked") + @Test(expectedExceptions=DeploymentException.class) @SpecAssertion(section="2.5.6") + public void testStandardMustBeDeclared() + { + configuration().getManagers().setEnabledDeploymentTypes( + Arrays.asList(AnotherDeploymentType.class, HornedAnimalDeploymentType.class)); + } + + @Test(groups={"stub", "webbeansxml"}, expectedExceptions=DeploymentException.class) @SpecAssertion(section="2.5.6") + public void testMultipleDeployElementsCannotBeDefined() + { + + } + + @Test @SpecAssertion(section={"2.5.5", "2.7.2"}) + public void testWebBeanDeploymentTypeOverridesStereotype() + { + Bean<Reindeer> bean = getSimpleBean(Reindeer.class); + assert bean.getDeploymentType().equals(Production.class); + } +} \ No newline at end of file Copied: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/Gazelle_Broken.java (from rev 984, tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/broken/Gazelle.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/Gazelle_Broken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/Gazelle_Broken.java 2009-01-15 18:57:39 UTC (rev 989) @@ -0,0 +1,9 @@ +package org.jboss.webbeans.tck.tests.definition.deployment; + +import javax.webbeans.Standard; + +@Standard +class Gazelle_Broken +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/name/NameTest.java (from rev 984, tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/NameTest.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/name/NameTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/name/NameTest.java 2009-01-15 18:57:39 UTC (rev 989) @@ -0,0 +1,144 @@ +package org.jboss.webbeans.tck.tests.definition.name; + +import java.lang.annotation.Annotation; +import java.util.List; + +import javax.webbeans.DefinitionException; +import javax.webbeans.manager.Bean; + +import org.jboss.webbeans.tck.impl.SpecAssertion; +import org.jboss.webbeans.tck.impl.SpecVersion; +import org.jboss.webbeans.tck.tests.AbstractTest; +import org.testng.annotations.Test; + +@SpecVersion("20081206") +public class NameTest extends AbstractTest +{ + + @Override + protected List<Class<? extends Annotation>> getEnabledDeploymentTypes() + { + List<Class<? extends Annotation>> deploymentTypes = super.getEnabledDeploymentTypes(); + deploymentTypes.add(AnotherDeploymentType.class); + return deploymentTypes; + } + + @Test(groups="stub", expectedExceptions=DefinitionException.class) @SpecAssertion(section="2.6") + public void testInvalidElIdentifierUsedAsWebBeanName() + { + assert false; + } + + @Test @SpecAssertion(section="2.6.1") + public void testNonDefaultNamed() + { + Bean<Moose> moose = getSimpleBean(Moose.class); + assert moose.getName().equals("aMoose"); + } + + @Test(groups={"stub", "webbeansxml"}) @SpecAssertion(section="2.6.2") + public void testNonDefaultXmlNamed() + { + /*Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>(); + annotations.put(Named.class, new NamedAnnotationLiteral(){ + + public String value() + { + return "aTrout"; + } + + }); + AnnotatedClass<SeaBass> annotatedItem = new SimpleAnnotatedClass<SeaBass>(SeaBass.class, annotations);*/ + //SimpleBean<SeaBass> trout = createSimpleBean(SeaBass.class, annotatedItem, manager); + + //assert trout.getName().equals("aTrout"); + assert false; + } + + @Test(groups={"stub", "webbeansxml"}) @SpecAssertion(section="2.6.2") + public void testXmlNamedOverridesJavaNamed() + { + /*Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>(); + annotations.put(Named.class, new NamedAnnotationLiteral(){ + + public String value() + { + return "aTrout"; + } + + }); + AnnotatedClass<Cod> annotatedItem = new SimpleAnnotatedClass<Cod>(Cod.class, annotations);*/ + //SimpleBean<Cod> cod = createSimpleBean(Cod.class, annotatedItem, manager); + + //assert cod.getName().equals("aTrout"); + assert false; + } + + @Test(groups={"stub", "webbeansxml"}) @SpecAssertion(section={"2.6.2", "2.6.3"}) + public void testJavaNamedUsedWhenNoXmlSpecified() + { + //Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>(); + //AnnotatedClass<Cod> annotatedItem = new SimpleAnnotatedClass<Cod>(Cod.class, annotations); + //SimpleBean<Cod> cod = createSimpleBean(Cod.class, annotatedItem, manager); + + //assert cod.getName().equals("whitefish"); + assert false; + } + + @Test @SpecAssertion(section={"2.6.3", "3.2.7"}) + public void testDefaultNamed() + { + Bean<Haddock> haddock = getSimpleBean(Haddock.class); + assert haddock.getName() != null; + assert haddock.getName().equals("haddock"); + } + + @Test(groups={"stub", "webbeansxml"}) @SpecAssertion(section="2.6.3") + public void testDefaultXmlNamed() + { + /*Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>(); + annotations.put(Named.class, new NamedAnnotationLiteral() { + + public String value() + { + return ""; + } + + }); + AnnotatedClass<SeaBass> annotatedItem = new SimpleAnnotatedClass<SeaBass>(SeaBass.class, annotations);*/ + //SimpleBean<SeaBass> trout = createSimpleBean(SeaBass.class, annotatedItem, manager); + + //assert trout.getName() != null; + //assert trout.getName().equals("seaBass"); + assert false; + } + + @Test @SpecAssertion(section={"2.6.3", "2.7"}) + public void testSterotypeDefaultsName() + { + Bean<RedSnapper> model = getSimpleBean(RedSnapper.class); + assert model.getName().equals("redSnapper"); + } + + @Test @SpecAssertion(section="2.6.4") + public void testNotNamedInJava() + { + Bean<SeaBass> model = getSimpleBean(SeaBass.class); + assert model.getName() == null; + } + + @Test @SpecAssertion(section="2.6.4") + public void testNotNamedInXml() + { + Bean<SeaBass> model = getSimpleBean(SeaBass.class); + assert model.getName() == null; + } + + @Test @SpecAssertion(section="2.6.4") + public void testNotNamedInStereotype() + { + Bean<Minnow> model = getSimpleBean(Minnow.class); + assert model.getName() == null; + } + +} Copied: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/type/TypeTest.java (from rev 984, tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/TypeTest.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/type/TypeTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/type/TypeTest.java 2009-01-15 18:57:39 UTC (rev 989) @@ -0,0 +1,21 @@ +package org.jboss.webbeans.tck.tests.definition.type; + +import javax.webbeans.manager.Bean; + +import org.jboss.webbeans.tck.impl.SpecAssertion; +import org.jboss.webbeans.tck.tests.AbstractTest; +import org.testng.annotations.Test; + +public class TypeTest extends AbstractTest +{ + + @Test @SpecAssertion(section="2.6.3") + public void testDefaultNamed() + { + Bean<Haddock> haddock = getSimpleBean(Haddock.class); + assert haddock.getName() != null; + assert haddock.getName().equals("haddock"); + } + +} +