Author: shane.bryzak(a)jboss.com Date: 2009-01-14 01:56:59 -0500 (Wed, 14 Jan 2009) New Revision: 946 Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/annotations/AnotherScopeType.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/annotations/FishStereotype.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/annotations/HornedMammalStereotype.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/annotations/MammalStereotype.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/annotations/RiverFishStereotype.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/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/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/Pollock.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/SeaBass.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/beans/broken/BeanWithTooManyDeploymentTypes.java 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/impl/test/beans/broken/Scallop.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/api/src/main/java/org/jboss/webbeans/tck/api/Beans.java tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/Managers.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/AbstractTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/CommonWebBeanTest.java Log: More chapter 2 tests Modified: tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/Beans.java =================================================================== --- tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/Beans.java 2009-01-14 06:33:46 UTC (rev 945) +++ tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/Beans.java 2009-01-14 06:56:59 UTC (rev 946) @@ -1,6 +1,8 @@ package org.jboss.webbeans.tck.api; +import java.lang.annotation.Annotation; import java.lang.reflect.Method; +import java.util.Set; import javax.webbeans.manager.Bean; @@ -57,4 +59,29 @@ */ public <T> Bean<T> createProducerMethodBean(Method method, Bean<?> declaringBean); + /** + * + * @param bean + * @return + */ + boolean isBeanNameDefaulted(Bean<?> bean); + + /** + * + * @param bean + * @return + */ + Set<Class<?>> getRequiredTypes(Bean<?> bean); + + /** + * + * @return + */ + Set<Class<? extends Annotation>> getSupportedScopes(Bean<?> bean); + + /** + * + * @return + */ + Set<Annotation> getBindings(Bean<?> bean); } Modified: tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/Managers.java =================================================================== --- tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/Managers.java 2009-01-14 06:33:46 UTC (rev 945) +++ tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/Managers.java 2009-01-14 06:56:59 UTC (rev 946) @@ -25,6 +25,13 @@ void setEnabledDeploymentTypes(List<Class<? extends Annotation>> enabledDeploymentTypes); /** + * Returns a list of the enabled deployment types for the current manager + * + * @return + */ + List<Class<? extends Annotation>> getEnabledDeploymentTypes(); + + /** * Get a new Manager instance * * @return the Manager Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/annotations/AnotherScopeType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/annotations/AnotherScopeType.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/annotations/AnotherScopeType.java 2009-01-14 06:56:59 UTC (rev 946) @@ -0,0 +1,20 @@ +package org.jboss.webbeans.tck.impl.test.annotations; + +import static java.lang.annotation.ElementType.METHOD; +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.ScopeType; + +@Target( { TYPE, METHOD }) +@Retention(RUNTIME) +@Documented +@ScopeType +public @interface AnotherScopeType +{ + +} Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/annotations/FishStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/annotations/FishStereotype.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/annotations/FishStereotype.java 2009-01-14 06:56:59 UTC (rev 946) @@ -0,0 +1,23 @@ +package org.jboss.webbeans.tck.impl.test.annotations; + +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.webbeans.ApplicationScoped; +import javax.webbeans.Named; +import javax.webbeans.Stereotype; + +import org.jboss.webbeans.tck.impl.test.beans.Animal; + +(a)Stereotype(requiredTypes=Animal.class) +@Target( { TYPE }) +@Retention(RUNTIME) +@ApplicationScoped +@Named +public @interface FishStereotype +{ + +} Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/annotations/HornedMammalStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/annotations/HornedMammalStereotype.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/annotations/HornedMammalStereotype.java 2009-01-14 06:56:59 UTC (rev 946) @@ -0,0 +1,20 @@ +package org.jboss.webbeans.tck.impl.test.annotations; + +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.webbeans.Stereotype; + +import org.jboss.webbeans.tck.impl.test.beans.Animal; + +(a)Stereotype(requiredTypes=Animal.class) +@Target( { TYPE }) +@Retention(RUNTIME) +@HornedAnimalDeploymentType +public @interface HornedMammalStereotype +{ + +} Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/annotations/MammalStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/annotations/MammalStereotype.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/annotations/MammalStereotype.java 2009-01-14 06:56:59 UTC (rev 946) @@ -0,0 +1,20 @@ +package org.jboss.webbeans.tck.impl.test.annotations; + +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.webbeans.Stereotype; + +import org.jboss.webbeans.tck.impl.test.beans.Animal; + +(a)Stereotype(requiredTypes=Animal.class) +@Target( { TYPE }) +@Retention(RUNTIME) +@AnotherDeploymentType +public @interface MammalStereotype +{ + +} Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/annotations/RiverFishStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/annotations/RiverFishStereotype.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/annotations/RiverFishStereotype.java 2009-01-14 06:56:59 UTC (rev 946) @@ -0,0 +1,21 @@ +package org.jboss.webbeans.tck.impl.test.annotations; + +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.webbeans.ApplicationScoped; +import javax.webbeans.Stereotype; + +import org.jboss.webbeans.tck.impl.test.beans.Animal; + +(a)Stereotype(requiredTypes=Animal.class) +@Target( { TYPE }) +@Retention(RUNTIME) +@ApplicationScoped +public @interface RiverFishStereotype +{ + +} Added: 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 (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/BeanWithTooManyScopeTypes.java 2009-01-14 06:56:59 UTC (rev 946) @@ -0,0 +1,11 @@ +package org.jboss.webbeans.tck.impl.test.beans; + +import javax.webbeans.ConversationScoped; +import javax.webbeans.RequestScoped; + +@RequestScoped +@ConversationScoped +public class BeanWithTooManyScopeTypes +{ + +} Added: 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 (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Grayling.java 2009-01-14 06:56:59 UTC (rev 946) @@ -0,0 +1,11 @@ +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 +{ + +} Added: 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 (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Haddock.java 2009-01-14 06:56:59 UTC (rev 946) @@ -0,0 +1,11 @@ +package org.jboss.webbeans.tck.impl.test.beans; + +import javax.webbeans.Named; +import javax.webbeans.Production; + +@Production +@Named +public class Haddock implements Animal +{ + +} Added: 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 (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Minnow.java 2009-01-14 06:56:59 UTC (rev 946) @@ -0,0 +1,12 @@ +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 +{ + +} Added: 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 (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Moose.java 2009-01-14 06:56:59 UTC (rev 946) @@ -0,0 +1,12 @@ +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 +{ + +} Added: 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 (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Mullet.java 2009-01-14 06:56:59 UTC (rev 946) @@ -0,0 +1,9 @@ +package org.jboss.webbeans.tck.impl.test.beans; + +import org.jboss.webbeans.tck.impl.test.annotations.AnotherScopeType; + +@AnotherScopeType +public class Mullet +{ + +} Added: 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 (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Pollock.java 2009-01-14 06:56:59 UTC (rev 946) @@ -0,0 +1,14 @@ +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 +{ + +} Added: 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 (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Reindeer.java 2009-01-14 06:56:59 UTC (rev 946) @@ -0,0 +1,12 @@ +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 +{ + +} Added: 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 (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Rhinoceros.java 2009-01-14 06:56:59 UTC (rev 946) @@ -0,0 +1,11 @@ +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 +{ + +} Added: 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 (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/SeaBass.java 2009-01-14 06:56:59 UTC (rev 946) @@ -0,0 +1,11 @@ +package org.jboss.webbeans.tck.impl.test.beans; + +import javax.webbeans.Production; +import javax.webbeans.RequestScoped; + +@Production +@RequestScoped +public class SeaBass implements Animal +{ + +} Added: 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/impl/test/beans/broken/BeanWithTooManyDeploymentTypes.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/broken/BeanWithTooManyDeploymentTypes.java 2009-01-14 06:56:59 UTC (rev 946) @@ -0,0 +1,12 @@ +package org.jboss.webbeans.tck.impl.test.beans.broken; + +import javax.webbeans.Production; + +import org.jboss.webbeans.tck.impl.test.annotations.AnotherDeploymentType; + +@Production +@AnotherDeploymentType +public class BeanWithTooManyDeploymentTypes +{ + +} Added: 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/impl/test/beans/broken/Gazelle.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/broken/Gazelle.java 2009-01-14 06:56:59 UTC (rev 946) @@ -0,0 +1,9 @@ +package org.jboss.webbeans.tck.impl.test.beans.broken; + +import javax.webbeans.Standard; + +@Standard +public class Gazelle +{ + +} Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/broken/Scallop.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/broken/Scallop.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/broken/Scallop.java 2009-01-14 06:56:59 UTC (rev 946) @@ -0,0 +1,11 @@ +package org.jboss.webbeans.tck.impl.test.beans.broken; + +import org.jboss.webbeans.tck.impl.test.annotations.AnimalStereotype; +import org.jboss.webbeans.tck.impl.test.annotations.FishStereotype; + +@AnimalStereotype +@FishStereotype +public class Scallop +{ + +} 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-14 06:33:46 UTC (rev 945) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/AbstractTest.java 2009-01-14 06:56:59 UTC (rev 946) @@ -14,8 +14,10 @@ import javax.webbeans.manager.Bean; import javax.webbeans.manager.Manager; +import org.jboss.webbeans.tck.impl.TckUtils; import org.jboss.webbeans.tck.impl.WebBeansTCKImpl; import org.jboss.webbeans.tck.impl.test.annotations.AnotherDeploymentType; +import org.jboss.webbeans.tck.impl.test.annotations.HornedAnimalDeploymentType; import org.testng.annotations.BeforeMethod; public class AbstractTest @@ -70,13 +72,13 @@ } */ - /* + @SuppressWarnings("unchecked") protected void addStandardDeploymentTypesForTests() { - manager.setEnabledDeploymentTypes(Arrays.asList(Standard.class, Production.class, AnotherDeploymentType.class, HornedAnimalDeploymentType.class)); + TckUtils.getManagers().setEnabledDeploymentTypes(Arrays.asList(Standard.class, Production.class, AnotherDeploymentType.class, HornedAnimalDeploymentType.class)); } - +/* protected <T> void addToEjbCache(Class<T> clazz) { manager.getEjbDescriptorCache().add(new MockEjbDescriptor<T>(clazz)); Modified: 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-14 06:33:46 UTC (rev 945) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/CommonWebBeanTest.java 2009-01-14 06:56:59 UTC (rev 946) @@ -8,6 +8,7 @@ import org.jboss.webbeans.tck.impl.SpecAssertion; import org.jboss.webbeans.tck.impl.SpecVersion; +import org.jboss.webbeans.tck.impl.TckUtils; 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; @@ -42,7 +43,7 @@ public void testBindingTypesNonEmpty() { Bean<?> model = getSimpleBean(RedSnapper.class); - assert model.getBindings().size() > 0; + assert TckUtils.getBeans().getBindings(model).size() > 0; } @Test @SpecAssertion(section="2") Added: 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 (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/DefaultDeploymentTypeTest.java 2009-01-14 06:56:59 UTC (rev 946) @@ -0,0 +1,29 @@ +package org.jboss.webbeans.tck.tests.definition; + +import javax.webbeans.Production; +import javax.webbeans.Standard; + +import org.jboss.webbeans.tck.impl.SpecAssertion; +import org.jboss.webbeans.tck.impl.TckUtils; +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 TckUtils.getManagers().getEnabledDeploymentTypes().size() == 2; + assert TckUtils.getManagers().getEnabledDeploymentTypes().get(0).equals(Standard.class); + assert TckUtils.getManagers().getEnabledDeploymentTypes().get(1).equals(Production.class); + } + +} Added: 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 (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/DeploymentTypeTest.java 2009-01-14 06:56:59 UTC (rev 946) @@ -0,0 +1,158 @@ +package org.jboss.webbeans.tck.tests.definition; + +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.TckUtils; +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() + { + TckUtils.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() + { + TckUtils.getManagers().setEnabledDeploymentTypes( + Arrays.asList(Standard.class, AnotherDeploymentType.class, + HornedAnimalDeploymentType.class)); + assert TckUtils.getManagers().getEnabledDeploymentTypes().size() == 3; + assert TckUtils.getManagers().getEnabledDeploymentTypes().get(0).equals(Standard.class); + assert TckUtils.getManagers().getEnabledDeploymentTypes().get(1).equals(AnotherDeploymentType.class); + assert TckUtils.getManagers().getEnabledDeploymentTypes().get(2).equals(HornedAnimalDeploymentType.class); + } + + @SuppressWarnings("unchecked") + @Test(expectedExceptions=DeploymentException.class) @SpecAssertion(section="2.5.6") + public void testStandardMustBeDeclared() + { + TckUtils.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 Added: 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 (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/NameTest.java 2009-01-14 06:56:59 UTC (rev 946) @@ -0,0 +1,140 @@ +package org.jboss.webbeans.tck.tests.definition; + +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.TckUtils; +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 TckUtils.getBeans().isBeanNameDefaulted(model); + 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; + } + +} Added: 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 (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/ScopeTypeTest.java 2009-01-14 06:56:59 UTC (rev 946) @@ -0,0 +1,151 @@ +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 Added: 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 (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/TypeTest.java 2009-01-14 06:56:59 UTC (rev 946) @@ -0,0 +1,22 @@ +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"); + } + +} +