[webbeans-commits] Webbeans SVN: r3088 - in tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests: implementation/producer/method/definition and 7 other directories.

Author: shane.bryzak(a)jboss.com Date: 2009-07-19 19:52:32 -0400 (Sun, 19 Jul 2009) New Revision: 3088 Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/ProducerFieldLifecycleTest.java 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/inheritance/specialization/enterprise/EnterpriseBeanSpecializationIntegrationTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/InvalidEnterpriseBeanSpecializationTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsNothing/DirectlyExtendsNothingTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsSimpleBean/DirectlyExtendsSimpleBeanTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/implementInterfaceAndExtendsNothing/ImplementsInterfaceAndExtendsNothingTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/DependencyResolutionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/InjectionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java Log: matched miscellaneous tests to assertions Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/ProducerFieldLifecycleTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/ProducerFieldLifecycleTest.java 2009-07-19 13:31:12 UTC (rev 3087) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/ProducerFieldLifecycleTest.java 2009-07-19 23:52:32 UTC (rev 3088) @@ -11,7 +11,7 @@ /** * - * Spec version: 20090519 + * Spec version: 20090625 * */ @Artifact @@ -21,7 +21,7 @@ @Test(groups = { "producerField" }) @SpecAssertions({ - @SpecAssertion(section = "7.6", id = "b") + @SpecAssertion(section = "7.3.5", id = "review") // removed from spec }) public void testProducerFieldNotAnotherBean() { @@ -38,8 +38,8 @@ @Test(groups = { "producerField" }) @SpecAssertions({ - @SpecAssertion(section = "5.4.7", id = "a"), - @SpecAssertion(section = "3.5", id = "b") + @SpecAssertion(section = "5.6.7", id = "a"), + @SpecAssertion(section = "3.4", id = "b") }) public void testProducerStaticFieldBean() { @@ -58,9 +58,8 @@ @Test(groups = { "producerField" }) @SpecAssertions({ @SpecAssertion(section = "4.3.2", id = "a"), - @SpecAssertion(section = "5.4.7", id = "b"), - @SpecAssertion(section = "7.6", id = "ga"), - @SpecAssertion(section = "7.6", id = "a") + @SpecAssertion(section = "5.6.7", id = "b"), + @SpecAssertion(section = "7.3.5", id = "ga") }) public void testProducerFieldBeanCreate() throws Exception { @@ -95,8 +94,8 @@ @Test(groups = { "producerField" }) @SpecAssertions({ - @SpecAssertion(section = "3.5", id = "d"), - @SpecAssertion(section = "7.6", id = "m") + @SpecAssertion(section = "3.4", id = "d"), + @SpecAssertion(section = "7.3.5", id = "m") }) public void testProducerFieldReturnsNullIsDependent() throws Exception { @@ -113,8 +112,8 @@ @Test(groups = { "producerField" }, expectedExceptions = IllegalProductException.class) @SpecAssertions({ - @SpecAssertion(section = "3.5", id = "e"), - @SpecAssertion(section = "7.6", id = "n") + @SpecAssertion(section = "3.4", id = "e"), + @SpecAssertion(section = "7.3.5", id = "n") }) public void testProducerFieldReturnsNullIsNotDependent() throws Exception { 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-19 13:31:12 UTC (rev 3087) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/ProducerMethodDefinitionTest.java 2009-07-19 23:52:32 UTC (rev 3088) @@ -180,7 +180,7 @@ @Test(groups = "producerMethod") @SpecAssertions({ - @SpecAssertion(section = "3.3.2", id = "bc"), + @SpecAssertion(section = "review", id = "review"), // deployment types removed from spec @SpecAssertion(section = "review", id = "review") }) public void testDeploymentType() throws Exception Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationIntegrationTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationIntegrationTest.java 2009-07-19 13:31:12 UTC (rev 3087) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationIntegrationTest.java 2009-07-19 23:52:32 UTC (rev 3088) @@ -14,6 +14,11 @@ import org.jboss.testharness.impl.packaging.jsr299.BeansXml; import org.testng.annotations.Test; +/** + * + * Spec version: 20090625 + * + */ @Artifact @IntegrationTest @Packaging(PackagingType.EAR) @@ -25,9 +30,8 @@ @Test @SpecAssertions({ - @SpecAssertion(section = "4.3.1", id = "f"), - @SpecAssertion(section = "3.3.7", id = "b"), - @SpecAssertion(section = "3.3.7", id = "c") + @SpecAssertion(section = "3.2.4", id = "review"), // removed from spec? + @SpecAssertion(section = "3.2.4", id = "review") }) public void testSpecializedBeanNotInstantiated() throws Exception { @@ -46,7 +50,7 @@ @Test - @SpecAssertion(section="4.3.1", id = "g") + @SpecAssertion(section="review", id = "review") // removed from spec? public void testProducerMethodOnSpecializedBeanCalledOnSpecializingBean() throws Exception { new RunInDependentContext() Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/InvalidEnterpriseBeanSpecializationTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/InvalidEnterpriseBeanSpecializationTest.java 2009-07-19 13:31:12 UTC (rev 3087) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/InvalidEnterpriseBeanSpecializationTest.java 2009-07-19 23:52:32 UTC (rev 3088) @@ -9,7 +9,7 @@ import org.testng.annotations.Test; /** - * Spec version: 20090519 + * Spec version: 20090625 */ @Artifact @Packaging(PackagingType.EAR) @@ -17,14 +17,14 @@ public class InvalidEnterpriseBeanSpecializationTest extends AbstractJSR299Test { @Test(groups={"stub", "specialization"}) - @SpecAssertion(section="3.3.4", id = "e") + @SpecAssertion(section="3.2.4", id = "review") // removed from spec? public void testSpecializingBeanDoesNotSupportAllLocalInterfacesOnSpecializedBean() { assert false; } @Test(groups={"stub", "specialization"}) - @SpecAssertion(section="3.3.4", id = "f") + @SpecAssertion(section="3.2.4", id = "review") // removed from spec? public void testSpecializingBeanDoesNotSupportLocalInterfaceView() { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsNothing/DirectlyExtendsNothingTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsNothing/DirectlyExtendsNothingTest.java 2009-07-19 13:31:12 UTC (rev 3087) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsNothing/DirectlyExtendsNothingTest.java 2009-07-19 23:52:32 UTC (rev 3088) @@ -11,7 +11,7 @@ import org.testng.annotations.Test; /** - * Spec version: 20090519 + * Spec version: 20090625 */ @Artifact @ExpectedDeploymentException(DefinitionError.class) @@ -21,7 +21,7 @@ @Test(groups={"specialization"}) - @SpecAssertion(section="3.3.4", id = "da") + @SpecAssertion(section="3.2.4", id = "da") public void testSpecializingClassDirectlyExtendsNothing() { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsSimpleBean/DirectlyExtendsSimpleBeanTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsSimpleBean/DirectlyExtendsSimpleBeanTest.java 2009-07-19 13:31:12 UTC (rev 3087) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsSimpleBean/DirectlyExtendsSimpleBeanTest.java 2009-07-19 23:52:32 UTC (rev 3088) @@ -11,7 +11,7 @@ import org.testng.annotations.Test; /** - * Spec version: 20090519 + * Spec version: 20090625 */ @Artifact @Packaging(PackagingType.EAR) @@ -21,7 +21,7 @@ @Test(groups={"specialization"}) - @SpecAssertion(section="3.3.4", id = "da") + @SpecAssertion(section="3.2.4", id = "da") public void testSpecializingClassDirectlyExtendsSimpleBean() { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/implementInterfaceAndExtendsNothing/ImplementsInterfaceAndExtendsNothingTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/implementInterfaceAndExtendsNothing/ImplementsInterfaceAndExtendsNothingTest.java 2009-07-19 13:31:12 UTC (rev 3087) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/implementInterfaceAndExtendsNothing/ImplementsInterfaceAndExtendsNothingTest.java 2009-07-19 23:52:32 UTC (rev 3088) @@ -11,7 +11,7 @@ import org.testng.annotations.Test; /** - * Spec version: 20090519 + * Spec version: 20090625 */ @ExpectedDeploymentException(DefinitionError.class) @Artifact @@ -20,7 +20,7 @@ { @Test(groups={"specialization"}) - @SpecAssertion(section="3.3.4", id = "da") + @SpecAssertion(section="3.2.4", id = "da") public void testSpecializingClassImplementsInterfaceAndExtendsNothing() { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/DependencyResolutionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/DependencyResolutionTest.java 2009-07-19 13:31:12 UTC (rev 3087) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/DependencyResolutionTest.java 2009-07-19 23:52:32 UTC (rev 3088) @@ -22,7 +22,7 @@ /** * Tests for dependency resolution problem detection * - * Spec version: 20090519 + * Spec version: 20090625 */ @Artifact public class DependencyResolutionTest extends AbstractJSR299Test @@ -83,7 +83,7 @@ } @Test(groups = "rewrite") - @SpecAssertion(section = "5.1.2", id = "aa") + @SpecAssertion(section = "5.3.1", id = "aa") public void testUnsatisfiedDependencyDetected() throws Exception { Bean<Vanilla> vanillaBean = getBeans(Vanilla.class).iterator().next(); @@ -97,7 +97,7 @@ } @Test(groups = "rewrite") - @SpecAssertion(section = "5.1.2", id = "aa") + @SpecAssertion(section = "5.3.1", id = "aa") public void testAmbiguousDependencyDetected() throws Exception { Bean<Vanilla> vanillaBean = getBeans(Vanilla.class).iterator().next(); @@ -110,7 +110,7 @@ } @Test(groups = "rewrite") - @SpecAssertion(section = "5.3.1", id = "aa") + @SpecAssertion(section = "5.5.1", id = "aa") public void testUnproxyableDependencyDetected() throws Exception { final Bean<Mustard> bean = getBeans(Mustard.class).iterator().next(); @@ -164,7 +164,7 @@ } @Test - @SpecAssertion(section="5.1.3", id="aa") + @SpecAssertion(section="5.3.4", id="aa") public void testTypeBoxing() { assert getInstanceByType(Integer.class, new AnnotationLiteral<Small>() {}).equals(IntegerProducer.VALUE); Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/InjectionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/InjectionTest.java 2009-07-19 13:31:12 UTC (rev 3087) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/InjectionTest.java 2009-07-19 23:52:32 UTC (rev 3088) @@ -8,16 +8,15 @@ /** * - * Spec version: 20090519 + * Spec version: 20090625 * */ @Artifact @BeansXml("beans.xml") public class InjectionTest extends AbstractJSR299Test { - @Test(groups = { "injection", "producerMethod" }) - @SpecAssertion(section = "5.1.3", id = "aa") + @SpecAssertion(section = "5.3.4", id = "aa") public void testInjectionPerformsBoxingIfNecessary() throws Exception { assert getBeans(SpiderNest.class).size() == 1; @@ -59,7 +58,7 @@ } @Test(groups = {"injection", "underInvestigation"}) - @SpecAssertion(section = "3.8", id = "aa") + @SpecAssertion(section = "3.7", id = "aa") public void testInjectingStaticField() { assert getBeans(BeanWithStaticBoundField_Broken.class).size() == 1; @@ -67,7 +66,7 @@ } @Test(groups = {"injection", "underInvestigation"}) - @SpecAssertion(section = "3.8", id = "ab") + @SpecAssertion(section = "3.7", id = "ab") public void testInjectingFinalField() { assert getBeans(BeanWithFinalBoundField_Broken.class).size() == 1; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java 2009-07-19 13:31:12 UTC (rev 3087) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java 2009-07-19 23:52:32 UTC (rev 3088) @@ -18,7 +18,7 @@ /** * - * Spec version: 20090519 + * Spec version: 20090625 * */ @Artifact @@ -28,7 +28,7 @@ @Test(groups="resolution") @SpecAssertions({ - @SpecAssertion(section="5.1", id = "gaa") + @SpecAssertion(section="5.3", id = "review") // removed from spec? }) public void testDefaultBindingTypeAssumed() throws Exception { @@ -45,14 +45,14 @@ } @Test(groups = { "resolution", "rewrite" }, expectedExceptions=IllegalArgumentException.class) - @SpecAssertion(section="5.1", id = "d") + @SpecAssertion(section="5.3", id = "review") // removed from spec? public void testDuplicateBindingTypesUsed() { getBeans(Tuna.class, new CurrentLiteral(), new CurrentLiteral()); } @Test(groups="resolution", expectedExceptions=IllegalArgumentException.class) - @SpecAssertion(section="5.1", id = "e") + @SpecAssertion(section="5.3", id = "e") public void testNonBindingTypeUsed() { getBeans(Tuna.class, new AnotherDeploymentTypeLiteral()); @@ -60,7 +60,7 @@ @Test(groups="resolution") @SpecAssertions({ - @SpecAssertion(section = "5.1", id ="faa") + @SpecAssertion(section = "5.3", id ="review") // removed from spec? }) public void testResolveByType() throws Exception { @@ -95,9 +95,9 @@ @Test(groups="injection") @SpecAssertions({ @SpecAssertion(section = "2.3.4", id = "b" ), - @SpecAssertion(section = "5.1", id = "gba"), + @SpecAssertion(section = "5.3", id = "l"), @SpecAssertion(section = "2.3.3", id = "d" ), - @SpecAssertion(section = "5.1.5", id = "a" ) + @SpecAssertion(section = "5.3.6", id = "a" ) }) public void testAllBindingTypesSpecifiedForResolutionMustAppearOnWebBean() { @@ -123,9 +123,8 @@ @Test(groups="resolution") @SpecAssertions({ - @SpecAssertion(section="5.1", id = "fd"), - @SpecAssertion(section="2.2", id="bb"), - @SpecAssertion(section="2.2", id="ba") + @SpecAssertion(section="2.2", id="review"), + @SpecAssertion(section="2.2", id="review") // what is this testing? }) public void testResolveByTypeWithTypeParameter() throws Exception { @@ -134,13 +133,13 @@ } @Test(groups={"resolution", "producerMethod"}) - @SpecAssertion(section="5.1", id = "fc") + @SpecAssertion(section="2.2.1", id = "i") public void testResolveByTypeWithArray() throws Exception { assert getBeans(Spider[].class).size() == 1; } - @Test @SpecAssertion(section="5.1", id = "ha") + @Test @SpecAssertion(section="5.3", id = "review") // deployment types removed public void testOnlyHighestEnabledPrecedenceWebBeansResolved() throws Exception { assert getBeans(Animal.class, new AnnotationLiteral<Whitefish>() {}).size() == 1; @@ -149,7 +148,7 @@ @Test(groups="resolution") - @SpecAssertion(section="5.1", id = "hb") + @SpecAssertion(section="5.3", id = "review") // deployment types removed public void testNoWebBeansFound() throws Exception { assert getBeans(Tuna.class, new AnnotationLiteral<FakeFish>() {}).size() == 0; @@ -157,7 +156,7 @@ @Test(groups="resolution") @SpecAssertions({ - @SpecAssertion(section="5.1", id = "gca") + @SpecAssertion(section="5.3", id = "l") }) public void testResolveByTypeWithNonBindingMembers() throws Exception { @@ -195,7 +194,7 @@ } @Test(groups={"resolution", "broken"}) - @SpecAssertion(section="5.1.4", id = "ca") + @SpecAssertion(section="5.3.5", id = "ca") public void testArrayValuedAnnotationMemberWithoutNonBinding() { Throwable t = null; @@ -220,7 +219,7 @@ } @Test(groups={"resolution", "broken"})//, expectedExceptions=DefinitionException.class) - @SpecAssertion(section="5.1.4", id = "cb") + @SpecAssertion(section="5.3.5", id = "cb") public void testAnnotationValuedAnnotationMemberWithoutNonBinding() { Throwable t = null;