[weld-commits] Weld SVN: r4697 - in cdi-tck/trunk/impl/src/main: java/org/jboss/jsr299/tck/tests/context/dependent and 27 other directories.

Author: shane.bryzak(a)jboss.com Date: 2009-11-05 04:38:05 -0500 (Thu, 05 Nov 2009) New Revision: 4697 Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/DestroyForSameCreationalContextTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/DependentContextTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerField/NonPassivationCapableProducerFieldTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/multipleDelegateInjectionPoints/MultipleDelegateInjectionPointsTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDeploymentProblem/AddDeploymentProblemTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/beanDiscoveryMethodThrowsException/BeforeBeanDiscoveryThrowsExceptionTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/nonbinding/NonBindingTypePassedToFireTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/transactional/TransactionalObserversTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/ResolvingChecksBindingTypeMembersTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/select/SelectEventTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/ProcessAnnotatedTypeTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/definitionError/ProcessObserverMethodErrorTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/broken/injectionTargetError/InjectionTargetDefinitionErrorTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/UnresolvedDisposalMethodDefinitionTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanDefinitionTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasObservesParameter/ConstructorHasObservesParameterTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializingAndSpecializedBeanHaveName/SpecializingAndSpecializedBeanHaveNameTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/SpecializingBeanExtendsEnterpriseBeanTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/SpecializingBeanImplementsInterfaceOnly.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/interceptorCanNotBeDecorator/InterceptorCanNotBeDecoratorTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/sameClassListedTwiceInBeansXml/SameClassListedTwiceInBeansXmlTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorCalledBeforeDecorator/InterceptorCalledBeforeDecoratorTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/ResolutionByNameTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/builtin/BuiltinInstanceTest.java cdi-tck/trunk/impl/src/main/resources/tck-audit-cdi.xml Log: assertion mappings Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/DestroyForSameCreationalContextTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/DestroyForSameCreationalContextTest.java 2009-11-05 08:52:14 UTC (rev 4696) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/DestroyForSameCreationalContextTest.java 2009-11-05 09:38:05 UTC (rev 4697) @@ -19,7 +19,7 @@ * @author David Allen */ @Artifact -@SpecVersion(spec="cdi", version="20091018") +@SpecVersion(spec="cdi", version="20091101") public class DestroyForSameCreationalContextTest extends AbstractJSR299Test { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/DependentContextTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/DependentContextTest.java 2009-11-05 08:52:14 UTC (rev 4696) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/DependentContextTest.java 2009-11-05 09:38:05 UTC (rev 4697) @@ -20,7 +20,7 @@ @Artifact @BeansXml("beans.xml") -@SpecVersion(spec="cdi", version="20091018") +@SpecVersion(spec="cdi", version="20091101") public class DependentContextTest extends AbstractJSR299Test { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerField/NonPassivationCapableProducerFieldTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerField/NonPassivationCapableProducerFieldTest.java 2009-11-05 08:52:14 UTC (rev 4696) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerField/NonPassivationCapableProducerFieldTest.java 2009-11-05 09:38:05 UTC (rev 4697) @@ -17,7 +17,7 @@ */ @Artifact @Packaging(PackagingType.EAR) -@SpecVersion(spec="cdi", version="20091018") +@SpecVersion(spec="cdi", version="20091101") @ExpectedDeploymentException(DeploymentError.class) public class NonPassivationCapableProducerFieldTest extends AbstractJSR299Test { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/multipleDelegateInjectionPoints/MultipleDelegateInjectionPointsTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/multipleDelegateInjectionPoints/MultipleDelegateInjectionPointsTest.java 2009-11-05 08:52:14 UTC (rev 4696) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/multipleDelegateInjectionPoints/MultipleDelegateInjectionPointsTest.java 2009-11-05 09:38:05 UTC (rev 4697) @@ -32,7 +32,7 @@ @Artifact @ExpectedDeploymentException(DefinitionError.class) @BeansXml("beans.xml") -@SpecVersion(spec="cdi", version="20091018") +@SpecVersion(spec="cdi", version="20091101") public class MultipleDelegateInjectionPointsTest extends AbstractJSR299Test { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDeploymentProblem/AddDeploymentProblemTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDeploymentProblem/AddDeploymentProblemTest.java 2009-11-05 08:52:14 UTC (rev 4696) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDeploymentProblem/AddDeploymentProblemTest.java 2009-11-05 09:38:05 UTC (rev 4697) @@ -35,7 +35,7 @@ */ @Artifact @ExpectedDeploymentException(DeploymentError.class) -@SpecVersion(spec="cdi", version="20091018") +@SpecVersion(spec="cdi", version="20091101") public class AddDeploymentProblemTest extends AbstractJSR299Test { @Test(groups={"rewrite", "jboss-as-broken"}) Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/beanDiscoveryMethodThrowsException/BeforeBeanDiscoveryThrowsExceptionTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/beanDiscoveryMethodThrowsException/BeforeBeanDiscoveryThrowsExceptionTest.java 2009-11-05 08:52:14 UTC (rev 4696) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/beanDiscoveryMethodThrowsException/BeforeBeanDiscoveryThrowsExceptionTest.java 2009-11-05 09:38:05 UTC (rev 4697) @@ -36,7 +36,7 @@ }) @IntegrationTest @ExpectedDeploymentException(DefinitionError.class) -@SpecVersion(spec="cdi", version="20091018") +@SpecVersion(spec="cdi", version="20091101") public class BeforeBeanDiscoveryThrowsExceptionTest extends AbstractJSR299Test { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java 2009-11-05 08:52:14 UTC (rev 4696) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java 2009-11-05 09:38:05 UTC (rev 4697) @@ -22,13 +22,13 @@ */ @Artifact @BeansXml("beans.xml") -@SpecVersion(spec="cdi", version="20091018") +@SpecVersion(spec="cdi", version="20091101") public class EventTest extends AbstractJSR299Test { @Test(groups = { "events" }) @SpecAssertions( { - @SpecAssertion(section = "10.4.3", id = "a"), - @SpecAssertion(section = "5.6.8", id = "c"), + @SpecAssertion(section = "10.4.2", id = "i"), + @SpecAssertion(section = "5.5.6", id = "c"), @SpecAssertion(section = "2.3.5", id = "ca"), @SpecAssertion(section = "3.10", id = "a") }) @@ -44,7 +44,7 @@ @Test(groups = { "events" }) @SpecAssertions({ @SpecAssertion(section = "10.4", id = "c"), - @SpecAssertion(section = "5.6.8", id = "a") + @SpecAssertion(section = "5.5.6", id = "a") }) public void testStaticObserverMethodInvoked() { @@ -66,7 +66,7 @@ @SpecAssertions({ //@SpecAssertion(section = "4.3.2", id = "d"), @SpecAssertion(section="4.3", id="cb"), - @SpecAssertion(section = "5.6.8", id = "baa") + @SpecAssertion(section = "5.5.6", id = "baa") }) public void testObserverCalledOnMostSpecializedInstance() { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/nonbinding/NonBindingTypePassedToFireTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/nonbinding/NonBindingTypePassedToFireTest.java 2009-11-05 08:52:14 UTC (rev 4696) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/nonbinding/NonBindingTypePassedToFireTest.java 2009-11-05 09:38:05 UTC (rev 4697) @@ -7,7 +7,7 @@ import org.testng.annotations.Test; @Artifact -@SpecVersion(spec="cdi", version="20091018") +@SpecVersion(spec="cdi", version="20091101") public class NonBindingTypePassedToFireTest extends AbstractJSR299Test { @Test(groups = { "events" }, expectedExceptions = { IllegalArgumentException.class }) Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/transactional/TransactionalObserversTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/transactional/TransactionalObserversTest.java 2009-11-05 08:52:14 UTC (rev 4696) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/transactional/TransactionalObserversTest.java 2009-11-05 09:38:05 UTC (rev 4697) @@ -38,7 +38,7 @@ @Artifact @Packaging(PackagingType.EAR) @IntegrationTest -@SpecVersion(spec="cdi", version="20091018") +@SpecVersion(spec="cdi", version="20091101") public class TransactionalObserversTest extends AbstractJSR299Test { private PomeranianInterface dog = null; @@ -64,7 +64,7 @@ // } @Test(groups = { "events", "integration" }) - @SpecAssertion(section = "10.4.5", id = "a") + @SpecAssertion(section = "10.4.4", id = "a") public void testTransactionalObserverNotifiedImmediatelyWhenNoTransactionInProgress() { dog.setCorrectContext(false); @@ -78,7 +78,7 @@ } @Test(groups = { "events", "integration" }) - @SpecAssertion(section = "10.4.5", id = "c") + @SpecAssertion(section = "10.4.4", id = "c") public void testAfterTransactionCompletionObserver() throws InterruptedException { dog.setCorrectContext(false); @@ -91,7 +91,7 @@ } @Test(groups = { "events", "integration" }) - @SpecAssertion(section = "10.4.5", id = "d") + @SpecAssertion(section = "10.4.4", id = "d") public void testAfterTransactionSuccessObserver() throws InterruptedException { dog.setCorrectContext(false); @@ -103,7 +103,7 @@ } @Test(groups = { "events", "integration" }) - @SpecAssertion(section = "10.4.5", id = "e") + @SpecAssertion(section = "10.4.4", id = "e") public void testAfterTransactionFailureObserver() throws Exception { dog.setCorrectContext(false); @@ -126,8 +126,8 @@ @Test(groups = { "events", "integration" }) @SpecAssertions( { - @SpecAssertion(section = "10.4.5", id = "b"), - @SpecAssertion(section = "10.4.5", id = "e") }) + @SpecAssertion(section = "10.4.4", id = "b"), + @SpecAssertion(section = "10.4.4", id = "e") }) public void testBeforeTransactionCompletionObserver() { dog.setCorrectContext(false); Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/ResolvingChecksBindingTypeMembersTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/ResolvingChecksBindingTypeMembersTest.java 2009-11-05 08:52:14 UTC (rev 4696) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/ResolvingChecksBindingTypeMembersTest.java 2009-11-05 09:38:05 UTC (rev 4697) @@ -10,7 +10,7 @@ import org.testng.annotations.Test; @Artifact -@SpecVersion(spec="cdi", version="20091018") +@SpecVersion(spec="cdi", version="20091101") public class ResolvingChecksBindingTypeMembersTest extends AbstractJSR299Test { public static class AnEventType Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/select/SelectEventTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/select/SelectEventTest.java 2009-11-05 08:52:14 UTC (rev 4696) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/select/SelectEventTest.java 2009-11-05 09:38:05 UTC (rev 4697) @@ -15,7 +15,7 @@ * @author Dan Allen */ @Artifact -@SpecVersion(spec="cdi", version="20091018") +@SpecVersion(spec="cdi", version="20091101") public class SelectEventTest extends AbstractJSR299Test { @Test(groups = "events") Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/ProcessAnnotatedTypeTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/ProcessAnnotatedTypeTest.java 2009-11-05 08:52:14 UTC (rev 4696) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/ProcessAnnotatedTypeTest.java 2009-11-05 09:38:05 UTC (rev 4697) @@ -40,7 +40,7 @@ @Resource(source="javax.enterprise.inject.spi.Extension", destination="WEB-INF/classes/META-INF/services/javax.enterprise.inject.spi.Extension") }) @IntegrationTest -@SpecVersion(spec="cdi", version="20091018") +@SpecVersion(spec="cdi", version="20091101") public class ProcessAnnotatedTypeTest extends AbstractJSR299Test { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/definitionError/ProcessObserverMethodErrorTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/definitionError/ProcessObserverMethodErrorTest.java 2009-11-05 08:52:14 UTC (rev 4696) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/definitionError/ProcessObserverMethodErrorTest.java 2009-11-05 09:38:05 UTC (rev 4697) @@ -40,7 +40,7 @@ @Resource(source="javax.enterprise.inject.spi.Extension", destination="WEB-INF/classes/META-INF/services/javax.enterprise.inject.spi.Extension") }) @IntegrationTest -@SpecVersion(spec="cdi", version="20091018") +@SpecVersion(spec="cdi", version="20091101") public class ProcessObserverMethodErrorTest extends AbstractJSR299Test { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/broken/injectionTargetError/InjectionTargetDefinitionErrorTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/broken/injectionTargetError/InjectionTargetDefinitionErrorTest.java 2009-11-05 08:52:14 UTC (rev 4696) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/broken/injectionTargetError/InjectionTargetDefinitionErrorTest.java 2009-11-05 09:38:05 UTC (rev 4697) @@ -25,7 +25,7 @@ // Must be an integration test as it needs a resource copied to a folder @IntegrationTest @ExpectedDeploymentException(DefinitionError.class) -@SpecVersion(spec="cdi", version="20091018") +@SpecVersion(spec="cdi", version="20091101") public class InjectionTargetDefinitionErrorTest extends AbstractJSR299Test { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/UnresolvedDisposalMethodDefinitionTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/UnresolvedDisposalMethodDefinitionTest.java 2009-11-05 08:52:14 UTC (rev 4696) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/UnresolvedDisposalMethodDefinitionTest.java 2009-11-05 09:38:05 UTC (rev 4697) @@ -12,11 +12,11 @@ @Artifact @ExpectedDeploymentException(DefinitionError.class) @BeansXml("beans.xml") -@SpecVersion(spec="cdi", version="20091018") +@SpecVersion(spec="cdi", version="20091101") public class UnresolvedDisposalMethodDefinitionTest extends AbstractJSR299Test { @Test - @SpecAssertion(section = "3.3.9", id = "ca") + @SpecAssertion(section = "3.3.7", id = "ca") public void testUnresolvedDisposalMethod() { assert false; Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java 2009-11-05 08:52:14 UTC (rev 4696) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java 2009-11-05 09:38:05 UTC (rev 4697) @@ -10,7 +10,7 @@ @Artifact @ExpectedDeploymentException(DefinitionError.class) -@SpecVersion(spec="cdi", version="20091018") +@SpecVersion(spec="cdi", version="20091101") public class ParameterAnnotatedObservesTest extends AbstractJSR299Test { @Test(groups = "initializerMethod") Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java 2009-11-05 08:52:14 UTC (rev 4696) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java 2009-11-05 09:38:05 UTC (rev 4697) @@ -11,7 +11,7 @@ @Artifact @ExpectedDeploymentException(DefinitionError.class) -@SpecVersion(spec="cdi", version="20091018") +@SpecVersion(spec="cdi", version="20091101") public class ParameterAnnotatedDisposesTest extends AbstractJSR299Test { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java 2009-11-05 08:52:14 UTC (rev 4696) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java 2009-11-05 09:38:05 UTC (rev 4697) @@ -11,7 +11,7 @@ @Artifact @ExpectedDeploymentException(DefinitionError.class) -@SpecVersion(spec="cdi", version="20091018") +@SpecVersion(spec="cdi", version="20091101") public class ParameterAnnotatedObservesTest extends AbstractJSR299Test { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanDefinitionTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanDefinitionTest.java 2009-11-05 08:52:14 UTC (rev 4696) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanDefinitionTest.java 2009-11-05 09:38:05 UTC (rev 4697) @@ -12,7 +12,7 @@ import org.testng.annotations.Test; @Artifact -@SpecVersion(spec="cdi", version="20091018") +@SpecVersion(spec="cdi", version="20091101") @Packaging(PackagingType.EAR) public class SimpleBeanDefinitionTest extends AbstractJSR299Test { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasObservesParameter/ConstructorHasObservesParameterTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasObservesParameter/ConstructorHasObservesParameterTest.java 2009-11-05 08:52:14 UTC (rev 4696) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasObservesParameter/ConstructorHasObservesParameterTest.java 2009-11-05 09:38:05 UTC (rev 4697) @@ -11,7 +11,7 @@ @Artifact @ExpectedDeploymentException(DefinitionError.class) -@SpecVersion(spec="cdi", version="20091018") +@SpecVersion(spec="cdi", version="20091101") public class ConstructorHasObservesParameterTest extends AbstractJSR299Test { @Test(groups = { "observerMethod" }) Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializingAndSpecializedBeanHaveName/SpecializingAndSpecializedBeanHaveNameTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializingAndSpecializedBeanHaveName/SpecializingAndSpecializedBeanHaveNameTest.java 2009-11-05 08:52:14 UTC (rev 4696) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializingAndSpecializedBeanHaveName/SpecializingAndSpecializedBeanHaveNameTest.java 2009-11-05 09:38:05 UTC (rev 4697) @@ -11,7 +11,7 @@ @Artifact @ExpectedDeploymentException(DefinitionError.class) -@SpecVersion(spec="cdi", version="20091018") +@SpecVersion(spec="cdi", version="20091101") public class SpecializingAndSpecializedBeanHaveNameTest extends AbstractJSR299Test { @Test Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/SpecializingBeanExtendsEnterpriseBeanTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/SpecializingBeanExtendsEnterpriseBeanTest.java 2009-11-05 08:52:14 UTC (rev 4696) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/SpecializingBeanExtendsEnterpriseBeanTest.java 2009-11-05 09:38:05 UTC (rev 4697) @@ -14,7 +14,7 @@ @Artifact @Packaging(PackagingType.EAR) @ExpectedDeploymentException(DefinitionError.class) -@SpecVersion(spec="cdi", version="20091018") +@SpecVersion(spec="cdi", version="20091101") public class SpecializingBeanExtendsEnterpriseBeanTest extends AbstractJSR299Test { @Test(groups = { "specialization" }) Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/SpecializingBeanImplementsInterfaceOnly.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/SpecializingBeanImplementsInterfaceOnly.java 2009-11-05 08:52:14 UTC (rev 4696) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/SpecializingBeanImplementsInterfaceOnly.java 2009-11-05 09:38:05 UTC (rev 4697) @@ -11,7 +11,7 @@ @Artifact @ExpectedDeploymentException(DefinitionError.class) -@SpecVersion(spec="cdi", version="20091018") +@SpecVersion(spec="cdi", version="20091101") public class SpecializingBeanImplementsInterfaceOnly extends AbstractJSR299Test { @Test(groups = { "specialization" }) Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/interceptorCanNotBeDecorator/InterceptorCanNotBeDecoratorTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/interceptorCanNotBeDecorator/InterceptorCanNotBeDecoratorTest.java 2009-11-05 08:52:14 UTC (rev 4696) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/interceptorCanNotBeDecorator/InterceptorCanNotBeDecoratorTest.java 2009-11-05 09:38:05 UTC (rev 4697) @@ -11,7 +11,7 @@ @Artifact @ExpectedDeploymentException(DeploymentError.class) -@SpecVersion(spec="cdi", version="20091018") +@SpecVersion(spec="cdi", version="20091101") @BeansXml("beans.xml") public class InterceptorCanNotBeDecoratorTest extends AbstractJSR299Test { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/sameClassListedTwiceInBeansXml/SameClassListedTwiceInBeansXmlTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/sameClassListedTwiceInBeansXml/SameClassListedTwiceInBeansXmlTest.java 2009-11-05 08:52:14 UTC (rev 4696) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/sameClassListedTwiceInBeansXml/SameClassListedTwiceInBeansXmlTest.java 2009-11-05 09:38:05 UTC (rev 4697) @@ -11,7 +11,7 @@ @Artifact @ExpectedDeploymentException(DeploymentError.class) -@SpecVersion(spec="cdi", version="20091018") +@SpecVersion(spec="cdi", version="20091101") @BeansXml("beans.xml") public class SameClassListedTwiceInBeansXmlTest extends AbstractJSR299Test { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorCalledBeforeDecorator/InterceptorCalledBeforeDecoratorTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorCalledBeforeDecorator/InterceptorCalledBeforeDecoratorTest.java 2009-11-05 08:52:14 UTC (rev 4696) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorCalledBeforeDecorator/InterceptorCalledBeforeDecoratorTest.java 2009-11-05 09:38:05 UTC (rev 4697) @@ -9,7 +9,7 @@ import org.testng.annotations.Test; @Artifact -@SpecVersion(spec="cdi", version="20091018") +@SpecVersion(spec="cdi", version="20091101") @BeansXml("beans.xml") public class InterceptorCalledBeforeDecoratorTest extends AbstractJSR299Test { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/ResolutionByNameTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/ResolutionByNameTest.java 2009-11-05 08:52:14 UTC (rev 4696) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/ResolutionByNameTest.java 2009-11-05 09:38:05 UTC (rev 4697) @@ -30,13 +30,13 @@ @Artifact @BeansXml("beans.xml") -@SpecVersion(spec="cdi", version="20091018") +@SpecVersion(spec="cdi", version="20091101") public class ResolutionByNameTest extends AbstractJSR299Test { @Test(groups = { "resolution"}) @SpecAssertions({ - @SpecAssertion(section = "5.4.1", id = "ca"), + @SpecAssertion(section = "5.3.1", id = "ca"), @SpecAssertion(section = "11.3.5", id = "aa"), @SpecAssertion(section = "11.3.5", id = "b") }) Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/builtin/BuiltinInstanceTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/builtin/BuiltinInstanceTest.java 2009-11-05 08:52:14 UTC (rev 4696) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/builtin/BuiltinInstanceTest.java 2009-11-05 09:38:05 UTC (rev 4697) @@ -32,11 +32,11 @@ * Tests for built-in Instance. */ @Artifact -@SpecVersion(spec="cdi", version="20091018") +@SpecVersion(spec="cdi", version="20091101") public class BuiltinInstanceTest extends AbstractJSR299Test { @Test - @SpecAssertion(section = "5.7.2", id = "d") + @SpecAssertion(section = "5.6.2", id = "d") public void testScopeOfBuiltinInstance() { Bean<Instance<Cow>> bean = getBeans(new TypeLiteral<Instance<Cow>>() {}).iterator().next(); @@ -44,7 +44,7 @@ } @Test - @SpecAssertion(section = "5.7.2", id = "e") + @SpecAssertion(section = "5.6.2", id = "e") public void testNameOfBuiltinInstance() { Bean<Instance<Cow>> bean = getBeans(new TypeLiteral<Instance<Cow>>() {}).iterator().next(); @@ -53,8 +53,8 @@ @Test @SpecAssertions({ - @SpecAssertion(section = "5.7.2", id = "a"), - @SpecAssertion(section = "5.7.2", id = "f") + @SpecAssertion(section = "5.6.2", id = "a"), + @SpecAssertion(section = "5.6.2", id = "f") }) public void testInstanceProvidedForEveryLegalBeanType() { @@ -65,7 +65,7 @@ } @Test(groups = "ri-broken") - @SpecAssertion(section = "5.7.2", id = "g") + @SpecAssertion(section = "5.6.2", id = "g") public void testInstanceIsPassivationCapable() throws Exception { Field field = getInstanceByType(Field.class); Modified: cdi-tck/trunk/impl/src/main/resources/tck-audit-cdi.xml =================================================================== --- cdi-tck/trunk/impl/src/main/resources/tck-audit-cdi.xml 2009-11-05 08:52:14 UTC (rev 4696) +++ cdi-tck/trunk/impl/src/main/resources/tck-audit-cdi.xml 2009-11-05 09:38:05 UTC (rev 4697) @@ -4781,7 +4781,7 @@ <text>Interceptors and decorators may not declare observer methods. If an interceptor or decorator has a method with a parameter annotated |@Observes|, the container automatically detects the problem and treats it as a definition error.</text> </assertion> - <assertion id="a"> + <assertion id="i"> <text>In addition to the event parameter, observer methods may declare additional parameters, which may declare qualifiers. These additional parameters are injection points.</text> </assertion> </section>