[webbeans-commits] Webbeans SVN: r3069 - in tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests: definition/deployment/broken/tooMany/producerMethod and 3 other directories.

Author: shane.bryzak(a)jboss.com Date: 2009-07-16 20:23:13 -0400 (Thu, 16 Jul 2009) New Revision: 3069 Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/DeploymentTypeDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerMethod/TooManyProducerMethodDeploymentTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/custom/CustomDeploymentTypeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesMultipleDeploymentTypes/MultipleStereotypesWithMultipleDeploymentTypesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/ProducerMethodDefinitionTest.java Log: matched producer method tests, other misc tests Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/DeploymentTypeDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/DeploymentTypeDefinitionTest.java 2009-07-16 23:33:04 UTC (rev 3068) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/DeploymentTypeDefinitionTest.java 2009-07-17 00:23:13 UTC (rev 3069) @@ -18,14 +18,14 @@ import org.testng.annotations.Test; /** - * Spec version: 20090519 + * Spec version: 20090625 */ @Artifact @BeansXml("beans.xml") public class DeploymentTypeDefinitionTest extends AbstractJSR299Test { @Test(groups = { "annotationDefinition", "deploymentType" }) - @SpecAssertion(section = "2.5.2", id = "a") + @SpecAssertion(section = "review", id = "review") public void testDeploymentTypeHasCorrectTarget() { assert getBeans(BlackWidow.class).size() == 1; @@ -39,7 +39,7 @@ } @Test(groups = { "annotationDefinition", "deploymentType" }) - @SpecAssertion(section = "2.5.2", id = "c") + @SpecAssertion(section = "review", id = "review") public void testDeploymentTypeDeclaresDeploymentTypeAnnotation() { assert getBeans(BlackWidow.class).size() == 1; @@ -48,7 +48,7 @@ } @Test(groups = { "deploymentType" }) - @SpecAssertion(section = "2.5.3", id = "g") + @SpecAssertion(section = "review", id = "review") public void testDeploymentTypeInheritedFromDeclaringBean() throws Exception { assert getBeans(BlackWidow.class).size() == 1; @@ -57,7 +57,7 @@ } @Test(groups = { "webbeansxml", "deploymentType" }) - @SpecAssertion(section = "2.5.4", id = "aa") + @SpecAssertion(section = "review", id = "review") public void testDefaultDeploymentType() { assert getBeans(Tarantula.class).size() == 1; @@ -66,7 +66,7 @@ } @Test(groups = { "deploymentType" }) - @SpecAssertion(section = "2.5.4", id = "b") + @SpecAssertion(section = "review", id = "review") public void testHighestPrecedenceDeploymentTypeFromStereotype() { assert getBeans(Rhinoceros.class).size() == 1; @@ -75,7 +75,7 @@ } @Test(groups = { "beanLifecycle", "deploymentType" }, expectedExceptions = UnsatisfiedResolutionException.class) - @SpecAssertion(section = "2.5.5", id = "a") + @SpecAssertion(section = "review", id = "review") public void testBeanWithDisabledDeploymentTypeNotInstantiated() { getInstanceByType(RedSnapper.class); @@ -83,8 +83,8 @@ @Test(groups = { "deploymentType" }) @SpecAssertions( { - @SpecAssertion(section = "2.5.4", id = "c"), - @SpecAssertion(section = "2.7.2", id = "da") + @SpecAssertion(section = "review", id = "review"), + @SpecAssertion(section = "review", id = "review") }) public void testWebBeanDeploymentTypeOverridesStereotype() { @@ -94,7 +94,7 @@ } @Test - @SpecAssertion(section = "2.5.3", id = "i") + @SpecAssertion(section = "review", id = "review") public void testDeploymentTypeMayBeSpecifiedByStereotype() { assert getBeans(Goat.class).size() == 1; @@ -103,7 +103,7 @@ } @Test(groups = { "deploymentType" }) - @SpecAssertion(section = "4.1", id = "ca") + @SpecAssertion(section = "review", id = "review") public void testDeploymentTypeDeclaredInheritedIsInherited() throws Exception { assert getBeans(BorderCollie.class).size() == 1; @@ -111,7 +111,7 @@ } @Test(groups = { "deploymentType" }) - @SpecAssertion(section = "4.1", id = "ca") + @SpecAssertion(section = "review", id = "review") public void testDeploymentTypeNotDeclaredInheritedIsNotInherited() { assert getBeans(ShetlandPony.class).size() == 1; @@ -119,7 +119,7 @@ } @Test(groups = { "deploymentType" }) - @SpecAssertion(section = "4.1", id = "cc") + @SpecAssertion(section = "review", id = "review") public void testDeploymentTypeDeclaredInheritedIsBlockedByIntermediateDeploymentTypeNotMarkedInherited() { assert getBeans(GoldenRetriever.class).size() == 1; @@ -127,7 +127,7 @@ } @Test(groups = { "deploymentType" }) - @SpecAssertion(section = "4.1", id = "cc") + @SpecAssertion(section = "review", id = "review") public void testDeploymentTypeDeclaredInheritedIsBlockedByIntermediateDeploymentTypeMarkedInherited() { assert getBeans(GoldenLabrador.class).size() == 1; @@ -135,7 +135,7 @@ } @Test - @SpecAssertion(section = "4.1", id = "dab") + @SpecAssertion(section = "review", id = "review") public void testDeploymentTypeIsOverriddenByInheritedDeploymentType() { assert getBeans(Cow.class).size() == 1; @@ -143,7 +143,7 @@ } @Test - @SpecAssertion(section = "4.1", id = "dcb") + @SpecAssertion(section = "review", id = "review") public void testDeploymentTypeIsOverriddenByIndirectlyInheritedDeploymentType() { assert getBeans(JerseyCow.class).size() == 1; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerMethod/TooManyProducerMethodDeploymentTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerMethod/TooManyProducerMethodDeploymentTest.java 2009-07-16 23:33:04 UTC (rev 3068) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerMethod/TooManyProducerMethodDeploymentTest.java 2009-07-17 00:23:13 UTC (rev 3069) @@ -10,14 +10,14 @@ /** * Validate that a producer method declares at most one deployment type. - * Spec version: 20090519 + * Spec version: 20090625 */ @Artifact @ExpectedDeploymentException(DefinitionError.class) public class TooManyProducerMethodDeploymentTest extends AbstractJSR299Test { @Test(groups = { "deploymentType" }) - @SpecAssertion(section = "2.5.3", id = "ea") + @SpecAssertion(section = "review", id = "review") public void testTooManyDeploymentTypes() { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/custom/CustomDeploymentTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/custom/CustomDeploymentTypeTest.java 2009-07-16 23:33:04 UTC (rev 3068) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/custom/CustomDeploymentTypeTest.java 2009-07-17 00:23:13 UTC (rev 3069) @@ -11,7 +11,7 @@ /** * - * Spec version: 20090519 + * Spec version: 20090625 * */ @Artifact @@ -20,10 +20,10 @@ { @SuppressWarnings("unchecked") - @Test(groups="rewrite") + @Test(groups={"rewrite", "deployment"}) @SpecAssertions({ - @SpecAssertion(section = "2.5.5", id = "b"), - @SpecAssertion(section = "2.5.2", id = "d") + @SpecAssertion(section = "review", id = "review"), + @SpecAssertion(section = "review", id = "review") // deployment types removed from spec }) // Note new wording around @Standard not being explicitly needed public void testCustomDeploymentTypes() Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesMultipleDeploymentTypes/MultipleStereotypesWithMultipleDeploymentTypesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesMultipleDeploymentTypes/MultipleStereotypesWithMultipleDeploymentTypesTest.java 2009-07-16 23:33:04 UTC (rev 3068) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesMultipleDeploymentTypes/MultipleStereotypesWithMultipleDeploymentTypesTest.java 2009-07-17 00:23:13 UTC (rev 3069) @@ -8,14 +8,14 @@ import org.testng.annotations.Test; /** - * Spec version: 20090519 + * Spec version: 20090625 */ @Artifact @BeansXml("beans.xml") public class MultipleStereotypesWithMultipleDeploymentTypesTest extends AbstractJSR299Test { @Test - @SpecAssertions( { @SpecAssertion(section = "2.7.2", id = "e"), @SpecAssertion(section = "2.5.4", id = "b") }) + @SpecAssertions( { @SpecAssertion(section = "2.7.2", id = "e"), @SpecAssertion(section = "review", id = "review") }) public void testMultipleStereotypesWithMultipleDeploymentTypes() { assert getBeans(Goat.class).size() == 1; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/ProducerMethodDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/ProducerMethodDefinitionTest.java 2009-07-16 23:33:04 UTC (rev 3068) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/ProducerMethodDefinitionTest.java 2009-07-17 00:23:13 UTC (rev 3069) @@ -20,7 +20,7 @@ /** * - * Spec version: 20090519 + * Spec version: 20090625 * */ @Artifact @@ -33,8 +33,8 @@ @Test(groups = "producerMethod") @SpecAssertions( { - @SpecAssertion(section = "2.5.3", id = "g"), - @SpecAssertion(section = "3.4.3", id = "c") + @SpecAssertion(section = "review", id = "review"), + @SpecAssertion(section = "3.3.3", id = "c") } ) public void testProducerMethodInheritsDeploymentTypeOfDeclaringWebBean() throws Exception { @@ -44,8 +44,8 @@ @Test(groups = "producerMethod") @SpecAssertions( { - @SpecAssertion(section = "3.4", id = "b"), - @SpecAssertion(section = "7.5", id = "a") + @SpecAssertion(section = "3.3", id = "b"), + @SpecAssertion(section = "7.3.4", id = "a") } ) public void testStaticMethod() throws Exception { @@ -55,7 +55,7 @@ @Test(groups = { "producerMethod" }) @SpecAssertions( { - @SpecAssertion(section = "3.4", id = "a") + @SpecAssertion(section = "3.3", id = "a") } ) public void testProducerOnNonBean() throws Exception { @@ -64,9 +64,9 @@ @Test(groups = "producerMethod") @SpecAssertions( { - @SpecAssertion(section = "3.4.5", id = "b") + @SpecAssertion(section = "3.3.5", id = "b") } ) - public void testStaticDisposalMethod() throws Exception + public void testStaticDisposerMethod() throws Exception { assert getBeans(String.class).size() == 1; String aString = getInstanceByType(String.class); @@ -77,7 +77,7 @@ } @Test(groups = "producerMethod") - @SpecAssertion(section = "3.4", id = "ga") + @SpecAssertion(section = "3.3", id = "ga") public void testParameterizedReturnType() throws Exception { assert getBeans(new TypeLiteral<FunnelWeaver<Spider>>() {}).size() == 1; @@ -85,8 +85,8 @@ @Test(groups = "producerMethod") @SpecAssertions({ - @SpecAssertion(section = "3.4", id = "c"), - @SpecAssertion(section = "3.4.2", id = "a"), + @SpecAssertion(section = "3.3", id = "c"), + @SpecAssertion(section = "3.3.2", id = "a"), @SpecAssertion(section = "2.3.1", id = "a0"), @SpecAssertion(section = "2.3.1", id = "aa") }) @@ -100,7 +100,7 @@ @Test(groups = "producerMethod") @SpecAssertions({ - @SpecAssertion(section = "3.4.1", id = "c"), + @SpecAssertion(section = "3.3.1", id = "c"), @SpecAssertion(section="2.2", id = "l") }) public void testApiTypeForClassReturn() throws Exception @@ -118,7 +118,7 @@ } @Test(groups = "producerMethod") - @SpecAssertion(section = "3.4.1", id = "a") + @SpecAssertion(section = "3.3.1", id = "a") public void testApiTypeForInterfaceReturn() throws Exception { assert getBeans(Bite.class).size() == 1; @@ -129,7 +129,7 @@ } @Test(groups = "producerMethod") - @SpecAssertion(section = "3.4.1", id = "b") + @SpecAssertion(section = "3.3.1", id = "b") public void testApiTypeForPrimitiveReturn() throws Exception { assert getBeans(Integer.class).size() == 1; @@ -141,7 +141,7 @@ @Test(groups = "producerMethod") @SpecAssertions({ - @SpecAssertion(section = "3.4.1", id = "b"), + @SpecAssertion(section = "3.3.1", id = "b"), @SpecAssertion(section = "2.2", id = "j") }) public void testApiTypeForArrayTypeReturn() throws Exception @@ -155,8 +155,8 @@ @Test(groups = "producerMethod") @SpecAssertions({ - @SpecAssertion(section = "3.4.2", id = "be"), - @SpecAssertion(section = "3.4", id = "k") + @SpecAssertion(section = "3.3.2", id = "be"), + @SpecAssertion(section = "3.3", id = "k") }) public void testBindingType() throws Exception { @@ -168,8 +168,8 @@ @Test(groups = "producerMethod") @SpecAssertions({ - @SpecAssertion(section = "3.4.2", id = "ba"), - @SpecAssertion(section = "3.4", id = "k") + @SpecAssertion(section = "3.3.2", id = "ba"), + @SpecAssertion(section = "3.3", id = "k") }) public void testScopeType() throws Exception { @@ -180,8 +180,8 @@ @Test(groups = "producerMethod") @SpecAssertions({ - @SpecAssertion(section = "3.4.2", id = "bc"), - @SpecAssertion(section = "2.5.3", id = "b") + @SpecAssertion(section = "3.3.2", id = "bc"), + @SpecAssertion(section = "review", id = "review") }) public void testDeploymentType() throws Exception { @@ -192,8 +192,8 @@ @Test(groups = "producerMethod") @SpecAssertions({ - @SpecAssertion(section = "3.4.2", id = "bb"), - @SpecAssertion(section = "2.6.1", id = "b") + @SpecAssertion(section = "3.3.2", id = "bb"), + @SpecAssertion(section = "2.5.1", id = "b") }) public void testNamedMethod() throws Exception { @@ -204,9 +204,9 @@ @Test(groups = "producerMethod") @SpecAssertions({ - @SpecAssertion(section = "3.4.2", id = "bb"), - @SpecAssertion(section = "2.6.1", id = "d"), - @SpecAssertion(section = "3.4.12", id = "a") + @SpecAssertion(section = "3.3.2", id = "bb"), + @SpecAssertion(section = "2.5.1", id = "d"), + @SpecAssertion(section = "3.3.10", id = "a") }) public void testDefaultNamedMethod() throws Exception { @@ -222,9 +222,9 @@ @Test(groups = "producerMethod") @SpecAssertions({ @SpecAssertion(section = "2.7.2", id = "b"), - @SpecAssertion(section = "3.4.2", id = "ba"), - @SpecAssertion(section = "2.4.5", id = "c"), - @SpecAssertion(section = "3.4.2", id = "bd") + @SpecAssertion(section = "3.3.2", id = "ba"), + @SpecAssertion(section = "2.4.4", id = "c"), + @SpecAssertion(section = "3.3.2", id = "bd") }) public void testStereotypeSpecifiesScope() throws Exception { @@ -253,7 +253,7 @@ } @Test - @SpecAssertion(section = "2.3.6", id = "a") + @SpecAssertion(section = "2.3.5", id = "a") public void testBindingTypesAppliedToProducerMethodParameters() { Bean<Tarantula> tarantula = getBeans(Tarantula.class, DEADLIEST_LITERAL).iterator().next(); @@ -263,14 +263,14 @@ } @Test - @SpecAssertion(section = "3.4", id = "e") + @SpecAssertion(section = "3.3", id = "e") public void testDependentProducerReturnsNullValue() { assert getInstanceByType(Acorn.class) == null; } @Test(groups = { "ri-broken" }, expectedExceptions = { IllegalProductException.class }) - @SpecAssertion(section = "3.4", id = "f") + @SpecAssertion(section = "3.3", id = "f") public void testNonDependentProducerReturnsNullValue() { getInstanceByType(Pollen.class);