Author: shane.bryzak(a)jboss.com Date: 2009-07-22 19:35:57 -0400 (Wed, 22 Jul 2009) New Revision: 3147 Removed: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/tooManyDeployElements/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/jms1/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/definition/stereotype/broken/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesMultipleDeploymentTypes/ Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationContextTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ClientConversationContextTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/DependentContextTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/PassivatingContextTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/NameDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/wildcardAndGenericType/ObserverMethodWithWildcardedEventTypeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanViaXmlTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/enterprise/nonbusiness/ProducerMethodNotBusinessMethodTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.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/broken/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/indirectOverride/IndirectOverrideTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializesStaticMethod/SpecializesStaticMethodTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/SimpleBeanSpecializationTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/SpecializingBeanExtendsEnterpriseBeanTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/SpecializingBeanImplementsInterfaceOnly.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/SpecializingBeanExtendsNothingTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/SpecializingClassExtendsNonSimpleBeanTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/TwoSpecializingBeansForOneSpecializedTest.java tck/trunk/impl/src/main/resources/tck-audit.xml Log: matched remaining unmatched tests to assertions Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationContextTest.java 2009-07-22 22:49:01 UTC (rev 3146) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationContextTest.java 2009-07-22 23:35:57 UTC (rev 3147) @@ -42,13 +42,6 @@ assert getBeans(Conversation.class).iterator().next().getScopeType().equals(RequestScoped.class); } - @Test(groups = { "contexts", "rewrite" }) - @SpecAssertion(section = "6.7.5", id = "ic") - public void testBeanWithDeploymentTypeStandard() - { - assert getBeans(Conversation.class).iterator().next().getDeploymentType().equals(Standard.class); - } - @Test(groups = { "contexts" }) @SpecAssertion(section = "6.7.5", id = "id") public void testBeanWithBindingCurrent() Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ClientConversationContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ClientConversationContextTest.java 2009-07-22 22:49:01 UTC (rev 3146) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ClientConversationContextTest.java 2009-07-22 23:35:57 UTC (rev 3147) @@ -124,7 +124,7 @@ } @Test(groups = { "contexts" }) - @SpecAssertion(section = "6.7.4", id = "s") + @SpecAssertion(section = "6.7.4", id = "tb") public void testConversationPropagationToNonExistentConversationLeadsToTransientConversation() throws Exception { HttpClient client = new HttpClient(); Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/DependentContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/DependentContextTest.java 2009-07-22 22:49:01 UTC (rev 3146) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/DependentContextTest.java 2009-07-22 23:35:57 UTC (rev 3147) @@ -173,7 +173,7 @@ @Test(groups = { "contexts", "disposalMethod" }) @SpecAssertions({ @SpecAssertion(section = "6.4", id = "g"), - @SpecAssertion(section = "11.1", id = "a") + @SpecAssertion(section = "11.1", id = "aa") }) public void testContextIsActiveWhenInvokingDisposalMethod() { @@ -225,7 +225,7 @@ @Test(groups = { "contexts", "beanDestruction"}) @SpecAssertions({ - @SpecAssertion(section = "6.4.2", id = "aaa"), + @SpecAssertion(section = "6.4.2", id = "aaaa"), @SpecAssertion(section = "6.4", id = "b") }) public void testDestroyingSimpleParentDestroysDependents() @@ -244,7 +244,7 @@ @Test(groups = { "contexts", "beanDestruction"}) @SpecAssertions({ - @SpecAssertion(section = "6.4.2", id = "aaa"), + @SpecAssertion(section = "6.4.2", id = "aaaa"), @SpecAssertion(section = "6.4", id = "b") }) public void testDestroyingManagedParentDestroysDependentsOfSameBean() Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/PassivatingContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/PassivatingContextTest.java 2009-07-22 22:49:01 UTC (rev 3146) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/PassivatingContextTest.java 2009-07-22 23:35:57 UTC (rev 3147) @@ -39,13 +39,13 @@ assert !beans.isEmpty(); } - @Test @SpecAssertion(section="review", id = "review") + @Test @SpecAssertion(section="6.6.2", id = "c") public void testInjectionOfDependentPrimitiveProductIntoNormalBean() { getInstanceByType(NumberConsumer.class).ping(); } - @Test @SpecAssertion(section="6.6.2", id = "6.6.2") + @Test @SpecAssertion(section="6.6.2", id = "c") public void testInjectionOfDependentSerializableProductIntoNormalBean() { getInstanceByType(SerializableCityConsumer.class).ping(); Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/NameDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/NameDefinitionTest.java 2009-07-22 22:49:01 UTC (rev 3146) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/NameDefinitionTest.java 2009-07-22 23:35:57 UTC (rev 3147) @@ -33,7 +33,7 @@ @Test @SpecAssertions({ @SpecAssertion(section= "2.5.2", id = "a"), - @SpecAssertion(section = "3.2.6", id = "a"), + @SpecAssertion(section = "3.1.6", id = "a"), @SpecAssertion(section = "2.5.1", id = "d") }) public void testDefaultNamed() Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java 2009-07-22 22:49:01 UTC (rev 3146) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java 2009-07-22 23:35:57 UTC (rev 3147) @@ -158,7 +158,7 @@ @SpecAssertions({ @SpecAssertion(section = "10.5", id = "aa"), @SpecAssertion(section = "10.4.2", id = "a"), - @SpecAssertion(section = "12.3", id = "o") + @SpecAssertion(section = "12.3", id = "oa") }) public void testObserverMethodAutomaticallyRegistered() { @@ -235,7 +235,7 @@ @Test(groups = { "events" }) @SpecAssertions( { @SpecAssertion(section = "10.4.4", id = "a"), - @SpecAssertion(section = "5.6.8", id = "b") + @SpecAssertion(section = "5.6.8", id = "ba") } ) public void testConditionalObserver() { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/wildcardAndGenericType/ObserverMethodWithWildcardedEventTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/wildcardAndGenericType/ObserverMethodWithWildcardedEventTypeTest.java 2009-07-22 22:49:01 UTC (rev 3146) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/wildcardAndGenericType/ObserverMethodWithWildcardedEventTypeTest.java 2009-07-22 23:35:57 UTC (rev 3147) @@ -25,7 +25,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 */ @@ -33,7 +33,7 @@ public class ObserverMethodWithWildcardedEventTypeTest extends AbstractJSR299Test { @Test(groups = { "events", "ri-broken" }) - @SpecAssertion(section = "10.5.1", id = "ca") + @SpecAssertion(section = "10.4.1", id = "ca") public void testObserverMethodCanObserveParameterizedEvents() { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanViaXmlTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanViaXmlTest.java 2009-07-22 22:49:01 UTC (rev 3146) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanViaXmlTest.java 2009-07-22 23:35:57 UTC (rev 3147) @@ -34,7 +34,7 @@ * * @author David Allen * - * Spec version: 20090519 + * Spec version: 20090625 */ @Artifact @Packaging(PackagingType.EAR) @@ -45,8 +45,8 @@ @Test(groups = { "enterpriseBeans", "ejbjarxml" }) @SpecAssertions( { - @SpecAssertion(section = "3.2.1", id = "n"), - @SpecAssertion(section = "3.3.2", id = "ba") + @SpecAssertion(section = "3.1.1", id = "n"), + @SpecAssertion(section = "3.2.2", id = "ba") }) public void testEjbDeclaredInXmlNotSimpleBean() { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java 2009-07-22 22:49:01 UTC (rev 3146) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java 2009-07-22 23:35:57 UTC (rev 3147) @@ -1,6 +1,5 @@ package org.jboss.jsr299.tck.tests.implementation.initializer.broken.parameterAnnotatedObserves; - import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DefinitionError; @@ -8,14 +7,17 @@ import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; +/** + * + * Spec version: 20090625 + * + */ @Artifact @ExpectedDeploymentException(DefinitionError.class) public class ParameterAnnotatedObservesTest extends AbstractJSR299Test { - - @Test(groups = "initializerMethod") - @SpecAssertion(section = "3.9.1", id = "d") + @SpecAssertion(section = "3.8.1", id = "da") public void testInitializerMethodHasParameterAnnotatedObserves() { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/enterprise/nonbusiness/ProducerMethodNotBusinessMethodTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/enterprise/nonbusiness/ProducerMethodNotBusinessMethodTest.java 2009-07-22 22:49:01 UTC (rev 3146) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/enterprise/nonbusiness/ProducerMethodNotBusinessMethodTest.java 2009-07-22 23:35:57 UTC (rev 3147) @@ -13,7 +13,7 @@ /** * - * Spec version: 20090519 + * Spec version: 20090625 * */ @Artifact @@ -23,8 +23,8 @@ { @Test @SpecAssertions({ - @SpecAssertion(section = "3.4.2", id = "fa"), - @SpecAssertion(section = "3.4", id = "d") + @SpecAssertion(section = "3.3.2", id = "fa"), + @SpecAssertion(section = "3.3", id = "d") }) public void testProducerMethodOnSessionBeanMustBeBusinessMethod() { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java 2009-07-22 22:49:01 UTC (rev 3146) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java 2009-07-22 23:35:57 UTC (rev 3147) @@ -10,7 +10,7 @@ /** * - * Spec version: 20090519 + * Spec version: 20090625 * */ @Artifact @@ -20,7 +20,7 @@ @Test(groups = "producerMethod") - @SpecAssertion(section = "3.4.2", id = "da") + @SpecAssertion(section = "3.3.2", id = "da") public void testProducerMethodWithParameterAnnotatedDisposes() throws Exception { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java 2009-07-22 22:49:01 UTC (rev 3146) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java 2009-07-22 23:35:57 UTC (rev 3147) @@ -132,7 +132,7 @@ @Test(groups = "injection") @SpecAssertions({ - @SpecAssertion(section = "7.3.1", id = "c"), + @SpecAssertion(section = "7.3.1", id = "aa"), @SpecAssertion(section = "3.7.1", id = "a") }) public void testCreateInjectsFieldsDeclaredInJava() 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-22 22:49:01 UTC (rev 3146) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationIntegrationTest.java 2009-07-22 23:35:57 UTC (rev 3147) @@ -49,10 +49,7 @@ @Test - @SpecAssertions({ - @SpecAssertion(section="4.3.2", id = "a"), - @SpecAssertion(section="4.3.1", id ="cb") - }) + @SpecAssertion(section="4.3.2", id = "a") public void testProducerMethodOnSpecializedBeanCalledOnSpecializingBean() throws Exception { new RunInDependentContext() Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java 2009-07-22 22:49:01 UTC (rev 3146) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java 2009-07-22 23:35:57 UTC (rev 3147) @@ -11,7 +11,7 @@ import org.testng.annotations.Test; /** - * Spec version: 20090519 + * Spec version: 20090625 */ @Artifact @Packaging(PackagingType.EAR) @@ -20,7 +20,12 @@ public class TwoBeansSpecializeTheSameBeanTest extends AbstractJSR299Test { @Test - @SpecAssertion(section="4.3.3", id = "ba") + //(a)SpecAssertion(section=&quot;4.3.3&quot;, id = "ba") + @SpecAssertion(section = "review", id = "review") // removed from spec? was: + // If, in a particular deployment, more than one enabled bean directly specializes + // the same bean, the container automatically detects inconsistent specialization + // and treats it as a deployment problem, as defined in Section 12.4, "Problems + // detected automatically by the container" public void testTwoBeansSpecializeTheSameBean() { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/indirectOverride/IndirectOverrideTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/indirectOverride/IndirectOverrideTest.java 2009-07-22 22:49:01 UTC (rev 3146) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/indirectOverride/IndirectOverrideTest.java 2009-07-22 23:35:57 UTC (rev 3147) @@ -9,7 +9,7 @@ import org.testng.annotations.Test; /** - * Spec version: 20090519 + * Spec version: 20090625 */ @Artifact @ExpectedDeploymentException(DefinitionError.class) @@ -17,7 +17,7 @@ { @Test - @SpecAssertion(section="3.4.4", id = "ca") + @SpecAssertion(section="3.3.4", id = "ca") public void testSpecializedMethodIndirectlyOverridesAnotherProducerMethod() { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializesStaticMethod/SpecializesStaticMethodTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializesStaticMethod/SpecializesStaticMethodTest.java 2009-07-22 22:49:01 UTC (rev 3146) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializesStaticMethod/SpecializesStaticMethodTest.java 2009-07-22 23:35:57 UTC (rev 3147) @@ -9,7 +9,7 @@ import org.testng.annotations.Test; /** - * Spec version: 20090519 + * Spec version: 20090625 */ @Artifact @ExpectedDeploymentException(DefinitionError.class) @@ -17,7 +17,7 @@ { @Test - @SpecAssertion(section="3.4.4", id = "ba") + @SpecAssertion(section="3.3.4", id = "ba") public void testSpecializedStaticMethod() { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java 2009-07-22 22:49:01 UTC (rev 3146) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java 2009-07-22 23:35:57 UTC (rev 3147) @@ -8,7 +8,7 @@ import org.testng.annotations.Test; /** - * Spec version: 20090519 + * Spec version: 20090625 */ @Artifact @ExpectedDeploymentException(DeploymentError.class) @@ -16,7 +16,12 @@ { @Test - @SpecAssertion(section="4.3.3", id = "ba") + //(a)SpecAssertion(section=&quot;4.3.3&quot;, id = "ba") + @SpecAssertion(section = "review", id = "review") // removed from spec? was: + // If, in a particular deployment, more than one enabled bean directly specializes + // the same bean, the container automatically detects inconsistent specialization + // and treats it as a deployment problem, as defined in Section 12.4, "Problems + // detected automatically by the container" public void testTwoBeansSpecializeTheSameBean() { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/SimpleBeanSpecializationTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/SimpleBeanSpecializationTest.java 2009-07-22 22:49:01 UTC (rev 3146) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/SimpleBeanSpecializationTest.java 2009-07-22 23:35:57 UTC (rev 3147) @@ -14,7 +14,7 @@ import org.testng.annotations.Test; /** - * Spec version: 20090519 + * Spec version: 20090625 * */ @Artifact @@ -31,7 +31,7 @@ @SpecAssertions( { @SpecAssertion(section = "4.3.1", id = "i"), @SpecAssertion(section = "4.3.1", id = "j"), - @SpecAssertion(section = "3.2.5", id = "aa") + @SpecAssertion(section = "3.1.5", id = "aa") }) public void testSpecializingBeanHasBindingsOfSpecializedAndSpecializingBean() { @@ -45,7 +45,7 @@ @Test @SpecAssertions( { @SpecAssertion(section = "4.3.1", id = "k"), - @SpecAssertion(section = "3.2.5", id = "aa") + @SpecAssertion(section = "3.1.5", id = "aa") }) public void testSpecializingBeanHasNameOfSpecializedBean() { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/SpecializingBeanExtendsEnterpriseBeanTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/SpecializingBeanExtendsEnterpriseBeanTest.java 2009-07-22 22:49:01 UTC (rev 3146) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/SpecializingBeanExtendsEnterpriseBeanTest.java 2009-07-22 23:35:57 UTC (rev 3147) @@ -11,7 +11,7 @@ import org.testng.annotations.Test; /** - * Spec version: 20090519 + * Spec version: 20090625 */ @Artifact @Packaging(PackagingType.EAR) @@ -19,7 +19,7 @@ public class SpecializingBeanExtendsEnterpriseBeanTest extends AbstractJSR299Test { @Test(groups = { "specialization" }) - @SpecAssertion(section = "3.2.5", id = "aa") + @SpecAssertion(section = "3.1.5", id = "aa") public void testSpecializingClassDirectlyExtendsEnterpriseBean() { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/SpecializingBeanImplementsInterfaceOnly.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/SpecializingBeanImplementsInterfaceOnly.java 2009-07-22 22:49:01 UTC (rev 3146) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/SpecializingBeanImplementsInterfaceOnly.java 2009-07-22 23:35:57 UTC (rev 3147) @@ -9,14 +9,14 @@ import org.testng.annotations.Test; /** - * Spec version: 20090519 + * Spec version: 20090625 */ @Artifact @ExpectedDeploymentException(DefinitionError.class) public class SpecializingBeanImplementsInterfaceOnly extends AbstractJSR299Test { @Test(groups = { "specialization" }) - @SpecAssertion(section = "3.2.5", id = "da") + @SpecAssertion(section = "3.1.5", id = "da") public void testSpecializingClassImplementsInterfaceAndExtendsNothing() { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/SpecializingBeanExtendsNothingTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/SpecializingBeanExtendsNothingTest.java 2009-07-22 22:49:01 UTC (rev 3146) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/SpecializingBeanExtendsNothingTest.java 2009-07-22 23:35:57 UTC (rev 3147) @@ -9,14 +9,14 @@ import org.testng.annotations.Test; /** - * Spec version: 20090519 + * Spec version: 20090625 */ @Artifact @ExpectedDeploymentException(DefinitionError.class) public class SpecializingBeanExtendsNothingTest extends AbstractJSR299Test { @Test(groups = { "specialization" }) - @SpecAssertion(section = "3.2.5", id = "da") + @SpecAssertion(section = "3.1.5", id = "da") public void testSpecializingClassDirectlyExtendsNothing() { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/SpecializingClassExtendsNonSimpleBeanTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/SpecializingClassExtendsNonSimpleBeanTest.java 2009-07-22 22:49:01 UTC (rev 3146) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/SpecializingClassExtendsNonSimpleBeanTest.java 2009-07-22 23:35:57 UTC (rev 3147) @@ -9,14 +9,14 @@ import org.testng.annotations.Test; /** - * Spec version: 20090519 + * Spec version: 20090625 */ @Artifact @ExpectedDeploymentException(DefinitionError.class) public class SpecializingClassExtendsNonSimpleBeanTest extends AbstractJSR299Test { @Test(groups = { "specialization" }) - @SpecAssertion(section = "3.2.5", id = "da") + @SpecAssertion(section = "3.1.5", id = "da") public void testSpecializingClassExtendsNonSimpleBean() { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/TwoSpecializingBeansForOneSpecializedTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/TwoSpecializingBeansForOneSpecializedTest.java 2009-07-22 22:49:01 UTC (rev 3146) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/TwoSpecializingBeansForOneSpecializedTest.java 2009-07-22 23:35:57 UTC (rev 3147) @@ -8,14 +8,19 @@ import org.testng.annotations.Test; /** - * Spec version: 20090519 + * Spec version: 20090625 */ @Artifact @ExpectedDeploymentException(DeploymentError.class) public class TwoSpecializingBeansForOneSpecializedTest extends AbstractJSR299Test { @Test - @SpecAssertion(section="4.3.3", id="ba") + //(a)SpecAssertion(section=&quot;4.3.3&quot;, id = "ba") + @SpecAssertion(section = "review", id = "review") // removed from spec? was: + // If, in a particular deployment, more than one enabled bean directly specializes + // the same bean, the container automatically detects inconsistent specialization + // and treats it as a deployment problem, as defined in Section 12.4, "Problems + // detected automatically by the container" public void testTwoBeansSpecializeTheSameBean() { assert false; Modified: tck/trunk/impl/src/main/resources/tck-audit.xml =================================================================== --- tck/trunk/impl/src/main/resources/tck-audit.xml 2009-07-22 22:49:01 UTC (rev 3146) +++ tck/trunk/impl/src/main/resources/tck-audit.xml 2009-07-22 23:35:57 UTC (rev 3147) @@ -1618,13 +1618,13 @@ <section id="4.3.2" title="Most specialized enabled bean for a bean"> <assertion id="a"> - <text>Non-static producer methods, ~producer fields, disposal methods and observer methods~ of a bean are invoked upon an instance of the most specialized enabled bean that specializes the bean, as defined by Section 5.6.6, "Invocation of producer or disposal methods", Section 5.6.7, "Access to producer field values" and Section 5.6.8, "Invocation of observer methods".</text><assertion id="b"> + <text>Non-static producer methods, ~producer fields, disposal methods and observer methods~ of a bean are invoked upon an instance of the most specialized enabled bean that specializes the bean, as defined by Section 5.6.6, "Invocation of producer or disposal methods", Section 5.6.7, "Access to producer field values" and Section 5.6.8, "Invocation of observer methods".</text> + </assertion> + + <assertion id="b"> <text>Non-static ~producer methods,~ producer fields~, disposal methods and observer methods~ of a bean are invoked upon an instance of the most specialized enabled bean that specializes the bean, as defined by Section 5.6.6, "Invocation of producer or disposal methods", Section 5.6.7, "Access to producer field values" and Section 5.6.8, "Invocation of observer methods".</text> - </assertion> - </assertion> + </assertion> - - <assertion id="c"> <text>Non-static ~producer methods, producer fields,~ disposal methods~ and observer methods~ of a bean are invoked upon an instance of the most specialized enabled bean that specializes the bean, as defined by Section 5.6.6, "Invocation of producer or disposal methods", Section 5.6.7, "Access to producer field values" and Section 5.6.8, "Invocation of observer methods".</text> </assertion>