[weld-commits] Weld SVN: r4953 - in cdi-tck/trunk: impl/src/main/java/org/jboss/jsr299/tck and 153 other directories.

Author: pete.muir(a)jboss.org Date: 2009-11-10 08:30:32 -0500 (Tue, 10 Nov 2009) New Revision: 4953 Added: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/DeploymentFailure.java Removed: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/DefinitionError.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/DeploymentError.java Modified: cdi-tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/Managers.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/aroundInvoke/SimpleBean.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/definition/DefinitionTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/lifecycleCallback/order/InvocationOrderTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/FoxHole.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/MissileInterceptor.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Tarantula.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Transactional.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingBeanConstructor/DecoratorWithNonPassivatingBeanConstructorTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInitializerMethod/DecoratorWithNonPassivatingInitializerMethodTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInjectedField/DecoratorWithNonPassivatingInjectedFieldTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptor/BrokenInterceptor.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptor/EnterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptorTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptor/Espoo_Broken.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingConstructorFieldInDecorator/EnterpriseBeanWithNonPassivatingFieldInDecoratorTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingDecorator/EnterpriseBeanWithNonPassivatingDecoratorTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerInDecorator/EnterpriseBeanWithNonPassivatingInitializerInDecoratorTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerParameterInInterceptor/BrokenInterceptor.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerParameterInInterceptor/City.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerParameterInInterceptor/EnterpriseBeanWithNonPassivatingInitializerParameterInInterceptorTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInjectedFieldInDecorator/EnterpriseBeanWithNonPassivatingInjectedFieldInDecoratorTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInjectedFieldInInterceptor/BrokenInterceptor.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInjectedFieldInInterceptor/EnterpriseBeanWithNonPassivatingInjectedFieldInInterceptorTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonSerializableIntializerMethod/EnterpriseBeanWithNonSerializableIntializerMethodTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/finalProducerFieldNotPassivationCapable/NonPassivationCapableProducerFieldTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/PassivationCapableBeanWithNonPassivatingInterceptorTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInitializerMethodParameter/PassivationCapableBeanWithNonPassivatingInterceptorTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInjectedField/BakedBean.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInjectedField/PassivationCapableBeanWithNonPassivatingInterceptorTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/managedBeanWithNonPassivatingDecorator/ManagedBeanWithNonPassivatingDecoratorTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/managedBeanWithNonSerializableInterceptorClass/ManagedBeanWithNonSerializableInterceptorClassTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableManagedBeanHasPassivatingScope/NonPassivationManagedBeanHasPassivatingScopeTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerField/NonPassivationCapableProducerFieldTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerMethod/NonPassivationCapableProducerMethodTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingManagedBeanWithNonPassivatingBeanConstructor/PassivatingManagedBeanWithNonPassivatingBeanConstructorTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingManagedBeanWithNonPassivatingInitializerMethod/PassivatingManagedBeanWithNonPassivatingInitializerMethodTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingManagedBeanWithNonPassivatingInjcetedField/PassivatingManagedBeanWithNonPassivatingInjcetedFieldTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingProducerMethodWithNonPassivatingParameter/PassivatingProducerMethodWithNonPassivatingParameterTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/unserializableSimpleInjectedIntoPassivatingEnterpriseBean/UnserializableSimpleInjectedIntoPassivatingEnterpriseBeanTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/custom/broken/finalBeanClass/CustomDecoratorMatchingBeanWithFinalClassTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorListedTwiceInBeansXml/DecoratorListedTwiceInBeansXmlTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/enabledDecoratorIsNotDecorator/EnabledDecoratorNotADecoratorTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanClass/FinalBeanClassTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanMethod/FinalBeanMethodTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/multipleDelegateInjectionPoints/MultipleDelegateInjectionPointsTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/noDelegateInjectionPoints/NoDelegateInjectionPointsTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/nonDecoratorWithDecorates/NonDecoratorWithDecoratesTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/nonExistantClassInBeansXml/NonExistantDecoratorClassInBeansXmlTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/notAllDecoratedTypesImplemented/NotAllDecoratedTypesImplementedTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/broken/delegateProducerMethod/DelegateInjectionPointTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/delegateConstructor/TimestampLogger.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/delegateInitializerMethod/TimestampLogger.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/genericbroken/GenericManagedBeanTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken/tooManyScopes/TooManyScopesTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/StereotypeDefinitionTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/nonEmptyNamed/NonEmptyNamedTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/scopeConflict/IncompatibleStereotypesTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/tooManyScopes/TooManyScopeTypesTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/withBindingType/StereoTypeWithBindingTypesTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDefinitionError/AddDefinitionErrorTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDeploymentProblem/AddDeploymentProblemTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/beanDiscoveryMethodThrowsException/BeforeBeanDiscoveryThrowsExceptionTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanDiscoveryObserver/AfterBeanDiscoveryObserverExecutionFailureTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanValidationObserver/AfterDeploymentValidationObserverExecutionFailureTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringBeanDiscovery/DeploymentFailureTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringValidation/AfterBeanDiscoveryFailureTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/normalScope/AddingNormalScopeTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/passivatingScope/AddingPassivatingScopeTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/inject/withoutType/EventInjectionWithoutTypeTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/dependentIsConditionalObserver/AlarmSystem.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/dependentIsConditionalObserver/DependentIsConditionalObserverTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isDisposer/ObserverMethodAnnotatedDisposesTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isInitializer/ObserverMethodAnnotatedInitialzerTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isProducer/ObserverMethodAnnotatedProducesTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/notBusinessMethod/EJBObserverMethodNotBusinessMethodTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/tooManyParameters/ObserverMethodWithTwoEventParametersTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer8/AsynchronousBeforeCompletionObserverTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/AnotherObserver.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/conditional/RecluseSpider.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/alternative/metadata/AnnotatedTypeWrapper.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/alternative/metadata/Grocery.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/alternative/metadata/GroceryInterceptorBinding.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/alternative/metadata/GroceryWrapper.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/broken/processAnnotatedObserverThrowsException/ProcessAnnotatedTypeEventThrowsExceptionTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/broken/processInjectionTargetThrowsException/ProcessInjectionTargetEventThrowsExceptionTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/container/event/broken/processBeanObserverRegistersException/AddDefinitionErrorTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/container/event/broken/processBeanObserverThrowsException/ThrowExceptionInProcessBeanObserverTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/definitionError/ProcessObserverMethodErrorTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/exception/ProcessObserverMethodExceptionTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/broken/injectionTargetError/InjectionTargetDefinitionErrorTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/InitializerUnallowedDefinitionTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/methodOnSessionBean/DisposalMethodOnSessionBean.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multiParams/MultipleDisposeParametersDefinitionTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/observesUnallowed/ObserverParameterUnallowedDefinitionTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/producesUnallowed/ProducesUnallowedDefinitionTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/UnresolvedDisposalMethodDefinitionTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithConversationScope/SingletonWithConversationScopeTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithRequestScope/SingletonWithRequestScopeTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithSessionScope/SingletonWithSessionScopeTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithApplicationScope/StatelessWithApplicationScopeTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithConversationScope/StatelessWithConversationScopeTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithRequestScope/StatelessWithRequestScopeTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithSessionScope/StatelessWithSessionScopeTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/methodAnnotatedProduces/InitializerMethodAnnotatedProducesTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/parameterizedReturnTypeWithWildcard/ParameterizedReturnTypeWithWildcardTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/ProducerFieldLifecycleTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/enterprise/nonbusiness/ProducerMethodNotBusinessMethodTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithTypeParameter2/ParameterizedTypeWithTypeParameterTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithWildcard/ParameterizedTypeWithWildcardTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/ProducerMethodLifecycleTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasDisposesParameter/ConstructorHasDisposesParameterTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasObservesParameter/ConstructorHasObservesParameterTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/dependentWithPublicField/DependentWithPublicFieldTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/tooManyInitializerAnnotatedConstructors/TooManyInitializerAnnotatedConstructorsTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/unproxyable/UnproxyableManagedBeanTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsNothing/DirectlyExtendsNothingTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsSimpleBean/DirectlyExtendsSimpleBeanTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/implementInterfaceAndExtendsNothing/ImplementsInterfaceAndExtendsNothingTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/sameName/SameNameTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/indirectOverride/IndirectOverrideTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializesStaticMethod/SpecializesStaticMethodTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializingAndSpecializedBeanHaveName/SpecializingAndSpecializedBeanHaveNameTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/SpecializingBeanExtendsEnterpriseBeanTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/inconsistent/InconsistentSpecializationTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/SpecializingAndSpecializedBeanHasNameTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/SpecializingBeanImplementsInterfaceOnly.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/SpecializingBeanExtendsNothingTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/SpecializingClassExtendsNonSimpleBeanTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/TwoSpecializingBeansForOneSpecializedTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/interceptorCanNotBeDecorator/InterceptorCanNotBeDecoratorTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/invalidBindingAnnotations/InvalidInterceptorBindingAnnotationsTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/invalidLifecycleInterceptor/InvalidLifecycleInterceptorTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/nonExistantClassInBeansXml/NonExistantClassInBeansXmlTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/nonInterceptorClassInBeansXml/NonInterceptorClassInBeansXmlTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/sameClassListedTwiceInBeansXml/FordInterceptor.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/sameClassListedTwiceInBeansXml/SameClassListedTwiceInBeansXmlTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/custom/AfterBeanDiscoveryObserver.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/custom/CustomInterceptorTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorCalledBeforeDecorator/InterceptorCalledBeforeDecoratorTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorCalledBeforeDecorator/TransactionInterceptor.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorNotListedInBeansXml/Transactional.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorOrder/Foo.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorOrder/Secure.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorOrder/Transactional.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/multipleBindings/Slow.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/binding/members/annotation/BindingAnnotationWithMemberTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/binding/members/array/BindingAnnotationWithMemberTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicateNameResolution/DuplicateNameResolutionTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicatePrefixResolution/DuplicateNamePrefixResolutionTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/array/ArrayTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/finalClass/FinalClassTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/finalMethod/FinalMethodTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/primitive/UnproxyableTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/privateConstructor/PrivateConstructorTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/broken/ambiguous/AmbiguousDependencyTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/broken/unsatisfied/UnsatisfiedDependencyTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/nullableBean/NullableBeanTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/broken/normal/scope/NormalScopedBeanWithInjectionPoint.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/broken/not/bean/InjectionPointTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/broken/primitive/PrimitiveInjectionPointTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/broken/type/variable/TypeVariableInjectionPointTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/incorrect/name/NoClassWithSpecifiedNameTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/incorrect/name/stereotype/NoAnnotationWithSpecifiedNameTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/not/policy/ClassIsNotPolicyTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/not/policy/stereotype/ClassIsNotPolicyTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/same/type/twice/SameTypeListedTwiceTest.java Log: mark tests ri-broken, remove distinction between definition error and deployment problem Modified: cdi-tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/Managers.java =================================================================== --- cdi-tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/Managers.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/Managers.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -2,8 +2,6 @@ import javax.enterprise.inject.spi.BeanManager; -import org.jboss.testharness.api.DeploymentException; - /** * This interface provides operations relating to a Manager. * @@ -27,28 +25,4 @@ */ public BeanManager getManager(); - /** - * Checks whether there is a definition error, as described in Section 2.8, - * "Problems detected automatically by the container". - * - * @param deploymentException the deployment exception context provided by - * the deployment which is in error. The deployment is not required - * to provide a deploymentException, even if the deployment is in - * error - * @return true if there is a definition error - */ - public boolean isDefinitionError(DeploymentException deploymentException); - - /** - * Checks whether there is a deployment problem, as described in Section 2.8, - * "Problems detected automatically by the container". - * - * @param deploymentException the deployment exception context provided by - * the deployment which is in error. The deployment is not required - * to provide a deploymentException, even if the deployment is in - * error - * @return true if there is a deployment error - */ - public boolean isDeploymentProblem(DeploymentException deploymentException); - } Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -22,6 +22,7 @@ import org.jboss.jsr299.tck.api.JSR299Configuration; import org.jboss.jsr299.tck.impl.OldSPIBridge; +import org.jboss.testharness.ExpectedException; import org.jboss.testharness.api.DeploymentException; import org.jboss.testharness.impl.ConfigurationFactory; @@ -169,17 +170,13 @@ @Override protected DeploymentException handleDeploymentFailure(DeploymentException deploymentException) { - if (getCurrentConfiguration().getManagers().isDefinitionError(deploymentException)) + if (deploymentException.getCause().getClass().equals(ExpectedException.class)) { - return new DeploymentException(deploymentException, new DefinitionError(deploymentException.getCause())); + return new DeploymentException(deploymentException, deploymentException.getCause()); } - else if (getCurrentConfiguration().getManagers().isDeploymentProblem(deploymentException)) - { - return new DeploymentException(deploymentException, new DeploymentError(deploymentException.getCause())); - } else { - return deploymentException; + return new DeploymentException(deploymentException, new DeploymentFailure()); } } } Deleted: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/DefinitionError.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/DefinitionError.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/DefinitionError.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -1,40 +0,0 @@ -package org.jboss.jsr299.tck; - -/** - * A category exception which can be declared in the @ExpectedDeploymentException - * annotation of an @Artifact to detect a definition error as described in - * Section 12.4, "Problems detected automatically by the container". - * - * @see org.jboss.jsr299.tck.spi.Managers#isDefinitionError(Throwable) - */ -public class DefinitionError extends RuntimeException -{ - - /** - * - */ - private static final long serialVersionUID = 3544233876045340712L; - -public DefinitionError() - { - super(); - } - - public DefinitionError(String message, Throwable cause) - { - super(message, cause); - } - - public DefinitionError(String message) - { - super(message); - } - - public DefinitionError(Throwable cause) - { - super(cause); - } - - - -} Deleted: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/DeploymentError.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/DeploymentError.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/DeploymentError.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -1,40 +0,0 @@ -package org.jboss.jsr299.tck; - -/** - * A category exception which can be declared in the @ExpectedDeploymentException - * annotation of an @Artifact to detect a deployment error as described in - * Section 12.4, "Problems detected automatically by the container". - * - * @see org.jboss.jsr299.tck.spi.Managers#isDeploymentProblem(Throwable) - */ -public class DeploymentError extends RuntimeException -{ - - /** - * - */ - private static final long serialVersionUID = 6495327942053526437L; - -public DeploymentError() - { - super(); - } - - public DeploymentError(String message, Throwable cause) - { - super(message, cause); - } - - public DeploymentError(String message) - { - super(message); - } - - public DeploymentError(Throwable cause) - { - super(cause); - } - - - -} Copied: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/DeploymentFailure.java (from rev 4854, cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/DefinitionError.java) =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/DeploymentFailure.java (rev 0) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/DeploymentFailure.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -0,0 +1,40 @@ +package org.jboss.jsr299.tck; + +/** + * A category exception which can be declared in the @ExpectedDeploymentException + * annotation of an @Artifact to detect a definition error as described in + * Section 12.4, "Problems detected automatically by the container". + * + * @see org.jboss.jsr299.tck.spi.Managers#isDefinitionError(Throwable) + */ +public class DeploymentFailure extends RuntimeException +{ + + /** + * + */ + private static final long serialVersionUID = 3544233876045340712L; + +public DeploymentFailure() + { + super(); + } + + public DeploymentFailure(String message, Throwable cause) + { + super(message, cause); + } + + public DeploymentFailure(String message) + { + super(message); + } + + public DeploymentFailure(Throwable cause) + { + super(cause); + } + + + +} Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/aroundInvoke/SimpleBean.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/aroundInvoke/SimpleBean.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/aroundInvoke/SimpleBean.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -2,9 +2,7 @@ import javax.interceptor.Interceptors; -import org.jboss.jsr299.tck.interceptors.tests.aroundInvoke.PackagePrivateInterceptor; - class SimpleBean { @Interceptors(PrivateInterceptor.class) Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/definition/DefinitionTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/definition/DefinitionTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/definition/DefinitionTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -26,7 +26,7 @@ @SpecVersion(spec = "int", version = "3.1.PFD") public class DefinitionTest extends AbstractJSR299Test { - @Test + @Test(groups="ri-broken") @SpecAssertion(section = "1", id= "a") public void testInterceptorMethodDefinedOnTargetClass() { assert getInstanceByType(ClassWithAroundInvokeMethod.class).foo().equals("barbar"); Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/lifecycleCallback/order/InvocationOrderTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/lifecycleCallback/order/InvocationOrderTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/lifecycleCallback/order/InvocationOrderTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -27,7 +27,7 @@ @SpecVersion(spec = "int", version = "3.1.PFD") public class InvocationOrderTest extends AbstractJSR299Test { - @Test + @Test(groups="ri-broken") @SpecAssertions({ @SpecAssertion(section = "5.1", id = "c"), @SpecAssertion(section = "5.1", id = "d"), Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/FoxHole.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/FoxHole.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/FoxHole.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -1,6 +1,5 @@ package org.jboss.jsr299.tck.tests.context.dependent; -import javax.enterprise.inject.Any; import javax.inject.Inject; class FoxHole Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/MissileInterceptor.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/MissileInterceptor.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/MissileInterceptor.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -1,8 +1,7 @@ package org.jboss.jsr299.tck.tests.context.dependent; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; import javax.interceptor.AroundInvoke; +import javax.interceptor.InvocationContext; class MissileInterceptor { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Tarantula.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Tarantula.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Tarantula.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -3,7 +3,6 @@ import javax.annotation.PreDestroy; import org.jboss.jsr299.tck.api.JSR299Configuration; -import org.jboss.jsr299.tck.impl.JSR299ConfigurationImpl; import org.jboss.testharness.impl.ConfigurationFactory; class Tarantula extends Spider implements DeadlySpider Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Transactional.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Transactional.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Transactional.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -1,8 +1,6 @@ package org.jboss.jsr299.tck.tests.context.dependent; -import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingBeanConstructor/DecoratorWithNonPassivatingBeanConstructorTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingBeanConstructor/DecoratorWithNonPassivatingBeanConstructorTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingBeanConstructor/DecoratorWithNonPassivatingBeanConstructorTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.context.passivating.broken.decoratorWithNonPassivatingBeanConstructor; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DeploymentError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -10,7 +10,7 @@ import org.testng.annotations.Test; @Artifact -(a)ExpectedDeploymentException(DeploymentError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @SpecVersion(spec="cdi", version="20091101") @BeansXml("beans.xml") public class DecoratorWithNonPassivatingBeanConstructorTest extends AbstractJSR299Test Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInitializerMethod/DecoratorWithNonPassivatingInitializerMethodTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInitializerMethod/DecoratorWithNonPassivatingInitializerMethodTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInitializerMethod/DecoratorWithNonPassivatingInitializerMethodTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.context.passivating.broken.decoratorWithNonPassivatingInitializerMethod; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DeploymentError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -10,7 +10,7 @@ import org.testng.annotations.Test; @Artifact -(a)ExpectedDeploymentException(DeploymentError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @SpecVersion(spec="cdi", version="20091101") @BeansXml("beans.xml") public class DecoratorWithNonPassivatingInitializerMethodTest extends AbstractJSR299Test Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInjectedField/DecoratorWithNonPassivatingInjectedFieldTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInjectedField/DecoratorWithNonPassivatingInjectedFieldTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInjectedField/DecoratorWithNonPassivatingInjectedFieldTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.context.passivating.broken.decoratorWithNonPassivatingInjectedField; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DeploymentError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -10,7 +10,7 @@ import org.testng.annotations.Test; @Artifact -(a)ExpectedDeploymentException(DeploymentError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @SpecVersion(spec="cdi", version="20091101") @BeansXml("beans.xml") public class DecoratorWithNonPassivatingInjectedFieldTest extends AbstractJSR299Test Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptor/BrokenInterceptor.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptor/BrokenInterceptor.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptor/BrokenInterceptor.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -1,10 +1,11 @@ package org.jboss.jsr299.tck.tests.context.passivating.broken.enterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptor; +import java.io.Serializable; + +import javax.inject.Inject; +import javax.interceptor.AroundInvoke; import javax.interceptor.Interceptor; import javax.interceptor.InvocationContext; -import javax.interceptor.AroundInvoke; -import javax.inject.Inject; -import java.io.Serializable; @Interceptor @CityBinding class BrokenInterceptor implements Serializable Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptor/EnterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptorTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptor/EnterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptorTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptor/EnterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptorTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.context.passivating.broken.enterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptor; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DeploymentError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -13,7 +13,7 @@ @Artifact @Packaging(PackagingType.EAR) -(a)ExpectedDeploymentException(DeploymentError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @BeansXml("beans.xml") @SpecVersion(spec="cdi", version="20091101") public class EnterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptorTest extends AbstractJSR299Test Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptor/Espoo_Broken.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptor/Espoo_Broken.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptor/Espoo_Broken.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -3,7 +3,6 @@ import javax.ejb.Remove; import javax.ejb.Stateful; import javax.enterprise.context.SessionScoped; -import javax.interceptor.Interceptors; @Stateful @SessionScoped Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingConstructorFieldInDecorator/EnterpriseBeanWithNonPassivatingFieldInDecoratorTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingConstructorFieldInDecorator/EnterpriseBeanWithNonPassivatingFieldInDecoratorTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingConstructorFieldInDecorator/EnterpriseBeanWithNonPassivatingFieldInDecoratorTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.context.passivating.broken.enterpriseBeanWithNonPassivatingConstructorFieldInDecorator; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DeploymentError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -13,7 +13,7 @@ @Artifact @Packaging(PackagingType.EAR) -(a)ExpectedDeploymentException(DeploymentError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @SpecVersion(spec="cdi", version="20091101") @BeansXml("beans.xml") public class EnterpriseBeanWithNonPassivatingFieldInDecoratorTest extends AbstractJSR299Test Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingDecorator/EnterpriseBeanWithNonPassivatingDecoratorTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingDecorator/EnterpriseBeanWithNonPassivatingDecoratorTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingDecorator/EnterpriseBeanWithNonPassivatingDecoratorTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.context.passivating.broken.enterpriseBeanWithNonPassivatingDecorator; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DeploymentError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -13,7 +13,7 @@ @Artifact @Packaging(PackagingType.EAR) -(a)ExpectedDeploymentException(DeploymentError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @SpecVersion(spec="cdi", version="20091101") @BeansXml("beans.xml") public class EnterpriseBeanWithNonPassivatingDecoratorTest extends AbstractJSR299Test Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerInDecorator/EnterpriseBeanWithNonPassivatingInitializerInDecoratorTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerInDecorator/EnterpriseBeanWithNonPassivatingInitializerInDecoratorTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerInDecorator/EnterpriseBeanWithNonPassivatingInitializerInDecoratorTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.context.passivating.broken.enterpriseBeanWithNonPassivatingInitializerInDecorator; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DeploymentError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -13,7 +13,7 @@ @Artifact @Packaging(PackagingType.EAR) -(a)ExpectedDeploymentException(DeploymentError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @SpecVersion(spec="cdi", version="20091101") @BeansXml("beans.xml") public class EnterpriseBeanWithNonPassivatingInitializerInDecoratorTest extends AbstractJSR299Test Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerParameterInInterceptor/BrokenInterceptor.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerParameterInInterceptor/BrokenInterceptor.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerParameterInInterceptor/BrokenInterceptor.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -3,9 +3,9 @@ import java.io.Serializable; import javax.inject.Inject; +import javax.interceptor.AroundInvoke; import javax.interceptor.Interceptor; import javax.interceptor.InvocationContext; -import javax.interceptor.AroundInvoke; import org.jboss.testharness.impl.packaging.jsr299.BeansXml; Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerParameterInInterceptor/City.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerParameterInInterceptor/City.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerParameterInInterceptor/City.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -1,10 +1,11 @@ package org.jboss.jsr299.tck.tests.context.passivating.broken.enterpriseBeanWithNonPassivatingInitializerParameterInInterceptor; -import java.lang.annotation.Documented; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; import java.lang.annotation.Retention; -import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; import javax.interceptor.InterceptorBinding; Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerParameterInInterceptor/EnterpriseBeanWithNonPassivatingInitializerParameterInInterceptorTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerParameterInInterceptor/EnterpriseBeanWithNonPassivatingInitializerParameterInInterceptorTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerParameterInInterceptor/EnterpriseBeanWithNonPassivatingInitializerParameterInInterceptorTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.context.passivating.broken.enterpriseBeanWithNonPassivatingInitializerParameterInInterceptor; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DeploymentError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -9,12 +9,11 @@ import org.jboss.testharness.impl.packaging.Packaging; import org.jboss.testharness.impl.packaging.PackagingType; import org.jboss.testharness.impl.packaging.jsr299.BeansXml; - import org.testng.annotations.Test; @Artifact @Packaging(PackagingType.EAR) -(a)ExpectedDeploymentException(DeploymentError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @SpecVersion(spec="cdi", version="20091101") @BeansXml("beans.xml") public class EnterpriseBeanWithNonPassivatingInitializerParameterInInterceptorTest extends AbstractJSR299Test Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInjectedFieldInDecorator/EnterpriseBeanWithNonPassivatingInjectedFieldInDecoratorTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInjectedFieldInDecorator/EnterpriseBeanWithNonPassivatingInjectedFieldInDecoratorTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInjectedFieldInDecorator/EnterpriseBeanWithNonPassivatingInjectedFieldInDecoratorTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.context.passivating.broken.enterpriseBeanWithNonPassivatingInjectedFieldInDecorator; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DeploymentError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -13,7 +13,7 @@ @Artifact @Packaging(PackagingType.EAR) -(a)ExpectedDeploymentException(DeploymentError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @SpecVersion(spec="cdi", version="20091101") @BeansXml("beans.xml") public class EnterpriseBeanWithNonPassivatingInjectedFieldInDecoratorTest extends AbstractJSR299Test Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInjectedFieldInInterceptor/BrokenInterceptor.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInjectedFieldInInterceptor/BrokenInterceptor.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInjectedFieldInInterceptor/BrokenInterceptor.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -1,9 +1,8 @@ package org.jboss.jsr299.tck.tests.context.passivating.broken.enterpriseBeanWithNonPassivatingInjectedFieldInInterceptor; import javax.inject.Inject; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; import javax.interceptor.AroundInvoke; +import javax.interceptor.InvocationContext; class BrokenInterceptor { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInjectedFieldInInterceptor/EnterpriseBeanWithNonPassivatingInjectedFieldInInterceptorTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInjectedFieldInInterceptor/EnterpriseBeanWithNonPassivatingInjectedFieldInInterceptorTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInjectedFieldInInterceptor/EnterpriseBeanWithNonPassivatingInjectedFieldInInterceptorTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.context.passivating.broken.enterpriseBeanWithNonPassivatingInjectedFieldInInterceptor; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DeploymentError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -12,7 +12,7 @@ @Artifact @Packaging(PackagingType.EAR) -(a)ExpectedDeploymentException(DeploymentError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @SpecVersion(spec="cdi", version="20091101") public class EnterpriseBeanWithNonPassivatingInjectedFieldInInterceptorTest extends AbstractJSR299Test { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonSerializableIntializerMethod/EnterpriseBeanWithNonSerializableIntializerMethodTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonSerializableIntializerMethod/EnterpriseBeanWithNonSerializableIntializerMethodTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonSerializableIntializerMethod/EnterpriseBeanWithNonSerializableIntializerMethodTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.context.passivating.broken.enterpriseBeanWithNonSerializableIntializerMethod; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DeploymentError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -12,7 +12,7 @@ @Artifact @Packaging(PackagingType.EAR) -(a)ExpectedDeploymentException(DeploymentError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @SpecVersion(spec="cdi", version="20091101") public class EnterpriseBeanWithNonSerializableIntializerMethodTest extends AbstractJSR299Test { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/finalProducerFieldNotPassivationCapable/NonPassivationCapableProducerFieldTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/finalProducerFieldNotPassivationCapable/NonPassivationCapableProducerFieldTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/finalProducerFieldNotPassivationCapable/NonPassivationCapableProducerFieldTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.context.passivating.broken.finalProducerFieldNotPassivationCapable; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DeploymentError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; @@ -18,7 +18,7 @@ @Artifact @Packaging(PackagingType.EAR) @SpecVersion(spec="cdi", version="20091101") -(a)ExpectedDeploymentException(DeploymentError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) public class NonPassivationCapableProducerFieldTest extends AbstractJSR299Test { @Test(groups = { "passivation", "ri-wrong-cause" }) Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/PassivationCapableBeanWithNonPassivatingInterceptorTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/PassivationCapableBeanWithNonPassivatingInterceptorTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/PassivationCapableBeanWithNonPassivatingInterceptorTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -1,18 +1,17 @@ package org.jboss.jsr299.tck.tests.context.passivating.broken.interceptorWithNonPassivatingBeanConstructorParameter; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DeploymentError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.jboss.testharness.impl.packaging.jsr299.BeansXml; - import org.testng.annotations.Test; @Artifact @BeansXml("beans.xml") -(a)ExpectedDeploymentException(DeploymentError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @SpecVersion(spec="cdi", version="20091101") public class PassivationCapableBeanWithNonPassivatingInterceptorTest extends AbstractJSR299Test { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInitializerMethodParameter/PassivationCapableBeanWithNonPassivatingInterceptorTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInitializerMethodParameter/PassivationCapableBeanWithNonPassivatingInterceptorTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInitializerMethodParameter/PassivationCapableBeanWithNonPassivatingInterceptorTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.context.passivating.broken.interceptorWithNonPassivatingInitializerMethodParameter; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DeploymentError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -9,7 +9,7 @@ import org.testng.annotations.Test; @Artifact -(a)ExpectedDeploymentException(DeploymentError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @SpecVersion(spec="cdi", version="20091101") public class PassivationCapableBeanWithNonPassivatingInterceptorTest extends AbstractJSR299Test { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInjectedField/BakedBean.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInjectedField/BakedBean.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInjectedField/BakedBean.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -1,8 +1,9 @@ package org.jboss.jsr299.tck.tests.context.passivating.broken.interceptorWithNonPassivatingInjectedField; -import javax.enterprise.context.SessionScoped; import java.io.Serializable; +import javax.enterprise.context.SessionScoped; + @SessionScoped @BakedBinding class BakedBean implements Serializable { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInjectedField/PassivationCapableBeanWithNonPassivatingInterceptorTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInjectedField/PassivationCapableBeanWithNonPassivatingInterceptorTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInjectedField/PassivationCapableBeanWithNonPassivatingInterceptorTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.context.passivating.broken.interceptorWithNonPassivatingInjectedField; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DeploymentError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -10,7 +10,7 @@ import org.testng.annotations.Test; @Artifact -(a)ExpectedDeploymentException(DeploymentError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @SpecVersion(spec="cdi", version="20091101") @BeansXml("beans.xml") public class PassivationCapableBeanWithNonPassivatingInterceptorTest extends AbstractJSR299Test Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/managedBeanWithNonPassivatingDecorator/ManagedBeanWithNonPassivatingDecoratorTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/managedBeanWithNonPassivatingDecorator/ManagedBeanWithNonPassivatingDecoratorTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/managedBeanWithNonPassivatingDecorator/ManagedBeanWithNonPassivatingDecoratorTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.context.passivating.broken.managedBeanWithNonPassivatingDecorator; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DefinitionError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -13,7 +13,7 @@ @Artifact @Packaging(PackagingType.EAR) -(a)ExpectedDeploymentException(DefinitionError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @SpecVersion(spec="cdi", version="20091101") @BeansXml("beans.xml") public class ManagedBeanWithNonPassivatingDecoratorTest extends AbstractJSR299Test Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/managedBeanWithNonSerializableInterceptorClass/ManagedBeanWithNonSerializableInterceptorClassTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/managedBeanWithNonSerializableInterceptorClass/ManagedBeanWithNonSerializableInterceptorClassTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/managedBeanWithNonSerializableInterceptorClass/ManagedBeanWithNonSerializableInterceptorClassTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.context.passivating.broken.managedBeanWithNonSerializableInterceptorClass; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DeploymentError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -9,7 +9,7 @@ import org.testng.annotations.Test; @Artifact -(a)ExpectedDeploymentException(DeploymentError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @SpecVersion(spec="cdi", version="20091101") public class ManagedBeanWithNonSerializableInterceptorClassTest extends AbstractJSR299Test { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableManagedBeanHasPassivatingScope/NonPassivationManagedBeanHasPassivatingScopeTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableManagedBeanHasPassivatingScope/NonPassivationManagedBeanHasPassivatingScopeTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableManagedBeanHasPassivatingScope/NonPassivationManagedBeanHasPassivatingScopeTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -2,7 +2,7 @@ import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DefinitionError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -16,7 +16,7 @@ * */ @Artifact -(a)ExpectedDeploymentException(DefinitionError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @SpecVersion(spec="cdi", version="20091101") public class NonPassivationManagedBeanHasPassivatingScopeTest extends AbstractJSR299Test { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerField/NonPassivationCapableProducerFieldTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerField/NonPassivationCapableProducerFieldTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerField/NonPassivationCapableProducerFieldTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.context.passivating.broken.nonPassivationCapableProducerField; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DeploymentError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; @@ -18,7 +18,7 @@ @Artifact @Packaging(PackagingType.EAR) @SpecVersion(spec="cdi", version="20091101") -(a)ExpectedDeploymentException(DeploymentError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) public class NonPassivationCapableProducerFieldTest extends AbstractJSR299Test { @Test(groups = { "passivation", "ri-wrong-cause" }) Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerMethod/NonPassivationCapableProducerMethodTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerMethod/NonPassivationCapableProducerMethodTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerMethod/NonPassivationCapableProducerMethodTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.context.passivating.broken.nonPassivationCapableProducerMethod; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DeploymentError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; @@ -18,7 +18,7 @@ @Artifact @Packaging(PackagingType.EAR) @SpecVersion(spec="cdi", version="20091101") -(a)ExpectedDeploymentException(DeploymentError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) public class NonPassivationCapableProducerMethodTest extends AbstractJSR299Test { @Test(groups = { "passivation", "ri-wrong-cause" }) Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingManagedBeanWithNonPassivatingBeanConstructor/PassivatingManagedBeanWithNonPassivatingBeanConstructorTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingManagedBeanWithNonPassivatingBeanConstructor/PassivatingManagedBeanWithNonPassivatingBeanConstructorTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingManagedBeanWithNonPassivatingBeanConstructor/PassivatingManagedBeanWithNonPassivatingBeanConstructorTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.context.passivating.broken.passivatingManagedBeanWithNonPassivatingBeanConstructor; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DeploymentError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -9,7 +9,7 @@ import org.testng.annotations.Test; @Artifact -(a)ExpectedDeploymentException(DeploymentError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @SpecVersion(spec="cdi", version="20091101") public class PassivatingManagedBeanWithNonPassivatingBeanConstructorTest extends AbstractJSR299Test { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingManagedBeanWithNonPassivatingInitializerMethod/PassivatingManagedBeanWithNonPassivatingInitializerMethodTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingManagedBeanWithNonPassivatingInitializerMethod/PassivatingManagedBeanWithNonPassivatingInitializerMethodTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingManagedBeanWithNonPassivatingInitializerMethod/PassivatingManagedBeanWithNonPassivatingInitializerMethodTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.context.passivating.broken.passivatingManagedBeanWithNonPassivatingInitializerMethod; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DeploymentError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -9,7 +9,7 @@ import org.testng.annotations.Test; @Artifact -(a)ExpectedDeploymentException(DeploymentError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @SpecVersion(spec="cdi", version="20091101") public class PassivatingManagedBeanWithNonPassivatingInitializerMethodTest extends AbstractJSR299Test { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingManagedBeanWithNonPassivatingInjcetedField/PassivatingManagedBeanWithNonPassivatingInjcetedFieldTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingManagedBeanWithNonPassivatingInjcetedField/PassivatingManagedBeanWithNonPassivatingInjcetedFieldTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingManagedBeanWithNonPassivatingInjcetedField/PassivatingManagedBeanWithNonPassivatingInjcetedFieldTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.context.passivating.broken.passivatingManagedBeanWithNonPassivatingInjcetedField; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DeploymentError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -9,7 +9,7 @@ import org.testng.annotations.Test; @Artifact -(a)ExpectedDeploymentException(DeploymentError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @SpecVersion(spec="cdi", version="20091101") public class PassivatingManagedBeanWithNonPassivatingInjcetedFieldTest extends AbstractJSR299Test { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingProducerMethodWithNonPassivatingParameter/PassivatingProducerMethodWithNonPassivatingParameterTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingProducerMethodWithNonPassivatingParameter/PassivatingProducerMethodWithNonPassivatingParameterTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingProducerMethodWithNonPassivatingParameter/PassivatingProducerMethodWithNonPassivatingParameterTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.context.passivating.broken.passivatingProducerMethodWithNonPassivatingParameter; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DeploymentError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -9,7 +9,7 @@ import org.testng.annotations.Test; @Artifact -(a)ExpectedDeploymentException(DeploymentError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @SpecVersion(spec="cdi", version="20091101") public class PassivatingProducerMethodWithNonPassivatingParameterTest extends AbstractJSR299Test { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/unserializableSimpleInjectedIntoPassivatingEnterpriseBean/UnserializableSimpleInjectedIntoPassivatingEnterpriseBeanTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/unserializableSimpleInjectedIntoPassivatingEnterpriseBean/UnserializableSimpleInjectedIntoPassivatingEnterpriseBeanTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/unserializableSimpleInjectedIntoPassivatingEnterpriseBean/UnserializableSimpleInjectedIntoPassivatingEnterpriseBeanTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.context.passivating.broken.unserializableSimpleInjectedIntoPassivatingEnterpriseBean; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DeploymentError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -12,7 +12,7 @@ @Artifact @Packaging(PackagingType.EAR) -(a)ExpectedDeploymentException(DeploymentError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @SpecVersion(spec="cdi", version="20091101") public class UnserializableSimpleInjectedIntoPassivatingEnterpriseBeanTest extends AbstractJSR299Test { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/custom/broken/finalBeanClass/CustomDecoratorMatchingBeanWithFinalClassTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/custom/broken/finalBeanClass/CustomDecoratorMatchingBeanWithFinalClassTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/custom/broken/finalBeanClass/CustomDecoratorMatchingBeanWithFinalClassTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -17,7 +17,7 @@ package org.jboss.jsr299.tck.tests.decorators.custom.broken.finalBeanClass; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DeploymentError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -32,7 +32,7 @@ @SpecVersion(spec = "cdi", version = "20091101") @IntegrationTest @Extension("javax.enterprise.inject.spi.Extension") -(a)ExpectedDeploymentException(DeploymentError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) public class CustomDecoratorMatchingBeanWithFinalClassTest extends AbstractJSR299Test { @Test(groups = "ri-broken") Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorListedTwiceInBeansXml/DecoratorListedTwiceInBeansXmlTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorListedTwiceInBeansXml/DecoratorListedTwiceInBeansXmlTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorListedTwiceInBeansXml/DecoratorListedTwiceInBeansXmlTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.decorators.definition.broken.decoratorListedTwiceInBeansXml; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DeploymentError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -14,7 +14,7 @@ * @author Shane Bryzak */ @Artifact -(a)ExpectedDeploymentException(DeploymentError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @BeansXml("beans.xml") @SpecVersion(spec="cdi", version="20091101") public class DecoratorListedTwiceInBeansXmlTest extends AbstractJSR299Test Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/enabledDecoratorIsNotDecorator/EnabledDecoratorNotADecoratorTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/enabledDecoratorIsNotDecorator/EnabledDecoratorNotADecoratorTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/enabledDecoratorIsNotDecorator/EnabledDecoratorNotADecoratorTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -17,7 +17,7 @@ package org.jboss.jsr299.tck.tests.decorators.definition.broken.enabledDecoratorIsNotDecorator; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DeploymentError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -29,7 +29,7 @@ * @author pmuir */ @Artifact -(a)ExpectedDeploymentException(DeploymentError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @BeansXml("beans.xml") @SpecVersion(spec="cdi", version="20091101") public class EnabledDecoratorNotADecoratorTest extends AbstractJSR299Test Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanClass/FinalBeanClassTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanClass/FinalBeanClassTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanClass/FinalBeanClassTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -17,7 +17,7 @@ package org.jboss.jsr299.tck.tests.decorators.definition.broken.finalBeanClass; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DeploymentError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -30,7 +30,7 @@ * */ @Artifact -(a)ExpectedDeploymentException(DeploymentError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @BeansXml("beans.xml") @SpecVersion(spec="cdi", version="20091101") public class FinalBeanClassTest extends AbstractJSR299Test Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanMethod/FinalBeanMethodTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanMethod/FinalBeanMethodTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanMethod/FinalBeanMethodTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -17,7 +17,7 @@ package org.jboss.jsr299.tck.tests.decorators.definition.broken.finalBeanMethod; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DeploymentError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -30,7 +30,7 @@ * */ @Artifact -(a)ExpectedDeploymentException(DeploymentError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @BeansXml("beans.xml") @SpecVersion(spec="cdi", version="20091101") public class FinalBeanMethodTest extends AbstractJSR299Test Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/multipleDelegateInjectionPoints/MultipleDelegateInjectionPointsTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/multipleDelegateInjectionPoints/MultipleDelegateInjectionPointsTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/multipleDelegateInjectionPoints/MultipleDelegateInjectionPointsTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -17,7 +17,7 @@ package org.jboss.jsr299.tck.tests.decorators.definition.broken.multipleDelegateInjectionPoints; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DefinitionError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -30,7 +30,7 @@ * */ @Artifact -(a)ExpectedDeploymentException(DefinitionError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @BeansXml("beans.xml") @SpecVersion(spec="cdi", version="20091101") public class MultipleDelegateInjectionPointsTest extends AbstractJSR299Test Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/noDelegateInjectionPoints/NoDelegateInjectionPointsTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/noDelegateInjectionPoints/NoDelegateInjectionPointsTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/noDelegateInjectionPoints/NoDelegateInjectionPointsTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -17,7 +17,7 @@ package org.jboss.jsr299.tck.tests.decorators.definition.broken.noDelegateInjectionPoints; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DefinitionError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -30,7 +30,7 @@ * */ @Artifact -(a)ExpectedDeploymentException(DefinitionError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @BeansXml("beans.xml") @SpecVersion(spec="cdi", version="20091101") public class NoDelegateInjectionPointsTest extends AbstractJSR299Test Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/nonDecoratorWithDecorates/NonDecoratorWithDecoratesTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/nonDecoratorWithDecorates/NonDecoratorWithDecoratesTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/nonDecoratorWithDecorates/NonDecoratorWithDecoratesTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.decorators.definition.broken.nonDecoratorWithDecorates; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DefinitionError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -13,7 +13,7 @@ * @author Shane Bryzak */ @Artifact -(a)ExpectedDeploymentException(DefinitionError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @SpecVersion(spec="cdi", version="20091101") public class NonDecoratorWithDecoratesTest extends AbstractJSR299Test { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/nonExistantClassInBeansXml/NonExistantDecoratorClassInBeansXmlTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/nonExistantClassInBeansXml/NonExistantDecoratorClassInBeansXmlTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/nonExistantClassInBeansXml/NonExistantDecoratorClassInBeansXmlTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.decorators.definition.broken.nonExistantClassInBeansXml; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DeploymentError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -10,7 +10,7 @@ import org.testng.annotations.Test; @Artifact -(a)ExpectedDeploymentException(DeploymentError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @BeansXml("beans.xml") @SpecVersion(spec="cdi", version="20091101") public class NonExistantDecoratorClassInBeansXmlTest extends AbstractJSR299Test Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/notAllDecoratedTypesImplemented/NotAllDecoratedTypesImplementedTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/notAllDecoratedTypesImplemented/NotAllDecoratedTypesImplementedTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/notAllDecoratedTypesImplemented/NotAllDecoratedTypesImplementedTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -17,7 +17,7 @@ package org.jboss.jsr299.tck.tests.decorators.definition.broken.notAllDecoratedTypesImplemented; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DefinitionError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -30,7 +30,7 @@ * */ @Artifact -(a)ExpectedDeploymentException(DefinitionError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @BeansXml("beans.xml") @SpecVersion(spec="cdi", version="20091101") public class NotAllDecoratedTypesImplementedTest extends AbstractJSR299Test Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/broken/delegateProducerMethod/DelegateInjectionPointTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/broken/delegateProducerMethod/DelegateInjectionPointTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/broken/delegateProducerMethod/DelegateInjectionPointTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -17,7 +17,7 @@ package org.jboss.jsr299.tck.tests.decorators.definition.inject.broken.delegateProducerMethod; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DefinitionError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; @@ -33,7 +33,7 @@ @Artifact @BeansXml("beans.xml") @SpecVersion(spec="cdi", version="20091101") -(a)ExpectedDeploymentException(DefinitionError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) public class DelegateInjectionPointTest extends AbstractJSR299Test { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/delegateConstructor/TimestampLogger.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/delegateConstructor/TimestampLogger.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/delegateConstructor/TimestampLogger.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -16,8 +16,8 @@ */ package org.jboss.jsr299.tck.tests.decorators.definition.inject.delegateConstructor; +import javax.decorator.Decorator; import javax.decorator.Delegate; -import javax.decorator.Decorator; import javax.inject.Inject; Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/delegateInitializerMethod/TimestampLogger.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/delegateInitializerMethod/TimestampLogger.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/delegateInitializerMethod/TimestampLogger.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -16,8 +16,8 @@ */ package org.jboss.jsr299.tck.tests.decorators.definition.inject.delegateInitializerMethod; +import javax.decorator.Decorator; import javax.decorator.Delegate; -import javax.decorator.Decorator; import javax.inject.Inject; Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/genericbroken/GenericManagedBeanTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/genericbroken/GenericManagedBeanTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/genericbroken/GenericManagedBeanTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.definition.bean.genericbroken; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DefinitionError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -10,7 +10,7 @@ import org.testng.annotations.Test; @Artifact -(a)ExpectedDeploymentException(DefinitionError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @SpecVersion(spec="cdi", version="20091101") @BeansXml("beans.xml") public class GenericManagedBeanTest extends AbstractJSR299Test Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken/tooManyScopes/TooManyScopesTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken/tooManyScopes/TooManyScopesTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken/tooManyScopes/TooManyScopesTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -2,7 +2,7 @@ import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DefinitionError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -10,7 +10,7 @@ import org.testng.annotations.Test; @Artifact -(a)ExpectedDeploymentException(DefinitionError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @SpecVersion(spec="cdi", version="20091101") public class TooManyScopesTest extends AbstractJSR299Test { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/StereotypeDefinitionTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/StereotypeDefinitionTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/StereotypeDefinitionTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -2,7 +2,6 @@ import java.lang.annotation.Annotation; -import javax.enterprise.context.ApplicationScoped; import javax.enterprise.context.Dependent; import javax.enterprise.context.RequestScoped; import javax.enterprise.context.SessionScoped; Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/nonEmptyNamed/NonEmptyNamedTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/nonEmptyNamed/NonEmptyNamedTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/nonEmptyNamed/NonEmptyNamedTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -2,7 +2,7 @@ import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DefinitionError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; @@ -11,7 +11,7 @@ import org.testng.annotations.Test; @Artifact -(a)ExpectedDeploymentException(DefinitionError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @SpecVersion(spec="cdi", version="20091101") public class NonEmptyNamedTest extends AbstractJSR299Test { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/scopeConflict/IncompatibleStereotypesTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/scopeConflict/IncompatibleStereotypesTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/scopeConflict/IncompatibleStereotypesTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.definition.stereotype.broken.scopeConflict; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DefinitionError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; @@ -10,7 +10,7 @@ import org.testng.annotations.Test; @Artifact -(a)ExpectedDeploymentException(DefinitionError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @SpecVersion(spec="cdi", version="20091101") public class IncompatibleStereotypesTest extends AbstractJSR299Test { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/tooManyScopes/TooManyScopeTypesTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/tooManyScopes/TooManyScopeTypesTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/tooManyScopes/TooManyScopeTypesTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -2,7 +2,7 @@ import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DefinitionError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -10,7 +10,7 @@ import org.testng.annotations.Test; @Artifact -(a)ExpectedDeploymentException(DefinitionError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @SpecVersion(spec="cdi", version="20091101") public class TooManyScopeTypesTest extends AbstractJSR299Test { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/withBindingType/StereoTypeWithBindingTypesTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/withBindingType/StereoTypeWithBindingTypesTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/withBindingType/StereoTypeWithBindingTypesTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -2,12 +2,8 @@ import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DefinitionError; -import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; -import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; -import org.testng.annotations.Test; @Artifact //(a)ExpectedDeploymentException(DefinitionError.class) Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDefinitionError/AddDefinitionErrorTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDefinitionError/AddDefinitionErrorTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDefinitionError/AddDefinitionErrorTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.deployment.lifecycle.broken.addDefinitionError; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DefinitionError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; @@ -25,7 +25,7 @@ }) // Must be an integration test as it needs a resource copied to a folder @IntegrationTest -(a)ExpectedDeploymentException(DefinitionError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @SpecVersion(spec="cdi", version="20091101") public class AddDefinitionErrorTest extends AbstractJSR299Test { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDeploymentProblem/AddDeploymentProblemTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDeploymentProblem/AddDeploymentProblemTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDeploymentProblem/AddDeploymentProblemTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -18,7 +18,7 @@ package org.jboss.jsr299.tck.tests.deployment.lifecycle.broken.addDeploymentProblem; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DeploymentError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -34,7 +34,7 @@ * @author Dan Allen */ @Artifact -(a)ExpectedDeploymentException(DeploymentError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @SpecVersion(spec="cdi", version="20091101") public class AddDeploymentProblemTest extends AbstractJSR299Test { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/beanDiscoveryMethodThrowsException/BeforeBeanDiscoveryThrowsExceptionTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/beanDiscoveryMethodThrowsException/BeforeBeanDiscoveryThrowsExceptionTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/beanDiscoveryMethodThrowsException/BeforeBeanDiscoveryThrowsExceptionTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -17,7 +17,7 @@ package org.jboss.jsr299.tck.tests.deployment.lifecycle.broken.beanDiscoveryMethodThrowsException; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DefinitionError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -35,13 +35,12 @@ @Resource(source="javax.enterprise.inject.spi.Extension", destination="WEB-INF/classes/META-INF/services/javax.enterprise.inject.spi.Extension") }) @IntegrationTest -(a)ExpectedDeploymentException(DefinitionError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @SpecVersion(spec="cdi", version="20091101") public class BeforeBeanDiscoveryThrowsExceptionTest extends AbstractJSR299Test { - @Test(groups="jboss-as-broken") - // WBRI-312 + @Test @SpecAssertion(section="11.5.1", id="ag") public void testThrowsException() { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanDiscoveryObserver/AfterBeanDiscoveryObserverExecutionFailureTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanDiscoveryObserver/AfterBeanDiscoveryObserverExecutionFailureTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanDiscoveryObserver/AfterBeanDiscoveryObserverExecutionFailureTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.deployment.lifecycle.broken.exceptionInAfterBeanDiscoveryObserver; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DefinitionError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -16,7 +16,7 @@ * @author Dan Allen */ @Artifact -(a)ExpectedDeploymentException(DefinitionError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @SpecVersion(spec="cdi", version="20091101") public class AfterBeanDiscoveryObserverExecutionFailureTest extends AbstractJSR299Test { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanValidationObserver/AfterDeploymentValidationObserverExecutionFailureTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanValidationObserver/AfterDeploymentValidationObserverExecutionFailureTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanValidationObserver/AfterDeploymentValidationObserverExecutionFailureTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -18,7 +18,7 @@ package org.jboss.jsr299.tck.tests.deployment.lifecycle.broken.exceptionInAfterBeanValidationObserver; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DeploymentError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -33,7 +33,7 @@ * @author Dan Allen */ @Artifact -(a)ExpectedDeploymentException(DeploymentError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @SpecVersion(spec="cdi", version="20091101") public class AfterDeploymentValidationObserverExecutionFailureTest extends AbstractJSR299Test { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringBeanDiscovery/DeploymentFailureTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringBeanDiscovery/DeploymentFailureTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringBeanDiscovery/DeploymentFailureTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.deployment.lifecycle.broken.failsDuringBeanDiscovery; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DefinitionError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; @@ -13,7 +13,7 @@ @Artifact @Packaging(PackagingType.EAR) -(a)ExpectedDeploymentException(DefinitionError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @SpecVersion(spec="cdi", version="20091101") public class DeploymentFailureTest extends AbstractJSR299Test { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringValidation/AfterBeanDiscoveryFailureTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringValidation/AfterBeanDiscoveryFailureTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringValidation/AfterBeanDiscoveryFailureTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -18,7 +18,7 @@ package org.jboss.jsr299.tck.tests.deployment.lifecycle.broken.failsDuringValidation; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DeploymentError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; @@ -35,7 +35,7 @@ * @author Dan Allen */ @Artifact -(a)ExpectedDeploymentException(DeploymentError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @SpecVersion(spec="cdi", version="20091101") public class AfterBeanDiscoveryFailureTest extends AbstractJSR299Test { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/normalScope/AddingNormalScopeTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/normalScope/AddingNormalScopeTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/normalScope/AddingNormalScopeTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -17,7 +17,7 @@ package org.jboss.jsr299.tck.tests.deployment.lifecycle.broken.normalScope; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DeploymentError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -36,7 +36,7 @@ @Resource(source="javax.enterprise.inject.spi.Extension", destination="WEB-INF/classes/META-INF/services/javax.enterprise.inject.spi.Extension") }) @IntegrationTest -(a)ExpectedDeploymentException(DeploymentError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @SpecVersion(spec="cdi", version="20091101") public class AddingNormalScopeTest extends AbstractJSR299Test { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/passivatingScope/AddingPassivatingScopeTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/passivatingScope/AddingPassivatingScopeTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/passivatingScope/AddingPassivatingScopeTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -17,7 +17,7 @@ package org.jboss.jsr299.tck.tests.deployment.lifecycle.broken.passivatingScope; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DeploymentError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -35,7 +35,7 @@ @Resource(source="javax.enterprise.inject.spi.Extension", destination="WEB-INF/classes/META-INF/services/javax.enterprise.inject.spi.Extension") }) @IntegrationTest -(a)ExpectedDeploymentException(DeploymentError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @SpecVersion(spec="cdi", version="20091101") public class AddingPassivatingScopeTest extends AbstractJSR299Test { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/inject/withoutType/EventInjectionWithoutTypeTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/inject/withoutType/EventInjectionWithoutTypeTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/inject/withoutType/EventInjectionWithoutTypeTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -18,7 +18,7 @@ import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DefinitionError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; @@ -30,7 +30,7 @@ * @author David Allen */ @Artifact -(a)ExpectedDeploymentException(DefinitionError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) public class EventInjectionWithoutTypeTest extends AbstractJSR299Test { @Test(groups = { "events" }) Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/dependentIsConditionalObserver/AlarmSystem.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/dependentIsConditionalObserver/AlarmSystem.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/dependentIsConditionalObserver/AlarmSystem.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.event.broken.observer.dependentIsConditionalObserver; +import javax.enterprise.event.Observes; import javax.enterprise.event.Reception; -import javax.enterprise.event.Observes; class AlarmSystem { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/dependentIsConditionalObserver/DependentIsConditionalObserverTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/dependentIsConditionalObserver/DependentIsConditionalObserverTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/dependentIsConditionalObserver/DependentIsConditionalObserverTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.event.broken.observer.dependentIsConditionalObserver; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DefinitionError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -9,7 +9,7 @@ import org.testng.annotations.Test; @Artifact -(a)ExpectedDeploymentException(DefinitionError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @SpecVersion(spec="cdi", version="20091101") public class DependentIsConditionalObserverTest extends AbstractJSR299Test { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isDisposer/ObserverMethodAnnotatedDisposesTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isDisposer/ObserverMethodAnnotatedDisposesTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isDisposer/ObserverMethodAnnotatedDisposesTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -19,7 +19,7 @@ import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DefinitionError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -33,7 +33,7 @@ * @author David Allen */ @Artifact -(a)ExpectedDeploymentException(DefinitionError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @SpecVersion(spec="cdi", version="20091101") public class ObserverMethodAnnotatedDisposesTest extends AbstractJSR299Test { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isInitializer/ObserverMethodAnnotatedInitialzerTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isInitializer/ObserverMethodAnnotatedInitialzerTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isInitializer/ObserverMethodAnnotatedInitialzerTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -19,7 +19,7 @@ import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DefinitionError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -33,7 +33,7 @@ * @author David Allen */ @Artifact -(a)ExpectedDeploymentException(DefinitionError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @SpecVersion(spec="cdi", version="20091101") public class ObserverMethodAnnotatedInitialzerTest extends AbstractJSR299Test { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isProducer/ObserverMethodAnnotatedProducesTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isProducer/ObserverMethodAnnotatedProducesTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isProducer/ObserverMethodAnnotatedProducesTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -18,7 +18,7 @@ package org.jboss.jsr299.tck.tests.event.broken.observer.isProducer; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DefinitionError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -31,7 +31,7 @@ * @author David Allen */ @Artifact -(a)ExpectedDeploymentException(DefinitionError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @SpecVersion(spec="cdi", version="20091101") public class ObserverMethodAnnotatedProducesTest extends AbstractJSR299Test { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/notBusinessMethod/EJBObserverMethodNotBusinessMethodTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/notBusinessMethod/EJBObserverMethodNotBusinessMethodTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/notBusinessMethod/EJBObserverMethodNotBusinessMethodTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -17,7 +17,7 @@ package org.jboss.jsr299.tck.tests.event.broken.observer.notBusinessMethod; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DefinitionError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; @@ -35,7 +35,7 @@ */ @Artifact @Packaging(PackagingType.EAR) -(a)ExpectedDeploymentException(DefinitionError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @SpecVersion(spec="cdi", version="20091101") public class EJBObserverMethodNotBusinessMethodTest extends AbstractJSR299Test { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/tooManyParameters/ObserverMethodWithTwoEventParametersTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/tooManyParameters/ObserverMethodWithTwoEventParametersTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/tooManyParameters/ObserverMethodWithTwoEventParametersTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.event.broken.observer.tooManyParameters; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DefinitionError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; @@ -10,7 +10,7 @@ import org.testng.annotations.Test; @Artifact -(a)ExpectedDeploymentException(DefinitionError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @SpecVersion(spec="cdi", version="20091101") public class ObserverMethodWithTwoEventParametersTest extends AbstractJSR299Test { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer8/AsynchronousBeforeCompletionObserverTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer8/AsynchronousBeforeCompletionObserverTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer8/AsynchronousBeforeCompletionObserverTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -17,7 +17,7 @@ package org.jboss.jsr299.tck.tests.event.broken.observer8; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DefinitionError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; @@ -30,7 +30,7 @@ * @author David Allen */ @Artifact -(a)ExpectedDeploymentException(DefinitionError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) public class AsynchronousBeforeCompletionObserverTest extends AbstractJSR299Test { // @Test(groups = { "events" }) Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/AnotherObserver.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/AnotherObserver.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/AnotherObserver.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -1,8 +1,8 @@ package org.jboss.jsr299.tck.tests.event.observer; import javax.enterprise.context.RequestScoped; +import javax.enterprise.event.Observes; import javax.enterprise.event.Reception; -import javax.enterprise.event.Observes; @RequestScoped class AnotherObserver Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/conditional/RecluseSpider.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/conditional/RecluseSpider.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/conditional/RecluseSpider.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -1,8 +1,8 @@ package org.jboss.jsr299.tck.tests.event.observer.conditional; import javax.enterprise.context.RequestScoped; +import javax.enterprise.event.Observes; import javax.enterprise.event.Reception; -import javax.enterprise.event.Observes; /** * Simple web bean that conditionally listens to events. Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/alternative/metadata/AnnotatedTypeWrapper.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/alternative/metadata/AnnotatedTypeWrapper.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/alternative/metadata/AnnotatedTypeWrapper.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -8,8 +8,6 @@ import javax.enterprise.inject.spi.AnnotatedMethod; import javax.enterprise.inject.spi.AnnotatedType; -import org.jboss.jsr299.tck.tests.extensions.alternative.metadata.AnnotatedWrapper; - public class AnnotatedTypeWrapper<X> extends AnnotatedWrapper implements AnnotatedType<X> { private AnnotatedType<X> delegate; Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/alternative/metadata/Grocery.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/alternative/metadata/Grocery.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/alternative/metadata/Grocery.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -1,9 +1,6 @@ package org.jboss.jsr299.tck.tests.extensions.alternative.metadata; -import java.io.Serializable; - import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.SessionScoped; import javax.enterprise.event.Observes; import javax.enterprise.inject.Any; import javax.enterprise.inject.Produces; Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/alternative/metadata/GroceryInterceptorBinding.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/alternative/metadata/GroceryInterceptorBinding.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/alternative/metadata/GroceryInterceptorBinding.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -1,11 +1,12 @@ package org.jboss.jsr299.tck.tests.extensions.alternative.metadata; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + import javax.interceptor.InterceptorBinding; @InterceptorBinding Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/alternative/metadata/GroceryWrapper.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/alternative/metadata/GroceryWrapper.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/alternative/metadata/GroceryWrapper.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -8,8 +8,8 @@ import java.util.Set; import javax.enterprise.context.RequestScoped; +import javax.enterprise.event.Observes; import javax.enterprise.event.Reception; -import javax.enterprise.event.Observes; import javax.enterprise.event.TransactionPhase; import javax.enterprise.inject.Produces; import javax.enterprise.inject.spi.AnnotatedConstructor; Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/broken/processAnnotatedObserverThrowsException/ProcessAnnotatedTypeEventThrowsExceptionTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/broken/processAnnotatedObserverThrowsException/ProcessAnnotatedTypeEventThrowsExceptionTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/broken/processAnnotatedObserverThrowsException/ProcessAnnotatedTypeEventThrowsExceptionTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -18,7 +18,7 @@ package org.jboss.jsr299.tck.tests.extensions.annotated.broken.processAnnotatedObserverThrowsException; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DeploymentError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -35,7 +35,7 @@ * */ @Artifact -(a)ExpectedDeploymentException(DeploymentError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @Resources({ @Resource(source="javax.enterprise.inject.spi.Extension", destination="WEB-INF/classes/META-INF/services/javax.enterprise.inject.spi.Extension") }) @@ -43,7 +43,7 @@ @SpecVersion(spec="cdi", version="20091101") public class ProcessAnnotatedTypeEventThrowsExceptionTest extends AbstractJSR299Test { - @Test(groups="jboss-as-broken") + @Test @SpecAssertion(section = "11.5.5", id = "e") public void testProcessAnnotatedTypeEventThrowsExceptionNotOk() { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/broken/processInjectionTargetThrowsException/ProcessInjectionTargetEventThrowsExceptionTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/broken/processInjectionTargetThrowsException/ProcessInjectionTargetEventThrowsExceptionTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/broken/processInjectionTargetThrowsException/ProcessInjectionTargetEventThrowsExceptionTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -18,7 +18,7 @@ package org.jboss.jsr299.tck.tests.extensions.annotated.broken.processInjectionTargetThrowsException; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DeploymentError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -35,7 +35,7 @@ * */ @Artifact -(a)ExpectedDeploymentException(DeploymentError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @Resources({ @Resource(source="javax.enterprise.inject.spi.Extension", destination="WEB-INF/classes/META-INF/services/javax.enterprise.inject.spi.Extension") }) @@ -43,7 +43,7 @@ @SpecVersion(spec="cdi", version="20091101") public class ProcessInjectionTargetEventThrowsExceptionTest extends AbstractJSR299Test { - @Test(groups="jboss-as-broken") + @Test @SpecAssertion(section = "11.5.6", id = "f") public void testProcessInjectionTargetEventThrowsExceptionNotOk() { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/container/event/broken/processBeanObserverRegistersException/AddDefinitionErrorTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/container/event/broken/processBeanObserverRegistersException/AddDefinitionErrorTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/container/event/broken/processBeanObserverRegistersException/AddDefinitionErrorTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -17,7 +17,7 @@ package org.jboss.jsr299.tck.tests.extensions.container.event.broken.processBeanObserverRegistersException; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DefinitionError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -27,15 +27,14 @@ import org.testng.annotations.Test; @Artifact -(a)ExpectedDeploymentException(DefinitionError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @Resource(source = "javax.enterprise.inject.spi.Extension", destination = "WEB-INF/classes/META-INF/services/javax.enterprise.inject.spi.Extension") @IntegrationTest @SpecVersion(spec = "cdi", version = "20091101") public class AddDefinitionErrorTest extends AbstractJSR299Test { - @Test(groups = "jboss-as-broken") + @Test @SpecAssertion(section = "11.5.8", id = "h") - // WELD-223 public void testAddDefinitionError() { assert false; Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/container/event/broken/processBeanObserverThrowsException/ThrowExceptionInProcessBeanObserverTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/container/event/broken/processBeanObserverThrowsException/ThrowExceptionInProcessBeanObserverTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/container/event/broken/processBeanObserverThrowsException/ThrowExceptionInProcessBeanObserverTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -17,7 +17,7 @@ package org.jboss.jsr299.tck.tests.extensions.container.event.broken.processBeanObserverThrowsException; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DefinitionError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -27,15 +27,14 @@ import org.testng.annotations.Test; @Artifact -(a)ExpectedDeploymentException(DefinitionError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @Resource(source = "javax.enterprise.inject.spi.Extension", destination = "WEB-INF/classes/META-INF/services/javax.enterprise.inject.spi.Extension") @IntegrationTest @SpecVersion(spec = "cdi", version = "20091101") public class ThrowExceptionInProcessBeanObserverTest extends AbstractJSR299Test { - @Test(groups = "jboss-as-broken") + @Test @SpecAssertion(section = "11.5.8", id = "hd") - // WELD-224 public void testProcessBeanObserverThrowsException() { assert false; Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/definitionError/ProcessObserverMethodErrorTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/definitionError/ProcessObserverMethodErrorTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/definitionError/ProcessObserverMethodErrorTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -18,7 +18,7 @@ package org.jboss.jsr299.tck.tests.extensions.observer.broken.definitionError; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DefinitionError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -35,7 +35,7 @@ * */ @Artifact -(a)ExpectedDeploymentException(DefinitionError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @Resources({ @Resource(source="javax.enterprise.inject.spi.Extension", destination="WEB-INF/classes/META-INF/services/javax.enterprise.inject.spi.Extension") }) Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/exception/ProcessObserverMethodExceptionTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/exception/ProcessObserverMethodExceptionTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/exception/ProcessObserverMethodExceptionTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -18,7 +18,7 @@ package org.jboss.jsr299.tck.tests.extensions.observer.broken.exception; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DefinitionError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -36,7 +36,7 @@ * */ @Artifact -(a)ExpectedDeploymentException(DefinitionError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @Resources({ @Resource(source="javax.enterprise.inject.spi.Extension", destination="WEB-INF/classes/META-INF/services/javax.enterprise.inject.spi.Extension") }) Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/broken/injectionTargetError/InjectionTargetDefinitionErrorTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/broken/injectionTargetError/InjectionTargetDefinitionErrorTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/broken/injectionTargetError/InjectionTargetDefinitionErrorTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.extensions.producer.broken.injectionTargetError; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DefinitionError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; @@ -24,16 +24,15 @@ }) // Must be an integration test as it needs a resource copied to a folder @IntegrationTest -(a)ExpectedDeploymentException(DefinitionError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @SpecVersion(spec="cdi", version="20091101") public class InjectionTargetDefinitionErrorTest extends AbstractJSR299Test { - @Test(groups = "jboss-as-broken") + @Test @SpecAssertions({ @SpecAssertion(section = "11.5.6", id = "da") }) - // WBRII-345 public void testAddingDefinitionError() { assert false; Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/InitializerUnallowedDefinitionTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/InitializerUnallowedDefinitionTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/InitializerUnallowedDefinitionTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -2,7 +2,7 @@ import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DefinitionError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -11,7 +11,7 @@ import org.testng.annotations.Test; @Artifact -(a)ExpectedDeploymentException(DefinitionError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @BeansXml("beans.xml") @SpecVersion(spec="cdi", version="20091101") public class InitializerUnallowedDefinitionTest extends AbstractJSR299Test Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/methodOnSessionBean/DisposalMethodOnSessionBean.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/methodOnSessionBean/DisposalMethodOnSessionBean.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/methodOnSessionBean/DisposalMethodOnSessionBean.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken.methodOnSessionBean; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DefinitionError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; @@ -13,7 +13,7 @@ import org.testng.annotations.Test; @Artifact -(a)ExpectedDeploymentException(DefinitionError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @IntegrationTest @Packaging(PackagingType.EAR) @SpecVersion(spec="cdi", version="20091101") Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multiParams/MultipleDisposeParametersDefinitionTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multiParams/MultipleDisposeParametersDefinitionTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multiParams/MultipleDisposeParametersDefinitionTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -2,7 +2,7 @@ import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DefinitionError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; @@ -12,7 +12,7 @@ import org.testng.annotations.Test; @Artifact -(a)ExpectedDeploymentException(DefinitionError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @BeansXml("beans.xml") @SpecVersion(spec="cdi", version="20091101") public class MultipleDisposeParametersDefinitionTest extends AbstractJSR299Test Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/observesUnallowed/ObserverParameterUnallowedDefinitionTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/observesUnallowed/ObserverParameterUnallowedDefinitionTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/observesUnallowed/ObserverParameterUnallowedDefinitionTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken.observesUnallowed; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DefinitionError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -10,7 +10,7 @@ import org.testng.annotations.Test; @Artifact -(a)ExpectedDeploymentException(DefinitionError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @BeansXml("beans.xml") @SpecVersion(spec="cdi", version="20091101") public class ObserverParameterUnallowedDefinitionTest extends AbstractJSR299Test Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/producesUnallowed/ProducesUnallowedDefinitionTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/producesUnallowed/ProducesUnallowedDefinitionTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/producesUnallowed/ProducesUnallowedDefinitionTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -2,7 +2,7 @@ import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DefinitionError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -10,7 +10,7 @@ import org.testng.annotations.Test; @Artifact -(a)ExpectedDeploymentException(DefinitionError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @SpecVersion(spec="cdi", version="20091101") public class ProducesUnallowedDefinitionTest extends AbstractJSR299Test { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/UnresolvedDisposalMethodDefinitionTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/UnresolvedDisposalMethodDefinitionTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/UnresolvedDisposalMethodDefinitionTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken.unresolvedMethod; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DefinitionError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -10,7 +10,7 @@ import org.testng.annotations.Test; @Artifact -(a)ExpectedDeploymentException(DefinitionError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @BeansXml("beans.xml") @SpecVersion(spec="cdi", version="20091101") public class UnresolvedDisposalMethodDefinitionTest extends AbstractJSR299Test Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithConversationScope/SingletonWithConversationScopeTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithConversationScope/SingletonWithConversationScopeTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithConversationScope/SingletonWithConversationScopeTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -2,7 +2,7 @@ import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DefinitionError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -11,7 +11,7 @@ import org.jboss.testharness.impl.packaging.PackagingType; import org.testng.annotations.Test; -(a)ExpectedDeploymentException(DefinitionError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @Artifact @Packaging(PackagingType.EAR) @SpecVersion(spec="cdi", version="20091101") Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithRequestScope/SingletonWithRequestScopeTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithRequestScope/SingletonWithRequestScopeTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithRequestScope/SingletonWithRequestScopeTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -2,7 +2,7 @@ import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DefinitionError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -12,7 +12,7 @@ import org.testng.annotations.Test; @Artifact -(a)ExpectedDeploymentException(DefinitionError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @Packaging(PackagingType.EAR) @SpecVersion(spec="cdi", version="20091101") public class SingletonWithRequestScopeTest extends AbstractJSR299Test Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithSessionScope/SingletonWithSessionScopeTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithSessionScope/SingletonWithSessionScopeTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithSessionScope/SingletonWithSessionScopeTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -2,7 +2,7 @@ import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DefinitionError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -12,7 +12,7 @@ import org.testng.annotations.Test; @Artifact -(a)ExpectedDeploymentException(DefinitionError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @Packaging(PackagingType.EAR) @SpecVersion(spec="cdi", version="20091101") public class SingletonWithSessionScopeTest extends AbstractJSR299Test Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithApplicationScope/StatelessWithApplicationScopeTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithApplicationScope/StatelessWithApplicationScopeTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithApplicationScope/StatelessWithApplicationScopeTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -2,7 +2,7 @@ import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DefinitionError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -12,7 +12,7 @@ import org.testng.annotations.Test; @Artifact -(a)ExpectedDeploymentException(DefinitionError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @Packaging(PackagingType.EAR) @SpecVersion(spec="cdi", version="20091101") public class StatelessWithApplicationScopeTest extends AbstractJSR299Test Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithConversationScope/StatelessWithConversationScopeTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithConversationScope/StatelessWithConversationScopeTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithConversationScope/StatelessWithConversationScopeTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -2,7 +2,7 @@ import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DefinitionError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -12,7 +12,7 @@ import org.testng.annotations.Test; @Artifact -(a)ExpectedDeploymentException(DefinitionError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @Packaging(PackagingType.EAR) @SpecVersion(spec="cdi", version="20091101") public class StatelessWithConversationScopeTest extends AbstractJSR299Test Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithRequestScope/StatelessWithRequestScopeTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithRequestScope/StatelessWithRequestScopeTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithRequestScope/StatelessWithRequestScopeTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -2,7 +2,7 @@ import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DefinitionError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -12,7 +12,7 @@ import org.testng.annotations.Test; @Artifact -(a)ExpectedDeploymentException(DefinitionError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @Packaging(PackagingType.EAR) @SpecVersion(spec="cdi", version="20091101") public class StatelessWithRequestScopeTest extends AbstractJSR299Test Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithSessionScope/StatelessWithSessionScopeTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithSessionScope/StatelessWithSessionScopeTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithSessionScope/StatelessWithSessionScopeTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -2,7 +2,7 @@ import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DefinitionError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -12,7 +12,7 @@ import org.testng.annotations.Test; @Artifact -(a)ExpectedDeploymentException(DefinitionError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @Packaging(PackagingType.EAR) @SpecVersion(spec="cdi", version="20091101") public class StatelessWithSessionScopeTest extends AbstractJSR299Test Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/methodAnnotatedProduces/InitializerMethodAnnotatedProducesTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/methodAnnotatedProduces/InitializerMethodAnnotatedProducesTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/methodAnnotatedProduces/InitializerMethodAnnotatedProducesTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -2,7 +2,7 @@ import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DefinitionError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; @@ -11,7 +11,7 @@ import org.testng.annotations.Test; @Artifact -(a)ExpectedDeploymentException(DefinitionError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @SpecVersion(spec="cdi", version="20091101") public class InitializerMethodAnnotatedProducesTest extends AbstractJSR299Test { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -2,7 +2,7 @@ import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DefinitionError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -10,7 +10,7 @@ import org.testng.annotations.Test; @Artifact -(a)ExpectedDeploymentException(DefinitionError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @SpecVersion(spec="cdi", version="20091101") public class ParameterAnnotatedDisposesTest extends AbstractJSR299Test { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.implementation.initializer.broken.parameterAnnotatedObserves; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DefinitionError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -9,7 +9,7 @@ import org.testng.annotations.Test; @Artifact -(a)ExpectedDeploymentException(DefinitionError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @SpecVersion(spec="cdi", version="20091101") public class ParameterAnnotatedObservesTest extends AbstractJSR299Test { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/parameterizedReturnTypeWithWildcard/ParameterizedReturnTypeWithWildcardTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/parameterizedReturnTypeWithWildcard/ParameterizedReturnTypeWithWildcardTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/parameterizedReturnTypeWithWildcard/ParameterizedReturnTypeWithWildcardTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -2,7 +2,7 @@ import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DefinitionError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -10,7 +10,7 @@ import org.testng.annotations.Test; @Artifact -(a)ExpectedDeploymentException(DefinitionError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @SpecVersion(spec="cdi", version="20091101") public class ParameterizedReturnTypeWithWildcardTest extends AbstractJSR299Test { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/ProducerFieldLifecycleTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/ProducerFieldLifecycleTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/ProducerFieldLifecycleTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -1,10 +1,9 @@ package org.jboss.jsr299.tck.tests.implementation.producer.field.lifecycle; +import javax.enterprise.context.spi.CreationalContext; import javax.enterprise.inject.IllegalProductException; import javax.enterprise.inject.spi.Bean; -import javax.enterprise.inject.spi.BeanManager; import javax.enterprise.util.AnnotationLiteral; -import javax.enterprise.context.spi.CreationalContext; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.test.audit.annotations.SpecAssertion; Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/enterprise/nonbusiness/ProducerMethodNotBusinessMethodTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/enterprise/nonbusiness/ProducerMethodNotBusinessMethodTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/enterprise/nonbusiness/ProducerMethodNotBusinessMethodTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -2,7 +2,7 @@ import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DefinitionError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; @@ -14,7 +14,7 @@ @Artifact @Packaging(PackagingType.EAR) -(a)ExpectedDeploymentException(DefinitionError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @SpecVersion(spec="cdi", version="20091101") public class ProducerMethodNotBusinessMethodTest extends AbstractJSR299Test { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -2,7 +2,7 @@ import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DefinitionError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -10,7 +10,7 @@ import org.testng.annotations.Test; @Artifact -(a)ExpectedDeploymentException(DefinitionError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @SpecVersion(spec="cdi", version="20091101") public class ParameterAnnotatedDisposesTest extends AbstractJSR299Test { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -2,7 +2,7 @@ import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DefinitionError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -10,7 +10,7 @@ import org.testng.annotations.Test; @Artifact -(a)ExpectedDeploymentException(DefinitionError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @SpecVersion(spec="cdi", version="20091101") public class ParameterAnnotatedObservesTest extends AbstractJSR299Test { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithTypeParameter2/ParameterizedTypeWithTypeParameterTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithTypeParameter2/ParameterizedTypeWithTypeParameterTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithTypeParameter2/ParameterizedTypeWithTypeParameterTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -2,7 +2,7 @@ import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DefinitionError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; @@ -11,7 +11,7 @@ import org.testng.annotations.Test; @Artifact -(a)ExpectedDeploymentException(DefinitionError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @SpecVersion(spec="cdi", version="20091101") public class ParameterizedTypeWithTypeParameterTest extends AbstractJSR299Test { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithWildcard/ParameterizedTypeWithWildcardTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithWildcard/ParameterizedTypeWithWildcardTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithWildcard/ParameterizedTypeWithWildcardTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -2,7 +2,7 @@ import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DefinitionError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; @@ -11,7 +11,7 @@ import org.testng.annotations.Test; @Artifact -(a)ExpectedDeploymentException(DefinitionError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @SpecVersion(spec="cdi", version="20091101") public class ParameterizedTypeWithWildcardTest extends AbstractJSR299Test { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/ProducerMethodLifecycleTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/ProducerMethodLifecycleTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/ProducerMethodLifecycleTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -2,7 +2,6 @@ import java.util.Set; -import javax.enterprise.context.RequestScoped; import javax.enterprise.context.spi.CreationalContext; import javax.enterprise.inject.CreationException; import javax.enterprise.inject.IllegalProductException; Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasDisposesParameter/ConstructorHasDisposesParameterTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasDisposesParameter/ConstructorHasDisposesParameterTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasDisposesParameter/ConstructorHasDisposesParameterTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -2,7 +2,7 @@ import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DefinitionError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; @@ -11,7 +11,7 @@ import org.testng.annotations.Test; @Artifact -(a)ExpectedDeploymentException(DefinitionError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @SpecVersion(spec="cdi", version="20091101") public class ConstructorHasDisposesParameterTest extends AbstractJSR299Test { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasObservesParameter/ConstructorHasObservesParameterTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasObservesParameter/ConstructorHasObservesParameterTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasObservesParameter/ConstructorHasObservesParameterTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -2,7 +2,7 @@ import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DefinitionError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -10,7 +10,7 @@ import org.testng.annotations.Test; @Artifact -(a)ExpectedDeploymentException(DefinitionError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @SpecVersion(spec="cdi", version="20091101") public class ConstructorHasObservesParameterTest extends AbstractJSR299Test { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/dependentWithPublicField/DependentWithPublicFieldTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/dependentWithPublicField/DependentWithPublicFieldTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/dependentWithPublicField/DependentWithPublicFieldTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -2,7 +2,7 @@ import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DefinitionError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -10,7 +10,7 @@ import org.testng.annotations.Test; @Artifact -(a)ExpectedDeploymentException(DefinitionError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @SpecVersion(spec="cdi", version="20091101") public class DependentWithPublicFieldTest extends AbstractJSR299Test { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/tooManyInitializerAnnotatedConstructors/TooManyInitializerAnnotatedConstructorsTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/tooManyInitializerAnnotatedConstructors/TooManyInitializerAnnotatedConstructorsTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/tooManyInitializerAnnotatedConstructors/TooManyInitializerAnnotatedConstructorsTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -2,7 +2,7 @@ import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DefinitionError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -10,7 +10,7 @@ import org.testng.annotations.Test; @Artifact -(a)ExpectedDeploymentException(DefinitionError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @SpecVersion(spec="cdi", version="20091101") public class TooManyInitializerAnnotatedConstructorsTest extends AbstractJSR299Test { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/unproxyable/UnproxyableManagedBeanTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/unproxyable/UnproxyableManagedBeanTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/unproxyable/UnproxyableManagedBeanTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -1,8 +1,7 @@ package org.jboss.jsr299.tck.tests.implementation.simple.lifecycle.unproxyable; -import javax.enterprise.inject.UnproxyableResolutionException; - import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -10,7 +9,7 @@ import org.testng.annotations.Test; @Artifact -(a)ExpectedDeploymentException(UnproxyableResolutionException.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @SpecVersion(spec="cdi", version="20091101") public class UnproxyableManagedBeanTest extends AbstractJSR299Test { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsNothing/DirectlyExtendsNothingTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsNothing/DirectlyExtendsNothingTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsNothing/DirectlyExtendsNothingTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -2,7 +2,7 @@ import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DefinitionError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -12,7 +12,7 @@ import org.testng.annotations.Test; @Artifact -(a)ExpectedDeploymentException(DefinitionError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @Packaging(PackagingType.EAR) @SpecVersion(spec="cdi", version="20091101") public class DirectlyExtendsNothingTest extends AbstractJSR299Test Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsSimpleBean/DirectlyExtendsSimpleBeanTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsSimpleBean/DirectlyExtendsSimpleBeanTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsSimpleBean/DirectlyExtendsSimpleBeanTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -2,7 +2,7 @@ import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DefinitionError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -13,7 +13,7 @@ @Artifact @Packaging(PackagingType.EAR) -(a)ExpectedDeploymentException(DefinitionError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @SpecVersion(spec="cdi", version="20091101") public class DirectlyExtendsSimpleBeanTest extends AbstractJSR299Test { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/implementInterfaceAndExtendsNothing/ImplementsInterfaceAndExtendsNothingTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/implementInterfaceAndExtendsNothing/ImplementsInterfaceAndExtendsNothingTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/implementInterfaceAndExtendsNothing/ImplementsInterfaceAndExtendsNothingTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -2,7 +2,7 @@ import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DefinitionError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -11,7 +11,7 @@ import org.jboss.testharness.impl.packaging.PackagingType; import org.testng.annotations.Test; -(a)ExpectedDeploymentException(DefinitionError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @Artifact @Packaging(PackagingType.EAR) @SpecVersion(spec="cdi", version="20091101") Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/sameName/SameNameTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/sameName/SameNameTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/sameName/SameNameTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -2,7 +2,7 @@ import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DefinitionError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -13,7 +13,7 @@ import org.testng.annotations.Test; @Artifact -(a)ExpectedDeploymentException(DefinitionError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @Packaging(PackagingType.EAR) @BeansXml("beans.xml") @SpecVersion(spec="cdi", version="20091101") Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -1,21 +1,19 @@ package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.broken.twoBeansSpecializeTheSameBean; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DeploymentError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.two.TwoSpecializingBeansForOneSpecializedTest; -import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.jboss.testharness.impl.packaging.Packaging; import org.jboss.testharness.impl.packaging.PackagingType; import org.jboss.testharness.impl.packaging.jsr299.BeansXml; -import org.testng.annotations.Test; @Artifact @Packaging(PackagingType.EAR) @BeansXml("beans.xml") -(a)ExpectedDeploymentException(DeploymentError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @SpecVersion(spec="cdi", version="20091018") public class TwoBeansSpecializeTheSameBeanTest extends AbstractJSR299Test { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/indirectOverride/IndirectOverrideTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/indirectOverride/IndirectOverrideTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/indirectOverride/IndirectOverrideTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -2,7 +2,7 @@ import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DefinitionError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -10,7 +10,7 @@ import org.testng.annotations.Test; @Artifact -(a)ExpectedDeploymentException(DefinitionError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @SpecVersion(spec="cdi", version="20091101") public class IndirectOverrideTest extends AbstractJSR299Test { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializesStaticMethod/SpecializesStaticMethodTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializesStaticMethod/SpecializesStaticMethodTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializesStaticMethod/SpecializesStaticMethodTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -2,7 +2,7 @@ import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DefinitionError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -10,7 +10,7 @@ import org.testng.annotations.Test; @Artifact -(a)ExpectedDeploymentException(DefinitionError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @SpecVersion(spec="cdi", version="20091101") public class SpecializesStaticMethodTest extends AbstractJSR299Test { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializingAndSpecializedBeanHaveName/SpecializingAndSpecializedBeanHaveNameTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializingAndSpecializedBeanHaveName/SpecializingAndSpecializedBeanHaveNameTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializingAndSpecializedBeanHaveName/SpecializingAndSpecializedBeanHaveNameTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -2,7 +2,7 @@ import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DefinitionError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -10,7 +10,7 @@ import org.testng.annotations.Test; @Artifact -(a)ExpectedDeploymentException(DefinitionError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @SpecVersion(spec="cdi", version="20091101") public class SpecializingAndSpecializedBeanHaveNameTest extends AbstractJSR299Test { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -1,16 +1,14 @@ package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.broken.twoBeansSpecializeTheSameBean; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DeploymentError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.two.TwoSpecializingBeansForOneSpecializedTest; -import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; -import org.testng.annotations.Test; @Artifact -(a)ExpectedDeploymentException(DeploymentError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @SpecVersion(spec="cdi", version="20091018") public class TwoBeansSpecializeTheSameBeanTest extends AbstractJSR299Test { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/SpecializingBeanExtendsEnterpriseBeanTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/SpecializingBeanExtendsEnterpriseBeanTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/SpecializingBeanExtendsEnterpriseBeanTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -2,7 +2,7 @@ import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DefinitionError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -13,7 +13,7 @@ @Artifact @Packaging(PackagingType.EAR) -(a)ExpectedDeploymentException(DefinitionError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @SpecVersion(spec="cdi", version="20091101") public class SpecializingBeanExtendsEnterpriseBeanTest extends AbstractJSR299Test { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/inconsistent/InconsistentSpecializationTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/inconsistent/InconsistentSpecializationTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/inconsistent/InconsistentSpecializationTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -17,7 +17,7 @@ package org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.inconsistent; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DeploymentError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -25,7 +25,7 @@ import org.testng.annotations.Test; @Artifact -(a)ExpectedDeploymentException(DeploymentError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @SpecVersion(spec="cdi", version="20091101") public class InconsistentSpecializationTest extends AbstractJSR299Test { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/SpecializingAndSpecializedBeanHasNameTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/SpecializingAndSpecializedBeanHasNameTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/SpecializingAndSpecializedBeanHasNameTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -2,7 +2,7 @@ import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DefinitionError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -10,7 +10,7 @@ import org.testng.annotations.Test; @Artifact -(a)ExpectedDeploymentException(DefinitionError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @SpecVersion(spec="cdi", version="20091101") public class SpecializingAndSpecializedBeanHasNameTest extends AbstractJSR299Test { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/SpecializingBeanImplementsInterfaceOnly.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/SpecializingBeanImplementsInterfaceOnly.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/SpecializingBeanImplementsInterfaceOnly.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -2,7 +2,7 @@ import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DefinitionError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -10,7 +10,7 @@ import org.testng.annotations.Test; @Artifact -(a)ExpectedDeploymentException(DefinitionError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @SpecVersion(spec="cdi", version="20091101") public class SpecializingBeanImplementsInterfaceOnly extends AbstractJSR299Test { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/SpecializingBeanExtendsNothingTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/SpecializingBeanExtendsNothingTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/SpecializingBeanExtendsNothingTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -2,7 +2,7 @@ import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DefinitionError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -10,7 +10,7 @@ import org.testng.annotations.Test; @Artifact -(a)ExpectedDeploymentException(DefinitionError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @SpecVersion(spec="cdi", version="20091101") public class SpecializingBeanExtendsNothingTest extends AbstractJSR299Test { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/SpecializingClassExtendsNonSimpleBeanTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/SpecializingClassExtendsNonSimpleBeanTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/SpecializingClassExtendsNonSimpleBeanTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -2,7 +2,7 @@ import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DefinitionError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -10,7 +10,7 @@ import org.testng.annotations.Test; @Artifact -(a)ExpectedDeploymentException(DefinitionError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @SpecVersion(spec="cdi", version="20091101") public class SpecializingClassExtendsNonSimpleBeanTest extends AbstractJSR299Test { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/TwoSpecializingBeansForOneSpecializedTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/TwoSpecializingBeansForOneSpecializedTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/TwoSpecializingBeansForOneSpecializedTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -1,16 +1,14 @@ package org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.two; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DeploymentError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.broken.twoBeansSpecializeTheSameBean.TwoBeansSpecializeTheSameBeanTest; -import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; -import org.testng.annotations.Test; @Artifact -(a)ExpectedDeploymentException(DeploymentError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @SpecVersion(spec="cdi", version="20091018") public class TwoSpecializingBeansForOneSpecializedTest extends AbstractJSR299Test { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/interceptorCanNotBeDecorator/InterceptorCanNotBeDecoratorTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/interceptorCanNotBeDecorator/InterceptorCanNotBeDecoratorTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/interceptorCanNotBeDecorator/InterceptorCanNotBeDecoratorTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.interceptors.definition.broken.interceptorCanNotBeDecorator; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DeploymentError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -10,7 +10,7 @@ import org.testng.annotations.Test; @Artifact -(a)ExpectedDeploymentException(DeploymentError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @SpecVersion(spec="cdi", version="20091101") @BeansXml("beans.xml") public class InterceptorCanNotBeDecoratorTest extends AbstractJSR299Test Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/invalidBindingAnnotations/InvalidInterceptorBindingAnnotationsTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/invalidBindingAnnotations/InvalidInterceptorBindingAnnotationsTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/invalidBindingAnnotations/InvalidInterceptorBindingAnnotationsTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.interceptors.definition.broken.invalidBindingAnnotations; -import org.jboss.jsr299.tck.DeploymentError; import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -10,7 +10,7 @@ import org.testng.annotations.Test; @Artifact -(a)ExpectedDeploymentException(DeploymentError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @SpecVersion(spec="cdi", version="20091101") @BeansXml("beans.xml") public class InvalidInterceptorBindingAnnotationsTest extends AbstractJSR299Test Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/invalidLifecycleInterceptor/InvalidLifecycleInterceptorTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/invalidLifecycleInterceptor/InvalidLifecycleInterceptorTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/invalidLifecycleInterceptor/InvalidLifecycleInterceptorTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.interceptors.definition.broken.invalidLifecycleInterceptor; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DeploymentError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -10,7 +10,7 @@ import org.testng.annotations.Test; @Artifact -(a)ExpectedDeploymentException(DeploymentError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @SpecVersion(spec="cdi", version="20091101") @BeansXml("beans.xml") public class InvalidLifecycleInterceptorTest extends AbstractJSR299Test Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/nonExistantClassInBeansXml/NonExistantClassInBeansXmlTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/nonExistantClassInBeansXml/NonExistantClassInBeansXmlTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/nonExistantClassInBeansXml/NonExistantClassInBeansXmlTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.interceptors.definition.broken.nonExistantClassInBeansXml; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DeploymentError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -10,7 +10,7 @@ import org.testng.annotations.Test; @Artifact -(a)ExpectedDeploymentException(DeploymentError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @SpecVersion(spec="cdi", version="20091101") @BeansXml("beans.xml") public class NonExistantClassInBeansXmlTest extends AbstractJSR299Test Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/nonInterceptorClassInBeansXml/NonInterceptorClassInBeansXmlTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/nonInterceptorClassInBeansXml/NonInterceptorClassInBeansXmlTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/nonInterceptorClassInBeansXml/NonInterceptorClassInBeansXmlTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.interceptors.definition.broken.nonInterceptorClassInBeansXml; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DeploymentError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -10,7 +10,7 @@ import org.testng.annotations.Test; @Artifact -(a)ExpectedDeploymentException(DeploymentError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @SpecVersion(spec="cdi", version="20091101") @BeansXml("beans.xml") public class NonInterceptorClassInBeansXmlTest extends AbstractJSR299Test Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/sameClassListedTwiceInBeansXml/FordInterceptor.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/sameClassListedTwiceInBeansXml/FordInterceptor.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/sameClassListedTwiceInBeansXml/FordInterceptor.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -1,8 +1,8 @@ package org.jboss.jsr299.tck.tests.interceptors.definition.broken.sameClassListedTwiceInBeansXml; import javax.interceptor.AroundInvoke; +import javax.interceptor.Interceptor; import javax.interceptor.InvocationContext; -import javax.interceptor.Interceptor; @Interceptor @Transactional class FordInterceptor Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/sameClassListedTwiceInBeansXml/SameClassListedTwiceInBeansXmlTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/sameClassListedTwiceInBeansXml/SameClassListedTwiceInBeansXmlTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/sameClassListedTwiceInBeansXml/SameClassListedTwiceInBeansXmlTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.interceptors.definition.broken.sameClassListedTwiceInBeansXml; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DeploymentError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -10,7 +10,7 @@ import org.testng.annotations.Test; @Artifact -(a)ExpectedDeploymentException(DeploymentError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @SpecVersion(spec="cdi", version="20091101") @BeansXml("beans.xml") public class SameClassListedTwiceInBeansXmlTest extends AbstractJSR299Test Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/custom/AfterBeanDiscoveryObserver.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/custom/AfterBeanDiscoveryObserver.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/custom/AfterBeanDiscoveryObserver.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -1,9 +1,15 @@ package org.jboss.jsr299.tck.tests.interceptors.definition.custom; +import static javax.enterprise.inject.spi.InterceptionType.AROUND_INVOKE; +import static javax.enterprise.inject.spi.InterceptionType.AROUND_TIMEOUT; +import static javax.enterprise.inject.spi.InterceptionType.POST_ACTIVATE; +import static javax.enterprise.inject.spi.InterceptionType.POST_CONSTRUCT; +import static javax.enterprise.inject.spi.InterceptionType.PRE_DESTROY; +import static javax.enterprise.inject.spi.InterceptionType.PRE_PASSIVATE; + import javax.enterprise.event.Observes; import javax.enterprise.inject.spi.AfterBeanDiscovery; import javax.enterprise.inject.spi.Extension; -import static javax.enterprise.inject.spi.InterceptionType.*; public class AfterBeanDiscoveryObserver implements Extension Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/custom/CustomInterceptorTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/custom/CustomInterceptorTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/custom/CustomInterceptorTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -16,7 +16,12 @@ */ package org.jboss.jsr299.tck.tests.interceptors.definition.custom; -import static javax.enterprise.inject.spi.InterceptionType.*; +import static javax.enterprise.inject.spi.InterceptionType.AROUND_INVOKE; +import static javax.enterprise.inject.spi.InterceptionType.AROUND_TIMEOUT; +import static javax.enterprise.inject.spi.InterceptionType.POST_ACTIVATE; +import static javax.enterprise.inject.spi.InterceptionType.POST_CONSTRUCT; +import static javax.enterprise.inject.spi.InterceptionType.PRE_DESTROY; +import static javax.enterprise.inject.spi.InterceptionType.PRE_PASSIVATE; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.test.audit.annotations.SpecAssertion; Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorCalledBeforeDecorator/InterceptorCalledBeforeDecoratorTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorCalledBeforeDecorator/InterceptorCalledBeforeDecoratorTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorCalledBeforeDecorator/InterceptorCalledBeforeDecoratorTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -5,7 +5,6 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.jsr299.BeansXml; - import org.testng.annotations.Test; @Artifact Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorCalledBeforeDecorator/TransactionInterceptor.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorCalledBeforeDecorator/TransactionInterceptor.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorCalledBeforeDecorator/TransactionInterceptor.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -1,7 +1,6 @@ package org.jboss.jsr299.tck.tests.interceptors.definition.interceptorCalledBeforeDecorator; import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; import javax.interceptor.InvocationContext; public class TransactionInterceptor Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorNotListedInBeansXml/Transactional.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorNotListedInBeansXml/Transactional.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorNotListedInBeansXml/Transactional.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -1,8 +1,6 @@ package org.jboss.jsr299.tck.tests.interceptors.definition.interceptorNotListedInBeansXml; -import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorOrder/Foo.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorOrder/Foo.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorOrder/Foo.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -1,6 +1,5 @@ package org.jboss.jsr299.tck.tests.interceptors.definition.interceptorOrder; -import javax.interceptor.Interceptors; @Secure class Foo Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorOrder/Secure.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorOrder/Secure.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorOrder/Secure.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -1,8 +1,6 @@ package org.jboss.jsr299.tck.tests.interceptors.definition.interceptorOrder; -import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorOrder/Transactional.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorOrder/Transactional.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorOrder/Transactional.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -1,8 +1,6 @@ package org.jboss.jsr299.tck.tests.interceptors.definition.interceptorOrder; -import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/multipleBindings/Slow.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/multipleBindings/Slow.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/multipleBindings/Slow.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -1,12 +1,11 @@ package org.jboss.jsr299.tck.tests.interceptors.definition.multipleBindings; -import java.lang.annotation.Documented; -import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; import static java.lang.annotation.ElementType.TYPE; -import java.lang.annotation.Retention; import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; import java.lang.annotation.Target; import javax.interceptor.InterceptorBinding; Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/binding/members/annotation/BindingAnnotationWithMemberTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/binding/members/annotation/BindingAnnotationWithMemberTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/binding/members/annotation/BindingAnnotationWithMemberTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -17,7 +17,7 @@ package org.jboss.jsr299.tck.tests.lookup.binding.members.annotation; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DefinitionError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -25,7 +25,7 @@ import org.testng.annotations.Test; @Artifact -(a)ExpectedDeploymentException(DefinitionError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @SpecVersion(spec="cdi", version="20091101") public class BindingAnnotationWithMemberTest extends AbstractJSR299Test { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/binding/members/array/BindingAnnotationWithMemberTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/binding/members/array/BindingAnnotationWithMemberTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/binding/members/array/BindingAnnotationWithMemberTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -17,7 +17,7 @@ package org.jboss.jsr299.tck.tests.lookup.binding.members.array; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DefinitionError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -25,7 +25,7 @@ import org.testng.annotations.Test; @Artifact -(a)ExpectedDeploymentException(DefinitionError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @SpecVersion(spec="cdi", version="20091101") public class BindingAnnotationWithMemberTest extends AbstractJSR299Test { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicateNameResolution/DuplicateNameResolutionTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicateNameResolution/DuplicateNameResolutionTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicateNameResolution/DuplicateNameResolutionTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -18,7 +18,7 @@ package org.jboss.jsr299.tck.tests.lookup.byname.duplicateNameResolution; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DeploymentError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -26,7 +26,7 @@ import org.testng.annotations.Test; @Artifact -(a)ExpectedDeploymentException(DeploymentError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @SpecVersion(spec="cdi", version="20091101") public class DuplicateNameResolutionTest extends AbstractJSR299Test { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicatePrefixResolution/DuplicateNamePrefixResolutionTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicatePrefixResolution/DuplicateNamePrefixResolutionTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicatePrefixResolution/DuplicateNamePrefixResolutionTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -18,7 +18,7 @@ package org.jboss.jsr299.tck.tests.lookup.byname.duplicatePrefixResolution; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DeploymentError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -26,7 +26,7 @@ import org.testng.annotations.Test; @Artifact -(a)ExpectedDeploymentException(DeploymentError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @SpecVersion(spec="cdi", version="20091101") public class DuplicateNamePrefixResolutionTest extends AbstractJSR299Test { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/array/ArrayTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/array/ArrayTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/array/ArrayTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -17,7 +17,7 @@ package org.jboss.jsr299.tck.tests.lookup.clientProxy.unproxyable.array; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DeploymentError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; @@ -29,7 +29,7 @@ * Test for problem detection of array injection. */ @Artifact -(a)ExpectedDeploymentException(DeploymentError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @SpecVersion(spec="cdi", version="20091101") public class ArrayTest extends AbstractJSR299Test { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/finalClass/FinalClassTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/finalClass/FinalClassTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/finalClass/FinalClassTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -17,7 +17,7 @@ package org.jboss.jsr299.tck.tests.lookup.clientProxy.unproxyable.finalClass; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DeploymentError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -25,7 +25,7 @@ import org.testng.annotations.Test; @Artifact -(a)ExpectedDeploymentException(DeploymentError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @SpecVersion(spec="cdi", version="20091101") public class FinalClassTest extends AbstractJSR299Test { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/finalMethod/FinalMethodTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/finalMethod/FinalMethodTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/finalMethod/FinalMethodTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -17,7 +17,7 @@ package org.jboss.jsr299.tck.tests.lookup.clientProxy.unproxyable.finalMethod; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DeploymentError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -25,7 +25,7 @@ import org.testng.annotations.Test; @Artifact -(a)ExpectedDeploymentException(DeploymentError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @SpecVersion(spec="cdi", version="20091101") public class FinalMethodTest extends AbstractJSR299Test { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/primitive/UnproxyableTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/primitive/UnproxyableTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/primitive/UnproxyableTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -17,7 +17,7 @@ package org.jboss.jsr299.tck.tests.lookup.clientProxy.unproxyable.primitive; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DeploymentError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -25,7 +25,7 @@ import org.testng.annotations.Test; @Artifact -(a)ExpectedDeploymentException(DeploymentError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @SpecVersion(spec="cdi", version="20091101") public class UnproxyableTest extends AbstractJSR299Test { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/privateConstructor/PrivateConstructorTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/privateConstructor/PrivateConstructorTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/privateConstructor/PrivateConstructorTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -17,7 +17,7 @@ package org.jboss.jsr299.tck.tests.lookup.clientProxy.unproxyable.privateConstructor; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DeploymentError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -29,7 +29,7 @@ * Test for problem detection of unproxyable bean with private constructor. */ @Artifact -(a)ExpectedDeploymentException(DeploymentError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @SpecVersion(spec="cdi", version="20091101") public class PrivateConstructorTest extends AbstractJSR299Test { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/broken/ambiguous/AmbiguousDependencyTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/broken/ambiguous/AmbiguousDependencyTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/broken/ambiguous/AmbiguousDependencyTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -17,7 +17,7 @@ package org.jboss.jsr299.tck.tests.lookup.dependency.resolution.broken.ambiguous; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DeploymentError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -25,7 +25,7 @@ import org.testng.annotations.Test; @Artifact -(a)ExpectedDeploymentException(DeploymentError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @SpecVersion(spec="cdi", version="20091101") public class AmbiguousDependencyTest extends AbstractJSR299Test { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/broken/unsatisfied/UnsatisfiedDependencyTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/broken/unsatisfied/UnsatisfiedDependencyTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/broken/unsatisfied/UnsatisfiedDependencyTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -17,7 +17,7 @@ package org.jboss.jsr299.tck.tests.lookup.dependency.resolution.broken.unsatisfied; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DeploymentError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -25,7 +25,7 @@ import org.testng.annotations.Test; @Artifact -(a)ExpectedDeploymentException(DeploymentError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @SpecVersion(spec="cdi", version="20091101") public class UnsatisfiedDependencyTest extends AbstractJSR299Test { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/nullableBean/NullableBeanTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/nullableBean/NullableBeanTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/nullableBean/NullableBeanTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.lookup.injection.nullableBean; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DeploymentError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -9,7 +9,7 @@ import org.testng.annotations.Test; @Artifact -(a)ExpectedDeploymentException(DeploymentError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @SpecVersion(spec="cdi", version="20091101") public class NullableBeanTest extends AbstractJSR299Test { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/broken/normal/scope/NormalScopedBeanWithInjectionPoint.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/broken/normal/scope/NormalScopedBeanWithInjectionPoint.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/broken/normal/scope/NormalScopedBeanWithInjectionPoint.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -17,7 +17,7 @@ package org.jboss.jsr299.tck.tests.lookup.injectionpoint.broken.normal.scope; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DefinitionError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -25,7 +25,7 @@ import org.testng.annotations.Test; @Artifact -(a)ExpectedDeploymentException(DefinitionError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @SpecVersion(spec="cdi", version="20091101") public class NormalScopedBeanWithInjectionPoint extends AbstractJSR299Test { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/broken/not/bean/InjectionPointTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/broken/not/bean/InjectionPointTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/broken/not/bean/InjectionPointTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -17,7 +17,7 @@ package org.jboss.jsr299.tck.tests.lookup.injectionpoint.broken.not.bean; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DefinitionError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -29,7 +29,7 @@ @Artifact @SpecVersion(spec="cdi", version="20091101") -(a)ExpectedDeploymentException(DefinitionError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @IntegrationTest @Resource(destination = WarArtifactDescriptor.WEB_XML_DESTINATION, source = "web.xml") public class InjectionPointTest extends AbstractJSR299Test Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/broken/primitive/PrimitiveInjectionPointTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/broken/primitive/PrimitiveInjectionPointTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/broken/primitive/PrimitiveInjectionPointTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -17,7 +17,7 @@ package org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.broken.primitive; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DeploymentError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -25,7 +25,7 @@ import org.testng.annotations.Test; @Artifact -(a)ExpectedDeploymentException(DeploymentError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @SpecVersion(spec="cdi", version="20091101") public class PrimitiveInjectionPointTest extends AbstractJSR299Test { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/broken/type/variable/TypeVariableInjectionPointTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/broken/type/variable/TypeVariableInjectionPointTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/broken/type/variable/TypeVariableInjectionPointTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -17,7 +17,7 @@ package org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.broken.type.variable; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DefinitionError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -25,7 +25,7 @@ import org.testng.annotations.Test; @Artifact -(a)ExpectedDeploymentException(DefinitionError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @SpecVersion(spec="cdi", version="20091101") public class TypeVariableInjectionPointTest extends AbstractJSR299Test { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/incorrect/name/NoClassWithSpecifiedNameTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/incorrect/name/NoClassWithSpecifiedNameTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/incorrect/name/NoClassWithSpecifiedNameTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -17,7 +17,7 @@ package org.jboss.jsr299.tck.tests.policy.broken.incorrect.name; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DeploymentError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -27,7 +27,7 @@ @Artifact @BeansXml("beans.xml") -(a)ExpectedDeploymentException(DeploymentError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @SpecVersion(spec="cdi", version="20091101") public class NoClassWithSpecifiedNameTest extends AbstractJSR299Test { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/incorrect/name/stereotype/NoAnnotationWithSpecifiedNameTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/incorrect/name/stereotype/NoAnnotationWithSpecifiedNameTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/incorrect/name/stereotype/NoAnnotationWithSpecifiedNameTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -17,7 +17,7 @@ package org.jboss.jsr299.tck.tests.policy.broken.incorrect.name.stereotype; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DeploymentError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -27,7 +27,7 @@ @Artifact @BeansXml("beans.xml") -(a)ExpectedDeploymentException(DeploymentError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @SpecVersion(spec="cdi", version="20091101") public class NoAnnotationWithSpecifiedNameTest extends AbstractJSR299Test { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/not/policy/ClassIsNotPolicyTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/not/policy/ClassIsNotPolicyTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/not/policy/ClassIsNotPolicyTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -17,7 +17,7 @@ package org.jboss.jsr299.tck.tests.policy.broken.not.policy; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DeploymentError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -27,7 +27,7 @@ @Artifact @BeansXml("beans.xml") -(a)ExpectedDeploymentException(DeploymentError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @SpecVersion(spec="cdi", version="20091101") public class ClassIsNotPolicyTest extends AbstractJSR299Test { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/not/policy/stereotype/ClassIsNotPolicyTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/not/policy/stereotype/ClassIsNotPolicyTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/not/policy/stereotype/ClassIsNotPolicyTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -17,7 +17,7 @@ package org.jboss.jsr299.tck.tests.policy.broken.not.policy.stereotype; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DeploymentError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -27,7 +27,7 @@ @Artifact @BeansXml("beans.xml") -(a)ExpectedDeploymentException(DeploymentError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @SpecVersion(spec="cdi", version="20091101") public class ClassIsNotPolicyTest extends AbstractJSR299Test { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/same/type/twice/SameTypeListedTwiceTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/same/type/twice/SameTypeListedTwiceTest.java 2009-11-10 13:13:57 UTC (rev 4952) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/same/type/twice/SameTypeListedTwiceTest.java 2009-11-10 13:30:32 UTC (rev 4953) @@ -17,7 +17,7 @@ package org.jboss.jsr299.tck.tests.policy.broken.same.type.twice; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DeploymentError; +import org.jboss.jsr299.tck.DeploymentFailure; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; @@ -27,7 +27,7 @@ @Artifact @BeansXml("beans.xml") -(a)ExpectedDeploymentException(DeploymentError.class) +(a)ExpectedDeploymentException(DeploymentFailure.class) @SpecVersion(spec="cdi", version="20091101") public class SameTypeListedTwiceTest extends AbstractJSR299Test {