Author: shane.bryzak(a)jboss.com Date: 2009-07-22 18:49:01 -0400 (Wed, 22 Jul 2009) New Revision: 3146 Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/StereotypeDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/ExtensionsTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDefinitionError/AddDefinitionErrorTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/beanDiscoveryMethodThrowsException/BeforeBeanDiscoveryThrowsExceptionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/normalScope/AddingNormalScopeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/passivatingScope/AddingPassivatingScopeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/wildcardAndGenericType/ObserverMethodWithTypeVariableEventTypeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/ResolvingChecksBindingTypeMembersTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/typeWithParameters/ChecksEventTypeWhenResolvingTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/InitializerUnallowedDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/observesUnallowed/ObserverParameterUnallowedDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithSessionScope/SingletonWithSessionScopeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/parameterizedReturnTypeWithWildcard/ParameterizedReturnTypeWithWildcardTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/ProducerMethodDefinitionTest.java Log: matched miscellaneous tests with latest spec assertions Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/StereotypeDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/StereotypeDefinitionTest.java 2009-07-22 20:12:03 UTC (rev 3145) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/StereotypeDefinitionTest.java 2009-07-22 22:49:01 UTC (rev 3146) @@ -18,7 +18,7 @@ import org.testng.annotations.Test; /** - * Spec version: 20090519 + * Spec version: 20090625 */ @Artifact @BeansXml("beans.xml") @@ -36,7 +36,8 @@ } @Test - @SpecAssertions( { @SpecAssertion(section = "2.7.1.1", id = "aa"), @SpecAssertion(section = "2.4.3", id = "c") }) + @SpecAssertions( { @SpecAssertion(section = "2.7.1.1", id = "aa"), + @SpecAssertion(section = "2.4.3", id = "c") }) public void testStereotypeWithScopeType() { assert getBeans(Moose.class).size() == 1; @@ -44,7 +45,8 @@ } @Test - @SpecAssertions( { @SpecAssertion(section = "2.7.1.1", id = "aa"), @SpecAssertion(section = "2.4.4", id = "b") }) + @SpecAssertions( { @SpecAssertion(section = "2.7.1.1", id = "aa"), + @SpecAssertion(section = "2.4.4", id = "b") }) public void testStereotypeWithoutScopeType() { assert getBeans(Reindeer.class).size() == 1; @@ -60,7 +62,8 @@ } @Test - @SpecAssertions( { @SpecAssertion(section = "2.7.2", id = "e"), @SpecAssertion(section = "2.7", id = "d") }) + @SpecAssertions( { @SpecAssertion(section = "2.7.2", id = "e"), + @SpecAssertion(section = "2.7", id = "d") }) public void testMultipleStereotypesAllowed() { assert getBeans(HighlandCow.class, TAME_LITERAL).size() == 1; @@ -71,7 +74,8 @@ } @Test - @SpecAssertions( { @SpecAssertion(section = "2.7.2", id = "e"), @SpecAssertion(section = "2.4.4", id = "e") }) + @SpecAssertions( { @SpecAssertion(section = "2.7.2", id = "e"), + @SpecAssertion(section = "2.4.4", id = "e") }) public void testExplicitScopeOverridesMergedScopesFromMultipleStereotype() { assert getBeans(Springbok.class).size() == 1; @@ -90,7 +94,10 @@ public void testStereotypeNotDeclaredInheritedIsNotInherited() { assert getBeans(ShetlandPony.class).size() == 1; - assert getBeans(ShetlandPony.class).iterator().next().getDeploymentType().equals(Production.class); + + // rewrite this to not test deployment type + //assert getBeans(ShetlandPony.class).iterator().next().getDeploymentType().equals(Production.class); + assert false; } @Test @@ -101,14 +108,14 @@ } @Test - @SpecAssertion(section = "4.1", id = "daa") + @SpecAssertion(section = "4.1", id = "hhh") public void testStereotypeScopeIsOverriddenByInheritedScope() { assert getBeans(Chihuahua.class).iterator().next().getScopeType().equals(SessionScoped.class); } @Test - @SpecAssertion(section = "4.1", id = "dca") + @SpecAssertion(section = "4.1", id = "hhi") public void testStereotypeScopeIsOverriddenByIndirectlyInheritedScope() { assert getBeans(MexicanChihuahua.class).iterator().next().getScopeType().equals(SessionScoped.class); Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/ExtensionsTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/ExtensionsTest.java 2009-07-22 20:12:03 UTC (rev 3145) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/ExtensionsTest.java 2009-07-22 22:49:01 UTC (rev 3146) @@ -30,6 +30,7 @@ /** * @author pmuir * + * Spec version: 20090625 */ @Artifact @Resources({ @@ -47,7 +48,8 @@ } @Test - @SpecAssertion(section="11.5.1", id="ba") + //(a)SpecAssertion(section="11.5.1", id="ba") + @SpecAssertion(section="review", id="review") public void testAddingBindingType() { assert BeforeBeanDiscoveryObserver.isObserved(); @@ -56,7 +58,8 @@ } @Test - @SpecAssertion(section="11.5.1", id="bb") + //(a)SpecAssertion(section="11.5.1", id="bb") + @SpecAssertion(section="review", id="review") public void testAddingScopeType() { assert BeforeBeanDiscoveryObserver.isObserved(); Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDefinitionError/AddDefinitionErrorTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDefinitionError/AddDefinitionErrorTest.java 2009-07-22 20:12:03 UTC (rev 3145) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDefinitionError/AddDefinitionErrorTest.java 2009-07-22 22:49:01 UTC (rev 3146) @@ -13,7 +13,7 @@ * Tests that any definition error added by an observer of the AfterBeanDiscovery * event results in a definition error. * - * Spec version: 20090519 + * Spec version: 20090625 * * @author David Allen * @author Dan Allen @@ -29,7 +29,7 @@ { @Test //TODO This test is not working in container due to exceptions being unwound on the server - @SpecAssertion(section = "11.5.2", id = "c") + @SpecAssertion(section = "11.5.2", id = "ca") public void testObserverDefinitionErrorTreatedAsDefinitionError() { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/beanDiscoveryMethodThrowsException/BeforeBeanDiscoveryThrowsExceptionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/beanDiscoveryMethodThrowsException/BeforeBeanDiscoveryThrowsExceptionTest.java 2009-07-22 20:12:03 UTC (rev 3145) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/beanDiscoveryMethodThrowsException/BeforeBeanDiscoveryThrowsExceptionTest.java 2009-07-22 22:49:01 UTC (rev 3146) @@ -28,6 +28,8 @@ /** * @author pmuir + * + * Spec version: 20090625 * */ @Artifact @@ -40,7 +42,8 @@ { @Test(groups="incontainer-ri-broken") - @SpecAssertion(section="11.5.1", id="c") + //(a)SpecAssertion(section="11.5.1", id="c") + @SpecAssertion(section="review", id="review") public void testThrowsException() { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/normalScope/AddingNormalScopeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/normalScope/AddingNormalScopeTest.java 2009-07-22 20:12:03 UTC (rev 3145) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/normalScope/AddingNormalScopeTest.java 2009-07-22 22:49:01 UTC (rev 3146) @@ -28,6 +28,8 @@ /** * @author pmuir + * + * Spec version: 20090625 * */ @Artifact @@ -40,7 +42,8 @@ { @Test - @SpecAssertion(section="11.5.1", id="bb") + //(a)SpecAssertion(section="11.5.1", id="bb") + @SpecAssertion(section="review", id="review") public void testAddingScopeType() { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/passivatingScope/AddingPassivatingScopeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/passivatingScope/AddingPassivatingScopeTest.java 2009-07-22 20:12:03 UTC (rev 3145) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/passivatingScope/AddingPassivatingScopeTest.java 2009-07-22 22:49:01 UTC (rev 3146) @@ -29,6 +29,7 @@ /** * @author pmuir * + * Spec version: 20090625 */ @Artifact @Resources({ @@ -41,7 +42,8 @@ { @Test - @SpecAssertion(section="11.5.1", id="bb") + //(a)SpecAssertion(section="11.5.1", id="bb") + @SpecAssertion(section="review", id="review") public void testAddingScopeType() { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/wildcardAndGenericType/ObserverMethodWithTypeVariableEventTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/wildcardAndGenericType/ObserverMethodWithTypeVariableEventTypeTest.java 2009-07-22 20:12:03 UTC (rev 3145) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/wildcardAndGenericType/ObserverMethodWithTypeVariableEventTypeTest.java 2009-07-22 22:49:01 UTC (rev 3146) @@ -29,7 +29,7 @@ * Tests an observer method defined to observe an event type which * is generic and wildcarded. * - * Spec version: 20090610 + * Spec version: 20090625 * * @author David Allen */ @@ -38,7 +38,7 @@ public class ObserverMethodWithTypeVariableEventTypeTest extends AbstractJSR299Test { @Test(groups = { "events", "ri-broken" }) - @SpecAssertion(section = "10.5.1", id = "cb") + @SpecAssertion(section = "10.4.1", id = "cb") public void testObserverMethodCanObserveParameterizedEvents() { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/ResolvingChecksBindingTypeMembersTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/ResolvingChecksBindingTypeMembersTest.java 2009-07-22 20:12:03 UTC (rev 3145) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/ResolvingChecksBindingTypeMembersTest.java 2009-07-22 22:49:01 UTC (rev 3146) @@ -12,7 +12,7 @@ import org.testng.annotations.Test; /** - * Spec version: 20090519 + * Spec version: 20090625 */ @Artifact public class ResolvingChecksBindingTypeMembersTest extends AbstractJSR299Test @@ -43,9 +43,9 @@ @Test(groups = { "events" }) @SpecAssertions({ - @SpecAssertion(section = "10.5.1", id = "a"), - @SpecAssertion(section = "10.2.1", id = "a"), - @SpecAssertion(section = "10.2.1", id = "b") + @SpecAssertion(section = "10.4.1", id = "a"), + @SpecAssertion(section = "10.2.2", id = "a"), + @SpecAssertion(section = "10.2.2", id = "b") }) public void testResolvingChecksBindingTypeMembers() { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/typeWithParameters/ChecksEventTypeWhenResolvingTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/typeWithParameters/ChecksEventTypeWhenResolvingTest.java 2009-07-22 20:12:03 UTC (rev 3145) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/typeWithParameters/ChecksEventTypeWhenResolvingTest.java 2009-07-22 22:49:01 UTC (rev 3146) @@ -11,7 +11,7 @@ import org.testng.annotations.Test; /** - * Spec version: 20090519 + * Spec version: 20090625 */ @Artifact public class ChecksEventTypeWhenResolvingTest extends AbstractJSR299Test @@ -31,7 +31,7 @@ } @Test(groups = { "events" }) - @SpecAssertion(section = "10.5.1", id = "a") + @SpecAssertion(section = "10.4.1", id = "a") public void testResolvingChecksEventType() { assert !getCurrentManager().resolveObserverMethods(new AnEventType()).isEmpty(); Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/InitializerUnallowedDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/InitializerUnallowedDefinitionTest.java 2009-07-22 20:12:03 UTC (rev 3145) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/InitializerUnallowedDefinitionTest.java 2009-07-22 22:49:01 UTC (rev 3146) @@ -10,7 +10,7 @@ import org.testng.annotations.Test; /** - * Spec version: 20090519 + * Spec version: 20090625 */ @Artifact @ExpectedDeploymentException(DefinitionError.class) @@ -18,7 +18,7 @@ public class InitializerUnallowedDefinitionTest extends AbstractJSR299Test { @Test - @SpecAssertion(section = "3.4.7", id = "da") + @SpecAssertion(section = "3.3.7", id = "da") public void testInitializerUnallowed() { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/observesUnallowed/ObserverParameterUnallowedDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/observesUnallowed/ObserverParameterUnallowedDefinitionTest.java 2009-07-22 20:12:03 UTC (rev 3145) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/observesUnallowed/ObserverParameterUnallowedDefinitionTest.java 2009-07-22 22:49:01 UTC (rev 3146) @@ -9,7 +9,7 @@ import org.testng.annotations.Test; /** - * Spec version: 20090519 + * Spec version: 20090625 */ @Artifact @ExpectedDeploymentException(DefinitionError.class) @@ -17,7 +17,7 @@ public class ObserverParameterUnallowedDefinitionTest extends AbstractJSR299Test { @Test - @SpecAssertion(section = "3.4.7", id = "ea") + @SpecAssertion(section = "3.3.7", id = "ea") public void testObserverParameterUnallowed() { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithSessionScope/SingletonWithSessionScopeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithSessionScope/SingletonWithSessionScopeTest.java 2009-07-22 20:12:03 UTC (rev 3145) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithSessionScope/SingletonWithSessionScopeTest.java 2009-07-22 22:49:01 UTC (rev 3146) @@ -12,19 +12,17 @@ /** * - * Spec version: 20090519 + * Spec version: 20090625 */ @Artifact @ExpectedDeploymentException(DefinitionError.class) @Packaging(PackagingType.EAR) public class SingletonWithSessionScopeTest extends AbstractJSR299Test { - @Test(groups = { "incontainer-broken" }) - @SpecAssertion(section = "3.3", id = "da") + @SpecAssertion(section = "3.2", id = "da") public void testSingletonWithSessionScopeFails() { assert false; } - } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/parameterizedReturnTypeWithWildcard/ParameterizedReturnTypeWithWildcardTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/parameterizedReturnTypeWithWildcard/ParameterizedReturnTypeWithWildcardTest.java 2009-07-22 20:12:03 UTC (rev 3145) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/parameterizedReturnTypeWithWildcard/ParameterizedReturnTypeWithWildcardTest.java 2009-07-22 22:49:01 UTC (rev 3146) @@ -10,21 +10,20 @@ /** * - * Spec version: 20090519 + * Spec version: 20090625 * */ @Artifact @ExpectedDeploymentException(DefinitionError.class) public class ParameterizedReturnTypeWithWildcardTest extends AbstractJSR299Test { - - @Test(groups = "producerField") - @SpecAssertion(section = "3.5", id = "ga") + @SpecAssertion(section = "3.4", id = "ga") public void testParameterizedReturnTypeWithWildcard() { assert false; } + } 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-22 20:12:03 UTC (rev 3145) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/ProducerMethodDefinitionTest.java 2009-07-22 22:49:01 UTC (rev 3146) @@ -131,7 +131,7 @@ @Test(groups = "producerMethod") @SpecAssertions({ @SpecAssertion(section = "3.3.1", id = "b"), - @SpecAssertion(section = "2.2", id = "j") + @SpecAssertion(section = "2.2.1", id = "i") }) public void testApiTypeForArrayTypeReturn() throws Exception {