Author: shane.bryzak(a)jboss.com Date: 2009-03-09 04:46:40 -0400 (Mon, 09 Mar 2009) New Revision: 1868 Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerField/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerField/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerField/ProducerFieldDeploymentTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerField/SpiderProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerField/Tarantula.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerMethod/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerMethod/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerMethod/ProducerMethodDeploymentTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerMethod/SpiderProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerMethod/Tarantula.java Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/TooManyDeploymentTypesTest.java Log: section 2.5.3 tests Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/TooManyDeploymentTypesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/TooManyDeploymentTypesTest.java 2009-03-09 08:10:44 UTC (rev 1867) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/TooManyDeploymentTypesTest.java 2009-03-09 08:46:40 UTC (rev 1868) @@ -32,15 +32,11 @@ @ExpectedDeploymentException(DefinitionException.class) public class TooManyDeploymentTypesTest extends AbstractDeclarativeTest { - /** - * An bean class or producer method or field may specify at most one - * deployment type. If multiple deployment type annotations are specified, a - * DefinitionException is thrown by the container at deployment time. - */ @Test(groups = { "deploymentType"}) @SpecAssertion(section = "2.5.3", id = "d") public void testTooManyDeploymentTypes() { + assert false; } } Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerField/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerField/AnotherDeploymentType.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerField/AnotherDeploymentType.java 2009-03-09 08:46:40 UTC (rev 1868) @@ -0,0 +1,22 @@ +package org.jboss.jsr299.tck.tests.definition.deployment.broken.tooMany.producerField; + +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.Inherited; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.inject.DeploymentType; + +@Target( { TYPE, METHOD }) +@Retention(RUNTIME) +@Documented +@DeploymentType +@Inherited +@interface AnotherDeploymentType +{ + +} \ No newline at end of file Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerField/ProducerFieldDeploymentTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerField/ProducerFieldDeploymentTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerField/ProducerFieldDeploymentTest.java 2009-03-09 08:46:40 UTC (rev 1868) @@ -0,0 +1,21 @@ +package org.jboss.jsr299.tck.tests.definition.deployment.broken.tooMany.producerField; + +import javax.inject.DefinitionException; + +import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.jsr299.tck.AbstractDeclarativeTest; +import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; +import org.testng.annotations.Test; + +@Artifact +(a)ExpectedDeploymentException(DefinitionException.class) +public class ProducerFieldDeploymentTest extends AbstractDeclarativeTest +{ + @Test(groups = { "deploymentType"}) + @SpecAssertion(section = "2.5.3", id = "f") + public void testTooManyDeploymentTypes() + { + assert false; + } +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerField/SpiderProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerField/SpiderProducer.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerField/SpiderProducer.java 2009-03-09 08:46:40 UTC (rev 1868) @@ -0,0 +1,12 @@ +package org.jboss.jsr299.tck.tests.definition.deployment.broken.tooMany.producerField; + +import javax.inject.Produces; +import javax.inject.Production; + +@Production +@AnotherDeploymentType +class SpiderProducer +{ + @Produces public Tarantula produceTarantula = new Tarantula(); +} + \ No newline at end of file Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerField/Tarantula.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerField/Tarantula.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerField/Tarantula.java 2009-03-09 08:46:40 UTC (rev 1868) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.tests.definition.deployment.broken.tooMany.producerField; + +public class Tarantula +{ + +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerMethod/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerMethod/AnotherDeploymentType.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerMethod/AnotherDeploymentType.java 2009-03-09 08:46:40 UTC (rev 1868) @@ -0,0 +1,22 @@ +package org.jboss.jsr299.tck.tests.definition.deployment.broken.tooMany.producerMethod; + +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.Inherited; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.inject.DeploymentType; + +@Target( { TYPE, METHOD }) +@Retention(RUNTIME) +@Documented +@DeploymentType +@Inherited +@interface AnotherDeploymentType +{ + +} \ No newline at end of file Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerMethod/ProducerMethodDeploymentTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerMethod/ProducerMethodDeploymentTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerMethod/ProducerMethodDeploymentTest.java 2009-03-09 08:46:40 UTC (rev 1868) @@ -0,0 +1,21 @@ +package org.jboss.jsr299.tck.tests.definition.deployment.broken.tooMany.producerMethod; + +import javax.inject.DefinitionException; + +import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.jsr299.tck.AbstractDeclarativeTest; +import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; +import org.testng.annotations.Test; + +@Artifact +(a)ExpectedDeploymentException(DefinitionException.class) +public class ProducerMethodDeploymentTest extends AbstractDeclarativeTest +{ + @Test(groups = { "deploymentType"}) + @SpecAssertion(section = "2.5.3", id = "e") + public void testTooManyDeploymentTypes() + { + assert false; + } +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerMethod/SpiderProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerMethod/SpiderProducer.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerMethod/SpiderProducer.java 2009-03-09 08:46:40 UTC (rev 1868) @@ -0,0 +1,15 @@ +package org.jboss.jsr299.tck.tests.definition.deployment.broken.tooMany.producerMethod; + +import javax.inject.Produces; +import javax.inject.Production; + +@Production +@AnotherDeploymentType +class SpiderProducer +{ + @Produces public Tarantula produceTarantula() + { + return new Tarantula(); + } +} + \ No newline at end of file Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerMethod/Tarantula.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerMethod/Tarantula.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerMethod/Tarantula.java 2009-03-09 08:46:40 UTC (rev 1868) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.tests.definition.deployment.broken.tooMany.producerMethod; + +public class Tarantula +{ + +}