[webbeans-commits] Webbeans SVN: r3059 - in tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests: implementation/producer/field/definition and 1 other directory.

Author: shane.bryzak(a)jboss.com Date: 2009-07-15 21:47:19 -0400 (Wed, 15 Jul 2009) New Revision: 3059 Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/DecoratorDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/ProducerFieldDefinitionTest.java Log: matched decorator and producer field tests Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/DecoratorDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/DecoratorDefinitionTest.java 2009-07-16 01:31:46 UTC (rev 3058) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/DecoratorDefinitionTest.java 2009-07-16 01:47:19 UTC (rev 3059) @@ -35,12 +35,12 @@ /** * @author pmuir * + * Spec version: 20090625 */ @Artifact @BeansXml("beans.xml") public class DecoratorDefinitionTest extends AbstractJSR299Test { - @Test @SpecAssertions ({ @@ -48,7 +48,7 @@ @SpecAssertion(section="8.1", id="d"), @SpecAssertion(section="8.1.1", id="a"), @SpecAssertion(section="8.1.3", id="c"), - @SpecAssertion(section="8.3", id="a"), + @SpecAssertion(section="8.3", id="aa"), @SpecAssertion(section="11.1.1", id="a") }) @@ -121,7 +121,7 @@ @Test @SpecAssertions({ @SpecAssertion(section="8.2", id="b"), - @SpecAssertion(section="8.3", id="a") + @SpecAssertion(section="8.3", id="aa") }) public void testDecoratorOrdering() { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/ProducerFieldDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/ProducerFieldDefinitionTest.java 2009-07-16 01:31:46 UTC (rev 3058) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/ProducerFieldDefinitionTest.java 2009-07-16 01:47:19 UTC (rev 3059) @@ -18,20 +18,19 @@ /** * - * Spec version: 20090519 + * Spec version: 20090625 * */ @Artifact @BeansXml("beans.xml") public class ProducerFieldDefinitionTest extends AbstractJSR299Test -{ - +{ private static final Annotation TAME_LITERAL = new AnnotationLiteral<Tame>() {}; private static final Annotation FOO_LITERAL = new AnnotationLiteral<Foo>() {}; private static final Annotation STATIC_LITERAL = new AnnotationLiteral<Static>() {}; - @Test(groups = { "producerField" }) - @SpecAssertion(section = "2.5.3", id = "h") + @Test(groups = { "producerField", "deployment" }) + @SpecAssertion(section = "review", id = "review") public void testProducerFieldInheritsDeploymentTypeOfDeclaringWebBean() throws Exception { Set<Bean<Tarantula>> tarantulaBeans = getBeans(Tarantula.class); @@ -40,7 +39,7 @@ } @Test(groups = "producerField") - @SpecAssertion(section = "3.5", id = "fa") + @SpecAssertion(section = "3.4", id = "fa") public void testParameterizedReturnType() throws Exception { new RunInDependentContext() @@ -57,9 +56,9 @@ @Test(groups = { "producerField", "deployment" }) @SpecAssertions({ - @SpecAssertion(section = "3.5", id = "j"), - @SpecAssertion(section = "3.5", id = "c"), - @SpecAssertion(section = "3.5.2", id ="a") + @SpecAssertion(section = "3.4", id = "j"), + @SpecAssertion(section = "3.4", id = "c"), + @SpecAssertion(section = "3.4.2", id ="a") }) public void testBeanDeclaresMultipleProducerFields() { @@ -81,7 +80,7 @@ } @Test(groups = "producerField") - @SpecAssertion(section = "3.5.1", id = "c") + @SpecAssertion(section = "3.4.1", id = "c") public void testApiTypeForClassReturn() { Set<Bean<Tarantula>> tarantulaBeans = getBeans(Tarantula.class); @@ -97,7 +96,7 @@ } @Test(groups = { "producerField" }) - @SpecAssertion(section = "3.5.1", id = "a") + @SpecAssertion(section = "3.4.1", id = "a") public void testApiTypeForInterfaceReturn() { Set<Bean<Animal>> animalBeans = getBeans(Animal.class, new AnnotationLiteral<AsAnimal>() {}); @@ -109,7 +108,7 @@ } @Test(groups = { "producerField" }) - @SpecAssertion(section = "3.5.1", id = "b") + @SpecAssertion(section = "3.4.1", id = "b") public void testApiTypeForPrimitiveReturn() { Set<Bean<?>> beans = getCurrentManager().getBeans("SpiderSize"); @@ -122,7 +121,7 @@ @Test(groups = { "producerField" }) @SpecAssertions({ - @SpecAssertion(section = "3.5.1", id = "b"), + @SpecAssertion(section = "3.4.1", id = "b"), @SpecAssertion(section = "2.2.1", id = "i") }) public void testApiTypeForArrayTypeReturn() @@ -137,7 +136,7 @@ @Test(groups = "producerField") @SpecAssertions({ - @SpecAssertion(section = "3.5.2", id = "f"), + @SpecAssertion(section = "3.4.2", id = "f"), @SpecAssertion(section="2.3.3", id="c") }) public void testBindingType() @@ -150,7 +149,7 @@ } @Test(groups = "producerField") - @SpecAssertion(section = "3.5.2", id = "b") + @SpecAssertion(section = "3.4.2", id = "b") public void testScopeType() { Set<Bean<Tarantula>> tarantulaBeans = getBeans(Tarantula.class, TAME_LITERAL, FOO_LITERAL); @@ -160,7 +159,7 @@ } @Test(groups = "producerField") - @SpecAssertion(section = "3.5.2", id = "d") + @SpecAssertion(section = "3.4.2", id = "review") public void testDeploymentType() { Set<Bean<Tarantula>> tarantulaBeans = getBeans(Tarantula.class, TAME_LITERAL, FOO_LITERAL); @@ -171,8 +170,8 @@ @Test(groups = "producerField") @SpecAssertions({ - @SpecAssertion(section = "3.5.2", id = "c"), - @SpecAssertion(section="2.6.1", id = "c") + @SpecAssertion(section = "3.4.2", id = "c"), + @SpecAssertion(section="2.5.1", id = "c") }) public void testNamedField() { @@ -186,9 +185,9 @@ @Test(groups = { "producerField" }) @SpecAssertions({ - @SpecAssertion(section = "2.6.3", id = "a"), - @SpecAssertion(section = "3.5.4", id = "a"), - @SpecAssertion(section = "2.6.1", id = "d") + @SpecAssertion(section = "2.5.3", id = "a"), + @SpecAssertion(section = "3.4.3", id = "a"), + @SpecAssertion(section = "2.5.1", id = "d") }) public void testDefaultNamedField() { @@ -202,7 +201,7 @@ @Test(groups = "producerField") @SpecAssertions({ @SpecAssertion(section = "2.7.2", id = "c"), - @SpecAssertion(section = "3.5.2", id = "e") + @SpecAssertion(section = "3.4.2", id = "e") }) public void testStereotype() {