weld-commits July 2009

weld-commits@lists.jboss.org

1 participants
446 discussions

[webbeans-commits] Webbeans SVN: r3269 - in tck/trunk: api/src/main/java/org/jboss/jsr299/tck/spi and 181 other directories.

by webbeans-commits＠lists.jboss.org

Author: shane.bryzak(a)jboss.com Date: 2009-07-27 09:55:14 -0400 (Mon, 27 Jul 2009) New Revision: 3269 Modified: tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/Beans.java tck/trunk/impl/pom.xml tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/DefinitionError.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/DeploymentError.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/ContextTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/DestroyedInstanceReturnedByGetTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/GetFromContextualTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/GetOnInactiveContextTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/GetWithNoCreationalContextTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/InactiveContextTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/NormalContextTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ApplicationContextTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ejb/EJBApplicationContextTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationBeginTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationContextTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationEndTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationIdSetByApplicationTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationIdSetByContainerTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationTimeoutTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ClientConversationContextTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/Cloud.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ConversationStatusServlet.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ConversationTestPhaseListener.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/InvalidatingSessionDestroysConversationTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/LongRunningConversationPropagatedByFacesContextTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ManualCidPropagationTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/Storm.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/DependentContextTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/SpiderProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/DependentContextEjbTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/Horse.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/Stable.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/PassivatingContextTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/SerializableCity.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken10/UnserializableSimpleInjectedIntoPassivatingEnterpriseBeanTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken11/EnterpriseBeanWithIllegalDependencyTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken2/NonSerializableTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken6/NonSerializableTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken7/NonSerializableTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken8/NonSerializableTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken9/NonSerializableTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/RequestContextTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/ejb/EJBRequestContextTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/SessionContextTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/DecoratorDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/FooBarImpl.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/FooDecorator.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/enabledDecoratorIsNotDecorator/EnabledDecoratorNotADecoratorTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanClass/FinalBeanClassTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanMethod/FinalBeanMethodTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/multipleDelegateInjectionPoints/MultipleDelegateInjectionPointsTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/noDelegateInjectionPoints/NoDelegateInjectionPointsTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/notAllDecoratedTypesImplemented/NotAllDecoratedTypesImplementedTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/DecoratorInvocationTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/BeanDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/BindingDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/DefangedTarantula.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/EnterpriseBindingDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/NameDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/ScopeDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken/tooManyScopes/TooManyScopesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/enterprise/EnterpriseScopeDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/Chihuahua.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/MexicanChihuahua.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/ShortHairedDog.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/StereotypeDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/nonEmptyNamed/NonEmptyNamedTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/scopeConflict/IncompatibleStereotypesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/tooManyScopes/TooManyScopeTypesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/withBindingType/StereoTypeWithBindingTypesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/defaultNamed/DefaultNamedTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/Chihuahua.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/EnterpriseStereotypeDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/MexicanChihuahua.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/ShortHairedDog.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/resolvedScopeConflict/ResolvedStereotypeScopeConflictTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/DeploymentTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/ExtensionsTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDefinitionError/AddDefinitionErrorTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDeploymentProblem/AddDeploymentProblemTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/beanDiscoveryMethodThrowsException/BeforeBeanDiscoveryThrowsExceptionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanDiscoveryObserver/AfterBeanDiscoveryObserverExecutionFailureTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanDiscoveryObserver/FooException.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanValidationObserver/AfterDeploymentValidationObserverExecutionFailureTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringBeanDiscovery/DeploymentFailureTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringValidation/AfterBeanDiscoveryFailureTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/normalScope/AddingNormalScopeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/passivatingScope/AddingPassivatingScopeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/useBeforeValidationFails/ManagerObserver.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/useBeforeValidationFails/UseBeforeValidationTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/bindingTypes/EventBindingTypesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/inject/withTypeVariable/EventInjectionWithUndefinedTypeVariableTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/inject/withWildcardType/EventInjectionWithWildcardTypeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/beanNotManaged/ObserverMethodOnIncorrectBeanTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isDisposer/ObserverMethodAnnotatedDisposesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isInitializer/ObserverMethodAnnotatedInitialzerTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isProducer/ObserverMethodAnnotatedProducesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/notBusinessMethod/EJBObserverMethodNotBusinessMethodTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/tooManyParameters/ObserverMethodWithTwoEventParametersTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer8/AsynchronousBeforeCompletionObserverTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/eventTypes/EventTypesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/FireEventTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/nonbinding/NonBindingTypePassedToFireTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/implicit/ImplicitEventTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/ObserverTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/abortProcessing/ObserverExceptionAbortsProcessingTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/checkedException/CheckedExceptionWrappedTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/EnterpriseEventInheritenceTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/runtimeException/ObserverExceptionRethrownTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/wildcardAndTypeVariable/ObserverMethodWithParametertizedTypeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/DuplicateBindingTypesWhenResolvingTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/ResolvingChecksBindingTypeMembersTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/nonbinding/NonBindingTypesWhenResolvingTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/typeWithParameters/CheckTypeParametersWhenResolvingObserversTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/typeWithParameters/ChecksEventTypeWhenResolvingTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/select/SelectEventTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/transactionalObservers/EventTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DisposalMethodDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/InitializerUnallowedDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/methodOnSessionBean/DisposalMethodOnSessionBean.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multiParams/MultipleDisposeParametersDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/observesUnallowed/ObserverParameterUnallowedDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/producesUnallowed/ProducesUnallowedDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/UnresolvedDisposalMethodDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithConversationScope/SingletonWithConversationScopeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithRequestScope/SingletonWithRequestScopeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithSessionScope/IrishTerrier_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithSessionScope/SingletonWithSessionScopeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithApplicationScope/StatelessWithApplicationScopeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithConversationScope/StatelessWithConversationScopeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithRequestScope/StatelessWithRequestScopeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithSessionScope/StatelessWithSessionScopeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanViaXmlTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanICTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/EnterpriseBeanRemoveMethodTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/StateKeeper.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/EjbInitializerMethodTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/InitializerMethodTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/methodAnnotatedProduces/MethodAnnotatedProducesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/staticInitializer/StaticInitializerTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/ProducerFieldDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/TameTarantulaProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/parameterizedReturnTypeWithWildcard/ParameterizedReturnTypeWithWildcardTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/enterprise/EnterpriseProducerFieldDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/ProducerFieldLifecycleTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/enterprise/nonbusiness/ProducerMethodNotBusinessMethodTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithTypeParameter/ParameterizedTypeWithTypeParameterTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithTypeParameter2/ParameterizedTypeWithTypeParameterTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithWildcard/PamaterizedTypeWithWildcardTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/LadybirdSpider.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/ProducerMethodDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/FooException.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/ProducerMethodLifecycleTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/MockEnterpriseBean.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasDisposesParameter/ConstructorHasDisposesParameterTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasObservesParameter/ConstructorHasObservesParameterTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/dependentWithPublicField/DependentWithPublicFieldTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/tooManyInitializerAnnotatedConstructors/TooManyInitializerAnnotatedConstructorsTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/FooException.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/NewSimpleBeanTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/EjbInjectionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/Monitor.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/env/EnvInjectionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/PersistenceContextInjectionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/InjectionOfResourceTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationIntegrationTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsNothing/DirectlyExtendsNothingTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsSimpleBean/DirectlyExtendsSimpleBeanTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/implementInterfaceAndExtendsNothing/ImplementsInterfaceAndExtendsNothingTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/sameName/SameNameTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/ProducerMethodSpecializationTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/indirectOverride/IndirectOverrideTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializesStaticMethod/SpecializesStaticMethodTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializingAndSpecializedBeanHaveName/SpecializingAndSpecializedBeanHaveNameTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/SimpleBeanSpecializationTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/SpecializingBeanExtendsEnterpriseBeanTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/SpecializingAndSpecializedBeanHasNameTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/SpecializingBeanImplementsInterfaceOnly.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/SpecializingBeanExtendsNothingTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/SpecializingClassExtendsNonSimpleBeanTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/TwoSpecializingBeansForOneSpecializedTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/InterceptorDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/binding/members/annotation/BindingAnnotationWithMemberTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/binding/members/array/BindingAnnotationWithMemberTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/ResolutionByNameTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicateNameResolution/DuplicateNameResolutionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicatePrefixResolution/DuplicateNamePrefixResolutionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/circular/CircularDependencyTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/ClientProxyTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/array/ArrayTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/finalClass/FinalClassTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/finalMethod/FinalMethodTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/primitive/UnproxyableTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/privateConstructor/PrivateConstructorTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/DependencyResolutionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/broken/ambiguous/AmbiguousDependencyTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/broken/unsatisfied/UnsatisfiedDependencyTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/DynamicLookupTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/builtin/BuiltinInstanceTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/el/ResolutionByNameTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/InjectionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/nullableBean/NullableBeanTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/InjectableReferenceTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/InjectionPointTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/broken/normal/scope/NormalScopedBeanWithInjectionPoint.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/broken/not/bean/InjectionPointOnNonBeanTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/ManagerTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/jndi/ManagerTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/broken/primitive/PrimitiveInjectionPointTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/broken/type/variable/TypeVariableInjectionPointTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/parameterized/AssignabilityOfRawAndParameterizedTypesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/PolicyAvailabilityTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/incorrect/name/NoClassWithSpecifiedNameTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/incorrect/name/stereotype/NoAnnotationWithSpecifiedNameTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/not/policy/ClassIsNotPolicyTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/not/policy/stereotype/ClassIsNotPolicyTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/same/type/twice/SameTypeListedTwiceTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/enterprise/SessionBeanPolicyTest.java tck/trunk/pom.xml Log: Added @SpecVersion to test classes Modified: tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/Beans.java =================================================================== --- tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/Beans.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/Beans.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -1,8 +1,5 @@ package org.jboss.jsr299.tck.spi; -import javax.enterprise.inject.spi.Bean; - - /** * Provides Bean related operations. * Modified: tck/trunk/impl/pom.xml =================================================================== --- tck/trunk/impl/pom.xml 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/pom.xml 2009-07-27 13:55:14 UTC (rev 3269) @@ -44,8 +44,8 @@ </dependency> <dependency> - <groupId>org.hibernate</groupId> - <artifactId>tck-utils-api</artifactId> + <groupId>org.jboss.test-audit</groupId> + <artifactId>jboss-test-audit-api</artifactId> </dependency> <dependency> @@ -177,8 +177,8 @@ </activation> <dependencies> <dependency> - <groupId>org.hibernate</groupId> - <artifactId>tck-utils-impl</artifactId> + <groupId>org.jboss.test-audit</groupId> + <artifactId>jboss-test-audit-impl</artifactId> </dependency> </dependencies> <build> Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/DefinitionError.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/DefinitionError.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/DefinitionError.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -10,7 +10,12 @@ public class DefinitionError extends RuntimeException { - public DefinitionError() + /** + * + */ + private static final long serialVersionUID = 3544233876045340712L; + +public DefinitionError() { super(); } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/DeploymentError.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/DeploymentError.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/DeploymentError.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -10,7 +10,12 @@ public class DeploymentError extends RuntimeException { - public DeploymentError() + /** + * + */ + private static final long serialVersionUID = 6495327942053526437L; + +public DeploymentError() { super(); } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/ContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/ContextTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/ContextTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -7,16 +7,15 @@ import javax.enterprise.context.SessionScoped; import javax.enterprise.context.spi.Context; -import org.hibernate.tck.annotations.SpecAssertion; -import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.testharness.impl.packaging.Artifact; import org.testng.annotations.Test; -/** - * Spec version: 20090625 - */ @Artifact +@SpecVersion("20090625") public class ContextTest extends AbstractJSR299Test { @Test(expectedExceptions = { IllegalStateException.class }, groups = { "manager" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/DestroyedInstanceReturnedByGetTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/DestroyedInstanceReturnedByGetTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/DestroyedInstanceReturnedByGetTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -5,16 +5,15 @@ import javax.enterprise.context.spi.CreationalContext; import javax.enterprise.inject.spi.Bean; -import org.hibernate.tck.annotations.SpecAssertion; -import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.testharness.impl.packaging.Artifact; import org.testng.annotations.Test; -/** - * Spec version: 20090625 - */ @Artifact +@SpecVersion("20090625") public class DestroyedInstanceReturnedByGetTest extends AbstractJSR299Test { @Test(groups = { "contexts" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/GetFromContextualTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/GetFromContextualTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/GetFromContextualTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -5,17 +5,16 @@ import javax.enterprise.context.spi.Contextual; import javax.enterprise.context.spi.CreationalContext; -import org.hibernate.tck.annotations.SpecAssertion; -import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.impl.MockCreationalContext; import org.jboss.testharness.impl.packaging.Artifact; import org.testng.annotations.Test; -/** - * Spec version: 20090625 - */ @Artifact +@SpecVersion("20090625") public class GetFromContextualTest extends AbstractJSR299Test { @Test(groups = { "contexts" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/GetOnInactiveContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/GetOnInactiveContextTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/GetOnInactiveContextTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -5,15 +5,14 @@ import javax.enterprise.context.spi.Context; import javax.enterprise.context.spi.Contextual; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.testharness.impl.packaging.Artifact; import org.testng.annotations.Test; -/** - * Spec version: 20090625 - */ @Artifact +@SpecVersion("20090625") public class GetOnInactiveContextTest extends AbstractJSR299Test { @Test(groups = { "contexts" }, expectedExceptions = { ContextNotActiveException.class }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/GetWithNoCreationalContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/GetWithNoCreationalContextTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/GetWithNoCreationalContextTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -3,16 +3,15 @@ import javax.enterprise.context.SessionScoped; import javax.enterprise.context.spi.Contextual; -import org.hibernate.tck.annotations.SpecAssertion; -import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.testharness.impl.packaging.Artifact; import org.testng.annotations.Test; -/** - * Spec version: 20090625 - */ @Artifact +@SpecVersion("20090625") public class GetWithNoCreationalContextTest extends AbstractJSR299Test { @Test(groups = { "contexts" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/InactiveContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/InactiveContextTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/InactiveContextTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -3,15 +3,14 @@ import javax.enterprise.context.ContextNotActiveException; import javax.enterprise.context.RequestScoped; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.testharness.impl.packaging.Artifact; import org.testng.annotations.Test; -/** - * Spec version: 20090519 - */ @Artifact +@SpecVersion("20090519") public class InactiveContextTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/NormalContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/NormalContextTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/NormalContextTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -5,21 +5,22 @@ import javax.enterprise.context.spi.CreationalContext; import javax.enterprise.inject.spi.Bean; -import org.hibernate.tck.annotations.SpecAssertion; -import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.impl.MockCreationalContext; import org.jboss.testharness.impl.packaging.Artifact; import org.testng.annotations.Test; /** - * Spec version: 20090519 * * @author Nicklas Karlsson * @author Pete Muir * @author David Allen */ @Artifact +@SpecVersion("20090519") public class NormalContextTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ApplicationContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ApplicationContextTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ApplicationContextTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -1,6 +1,7 @@ package org.jboss.jsr299.tck.tests.context.application; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.IntegrationTest; @@ -14,8 +15,6 @@ /** * @author David Allen - * - * Spec version: 20090625 */ @Artifact @IntegrationTest(runLocally=true) @@ -23,6 +22,7 @@ @Resource(destination=WarArtifactDescriptor.WEB_XML_DESTINATION, source="web.xml"), @Resource(destination="SimplePage.html", source="SimplePage.html") }) +@SpecVersion("20090625") public class ApplicationContextTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ejb/EJBApplicationContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ejb/EJBApplicationContextTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ejb/EJBApplicationContextTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -1,6 +1,7 @@ package org.jboss.jsr299.tck.tests.context.application.ejb; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.IntegrationTest; @@ -12,12 +13,11 @@ * EJB and related tests with the built-in application context. * * @author David Allen - * - * Spec version: 20090625 */ @Artifact @IntegrationTest @Packaging(PackagingType.EAR) +@SpecVersion("20090625") public class EJBApplicationContextTest extends AbstractJSR299Test { @Test(groups = { "broken", "contexts", "webservice", "integration" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationBeginTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationBeginTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationBeginTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -2,17 +2,17 @@ import javax.enterprise.context.Conversation; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.testharness.impl.packaging.Artifact; import org.testng.annotations.Test; /** * @author Nicklas Karlsson - * - * Spec version: 20090625 */ @Artifact +@SpecVersion("20090625") public class ConversationBeginTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationContextTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationContextTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -6,17 +6,17 @@ import javax.enterprise.context.RequestScoped; import javax.enterprise.inject.Current; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.testharness.impl.packaging.Artifact; import org.testng.annotations.Test; /** * @author Nicklas Karlsson - * - * Spec version: 20090625 */ @Artifact +@SpecVersion("20090625") public class ConversationContextTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationEndTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationEndTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationEndTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -2,18 +2,18 @@ import javax.enterprise.context.Conversation; -import org.hibernate.tck.annotations.SpecAssertion; -import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.testharness.impl.packaging.Artifact; import org.testng.annotations.Test; /** * @author Nicklas Karlsson - * - * Spec version: 20090625 */ @Artifact +@SpecVersion("20090625") public class ConversationEndTest extends AbstractJSR299Test { @Override Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationIdSetByApplicationTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationIdSetByApplicationTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationIdSetByApplicationTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -2,18 +2,18 @@ import javax.enterprise.context.Conversation; -import org.hibernate.tck.annotations.SpecAssertion; -import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.testharness.impl.packaging.Artifact; import org.testng.annotations.Test; /** * @author Nicklas Karlsson - * - * Spec version: 20090625 */ @Artifact +@SpecVersion("20090625") public class ConversationIdSetByApplicationTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationIdSetByContainerTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationIdSetByContainerTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationIdSetByContainerTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -2,8 +2,9 @@ import javax.enterprise.context.Conversation; -import org.hibernate.tck.annotations.SpecAssertion; -import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.testharness.impl.packaging.Artifact; import org.testng.annotations.Test; @@ -11,9 +12,9 @@ /** * @author Nicklas Karlsson * - * Spec version: 20090625 */ @Artifact +@SpecVersion("20090625") public class ConversationIdSetByContainerTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationTimeoutTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationTimeoutTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationTimeoutTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -2,18 +2,18 @@ import javax.enterprise.context.Conversation; -import org.hibernate.tck.annotations.SpecAssertion; -import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.testharness.impl.packaging.Artifact; import org.testng.annotations.Test; /** * @author Dan Allen - * - * Spec version: 20090625 */ @Artifact +@SpecVersion("20090625") public class ConversationTimeoutTest extends AbstractJSR299Test { @Test Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ClientConversationContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ClientConversationContextTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ClientConversationContextTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -1,8 +1,9 @@ package org.jboss.jsr299.tck.tests.context.conversation.client; import org.apache.commons.httpclient.HttpClient; -import org.hibernate.tck.annotations.SpecAssertion; -import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.Classes; import org.jboss.testharness.impl.packaging.IntegrationTest; @@ -14,8 +15,6 @@ /** * @author Nicklas Karlsson * @author Dan Allen - * - * Spec version: 20090625 */ @Artifact(addCurrentPackage=false) @Classes({Storm.class, ConversationTestPhaseListener.class, ConversationStatusServlet.class, Cloud.class, CloudController.class}) @@ -28,6 +27,7 @@ @Resource(destination="/WEB-INF/faces-config.xml", source="faces-config.xml"), @Resource(destination="rain.jspx", source="rain.jsf") }) +@SpecVersion("20090625") public class ClientConversationContextTest extends AbstractConversationTest { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/Cloud.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/Cloud.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/Cloud.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -8,7 +8,12 @@ public @Named @ConversationScoped class Cloud implements Serializable { - public static final String NAME = Cloud.class.getName() + ".Pete"; + /** + * + */ + private static final long serialVersionUID = 5765109971012677278L; + +public static final String NAME = Cloud.class.getName() + ".Pete"; public static final String RAINED_HEADER_NAME = Cloud.class.getName() + ".rained"; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ConversationStatusServlet.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ConversationStatusServlet.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ConversationStatusServlet.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -17,7 +17,11 @@ public class ConversationStatusServlet extends HttpServlet { - @Current + /** + * + */ + private static final long serialVersionUID = 2984756941080790899L; +@Current private BeanManager beanManager; @Override Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ConversationTestPhaseListener.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ConversationTestPhaseListener.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ConversationTestPhaseListener.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -15,8 +15,13 @@ public class ConversationTestPhaseListener implements PhaseListener { - public static final String ACTIVE_BEFORE_APPLY_REQUEST_VALUES_HEADER_NAME = "org.jboss.jsr299.tck.activeBeforeApplyRequestValues"; + /** + * + */ + private static final long serialVersionUID = 1197355854770726526L; +public static final String ACTIVE_BEFORE_APPLY_REQUEST_VALUES_HEADER_NAME = "org.jboss.jsr299.tck.activeBeforeApplyRequestValues"; + private boolean activeBeforeApplyRequestValues; public void afterPhase(PhaseEvent event) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/InvalidatingSessionDestroysConversationTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/InvalidatingSessionDestroysConversationTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/InvalidatingSessionDestroysConversationTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -1,7 +1,8 @@ package org.jboss.jsr299.tck.tests.context.conversation.client; import org.apache.commons.httpclient.HttpClient; -import org.hibernate.tck.annotations.SpecAssertion; +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.Classes; import org.jboss.testharness.impl.packaging.IntegrationTest; @@ -12,8 +13,6 @@ /** * @author Nicklas Karlsson - * - * Spec version: 20090625 */ @Artifact(addCurrentPackage=false) @Classes({Storm.class, ConversationTestPhaseListener.class, ConversationStatusServlet.class, Cloud.class, CloudController.class}) @@ -24,6 +23,7 @@ @Resource(destination="clouds.jspx", source="clouds.jsf"), @Resource(destination="cloud.jspx", source="cloud.jsf") }) +@SpecVersion("20090625") public class InvalidatingSessionDestroysConversationTest extends AbstractConversationTest { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/LongRunningConversationPropagatedByFacesContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/LongRunningConversationPropagatedByFacesContextTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/LongRunningConversationPropagatedByFacesContextTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -1,6 +1,7 @@ package org.jboss.jsr299.tck.tests.context.conversation.client; -import org.hibernate.tck.annotations.SpecAssertion; +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.Classes; import org.jboss.testharness.impl.packaging.IntegrationTest; @@ -16,8 +17,6 @@ /** * @author Nicklas Karlsson - * - * Spec version: 20090625 */ @Artifact(addCurrentPackage=false) @Classes({Storm.class, ConversationTestPhaseListener.class, ConversationStatusServlet.class, Cloud.class}) @@ -29,6 +28,7 @@ @Resource(destination="thunder.jspx", source="thunder.jsf"), @Resource(destination="lightening.jspx", source="lightening.jsf") }) +@SpecVersion("20090625") public class LongRunningConversationPropagatedByFacesContextTest extends AbstractConversationTest { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ManualCidPropagationTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ManualCidPropagationTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ManualCidPropagationTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -1,7 +1,8 @@ package org.jboss.jsr299.tck.tests.context.conversation.client; import org.apache.commons.httpclient.HttpClient; -import org.hibernate.tck.annotations.SpecAssertion; +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.Classes; import org.jboss.testharness.impl.packaging.IntegrationTest; @@ -14,7 +15,6 @@ * @author Nicklas Karlsson * @author Dan Allen * - * Spec version: 20090625 */ @Artifact(addCurrentPackage=false) @Classes({Storm.class, ConversationTestPhaseListener.class, ConversationStatusServlet.class, Cloud.class, CloudController.class}) @@ -25,6 +25,7 @@ @Resource(destination="clouds.jspx", source="clouds.jsf"), @Resource(destination="/WEB-INF/faces-config.xml", source="faces-config.xml") }) +@SpecVersion("20090625") public class ManualCidPropagationTest extends AbstractConversationTest { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/Storm.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/Storm.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/Storm.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -12,7 +12,12 @@ public class Storm implements Serializable { - @Current Conversation conversation; + /** + * + */ + private static final long serialVersionUID = -1513633490356967202L; + +@Current Conversation conversation; private String strength; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/DependentContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/DependentContextTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/DependentContextTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -3,26 +3,24 @@ import java.lang.annotation.Annotation; import java.util.Set; -import javax.enterprise.context.ContextNotActiveException; import javax.enterprise.context.Dependent; import javax.enterprise.context.spi.Context; import javax.enterprise.context.spi.CreationalContext; import javax.enterprise.inject.AnnotationLiteral; import javax.enterprise.inject.spi.Bean; -import org.hibernate.tck.annotations.SpecAssertion; -import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.impl.MockCreationalContext; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.jsr299.BeansXml; import org.testng.annotations.Test; -/** - * Spec version: 20090625 - */ @Artifact @BeansXml("beans.xml") +@SpecVersion("20090625") public class DependentContextTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/SpiderProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/SpiderProducer.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/SpiderProducer.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -2,7 +2,6 @@ import javax.annotation.PreDestroy; import javax.enterprise.context.Dependent; -import javax.enterprise.inject.Any; import javax.enterprise.inject.Current; import javax.enterprise.inject.Disposes; import javax.enterprise.inject.Produces; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/DependentContextEjbTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/DependentContextEjbTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/DependentContextEjbTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -20,7 +20,8 @@ import javax.enterprise.context.spi.CreationalContext; import javax.enterprise.inject.spi.Bean; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.IntegrationTest; @@ -28,12 +29,10 @@ import org.jboss.testharness.impl.packaging.PackagingType; import org.testng.annotations.Test; -/** - * Spec version: 20090625 - */ @IntegrationTest @Packaging(PackagingType.EAR) @Artifact +@SpecVersion("20090625") public class DependentContextEjbTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/Horse.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/Horse.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/Horse.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -7,7 +7,11 @@ class Horse implements Serializable { - public static boolean destroyed; + /** + * + */ + private static final long serialVersionUID = 1417245695143239294L; +public static boolean destroyed; @PreDestroy public void preDestroy() Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/Stable.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/Stable.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/Stable.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -8,7 +8,12 @@ class Stable implements Serializable { - @Current Horse horse; + /** + * + */ + private static final long serialVersionUID = -5240670259345637799L; + +@Current Horse horse; public static boolean destroyed; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/PassivatingContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/PassivatingContextTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/PassivatingContextTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -9,8 +9,9 @@ import javax.enterprise.inject.IllegalProductException; import javax.enterprise.inject.spi.Bean; -import org.hibernate.tck.annotations.SpecAssertion; -import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.Packaging; @@ -22,12 +23,11 @@ * * @author Nicklas Karlsson * @author David Allen - * - * Spec version: 20090625 */ @Artifact @BeansXml("beans.xml") @Packaging(PackagingType.EAR) +@SpecVersion("20090625") public class PassivatingContextTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/SerializableCity.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/SerializableCity.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/SerializableCity.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -4,4 +4,9 @@ public class SerializableCity extends City implements Serializable { + + /** + * + */ + private static final long serialVersionUID = -1178747162008489924L; } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken10/UnserializableSimpleInjectedIntoPassivatingEnterpriseBeanTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken10/UnserializableSimpleInjectedIntoPassivatingEnterpriseBeanTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken10/UnserializableSimpleInjectedIntoPassivatingEnterpriseBeanTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -1,6 +1,7 @@ package org.jboss.jsr299.tck.tests.context.passivating.broken10; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DeploymentError; import org.jboss.testharness.impl.packaging.Artifact; @@ -12,6 +13,7 @@ @Artifact @Packaging(PackagingType.EAR) @ExpectedDeploymentException(DeploymentError.class) +@SpecVersion("unknown") public class UnserializableSimpleInjectedIntoPassivatingEnterpriseBeanTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken11/EnterpriseBeanWithIllegalDependencyTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken11/EnterpriseBeanWithIllegalDependencyTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken11/EnterpriseBeanWithIllegalDependencyTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -2,7 +2,8 @@ import javax.enterprise.inject.IllegalProductException; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; @@ -15,6 +16,7 @@ @IntegrationTest @Packaging(PackagingType.EAR) @ExpectedDeploymentException(IllegalProductException.class) +@SpecVersion("unknown") public class EnterpriseBeanWithIllegalDependencyTest extends AbstractJSR299Test { @Test(groups = { "contexts", "passivation", "integration"}) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken2/NonSerializableTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken2/NonSerializableTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken2/NonSerializableTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -1,7 +1,8 @@ package org.jboss.jsr299.tck.tests.context.passivating.broken2; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; @@ -13,10 +14,10 @@ * @author Nicklas Karlsson * @author David Allen * - * Spec version: PRD2 */ @Artifact @ExpectedDeploymentException(DefinitionError.class) +@SpecVersion("PRD2") public class NonSerializableTest extends AbstractJSR299Test { @Test(groups = { "contexts", "passivation" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken6/NonSerializableTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken6/NonSerializableTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken6/NonSerializableTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -1,18 +1,16 @@ package org.jboss.jsr299.tck.tests.context.passivating.broken6; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DeploymentError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; -/** - * - * Spec version: 20090625 - */ @Artifact @ExpectedDeploymentException(DeploymentError.class) +@SpecVersion("20090625") public class NonSerializableTest extends AbstractJSR299Test { @Test(groups = { "contexts", "passivation" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken7/NonSerializableTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken7/NonSerializableTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken7/NonSerializableTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -1,18 +1,16 @@ package org.jboss.jsr299.tck.tests.context.passivating.broken7; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DeploymentError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; -/** - * - * Spec version: 20090625 - */ @Artifact @ExpectedDeploymentException(DeploymentError.class) +@SpecVersion("20090625") public class NonSerializableTest extends AbstractJSR299Test { @Test(groups = { "contexts", "passivation" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken8/NonSerializableTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken8/NonSerializableTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken8/NonSerializableTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -1,18 +1,16 @@ package org.jboss.jsr299.tck.tests.context.passivating.broken8; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DeploymentError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; -/** - * - * Spec version: 20090625 - */ @Artifact @ExpectedDeploymentException(DeploymentError.class) +@SpecVersion("20090625") public class NonSerializableTest extends AbstractJSR299Test { @Test(groups = { "contexts", "passivation" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken9/NonSerializableTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken9/NonSerializableTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken9/NonSerializableTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -1,17 +1,16 @@ package org.jboss.jsr299.tck.tests.context.passivating.broken9; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DeploymentError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; -/** - * Spec version: 20090625 - */ @Artifact @ExpectedDeploymentException(DeploymentError.class) +@SpecVersion("20090625") public class NonSerializableTest extends AbstractJSR299Test { @Test(groups = { "contexts", "passivation" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/RequestContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/RequestContextTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/RequestContextTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -1,6 +1,7 @@ package org.jboss.jsr299.tck.tests.context.request; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.IntegrationTest; @@ -12,16 +13,13 @@ import com.gargoylesoftware.htmlunit.TextPage; import com.gargoylesoftware.htmlunit.WebClient; -/** - * - * Spec version: 20090519 - */ @Artifact @IntegrationTest(runLocally=true) @Resources({ @Resource(destination=WarArtifactDescriptor.WEB_XML_DESTINATION, source="web.xml"), @Resource(destination="SimplePage.html", source="SimplePage.html") }) +@SpecVersion("20090519") public class RequestContextTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/ejb/EJBRequestContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/ejb/EJBRequestContextTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/ejb/EJBRequestContextTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -1,6 +1,7 @@ package org.jboss.jsr299.tck.tests.context.request.ejb; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.IntegrationTest; @@ -12,12 +13,11 @@ * EJB and related tests with the built-in request context. * * @author David Allen - * - * Spec version: 20090519 */ @Artifact @IntegrationTest @Packaging(PackagingType.EAR) +@SpecVersion("20090519") public class EJBRequestContextTest extends AbstractJSR299Test { /** Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/SessionContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/SessionContextTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/SessionContextTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -1,6 +1,7 @@ package org.jboss.jsr299.tck.tests.context.session; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.IntegrationTest; @@ -12,16 +13,13 @@ import com.gargoylesoftware.htmlunit.TextPage; import com.gargoylesoftware.htmlunit.WebClient; -/** - * - * Spec version: 20090625 - */ @Artifact @IntegrationTest(runLocally=true) @Resources({ @Resource(destination=WarArtifactDescriptor.WEB_XML_DESTINATION, source="web.xml"), @Resource(destination="SimplePage.html", source="SimplePage.html") }) +@SpecVersion("20090625") public class SessionContextTest extends AbstractJSR299Test { @Test(groups = { "contexts", "servlet", "integration" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/DecoratorDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/DecoratorDefinitionTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/DecoratorDefinitionTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -25,8 +25,9 @@ import javax.enterprise.inject.spi.Bean; import javax.enterprise.inject.spi.Decorator; -import org.hibernate.tck.annotations.SpecAssertion; -import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.jsr299.BeansXml; @@ -34,11 +35,10 @@ /** * @author pmuir - * - * Spec version: 20090625 */ @Artifact @BeansXml("beans.xml") +@SpecVersion("20090625") public class DecoratorDefinitionTest extends AbstractJSR299Test { @Test Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/FooBarImpl.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/FooBarImpl.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/FooBarImpl.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -23,4 +23,9 @@ public class FooBarImpl implements FooBar { + /** + * + */ + private static final long serialVersionUID = 9211059814119576671L; + } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/FooDecorator.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/FooDecorator.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/FooDecorator.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -27,6 +27,10 @@ public class FooDecorator extends AbstractFooDecorator implements Foo, Bar { - @Decorates FooBar foobar; + /** + * + */ + private static final long serialVersionUID = -2253839366401409666L; +@Decorates FooBar foobar; } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/enabledDecoratorIsNotDecorator/EnabledDecoratorNotADecoratorTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/enabledDecoratorIsNotDecorator/EnabledDecoratorNotADecoratorTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/enabledDecoratorIsNotDecorator/EnabledDecoratorNotADecoratorTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -16,7 +16,8 @@ */ package org.jboss.jsr299.tck.tests.decorators.definition.broken.enabledDecoratorIsNotDecorator; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DeploymentError; import org.jboss.testharness.impl.packaging.Artifact; @@ -26,12 +27,11 @@ /** * @author pmuir - * - * Spec version: 20090625 */ @Artifact @ExpectedDeploymentException(DeploymentError.class) @BeansXml("beans.xml") +@SpecVersion("20090625") public class EnabledDecoratorNotADecoratorTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanClass/FinalBeanClassTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanClass/FinalBeanClassTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanClass/FinalBeanClassTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -16,7 +16,8 @@ */ package org.jboss.jsr299.tck.tests.decorators.definition.broken.finalBeanClass; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; @@ -31,6 +32,7 @@ @Artifact @ExpectedDeploymentException(DefinitionError.class) @BeansXml("beans.xml") +@SpecVersion("unknown") public class FinalBeanClassTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanMethod/FinalBeanMethodTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanMethod/FinalBeanMethodTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanMethod/FinalBeanMethodTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -16,7 +16,8 @@ */ package org.jboss.jsr299.tck.tests.decorators.definition.broken.finalBeanMethod; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; @@ -31,6 +32,7 @@ @Artifact @ExpectedDeploymentException(DefinitionError.class) @BeansXml("beans.xml") +@SpecVersion("unknown") public class FinalBeanMethodTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/multipleDelegateInjectionPoints/MultipleDelegateInjectionPointsTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/multipleDelegateInjectionPoints/MultipleDelegateInjectionPointsTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/multipleDelegateInjectionPoints/MultipleDelegateInjectionPointsTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -16,7 +16,8 @@ */ package org.jboss.jsr299.tck.tests.decorators.definition.broken.multipleDelegateInjectionPoints; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; @@ -31,6 +32,7 @@ @Artifact @ExpectedDeploymentException(DefinitionError.class) @BeansXml("beans.xml") +@SpecVersion("unknown") public class MultipleDelegateInjectionPointsTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/noDelegateInjectionPoints/NoDelegateInjectionPointsTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/noDelegateInjectionPoints/NoDelegateInjectionPointsTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/noDelegateInjectionPoints/NoDelegateInjectionPointsTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -16,7 +16,8 @@ */ package org.jboss.jsr299.tck.tests.decorators.definition.broken.noDelegateInjectionPoints; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; @@ -31,6 +32,7 @@ @Artifact @ExpectedDeploymentException(DefinitionError.class) @BeansXml("beans.xml") +@SpecVersion("unknown") public class NoDelegateInjectionPointsTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/notAllDecoratedTypesImplemented/NotAllDecoratedTypesImplementedTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/notAllDecoratedTypesImplemented/NotAllDecoratedTypesImplementedTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/notAllDecoratedTypesImplemented/NotAllDecoratedTypesImplementedTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -16,7 +16,8 @@ */ package org.jboss.jsr299.tck.tests.decorators.definition.broken.notAllDecoratedTypesImplemented; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; @@ -31,6 +32,7 @@ @Artifact @ExpectedDeploymentException(DefinitionError.class) @BeansXml("beans.xml") +@SpecVersion("unknown") public class NotAllDecoratedTypesImplementedTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/DecoratorInvocationTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/DecoratorInvocationTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/DecoratorInvocationTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -16,8 +16,9 @@ */ package org.jboss.jsr299.tck.tests.decorators.invocation; -import org.hibernate.tck.annotations.SpecAssertion; -import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.jsr299.BeansXml; @@ -29,6 +30,7 @@ */ @Artifact @BeansXml("beans.xml") +@SpecVersion("unknown") public class DecoratorInvocationTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/BeanDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/BeanDefinitionTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/BeanDefinitionTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -4,11 +4,11 @@ import javax.enterprise.context.RequestScoped; import javax.enterprise.inject.AnnotationLiteral; -import javax.enterprise.inject.deployment.Production; import javax.enterprise.inject.spi.Bean; -import org.hibernate.tck.annotations.SpecAssertion; -import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.testharness.impl.packaging.Artifact; import org.testng.annotations.Test; @@ -17,10 +17,9 @@ * This test class should be used for common assertions about managed beans (not session beans) * * @author Pete Muir - * - * Spec version: 20090625 */ @Artifact +@SpecVersion("20090625") public class BeanDefinitionTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/BindingDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/BindingDefinitionTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/BindingDefinitionTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -6,8 +6,9 @@ import javax.enterprise.inject.spi.Bean; import javax.enterprise.inject.spi.InjectionPoint; -import org.hibernate.tck.annotations.SpecAssertion; -import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.literals.AnyLiteral; import org.jboss.jsr299.tck.literals.CurrentLiteral; @@ -15,10 +16,8 @@ import org.jboss.testharness.impl.packaging.Artifact; import org.testng.annotations.Test; -/** - * Spec version: 20090625 - */ @Artifact +@SpecVersion("20090625") public class BindingDefinitionTest extends AbstractJSR299Test { @Test Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/DefangedTarantula.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/DefangedTarantula.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/DefangedTarantula.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -3,4 +3,9 @@ class DefangedTarantula extends Tarantula { + /** + * + */ + private static final long serialVersionUID = 4125502808853107948L; + } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/EnterpriseBindingDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/EnterpriseBindingDefinitionTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/EnterpriseBindingDefinitionTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -5,7 +5,8 @@ import javax.enterprise.inject.Any; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.IntegrationTest; @@ -18,11 +19,11 @@ * for all managed beans. So likely there should be a parallel set of tests for session * and other managed beans. * - * Spec version: 20090625 */ @Artifact @IntegrationTest @Packaging(PackagingType.EAR) +@SpecVersion("20090625") public class EnterpriseBindingDefinitionTest extends AbstractJSR299Test { @Test Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/NameDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/NameDefinitionTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/NameDefinitionTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -2,18 +2,15 @@ import javax.enterprise.inject.spi.Bean; -import org.hibernate.tck.annotations.SpecAssertion; -import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.testharness.impl.packaging.Artifact; import org.testng.annotations.Test; -/** - * - * Spec version: 20090625 - * - */ @Artifact +@SpecVersion("20090625") public class NameDefinitionTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/ScopeDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/ScopeDefinitionTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/ScopeDefinitionTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -11,18 +11,15 @@ import javax.enterprise.context.ScopeType; import javax.enterprise.inject.spi.Bean; -import org.hibernate.tck.annotations.SpecAssertion; -import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.testharness.impl.packaging.Artifact; import org.testng.annotations.Test; -/** - * - * Spec version: 20090625 - * - */ @Artifact +@SpecVersion("20090625") public class ScopeDefinitionTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken/tooManyScopes/TooManyScopesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken/tooManyScopes/TooManyScopesTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken/tooManyScopes/TooManyScopesTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -1,18 +1,17 @@ package org.jboss.jsr299.tck.tests.definition.scope.broken.tooManyScopes; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; -/** - * Spec version: 20090519 - */ @Artifact @ExpectedDeploymentException(DefinitionError.class) +@SpecVersion("20090519") public class TooManyScopesTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/enterprise/EnterpriseScopeDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/enterprise/EnterpriseScopeDefinitionTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/enterprise/EnterpriseScopeDefinitionTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -2,18 +2,17 @@ import javax.enterprise.context.RequestScoped; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.Packaging; import org.jboss.testharness.impl.packaging.PackagingType; import org.testng.annotations.Test; -/** - * Spec version: 20090519 - */ @Artifact @Packaging(PackagingType.EAR) +@SpecVersion("20090519") public class EnterpriseScopeDefinitionTest extends AbstractJSR299Test { @Test @SpecAssertion(section="4.1", id = "bb") Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/Chihuahua.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/Chihuahua.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/Chihuahua.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -3,4 +3,9 @@ class Chihuahua extends ShortHairedDog { + /** + * + */ + private static final long serialVersionUID = 484594567205158344L; + } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/MexicanChihuahua.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/MexicanChihuahua.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/MexicanChihuahua.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -3,4 +3,9 @@ class MexicanChihuahua extends Chihuahua { + /** + * + */ + private static final long serialVersionUID = 6596918293280396284L; + } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/ShortHairedDog.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/ShortHairedDog.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/ShortHairedDog.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -9,4 +9,9 @@ class ShortHairedDog implements Animal, Serializable { + /** + * + */ + private static final long serialVersionUID = 1859229950272574260L; + } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/StereotypeDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/StereotypeDefinitionTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/StereotypeDefinitionTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -9,18 +9,17 @@ import javax.enterprise.inject.AnnotationLiteral; import javax.enterprise.inject.spi.Bean; -import org.hibernate.tck.annotations.SpecAssertion; -import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.jsr299.BeansXml; import org.testng.annotations.Test; -/** - * Spec version: 20090625 - */ @Artifact @BeansXml("beans.xml") +@SpecVersion("20090625") public class StereotypeDefinitionTest extends AbstractJSR299Test { private static final Annotation TAME_LITERAL = new AnnotationLiteral<Tame>() {}; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/nonEmptyNamed/NonEmptyNamedTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/nonEmptyNamed/NonEmptyNamedTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/nonEmptyNamed/NonEmptyNamedTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -1,19 +1,18 @@ package org.jboss.jsr299.tck.tests.definition.stereotype.broken.nonEmptyNamed; -import org.hibernate.tck.annotations.SpecAssertion; -import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; -/** - * Spec version: 20090625 - */ @Artifact @ExpectedDeploymentException(DefinitionError.class) +@SpecVersion("20090625") public class NonEmptyNamedTest extends AbstractJSR299Test { @Test Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/scopeConflict/IncompatibleStereotypesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/scopeConflict/IncompatibleStereotypesTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/scopeConflict/IncompatibleStereotypesTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -1,18 +1,17 @@ package org.jboss.jsr299.tck.tests.definition.stereotype.broken.scopeConflict; -import org.hibernate.tck.annotations.SpecAssertion; -import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; -/** - * Spec version: 20090519 - */ @Artifact @ExpectedDeploymentException(DefinitionError.class) +@SpecVersion("20090519") public class IncompatibleStereotypesTest extends AbstractJSR299Test { @Test Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/tooManyScopes/TooManyScopeTypesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/tooManyScopes/TooManyScopeTypesTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/tooManyScopes/TooManyScopeTypesTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -1,18 +1,17 @@ package org.jboss.jsr299.tck.tests.definition.stereotype.broken.tooManyScopes; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; -/** - * Spec version: 20090519 - */ @Artifact @ExpectedDeploymentException(DefinitionError.class) +@SpecVersion("20090519") public class TooManyScopeTypesTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/withBindingType/StereoTypeWithBindingTypesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/withBindingType/StereoTypeWithBindingTypesTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/withBindingType/StereoTypeWithBindingTypesTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -1,18 +1,17 @@ package org.jboss.jsr299.tck.tests.definition.stereotype.broken.withBindingType; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; -/** - * Spec version: 20090519 - */ @Artifact @ExpectedDeploymentException(DefinitionError.class) +@SpecVersion("20090519") public class StereoTypeWithBindingTypesTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/defaultNamed/DefaultNamedTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/defaultNamed/DefaultNamedTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/defaultNamed/DefaultNamedTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -1,15 +1,14 @@ package org.jboss.jsr299.tck.tests.definition.stereotype.defaultNamed; -import org.hibernate.tck.annotations.SpecAssertion; -import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.testharness.impl.packaging.Artifact; import org.testng.annotations.Test; -/** - * Spec version: 20090625 - */ @Artifact +@SpecVersion("20090625") public class DefaultNamedTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/Chihuahua.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/Chihuahua.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/Chihuahua.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -6,4 +6,9 @@ public class Chihuahua extends ShortHairedDog implements ChihuahuaLocal { + /** + * + */ + private static final long serialVersionUID = -9140665279312580651L; + } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/EnterpriseStereotypeDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/EnterpriseStereotypeDefinitionTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/EnterpriseStereotypeDefinitionTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -3,7 +3,8 @@ import javax.enterprise.context.RequestScoped; import javax.enterprise.context.SessionScoped; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.IntegrationTest; @@ -11,12 +12,10 @@ import org.jboss.testharness.impl.packaging.PackagingType; import org.testng.annotations.Test; -/** - * Spec version: 20090625 - */ @IntegrationTest @Artifact @Packaging(PackagingType.EAR) +@SpecVersion("20090625") public class EnterpriseStereotypeDefinitionTest extends AbstractJSR299Test { @Test Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/MexicanChihuahua.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/MexicanChihuahua.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/MexicanChihuahua.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -6,4 +6,9 @@ public class MexicanChihuahua extends Chihuahua implements MexicanChihuahuaLocal { + /** + * + */ + private static final long serialVersionUID = 6851776906570623607L; + } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/ShortHairedDog.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/ShortHairedDog.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/ShortHairedDog.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -9,4 +9,9 @@ class ShortHairedDog implements Animal, Serializable { + /** + * + */ + private static final long serialVersionUID = 8316028446413430833L; + } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/resolvedScopeConflict/ResolvedStereotypeScopeConflictTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/resolvedScopeConflict/ResolvedStereotypeScopeConflictTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/resolvedScopeConflict/ResolvedStereotypeScopeConflictTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -1,15 +1,14 @@ package org.jboss.jsr299.tck.tests.definition.stereotype.resolvedScopeConflict; -import org.hibernate.tck.annotations.SpecAssertion; -import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.testharness.impl.packaging.Artifact; import org.testng.annotations.Test; -/** - * Spec version: 20090519 - */ @Artifact +@SpecVersion("20090519") public class ResolvedStereotypeScopeConflictTest extends AbstractJSR299Test { @Test Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/DeploymentTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/DeploymentTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/DeploymentTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -17,8 +17,9 @@ package org.jboss.jsr299.tck.tests.deployment.lifecycle; -import org.hibernate.tck.annotations.SpecAssertion; -import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.testharness.impl.packaging.Artifact; import org.testng.annotations.Test; @@ -26,13 +27,12 @@ /** * Tests related to the final deployment phase of the lifecycle. * - * Spec version: 20090519 - * * @author David Allen */ @Artifact // TODO Add extension stuff @Test(groups="broken") +@SpecVersion("20090519") public class DeploymentTest extends AbstractJSR299Test { @Test Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/ExtensionsTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/ExtensionsTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/ExtensionsTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -19,7 +19,8 @@ import javax.enterprise.inject.AnnotationLiteral; import javax.enterprise.inject.spi.Bean; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.IntegrationTest; @@ -29,14 +30,13 @@ /** * @author pmuir - * - * Spec version: 20090625 */ @Artifact @Resources({ @Resource(source="javax.enterprise.inject.spi.Extension", destination="WEB-INF/classes/META-INF/services/javax.enterprise.inject.spi.Extension") }) @IntegrationTest +@SpecVersion("20090625") public class ExtensionsTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDefinitionError/AddDefinitionErrorTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDefinitionError/AddDefinitionErrorTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDefinitionError/AddDefinitionErrorTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -1,6 +1,7 @@ package org.jboss.jsr299.tck.tests.deployment.lifecycle.broken.addDefinitionError; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; @@ -14,8 +15,6 @@ * Tests that any definition error added by an observer of the AfterBeanDiscovery * event results in a definition error. * - * Spec version: 20090625 - * * @author David Allen * @author Dan Allen */ @@ -26,6 +25,7 @@ // Must be an integration test as it needs a resource copied to a folder @IntegrationTest @ExpectedDeploymentException(DefinitionError.class) +@SpecVersion("20090625") public class AddDefinitionErrorTest extends AbstractJSR299Test { @Test(groups="incontainer-ri-broken") Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDeploymentProblem/AddDeploymentProblemTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDeploymentProblem/AddDeploymentProblemTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDeploymentProblem/AddDeploymentProblemTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -17,7 +17,8 @@ package org.jboss.jsr299.tck.tests.deployment.lifecycle.broken.addDeploymentProblem; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DeploymentError; import org.jboss.testharness.impl.packaging.Artifact; @@ -29,13 +30,12 @@ * event results in a deployment error, but that all observers that observe this event * are still called. * - * Spec version: 20090519 - * * @author David Allen * @author Dan Allen */ @Artifact @ExpectedDeploymentException(DeploymentError.class) +@SpecVersion("20090519") public class AddDeploymentProblemTest extends AbstractJSR299Test { @Test(groups={"broken", "incontainer-ri-broken"}) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/beanDiscoveryMethodThrowsException/BeforeBeanDiscoveryThrowsExceptionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/beanDiscoveryMethodThrowsException/BeforeBeanDiscoveryThrowsExceptionTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/beanDiscoveryMethodThrowsException/BeforeBeanDiscoveryThrowsExceptionTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -16,7 +16,8 @@ */ package org.jboss.jsr299.tck.tests.deployment.lifecycle.broken.beanDiscoveryMethodThrowsException; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; @@ -28,9 +29,6 @@ /** * @author pmuir - * - * Spec version: 20090625 - * */ @Artifact @Resources({ @@ -38,6 +36,7 @@ }) @IntegrationTest @ExpectedDeploymentException(DefinitionError.class) +@SpecVersion("20090625") public class BeforeBeanDiscoveryThrowsExceptionTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanDiscoveryObserver/AfterBeanDiscoveryObserverExecutionFailureTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanDiscoveryObserver/AfterBeanDiscoveryObserverExecutionFailureTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanDiscoveryObserver/AfterBeanDiscoveryObserverExecutionFailureTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -1,6 +1,7 @@ package org.jboss.jsr299.tck.tests.deployment.lifecycle.broken.exceptionInAfterBeanDiscoveryObserver; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; @@ -11,13 +12,12 @@ * Tests that any exception raised in a method observing the AfterBeanDiscovery * event results in a definition error. * - * Spec version: 20090519 - * * @author David Allen * @author Dan Allen */ @Artifact @ExpectedDeploymentException(DefinitionError.class) +@SpecVersion("20090519") public class AfterBeanDiscoveryObserverExecutionFailureTest extends AbstractJSR299Test { @Test(groups={"incontainer-ri-broken", "broken"}) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanDiscoveryObserver/FooException.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanDiscoveryObserver/FooException.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanDiscoveryObserver/FooException.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -23,7 +23,12 @@ public class FooException extends RuntimeException { - public FooException() + /** + * + */ + private static final long serialVersionUID = 4441409975741605270L; + +public FooException() { super(); // TODO Auto-generated constructor stub Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanValidationObserver/AfterDeploymentValidationObserverExecutionFailureTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanValidationObserver/AfterDeploymentValidationObserverExecutionFailureTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanValidationObserver/AfterDeploymentValidationObserverExecutionFailureTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -17,7 +17,8 @@ package org.jboss.jsr299.tck.tests.deployment.lifecycle.broken.exceptionInAfterBeanValidationObserver; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DeploymentError; import org.jboss.testharness.impl.packaging.Artifact; @@ -28,13 +29,12 @@ * Tests that any failure in an observer observing the AfterDeploymentValidation * event results in a deployment error. * - * Spec version: 20090519 - * * @author David Allen * @author Dan Allen */ @Artifact @ExpectedDeploymentException(DeploymentError.class) +@SpecVersion("20090519") public class AfterDeploymentValidationObserverExecutionFailureTest extends AbstractJSR299Test { @Test(groups={"incontainer-ri-broken", "broken"}) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringBeanDiscovery/DeploymentFailureTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringBeanDiscovery/DeploymentFailureTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringBeanDiscovery/DeploymentFailureTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -1,7 +1,8 @@ package org.jboss.jsr299.tck.tests.deployment.lifecycle.broken.failsDuringBeanDiscovery; -import org.hibernate.tck.annotations.SpecAssertion; -import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; @@ -10,12 +11,10 @@ import org.jboss.testharness.impl.packaging.PackagingType; import org.testng.annotations.Test; -/** - * Spec version: 20090625 - */ @Artifact @Packaging(PackagingType.EAR) @ExpectedDeploymentException(DefinitionError.class) +@SpecVersion("20090625") public class DeploymentFailureTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringValidation/AfterBeanDiscoveryFailureTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringValidation/AfterBeanDiscoveryFailureTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringValidation/AfterBeanDiscoveryFailureTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -17,8 +17,9 @@ package org.jboss.jsr299.tck.tests.deployment.lifecycle.broken.failsDuringValidation; -import org.hibernate.tck.annotations.SpecAssertion; -import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DeploymentError; import org.jboss.testharness.impl.packaging.Artifact; @@ -30,13 +31,12 @@ * the AfterBeanDiscovery event but before the AfterDeploymentValidation event * is raised. * - * Spec version: 20090519 - * * @author David Allen * @author Dan Allen */ @Artifact @ExpectedDeploymentException(DeploymentError.class) +@SpecVersion("20090519") public class AfterBeanDiscoveryFailureTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/normalScope/AddingNormalScopeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/normalScope/AddingNormalScopeTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/normalScope/AddingNormalScopeTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -16,7 +16,8 @@ */ package org.jboss.jsr299.tck.tests.deployment.lifecycle.broken.normalScope; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DeploymentError; import org.jboss.testharness.impl.packaging.Artifact; @@ -29,8 +30,6 @@ /** * @author pmuir * - * Spec version: 20090625 - * */ @Artifact @Resources({ @@ -38,6 +37,7 @@ }) @IntegrationTest @ExpectedDeploymentException(DeploymentError.class) +@SpecVersion("20090625") public class AddingNormalScopeTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/passivatingScope/AddingPassivatingScopeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/passivatingScope/AddingPassivatingScopeTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/passivatingScope/AddingPassivatingScopeTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -16,7 +16,8 @@ */ package org.jboss.jsr299.tck.tests.deployment.lifecycle.broken.passivatingScope; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DeploymentError; import org.jboss.testharness.impl.packaging.Artifact; @@ -28,8 +29,6 @@ /** * @author pmuir - * - * Spec version: 20090625 */ @Artifact @Resources({ @@ -37,6 +36,7 @@ }) @IntegrationTest @ExpectedDeploymentException(DeploymentError.class) +@SpecVersion("20090625") public class AddingPassivatingScopeTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/useBeforeValidationFails/ManagerObserver.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/useBeforeValidationFails/ManagerObserver.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/useBeforeValidationFails/ManagerObserver.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -1,7 +1,5 @@ package org.jboss.jsr299.tck.tests.deployment.lifecycle.broken.useBeforeValidationFails; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.RequestScoped; import javax.enterprise.event.Observes; import javax.enterprise.inject.Current; import javax.enterprise.inject.spi.AfterBeanDiscovery; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/useBeforeValidationFails/UseBeforeValidationTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/useBeforeValidationFails/UseBeforeValidationTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/useBeforeValidationFails/UseBeforeValidationTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -17,8 +17,9 @@ package org.jboss.jsr299.tck.tests.deployment.lifecycle.broken.useBeforeValidationFails; -import org.hibernate.tck.annotations.SpecAssertion; -import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.testharness.impl.packaging.Artifact; import org.testng.annotations.Test; @@ -31,6 +32,7 @@ * */ @Artifact +@SpecVersion("unknown") public class UseBeforeValidationTest extends AbstractJSR299Test { @Test(groups = {"ri-broken", "broken"}) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -10,8 +10,9 @@ import javax.enterprise.inject.spi.BeanManager; import javax.enterprise.inject.spi.ObserverMethod; -import org.hibernate.tck.annotations.SpecAssertion; -import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.literals.AnyLiteral; import org.jboss.jsr299.tck.literals.CurrentLiteral; @@ -24,11 +25,10 @@ * * @author Nicklas Karlsson * @author David Allen - * - * Spec version: 20090625 */ @Artifact @BeansXml("beans.xml") +@SpecVersion("20090625") public class EventTest extends AbstractJSR299Test { private static final String FIRE_EVENT_METHOD_NAME = "fireEvent"; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/bindingTypes/EventBindingTypesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/bindingTypes/EventBindingTypesTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/bindingTypes/EventBindingTypesTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -5,18 +5,18 @@ import javax.enterprise.inject.TypeLiteral; import javax.enterprise.inject.spi.Bean; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.literals.AnyLiteral; import org.jboss.testharness.impl.packaging.Artifact; import org.testng.annotations.Test; /** - * Spec version: 20090625 - * * @author Dan Allen */ @Artifact +@SpecVersion("20090625") public class EventBindingTypesTest extends AbstractJSR299Test { @Test(groups = { "events" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/inject/withTypeVariable/EventInjectionWithUndefinedTypeVariableTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/inject/withTypeVariable/EventInjectionWithUndefinedTypeVariableTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/inject/withTypeVariable/EventInjectionWithUndefinedTypeVariableTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -17,7 +17,8 @@ package org.jboss.jsr299.tck.tests.event.broken.inject.withTypeVariable; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; @@ -28,12 +29,11 @@ * Tests an Event templated with an undefined type variable and annotated * with {@link @Any} fails. * - * Spec version: 20090625 - * * @author David Allen */ @Artifact @ExpectedDeploymentException(DefinitionError.class) +@SpecVersion("20090625") public class EventInjectionWithUndefinedTypeVariableTest extends AbstractJSR299Test { @Test(groups = { "events" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/inject/withWildcardType/EventInjectionWithWildcardTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/inject/withWildcardType/EventInjectionWithWildcardTypeTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/inject/withWildcardType/EventInjectionWithWildcardTypeTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -16,7 +16,8 @@ */ package org.jboss.jsr299.tck.tests.event.broken.inject.withWildcardType; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; @@ -27,12 +28,11 @@ * Tests that an injection point for an Event object with a wildcard * type parameter is treated as a definition error. * - * Spec version: 20090625 - * * @author David Allen */ @Artifact @ExpectedDeploymentException(DefinitionError.class) +@SpecVersion("20090625") public class EventInjectionWithWildcardTypeTest extends AbstractJSR299Test { @Test(groups = { "events" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/beanNotManaged/ObserverMethodOnIncorrectBeanTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/beanNotManaged/ObserverMethodOnIncorrectBeanTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/beanNotManaged/ObserverMethodOnIncorrectBeanTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -16,7 +16,8 @@ */ package org.jboss.jsr299.tck.tests.event.broken.observer.beanNotManaged; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.testharness.impl.packaging.Artifact; import org.testng.annotations.Test; @@ -25,11 +26,10 @@ * Tests an observer method on something that is not a managed bean * or a session bean. * - * Spec version: 20090625 - * * @author David Allen */ @Artifact +@SpecVersion("20090625") public class ObserverMethodOnIncorrectBeanTest extends AbstractJSR299Test { @Test(groups = { "events" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isDisposer/ObserverMethodAnnotatedDisposesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isDisposer/ObserverMethodAnnotatedDisposesTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isDisposer/ObserverMethodAnnotatedDisposesTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -18,7 +18,8 @@ package org.jboss.jsr299.tck.tests.event.broken.observer.isDisposer; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; @@ -29,12 +30,11 @@ * Tests an observer method that is also a disposes method * for something else. * - * Spec version: 20090625 - * * @author David Allen */ @Artifact @ExpectedDeploymentException(DefinitionError.class) +@SpecVersion("20090625") public class ObserverMethodAnnotatedDisposesTest extends AbstractJSR299Test { @Test(groups = { "events" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isInitializer/ObserverMethodAnnotatedInitialzerTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isInitializer/ObserverMethodAnnotatedInitialzerTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isInitializer/ObserverMethodAnnotatedInitialzerTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -18,7 +18,8 @@ package org.jboss.jsr299.tck.tests.event.broken.observer.isInitializer; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; @@ -29,12 +30,11 @@ * Tests an observer method that is also annotated as an * initializer method. * - * Spec version: 20090625 - * * @author David Allen */ @Artifact @ExpectedDeploymentException(DefinitionError.class) +@SpecVersion("20090625") public class ObserverMethodAnnotatedInitialzerTest extends AbstractJSR299Test { @Test(groups = { "events" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isProducer/ObserverMethodAnnotatedProducesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isProducer/ObserverMethodAnnotatedProducesTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isProducer/ObserverMethodAnnotatedProducesTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -17,7 +17,8 @@ package org.jboss.jsr299.tck.tests.event.broken.observer.isProducer; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; @@ -27,12 +28,11 @@ /** * Tests an observer method which is also annotated as a producer method. * - * Spec version: 20090625 - * * @author David Allen */ @Artifact @ExpectedDeploymentException(DefinitionError.class) +@SpecVersion("20090625") public class ObserverMethodAnnotatedProducesTest extends AbstractJSR299Test { @Test(groups = { "events" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/notBusinessMethod/EJBObserverMethodNotBusinessMethodTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/notBusinessMethod/EJBObserverMethodNotBusinessMethodTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/notBusinessMethod/EJBObserverMethodNotBusinessMethodTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -16,8 +16,9 @@ */ package org.jboss.jsr299.tck.tests.event.broken.observer.notBusinessMethod; -import org.hibernate.tck.annotations.SpecAssertion; -import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; @@ -30,13 +31,12 @@ * Test an observer method on an EJB that is neither a business method nor a * static method of the class. * - * Spec version: 20090625 - * * @author David Allen */ @Artifact @Packaging(PackagingType.EAR) @ExpectedDeploymentException(DefinitionError.class) +@SpecVersion("20090625") public class EJBObserverMethodNotBusinessMethodTest extends AbstractJSR299Test { @Test(groups = { "events" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/tooManyParameters/ObserverMethodWithTwoEventParametersTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/tooManyParameters/ObserverMethodWithTwoEventParametersTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/tooManyParameters/ObserverMethodWithTwoEventParametersTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -1,18 +1,17 @@ package org.jboss.jsr299.tck.tests.event.broken.observer.tooManyParameters; -import org.hibernate.tck.annotations.SpecAssertion; -import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; -/** - * Spec version: 20090625 - */ @Artifact @ExpectedDeploymentException(DefinitionError.class) +@SpecVersion("20090625") public class ObserverMethodWithTwoEventParametersTest extends AbstractJSR299Test { @Test(groups = { "events" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer8/AsynchronousBeforeCompletionObserverTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer8/AsynchronousBeforeCompletionObserverTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer8/AsynchronousBeforeCompletionObserverTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -16,12 +16,10 @@ */ package org.jboss.jsr299.tck.tests.event.broken.observer8; -import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; -import org.testng.annotations.Test; /** * Tests an asynchronous observer method that is also a Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/eventTypes/EventTypesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/eventTypes/EventTypesTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/eventTypes/EventTypesTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -1,17 +1,18 @@ package org.jboss.jsr299.tck.tests.event.eventTypes; -import org.hibernate.tck.annotations.SpecAssertion; -import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.testharness.impl.packaging.Artifact; import org.testng.annotations.Test; /** - * Spec version: 20090625 * * @author Dan Allen */ @Artifact +@SpecVersion("20090625") public class EventTypesTest extends AbstractJSR299Test { @Test(groups = "event") Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/FireEventTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/FireEventTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/FireEventTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -12,8 +12,9 @@ import javax.enterprise.inject.spi.Bean; import javax.enterprise.inject.spi.InjectionPoint; -import org.hibernate.tck.annotations.SpecAssertion; -import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.literals.AnyLiteral; import org.jboss.testharness.impl.packaging.Artifact; @@ -23,11 +24,10 @@ * Tests that verify the event firing behavior of the Event * interface. * - * Spec version: 20090625 - * * @author Dan Allen */ @Artifact +@SpecVersion("20090625") public class FireEventTest extends AbstractJSR299Test { /** Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/nonbinding/NonBindingTypePassedToFireTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/nonbinding/NonBindingTypePassedToFireTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/nonbinding/NonBindingTypePassedToFireTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -1,16 +1,13 @@ package org.jboss.jsr299.tck.tests.event.fires.nonbinding; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.testharness.impl.packaging.Artifact; import org.testng.annotations.Test; -/** - * - * Spec version: 20090625 - * - */ @Artifact +@SpecVersion("20090625") public class NonBindingTypePassedToFireTest extends AbstractJSR299Test { @Test(groups = { "events" }, expectedExceptions = { IllegalArgumentException.class }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/implicit/ImplicitEventTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/implicit/ImplicitEventTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/implicit/ImplicitEventTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -7,8 +7,9 @@ import javax.enterprise.event.Event; import javax.enterprise.inject.TypeLiteral; -import org.hibernate.tck.annotations.SpecAssertion; -import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.literals.AnyLiteral; import org.jboss.testharness.impl.packaging.Artifact; @@ -18,11 +19,10 @@ * Test that there is an implicit event bean for every legal event type * and verify its composition. * - * Spec version: 20090625 - * * @author Dan Allen */ @Artifact +@SpecVersion("20090625") public class ImplicitEventTest extends AbstractJSR299Test { private static final TypeLiteral<Event<StudentRegisteredEvent>> STUDENT_REGISTERED_EVENT_LITERAL = new TypeLiteral<Event<StudentRegisteredEvent>>() {}; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/ObserverTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/ObserverTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/ObserverTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -2,16 +2,15 @@ import java.lang.annotation.Annotation; -import org.hibernate.tck.annotations.SpecAssertion; -import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.testharness.impl.packaging.Artifact; import org.testng.annotations.Test; -/** - * Spec version: 20090625 - */ @Artifact +@SpecVersion("20090625") public class ObserverTest extends AbstractJSR299Test { @Test(groups = { "events" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/abortProcessing/ObserverExceptionAbortsProcessingTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/abortProcessing/ObserverExceptionAbortsProcessingTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/abortProcessing/ObserverExceptionAbortsProcessingTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -2,15 +2,14 @@ import javax.enterprise.event.Observes; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.testharness.impl.packaging.Artifact; import org.testng.annotations.Test; -/** - * Spec version: 20090625 - */ @Artifact +@SpecVersion("20090625") public class ObserverExceptionAbortsProcessingTest extends AbstractJSR299Test { public static class AnEventType Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/checkedException/CheckedExceptionWrappedTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/checkedException/CheckedExceptionWrappedTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/checkedException/CheckedExceptionWrappedTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -18,7 +18,8 @@ import javax.enterprise.event.ObserverException; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.testharness.impl.packaging.Artifact; import org.testng.annotations.Test; @@ -27,11 +28,10 @@ * Tests that a checked exception thrown from a non-transactional * observer is wrapped and thrown. * - * Spec version: 20090625 - * * @author David Allen */ @Artifact +@SpecVersion("20090625") public class CheckedExceptionWrappedTest extends AbstractJSR299Test { @Test(groups = { "events" }, expectedExceptions = { ObserverException.class }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/EnterpriseEventInheritenceTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/EnterpriseEventInheritenceTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/EnterpriseEventInheritenceTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -2,10 +2,10 @@ import java.util.Set; -import javax.enterprise.event.Observer; import javax.enterprise.inject.spi.ObserverMethod; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.IntegrationTest; @@ -16,13 +16,12 @@ /** * Tests for event inheritence with enterprise beans * - * Spec version: 20090519 - * * @author Shane Bryzak */ @Artifact @Packaging(PackagingType.EAR) @IntegrationTest +@SpecVersion("20090519") public class EnterpriseEventInheritenceTest extends AbstractJSR299Test { @Test(groups = { "events", "inheritance" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/runtimeException/ObserverExceptionRethrownTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/runtimeException/ObserverExceptionRethrownTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/runtimeException/ObserverExceptionRethrownTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -17,7 +17,8 @@ package org.jboss.jsr299.tck.tests.event.observer.runtimeException; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.testharness.impl.packaging.Artifact; import org.testng.annotations.Test; @@ -26,11 +27,10 @@ * Tests that an unchecked exception thrown from a non-transactional * observer is rethrown. * - * Spec version: 20090625 - * * @author David Allen */ @Artifact +@SpecVersion("20090625") public class ObserverExceptionRethrownTest extends AbstractJSR299Test { @Test(groups = { "events" }, expectedExceptions = { TeaCupPomeranian.OversizedException.class }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/wildcardAndTypeVariable/ObserverMethodWithParametertizedTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/wildcardAndTypeVariable/ObserverMethodWithParametertizedTypeTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/wildcardAndTypeVariable/ObserverMethodWithParametertizedTypeTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -22,7 +22,8 @@ import java.util.ArrayList; import java.util.List; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.testharness.impl.packaging.Artifact; import org.testng.annotations.Test; @@ -31,11 +32,11 @@ * Tests an observer method defined to observe an event type which * is generic and a type variable * - * Spec version: 20090625 * * @author David Allen */ @Artifact +@SpecVersion("20090625") public class ObserverMethodWithParametertizedTypeTest extends AbstractJSR299Test { @Test(groups = { "events", "ri-broken"}) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/DuplicateBindingTypesWhenResolvingTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/DuplicateBindingTypesWhenResolvingTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/DuplicateBindingTypesWhenResolvingTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -2,15 +2,14 @@ import javax.enterprise.event.Observes; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.testharness.impl.packaging.Artifact; import org.testng.annotations.Test; -/** - * Spec version: 20090625 - */ @Artifact +@SpecVersion("20090625") public class DuplicateBindingTypesWhenResolvingTest extends AbstractJSR299Test { public static class AnEventType Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/ResolvingChecksBindingTypeMembersTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/ResolvingChecksBindingTypeMembersTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/ResolvingChecksBindingTypeMembersTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -2,16 +2,15 @@ import javax.enterprise.event.Observes; -import org.hibernate.tck.annotations.SpecAssertion; -import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.testharness.impl.packaging.Artifact; import org.testng.annotations.Test; -/** - * Spec version: 20090625 - */ @Artifact +@SpecVersion("20090625") public class ResolvingChecksBindingTypeMembersTest extends AbstractJSR299Test { public static class AnEventType Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/nonbinding/NonBindingTypesWhenResolvingTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/nonbinding/NonBindingTypesWhenResolvingTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/nonbinding/NonBindingTypesWhenResolvingTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -5,15 +5,14 @@ import javax.enterprise.event.Observes; import javax.enterprise.inject.spi.ObserverMethod; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.testharness.impl.packaging.Artifact; import org.testng.annotations.Test; -/** - * Spec version: 20090625 - */ @Artifact +@SpecVersion("20090625") public class NonBindingTypesWhenResolvingTest extends AbstractJSR299Test { public static class AnEventType Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/typeWithParameters/CheckTypeParametersWhenResolvingObserversTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/typeWithParameters/CheckTypeParametersWhenResolvingObserversTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/typeWithParameters/CheckTypeParametersWhenResolvingObserversTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -2,19 +2,17 @@ import java.util.ArrayList; -import javax.enterprise.event.Observer; import javax.enterprise.event.Observes; -import org.hibernate.tck.annotations.SpecAssertion; -import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.testharness.impl.packaging.Artifact; import org.testng.annotations.Test; -/** - * Spec version: 20090625 - */ @Artifact +@SpecVersion("20090625") public class CheckTypeParametersWhenResolvingObserversTest extends AbstractJSR299Test { public static class CharacterList extends ArrayList<Character> Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/typeWithParameters/ChecksEventTypeWhenResolvingTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/typeWithParameters/ChecksEventTypeWhenResolvingTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/typeWithParameters/ChecksEventTypeWhenResolvingTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -1,19 +1,15 @@ package org.jboss.jsr299.tck.tests.event.resolve.typeWithParameters; -import java.util.Set; - -import javax.enterprise.event.Observer; import javax.enterprise.event.Observes; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.testharness.impl.packaging.Artifact; import org.testng.annotations.Test; -/** - * Spec version: 20090625 - */ @Artifact +@SpecVersion("20090625") public class ChecksEventTypeWhenResolvingTest extends AbstractJSR299Test { public static class AnEventType Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/select/SelectEventTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/select/SelectEventTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/select/SelectEventTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -2,7 +2,8 @@ import javax.enterprise.inject.AnnotationLiteral; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.testharness.impl.packaging.Artifact; import org.testng.annotations.Test; @@ -10,11 +11,10 @@ /** * These tests verify the behavior of the Event#select() method. * - * Spec version: 20090625 - * * @author Dan Allen */ @Artifact +@SpecVersion("20090625") public class SelectEventTest extends AbstractJSR299Test { @Test(groups = "events") Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/transactionalObservers/EventTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/transactionalObservers/EventTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/transactionalObservers/EventTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -23,8 +23,9 @@ import javax.ejb.EJBException; import javax.enterprise.inject.AnnotationLiteral; -import org.hibernate.tck.annotations.SpecAssertion; -import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.IntegrationTest; @@ -37,12 +38,11 @@ * * @author David Allen * - * Spec version: 20090625 - * */ @Artifact @Packaging(PackagingType.EAR) @IntegrationTest +@SpecVersion("20090625") public class EventTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DisposalMethodDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DisposalMethodDefinitionTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DisposalMethodDefinitionTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -6,18 +6,17 @@ import javax.enterprise.inject.AnnotationLiteral; import javax.enterprise.inject.spi.Bean; -import org.hibernate.tck.annotations.SpecAssertion; -import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.jsr299.BeansXml; import org.testng.annotations.Test; -/** - * Spec version: 20090625 - */ @Artifact @BeansXml("beans.xml") +@SpecVersion("20090625") public class DisposalMethodDefinitionTest extends AbstractJSR299Test { private static final Annotation DEADLIEST_LITERAL = new AnnotationLiteral<Deadliest>() {}; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/InitializerUnallowedDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/InitializerUnallowedDefinitionTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/InitializerUnallowedDefinitionTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -1,7 +1,8 @@ package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken.initializerUnallowed; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; @@ -9,12 +10,10 @@ import org.jboss.testharness.impl.packaging.jsr299.BeansXml; import org.testng.annotations.Test; -/** - * Spec version: 20090625 - */ @Artifact @ExpectedDeploymentException(DefinitionError.class) @BeansXml("beans.xml") +@SpecVersion("20090625") public class InitializerUnallowedDefinitionTest extends AbstractJSR299Test { @Test Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/methodOnSessionBean/DisposalMethodOnSessionBean.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/methodOnSessionBean/DisposalMethodOnSessionBean.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/methodOnSessionBean/DisposalMethodOnSessionBean.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -1,7 +1,8 @@ package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken.methodOnSessionBean; -import org.hibernate.tck.annotations.SpecAssertion; -import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; @@ -11,13 +12,11 @@ import org.jboss.testharness.impl.packaging.PackagingType; import org.testng.annotations.Test; -/** - * Spec version: 20090625 - */ @Artifact @ExpectedDeploymentException(DefinitionError.class) @IntegrationTest @Packaging(PackagingType.EAR) +@SpecVersion("20090625") public class DisposalMethodOnSessionBean extends AbstractJSR299Test { @Test Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multiParams/MultipleDisposeParametersDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multiParams/MultipleDisposeParametersDefinitionTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multiParams/MultipleDisposeParametersDefinitionTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -1,8 +1,9 @@ package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken.multiParams; -import org.hibernate.tck.annotations.SpecAssertion; -import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; @@ -10,12 +11,10 @@ import org.jboss.testharness.impl.packaging.jsr299.BeansXml; import org.testng.annotations.Test; -/** - * Spec version: 20090625 - */ @Artifact @ExpectedDeploymentException(DefinitionError.class) @BeansXml("beans.xml") +@SpecVersion("20090625") public class MultipleDisposeParametersDefinitionTest extends AbstractJSR299Test { @Test Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/observesUnallowed/ObserverParameterUnallowedDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/observesUnallowed/ObserverParameterUnallowedDefinitionTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/observesUnallowed/ObserverParameterUnallowedDefinitionTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -1,6 +1,7 @@ package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken.observesUnallowed; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; @@ -8,12 +9,10 @@ import org.jboss.testharness.impl.packaging.jsr299.BeansXml; import org.testng.annotations.Test; -/** - * Spec version: 20090625 - */ @Artifact @ExpectedDeploymentException(DefinitionError.class) @BeansXml("beans.xml") +@SpecVersion("20090625") public class ObserverParameterUnallowedDefinitionTest extends AbstractJSR299Test { @Test Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/producesUnallowed/ProducesUnallowedDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/producesUnallowed/ProducesUnallowedDefinitionTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/producesUnallowed/ProducesUnallowedDefinitionTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -1,18 +1,17 @@ package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken.producesUnallowed; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; -/** - * Spec version: 20090625 - */ @Artifact @ExpectedDeploymentException(DefinitionError.class) +@SpecVersion("20090625") public class ProducesUnallowedDefinitionTest extends AbstractJSR299Test { @Test Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/UnresolvedDisposalMethodDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/UnresolvedDisposalMethodDefinitionTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/UnresolvedDisposalMethodDefinitionTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -1,6 +1,7 @@ package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken.unresolvedMethod; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; @@ -8,12 +9,10 @@ import org.jboss.testharness.impl.packaging.jsr299.BeansXml; import org.testng.annotations.Test; -/** - * Spec version: 20090625 - */ @Artifact @ExpectedDeploymentException(DefinitionError.class) @BeansXml("beans.xml") +@SpecVersion("20090625") public class UnresolvedDisposalMethodDefinitionTest extends AbstractJSR299Test { @Test Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithConversationScope/SingletonWithConversationScopeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithConversationScope/SingletonWithConversationScopeTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithConversationScope/SingletonWithConversationScopeTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -1,7 +1,8 @@ package org.jboss.jsr299.tck.tests.implementation.enterprise.broken.singletonWithConversationScope; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; @@ -10,13 +11,10 @@ import org.jboss.testharness.impl.packaging.PackagingType; import org.testng.annotations.Test; -/** - * - * Spec version: 20090625 - */ @ExpectedDeploymentException(DefinitionError.class) @Artifact @Packaging(PackagingType.EAR) +@SpecVersion("20090625") public class SingletonWithConversationScopeTest extends AbstractJSR299Test { @Test(groups = { "enterpriseBeans" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithRequestScope/SingletonWithRequestScopeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithRequestScope/SingletonWithRequestScopeTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithRequestScope/SingletonWithRequestScopeTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -1,7 +1,8 @@ package org.jboss.jsr299.tck.tests.implementation.enterprise.broken.singletonWithRequestScope; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; @@ -10,13 +11,10 @@ import org.jboss.testharness.impl.packaging.PackagingType; import org.testng.annotations.Test; -/** - * - * Spec version: 20090625 - */ @Artifact @ExpectedDeploymentException(DefinitionError.class) @Packaging(PackagingType.EAR) +@SpecVersion("20090625") public class SingletonWithRequestScopeTest extends AbstractJSR299Test { @Test(groups = { "incontainer-broken" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithSessionScope/IrishTerrier_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithSessionScope/IrishTerrier_Broken.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithSessionScope/IrishTerrier_Broken.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -10,4 +10,9 @@ class IrishTerrier_Broken implements Serializable { + /** + * + */ + private static final long serialVersionUID = -1628520203303413522L; + } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithSessionScope/SingletonWithSessionScopeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithSessionScope/SingletonWithSessionScopeTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithSessionScope/SingletonWithSessionScopeTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -1,7 +1,8 @@ package org.jboss.jsr299.tck.tests.implementation.enterprise.broken.singletonWithSessionScope; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; @@ -10,13 +11,10 @@ import org.jboss.testharness.impl.packaging.PackagingType; import org.testng.annotations.Test; -/** - * - * Spec version: 20090625 - */ @Artifact @ExpectedDeploymentException(DefinitionError.class) @Packaging(PackagingType.EAR) +@SpecVersion("20090625") public class SingletonWithSessionScopeTest extends AbstractJSR299Test { @Test(groups = { "incontainer-broken" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithApplicationScope/StatelessWithApplicationScopeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithApplicationScope/StatelessWithApplicationScopeTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithApplicationScope/StatelessWithApplicationScopeTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -1,7 +1,8 @@ package org.jboss.jsr299.tck.tests.implementation.enterprise.broken.statelessWithApplicationScope; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; @@ -10,13 +11,10 @@ import org.jboss.testharness.impl.packaging.PackagingType; import org.testng.annotations.Test; -/** - * - * Spec version: 20090625 - */ @Artifact @ExpectedDeploymentException(DefinitionError.class) @Packaging(PackagingType.EAR) +@SpecVersion("20090625") public class StatelessWithApplicationScopeTest extends AbstractJSR299Test { @Test(groups = { "enterpriseBeans" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithConversationScope/StatelessWithConversationScopeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithConversationScope/StatelessWithConversationScopeTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithConversationScope/StatelessWithConversationScopeTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -1,7 +1,8 @@ package org.jboss.jsr299.tck.tests.implementation.enterprise.broken.statelessWithConversationScope; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; @@ -10,13 +11,10 @@ import org.jboss.testharness.impl.packaging.PackagingType; import org.testng.annotations.Test; -/** - * - * Spec version: 20090625 - */ @Artifact @ExpectedDeploymentException(DefinitionError.class) @Packaging(PackagingType.EAR) +@SpecVersion("20090625") public class StatelessWithConversationScopeTest extends AbstractJSR299Test { @Test(groups = { "enterpriseBeans" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithRequestScope/StatelessWithRequestScopeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithRequestScope/StatelessWithRequestScopeTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithRequestScope/StatelessWithRequestScopeTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -1,7 +1,8 @@ package org.jboss.jsr299.tck.tests.implementation.enterprise.broken.statelessWithRequestScope; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; @@ -10,13 +11,10 @@ import org.jboss.testharness.impl.packaging.PackagingType; import org.testng.annotations.Test; -/** - * - * Spec version: 20090625 - */ @Artifact @ExpectedDeploymentException(DefinitionError.class) @Packaging(PackagingType.EAR) +@SpecVersion("20090625") public class StatelessWithRequestScopeTest extends AbstractJSR299Test { @Test(groups = { "enterpriseBeans" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithSessionScope/StatelessWithSessionScopeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithSessionScope/StatelessWithSessionScopeTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithSessionScope/StatelessWithSessionScopeTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -1,7 +1,8 @@ package org.jboss.jsr299.tck.tests.implementation.enterprise.broken.statelessWithSessionScope; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; @@ -10,13 +11,10 @@ import org.jboss.testharness.impl.packaging.PackagingType; import org.testng.annotations.Test; -/** - * - * Spec version: 20090625 - */ @Artifact @ExpectedDeploymentException(DefinitionError.class) @Packaging(PackagingType.EAR) +@SpecVersion("20090625") public class StatelessWithSessionScopeTest extends AbstractJSR299Test { @Test(groups = { "enterpriseBeans" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -7,8 +7,9 @@ import javax.enterprise.inject.AnnotationLiteral; import javax.enterprise.inject.spi.Bean; -import org.hibernate.tck.annotations.SpecAssertion; -import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.Packaging; @@ -19,11 +20,11 @@ /** * @author Nicklas Karlsson * - * Spec version: 20090625 */ @Artifact @Packaging(PackagingType.EAR) @BeansXml("beans.xml") +@SpecVersion("20090625") public class EnterpriseBeanDefinitionTest extends AbstractJSR299Test { @Test(groups = { "enterpriseBeans" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanViaXmlTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanViaXmlTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanViaXmlTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -19,8 +19,9 @@ import javax.enterprise.inject.spi.Bean; -import org.hibernate.tck.annotations.SpecAssertion; -import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.IntegrationTest; @@ -33,13 +34,12 @@ * These tests are any that involve ejb-jar.xml resources. * * @author David Allen - * - * Spec version: 20090625 */ @Artifact @Packaging(PackagingType.EAR) @IntegrationTest @EjbJarXml("ejb-jar.xml") +@SpecVersion("20090625") public class EnterpriseBeanViaXmlTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -11,8 +11,9 @@ import javax.enterprise.inject.AnnotationLiteral; import javax.enterprise.inject.spi.Bean; -import org.hibernate.tck.annotations.SpecAssertion; -import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.IntegrationTest; @@ -31,12 +32,11 @@ * * @author Nicklas Karlsson * @author David Allen - * - * Spec version: 20090625 */ @Artifact @Packaging(PackagingType.EAR) @IntegrationTest +@SpecVersion("20090625") public class EnterpriseBeanLifecycleTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanICTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanICTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanICTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -6,7 +6,8 @@ import javax.enterprise.inject.AnnotationLiteral; import javax.enterprise.inject.spi.Bean; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.literals.NewLiteral; import org.jboss.testharness.impl.packaging.Artifact; @@ -15,13 +16,10 @@ import org.jboss.testharness.impl.packaging.PackagingType; import org.testng.annotations.Test; -/** - * - * Spec version: 20090625 - */ @Artifact @Packaging(PackagingType.EAR) @IntegrationTest +@SpecVersion("20090625") public class NewEnterpriseBeanICTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -9,8 +9,9 @@ import javax.enterprise.inject.New; import javax.enterprise.inject.spi.Bean; -import org.hibernate.tck.annotations.SpecAssertion; -import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.literals.AnyLiteral; import org.jboss.jsr299.tck.literals.CurrentLiteral; @@ -20,13 +21,9 @@ import org.jboss.testharness.impl.packaging.PackagingType; import org.testng.annotations.Test; -/** - * - * Spec version: 20090625 - * - */ @Artifact @Packaging(PackagingType.EAR) +@SpecVersion("20090625") public class NewEnterpriseBeanTest extends AbstractJSR299Test { private Bean<WrappedEnterpriseBeanLocal> newEnterpriseBean; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/EnterpriseBeanRemoveMethodTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/EnterpriseBeanRemoveMethodTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/EnterpriseBeanRemoveMethodTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -4,8 +4,9 @@ import javax.enterprise.inject.spi.Bean; -import org.hibernate.tck.annotations.SpecAssertion; -import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.IntegrationTest; @@ -13,13 +14,13 @@ import org.testng.annotations.Test; /** - * Spec version: 20090625 * * @author Nicklas Karlsson */ @Artifact @Packaging(EAR) @IntegrationTest +@SpecVersion("20090625") public class EnterpriseBeanRemoveMethodTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/StateKeeper.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/StateKeeper.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/StateKeeper.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -7,7 +7,11 @@ @ApplicationScoped class StateKeeper implements Serializable { - private boolean removeCalled = false; + /** + * + */ + private static final long serialVersionUID = -7168331316716402245L; +private boolean removeCalled = false; private boolean beanDestroyed = false; public boolean isRemoveCalled() Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/EjbInitializerMethodTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/EjbInitializerMethodTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/EjbInitializerMethodTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -1,7 +1,8 @@ package org.jboss.jsr299.tck.tests.implementation.initializer; -import org.hibernate.tck.annotations.SpecAssertion; -import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.IntegrationTest; @@ -9,14 +10,10 @@ import org.jboss.testharness.impl.packaging.PackagingType; import org.testng.annotations.Test; -/** - * - * Spec version: 20090625 - * - */ @Artifact @Packaging(PackagingType.EAR) @IntegrationTest +@SpecVersion("20090625") public class EjbInitializerMethodTest extends AbstractJSR299Test { @Test(groups = { "initializerMethod", "ejb3" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/InitializerMethodTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/InitializerMethodTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/InitializerMethodTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -1,19 +1,17 @@ package org.jboss.jsr299.tck.tests.implementation.initializer; -import org.hibernate.tck.annotations.SpecAssertion; -import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.Packaging; import org.jboss.testharness.impl.packaging.PackagingType; import org.testng.annotations.Test; -/** - * - * Spec version: 20090625 - */ @Artifact @Packaging(PackagingType.EAR) +@SpecVersion("20090625") public class InitializerMethodTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/methodAnnotatedProduces/MethodAnnotatedProducesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/methodAnnotatedProduces/MethodAnnotatedProducesTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/methodAnnotatedProduces/MethodAnnotatedProducesTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -1,20 +1,18 @@ package org.jboss.jsr299.tck.tests.implementation.initializer.broken.methodAnnotatedProduces; -import org.hibernate.tck.annotations.SpecAssertion; -import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; -/** - * - * Spec version: 20090625 - */ @Artifact @ExpectedDeploymentException(DefinitionError.class) +@SpecVersion("20090625") public class MethodAnnotatedProducesTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -1,19 +1,17 @@ package org.jboss.jsr299.tck.tests.implementation.initializer.broken.parameterAnnotatedDisposes; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; -/** - * - * Spec version: 20090625 - */ @Artifact @ExpectedDeploymentException(DefinitionError.class) +@SpecVersion("20090625") public class ParameterAnnotatedDisposesTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -1,19 +1,16 @@ package org.jboss.jsr299.tck.tests.implementation.initializer.broken.parameterAnnotatedObserves; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; -/** - * - * Spec version: 20090625 - * - */ @Artifact @ExpectedDeploymentException(DefinitionError.class) +@SpecVersion("20090625") public class ParameterAnnotatedObservesTest extends AbstractJSR299Test { @Test(groups = "initializerMethod") Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/staticInitializer/StaticInitializerTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/staticInitializer/StaticInitializerTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/staticInitializer/StaticInitializerTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -1,19 +1,17 @@ package org.jboss.jsr299.tck.tests.implementation.initializer.staticInitializer; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; -/** - * - * Spec version: 20090625 - */ @Artifact @ExpectedDeploymentException(DefinitionError.class) +@SpecVersion("20090625") public class StaticInitializerTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/ProducerFieldDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/ProducerFieldDefinitionTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/ProducerFieldDefinitionTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -7,21 +7,18 @@ import javax.enterprise.inject.AnnotationLiteral; import javax.enterprise.inject.spi.Bean; -import org.hibernate.tck.annotations.SpecAssertion; -import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.literals.CurrentLiteral; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.jsr299.BeansXml; import org.testng.annotations.Test; -/** - * - * Spec version: 20090625 - * - */ @Artifact @BeansXml("beans.xml") +@SpecVersion("20090625") public class ProducerFieldDefinitionTest extends AbstractJSR299Test { private static final Annotation TAME_LITERAL = new AnnotationLiteral<Tame>() {}; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/TameTarantulaProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/TameTarantulaProducer.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/TameTarantulaProducer.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -2,7 +2,6 @@ import javax.enterprise.context.RequestScoped; import javax.enterprise.inject.Produces; -import javax.enterprise.inject.deployment.Production; class TameTarantulaProducer { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/parameterizedReturnTypeWithWildcard/ParameterizedReturnTypeWithWildcardTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/parameterizedReturnTypeWithWildcard/ParameterizedReturnTypeWithWildcardTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/parameterizedReturnTypeWithWildcard/ParameterizedReturnTypeWithWildcardTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -1,20 +1,17 @@ package org.jboss.jsr299.tck.tests.implementation.producer.field.definition.broken.parameterizedReturnTypeWithWildcard; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; -/** - * - * Spec version: 20090625 - * - */ @Artifact @ExpectedDeploymentException(DefinitionError.class) +@SpecVersion("20090625") public class ParameterizedReturnTypeWithWildcardTest extends AbstractJSR299Test { @Test(groups = "producerField") Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/enterprise/EnterpriseProducerFieldDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/enterprise/EnterpriseProducerFieldDefinitionTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/enterprise/EnterpriseProducerFieldDefinitionTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -4,7 +4,8 @@ import javax.enterprise.inject.AnnotationLiteral; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.IntegrationTest; @@ -13,15 +14,11 @@ import org.jboss.testharness.impl.packaging.jsr299.BeansXml; import org.testng.annotations.Test; -/** - * - * Spec version: 20090519 - * - */ @Artifact @IntegrationTest @Packaging(PackagingType.EAR) @BeansXml("beans.xml") +@SpecVersion("20090519") public class EnterpriseProducerFieldDefinitionTest extends AbstractJSR299Test { private static final Annotation FOO_LITERAL = new AnnotationLiteral<Foo>() {}; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/ProducerFieldLifecycleTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/ProducerFieldLifecycleTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/ProducerFieldLifecycleTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -2,20 +2,17 @@ import javax.enterprise.inject.IllegalProductException; -import org.hibernate.tck.annotations.SpecAssertion; -import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.jsr299.BeansXml; import org.testng.annotations.Test; -/** - * - * Spec version: 20090625 - * - */ @Artifact @BeansXml("beans.xml") +@SpecVersion("20090625") public class ProducerFieldLifecycleTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/enterprise/nonbusiness/ProducerMethodNotBusinessMethodTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/enterprise/nonbusiness/ProducerMethodNotBusinessMethodTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/enterprise/nonbusiness/ProducerMethodNotBusinessMethodTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -1,8 +1,9 @@ package org.jboss.jsr299.tck.tests.implementation.producer.method.broken.enterprise.nonbusiness; -import org.hibernate.tck.annotations.SpecAssertion; -import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; @@ -11,14 +12,10 @@ import org.jboss.testharness.impl.packaging.PackagingType; import org.testng.annotations.Test; -/** - * - * Spec version: 20090625 - * - */ @Artifact @Packaging(PackagingType.EAR) @ExpectedDeploymentException(DefinitionError.class) +@SpecVersion("20090625") public class ProducerMethodNotBusinessMethodTest extends AbstractJSR299Test { @Test Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -1,20 +1,17 @@ package org.jboss.jsr299.tck.tests.implementation.producer.method.broken.parameterAnnotatedDisposes; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; -/** - * - * Spec version: 20090625 - * - */ @Artifact @ExpectedDeploymentException(DefinitionError.class) +@SpecVersion("20090625") public class ParameterAnnotatedDisposesTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -1,20 +1,17 @@ package org.jboss.jsr299.tck.tests.implementation.producer.method.broken.parameterAnnotatedObserves; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; -/** - * - * Spec version: 20090625 - * - */ @Artifact @ExpectedDeploymentException(DefinitionError.class) +@SpecVersion("20090625") public class ParameterAnnotatedObservesTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithTypeParameter/ParameterizedTypeWithTypeParameterTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithTypeParameter/ParameterizedTypeWithTypeParameterTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithTypeParameter/ParameterizedTypeWithTypeParameterTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -1,20 +1,17 @@ package org.jboss.jsr299.tck.tests.implementation.producer.method.broken.parameterizedTypeWithTypeParameter; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; -/** - * - * Spec version: 20090625 - * - */ @Artifact @ExpectedDeploymentException(DefinitionError.class) +@SpecVersion("20090625") public class ParameterizedTypeWithTypeParameterTest extends AbstractJSR299Test { @Test(groups = "producerMethod") Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithTypeParameter2/ParameterizedTypeWithTypeParameterTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithTypeParameter2/ParameterizedTypeWithTypeParameterTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithTypeParameter2/ParameterizedTypeWithTypeParameterTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -1,20 +1,17 @@ package org.jboss.jsr299.tck.tests.implementation.producer.method.broken.parameterizedTypeWithTypeParameter2; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; -/** - * - * Spec version: 20090625 - * - */ @Artifact @ExpectedDeploymentException(DefinitionError.class) +@SpecVersion("20090625") public class ParameterizedTypeWithTypeParameterTest extends AbstractJSR299Test { @Test Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithWildcard/PamaterizedTypeWithWildcardTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithWildcard/PamaterizedTypeWithWildcardTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithWildcard/PamaterizedTypeWithWildcardTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -1,20 +1,17 @@ package org.jboss.jsr299.tck.tests.implementation.producer.method.broken.parameterizedTypeWithWildcard; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; -/** - * - * Spec version: 20090519 - * - */ @Artifact @ExpectedDeploymentException(DefinitionError.class) +@SpecVersion("20090519") public class PamaterizedTypeWithWildcardTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/LadybirdSpider.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/LadybirdSpider.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/LadybirdSpider.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -8,7 +8,12 @@ class LadybirdSpider extends Spider implements Serializable { - public void spinWeb() + /** + * + */ + private static final long serialVersionUID = 3406592573483935477L; + +public void spinWeb() { } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/ProducerMethodDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/ProducerMethodDefinitionTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/ProducerMethodDefinitionTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -9,8 +9,9 @@ import javax.enterprise.inject.TypeLiteral; import javax.enterprise.inject.spi.Bean; -import org.hibernate.tck.annotations.SpecAssertion; -import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.literals.AnyLiteral; import org.jboss.jsr299.tck.literals.CurrentLiteral; @@ -18,13 +19,9 @@ import org.jboss.testharness.impl.packaging.jsr299.BeansXml; import org.testng.annotations.Test; -/** - * - * Spec version: 20090625 - * - */ @Artifact @BeansXml("beans.xml") +@SpecVersion("20090625") public class ProducerMethodDefinitionTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/FooException.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/FooException.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/FooException.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -2,5 +2,10 @@ class FooException extends RuntimeException { + + /** + * + */ + private static final long serialVersionUID = 6562854972213425887L; } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/ProducerMethodLifecycleTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/ProducerMethodLifecycleTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/ProducerMethodLifecycleTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -7,20 +7,21 @@ import javax.enterprise.inject.IllegalProductException; import javax.enterprise.inject.spi.Bean; -import org.hibernate.tck.annotations.SpecAssertion; -import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.jsr299.BeansXml; import org.testng.annotations.Test; /** - * Spec version: 20090625 * * NOTE May be able to get rid of some of the binding types if the producer method precedence question is resolved */ @Artifact @BeansXml("beans.xml") +@SpecVersion("20090625") public class ProducerMethodLifecycleTest extends AbstractJSR299Test { private AnnotationLiteral<Pet> PET_LITERAL = new AnnotationLiteral<Pet>() {}; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/MockEnterpriseBean.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/MockEnterpriseBean.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/MockEnterpriseBean.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -4,5 +4,10 @@ class MockEnterpriseBean implements EnterpriseBean { + + /** + * + */ + private static final long serialVersionUID = -2903748486907540813L; } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanDefinitionTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanDefinitionTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -1,19 +1,16 @@ package org.jboss.jsr299.tck.tests.implementation.simple.definition; -import org.hibernate.tck.annotations.SpecAssertion; -import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.tests.implementation.simple.definition.OuterClass.InnerClass_NotBeean; import org.jboss.jsr299.tck.tests.implementation.simple.definition.OuterClass.StaticInnerClass; import org.jboss.testharness.impl.packaging.Artifact; import org.testng.annotations.Test; -/** - * - * Spec version: 20090625 - * - */ @Artifact +@SpecVersion("20090625") public class SimpleBeanDefinitionTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasDisposesParameter/ConstructorHasDisposesParameterTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasDisposesParameter/ConstructorHasDisposesParameterTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasDisposesParameter/ConstructorHasDisposesParameterTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -1,20 +1,17 @@ package org.jboss.jsr299.tck.tests.implementation.simple.definition.constructorHasDisposesParameter; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; -/** - * - * Spec version: 20090625 - * - */ @Artifact @ExpectedDeploymentException(DefinitionError.class) +@SpecVersion("20090625") public class ConstructorHasDisposesParameterTest extends AbstractJSR299Test { @Test(groups = { "disposalMethod" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasObservesParameter/ConstructorHasObservesParameterTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasObservesParameter/ConstructorHasObservesParameterTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasObservesParameter/ConstructorHasObservesParameterTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -1,20 +1,17 @@ package org.jboss.jsr299.tck.tests.implementation.simple.definition.constructorHasObservesParameter; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; -/** - * - * Spec version: 20090625 - * - */ @Artifact @ExpectedDeploymentException(DefinitionError.class) +@SpecVersion("20090625") public class ConstructorHasObservesParameterTest extends AbstractJSR299Test { @Test(groups = { "observerMethod" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/dependentWithPublicField/DependentWithPublicFieldTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/dependentWithPublicField/DependentWithPublicFieldTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/dependentWithPublicField/DependentWithPublicFieldTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -1,20 +1,17 @@ package org.jboss.jsr299.tck.tests.implementation.simple.definition.dependentWithPublicField; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; -/** - * - * Spec version: 20090625 - * - */ @Artifact @ExpectedDeploymentException(DefinitionError.class) +@SpecVersion("20090625") public class DependentWithPublicFieldTest extends AbstractJSR299Test { @Test Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/tooManyInitializerAnnotatedConstructors/TooManyInitializerAnnotatedConstructorsTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/tooManyInitializerAnnotatedConstructors/TooManyInitializerAnnotatedConstructorsTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/tooManyInitializerAnnotatedConstructors/TooManyInitializerAnnotatedConstructorsTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -1,20 +1,17 @@ package org.jboss.jsr299.tck.tests.implementation.simple.definition.tooManyInitializerAnnotatedConstructors; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; -/** - * - * Spec version: 20090625 - * - */ @Artifact @ExpectedDeploymentException(DefinitionError.class) +@SpecVersion("20090625") public class TooManyInitializerAnnotatedConstructorsTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/FooException.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/FooException.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/FooException.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -2,5 +2,10 @@ class FooException extends RuntimeException { + + /** + * + */ + private static final long serialVersionUID = 3250507068142756766L; } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -12,19 +12,18 @@ import javax.enterprise.inject.Specializes; import javax.enterprise.inject.spi.Bean; -import org.hibernate.tck.annotations.SpecAssertion; -import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.impl.MockCreationalContext; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.jsr299.BeansXml; import org.testng.annotations.Test; -/** - * Spec version: 20090625 - */ @Artifact @BeansXml("beans.xml") +@SpecVersion("20090625") public class SimpleBeanLifecycleTest extends AbstractJSR299Test { private static final Annotation TAME_LITERAL = new AnnotationLiteral<Tame>() Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/NewSimpleBeanTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/NewSimpleBeanTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/NewSimpleBeanTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -10,8 +10,9 @@ import javax.enterprise.inject.New; import javax.enterprise.inject.spi.Bean; -import org.hibernate.tck.annotations.SpecAssertion; -import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.literals.AnyLiteral; import org.jboss.jsr299.tck.literals.CurrentLiteral; @@ -19,12 +20,8 @@ import org.jboss.testharness.impl.packaging.Artifact; import org.testng.annotations.Test; -/** - * - * Spec version: 20090625 - * - */ @Artifact +@SpecVersion("20090625") public class NewSimpleBeanTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/EjbInjectionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/EjbInjectionTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/EjbInjectionTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -24,8 +24,9 @@ import javax.enterprise.context.spi.CreationalContext; import javax.enterprise.inject.spi.Bean; -import org.hibernate.tck.annotations.SpecAssertion; -import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.IntegrationTest; @@ -37,14 +38,13 @@ /** * EJB injection tests for simple beans. * - * Spec version: 20090625 - * * @author David Allen */ @Artifact @Packaging(PackagingType.EAR) @IntegrationTest @BeansXml("beans.xml") +@SpecVersion("20090625") public class EjbInjectionTest extends AbstractJSR299Test { @Test(groups = { "beanLifecycle", "commonAnnotations", "integration" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/Monitor.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/Monitor.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/Monitor.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -6,7 +6,11 @@ @RequestScoped class Monitor implements Serializable { - private boolean remoteEjbDestroyed = false; + /** + * + */ + private static final long serialVersionUID = 4495864336368063408L; +private boolean remoteEjbDestroyed = false; public void remoteEjbDestroyed() { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/env/EnvInjectionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/env/EnvInjectionTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/env/EnvInjectionTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -20,8 +20,9 @@ import javax.enterprise.inject.AnnotationLiteral; import javax.enterprise.inject.spi.Bean; -import org.hibernate.tck.annotations.SpecAssertion; -import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.IntegrationTest; @@ -34,8 +35,6 @@ /** * Environment variable injection tests for simple beans. * - * Spec version: 20090625 - * * @author Dan Allen */ @Artifact @@ -43,6 +42,7 @@ @IntegrationTest @Resource(source="web.xml", destination="/WEB-INF/web.xml") @BeansXml("beans.xml") +@SpecVersion("20090625") public class EnvInjectionTest extends AbstractJSR299Test { @Test(groups = { "beanLifecycle", "commonAnnotations", "integration" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/PersistenceContextInjectionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/PersistenceContextInjectionTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/PersistenceContextInjectionTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -3,8 +3,9 @@ import javax.enterprise.context.spi.CreationalContext; import javax.enterprise.inject.spi.Bean; -import org.hibernate.tck.annotations.SpecAssertion; -import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.IntegrationTest; @@ -16,8 +17,6 @@ /** * Injection of persistence related objects. - * - * Spec version: 20090625 * * @author David Allen */ @@ -27,6 +26,7 @@ @Resource(source = "persistence.xml", destination = "WEB-INF/classes/META-INF/persistence.xml") //@PersistenceXml("persistence.xml") @BeansXml("beans.xml") +@SpecVersion("20090625") public class PersistenceContextInjectionTest extends AbstractJSR299Test { @Test(groups = { "beanLifecycle", "commonAnnotations", "integration" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/InjectionOfResourceTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/InjectionOfResourceTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/InjectionOfResourceTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -5,8 +5,9 @@ import javax.enterprise.inject.spi.Bean; import javax.enterprise.inject.spi.BeanManager; -import org.hibernate.tck.annotations.SpecAssertion; -import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.IntegrationTest; @@ -15,13 +16,11 @@ import org.jboss.testharness.impl.packaging.jsr299.BeansXml; import org.testng.annotations.Test; -/** - * Spec version: 20090625 - */ @Artifact @Packaging(PackagingType.WAR) @IntegrationTest @BeansXml("beans.xml") +@SpecVersion("20090625") public class InjectionOfResourceTest extends AbstractJSR299Test { @Test(groups = { "beanLifecycle", "commonAnnotations", "integration" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationIntegrationTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationIntegrationTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationIntegrationTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -4,8 +4,9 @@ import javax.enterprise.inject.AnnotationLiteral; -import org.hibernate.tck.annotations.SpecAssertion; -import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.IntegrationTest; @@ -14,15 +15,11 @@ import org.jboss.testharness.impl.packaging.jsr299.BeansXml; import org.testng.annotations.Test; -/** - * - * Spec version: 20090625 - * - */ @Artifact @IntegrationTest @Packaging(PackagingType.EAR) @BeansXml("beans.xml") +@SpecVersion("20090625") public class EnterpriseBeanSpecializationIntegrationTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -6,8 +6,9 @@ import javax.enterprise.inject.Any; import javax.enterprise.inject.spi.Bean; -import org.hibernate.tck.annotations.SpecAssertion; -import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.Packaging; @@ -15,12 +16,10 @@ import org.jboss.testharness.impl.packaging.jsr299.BeansXml; import org.testng.annotations.Test; -/** - * Spec version: 20090519 - */ @Artifact @Packaging(PackagingType.EAR) @BeansXml("beans.xml") +@SpecVersion("20090519") public class EnterpriseBeanSpecializationTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsNothing/DirectlyExtendsNothingTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsNothing/DirectlyExtendsNothingTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsNothing/DirectlyExtendsNothingTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -1,7 +1,8 @@ package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.broken.directlyExtendsNothing; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; @@ -10,12 +11,10 @@ import org.jboss.testharness.impl.packaging.PackagingType; import org.testng.annotations.Test; -/** - * Spec version: 20090625 - */ @Artifact @ExpectedDeploymentException(DefinitionError.class) @Packaging(PackagingType.EAR) +@SpecVersion("20090625") public class DirectlyExtendsNothingTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsSimpleBean/DirectlyExtendsSimpleBeanTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsSimpleBean/DirectlyExtendsSimpleBeanTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsSimpleBean/DirectlyExtendsSimpleBeanTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -1,7 +1,8 @@ package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.broken.directlyExtendsSimpleBean; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; @@ -10,12 +11,10 @@ import org.jboss.testharness.impl.packaging.PackagingType; import org.testng.annotations.Test; -/** - * Spec version: 20090625 - */ @Artifact @Packaging(PackagingType.EAR) @ExpectedDeploymentException(DefinitionError.class) +@SpecVersion("20090625") public class DirectlyExtendsSimpleBeanTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/implementInterfaceAndExtendsNothing/ImplementsInterfaceAndExtendsNothingTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/implementInterfaceAndExtendsNothing/ImplementsInterfaceAndExtendsNothingTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/implementInterfaceAndExtendsNothing/ImplementsInterfaceAndExtendsNothingTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -1,7 +1,8 @@ package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.broken.implementInterfaceAndExtendsNothing; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; @@ -10,12 +11,10 @@ import org.jboss.testharness.impl.packaging.PackagingType; import org.testng.annotations.Test; -/** - * Spec version: 20090625 - */ @ExpectedDeploymentException(DefinitionError.class) @Artifact @Packaging(PackagingType.EAR) +@SpecVersion("20090625") public class ImplementsInterfaceAndExtendsNothingTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/sameName/SameNameTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/sameName/SameNameTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/sameName/SameNameTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -1,7 +1,8 @@ package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.broken.sameName; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; @@ -11,17 +12,13 @@ import org.jboss.testharness.impl.packaging.jsr299.BeansXml; import org.testng.annotations.Test; -/** - * Spec version: 20090519 - */ @Artifact @ExpectedDeploymentException(DefinitionError.class) @Packaging(PackagingType.EAR) @BeansXml("beans.xml") +@SpecVersion("20090519") public class SameNameTest extends AbstractJSR299Test { - - @Test @SpecAssertion(section = "4.3.1", id = "l") public void testSpecializingAndSpecializedBeanHasName() Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -1,6 +1,7 @@ package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.broken.twoBeansSpecializeTheSameBean; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DeploymentError; import org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.two.TwoSpecializingBeansForOneSpecializedTest; @@ -11,13 +12,11 @@ import org.jboss.testharness.impl.packaging.jsr299.BeansXml; import org.testng.annotations.Test; -/** - * Spec version: 20090625 - */ @Artifact @Packaging(PackagingType.EAR) @BeansXml("beans.xml") @ExpectedDeploymentException(DeploymentError.class) +@SpecVersion("20090625") public class TwoBeansSpecializeTheSameBeanTest extends AbstractJSR299Test { /** Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/ProducerMethodSpecializationTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/ProducerMethodSpecializationTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/ProducerMethodSpecializationTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -5,19 +5,17 @@ import javax.enterprise.inject.AnnotationLiteral; import javax.enterprise.inject.Any; -import org.hibernate.tck.annotations.SpecAssertion; -import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.jsr299.BeansXml; import org.testng.annotations.Test; -/** - * Spec version: 20090625 - * - */ @Artifact @BeansXml("beans.xml") +@SpecVersion("20090625") public class ProducerMethodSpecializationTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/indirectOverride/IndirectOverrideTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/indirectOverride/IndirectOverrideTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/indirectOverride/IndirectOverrideTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -1,18 +1,17 @@ package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.broken.indirectOverride; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; -/** - * Spec version: 20090625 - */ @Artifact @ExpectedDeploymentException(DefinitionError.class) +@SpecVersion("20090625") public class IndirectOverrideTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializesStaticMethod/SpecializesStaticMethodTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializesStaticMethod/SpecializesStaticMethodTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializesStaticMethod/SpecializesStaticMethodTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -1,18 +1,17 @@ package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.broken.specializesStaticMethod; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; -/** - * Spec version: 20090625 - */ @Artifact @ExpectedDeploymentException(DefinitionError.class) +@SpecVersion("20090625") public class SpecializesStaticMethodTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializingAndSpecializedBeanHaveName/SpecializingAndSpecializedBeanHaveNameTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializingAndSpecializedBeanHaveName/SpecializingAndSpecializedBeanHaveNameTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializingAndSpecializedBeanHaveName/SpecializingAndSpecializedBeanHaveNameTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -1,18 +1,17 @@ package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.broken.specializingAndSpecializedBeanHaveName; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; -/** - * Spec version: 20090519 - */ @Artifact @ExpectedDeploymentException(DefinitionError.class) +@SpecVersion("20090519") public class SpecializingAndSpecializedBeanHaveNameTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -1,6 +1,7 @@ package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.broken.twoBeansSpecializeTheSameBean; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DeploymentError; import org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.two.TwoSpecializingBeansForOneSpecializedTest; @@ -8,11 +9,9 @@ import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; -/** - * Spec version: 20090625 - */ @Artifact @ExpectedDeploymentException(DeploymentError.class) +@SpecVersion("20090625") public class TwoBeansSpecializeTheSameBeanTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/SimpleBeanSpecializationTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/SimpleBeanSpecializationTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/SimpleBeanSpecializationTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -6,19 +6,17 @@ import javax.enterprise.inject.Any; import javax.enterprise.inject.spi.Bean; -import org.hibernate.tck.annotations.SpecAssertion; -import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.jsr299.BeansXml; import org.testng.annotations.Test; -/** - * Spec version: 20090625 - * - */ @Artifact @BeansXml("beans.xml") +@SpecVersion("20090625") public class SimpleBeanSpecializationTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/SpecializingBeanExtendsEnterpriseBeanTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/SpecializingBeanExtendsEnterpriseBeanTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/SpecializingBeanExtendsEnterpriseBeanTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -1,7 +1,8 @@ package org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.extendejb; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; @@ -10,12 +11,10 @@ import org.jboss.testharness.impl.packaging.PackagingType; import org.testng.annotations.Test; -/** - * Spec version: 20090625 - */ @Artifact @Packaging(PackagingType.EAR) @ExpectedDeploymentException(DefinitionError.class) +@SpecVersion("20090625") public class SpecializingBeanExtendsEnterpriseBeanTest extends AbstractJSR299Test { @Test(groups = { "specialization" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/SpecializingAndSpecializedBeanHasNameTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/SpecializingAndSpecializedBeanHasNameTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/SpecializingAndSpecializedBeanHasNameTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -1,18 +1,17 @@ package org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.names; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; -/** - * Spec version: 20090519 - */ @Artifact @ExpectedDeploymentException(DefinitionError.class) +@SpecVersion("20090519") public class SpecializingAndSpecializedBeanHasNameTest extends AbstractJSR299Test { @Test Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/SpecializingBeanImplementsInterfaceOnly.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/SpecializingBeanImplementsInterfaceOnly.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/SpecializingBeanImplementsInterfaceOnly.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -1,18 +1,17 @@ package org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.noextend1; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; -/** - * Spec version: 20090625 - */ @Artifact @ExpectedDeploymentException(DefinitionError.class) +@SpecVersion("20090625") public class SpecializingBeanImplementsInterfaceOnly extends AbstractJSR299Test { @Test(groups = { "specialization" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/SpecializingBeanExtendsNothingTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/SpecializingBeanExtendsNothingTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/SpecializingBeanExtendsNothingTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -1,18 +1,17 @@ package org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.noextend2; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; -/** - * Spec version: 20090625 - */ @Artifact @ExpectedDeploymentException(DefinitionError.class) +@SpecVersion("20090625") public class SpecializingBeanExtendsNothingTest extends AbstractJSR299Test { @Test(groups = { "specialization" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/SpecializingClassExtendsNonSimpleBeanTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/SpecializingClassExtendsNonSimpleBeanTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/SpecializingClassExtendsNonSimpleBeanTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -1,18 +1,17 @@ package org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.noextend3; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; -/** - * Spec version: 20090625 - */ @Artifact @ExpectedDeploymentException(DefinitionError.class) +@SpecVersion("20090625") public class SpecializingClassExtendsNonSimpleBeanTest extends AbstractJSR299Test { @Test(groups = { "specialization" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/TwoSpecializingBeansForOneSpecializedTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/TwoSpecializingBeansForOneSpecializedTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/TwoSpecializingBeansForOneSpecializedTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -1,6 +1,7 @@ package org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.two; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DeploymentError; import org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.broken.twoBeansSpecializeTheSameBean.TwoBeansSpecializeTheSameBeanTest; @@ -8,11 +9,9 @@ import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; -/** - * Spec version: 20090625 - */ @Artifact @ExpectedDeploymentException(DeploymentError.class) +@SpecVersion("20090625") public class TwoSpecializingBeansForOneSpecializedTest extends AbstractJSR299Test { /** Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/InterceptorDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/InterceptorDefinitionTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/InterceptorDefinitionTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -21,8 +21,9 @@ import javax.enterprise.inject.spi.Interceptor; -import org.hibernate.tck.annotations.SpecAssertion; -import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.testharness.impl.packaging.Artifact; import org.testng.annotations.Test; @@ -30,13 +31,12 @@ /** * Tests related to the definition of interceptors, but not necessarily * their execution. - * - * Spec version: 20090625 * * @author David Allen * */ @Artifact +@SpecVersion("20090625") public class InterceptorDefinitionTest extends AbstractJSR299Test { @Test(groups = "ri-broken") Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/binding/members/annotation/BindingAnnotationWithMemberTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/binding/members/annotation/BindingAnnotationWithMemberTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/binding/members/annotation/BindingAnnotationWithMemberTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -16,19 +16,17 @@ */ package org.jboss.jsr299.tck.tests.lookup.binding.members.annotation; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; -/** - * - * Spec version: 2009625 - */ @Artifact @ExpectedDeploymentException(DefinitionError.class) +@SpecVersion("20090625") public class BindingAnnotationWithMemberTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/binding/members/array/BindingAnnotationWithMemberTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/binding/members/array/BindingAnnotationWithMemberTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/binding/members/array/BindingAnnotationWithMemberTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -16,19 +16,17 @@ */ package org.jboss.jsr299.tck.tests.lookup.binding.members.array; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; -/** - * - * Spec version: 2009625 - */ @Artifact @ExpectedDeploymentException(DefinitionError.class) +@SpecVersion("20090625") public class BindingAnnotationWithMemberTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/ResolutionByNameTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/ResolutionByNameTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/ResolutionByNameTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -16,19 +16,16 @@ */ package org.jboss.jsr299.tck.tests.lookup.byname; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.jsr299.BeansXml; import org.testng.annotations.Test; -/** - * - * Spec version: 20090625 - * - */ @Artifact @BeansXml("beans.xml") +@SpecVersion("20090625") public class ResolutionByNameTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicateNameResolution/DuplicateNameResolutionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicateNameResolution/DuplicateNameResolutionTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicateNameResolution/DuplicateNameResolutionTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -17,20 +17,17 @@ package org.jboss.jsr299.tck.tests.lookup.byname.duplicateNameResolution; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DeploymentError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; -/** - * - * Spec version: 20090625 - * - */ @Artifact @ExpectedDeploymentException(DeploymentError.class) +@SpecVersion("20090625") public class DuplicateNameResolutionTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicatePrefixResolution/DuplicateNamePrefixResolutionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicatePrefixResolution/DuplicateNamePrefixResolutionTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicatePrefixResolution/DuplicateNamePrefixResolutionTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -17,21 +17,17 @@ package org.jboss.jsr299.tck.tests.lookup.byname.duplicatePrefixResolution; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DeploymentError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; -/** - * - * Spec version: 20090625 - * - */ - @Artifact @ExpectedDeploymentException(DeploymentError.class) +@SpecVersion("20090625") public class DuplicateNamePrefixResolutionTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/circular/CircularDependencyTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/circular/CircularDependencyTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/circular/CircularDependencyTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -16,17 +16,14 @@ */ package org.jboss.jsr299.tck.tests.lookup.circular; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.testharness.impl.packaging.Artifact; import org.testng.annotations.Test; -/** - * - * Spec version: 20090625 - * - */ @Artifact +@SpecVersion("20090625") public class CircularDependencyTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/ClientProxyTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/ClientProxyTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/ClientProxyTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -21,17 +21,14 @@ import javax.enterprise.context.ContextNotActiveException; import javax.enterprise.inject.spi.Bean; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.testharness.impl.packaging.Artifact; import org.testng.annotations.Test; -/** - * - * Spec version: 20090625 - * - */ @Artifact +@SpecVersion("20090625") public class ClientProxyTest extends AbstractJSR299Test { @Test Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/array/ArrayTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/array/ArrayTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/array/ArrayTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -16,7 +16,8 @@ */ package org.jboss.jsr299.tck.tests.lookup.clientProxy.unproxyable.array; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DeploymentError; import org.jboss.testharness.impl.packaging.Artifact; @@ -25,11 +26,10 @@ /** * Test for problem detection of array injection. - * - * Spec version: 2009625 */ @Artifact @ExpectedDeploymentException(DeploymentError.class) +@SpecVersion("20090625") public class ArrayTest extends AbstractJSR299Test { @Test Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/finalClass/FinalClassTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/finalClass/FinalClassTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/finalClass/FinalClassTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -16,21 +16,17 @@ */ package org.jboss.jsr299.tck.tests.lookup.clientProxy.unproxyable.finalClass; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DeploymentError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; -/** - * - * Spec version: 20090625 - * - */ - @Artifact @ExpectedDeploymentException(DeploymentError.class) +@SpecVersion("20090625") public class FinalClassTest extends AbstractJSR299Test { @Test Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/finalMethod/FinalMethodTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/finalMethod/FinalMethodTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/finalMethod/FinalMethodTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -16,21 +16,17 @@ */ package org.jboss.jsr299.tck.tests.lookup.clientProxy.unproxyable.finalMethod; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DeploymentError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; -/** - * - * Spec version: 20090625 - * - */ - @Artifact @ExpectedDeploymentException(DeploymentError.class) +@SpecVersion("20090625") public class FinalMethodTest extends AbstractJSR299Test { @Test Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/primitive/UnproxyableTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/primitive/UnproxyableTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/primitive/UnproxyableTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -16,21 +16,17 @@ */ package org.jboss.jsr299.tck.tests.lookup.clientProxy.unproxyable.primitive; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DeploymentError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; -/** - * - * Spec version: 20090625 - * - */ - @Artifact @ExpectedDeploymentException(DeploymentError.class) +@SpecVersion("20090625") public class UnproxyableTest extends AbstractJSR299Test { @Test Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/privateConstructor/PrivateConstructorTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/privateConstructor/PrivateConstructorTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/privateConstructor/PrivateConstructorTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -16,7 +16,8 @@ */ package org.jboss.jsr299.tck.tests.lookup.clientProxy.unproxyable.privateConstructor; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DeploymentError; import org.jboss.testharness.impl.packaging.Artifact; @@ -26,11 +27,10 @@ /** * Test for problem detection of unproxyable bean with private constructor. - * - * Spec version: 20090625 */ @Artifact @ExpectedDeploymentException(DeploymentError.class) +@SpecVersion("20090625") public class PrivateConstructorTest extends AbstractJSR299Test { @Test Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/DependencyResolutionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/DependencyResolutionTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/DependencyResolutionTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -13,7 +13,8 @@ import javax.enterprise.inject.spi.Bean; import javax.enterprise.inject.spi.InjectionPoint; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.ForwardingBean; import org.jboss.testharness.impl.packaging.Artifact; @@ -21,10 +22,9 @@ /** * Tests for dependency resolution problem detection - * - * Spec version: 20090625 */ @Artifact +@SpecVersion("20090625") public class DependencyResolutionTest extends AbstractJSR299Test { class MockInjectionPoint implements InjectionPoint Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/broken/ambiguous/AmbiguousDependencyTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/broken/ambiguous/AmbiguousDependencyTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/broken/ambiguous/AmbiguousDependencyTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -16,20 +16,17 @@ */ package org.jboss.jsr299.tck.tests.lookup.dependency.resolution.broken.ambiguous; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DeploymentError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; -/** - * - * Spec version: 20090625 - * - */ @Artifact @ExpectedDeploymentException(DeploymentError.class) +@SpecVersion("20090625") public class AmbiguousDependencyTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/broken/unsatisfied/UnsatisfiedDependencyTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/broken/unsatisfied/UnsatisfiedDependencyTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/broken/unsatisfied/UnsatisfiedDependencyTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -16,20 +16,17 @@ */ package org.jboss.jsr299.tck.tests.lookup.dependency.resolution.broken.unsatisfied; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DeploymentError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; -/** - * - * Spec version: 20090625 - * - */ @Artifact @ExpectedDeploymentException(DeploymentError.class) +@SpecVersion("20090625") public class UnsatisfiedDependencyTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/DynamicLookupTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/DynamicLookupTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/DynamicLookupTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -21,8 +21,9 @@ import javax.enterprise.inject.Instance; import javax.enterprise.inject.UnsatisfiedResolutionException; -import org.hibernate.tck.annotations.SpecAssertion; -import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.testharness.impl.packaging.Artifact; import org.testng.annotations.Test; @@ -32,10 +33,9 @@ * * @author Shane Bryzak * @author Jozef Hartinger - * - * Spec version: 20090625 */ @Artifact +@SpecVersion("20090625") public class DynamicLookupTest extends AbstractJSR299Test { @Test Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/builtin/BuiltinInstanceTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/builtin/BuiltinInstanceTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/builtin/BuiltinInstanceTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -21,19 +21,18 @@ import javax.enterprise.inject.TypeLiteral; import javax.enterprise.inject.spi.Bean; -import org.hibernate.tck.annotations.SpecAssertion; -import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.testharness.impl.packaging.Artifact; import org.testng.annotations.Test; /** * Tests for built-in Instance. - * - * Spec version: 2009625 */ - @Artifact +@SpecVersion("20090625") public class BuiltinInstanceTest extends AbstractJSR299Test { @Test Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/el/ResolutionByNameTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/el/ResolutionByNameTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/el/ResolutionByNameTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -5,18 +5,15 @@ import javax.enterprise.context.spi.Context; import javax.enterprise.inject.spi.Bean; -import org.hibernate.tck.annotations.SpecAssertion; -import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.testharness.impl.packaging.Artifact; import org.testng.annotations.Test; -/** - * - * Spec version: 20090625 - * - */ @Artifact +@SpecVersion("20090625") public class ResolutionByNameTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/InjectionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/InjectionTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/InjectionTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -1,18 +1,15 @@ package org.jboss.jsr299.tck.tests.lookup.injection; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.jsr299.BeansXml; import org.testng.annotations.Test; -/** - * - * Spec version: 20090625 - * - */ @Artifact @BeansXml("beans.xml") +@SpecVersion("20090625") public class InjectionTest extends AbstractJSR299Test { @Test(groups = { "injection", "producerMethod" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/nullableBean/NullableBeanTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/nullableBean/NullableBeanTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/nullableBean/NullableBeanTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -1,18 +1,16 @@ package org.jboss.jsr299.tck.tests.lookup.injection.nullableBean; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DeploymentError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; -/** - * - * Spec version: 20090625 - */ @Artifact @ExpectedDeploymentException(DeploymentError.class) +@SpecVersion("20090625") public class NullableBeanTest extends AbstractJSR299Test { @Test(groups = { "injection", "producerMethod" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/InjectableReferenceTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/InjectableReferenceTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/InjectableReferenceTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -21,8 +21,9 @@ import javax.enterprise.inject.spi.Bean; import javax.enterprise.inject.spi.InjectionPoint; -import org.hibernate.tck.annotations.SpecAssertion; -import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.literals.CurrentLiteral; import org.jboss.testharness.impl.packaging.Artifact; @@ -39,6 +40,7 @@ */ @Artifact @BeansXml("beans.xml") +@SpecVersion("unknown") public class InjectableReferenceTest extends AbstractJSR299Test { @SuppressWarnings("unchecked") Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/InjectionPointTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/InjectionPointTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/InjectionPointTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -29,8 +29,9 @@ import javax.enterprise.inject.spi.Bean; import javax.enterprise.inject.spi.InjectionPoint; -import org.hibernate.tck.annotations.SpecAssertion; -import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.literals.CurrentLiteral; import org.jboss.testharness.impl.packaging.Artifact; @@ -42,11 +43,10 @@ * * @author David Allen * @author Jozef Hartinger - * - * Spec version: 20090625 */ @Artifact @BeansXml("beans.xml") +@SpecVersion("20090625") public class InjectionPointTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/broken/normal/scope/NormalScopedBeanWithInjectionPoint.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/broken/normal/scope/NormalScopedBeanWithInjectionPoint.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/broken/normal/scope/NormalScopedBeanWithInjectionPoint.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -16,19 +16,17 @@ */ package org.jboss.jsr299.tck.tests.lookup.injectionpoint.broken.normal.scope; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; -/** - * - * Spec version: 2009625 - */ @Artifact @ExpectedDeploymentException(DefinitionError.class) +@SpecVersion("20090625") public class NormalScopedBeanWithInjectionPoint extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/broken/not/bean/InjectionPointOnNonBeanTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/broken/not/bean/InjectionPointOnNonBeanTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/broken/not/bean/InjectionPointOnNonBeanTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -16,18 +16,16 @@ */ package org.jboss.jsr299.tck.tests.lookup.injectionpoint.broken.not.bean; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; -/** - * - * Spec version: 2009625 - */ @Artifact @ExpectedDeploymentException(DefinitionError.class) +@SpecVersion("20090625") public class InjectionPointOnNonBeanTest { @Test(groups = { "injectionPoint", "ri-broken" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/ManagerTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/ManagerTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/ManagerTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -8,18 +8,15 @@ import javax.enterprise.inject.spi.Bean; import javax.enterprise.inject.spi.BeanManager; -import org.hibernate.tck.annotations.SpecAssertion; -import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.testharness.impl.packaging.Artifact; import org.testng.annotations.Test; -/** - * - * Spec version: 20090625 - * - */ @Artifact +@SpecVersion("20090625") public class ManagerTest extends AbstractJSR299Test { @Test(groups={"manager", "injection", "deployment"}) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/jndi/ManagerTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/jndi/ManagerTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/jndi/ManagerTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -3,19 +3,16 @@ import javax.enterprise.inject.spi.BeanManager; import javax.naming.InitialContext; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.IntegrationTest; import org.testng.annotations.Test; -/** - * - * Spec version: 20090625 - * - */ @Artifact @IntegrationTest +@SpecVersion("20090625") public class ManagerTest extends AbstractJSR299Test { @Test(groups = { "manager", "ejb3", "integration", "rewrite" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -26,20 +26,17 @@ import javax.enterprise.inject.TypeLiteral; import javax.enterprise.inject.spi.Bean; -import org.hibernate.tck.annotations.SpecAssertion; -import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.literals.AnyLiteral; import org.jboss.jsr299.tck.literals.CurrentLiteral; import org.jboss.testharness.impl.packaging.Artifact; import org.testng.annotations.Test; -/** - * - * Spec version: 20090625 - * - */ @Artifact +@SpecVersion("20090625") public class ResolutionByTypeTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/broken/primitive/PrimitiveInjectionPointTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/broken/primitive/PrimitiveInjectionPointTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/broken/primitive/PrimitiveInjectionPointTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -16,20 +16,17 @@ */ package org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.broken.primitive; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DeploymentError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; -/** - * - * Spec version: 20090625 - * - */ @Artifact @ExpectedDeploymentException(DeploymentError.class) +@SpecVersion("20090625") public class PrimitiveInjectionPointTest extends AbstractJSR299Test { @Test(groups={"resolution", "producerMethod"}) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/broken/type/variable/TypeVariableInjectionPointTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/broken/type/variable/TypeVariableInjectionPointTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/broken/type/variable/TypeVariableInjectionPointTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -16,20 +16,17 @@ */ package org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.broken.type.variable; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; -/** - * - * Spec version: 20090625 - * - */ @Artifact @ExpectedDeploymentException(DefinitionError.class) +@SpecVersion("20090625") public class TypeVariableInjectionPointTest extends AbstractJSR299Test { @Test(groups = { "resolution"}) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/parameterized/AssignabilityOfRawAndParameterizedTypesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/parameterized/AssignabilityOfRawAndParameterizedTypesTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/parameterized/AssignabilityOfRawAndParameterizedTypesTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -20,16 +20,15 @@ import javax.enterprise.inject.TypeLiteral; -import org.hibernate.tck.annotations.SpecAssertion; -import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.testharness.impl.packaging.Artifact; import org.testng.annotations.Test; -/** - * Spec version: 2009625 - */ @Artifact +@SpecVersion("20090625") public class AssignabilityOfRawAndParameterizedTypesTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/PolicyAvailabilityTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/PolicyAvailabilityTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/PolicyAvailabilityTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -23,20 +23,17 @@ import javax.enterprise.inject.AnnotationLiteral; import javax.enterprise.inject.spi.Bean; -import org.hibernate.tck.annotations.SpecAssertion; -import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.jsr299.BeansXml; import org.testng.annotations.Test; -/** - * - * Spec version: 20090625 - * - */ @Artifact @BeansXml("beans.xml") +@SpecVersion("20090625") public class PolicyAvailabilityTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/incorrect/name/NoClassWithSpecifiedNameTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/incorrect/name/NoClassWithSpecifiedNameTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/incorrect/name/NoClassWithSpecifiedNameTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -16,7 +16,8 @@ */ package org.jboss.jsr299.tck.tests.policy.broken.incorrect.name; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DeploymentError; import org.jboss.testharness.impl.packaging.Artifact; @@ -24,14 +25,10 @@ import org.jboss.testharness.impl.packaging.jsr299.BeansXml; import org.testng.annotations.Test; -/** - * - * Spec version: 20090625 - * - */ @Artifact @BeansXml("beans.xml") @ExpectedDeploymentException(DeploymentError.class) +@SpecVersion("20090625") public class NoClassWithSpecifiedNameTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/incorrect/name/stereotype/NoAnnotationWithSpecifiedNameTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/incorrect/name/stereotype/NoAnnotationWithSpecifiedNameTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/incorrect/name/stereotype/NoAnnotationWithSpecifiedNameTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -16,7 +16,8 @@ */ package org.jboss.jsr299.tck.tests.policy.broken.incorrect.name.stereotype; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DeploymentError; import org.jboss.testharness.impl.packaging.Artifact; @@ -24,14 +25,10 @@ import org.jboss.testharness.impl.packaging.jsr299.BeansXml; import org.testng.annotations.Test; -/** - * - * Spec version: 20090625 - * - */ @Artifact @BeansXml("beans.xml") @ExpectedDeploymentException(DeploymentError.class) +@SpecVersion("20090625") public class NoAnnotationWithSpecifiedNameTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/not/policy/ClassIsNotPolicyTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/not/policy/ClassIsNotPolicyTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/not/policy/ClassIsNotPolicyTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -16,7 +16,8 @@ */ package org.jboss.jsr299.tck.tests.policy.broken.not.policy; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DeploymentError; import org.jboss.testharness.impl.packaging.Artifact; @@ -24,14 +25,10 @@ import org.jboss.testharness.impl.packaging.jsr299.BeansXml; import org.testng.annotations.Test; -/** - * - * Spec version: 20090625 - * - */ @Artifact @BeansXml("beans.xml") @ExpectedDeploymentException(DeploymentError.class) +@SpecVersion("20090625") public class ClassIsNotPolicyTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/not/policy/stereotype/ClassIsNotPolicyTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/not/policy/stereotype/ClassIsNotPolicyTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/not/policy/stereotype/ClassIsNotPolicyTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -16,7 +16,8 @@ */ package org.jboss.jsr299.tck.tests.policy.broken.not.policy.stereotype; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DeploymentError; import org.jboss.testharness.impl.packaging.Artifact; @@ -24,14 +25,10 @@ import org.jboss.testharness.impl.packaging.jsr299.BeansXml; import org.testng.annotations.Test; -/** - * - * Spec version: 20090625 - * - */ @Artifact @BeansXml("beans.xml") @ExpectedDeploymentException(DeploymentError.class) +@SpecVersion("20090625") public class ClassIsNotPolicyTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/same/type/twice/SameTypeListedTwiceTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/same/type/twice/SameTypeListedTwiceTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/same/type/twice/SameTypeListedTwiceTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -16,7 +16,8 @@ */ package org.jboss.jsr299.tck.tests.policy.broken.same.type.twice; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DeploymentError; import org.jboss.testharness.impl.packaging.Artifact; @@ -24,14 +25,10 @@ import org.jboss.testharness.impl.packaging.jsr299.BeansXml; import org.testng.annotations.Test; -/** - * - * Spec version: 20090625 - * - */ @Artifact @BeansXml("beans.xml") @ExpectedDeploymentException(DeploymentError.class) +@SpecVersion("20090625") public class SameTypeListedTwiceTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/enterprise/SessionBeanPolicyTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/enterprise/SessionBeanPolicyTest.java 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/enterprise/SessionBeanPolicyTest.java 2009-07-27 13:55:14 UTC (rev 3269) @@ -16,7 +16,8 @@ */ package org.jboss.jsr299.tck.tests.policy.enterprise; -import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.IntegrationTest; @@ -25,15 +26,11 @@ import org.jboss.testharness.impl.packaging.jsr299.BeansXml; import org.testng.annotations.Test; -/** - * - * Spec version: 20090625 - * - */ @Artifact @Packaging(PackagingType.EAR) @IntegrationTest @BeansXml("beans.xml") +@SpecVersion("20090625") public class SessionBeanPolicyTest extends AbstractJSR299Test { Modified: tck/trunk/pom.xml =================================================================== --- tck/trunk/pom.xml 2009-07-27 13:12:56 UTC (rev 3268) +++ tck/trunk/pom.xml 2009-07-27 13:55:14 UTC (rev 3269) @@ -64,7 +64,7 @@ </modules> <properties> - <jboss.test.audit.version>0.9.1</jboss.test.audit.version> + <jboss.test.audit.version>1.0.0-SNAPSHOT</jboss.test.audit.version> <jboss.test.harness.version>1.0.0.BETA3</jboss.test.harness.version> </properties> @@ -127,13 +127,13 @@ <version>${project.version}</version> </dependency> <dependency> - <groupId>org.hibernate</groupId> - <artifactId>tck-utils-api</artifactId> + <groupId>org.jboss.test-audit</groupId> + <artifactId>jboss-test-audit-api</artifactId> <version>${jboss.test.audit.version}</version> </dependency> <dependency> - <groupId>org.hibernate</groupId> - <artifactId>tck-utils-impl</artifactId> + <groupId>org.jboss.test-audit</groupId> + <artifactId>jboss-test-audit-impl</artifactId> <version>${jboss.test.audit.version}</version> </dependency> <dependency>

15 years, 4 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r3268 - tck/trunk/impl/src/main/resources.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-07-27 09:12:56 -0400 (Mon, 27 Jul 2009) New Revision: 3268 Modified: tck/trunk/impl/src/main/resources/tck-audit.xml Log: Initially split out behaviors, many more splits needed for what "accessible" means Modified: tck/trunk/impl/src/main/resources/tck-audit.xml =================================================================== --- tck/trunk/impl/src/main/resources/tck-audit.xml 2009-07-27 07:33:08 UTC (rev 3267) +++ tck/trunk/impl/src/main/resources/tck-audit.xml 2009-07-27 13:12:56 UTC (rev 3268) @@ -1654,8 +1654,16 @@ </section> <section id="5.1" title="Inter-module accessibility in Java EE"> - <assertion id="a"> - <text>Beans packaged in a certain Java EE module or library are available for injection, lookup and EL resolution to classes and JSP/JSF pages packaged in some other Java EE module or library if and only if the first module or library is required to be accessible to the other module or library by the Java EE platform specification.</text> + <assertion id="aa"> + <text>Beans packaged in a certain Java EE _module or library are available for _injection_, lookup and EL resolution to classes and JSP/JSF pages packaged in some other Java EE module or library if and only if the first module or library is required to be accessible to the other module or library by the Java EE platform specification.</text> + </assertion> + + <assertion id="ab"> + <text>Beans packaged in a certain Java EE module or library are available for injection, _lookup_ and EL resolution to classes and JSP/JSF pages packaged in some other Java EE module or library if and only if the first module or library is required to be accessible to the other module or library by the Java EE platform specification.</text> + </assertion> + + <assertion id="ac"> + <text>Beans packaged in a certain Java EE module or library are available for injection, lookup and _EL resolution_ to classes and JSP/JSF pages packaged in some other Java EE module or library if and only if the first module or library is required to be accessible to the other module or library by the Java EE platform specification.</text> </assertion> <assertion id="b"> @@ -1676,6 +1684,10 @@ <assertion id="a"> <text>A policy is never available for injection, lookup or EL resolution in a Java EE module or library that is not a bean deployment archive (a module or library with no beans.xml file).</text> </assertion> + + <assertion id="a"> + <text>A policy is never available for injection, lookup or EL resolution in a Java EE module or library that is not a bean deployment archive (a module or library with no beans.xml file).</text> + </assertion> <assertion id="b"> <text>Nor is a policy available for injection, lookup or EL resolution in every bean deployment archive. A policy must be explicitly enabled in every bean deployment archive in which the policy should be available for injection, lookup and EL resolution.</text>

15 years, 4 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r3267 - ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular.

by webbeans-commits＠lists.jboss.org

Author: jharting Date: 2009-07-27 03:33:08 -0400 (Mon, 27 Jul 2009) New Revision: 3267 Removed: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Air.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Bird.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Car.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/DependentSelfConsumingNormalProducer.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Food.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/House.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/NormalSelfConsumingDependentProducer.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/NormalSelfConsumingNormalProducer.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Petrol.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Pig.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Planet.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/SelfConsumingDependent1.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/SelfConsumingNormal.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/SelfConsumingNormal1.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Space.java Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/CircularDependencyTest.java Log: Removed tests duplicated in TCK Deleted: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Air.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Air.java 2009-07-27 03:54:57 UTC (rev 3266) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Air.java 2009-07-27 07:33:08 UTC (rev 3267) @@ -1,20 +0,0 @@ -package org.jboss.webbeans.test.unit.lookup.circular; - -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Initializer; - -@ApplicationScoped -class Air -{ - - public Air() - { - - } - - @Initializer - public Air(Bird bird) - { - } - -} Deleted: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Bird.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Bird.java 2009-07-27 03:54:57 UTC (rev 3266) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Bird.java 2009-07-27 07:33:08 UTC (rev 3267) @@ -1,23 +0,0 @@ -package org.jboss.webbeans.test.unit.lookup.circular; - -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Initializer; - -@ApplicationScoped -class Bird -{ - - private Air air; - - public Bird() - { - - } - - @Initializer - public Bird(Air air) - { - this.air = air; - } - -} Deleted: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Car.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Car.java 2009-07-27 03:54:57 UTC (rev 3266) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Car.java 2009-07-27 07:33:08 UTC (rev 3267) @@ -1,32 +0,0 @@ -package org.jboss.webbeans.test.unit.lookup.circular; - -import javax.annotation.PostConstruct; -import javax.enterprise.inject.Current; - -class Car -{ - - public static boolean success; - - @Current Petrol petrol; - - public Car() - { - success = false; - } - - @PostConstruct - public void postConstruct() - { - if (petrol.getName().equals("petrol")) - { - success = true; - } - } - - public String getName() - { - return "herbie"; - } - -} Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/CircularDependencyTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/CircularDependencyTest.java 2009-07-27 03:54:57 UTC (rev 3266) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/CircularDependencyTest.java 2009-07-27 07:33:08 UTC (rev 3267) @@ -8,34 +8,7 @@ public class CircularDependencyTest extends AbstractWebBeansTest { - @Test - public void testCircularInjectionOnTwoNormalBeans() throws Exception - { - getCurrentManager().getInstanceByType(Pig.class).getName(); - assert Pig.success; - assert Food.success; - } - - @Test - public void testCircularInjectionOnOneNormalAndOneDependentBean() throws Exception - { - - getCurrentManager().getInstanceByType(Car.class).getName(); - assert Petrol.success; - assert Car.success; - } - - @Test - public void testCircularInjectionOnOneDependentAndOneNormalBean() throws Exception - { - getCurrentManager().getInstanceByType(Petrol.class).getName(); - assert Petrol.success; - assert Car.success; - } - - - @Test public void testCircularInjectionOnTwoSimpleDependentBeans() throws Exception { getCurrentManager().getInstanceByType(Foo.class).getName(); @@ -49,30 +22,6 @@ getCurrentManager().getInstanceByType(DependentSelfConsumingDependentProducer.class).ping(); } - @Test - public void testNormalProducerMethodDeclaredOnNormalBeanWhichInjectsProducedBean() throws Exception - { - getCurrentManager().getInstanceByType(NormalSelfConsumingNormalProducer.class).ping(); - } - - @Test - public void testNormalProducerMethodDeclaredOnDependentBeanWhichInjectsProducedBean() throws Exception - { - getCurrentManager().getInstanceByType(DependentSelfConsumingNormalProducer.class).ping(); - } - - @Test - public void testDependentProducerMethodDeclaredOnNormalBeanWhichInjectsProducedBean() throws Exception - { - getCurrentManager().getInstanceByType(NormalSelfConsumingDependentProducer.class).ping(); - } - - @Test - public void testNormalSelfConsumingProducer() throws Exception - { - createContextualInstance(Violation.class).ping(); - } - @Test(groups="broken", timeOut=1000) public void testDependentSelfConsumingProducer() throws Exception { @@ -85,28 +34,9 @@ getCurrentManager().getInstanceByType(Fish.class); } - @Test - public void testNormalCircularConstructors() throws Exception - { - getCurrentManager().getInstanceByType(Bird.class); - } - - @Test - public void testNormalAndDependentCircularConstructors() throws Exception - { - getCurrentManager().getInstanceByType(Planet.class); - } - @Test(groups="broken", timeOut=1000) public void testSelfConsumingConstructorsOnDependentBean() throws Exception { getCurrentManager().getInstanceByType(Farm.class); } - - @Test - public void testSelfConsumingConstructorsOnNormalBean() throws Exception - { - getCurrentManager().getInstanceByType(House.class); - } - } Deleted: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/DependentSelfConsumingNormalProducer.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/DependentSelfConsumingNormalProducer.java 2009-07-27 03:54:57 UTC (rev 3266) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/DependentSelfConsumingNormalProducer.java 2009-07-27 07:33:08 UTC (rev 3267) @@ -1,18 +0,0 @@ -package org.jboss.webbeans.test.unit.lookup.circular; - -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; - -class DependentSelfConsumingNormalProducer -{ - @SelfConsumingNormal1 Violation violation; - - @Produces @ApplicationScoped @SelfConsumingNormal1 - public Violation produceViolation() { - return new Violation(); - } - - public void ping() { - - } -} \ No newline at end of file Deleted: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Food.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Food.java 2009-07-27 03:54:57 UTC (rev 3266) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Food.java 2009-07-27 07:33:08 UTC (rev 3267) @@ -1,34 +0,0 @@ -package org.jboss.webbeans.test.unit.lookup.circular; - -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Current; - -@ApplicationScoped -class Food -{ - - public static boolean success; - - @Current Pig pig; - - public Food() - { - success = false; - } - - @PostConstruct - public void postConstruct() - { - if (pig.getName().equals("john")) - { - success = true; - } - } - - public String getName() - { - return "food"; - } - -} Deleted: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/House.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/House.java 2009-07-27 03:54:57 UTC (rev 3266) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/House.java 2009-07-27 07:33:08 UTC (rev 3267) @@ -1,24 +0,0 @@ -package org.jboss.webbeans.test.unit.lookup.circular; - -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Initializer; - -@ApplicationScoped -class House -{ - - // For serialization - public House() {} - - @Initializer - public House(House house) - { - house.ping(); - } - - private void ping() - { - - } - -} Deleted: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/NormalSelfConsumingDependentProducer.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/NormalSelfConsumingDependentProducer.java 2009-07-27 03:54:57 UTC (rev 3266) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/NormalSelfConsumingDependentProducer.java 2009-07-27 07:33:08 UTC (rev 3267) @@ -1,19 +0,0 @@ -package org.jboss.webbeans.test.unit.lookup.circular; - -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; - -@ApplicationScoped -class NormalSelfConsumingDependentProducer -{ - @SelfConsumingDependent1 Violation violation; - - @Produces @SelfConsumingDependent1 - public Violation produceViolation() { - return new Violation(); - } - - public void ping() { - - } -} \ No newline at end of file Deleted: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/NormalSelfConsumingNormalProducer.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/NormalSelfConsumingNormalProducer.java 2009-07-27 03:54:57 UTC (rev 3266) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/NormalSelfConsumingNormalProducer.java 2009-07-27 07:33:08 UTC (rev 3267) @@ -1,19 +0,0 @@ -package org.jboss.webbeans.test.unit.lookup.circular; - -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; - -@ApplicationScoped -class NormalSelfConsumingNormalProducer -{ - @SelfConsumingNormal Violation violation; - - @Produces @ApplicationScoped @SelfConsumingNormal - public Violation produceViolation() { - return new Violation(); - } - - public void ping() { - - } -} \ No newline at end of file Deleted: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Petrol.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Petrol.java 2009-07-27 03:54:57 UTC (rev 3266) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Petrol.java 2009-07-27 07:33:08 UTC (rev 3267) @@ -1,34 +0,0 @@ -package org.jboss.webbeans.test.unit.lookup.circular; - -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Current; - -@ApplicationScoped -class Petrol -{ - - public static boolean success; - - @Current Car car; - - public Petrol() - { - success = false; - } - - @PostConstruct - public void postConstruct() - { - if (car.getName().equals("herbie")) - { - success = true; - } - } - - public String getName() - { - return "petrol"; - } - -} Deleted: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Pig.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Pig.java 2009-07-27 03:54:57 UTC (rev 3266) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Pig.java 2009-07-27 07:33:08 UTC (rev 3267) @@ -1,34 +0,0 @@ -package org.jboss.webbeans.test.unit.lookup.circular; - -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Current; - -@ApplicationScoped -class Pig -{ - - public static boolean success; - - @Current Food food; - - public Pig() - { - success = false; - } - - @PostConstruct - public void postConstruct() - { - if (food.getName().equals("food")) - { - success = true; - } - } - - public String getName() - { - return "john"; - } - -} Deleted: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Planet.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Planet.java 2009-07-27 03:54:57 UTC (rev 3266) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Planet.java 2009-07-27 07:33:08 UTC (rev 3267) @@ -1,16 +0,0 @@ -package org.jboss.webbeans.test.unit.lookup.circular; - -import javax.enterprise.inject.Initializer; - -class Planet -{ - - private Space space; - - @Initializer - public Planet(Space space) - { - this.space = space; - } - -} Deleted: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/SelfConsumingDependent1.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/SelfConsumingDependent1.java 2009-07-27 03:54:57 UTC (rev 3266) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/SelfConsumingDependent1.java 2009-07-27 07:33:08 UTC (rev 3267) @@ -1,22 +0,0 @@ -package org.jboss.webbeans.test.unit.lookup.circular; - -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; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import javax.enterprise.inject.BindingType; - -@Target( { TYPE, METHOD, PARAMETER, FIELD }) -@Retention(RUNTIME) -@Documented -@BindingType -@interface SelfConsumingDependent1 -{ - -} Deleted: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/SelfConsumingNormal.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/SelfConsumingNormal.java 2009-07-27 03:54:57 UTC (rev 3266) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/SelfConsumingNormal.java 2009-07-27 07:33:08 UTC (rev 3267) @@ -1,22 +0,0 @@ -package org.jboss.webbeans.test.unit.lookup.circular; - -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; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import javax.enterprise.inject.BindingType; - -@Target( { TYPE, METHOD, PARAMETER, FIELD }) -@Retention(RUNTIME) -@Documented -@BindingType -@interface SelfConsumingNormal -{ - -} Deleted: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/SelfConsumingNormal1.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/SelfConsumingNormal1.java 2009-07-27 03:54:57 UTC (rev 3266) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/SelfConsumingNormal1.java 2009-07-27 07:33:08 UTC (rev 3267) @@ -1,22 +0,0 @@ -package org.jboss.webbeans.test.unit.lookup.circular; - -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; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import javax.enterprise.inject.BindingType; - -@Target( { TYPE, METHOD, PARAMETER, FIELD }) -@Retention(RUNTIME) -@Documented -@BindingType -@interface SelfConsumingNormal1 -{ - -} Deleted: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Space.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Space.java 2009-07-27 03:54:57 UTC (rev 3266) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Space.java 2009-07-27 07:33:08 UTC (rev 3267) @@ -1,18 +0,0 @@ -package org.jboss.webbeans.test.unit.lookup.circular; - -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Initializer; - -@ApplicationScoped -class Space -{ - - // For serialization - public Space() {} - - @Initializer - public Space(Planet planet) - { - } - -}

15 years, 4 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r3266 - tck/trunk/impl/src/main/resources.

by webbeans-commits＠lists.jboss.org

Author: shane.bryzak(a)jboss.com Date: 2009-07-26 23:54:57 -0400 (Sun, 26 Jul 2009) New Revision: 3266 Modified: tck/trunk/impl/src/main/resources/tck-audit.xml Log: Added assertions for section 5.1 Modified: tck/trunk/impl/src/main/resources/tck-audit.xml =================================================================== --- tck/trunk/impl/src/main/resources/tck-audit.xml 2009-07-26 21:57:09 UTC (rev 3265) +++ tck/trunk/impl/src/main/resources/tck-audit.xml 2009-07-27 03:54:57 UTC (rev 3266) @@ -1654,6 +1654,21 @@ </section> <section id="5.1" title="Inter-module accessibility in Java EE"> + <assertion id="a"> + <text>Beans packaged in a certain Java EE module or library are available for injection, lookup and EL resolution to classes and JSP/JSF pages packaged in some other Java EE module or library if and only if the first module or library is required to be accessible to the other module or library by the Java EE platform specification.</text> + </assertion> + + <assertion id="b"> + <text>For a custom implementation of the |Bean| interface defined in Section 11.1, "The Bean interface", the container calls |getBeanClass()| to determine the bean class of the bean.</text> + </assertion> + + <assertion id="c"> + <text>For a custom implementation of |Bean|, defined in Section 11.2, "The Producer and InjectionTarget interfaces", the container calls |InjectionPoint.getMember()| and then |Member.getDeclaringClass()| to determine the class that declares an injection point.</text> + </assertion> + + <assertion id="d"> + <text>For a custom implementation of |InjectionTarget|, defined in Section 11.2, "The Producer and InjectionTarget interfaces", the container calls |InjectionPoint.getMember()| and then |Member.getDeclaringClass()| to determine the class that declares an injection point.</text> + </assertion> </section>

15 years, 4 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r3265 - in tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests: deployment/lifecycle/broken/addDefinitionError and 11 other directories.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-07-26 17:57:09 -0400 (Sun, 26 Jul 2009) New Revision: 3265 Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/DeploymentTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDefinitionError/AddDefinitionErrorTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDeploymentProblem/AddDeploymentProblemTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/beanDiscoveryMethodThrowsException/BeforeBeanDiscoveryThrowsExceptionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanDiscoveryObserver/AfterBeanDiscoveryObserverExecutionFailureTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanValidationObserver/AfterDeploymentValidationObserverExecutionFailureTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/passivatingScope/AddingPassivatingScopeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/wildcardAndTypeVariable/ObserverMethodWithParametertizedTypeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/transactionalObservers/EventTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanICTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/enterprise/EnterpriseProducerFieldDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/InterceptorDefinitionTest.java Log: Link issues to WBRI Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/DeploymentTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/DeploymentTest.java 2009-07-26 21:45:54 UTC (rev 3264) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/DeploymentTest.java 2009-07-26 21:57:09 UTC (rev 3265) @@ -58,7 +58,7 @@ assert ManagerObserver.isRequestContextActive(); } - @Test(groups = { "ri-broken", "broken" }) + @Test(groups = { "broken" }) @SpecAssertions({ @SpecAssertion(section = "11.1", id = "f") }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDefinitionError/AddDefinitionErrorTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDefinitionError/AddDefinitionErrorTest.java 2009-07-26 21:45:54 UTC (rev 3264) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDefinitionError/AddDefinitionErrorTest.java 2009-07-26 21:57:09 UTC (rev 3265) @@ -29,7 +29,7 @@ public class AddDefinitionErrorTest extends AbstractJSR299Test { @Test(groups="incontainer-ri-broken") - // Not working, needs JBAS-7047 + // WBRI-312 @SpecAssertion(section = "11.5.2", id = "ca") public void testObserverDefinitionErrorTreatedAsDefinitionError() { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDeploymentProblem/AddDeploymentProblemTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDeploymentProblem/AddDeploymentProblemTest.java 2009-07-26 21:45:54 UTC (rev 3264) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDeploymentProblem/AddDeploymentProblemTest.java 2009-07-26 21:57:09 UTC (rev 3265) @@ -40,7 +40,7 @@ { @Test(groups={"broken", "incontainer-ri-broken"}) // TODO Needs Extension stuff adding - // Not working, needs JBAS-7047 + // WBRI-312 @SpecAssertion(section = "11.5.3", id = "b") public void testObserverDeploymentProblemTreatedAsDeploymentError() { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/beanDiscoveryMethodThrowsException/BeforeBeanDiscoveryThrowsExceptionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/beanDiscoveryMethodThrowsException/BeforeBeanDiscoveryThrowsExceptionTest.java 2009-07-26 21:45:54 UTC (rev 3264) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/beanDiscoveryMethodThrowsException/BeforeBeanDiscoveryThrowsExceptionTest.java 2009-07-26 21:57:09 UTC (rev 3265) @@ -42,7 +42,7 @@ { @Test(groups="incontainer-ri-broken") - // Not working, needs JBAS-7047 + // WBRI-312 @SpecAssertion(section="11.5.1", id="ag") public void testThrowsException() { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanDiscoveryObserver/AfterBeanDiscoveryObserverExecutionFailureTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanDiscoveryObserver/AfterBeanDiscoveryObserverExecutionFailureTest.java 2009-07-26 21:45:54 UTC (rev 3264) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanDiscoveryObserver/AfterBeanDiscoveryObserverExecutionFailureTest.java 2009-07-26 21:57:09 UTC (rev 3265) @@ -22,7 +22,7 @@ { @Test(groups={"incontainer-ri-broken", "broken"}) //TODO Needs Extension stuff adding - // Not working, needs JBAS-7047 + // WBRI-312 @SpecAssertion(section = "11.5.2", id = "d") public void testObserverFailureTreatedAsDefinitionError() { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanValidationObserver/AfterDeploymentValidationObserverExecutionFailureTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanValidationObserver/AfterDeploymentValidationObserverExecutionFailureTest.java 2009-07-26 21:45:54 UTC (rev 3264) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanValidationObserver/AfterDeploymentValidationObserverExecutionFailureTest.java 2009-07-26 21:57:09 UTC (rev 3265) @@ -39,7 +39,7 @@ { @Test(groups={"incontainer-ri-broken", "broken"}) // TODO Needs Extension stuff adding - // Not working, needs JBAS-7047 + // WBRI-312 @SpecAssertion(section = "11.5.3", id = "c") public void testObserverFailureTreatedAsDeploymentError() { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/passivatingScope/AddingPassivatingScopeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/passivatingScope/AddingPassivatingScopeTest.java 2009-07-26 21:45:54 UTC (rev 3264) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/passivatingScope/AddingPassivatingScopeTest.java 2009-07-26 21:57:09 UTC (rev 3265) @@ -41,7 +41,7 @@ { @Test(groups="ri-broken") - // Not working, needs JBAS-7047 + // WBRI-312 @SpecAssertion(section="11.5.1", id="ac") public void testAddingScopeType() { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/wildcardAndTypeVariable/ObserverMethodWithParametertizedTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/wildcardAndTypeVariable/ObserverMethodWithParametertizedTypeTest.java 2009-07-26 21:45:54 UTC (rev 3264) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/wildcardAndTypeVariable/ObserverMethodWithParametertizedTypeTest.java 2009-07-26 21:57:09 UTC (rev 3265) @@ -40,6 +40,7 @@ { @Test(groups = { "events", "ri-broken"}) @SpecAssertion(section = "10.4.1", id = "cb") + // WBRI-302 public void testObserverMethodCanObserveTypeVariable() { BostonTerrier.observed = false; @@ -50,6 +51,7 @@ @Test(groups = { "events", "ri-broken" }) @SpecAssertion(section = "10.4.1", id = "ca") + // WBRI-302 public void testObserverMethodCanObserveWildcardType() { WildBostonTerrier.observed = false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/transactionalObservers/EventTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/transactionalObservers/EventTest.java 2009-07-26 21:45:54 UTC (rev 3264) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/transactionalObservers/EventTest.java 2009-07-26 21:57:09 UTC (rev 3265) @@ -112,6 +112,7 @@ @Test(groups = { "events", "integration", "ri-broken" }) @SpecAssertion(section = "10.4.5", id = "e") + // WBRI-303 public void testAfterTransactionFailureObserver() throws InterruptedException { dog.setCorrectContext(false); @@ -139,6 +140,7 @@ @Test(groups = { "events", "ri-broken" }) @SpecAssertion(section = "review", id = "review") // the spec now only mentions asynchronous observer methods in passing + // WBRI-303 public void testAsynchronousObserverAlsoTransactional() throws InterruptedException { dog.setCorrectContext(false); @@ -159,6 +161,7 @@ @Test(groups = { "ri-broken", "events", "integration" }, expectedExceptions = EJBException.class) @SpecAssertion(section = "10.5", id = "bd") + // WBRI-303 public void testObserverCannotInitiateJtaTransaction() { Agent dogAgent = getInstanceByType(Agent.class); @@ -167,6 +170,7 @@ @Test(groups = { "ri-broken", "events", "integration" }, expectedExceptions = EJBException.class) @SpecAssertion(section = "10.5", id = "bd") + // WBRI-303 public void testObserverCannotCommitJtaTransaction() { Agent dogAgent = getInstanceByType(Agent.class); @@ -175,6 +179,7 @@ @Test(groups = { "ri-broken", "events", "integration" }, expectedExceptions = EJBException.class) @SpecAssertion(section = "10.5", id = "bd") + // WBRI-303 public void testObserverCannotRollbackJtaTransaction() { Agent dogAgent = getInstanceByType(Agent.class); Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java 2009-07-26 21:45:54 UTC (rev 3264) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java 2009-07-26 21:57:09 UTC (rev 3265) @@ -63,6 +63,7 @@ @Test(groups = { "ejb 3.1", "ri-broken" }) @SpecAssertion(section = "3.2.2", id = "ba") + // WBRI-231 public void testEnterpriseBeanClassLocalView() { //TODO We need a 3.1 compliant container for this test Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanICTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanICTest.java 2009-07-26 21:45:54 UTC (rev 3264) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanICTest.java 2009-07-26 21:57:09 UTC (rev 3265) @@ -62,13 +62,9 @@ }.run(); } - /** - * TODO Once WBRI-208 is fixed, check this test too - * - * @throws Exception - */ @Test(groups = { "new", "ri-broken" }) @SpecAssertion(section = "3.10", id = "w") + // WBRI-208 public void testNewBeanHasNoProducerFields() throws Exception { FoxLocal fox = getInstanceByType(FoxLocal.class); Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/enterprise/EnterpriseProducerFieldDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/enterprise/EnterpriseProducerFieldDefinitionTest.java 2009-07-26 21:45:54 UTC (rev 3264) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/enterprise/EnterpriseProducerFieldDefinitionTest.java 2009-07-26 21:57:09 UTC (rev 3265) @@ -28,6 +28,7 @@ @Test(groups = {"producerField", "ri-broken"}) @SpecAssertion(section = "4.2", id = "eb") + // WBRI-208 public void testNonStaticProducerFieldNotInherited() { assert !(getInstanceByType(Egg.class,FOO_LITERAL).getMother() instanceof InfertileChicken); @@ -35,6 +36,7 @@ @Test(groups = {"producerField", "ri-broken"}) @SpecAssertion(section = "4.2", id = "ed") + // WBRI-208 public void testNonStaticProducerFieldNotIndirectlyInherited() { assert !(getInstanceByType(Egg.class,FOO_LITERAL).getMother() instanceof LameInfertileChicken); Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/InterceptorDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/InterceptorDefinitionTest.java 2009-07-26 21:45:54 UTC (rev 3264) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/InterceptorDefinitionTest.java 2009-07-26 21:57:09 UTC (rev 3265) @@ -43,6 +43,7 @@ @SpecAssertions({ @SpecAssertion(section = "11.1.2", id = "a") }) + // WBRI-59 public void testInterceptorsImplementInterceptorInterface() { boolean interfaceFound = false;

15 years, 4 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r3264 - in tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests: policy and 6 other directories.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-07-26 17:45:54 -0400 (Sun, 26 Jul 2009) New Revision: 3264 Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/PolicyAvailabilityTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/incorrect/name/NoClassWithSpecifiedNameTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/incorrect/name/stereotype/NoAnnotationWithSpecifiedNameTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/not/policy/ClassIsNotPolicyTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/not/policy/stereotype/ClassIsNotPolicyTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/same/type/twice/SameTypeListedTwiceTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/enterprise/SessionBeanPolicyTest.java Log: link tests to JIRA Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java 2009-07-26 21:38:16 UTC (rev 3263) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java 2009-07-26 21:45:54 UTC (rev 3264) @@ -203,6 +203,7 @@ @Test(groups = { "ri-broken", "policy" }) @SpecAssertion(section = "5.2", id = "a") + // WBRI-306 public void testPolicyNotAvailableInNonDeploymentArchive() throws Exception { Set<Bean<Spider>> spiders = getBeans(Spider.class, new CurrentLiteral()); Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/PolicyAvailabilityTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/PolicyAvailabilityTest.java 2009-07-26 21:38:16 UTC (rev 3263) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/PolicyAvailabilityTest.java 2009-07-26 21:45:54 UTC (rev 3264) @@ -44,6 +44,7 @@ @SpecAssertions( { @SpecAssertion(section = "5.2", id = "b"), @SpecAssertion(section = "5.2", id = "c") }) + // WBRI-306 public void testPolicyAvailability() throws Exception { new RunInDependentContext() @@ -84,6 +85,7 @@ @Test(groups = {"policy", "ri-broken"}) @SpecAssertion(section = "5.2", id = "f") + // WBRI-306 public void testProducerPolicies() throws Exception { new RunInDependentContext() Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/incorrect/name/NoClassWithSpecifiedNameTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/incorrect/name/NoClassWithSpecifiedNameTest.java 2009-07-26 21:38:16 UTC (rev 3263) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/incorrect/name/NoClassWithSpecifiedNameTest.java 2009-07-26 21:45:54 UTC (rev 3264) @@ -37,6 +37,7 @@ @Test(groups = { "policy", "ri-broken" }) @SpecAssertion(section="5.2", id="h") + // WBRI-306 public void test() { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/incorrect/name/stereotype/NoAnnotationWithSpecifiedNameTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/incorrect/name/stereotype/NoAnnotationWithSpecifiedNameTest.java 2009-07-26 21:38:16 UTC (rev 3263) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/incorrect/name/stereotype/NoAnnotationWithSpecifiedNameTest.java 2009-07-26 21:45:54 UTC (rev 3264) @@ -37,6 +37,7 @@ @Test(groups = { "policy", "ri-broken" }) @SpecAssertion(section="5.2", id="i") + // WBRI-306 public void test() { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/not/policy/ClassIsNotPolicyTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/not/policy/ClassIsNotPolicyTest.java 2009-07-26 21:38:16 UTC (rev 3263) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/not/policy/ClassIsNotPolicyTest.java 2009-07-26 21:45:54 UTC (rev 3264) @@ -37,6 +37,7 @@ @Test(groups = { "policy", "ri-broken" }) @SpecAssertion(section="5.2", id="h") + // WBRI-306 public void test() { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/not/policy/stereotype/ClassIsNotPolicyTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/not/policy/stereotype/ClassIsNotPolicyTest.java 2009-07-26 21:38:16 UTC (rev 3263) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/not/policy/stereotype/ClassIsNotPolicyTest.java 2009-07-26 21:45:54 UTC (rev 3264) @@ -37,6 +37,7 @@ @Test(groups = { "policy", "ri-broken" }) @SpecAssertion(section="5.2", id="i") + // WBRI-306 public void test() { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/same/type/twice/SameTypeListedTwiceTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/same/type/twice/SameTypeListedTwiceTest.java 2009-07-26 21:38:16 UTC (rev 3263) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/same/type/twice/SameTypeListedTwiceTest.java 2009-07-26 21:45:54 UTC (rev 3264) @@ -37,6 +37,7 @@ @Test(groups = { "policy", "ri-broken" }) @SpecAssertion(section="5.2", id="j") + // WBRI-306 public void test() { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/enterprise/SessionBeanPolicyTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/enterprise/SessionBeanPolicyTest.java 2009-07-26 21:38:16 UTC (rev 3263) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/enterprise/SessionBeanPolicyTest.java 2009-07-26 21:45:54 UTC (rev 3264) @@ -39,6 +39,7 @@ @Test(groups = { "policy", "ri-broken" }) @SpecAssertion(section = "5.2", id = "eb") + // WBRI-306 public void testEnabledPolicyAvailable() { assert getBeans(EjbRemote.class).size() == 1;

15 years, 4 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r3263 - tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-07-26 17:38:16 -0400 (Sun, 26 Jul 2009) New Revision: 3263 Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java Log: fix test Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java 2009-07-26 21:33:56 UTC (rev 3262) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java 2009-07-26 21:38:16 UTC (rev 3263) @@ -29,6 +29,7 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.jsr299.tck.literals.AnyLiteral; import org.jboss.jsr299.tck.literals.CurrentLiteral; import org.jboss.testharness.impl.packaging.Artifact; import org.testng.annotations.Test; @@ -142,7 +143,7 @@ assert getBeans(Spider[].class).size() == 1; } - @Test(groups = { "resolution", "ri-broken" }) + @Test(groups = { "resolution" }) @SpecAssertions( { @SpecAssertion(section = "5.3", id = "i"), @SpecAssertion(section = "5.3.4", id = "aa"), @@ -151,8 +152,8 @@ @SpecAssertion(section = "5.3.6", id = "c") }) public void testResolveByTypeWithPrimitives() { - assert getBeans(Double.class).size() == 2; - assert getBeans(double.class).size() == 2; + assert getBeans(Double.class, new AnyLiteral()).size() == 2; + assert getBeans(double.class, new AnyLiteral()).size() == 2; Double min = getInstanceByType(Double.class, new AnnotationLiteral<Min>(){}); double max = getInstanceByType(double.class, new AnnotationLiteral<Max>(){}); @@ -160,6 +161,7 @@ assert min.equals(NumberProducer.min); assert NumberProducer.max.equals(max); } + @Test(groups = "resolution") @SpecAssertions( { @SpecAssertion(section = "5.3", id = "le"),

15 years, 4 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r3262 - tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/parameterized.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-07-26 17:33:56 -0400 (Sun, 26 Jul 2009) New Revision: 3262 Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/parameterized/AssignabilityOfRawAndParameterizedTypesTest.java Log: link to wbri Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/parameterized/AssignabilityOfRawAndParameterizedTypesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/parameterized/AssignabilityOfRawAndParameterizedTypesTest.java 2009-07-26 21:23:33 UTC (rev 3261) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/parameterized/AssignabilityOfRawAndParameterizedTypesTest.java 2009-07-26 21:33:56 UTC (rev 3262) @@ -35,6 +35,7 @@ @Test(groups = { "resolution", "ri-broken" }) @SpecAssertion(section = "5.3.3", id = "a") + // WBRI-311 public void testAssignabilityToRawType() { assert getBeans(Dao.class).size() == 2; // Dao and ObjectDao @@ -42,6 +43,7 @@ @Test(groups= {"resolution", "ri-broken"}) @SpecAssertion(section = "5.3.3", id = "b") + // WBRI-311 public void testAssignabilityOfParameterizedTypeWithActualTypesToParameterizedTypeWithActualTypes() { assert getBeans(new TypeLiteral<HashMap<Integer, Integer>>(){}).size() == 1; @@ -53,6 +55,7 @@ @SpecAssertions({ @SpecAssertion(section = "5.3.2", id = "b"), @SpecAssertion(section = "5.3.3", id = "c")}) + // WBRI-311 public void testAssignabilityOfParameterizedTypeWithActualTypesToParameterizedTypeWithWildcards() { assert getInstanceByType(InjectedBean.class).getMap() instanceof IntegerHashMap; @@ -60,6 +63,7 @@ @Test(groups = { "resolution", "ri-broken" }) @SpecAssertion(section = "5.3.3", id = "d") + // WBRI-311 public void testAssignabilityOfParameterizedTypeWithTypeVariablesToParameterizedTypeWithWildcards() { assert getBeans(new TypeLiteral<Result<? extends Throwable, ? super Exception>>(){}).size() == 1; @@ -69,6 +73,7 @@ @Test(groups = { "resolution", "ri-broken" }) @SpecAssertion(section = "5.3.3", id = "e") + // WBRI-311 public void testAssignabilityOfParameterizedTypeWithTypeVariablesToParameterizedTypeWithActualTypes() { assert getBeans(new TypeLiteral<Result<Exception, Exception>>(){}).size() == 1; @@ -78,6 +83,7 @@ @Test(groups = { "resolution", "ri-broken" }) @SpecAssertion(section = "5.3.3", id = "f") + // WBRI-311 public <T1 extends Exception, T2 extends Exception> void testAssignabilityOfParameterizedTypeWithTypeVariablesToParameterizedTypeTypeVariable() { assert getBeans(new TypeLiteral<Result<T1, T2>>(){}).size() == 1;

15 years, 4 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r3261 - in ri/trunk/impl/src/main/java/org/jboss/webbeans: bean and 1 other directory.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-07-26 17:23:33 -0400 (Sun, 26 Jul 2009) New Revision: 3261 Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/Validator.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractBean.java Log: move ip validation logic to validator to apply to all beans Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/Validator.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/Validator.java 2009-07-26 20:02:03 UTC (rev 3260) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/Validator.java 2009-07-26 21:23:33 UTC (rev 3261) @@ -117,12 +117,27 @@ } + /** + * Validate an injection point + * + * @param ij the injection point to validate + * @param declaringBean the bean into which the injectionPoint has been injected, if null, certain validations aren't available + * @param beanManager + */ public void validateInjectionPoint(InjectionPoint ij, BeanManagerImpl beanManager) { if (ij.getAnnotated().getAnnotation(New.class) != null && ij.getBindings().size() > 1) { throw new DefinitionException("The injection point " + ij + " is annotated with @New which cannot be combined with other binding types"); } + if (!Dependent.class.equals(ij.getBean().getScopeType()) && ij.getType().equals(InjectionPoint.class)) + { + throw new DefinitionException("Cannot inject an InjectionPoint into a non @Dependent scoped bean " + ij); + } + if (ij.getType() instanceof TypeVariable<?>) + { + throw new DefinitionException("Cannot declare an injection point with a type variable " + ij); + } if (ij.getType() instanceof ParameterizedType) { ParameterizedType parameterizedType = (ParameterizedType) ij.getType(); Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractBean.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractBean.java 2009-07-26 20:02:03 UTC (rev 3260) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractBean.java 2009-07-26 21:23:33 UTC (rev 3261) @@ -18,7 +18,6 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; -import java.lang.reflect.TypeVariable; import java.util.Arrays; import java.util.HashSet; import java.util.List; @@ -33,7 +32,6 @@ import javax.enterprise.inject.Specializes; import javax.enterprise.inject.deployment.Standard; import javax.enterprise.inject.spi.Bean; -import javax.enterprise.inject.spi.InjectionPoint; import javax.enterprise.inject.stereotype.Stereotype; import org.jboss.webbeans.BeanManagerImpl; @@ -159,7 +157,6 @@ initSerializable(); initProxyable(); initInjectionPoints(); - checkInjectionPoints(); initDecorates(); checkDecorates(); } @@ -296,23 +293,6 @@ } return true; } - - protected boolean checkInjectionPoints() - { - // TODO Merge serializable check in here - for (WBInjectionPoint<?, ?> injectionPoint : getAnnotatedInjectionPoints()) - { - if (!Dependent.class.equals(getScopeType()) && injectionPoint.getType().equals(InjectionPoint.class)) - { - throw new DefinitionException("Cannot inject an InjectionPoint into a non @Dependent scoped bean " + injectionPoint); - } - if (injectionPoint.getType() instanceof TypeVariable<?>) - { - throw new DefinitionException("Cannot declare an injection point with a type variable " + injectionPoint); - } - } - return true; - } /** * Initializes the scope type

15 years, 4 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r3260 - tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/broken/type/variable and 1 other directory.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-07-26 16:02:03 -0400 (Sun, 26 Jul 2009) New Revision: 3260 Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractBean.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/broken/type/variable/Farm.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/broken/type/variable/TypeVariableInjectionPointTest.java Log: Fix RI and test Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractBean.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractBean.java 2009-07-26 19:50:22 UTC (rev 3259) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractBean.java 2009-07-26 20:02:03 UTC (rev 3260) @@ -18,6 +18,7 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; +import java.lang.reflect.TypeVariable; import java.util.Arrays; import java.util.HashSet; import java.util.List; @@ -305,6 +306,10 @@ { throw new DefinitionException("Cannot inject an InjectionPoint into a non @Dependent scoped bean " + injectionPoint); } + if (injectionPoint.getType() instanceof TypeVariable<?>) + { + throw new DefinitionException("Cannot declare an injection point with a type variable " + injectionPoint); + } } return true; } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/broken/type/variable/Farm.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/broken/type/variable/Farm.java 2009-07-26 19:50:22 UTC (rev 3259) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/broken/type/variable/Farm.java 2009-07-26 20:02:03 UTC (rev 3260) @@ -1,9 +1,13 @@ package org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.broken.type.variable; -import javax.enterprise.inject.Current; +import javax.enterprise.inject.Initializer; @SuppressWarnings("unused") -class Farm<T extends Animal> +class Farm { - @Current private T animal; + @Initializer + public <T extends Animal> void setAnimal(T animal) + { + + } } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/broken/type/variable/TypeVariableInjectionPointTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/broken/type/variable/TypeVariableInjectionPointTest.java 2009-07-26 19:50:22 UTC (rev 3259) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/broken/type/variable/TypeVariableInjectionPointTest.java 2009-07-26 20:02:03 UTC (rev 3260) @@ -17,6 +17,7 @@ package org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.broken.type.variable; import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; @@ -29,11 +30,12 @@ */ @Artifact @ExpectedDeploymentException(DefinitionError.class) -public class TypeVariableInjectionPointTest +public class TypeVariableInjectionPointTest extends AbstractJSR299Test { - @Test(groups={"resolution", "ri-broken"}) - @SpecAssertion(section="5.3.2", id="c") - public void testTypeVariableInjectionPoint() { + @Test(groups = { "resolution"}) + @SpecAssertion(section = "5.3.2", id = "c") + public void testTypeVariableInjectionPoint() + { assert false; } }

15 years, 4 months

1
0
0 / 0

← Newer
1
...
10
11
12
13
14
15
16
...
45
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

weld-commits July 2009