Author: pete.muir(a)jboss.org Date: 2009-07-27 14:33:58 -0400 (Mon, 27 Jul 2009) New Revision: 3281 Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken11/EnterpriseBeanWithIllegalDependencyTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/tooManyScopes/TooManyScopeTypesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanDiscoveryObserver/AfterBeanDiscoveryObserverExecutionFailureTest.java tck/trunk/impl/src/main/resources/tck-audit.xml Log: versioning, split out assertion Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken11/EnterpriseBeanWithIllegalDependencyTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken11/EnterpriseBeanWithIllegalDependencyTest.java 2009-07-27 18:25:16 UTC (rev 3280) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken11/EnterpriseBeanWithIllegalDependencyTest.java 2009-07-27 18:33:58 UTC (rev 3281) @@ -2,9 +2,9 @@ import javax.enterprise.inject.IllegalProductException; +import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; -import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.jboss.testharness.impl.packaging.IntegrationTest; @@ -16,7 +16,7 @@ @IntegrationTest @Packaging(PackagingType.EAR) @ExpectedDeploymentException(IllegalProductException.class) -@SpecVersion("unknown") +@SpecVersion("20090625") public class EnterpriseBeanWithIllegalDependencyTest extends AbstractJSR299Test { @Test(groups = { "contexts", "passivation", "integration"}) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/tooManyScopes/TooManyScopeTypesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/tooManyScopes/TooManyScopeTypesTest.java 2009-07-27 18:25:16 UTC (rev 3280) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/tooManyScopes/TooManyScopeTypesTest.java 2009-07-27 18:33:58 UTC (rev 3281) @@ -1,22 +1,22 @@ package org.jboss.jsr299.tck.tests.definition.stereotype.broken.tooManyScopes; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.jsr299.tck.DefinitionError; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; -import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; @Artifact @ExpectedDeploymentException(DefinitionError.class) -@SpecVersion("20090519") +@SpecVersion("20090625") public class TooManyScopeTypesTest extends AbstractJSR299Test { @Test - @SpecAssertion(section = "2.7.1.1", id = "aa") + @SpecAssertion(section = "2.7.1.1", id = "ab") public void testStereotypeWithTooManyScopeTypes() { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanDiscoveryObserver/AfterBeanDiscoveryObserverExecutionFailureTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanDiscoveryObserver/AfterBeanDiscoveryObserverExecutionFailureTest.java 2009-07-27 18:25:16 UTC (rev 3280) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanDiscoveryObserver/AfterBeanDiscoveryObserverExecutionFailureTest.java 2009-07-27 18:33:58 UTC (rev 3281) @@ -1,9 +1,9 @@ package org.jboss.jsr299.tck.tests.deployment.lifecycle.broken.exceptionInAfterBeanDiscoveryObserver; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.jsr299.tck.DefinitionError; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; -import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; @@ -23,7 +23,7 @@ @Test(groups={"incontainer-ri-broken", "broken"}) //TODO Needs Extension stuff adding // WBRI-312 - @SpecAssertion(section = "11.5.2", id = "d") + @SpecAssertion(section = "11.5.2", id = "g") public void testObserverFailureTreatedAsDefinitionError() { assert false; Modified: tck/trunk/impl/src/main/resources/tck-audit.xml =================================================================== --- tck/trunk/impl/src/main/resources/tck-audit.xml 2009-07-27 18:25:16 UTC (rev 3280) +++ tck/trunk/impl/src/main/resources/tck-audit.xml 2009-07-27 18:33:58 UTC (rev 3281) @@ -417,9 +417,15 @@ <section id="2.7.1.1" title="Declaring the default scope for a stereotype"> <assertion id="aa"> - <text>A stereotype may declare at most one scope. If a stereotype declares more than one scope, the container automatically detects the problem and treats it as a definition error, as defined in Section 12.4, "Problems detected automatically by the -container".</text> + <text>A stereotype may declare at most one scope. ~If a stereotype declares more than one scope, the container automatically detects the problem and treats it as a definition error, as defined in Section 12.4, "Problems detected automatically by the +container".~</text> </assertion> + + <assertion id="ab"> + <text>A stereotype may declare at most one scope. _If a stereotype declares more than one scope, the container automatically detects the problem and treats it as a definition error, as defined in Section 12.4, "Problems detected automatically by the +container"._</text> + </assertion> + </section> <section id="2.7.1.2" title="Specifying interceptor bindings for a stereotype">