Author: shane.bryzak(a)jboss.com Date: 2009-09-24 22:31:37 -0400 (Thu, 24 Sep 2009) New Revision: 3781 Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/ContextTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/DestroyedInstanceReturnedByGetTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/GetFromContextualTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/GetOnInactiveContextTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/GetWithNoCreationalContextTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ejb/EJBApplicationContextTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationBeginTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationEndTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationIdSetByApplicationTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationIdSetByContainerTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationTimeoutTest.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/context/passivating/broken/decoratorWithNonPassivatingBeanConstructor/DecoratorWithNonPassivatingBeanConstructorTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInitializerMethod/DecoratorWithNonPassivatingInitializerMethodTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInjectedField/DecoratorWithNonPassivatingInjectedFieldTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/dependentScopedProducerFieldReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean/EnterpriseBeanWithIllegalDependencyTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/dependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean/EnterpriseBeanWithIllegalDependencyTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptor/EnterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptorTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingConstructorFieldInDecorator/EnterpriseBeanWithNonPassivatingFieldInDecoratorTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingDecorator/EnterpriseBeanWithNonPassivatingDecoratorTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonSerializableIntializerMethod/EnterpriseBeanWithNonSerializableIntializerMethodTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInitializerMethodParameter/PassivationCapableBeanWithNonPassivatingInterceptorTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInjectedField/PassivationCapableBeanWithNonPassivatingInterceptorTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/managedBeanWithNonSerializableInterceptorClass/ManagedBeanWithNonSerializableInterceptorClassTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerField/NonPassivationCapableProducerFieldTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingManagedBeanWithNonPassivatingInjcetedField/PassivatingManagedBeanWithNonPassivatingInjcetedFieldTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingProducerMethodWithNonPassivatingParameter/PassivatingProducerMethodWithNonPassivatingParameterTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/unserializableSimpleInjectedIntoPassivatingEnterpriseBean/UnserializableSimpleInjectedIntoPassivatingEnterpriseBeanTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/SessionContextTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/DecoratorDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorListedTwiceInBeansXml/DecoratorListedTwiceInBeansXmlTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanClass/FinalBeanClassTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/multipleDelegateInjectionPoints/MultipleDelegateInjectionPointsTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/noDelegateInjectionPoints/NoDelegateInjectionPointsTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/nonExistantClassInBeansXml/NonExistantDecoratorClassInBeansXmlTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/delegateConstructor/DelegateInjectionPointTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/delegateInitializerMethod/DelegateInjectionPointTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/DecoratorInvocationTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/EJBDecoratorInvocationTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/observer/DecoratorInvocationTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/producer/method/DecoratorInvocationTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/BeanDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/custom/CustomBeanImplementationTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/genericbroken/GenericManagedBeanTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/BindingDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/EnterpriseBindingDefinitionTest.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/definition/scope/ScopeDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken/tooManyScopes/TooManyScopesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/enterprise/EnterpriseScopeDefinitionTest.java 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/broken/nonEmptyNamed/NonEmptyNamedTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/scopeConflict/IncompatibleStereotypesTest.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/definition/stereotype/defaultNamed/DefaultNamedTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/EnterpriseStereotypeDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/inheritance/StereotypeInheritenceTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDeploymentProblem/AddDeploymentProblemTest.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/failsDuringValidation/AfterBeanDiscoveryFailureTest.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/useBeforeValidationFails/UseBeforeValidationTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/LibraryMissingBeansXmlTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/installedLibrary/EarInstalledLibraryTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/bindingTypes/EventBindingTypesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/beanNotManaged/ObserverMethodOnIncorrectBeanTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isInitializer/ObserverMethodAnnotatedInitialzerTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isProducer/ObserverMethodAnnotatedProducesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/tooManyParameters/ObserverMethodWithTwoEventParametersTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/eventTypes/EventTypesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/FireEventTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/ObserverTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/EnterpriseEventInheritenceTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/resolve/ResolveEventObserversTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/resolve/enterprise/ResolveEnterpriseEventObserverTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/runtimeException/ObserverExceptionRethrownTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/transactional/TransactionalObserversTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/wildcardAndTypeVariable/ObserverMethodWithParametertizedTypeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/select/SelectEventTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/ProcessAnnotatedTypeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/broken/processInjectionTargetThrowsException/ProcessInjectionTargetEventThrowsExceptionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/BeanManagerTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/ProcessObserverMethodEventTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/definitionError/ProcessObserverMethodErrorTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/builtin/BuiltInBeansTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DisposalMethodDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multiParams/MultipleDisposeParametersDefinitionTest.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/singletonWithRequestScope/SingletonWithRequestScopeTest.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/enterprise/broken/statelessWithApplicationScope/StatelessWithApplicationScopeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithRequestScope/StatelessWithRequestScopeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanICTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/methodAnnotatedProduces/InitializerMethodAnnotatedProducesTest.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/field/definition/broken/parameterizedReturnTypeWithWildcard/ParameterizedReturnTypeWithWildcardTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/enterprise/EnterpriseProducerFieldDefinitionTest.java 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/broken/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithWildcard/ParameterizedTypeWithWildcardTest.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/implementation/producer/method/definition/enterprise/EnterpriseProducerMethodDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/ProducerMethodLifecycleTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasObservesParameter/ConstructorHasObservesParameterTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/dependentWithPublicField/DependentWithPublicFieldTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/tooManyInitializerAnnotatedConstructors/TooManyInitializerAnnotatedConstructorsTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/NewSimpleBeanTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/EjbInjectionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/PersistenceContextInjectionTest.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/EnterpriseBeanSpecializationTest.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/inheritance/specialization/enterprise/broken/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/ProducerMethodSpecializationTest.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/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/interceptors/definition/InterceptorDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/interceptorCanNotBeDecorator/InterceptorCanNotBeDecoratorTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/nonExistantClassInBeansXml/NonExistantClassInBeansXmlTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/nonInterceptorClassInBeansXml/NonInterceptorClassInBeansXmlTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/sameClassListedTwiceInBeansXml/SameClassListedTwiceInBeansXmlTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/SessionBeanInterceptorDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorCalledBeforeDecorator/InterceptorCalledBeforeDecoratorTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorNotListedInBeansXml/InterceptorNotListedInBeansXmlNotEnabledTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/multipleBindings/MultipleInterceptorBindingsTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/binding/members/annotation/BindingAnnotationWithMemberTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/binding/members/array/BindingAnnotationWithMemberTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/ResolutionByNameTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicateNameResolution/DuplicateNameResolutionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/circular/CircularDependencyTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/ClientProxyTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/array/ArrayTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/finalClass/FinalClassTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/primitive/UnproxyableTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/broken/unsatisfied/UnsatisfiedDependencyTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/DynamicLookupTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/el/ResolutionByNameTest.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/injection/any/AnyInjectionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/SessionBeanInjectionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/InjectionIntoWebServiceEndPointTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/InjectionPointTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/broken/reference/ambiguous/AmbiguousInjectableReferenceTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/jndi/ManagerTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/broken/primitive/PrimitiveInjectionPointTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/broken/type/variable/TypeVariableInjectionPointTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/parameterized/AssignabilityOfRawAndParameterizedTypesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/incorrect/name/NoClassWithSpecifiedNameTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/not/policy/stereotype/ClassIsNotPolicyTest.java Log: remaining PFD2 test mappings Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/ContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/ContextTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/ContextTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -18,7 +18,7 @@ import org.testng.annotations.Test; @Artifact -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") @Resources({ @Resource(source="javax.enterprise.inject.spi.Extension", destination="WEB-INF/classes/META-INF/services/javax.enterprise.inject.spi.Extension") }) @@ -45,7 +45,7 @@ @SpecAssertion(section = "2.4.1", id = "ab"), @SpecAssertion(section = "2.4.1", id = "ac"), @SpecAssertion(section = "2.4.1", id = "ca"), - @SpecAssertion(section = "11.3.15", id = "a") + @SpecAssertion(section = "11.3.14", id = "a") }) public void testBuiltInContexts() { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/DestroyedInstanceReturnedByGetTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/DestroyedInstanceReturnedByGetTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/DestroyedInstanceReturnedByGetTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -13,7 +13,7 @@ import org.testng.annotations.Test; @Artifact -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class DestroyedInstanceReturnedByGetTest extends AbstractJSR299Test { @Test(groups = { "contexts" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/GetFromContextualTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/GetFromContextualTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/GetFromContextualTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -14,7 +14,7 @@ import org.testng.annotations.Test; @Artifact -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class GetFromContextualTest extends AbstractJSR299Test { @Test(groups = { "contexts" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/GetOnInactiveContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/GetOnInactiveContextTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/GetOnInactiveContextTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -12,7 +12,7 @@ import org.testng.annotations.Test; @Artifact -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class GetOnInactiveContextTest extends AbstractJSR299Test { @Test(groups = { "contexts" }, expectedExceptions = { ContextNotActiveException.class }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/GetWithNoCreationalContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/GetWithNoCreationalContextTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/GetWithNoCreationalContextTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -11,7 +11,7 @@ import org.testng.annotations.Test; @Artifact -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class GetWithNoCreationalContextTest extends AbstractJSR299Test { @Test(groups = { "contexts" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ejb/EJBApplicationContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ejb/EJBApplicationContextTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ejb/EJBApplicationContextTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -17,7 +17,7 @@ @Artifact @IntegrationTest @Packaging(PackagingType.EAR) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class EJBApplicationContextTest extends AbstractJSR299Test { @Test(groups = { "rewrite", "contexts", "webservice", "integration", "jboss-as-broken" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationBeginTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationBeginTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationBeginTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -13,7 +13,7 @@ * @author Nicklas Karlsson */ @Artifact -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class ConversationBeginTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationEndTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationEndTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationEndTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -13,7 +13,7 @@ * @author Nicklas Karlsson */ @Artifact -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class ConversationEndTest extends AbstractJSR299Test { @Override Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationIdSetByApplicationTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationIdSetByApplicationTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationIdSetByApplicationTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -13,7 +13,7 @@ * @author Nicklas Karlsson */ @Artifact -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class ConversationIdSetByApplicationTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationIdSetByContainerTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationIdSetByContainerTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationIdSetByContainerTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -14,7 +14,7 @@ * */ @Artifact -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class ConversationIdSetByContainerTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationTimeoutTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationTimeoutTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationTimeoutTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -13,7 +13,7 @@ * @author Dan Allen */ @Artifact -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class ConversationTimeoutTest extends AbstractJSR299Test { @Test 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-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ClientConversationContextTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -33,7 +33,7 @@ @Resource(destination="/WEB-INF/faces-config.xml", source="faces-config.xml"), @Resource(destination="rain.jspx", source="rain.jsf") }) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class ClientConversationContextTest extends AbstractConversationTest { 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-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/DependentContextTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -20,7 +20,7 @@ @Artifact @BeansXml("beans.xml") -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class DependentContextTest extends AbstractJSR299Test { 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-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/PassivatingContextTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -27,7 +27,7 @@ @Artifact @BeansXml("beans.xml") @Packaging(PackagingType.EAR) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class PassivatingContextTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingBeanConstructor/DecoratorWithNonPassivatingBeanConstructorTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingBeanConstructor/DecoratorWithNonPassivatingBeanConstructorTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingBeanConstructor/DecoratorWithNonPassivatingBeanConstructorTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -11,7 +11,7 @@ @Artifact @ExpectedDeploymentException(DeploymentError.class) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") @BeansXml("beans.xml") public class DecoratorWithNonPassivatingBeanConstructorTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInitializerMethod/DecoratorWithNonPassivatingInitializerMethodTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInitializerMethod/DecoratorWithNonPassivatingInitializerMethodTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInitializerMethod/DecoratorWithNonPassivatingInitializerMethodTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -11,7 +11,7 @@ @Artifact @ExpectedDeploymentException(DeploymentError.class) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") @BeansXml("beans.xml") public class DecoratorWithNonPassivatingInitializerMethodTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInjectedField/DecoratorWithNonPassivatingInjectedFieldTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInjectedField/DecoratorWithNonPassivatingInjectedFieldTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInjectedField/DecoratorWithNonPassivatingInjectedFieldTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -11,7 +11,7 @@ @Artifact @ExpectedDeploymentException(DeploymentError.class) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") @BeansXml("beans.xml") public class DecoratorWithNonPassivatingInjectedFieldTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/dependentScopedProducerFieldReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean/EnterpriseBeanWithIllegalDependencyTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/dependentScopedProducerFieldReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean/EnterpriseBeanWithIllegalDependencyTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/dependentScopedProducerFieldReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean/EnterpriseBeanWithIllegalDependencyTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -16,7 +16,7 @@ @IntegrationTest @Packaging(PackagingType.EAR) @ExpectedDeploymentException(IllegalProductException.class) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class EnterpriseBeanWithIllegalDependencyTest extends AbstractJSR299Test { @Test(groups = { "contexts", "passivation", "integration"}) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/dependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean/EnterpriseBeanWithIllegalDependencyTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/dependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean/EnterpriseBeanWithIllegalDependencyTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/dependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean/EnterpriseBeanWithIllegalDependencyTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -16,7 +16,7 @@ @IntegrationTest @Packaging(PackagingType.EAR) @ExpectedDeploymentException(IllegalProductException.class) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class EnterpriseBeanWithIllegalDependencyTest extends AbstractJSR299Test { @Test(groups = { "contexts", "passivation", "integration"}) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptor/EnterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptorTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptor/EnterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptorTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptor/EnterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptorTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -13,7 +13,7 @@ @Artifact @Packaging(PackagingType.EAR) @ExpectedDeploymentException(DeploymentError.class) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class EnterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptorTest extends AbstractJSR299Test { @Test(groups = { "contexts", "passivation", "ri-broken" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingConstructorFieldInDecorator/EnterpriseBeanWithNonPassivatingFieldInDecoratorTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingConstructorFieldInDecorator/EnterpriseBeanWithNonPassivatingFieldInDecoratorTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingConstructorFieldInDecorator/EnterpriseBeanWithNonPassivatingFieldInDecoratorTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -14,7 +14,7 @@ @Artifact @Packaging(PackagingType.EAR) @ExpectedDeploymentException(DeploymentError.class) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") @BeansXml("beans.xml") public class EnterpriseBeanWithNonPassivatingFieldInDecoratorTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingDecorator/EnterpriseBeanWithNonPassivatingDecoratorTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingDecorator/EnterpriseBeanWithNonPassivatingDecoratorTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingDecorator/EnterpriseBeanWithNonPassivatingDecoratorTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -14,7 +14,7 @@ @Artifact @Packaging(PackagingType.EAR) @ExpectedDeploymentException(DeploymentError.class) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") @BeansXml("beans.xml") public class EnterpriseBeanWithNonPassivatingDecoratorTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonSerializableIntializerMethod/EnterpriseBeanWithNonSerializableIntializerMethodTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonSerializableIntializerMethod/EnterpriseBeanWithNonSerializableIntializerMethodTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonSerializableIntializerMethod/EnterpriseBeanWithNonSerializableIntializerMethodTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -13,7 +13,7 @@ @Artifact @Packaging(PackagingType.EAR) @ExpectedDeploymentException(DeploymentError.class) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class EnterpriseBeanWithNonSerializableIntializerMethodTest extends AbstractJSR299Test { @Test(groups = { "contexts", "passivation"}) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInitializerMethodParameter/PassivationCapableBeanWithNonPassivatingInterceptorTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInitializerMethodParameter/PassivationCapableBeanWithNonPassivatingInterceptorTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInitializerMethodParameter/PassivationCapableBeanWithNonPassivatingInterceptorTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -10,7 +10,7 @@ @Artifact @ExpectedDeploymentException(DeploymentError.class) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class PassivationCapableBeanWithNonPassivatingInterceptorTest extends AbstractJSR299Test { @Test(groups = { "contexts", "passivation", "ri-broken" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInjectedField/PassivationCapableBeanWithNonPassivatingInterceptorTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInjectedField/PassivationCapableBeanWithNonPassivatingInterceptorTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInjectedField/PassivationCapableBeanWithNonPassivatingInterceptorTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -10,7 +10,7 @@ @Artifact @ExpectedDeploymentException(DeploymentError.class) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class PassivationCapableBeanWithNonPassivatingInterceptorTest extends AbstractJSR299Test { @Test(groups = { "contexts", "passivation", "ri-broken" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/managedBeanWithNonSerializableInterceptorClass/ManagedBeanWithNonSerializableInterceptorClassTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/managedBeanWithNonSerializableInterceptorClass/ManagedBeanWithNonSerializableInterceptorClassTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/managedBeanWithNonSerializableInterceptorClass/ManagedBeanWithNonSerializableInterceptorClassTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -10,7 +10,7 @@ @Artifact @ExpectedDeploymentException(DeploymentError.class) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class ManagedBeanWithNonSerializableInterceptorClassTest extends AbstractJSR299Test { @Test(groups = { "contexts", "passivation", "ri-broken"}) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerField/NonPassivationCapableProducerFieldTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerField/NonPassivationCapableProducerFieldTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerField/NonPassivationCapableProducerFieldTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -17,7 +17,7 @@ */ @Artifact @Packaging(PackagingType.EAR) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") @ExpectedDeploymentException(DeploymentError.class) public class NonPassivationCapableProducerFieldTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingManagedBeanWithNonPassivatingInjcetedField/PassivatingManagedBeanWithNonPassivatingInjcetedFieldTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingManagedBeanWithNonPassivatingInjcetedField/PassivatingManagedBeanWithNonPassivatingInjcetedFieldTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingManagedBeanWithNonPassivatingInjcetedField/PassivatingManagedBeanWithNonPassivatingInjcetedFieldTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -10,7 +10,7 @@ @Artifact @ExpectedDeploymentException(DeploymentError.class) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class PassivatingManagedBeanWithNonPassivatingInjcetedFieldTest extends AbstractJSR299Test { @Test(groups = { "contexts", "passivation" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingProducerMethodWithNonPassivatingParameter/PassivatingProducerMethodWithNonPassivatingParameterTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingProducerMethodWithNonPassivatingParameter/PassivatingProducerMethodWithNonPassivatingParameterTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingProducerMethodWithNonPassivatingParameter/PassivatingProducerMethodWithNonPassivatingParameterTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -10,7 +10,7 @@ @Artifact @ExpectedDeploymentException(DeploymentError.class) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class PassivatingProducerMethodWithNonPassivatingParameterTest extends AbstractJSR299Test { @Test(groups = { "contexts", "passivation" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/unserializableSimpleInjectedIntoPassivatingEnterpriseBean/UnserializableSimpleInjectedIntoPassivatingEnterpriseBeanTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/unserializableSimpleInjectedIntoPassivatingEnterpriseBean/UnserializableSimpleInjectedIntoPassivatingEnterpriseBeanTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/unserializableSimpleInjectedIntoPassivatingEnterpriseBean/UnserializableSimpleInjectedIntoPassivatingEnterpriseBeanTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -13,7 +13,7 @@ @Artifact @Packaging(PackagingType.EAR) @ExpectedDeploymentException(DeploymentError.class) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class UnserializableSimpleInjectedIntoPassivatingEnterpriseBeanTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/SessionContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/SessionContextTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/SessionContextTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -19,7 +19,7 @@ @Resource(destination=WarArtifactDescriptor.WEB_XML_DESTINATION, source="web.xml"), @Resource(destination="SimplePage.html", source="SimplePage.html") }) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class SessionContextTest extends AbstractJSR299Test { @Test(groups = { "contexts", "servlet", "integration" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/DecoratorDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/DecoratorDefinitionTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/DecoratorDefinitionTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -40,17 +40,17 @@ */ @Artifact @BeansXml("beans.xml") -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class DecoratorDefinitionTest extends AbstractJSR299Test { @Test @SpecAssertions ({ - @SpecAssertion(section="8.1", id="d"), - @SpecAssertion(section="8.1.1", id="a"), - @SpecAssertion(section="8.1.3", id="c"), - @SpecAssertion(section="8.3", id="aa"), - @SpecAssertion(section="11.1.1", id="a"), + @SpecAssertion(section = "8.1", id = "d"), + @SpecAssertion(section = "8.1.1", id = "a"), + @SpecAssertion(section = "8.1.3", id = "c"), + @SpecAssertion(section = "8.3", id = "aa"), + @SpecAssertion(section = "11.1.1", id = "a"), @SpecAssertion(section = "12.3", id = "kc") }) @@ -73,11 +73,11 @@ @Test @SpecAssertions ({ - @SpecAssertion(section="8.1", id="b"), - @SpecAssertion(section="8.1", id="c"), - @SpecAssertion(section="11.1.1", id="b"), - @SpecAssertion(section="11.3.12", id="a"), - @SpecAssertion(section="11.3.12", id="b") + @SpecAssertion(section = "8.1", id = "b"), + @SpecAssertion(section = "8.1", id = "c"), + @SpecAssertion(section = "11.1.1", id = "b"), + @SpecAssertion(section = "11.3.11", id = "a"), + @SpecAssertion(section = "11.3.11", id = "b") }) public void testDecoratedTypes() { @@ -123,7 +123,7 @@ @SpecAssertions({ @SpecAssertion(section="8.2", id="b"), @SpecAssertion(section="8.3", id="aa"), - @SpecAssertion(section="11.3.12", id="a") + @SpecAssertion(section="11.3.11", id="a") }) public void testDecoratorOrdering() { @@ -153,7 +153,7 @@ } @Test(expectedExceptions = IllegalArgumentException.class) - @SpecAssertion(section="11.3.12", id="c") + @SpecAssertion(section="11.3.11", id="c") public void testDuplicateBindingsOnResolveDecoratorsFails() { Annotation binding = new AnnotationLiteral<Meta>() {}; @@ -161,7 +161,7 @@ } @Test(expectedExceptions = IllegalArgumentException.class) - @SpecAssertion(section="11.3.12", id="d") + @SpecAssertion(section="11.3.11", id="d") public void testNonBindingsOnResolveDecoratorsFails() { Annotation binding = new AnnotationLiteral<NonMeta>() {}; @@ -169,7 +169,7 @@ } @Test(expectedExceptions = IllegalArgumentException.class) - @SpecAssertion(section="11.3.12", id="e") + @SpecAssertion(section="11.3.11", id="e") public void testEmptyTypeSetOnResolveDecoratorsFails() { Annotation binding = new AnnotationLiteral<NonMeta>() {}; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorListedTwiceInBeansXml/DecoratorListedTwiceInBeansXmlTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorListedTwiceInBeansXml/DecoratorListedTwiceInBeansXmlTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorListedTwiceInBeansXml/DecoratorListedTwiceInBeansXmlTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -16,7 +16,7 @@ @Artifact @ExpectedDeploymentException(DeploymentError.class) @BeansXml("beans.xml") -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class DecoratorListedTwiceInBeansXmlTest extends AbstractJSR299Test { @Test Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanClass/FinalBeanClassTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanClass/FinalBeanClassTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanClass/FinalBeanClassTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -32,7 +32,7 @@ @Artifact @ExpectedDeploymentException(DefinitionError.class) @BeansXml("beans.xml") -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class FinalBeanClassTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/multipleDelegateInjectionPoints/MultipleDelegateInjectionPointsTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/multipleDelegateInjectionPoints/MultipleDelegateInjectionPointsTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/multipleDelegateInjectionPoints/MultipleDelegateInjectionPointsTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -32,7 +32,7 @@ @Artifact @ExpectedDeploymentException(DefinitionError.class) @BeansXml("beans.xml") -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class MultipleDelegateInjectionPointsTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/noDelegateInjectionPoints/NoDelegateInjectionPointsTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/noDelegateInjectionPoints/NoDelegateInjectionPointsTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/noDelegateInjectionPoints/NoDelegateInjectionPointsTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -32,7 +32,7 @@ @Artifact @ExpectedDeploymentException(DefinitionError.class) @BeansXml("beans.xml") -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class NoDelegateInjectionPointsTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/nonExistantClassInBeansXml/NonExistantDecoratorClassInBeansXmlTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/nonExistantClassInBeansXml/NonExistantDecoratorClassInBeansXmlTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/nonExistantClassInBeansXml/NonExistantDecoratorClassInBeansXmlTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -12,7 +12,7 @@ @Artifact @ExpectedDeploymentException(DeploymentError.class) @BeansXml("beans.xml") -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class NonExistantDecoratorClassInBeansXmlTest extends AbstractJSR299Test { @Test Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/delegateConstructor/DelegateInjectionPointTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/delegateConstructor/DelegateInjectionPointTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/delegateConstructor/DelegateInjectionPointTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -30,7 +30,7 @@ */ @Artifact @BeansXml("beans.xml") -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class DelegateInjectionPointTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/delegateInitializerMethod/DelegateInjectionPointTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/delegateInitializerMethod/DelegateInjectionPointTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/delegateInitializerMethod/DelegateInjectionPointTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -30,7 +30,7 @@ */ @Artifact @BeansXml("beans.xml") -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class DelegateInjectionPointTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/DecoratorInvocationTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/DecoratorInvocationTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/DecoratorInvocationTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -30,7 +30,7 @@ */ @Artifact @BeansXml("beans.xml") -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class DecoratorInvocationTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/EJBDecoratorInvocationTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/EJBDecoratorInvocationTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/EJBDecoratorInvocationTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -31,7 +31,7 @@ */ @Artifact @BeansXml("beans.xml") -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") @IntegrationTest public class EJBDecoratorInvocationTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/observer/DecoratorInvocationTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/observer/DecoratorInvocationTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/observer/DecoratorInvocationTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -30,7 +30,7 @@ */ @Artifact @BeansXml("beans.xml") -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class DecoratorInvocationTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/producer/method/DecoratorInvocationTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/producer/method/DecoratorInvocationTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/producer/method/DecoratorInvocationTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -33,7 +33,7 @@ */ @Artifact @BeansXml("beans.xml") -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class DecoratorInvocationTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/BeanDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/BeanDefinitionTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/BeanDefinitionTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -20,7 +20,7 @@ * @author Pete Muir */ @Artifact -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class BeanDefinitionTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/custom/CustomBeanImplementationTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/custom/CustomBeanImplementationTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/custom/CustomBeanImplementationTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -27,7 +27,7 @@ import org.testng.annotations.Test; @Artifact -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") @Resources({ @Resource(source="javax.enterprise.inject.spi.Extension", destination="WEB-INF/classes/META-INF/services/javax.enterprise.inject.spi.Extension") }) @@ -44,7 +44,7 @@ } @Test(groups = { "ri-broken" }) - @SpecAssertion(section = "5.2", id = "k") + @SpecAssertion(section = "5.2.1", id = "k") // WBRI-328 public void testGetStereotypesCalled() { @@ -52,7 +52,7 @@ } @Test - @SpecAssertion(section = "5.2", id = "k") + @SpecAssertion(section = "5.2.1", id = "k") public void testIsPolicyCalled() { assert CatBean.bean.isPolicyCalled(); Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/genericbroken/GenericManagedBeanTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/genericbroken/GenericManagedBeanTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/genericbroken/GenericManagedBeanTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -11,7 +11,7 @@ @Artifact @ExpectedDeploymentException(DefinitionError.class) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") @BeansXml("beans.xml") public class GenericManagedBeanTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/BindingDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/BindingDefinitionTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/BindingDefinitionTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -18,7 +18,7 @@ import org.testng.annotations.Test; @Artifact -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class BindingDefinitionTest extends AbstractJSR299Test { @Test Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/EnterpriseBindingDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/EnterpriseBindingDefinitionTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/EnterpriseBindingDefinitionTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -24,7 +24,7 @@ @Artifact @IntegrationTest @Packaging(PackagingType.EAR) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class EnterpriseBindingDefinitionTest extends AbstractJSR299Test { @Test 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-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/NameDefinitionTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -10,7 +10,7 @@ import org.testng.annotations.Test; @Artifact -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class NameDefinitionTest extends AbstractJSR299Test { @@ -30,7 +30,7 @@ @Test @SpecAssertions({ @SpecAssertion(section= "2.5.2", id = "a"), - @SpecAssertion(section = "3.1.6", id = "a"), + @SpecAssertion(section = "3.1.5", id = "a"), @SpecAssertion(section = "2.5.1", id = "d") }) public void testDefaultNamed() Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/ScopeDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/ScopeDefinitionTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/ScopeDefinitionTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -19,7 +19,7 @@ import org.testng.annotations.Test; @Artifact -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class ScopeDefinitionTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken/tooManyScopes/TooManyScopesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken/tooManyScopes/TooManyScopesTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken/tooManyScopes/TooManyScopesTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -11,7 +11,7 @@ @Artifact @ExpectedDeploymentException(DefinitionError.class) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class TooManyScopesTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/enterprise/EnterpriseScopeDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/enterprise/EnterpriseScopeDefinitionTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/enterprise/EnterpriseScopeDefinitionTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -12,7 +12,7 @@ @Artifact @Packaging(PackagingType.EAR) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class EnterpriseScopeDefinitionTest extends AbstractJSR299Test { @Test 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-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/StereotypeDefinitionTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -19,7 +19,7 @@ @Artifact @BeansXml("beans.xml") -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class StereotypeDefinitionTest extends AbstractJSR299Test { private static final Annotation TAME_LITERAL = new AnnotationLiteral<Tame>() {}; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/nonEmptyNamed/NonEmptyNamedTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/nonEmptyNamed/NonEmptyNamedTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/nonEmptyNamed/NonEmptyNamedTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -12,7 +12,7 @@ @Artifact @ExpectedDeploymentException(DefinitionError.class) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class NonEmptyNamedTest extends AbstractJSR299Test { @Test Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/scopeConflict/IncompatibleStereotypesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/scopeConflict/IncompatibleStereotypesTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/scopeConflict/IncompatibleStereotypesTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -11,7 +11,7 @@ @Artifact @ExpectedDeploymentException(DefinitionError.class) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class IncompatibleStereotypesTest extends AbstractJSR299Test { @Test 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-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/tooManyScopes/TooManyScopeTypesTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -11,7 +11,7 @@ @Artifact @ExpectedDeploymentException(DefinitionError.class) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class TooManyScopeTypesTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/defaultNamed/DefaultNamedTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/defaultNamed/DefaultNamedTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/defaultNamed/DefaultNamedTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -8,7 +8,7 @@ import org.testng.annotations.Test; @Artifact -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class DefaultNamedTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/EnterpriseStereotypeDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/EnterpriseStereotypeDefinitionTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/EnterpriseStereotypeDefinitionTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -15,7 +15,7 @@ @IntegrationTest @Artifact @Packaging(PackagingType.EAR) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class EnterpriseStereotypeDefinitionTest extends AbstractJSR299Test { @Test Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/inheritance/StereotypeInheritenceTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/inheritance/StereotypeInheritenceTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/inheritance/StereotypeInheritenceTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -35,7 +35,7 @@ */ @Artifact @BeansXml("beans.xml") -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class StereotypeInheritenceTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDeploymentProblem/AddDeploymentProblemTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDeploymentProblem/AddDeploymentProblemTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDeploymentProblem/AddDeploymentProblemTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -35,7 +35,7 @@ */ @Artifact @ExpectedDeploymentException(DeploymentError.class) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class AddDeploymentProblemTest extends AbstractJSR299Test { @Test(groups={"rewrite", "jboss-as-broken"}) 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-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/beanDiscoveryMethodThrowsException/BeforeBeanDiscoveryThrowsExceptionTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -36,7 +36,7 @@ }) @IntegrationTest @ExpectedDeploymentException(DefinitionError.class) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class BeforeBeanDiscoveryThrowsExceptionTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringValidation/AfterBeanDiscoveryFailureTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringValidation/AfterBeanDiscoveryFailureTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringValidation/AfterBeanDiscoveryFailureTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -36,7 +36,7 @@ */ @Artifact @ExpectedDeploymentException(DeploymentError.class) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class AfterBeanDiscoveryFailureTest extends AbstractJSR299Test { 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-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/normalScope/AddingNormalScopeTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -37,7 +37,7 @@ }) @IntegrationTest @ExpectedDeploymentException(DeploymentError.class) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class AddingNormalScopeTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/useBeforeValidationFails/UseBeforeValidationTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/useBeforeValidationFails/UseBeforeValidationTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/useBeforeValidationFails/UseBeforeValidationTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -32,7 +32,7 @@ * */ @Artifact -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class UseBeforeValidationTest extends AbstractJSR299Test { @Test(groups = {"ri-broken", "rewrite"}) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/LibraryMissingBeansXmlTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/LibraryMissingBeansXmlTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/LibraryMissingBeansXmlTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -40,7 +40,7 @@ // We put Foo in the ejb jar, but Bar goes in the library @Classes({LibraryMissingBeansXmlTest.class, Foo.class}) @Test -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") @IntegrationTest public class LibraryMissingBeansXmlTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/installedLibrary/EarInstalledLibraryTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/installedLibrary/EarInstalledLibraryTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/installedLibrary/EarInstalledLibraryTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -47,7 +47,7 @@ // We put Foo in the ejb jar, but Bar goes in the library @Classes({EarInstalledLibraryTest.class, Foo.class}) @Test -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") @Packaging(PackagingType.EAR) @IntegrationTest public class EarInstalledLibraryTest extends AbstractJSR299Test Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/bindingTypes/EventBindingTypesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/bindingTypes/EventBindingTypesTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/bindingTypes/EventBindingTypesTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -16,7 +16,7 @@ * @author Dan Allen */ @Artifact -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class EventBindingTypesTest extends AbstractJSR299Test { @Test(groups = { "events" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/beanNotManaged/ObserverMethodOnIncorrectBeanTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/beanNotManaged/ObserverMethodOnIncorrectBeanTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/beanNotManaged/ObserverMethodOnIncorrectBeanTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -29,7 +29,7 @@ * @author David Allen */ @Artifact -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class ObserverMethodOnIncorrectBeanTest extends AbstractJSR299Test { @Test(groups = { "events" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isInitializer/ObserverMethodAnnotatedInitialzerTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isInitializer/ObserverMethodAnnotatedInitialzerTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isInitializer/ObserverMethodAnnotatedInitialzerTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -34,7 +34,7 @@ */ @Artifact @ExpectedDeploymentException(DefinitionError.class) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class ObserverMethodAnnotatedInitialzerTest extends AbstractJSR299Test { @Test(groups = { "events" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isProducer/ObserverMethodAnnotatedProducesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isProducer/ObserverMethodAnnotatedProducesTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isProducer/ObserverMethodAnnotatedProducesTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -32,7 +32,7 @@ */ @Artifact @ExpectedDeploymentException(DefinitionError.class) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class ObserverMethodAnnotatedProducesTest extends AbstractJSR299Test { @Test(groups = { "events" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/tooManyParameters/ObserverMethodWithTwoEventParametersTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/tooManyParameters/ObserverMethodWithTwoEventParametersTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/tooManyParameters/ObserverMethodWithTwoEventParametersTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -11,7 +11,7 @@ @Artifact @ExpectedDeploymentException(DefinitionError.class) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class ObserverMethodWithTwoEventParametersTest extends AbstractJSR299Test { @Test(groups = { "events" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/eventTypes/EventTypesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/eventTypes/EventTypesTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/eventTypes/EventTypesTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -12,7 +12,7 @@ * @author Dan Allen */ @Artifact -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class EventTypesTest extends AbstractJSR299Test { @Test(groups = "event") Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/FireEventTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/FireEventTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/FireEventTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -29,7 +29,7 @@ * @author Dan Allen */ @Artifact -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class FireEventTest extends AbstractJSR299Test { private static final String BEAN_MANAGER_FIRE_EVENT_METHOD_NAME = "fireEvent"; @@ -37,8 +37,8 @@ @Test(groups = { "events" }) @SpecAssertions({ // these two assertions combine to create a logical, testable assertion - @SpecAssertion(section = "11.3.10", id = "a"), - @SpecAssertion(section = "11.3.10", id = "b") + @SpecAssertion(section = "11.3.9", id = "a"), + @SpecAssertion(section = "11.3.9", id = "b") }) public void testBeanManagerInterfaceForFireEventMethod() throws Exception { @@ -46,7 +46,7 @@ } @Test(groups = { "events" }) - @SpecAssertion(section = "11.3.10", id = "a") + @SpecAssertion(section = "11.3.9", id = "a") public void testBeanManagerFireEvent() { Billing billing = getInstanceByType(Billing.class); @@ -61,14 +61,14 @@ } @Test(groups = { "events"}, expectedExceptions = { IllegalArgumentException.class }) - @SpecAssertion(section = "11.3.10", id = "c") + @SpecAssertion(section = "11.3.9", id = "c") public void testTypeVariableEventTypeFails() throws Exception { getCurrentManager().fireEvent(new Foo<String>()); } @Test(groups = { "events" }, expectedExceptions = { IllegalArgumentException.class }) - @SpecAssertion(section = "11.3.10", id = "d") + @SpecAssertion(section = "11.3.9", id = "d") public void testDuplicateBindingsToFireEventFails() throws Exception { getCurrentManager().fireEvent(new Object(), new AnnotationLiteral<Lifted>() {}, new AnnotationLiteral<Lifted>() {}); Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/ObserverTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/ObserverTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/ObserverTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -15,7 +15,7 @@ import org.testng.annotations.Test; @Artifact -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class ObserverTest extends AbstractJSR299Test { @Test(groups = { "events" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/EnterpriseEventInheritenceTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/EnterpriseEventInheritenceTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/EnterpriseEventInheritenceTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -21,7 +21,7 @@ @Artifact @Packaging(PackagingType.EAR) @IntegrationTest -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class EnterpriseEventInheritenceTest extends AbstractJSR299Test { @Test(groups = { "events", "inheritance" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/resolve/ResolveEventObserversTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/resolve/ResolveEventObserversTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/resolve/ResolveEventObserversTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -16,7 +16,7 @@ import org.testng.annotations.Test; @Artifact -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class ResolveEventObserversTest extends AbstractJSR299Test { private static final String BEAN_MANAGER_RESOLVE_OBSERVERS_METHOD_NAME = "resolveObserverMethods"; @@ -84,8 +84,8 @@ @Test(groups = { "events" }) @SpecAssertions({ // these two assertions combine to create a logical, testable assertion - @SpecAssertion(section = "11.3.11", id = "a"), - @SpecAssertion(section = "11.3.11", id = "b") + @SpecAssertion(section = "11.3.10", id = "a"), + @SpecAssertion(section = "11.3.10", id = "b") }) public void testBeanManagerResolveObserversSignature() throws Exception { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/resolve/enterprise/ResolveEnterpriseEventObserverTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/resolve/enterprise/ResolveEnterpriseEventObserverTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/resolve/enterprise/ResolveEnterpriseEventObserverTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -7,7 +7,7 @@ import org.testng.annotations.Test; @Artifact -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class ResolveEnterpriseEventObserverTest extends AbstractJSR299Test { @Test(groups = { "events", "ejb" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/runtimeException/ObserverExceptionRethrownTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/runtimeException/ObserverExceptionRethrownTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/runtimeException/ObserverExceptionRethrownTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -30,7 +30,7 @@ * @author David Allen */ @Artifact -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class ObserverExceptionRethrownTest extends AbstractJSR299Test { @Test(groups = { "events" }, expectedExceptions = { TeaCupPomeranian.OversizedException.class }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/transactional/TransactionalObserversTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/transactional/TransactionalObserversTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/transactional/TransactionalObserversTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -41,7 +41,7 @@ @Artifact @Packaging(PackagingType.EAR) @IntegrationTest -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class TransactionalObserversTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/wildcardAndTypeVariable/ObserverMethodWithParametertizedTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/wildcardAndTypeVariable/ObserverMethodWithParametertizedTypeTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/wildcardAndTypeVariable/ObserverMethodWithParametertizedTypeTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -35,7 +35,7 @@ * @author David Allen */ @Artifact -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class ObserverMethodWithParametertizedTypeTest extends AbstractJSR299Test { @Test(groups = { "events"}) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/select/SelectEventTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/select/SelectEventTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/select/SelectEventTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -15,7 +15,7 @@ * @author Dan Allen */ @Artifact -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class SelectEventTest extends AbstractJSR299Test { @Test(groups = "events") Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/ProcessAnnotatedTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/ProcessAnnotatedTypeTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/ProcessAnnotatedTypeTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -38,7 +38,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="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class ProcessAnnotatedTypeTest extends AbstractJSR299Test { @Test Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/broken/processInjectionTargetThrowsException/ProcessInjectionTargetEventThrowsExceptionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/broken/processInjectionTargetThrowsException/ProcessInjectionTargetEventThrowsExceptionTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/broken/processInjectionTargetThrowsException/ProcessInjectionTargetEventThrowsExceptionTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -35,7 +35,7 @@ @Artifact @ExpectedDeploymentException(DeploymentError.class) @IntegrationTest -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class ProcessInjectionTargetEventThrowsExceptionTest extends AbstractJSR299Test { @Test(groups="ri-broken") Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/BeanManagerTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/BeanManagerTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/BeanManagerTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -62,11 +62,11 @@ * */ @Artifact -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class BeanManagerTest extends AbstractJSR299Test { @Test(groups = "ri-broken") - @SpecAssertion(section = "11.3.7", id = "a") + @SpecAssertion(section = "11.3.6", id = "a") //WBRI-328 public void testGetPassivationCapableBeanById() { @@ -77,7 +77,7 @@ } @Test - @SpecAssertion(section = "11.3.8", id = "a") + @SpecAssertion(section = "11.3.7", id = "a") public void testAmbiguousDependencyResolved() { Set<Bean<?>> beans = new HashSet<Bean<?>>(); @@ -87,7 +87,7 @@ } @Test(expectedExceptions = AmbiguousResolutionException.class) - @SpecAssertion(section = "11.3.8", id = "b") + @SpecAssertion(section = "11.3.7", id = "b") public void testAmbiguousDependencyNotResolved() { Set<Bean<?>> beans = new HashSet<Bean<?>>(); @@ -98,8 +98,8 @@ @Test(expectedExceptions = InjectionException.class) @SpecAssertions({ - @SpecAssertion(section = "11.3.9", id = "a"), - @SpecAssertion(section = "11.3.9", id = "b") + @SpecAssertion(section = "11.3.8", id = "a"), + @SpecAssertion(section = "11.3.8", id = "b") }) public void testValidateThrowsException() { @@ -110,7 +110,7 @@ } @Test(groups="rewrite") - @SpecAssertion(section = "11.3.14", id = "aa") + @SpecAssertion(section = "11.3.13", id = "aa") // Should also check a custom bindingtype public void testDetermineBindingType() { @@ -122,7 +122,7 @@ @Test(groups="rewrite") // Should also check a custom scope - @SpecAssertion(section = "11.3.14", id = "ab") + @SpecAssertion(section = "11.3.13", id = "ab") public void testDetermineScopeType() { assert getCurrentManager().isScope(ApplicationScoped.class); @@ -132,7 +132,7 @@ } @Test(groups="rewrite") - @SpecAssertion(section = "11.3.14", id = "ac") + @SpecAssertion(section = "11.3.13", id = "ac") // Should also check a custom stereotype public void testDetermineStereotype() { @@ -145,7 +145,7 @@ @Test(groups = {"ri-broken", "rewrite"}) // WBRI-59 // Should also check a custom interceptor binding type - @SpecAssertion(section = "11.3.14", id = "ad") + @SpecAssertion(section = "11.3.13", id = "ad") public void testDetermineInterceptorBindingType() { assert getCurrentManager().isInterceptorBindingType(Transactional.class); @@ -155,7 +155,7 @@ } @Test(groups = { "rewrite"}) - @SpecAssertion(section = "11.3.14", id = "ae") + @SpecAssertion(section = "11.3.13", id = "ae") // Should also check a custom sterotype public void testGetMetaAnnotationsForStereotype() { @@ -186,7 +186,7 @@ } @Test(groups = {"ri-broken", "rewrite"}) - @SpecAssertion(section = "11.3.14", id = "af") + @SpecAssertion(section = "11.3.13", id = "af") // WBRI-59 // Should also check a custom defined interceptor binding public void testGetMetaAnnotationsForInterceptorBindingType() @@ -200,7 +200,7 @@ } @Test(groups = {"rewrite"}) - @SpecAssertion(section = "11.3.14", id = "ag") + @SpecAssertion(section = "11.3.13", id = "ag") // Should also check a custom defined scope public void testgetScope() { @@ -212,7 +212,7 @@ } @Test - @SpecAssertion(section = "11.3.16", id = "a") + @SpecAssertion(section = "11.3.15", id = "a") public void testGetELResolver() { assert getCurrentManager().getELResolver() != null; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/ProcessObserverMethodEventTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/ProcessObserverMethodEventTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/ProcessObserverMethodEventTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -37,7 +37,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="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class ProcessObserverMethodEventTest extends AbstractJSR299Test { @Test(groups = "ri-broken") Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/definitionError/ProcessObserverMethodErrorTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/definitionError/ProcessObserverMethodErrorTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/definitionError/ProcessObserverMethodErrorTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -39,7 +39,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="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class ProcessObserverMethodErrorTest { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/builtin/BuiltInBeansTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/builtin/BuiltInBeansTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/builtin/BuiltInBeansTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -27,7 +27,7 @@ @Artifact @Packaging(PackagingType.EAR) @IntegrationTest -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class BuiltInBeansTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DisposalMethodDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DisposalMethodDefinitionTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DisposalMethodDefinitionTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -16,7 +16,7 @@ @Artifact @BeansXml("beans.xml") -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class DisposalMethodDefinitionTest extends AbstractJSR299Test { private static final Annotation DEADLIEST_LITERAL = new AnnotationLiteral<Deadliest>() {}; @@ -67,7 +67,7 @@ @Test(groups = { "disposalMethod" }) @SpecAssertions({ @SpecAssertion(section = "3.3.8", id = "a"), - @SpecAssertion(section = "3.9", id = "a") + @SpecAssertion(section = "3.10", id = "a") }) public void testDisposalMethodParametersGetInjected() throws Exception { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multiParams/MultipleDisposeParametersDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multiParams/MultipleDisposeParametersDefinitionTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multiParams/MultipleDisposeParametersDefinitionTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -14,7 +14,7 @@ @Artifact @ExpectedDeploymentException(DefinitionError.class) @BeansXml("beans.xml") -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class MultipleDisposeParametersDefinitionTest extends AbstractJSR299Test { @Test 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-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/observesUnallowed/ObserverParameterUnallowedDefinitionTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -12,7 +12,7 @@ @Artifact @ExpectedDeploymentException(DefinitionError.class) @BeansXml("beans.xml") -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class ObserverParameterUnallowedDefinitionTest extends AbstractJSR299Test { @Test Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithRequestScope/SingletonWithRequestScopeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithRequestScope/SingletonWithRequestScopeTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithRequestScope/SingletonWithRequestScopeTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -14,7 +14,7 @@ @Artifact @ExpectedDeploymentException(DefinitionError.class) @Packaging(PackagingType.EAR) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class SingletonWithRequestScopeTest extends AbstractJSR299Test { @Test(groups = { "jboss-as-broken" }) 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-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithSessionScope/SingletonWithSessionScopeTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -14,7 +14,7 @@ @Artifact @ExpectedDeploymentException(DefinitionError.class) @Packaging(PackagingType.EAR) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class SingletonWithSessionScopeTest extends AbstractJSR299Test { @Test(groups = { "jboss-as-broken" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithApplicationScope/StatelessWithApplicationScopeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithApplicationScope/StatelessWithApplicationScopeTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithApplicationScope/StatelessWithApplicationScopeTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -14,7 +14,7 @@ @Artifact @ExpectedDeploymentException(DefinitionError.class) @Packaging(PackagingType.EAR) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class StatelessWithApplicationScopeTest extends AbstractJSR299Test { @Test(groups = { "enterpriseBeans" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithRequestScope/StatelessWithRequestScopeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithRequestScope/StatelessWithRequestScopeTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithRequestScope/StatelessWithRequestScopeTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -14,7 +14,7 @@ @Artifact @ExpectedDeploymentException(DefinitionError.class) @Packaging(PackagingType.EAR) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class StatelessWithRequestScopeTest extends AbstractJSR299Test { @Test(groups = { "enterpriseBeans" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -24,7 +24,7 @@ @Artifact @Packaging(PackagingType.EAR) @BeansXml("beans.xml") -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class EnterpriseBeanDefinitionTest extends AbstractJSR299Test { @Test(groups = { "enterpriseBeans" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -36,7 +36,7 @@ @Artifact @Packaging(PackagingType.EAR) @IntegrationTest -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class EnterpriseBeanLifecycleTest extends AbstractJSR299Test { @@ -147,7 +147,7 @@ } @Test(groups = { "enterpriseBeans", "lifecycle", "integration" }) - @SpecAssertion(section = "3.8.2", id = "b") + @SpecAssertion(section = "3.9.2", id = "b") public void testInitializerMethodsCalledWithCurrentParameterValues() { AlteStadt alteStadt = getInstanceByType(AlteStadt.class); Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanICTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanICTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanICTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -18,12 +18,12 @@ @Artifact @Packaging(PackagingType.EAR) @IntegrationTest -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class NewEnterpriseBeanICTest extends AbstractJSR299Test { @Test(groups = { "new", "ri-broken" }) - @SpecAssertion(section = "3.10", id = "l") + @SpecAssertion(section = "3.12", id = "l") public void testNewBeanHasSameConstructor() { ExplicitConstructor bean = getInstanceByType(ExplicitConstructor.class); @@ -35,7 +35,7 @@ } @Test(groups = { "new" }) - @SpecAssertion(section = "3.10", id = "m") + @SpecAssertion(section = "3.12", id = "m") public void testNewBeanHasSameInitializers() { InitializerSimpleBeanLocal bean = getInstanceByType(InitializerSimpleBeanLocal.class); @@ -51,7 +51,7 @@ * @throws Exception */ @Test(groups = { "new" }) - @SpecAssertion(section = "3.10", id = "v") + @SpecAssertion(section = "3.12", id = "v") public void testNewBeanHasNoProducerMethods() throws Exception { FoxLocal fox = getInstanceByType(FoxLocal.class); @@ -63,7 +63,7 @@ } @Test(groups = { "new", "disposal" }) - @SpecAssertion(section = "3.10", id = "x") + @SpecAssertion(section = "3.12", id = "x") public void testNewBeanHasNoDisposalMethods() throws Exception { FoxLocal fox = getInstanceByType(FoxLocal.class); Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/methodAnnotatedProduces/InitializerMethodAnnotatedProducesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/methodAnnotatedProduces/InitializerMethodAnnotatedProducesTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/methodAnnotatedProduces/InitializerMethodAnnotatedProducesTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -12,7 +12,7 @@ @Artifact @ExpectedDeploymentException(DefinitionError.class) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class InitializerMethodAnnotatedProducesTest extends AbstractJSR299Test { 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-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -10,11 +10,11 @@ @Artifact @ExpectedDeploymentException(DefinitionError.class) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class ParameterAnnotatedObservesTest extends AbstractJSR299Test { @Test(groups = "initializerMethod") - @SpecAssertion(section = "3.8.1", id = "da") + @SpecAssertion(section = "3.9.1", id = "da") public void testInitializerMethodHasParameterAnnotatedObserves() { 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-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/parameterizedReturnTypeWithWildcard/ParameterizedReturnTypeWithWildcardTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -11,7 +11,7 @@ @Artifact @ExpectedDeploymentException(DefinitionError.class) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class ParameterizedReturnTypeWithWildcardTest extends AbstractJSR299Test { @Test(groups = "producerField") Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/enterprise/EnterpriseProducerFieldDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/enterprise/EnterpriseProducerFieldDefinitionTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/enterprise/EnterpriseProducerFieldDefinitionTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -17,7 +17,7 @@ @IntegrationTest @Packaging(PackagingType.EAR) @BeansXml("beans.xml") -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class EnterpriseProducerFieldDefinitionTest extends AbstractJSR299Test { 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-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/ProducerFieldLifecycleTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -12,7 +12,7 @@ @Artifact @BeansXml("beans.xml") -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class ProducerFieldLifecycleTest extends AbstractJSR299Test { @@ -49,7 +49,7 @@ @Test(groups = { "producerField", "specialization" }) @SpecAssertions({ - @SpecAssertion(section = "4.3.2", id = "b"), + // @SpecAssertion(section = "4.3.2", id = "b"), removed @SpecAssertion(section="4.3", id="cb") }) public void testSpecializedBeanAlwaysUsed() throws Exception 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-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -11,7 +11,7 @@ @Artifact @ExpectedDeploymentException(DefinitionError.class) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class ParameterAnnotatedDisposesTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -11,7 +11,7 @@ @Artifact @ExpectedDeploymentException(DefinitionError.class) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class ParameterAnnotatedObservesTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithWildcard/ParameterizedTypeWithWildcardTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithWildcard/ParameterizedTypeWithWildcardTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithWildcard/ParameterizedTypeWithWildcardTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -12,14 +12,14 @@ @Artifact @ExpectedDeploymentException(DefinitionError.class) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class ParameterizedTypeWithWildcardTest extends AbstractJSR299Test { @Test(groups = "producerMethod") @SpecAssertions({ @SpecAssertion(section = "3.3", id = "ha"), - @SpecAssertion(section="2.2.1", id="lb") + @SpecAssertion(section = "2.2.1", id="lb") }) public void testParameterizedReturnTypeWithWildcard() 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-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/ProducerMethodDefinitionTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -21,7 +21,7 @@ @Artifact @BeansXml("beans.xml") -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class ProducerMethodDefinitionTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/EnterpriseProducerMethodDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/EnterpriseProducerMethodDefinitionTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/EnterpriseProducerMethodDefinitionTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -19,7 +19,7 @@ @Artifact @BeansXml("beans.xml") @Packaging(PackagingType.EAR) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class EnterpriseProducerMethodDefinitionTest extends AbstractJSR299Test { @Test Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/ProducerMethodLifecycleTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/ProducerMethodLifecycleTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/ProducerMethodLifecycleTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -23,7 +23,7 @@ */ @Artifact @BeansXml("beans.xml") -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class ProducerMethodLifecycleTest extends AbstractJSR299Test { private AnnotationLiteral<Pet> PET_LITERAL = new AnnotationLiteral<Pet>() {}; @@ -73,7 +73,7 @@ @Test(groups = { "producerMethod" }) @SpecAssertions({ - @SpecAssertion(section = "4.3.2", id = "ab"), + //@SpecAssertion(section = "4.3.2", id = "ab"), removed from spec @SpecAssertion(section = "5.6.6", id = "c"), @SpecAssertion(section="4.3", id="cb") }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanDefinitionTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanDefinitionTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -10,7 +10,7 @@ import org.testng.annotations.Test; @Artifact -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class SimpleBeanDefinitionTest extends AbstractJSR299Test { @@ -81,7 +81,7 @@ } @Test - @SpecAssertion(section = "3.1.4.1", id = "a") + @SpecAssertion(section = "3.7.1", id = "a") public void testInitializerAnnotatedConstructor() throws Exception { Sheep.constructedCorrectly = false; @@ -91,9 +91,9 @@ @Test @SpecAssertions({ - @SpecAssertion(section = "3.1.4.1", id = "ba"), + @SpecAssertion(section = "3.7.1", id = "ba"), @SpecAssertion(section = "3.1.3", id = "a"), - @SpecAssertion(section = "3.1.4", id = "a") + @SpecAssertion(section = "3.7", id = "a") }) public void testEmptyConstructorUsed() { @@ -103,7 +103,7 @@ } @Test - @SpecAssertion(section = "3.1.4.1", id = "a") + @SpecAssertion(section = "3.7.1", id = "a") public void testInitializerAnnotatedConstructorUsedOverEmptyConstuctor() throws Exception { getInstanceByType(Turkey.class); Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasObservesParameter/ConstructorHasObservesParameterTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasObservesParameter/ConstructorHasObservesParameterTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasObservesParameter/ConstructorHasObservesParameterTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -11,11 +11,11 @@ @Artifact @ExpectedDeploymentException(DefinitionError.class) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class ConstructorHasObservesParameterTest extends AbstractJSR299Test { @Test(groups = { "observerMethod" }) - @SpecAssertion(section = "3.1.4.1", id = "ea") + @SpecAssertion(section = "3.7.1", id = "ea") public void testConstructorHasObservesParameter() { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/dependentWithPublicField/DependentWithPublicFieldTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/dependentWithPublicField/DependentWithPublicFieldTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/dependentWithPublicField/DependentWithPublicFieldTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -11,7 +11,7 @@ @Artifact @ExpectedDeploymentException(DefinitionError.class) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class DependentWithPublicFieldTest extends AbstractJSR299Test { @Test Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/tooManyInitializerAnnotatedConstructors/TooManyInitializerAnnotatedConstructorsTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/tooManyInitializerAnnotatedConstructors/TooManyInitializerAnnotatedConstructorsTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/tooManyInitializerAnnotatedConstructors/TooManyInitializerAnnotatedConstructorsTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -11,12 +11,12 @@ @Artifact @ExpectedDeploymentException(DefinitionError.class) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class TooManyInitializerAnnotatedConstructorsTest extends AbstractJSR299Test { @Test - @SpecAssertion(section = "3.1.4.1", id = "ca") + @SpecAssertion(section = "3.7.1", id = "ca") public void testTooManyInitializerAnnotatedConstructor() { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/NewSimpleBeanTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/NewSimpleBeanTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/NewSimpleBeanTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -20,7 +20,7 @@ import org.testng.annotations.Test; @Artifact -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class NewSimpleBeanTest extends AbstractJSR299Test { @@ -30,7 +30,7 @@ @Test(groups = { "new" }) @SpecAssertions({ - @SpecAssertion(section = "3.10", id = "p") + @SpecAssertion(section = "3.12", id = "p") }) public void testNewBeanIsDependentScoped() { @@ -41,7 +41,7 @@ } @Test(groups = { "new" }) - @SpecAssertion(section = "3.10", id = "r") + @SpecAssertion(section = "3.12", id = "r") public void testNewBeanHasOnlyNewBinding() { Set<Bean<ExplicitContructorSimpleBean>> beans = getBeans(ExplicitContructorSimpleBean.class, ExplicitContructorSimpleBean.NEW); @@ -52,7 +52,7 @@ } @Test(groups = { "new" }) - @SpecAssertion(section = "3.10", id = "s") + @SpecAssertion(section = "3.12", id = "s") public void testNewBeanHasNoBeanELName() { Set<Bean<ExplicitContructorSimpleBean>> beans = getBeans(ExplicitContructorSimpleBean.class, ExplicitContructorSimpleBean.NEW); @@ -62,7 +62,7 @@ } @Test(groups = { "new" }) - @SpecAssertion(section = "3.10", id = "t") + @SpecAssertion(section = "3.12", id = "t") public void testNewBeanHasNoStereotypes() { Bean<Fox> foxBean = getBeans(Fox.class).iterator().next(); @@ -74,7 +74,7 @@ } @Test(groups = { "new" }) - @SpecAssertion(section = "3.10", id = "u") + @SpecAssertion(section = "3.12", id = "u") public void testNewBeanHasNoObservers() { // As long as only one observer exists here, we know it is not from the @New bean @@ -82,7 +82,7 @@ } @Test(groups = { "new" }) - @SpecAssertion(section = "3.10", id = "w") + @SpecAssertion(section = "3.12", id = "w") public void testNewBeanHasNoProducerFields() throws Exception { Fox fox = getInstanceByType(Fox.class); @@ -93,7 +93,7 @@ } @Test(groups = { "new" }) - @SpecAssertion(section = "3.10", id = "v") + @SpecAssertion(section = "3.12", id = "v") public void testNewBeanHasNoProducerMethods() throws Exception { Fox fox = getInstanceByType(Fox.class); @@ -105,7 +105,7 @@ } @Test(groups = { "new" }) - @SpecAssertion(section = "3.10", id = "x") + @SpecAssertion(section = "3.12", id = "x") public void testNewBeanHasNoDisposerMethods() throws Exception { Fox fox = getInstanceByType(Fox.class); @@ -119,7 +119,7 @@ } @Test - @SpecAssertion(section = "3.10", id = "d") + @SpecAssertion(section = "3.12", id = "d") public void testForEachSimpleBeanANewBeanExists() { assert getCurrentManager().getBeans(Order.class).size() == 1; @@ -141,7 +141,7 @@ } @Test(groups = { "new" }) - @SpecAssertion(section = "3.10", id = "f") + @SpecAssertion(section = "3.12", id = "f") public void testNewBeanHasSameConstructor() { ExplicitContructorSimpleBean.setConstructorCalls(0); @@ -152,7 +152,7 @@ } @Test(groups = { "new" }) - @SpecAssertion(section = "3.10", id = "g") + @SpecAssertion(section = "3.12", id = "g") public void testNewBeanHasSameInitializers() { InitializerSimpleBean.setInitializerCalls(0); @@ -164,7 +164,7 @@ } @Test(groups = { "new" }) - @SpecAssertion(section = "3.10", id = "h") + @SpecAssertion(section = "3.12", id = "h") public void testNewBeanHasSameInjectedFields() { Bean<InitializerSimpleBean> simpleBean = getBeans(InitializerSimpleBean.class).iterator().next(); @@ -174,7 +174,7 @@ } @Test - @SpecAssertion(section="3.10", id="z") + @SpecAssertion(section="3.12", id="z") public void testNewBeanWithNoMemberValue() { assert getInstanceByType(NewLionConsumer.class).getLion() instanceof Lion; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/EjbInjectionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/EjbInjectionTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/EjbInjectionTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -40,7 +40,7 @@ @Packaging(PackagingType.EAR) @IntegrationTest @BeansXml("beans.xml") -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class EjbInjectionTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/PersistenceContextInjectionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/PersistenceContextInjectionTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/PersistenceContextInjectionTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -29,14 +29,14 @@ @Resource(source = "persistence.xml", destination = "WEB-INF/classes/META-INF/persistence.xml") //(a)PersistenceXml(&quot;persistence.xml&quot;) @BeansXml("beans.xml") -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class PersistenceContextInjectionTest extends AbstractJSR299Test { @Test(groups = { "beanLifecycle", "commonAnnotations", "integration" }) @SpecAssertions( { @SpecAssertion(section = "3.5.1", id = "cc"), - @SpecAssertion(section="7.3.6", id="lb"), - @SpecAssertion(section="7.3.6", id="mc") + @SpecAssertion(section = "7.3.6", id = "lb"), + @SpecAssertion(section = "7.3.6", id = "mc") }) public void testInjectionOfPersistenceContext() { @@ -50,8 +50,8 @@ @Test(groups = { "beanLifecycle", "commonAnnotations", "integration" }) @SpecAssertions( { @SpecAssertion(section = "3.5.1", id = "dd"), - @SpecAssertion(section="7.3.6", id="lc"), - @SpecAssertion(section="7.3.6", id="me") + @SpecAssertion(section = "7.3.6", id = "lc"), + @SpecAssertion(section = "7.3.6", id = "me") }) public void testInjectionOfPersistenceUnit() { @@ -64,7 +64,7 @@ @Test(groups = { "beanLifecycle", "commonAnnotations", "integration" }) @SpecAssertions( { - @SpecAssertion(section="7.3.6", id="md") + @SpecAssertion(section = "7.3.6", id = "md") }) public void testPassivationOfPersistenceContext() throws Exception { @@ -78,7 +78,7 @@ @Test(groups = { "beanLifecycle", "commonAnnotations", "integration" }) @SpecAssertions( { - @SpecAssertion(section="7.3.6", id="nb") + @SpecAssertion(section="7.3.6", id = "nb") }) public void testDestructionOfPersistenceContext() throws Exception { @@ -93,8 +93,8 @@ @Test(groups = { "beanLifecycle", "commonAnnotations", "integration" }) @SpecAssertions( { - @SpecAssertion(section="7.3.6", id="lc"), - @SpecAssertion(section="7.3.6", id="mf") + @SpecAssertion(section = "7.3.6", id = "lc"), + @SpecAssertion(section = "7.3.6", id = "mf") }) public void testPassivationOfPersistenceUnit() 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-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationIntegrationTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -20,7 +20,7 @@ @IntegrationTest @Packaging(PackagingType.EAR) @BeansXml("beans.xml") -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class EnterpriseBeanSpecializationIntegrationTest extends AbstractJSR299Test { @@ -38,8 +38,8 @@ } - @Test - @SpecAssertion(section="4.3.2", id = "aa") + //@Test + //(a)SpecAssertion(section=&quot;4.3.2&quot;, id = "aa") removed from spec public void testProducerMethodOnSpecializedBeanCalledOnSpecializingBean() throws Exception { assert getBeans(Waste.class).size() == 1; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -20,7 +20,7 @@ @Artifact @Packaging(PackagingType.EAR) @BeansXml("beans.xml") -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class EnterpriseBeanSpecializationTest extends AbstractJSR299Test { 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-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsSimpleBean/DirectlyExtendsSimpleBeanTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -14,7 +14,7 @@ @Artifact @Packaging(PackagingType.EAR) @ExpectedDeploymentException(DefinitionError.class) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class DirectlyExtendsSimpleBeanTest extends AbstractJSR299Test { 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-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/implementInterfaceAndExtendsNothing/ImplementsInterfaceAndExtendsNothingTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -14,7 +14,7 @@ @ExpectedDeploymentException(DefinitionError.class) @Artifact @Packaging(PackagingType.EAR) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class ImplementsInterfaceAndExtendsNothingTest extends AbstractJSR299Test { 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-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -16,7 +16,7 @@ @Packaging(PackagingType.EAR) @BeansXml("beans.xml") @ExpectedDeploymentException(DeploymentError.class) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class TwoBeansSpecializeTheSameBeanTest extends AbstractJSR299Test { /** @@ -26,8 +26,8 @@ * @see TwoSpecializingBeansForOneSpecializedTest#testTwoBeansSpecializeTheSameBean() * */ - @Test - @SpecAssertion(section = "4.3.3", id = "c") + //@Test + //@SpecAssertion(section = "4.3.3", id = "c") removed from spec public void testTwoBeansSpecializeTheSameBean() { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/ProducerMethodSpecializationTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/ProducerMethodSpecializationTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/ProducerMethodSpecializationTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -16,7 +16,7 @@ @Artifact @BeansXml("beans.xml") -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class ProducerMethodSpecializationTest extends AbstractJSR299Test { 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-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/indirectOverride/IndirectOverrideTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -11,7 +11,7 @@ @Artifact @ExpectedDeploymentException(DefinitionError.class) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class IndirectOverrideTest extends AbstractJSR299Test { 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-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -11,7 +11,7 @@ @Artifact @ExpectedDeploymentException(DeploymentError.class) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class TwoBeansSpecializeTheSameBeanTest extends AbstractJSR299Test { @@ -21,8 +21,8 @@ * @see org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.broken.twoBeansSpecializeTheSameBean.TwoBeansSpecializeTheSameBeanTest#testTwoBeansSpecializeTheSameBean() * @see TwoSpecializingBeansForOneSpecializedTest#testTwoBeansSpecializeTheSameBean() */ - @Test - @SpecAssertion(section = "4.3.3", id = "c") + //@Test + //@SpecAssertion(section = "4.3.3", id = "c") removed from spec 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-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/SimpleBeanSpecializationTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -17,7 +17,7 @@ @Artifact @BeansXml("beans.xml") -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class SimpleBeanSpecializationTest extends AbstractJSR299Test { @@ -31,7 +31,7 @@ @SpecAssertion(section = "4.3.1", id = "ia"), @SpecAssertion(section = "4.3.1", id = "ib"), @SpecAssertion(section = "4.3.1", id = "j"), - @SpecAssertion(section = "3.1.5", id = "aa") + @SpecAssertion(section = "3.1.4", id = "aa") }) public void testSpecializingBeanHasBindingsOfSpecializedAndSpecializingBean() { @@ -45,7 +45,7 @@ @Test @SpecAssertions( { @SpecAssertion(section = "4.3.1", id = "k"), - @SpecAssertion(section = "3.1.5", id = "aa") + @SpecAssertion(section = "3.1.4", 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-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/SpecializingBeanExtendsEnterpriseBeanTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -14,11 +14,11 @@ @Artifact @Packaging(PackagingType.EAR) @ExpectedDeploymentException(DefinitionError.class) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class SpecializingBeanExtendsEnterpriseBeanTest extends AbstractJSR299Test { @Test(groups = { "specialization" }) - @SpecAssertion(section = "3.1.5", id = "aa") + @SpecAssertion(section = "3.1.4", 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-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/SpecializingBeanImplementsInterfaceOnly.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -11,11 +11,11 @@ @Artifact @ExpectedDeploymentException(DefinitionError.class) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class SpecializingBeanImplementsInterfaceOnly extends AbstractJSR299Test { @Test(groups = { "specialization" }) - @SpecAssertion(section = "3.1.5", id = "da") + @SpecAssertion(section = "3.1.4", id = "da") public void testSpecializingClassImplementsInterfaceAndExtendsNothing() { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/InterceptorDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/InterceptorDefinitionTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/InterceptorDefinitionTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -47,7 +47,7 @@ * */ @Artifact -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class InterceptorDefinitionTest extends AbstractJSR299Test { @Test(groups = "ri-broken") @@ -115,7 +115,7 @@ @Test(groups = "ri-broken") @SpecAssertions({ - @SpecAssertion(section = "11.3.13", id = "a") + @SpecAssertion(section = "11.3.12", id = "a") }) // WBRI-59 public void testResolveInterceptorsReturnsOrderedList() @@ -136,7 +136,7 @@ @Test(groups = "ri-broken") @SpecAssertions({ - @SpecAssertion(section = "11.3.13", id = "b") + @SpecAssertion(section = "11.3.12", id = "b") }) // WBRI-59 public void testSameBindingTypesToResolveInterceptorsFails() @@ -147,7 +147,7 @@ @Test(groups = "ri-broken") @SpecAssertions({ - @SpecAssertion(section = "11.3.13", id = "c") + @SpecAssertion(section = "11.3.12", id = "c") }) // WBRI-59 public void testNoBindingTypesToResolveInterceptorsFails() @@ -157,7 +157,7 @@ @Test(groups = "ri-broken") @SpecAssertions({ - @SpecAssertion(section = "11.3.13", id = "d") + @SpecAssertion(section = "11.3.12", id = "d") }) // WBRI-59 public void testNonBindingTypeToResolveInterceptorsFails() Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/interceptorCanNotBeDecorator/InterceptorCanNotBeDecoratorTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/interceptorCanNotBeDecorator/InterceptorCanNotBeDecoratorTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/interceptorCanNotBeDecorator/InterceptorCanNotBeDecoratorTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -11,7 +11,7 @@ @Artifact @ExpectedDeploymentException(DeploymentError.class) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") @BeansXml("beans.xml") public class InterceptorCanNotBeDecoratorTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/nonExistantClassInBeansXml/NonExistantClassInBeansXmlTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/nonExistantClassInBeansXml/NonExistantClassInBeansXmlTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/nonExistantClassInBeansXml/NonExistantClassInBeansXmlTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -11,7 +11,7 @@ @Artifact @ExpectedDeploymentException(DeploymentError.class) -@SpecVersion(spec = "cdi", version="1.0.20090625") +@SpecVersion(spec = "cdi", version="PFD2") @BeansXml("beans.xml") public class NonExistantClassInBeansXmlTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/nonInterceptorClassInBeansXml/NonInterceptorClassInBeansXmlTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/nonInterceptorClassInBeansXml/NonInterceptorClassInBeansXmlTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/nonInterceptorClassInBeansXml/NonInterceptorClassInBeansXmlTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -11,7 +11,7 @@ @Artifact @ExpectedDeploymentException(DeploymentError.class) -@SpecVersion(spec = "cdi", version="1.0.20090625") +@SpecVersion(spec = "cdi", version="PFD2") @BeansXml("beans.xml") public class NonInterceptorClassInBeansXmlTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/sameClassListedTwiceInBeansXml/SameClassListedTwiceInBeansXmlTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/sameClassListedTwiceInBeansXml/SameClassListedTwiceInBeansXmlTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/sameClassListedTwiceInBeansXml/SameClassListedTwiceInBeansXmlTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -11,7 +11,7 @@ @Artifact @ExpectedDeploymentException(DeploymentError.class) -@SpecVersion(spec = "cdi", version="1.0.20090625") +@SpecVersion(spec = "cdi", version="PFD2") @BeansXml("beans.xml") public class SameClassListedTwiceInBeansXmlTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/SessionBeanInterceptorDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/SessionBeanInterceptorDefinitionTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/SessionBeanInterceptorDefinitionTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -13,7 +13,7 @@ @IntegrationTest @Artifact @Packaging(PackagingType.EAR) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class SessionBeanInterceptorDefinitionTest extends AbstractJSR299Test { @Test(groups="ri-broken") Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorCalledBeforeDecorator/InterceptorCalledBeforeDecoratorTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorCalledBeforeDecorator/InterceptorCalledBeforeDecoratorTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorCalledBeforeDecorator/InterceptorCalledBeforeDecoratorTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -7,7 +7,7 @@ import org.testng.annotations.Test; @Artifact -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class InterceptorCalledBeforeDecoratorTest extends AbstractJSR299Test { @Test(groups = "ri-broken") Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorNotListedInBeansXml/InterceptorNotListedInBeansXmlNotEnabledTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorNotListedInBeansXml/InterceptorNotListedInBeansXmlNotEnabledTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorNotListedInBeansXml/InterceptorNotListedInBeansXmlNotEnabledTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -8,7 +8,7 @@ import org.testng.annotations.Test; @Artifact -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") @BeansXml("beans.xml") public class InterceptorNotListedInBeansXmlNotEnabledTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/multipleBindings/MultipleInterceptorBindingsTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/multipleBindings/MultipleInterceptorBindingsTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/multipleBindings/MultipleInterceptorBindingsTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -11,7 +11,7 @@ import org.testng.annotations.Test; @Artifact -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") @BeansXml("beans.xml") public class MultipleInterceptorBindingsTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/binding/members/annotation/BindingAnnotationWithMemberTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/binding/members/annotation/BindingAnnotationWithMemberTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/binding/members/annotation/BindingAnnotationWithMemberTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -26,7 +26,7 @@ @Artifact @ExpectedDeploymentException(DefinitionError.class) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class BindingAnnotationWithMemberTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/binding/members/array/BindingAnnotationWithMemberTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/binding/members/array/BindingAnnotationWithMemberTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/binding/members/array/BindingAnnotationWithMemberTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -26,7 +26,7 @@ @Artifact @ExpectedDeploymentException(DefinitionError.class) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class BindingAnnotationWithMemberTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/ResolutionByNameTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/ResolutionByNameTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/ResolutionByNameTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -30,7 +30,7 @@ @Artifact @BeansXml("beans.xml") -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class ResolutionByNameTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicateNameResolution/DuplicateNameResolutionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicateNameResolution/DuplicateNameResolutionTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicateNameResolution/DuplicateNameResolutionTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -27,7 +27,7 @@ @Artifact @ExpectedDeploymentException(DeploymentError.class) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class DuplicateNameResolutionTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/circular/CircularDependencyTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/circular/CircularDependencyTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/circular/CircularDependencyTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -23,7 +23,7 @@ import org.testng.annotations.Test; @Artifact -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class CircularDependencyTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/ClientProxyTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/ClientProxyTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/ClientProxyTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -29,7 +29,7 @@ import org.testng.annotations.Test; @Artifact -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class ClientProxyTest extends AbstractJSR299Test { @Test Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/array/ArrayTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/array/ArrayTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/array/ArrayTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -30,7 +30,7 @@ */ @Artifact @ExpectedDeploymentException(DeploymentError.class) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class ArrayTest extends AbstractJSR299Test { @Test Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/finalClass/FinalClassTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/finalClass/FinalClassTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/finalClass/FinalClassTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -26,7 +26,7 @@ @Artifact @ExpectedDeploymentException(DeploymentError.class) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class FinalClassTest extends AbstractJSR299Test { @Test Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/primitive/UnproxyableTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/primitive/UnproxyableTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/primitive/UnproxyableTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -26,7 +26,7 @@ @Artifact @ExpectedDeploymentException(DeploymentError.class) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class UnproxyableTest extends AbstractJSR299Test { @Test Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/broken/unsatisfied/UnsatisfiedDependencyTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/broken/unsatisfied/UnsatisfiedDependencyTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/broken/unsatisfied/UnsatisfiedDependencyTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -26,7 +26,7 @@ @Artifact @ExpectedDeploymentException(DeploymentError.class) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class UnsatisfiedDependencyTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/DynamicLookupTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/DynamicLookupTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/DynamicLookupTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -40,7 +40,7 @@ * @author Jozef Hartinger */ @Artifact -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class DynamicLookupTest extends AbstractJSR299Test { @Test Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/el/ResolutionByNameTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/el/ResolutionByNameTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/el/ResolutionByNameTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -28,7 +28,7 @@ import org.testng.annotations.Test; @Artifact -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class ResolutionByNameTest extends AbstractJSR299Test { 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-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/InjectionTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -9,7 +9,7 @@ @Artifact @BeansXml("beans.xml") -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class InjectionTest extends AbstractJSR299Test { @Test(groups = { "injection", "producerMethod" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/any/AnyInjectionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/any/AnyInjectionTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/any/AnyInjectionTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -23,7 +23,7 @@ import org.testng.annotations.Test; @Artifact -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class AnyInjectionTest extends AbstractJSR299Test { @Test Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/SessionBeanInjectionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/SessionBeanInjectionTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/SessionBeanInjectionTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -29,7 +29,7 @@ @Artifact @IntegrationTest @Packaging(PackagingType.EAR) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class SessionBeanInjectionTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/InjectionIntoWebServiceEndPointTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/InjectionIntoWebServiceEndPointTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/InjectionIntoWebServiceEndPointTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -30,7 +30,7 @@ @Artifact @IntegrationTest(runLocally = true) @Resource(destination = WarArtifactDescriptor.WEB_XML_DESTINATION, source = "web.xml") -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class InjectionIntoWebServiceEndPointTest extends AbstractJSR299Test { @WebServiceRef(wsdlLocation = "http://localhost:8080/org.jboss.jsr299.tck.tests.lookup.injection.non.contextual.ws.InjectionIntoWebServiceEndPointTest/TestWebService?wsdl") Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/InjectionPointTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/InjectionPointTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/InjectionPointTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -46,7 +46,7 @@ */ @Artifact @BeansXml("beans.xml") -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class InjectionPointTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/broken/reference/ambiguous/AmbiguousInjectableReferenceTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/broken/reference/ambiguous/AmbiguousInjectableReferenceTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/broken/reference/ambiguous/AmbiguousInjectableReferenceTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -36,7 +36,7 @@ * */ @Artifact -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class AmbiguousInjectableReferenceTest extends AbstractJSR299Test { @SuppressWarnings("unchecked") Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/jndi/ManagerTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/jndi/ManagerTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/jndi/ManagerTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -11,7 +11,7 @@ @Artifact @IntegrationTest -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class ManagerTest extends AbstractJSR299Test { @Test(groups = { "manager", "ejb3", "integration", "jboss-as-broken" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/broken/primitive/PrimitiveInjectionPointTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/broken/primitive/PrimitiveInjectionPointTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/broken/primitive/PrimitiveInjectionPointTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -26,7 +26,7 @@ @Artifact @ExpectedDeploymentException(DeploymentError.class) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class PrimitiveInjectionPointTest extends AbstractJSR299Test { @Test(groups={"resolution", "producerMethod"}) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/broken/type/variable/TypeVariableInjectionPointTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/broken/type/variable/TypeVariableInjectionPointTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/broken/type/variable/TypeVariableInjectionPointTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -26,7 +26,7 @@ @Artifact @ExpectedDeploymentException(DefinitionError.class) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class TypeVariableInjectionPointTest extends AbstractJSR299Test { @Test(groups = { "resolution"}) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/parameterized/AssignabilityOfRawAndParameterizedTypesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/parameterized/AssignabilityOfRawAndParameterizedTypesTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/parameterized/AssignabilityOfRawAndParameterizedTypesTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -31,7 +31,7 @@ import org.testng.annotations.Test; @Artifact -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class AssignabilityOfRawAndParameterizedTypesTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/incorrect/name/NoClassWithSpecifiedNameTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/incorrect/name/NoClassWithSpecifiedNameTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/incorrect/name/NoClassWithSpecifiedNameTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -28,12 +28,12 @@ @Artifact @BeansXml("beans.xml") @ExpectedDeploymentException(DeploymentError.class) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class NoClassWithSpecifiedNameTest extends AbstractJSR299Test { @Test(groups = { "policy" }) - @SpecAssertion(section="5.2", id="h") + @SpecAssertion(section="5.2.1", id="h") public void test() { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/not/policy/stereotype/ClassIsNotPolicyTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/not/policy/stereotype/ClassIsNotPolicyTest.java 2009-09-25 01:08:37 UTC (rev 3780) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/not/policy/stereotype/ClassIsNotPolicyTest.java 2009-09-25 02:31:37 UTC (rev 3781) @@ -28,7 +28,7 @@ @Artifact @BeansXml("beans.xml") @ExpectedDeploymentException(DeploymentError.class) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class ClassIsNotPolicyTest extends AbstractJSR299Test {