[webbeans-commits] Webbeans SVN: r1912 - ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas and 182 other directories.

Author: pete.muir(a)jboss.org Date: 2009-03-11 09:16:34 -0400 (Wed, 11 Mar 2009) New Revision: 1912 Added: tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/JSR299Configuration.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/JSR299ConfigurationImpl.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/JSR299PropertiesBasedConfigurationBuilder.java tck/trunk/impl/src/main/resources/META-INF/web-beans-tck.properties tck/trunk/impl/src/main/resources/org/jboss/testharness/ tck/trunk/impl/src/main/resources/org/jboss/testharness/impl/ tck/trunk/impl/src/main/resources/org/jboss/testharness/impl/packaging/ tck/trunk/impl/src/main/resources/org/jboss/testharness/impl/packaging/ear/ tck/trunk/impl/src/main/resources/org/jboss/testharness/impl/packaging/ear/ejb-jar.xml tck/trunk/impl/src/main/resources/org/jboss/testharness/impl/packaging/jsr299/ tck/trunk/impl/src/main/resources/org/jboss/testharness/impl/packaging/jsr299/default/ tck/trunk/impl/src/main/resources/org/jboss/testharness/impl/packaging/jsr299/default/beans.xml Removed: tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/Configurable.java tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/Configuration.java tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/DeploymentException.java tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/TCK.java tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/TestLauncher.java tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/TestResult.java tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/Containers.java tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/StandaloneContainers.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractDeclarativeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/ExpectedException.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/ConfigurationImpl.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/PropertiesBasedConfigurationImpl.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/TCKImpl.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/Artifact.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ArtifactDescriptor.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ArtifactGenerator.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ArtifactScanner.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/Classes.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ExpectedDeploymentException.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/IntegrationTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/Packaging.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/PackagingType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/Resource.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ResourceDescriptor.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/Resources.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ear/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/jsr299/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/war/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/runner/servlet/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/testng/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/util/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/servlet/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/impl/packaging/ear/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/impl/packaging/jsr299/default/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/impl/packaging/war/ tck/trunk/impl/src/main/resources/org/jboss/testharness/impl/packaging/ear/ejb-jar.xml tck/trunk/impl/src/main/resources/org/jboss/testharness/impl/packaging/jsr299/default/beans.xml tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/mock/ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/AbstractArtifactTest.java tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/ear/ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/Cow.java tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DeclarativeStandaloneTest.java tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DummyClassesSpecifiedTest.java tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DummyCustomBeansXmlTest.java tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DummyEjbTest.java tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DummyIntegrationTest.java tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DummyResourcesSpecifiedTest.java tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DummyTest.java tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DummyWarUnitTest.java tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/Fox.java tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/subpackage/ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/war/ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarativeArtifact/ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/ear/ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/packages/ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/subpackages/Cow.java tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/subpackages/SubpackagesArtifactTest.java tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/subpackages/subpackge/ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/tck/ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/war/ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/scanner/ArtifactScannerTest.java tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/scanner/DummyArtifact.java tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/scanner/subpackage/ tck/trunk/impl/src/test/resources/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/foo/ tck/trunk/impl/src/test/resources/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/my-web-beans.xml tck/trunk/impl/src/test/resources/org/jboss/jsr299/tck/test/impl/packaging/declarative/war/ tck/trunk/impl/src/test/resources/org/jboss/jsr299/tck/test/impl/packaging/declarativeArtifact/ Modified: ri/trunk/jboss-tck-runner/pom.xml ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/AbstractContainersImpl.java ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/ProfileServiceContainersImpl.java ri/trunk/jboss-tck-runner/src/main/resources/META-INF/web-beans-tck.properties ri/trunk/jboss-tck-runner/src/test/debug-resources/META-INF/web-beans-tck.properties ri/trunk/porting-package/src/main/java/org/jboss/webbeans/tck/ContextsImpl.java ri/trunk/porting-package/src/main/java/org/jboss/webbeans/tck/StandaloneContainersImpl.java ri/trunk/porting-package/src/main/resources/META-INF/web-beans-tck.properties tck/trunk/api/pom.xml tck/trunk/impl/pom.xml tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/ContextIntegrationTest.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/GetOnInactiveContextTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/GetTest.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/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/client/AbstractConversationTest.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/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/LongRunningInstancesNotDestroyedTest.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/Tarantula.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/passivating/PassivatingContextIntegrationTest.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/broken1/DependentInterceptorSerializableTest.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/broken3/DependentDecoratorSerializableTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken4/DependentInterceptorSerializableTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken5/DependentDecoratorSerializableTest.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/passivating/unserializableSimpleInjectedIntoPassivatingEnterpriseBean/UnserializableSimpleInjectedIntoPassivatingEnterpriseBeanTest.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/session/SessionContextTest.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/deployment/DeploymentTypeDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/BrokenDeploymentTypeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/TooManyDeploymentTypesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerField/ProducerFieldDeploymentTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerMethod/ProducerMethodDeploymentTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/typevariable/ParameterizedTypeInjectionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/wildcard/WildcardTypeInjectionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/custom/CustomDeploymentTypeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/defaultDeploymentType/DefaultDeploymentTypeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/nonBuiltInUsesStandard/NonBuiltInUsesStandardTest.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/AnimalStereotype.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/incompatibleStereotypes/IncompatibleStereotypesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/tooMany/TooManyScopesTest.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/multipleStereotypesWithMultipleDeploymentTypes/MultipleStereotypesWithMultipleDeploymentTypesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleScopeTypes/MultipleStereotypesWithMultipleScopeTypesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/nonEmptyNamed/NonEmptyNamedTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/requiredTypeNotImplemented/RequiredTypeNotImplementedTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/requiredTypesMerged/RequiredTypesMergedTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/scopeNotSupported/ScopeNotSupportedTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyDeployElements/TooManyDeployElementsTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyDeploymentTypes/TooManyDeploymentTypesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyScopeTypes/TooManyScopeTypesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/withBindingTypes/StereoTypeWithBindingTypesTest.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/Role.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/event1/FiresOnNonEventTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/event2/FiresOnEventWithoutTypeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/event3/FiresOnEventWithWildcardTypeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/event4/FiresOnEventWithTypeVariableTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/jms1/MappedEventObserversAsynchronousTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer1/EJBObserverMethodNotBusinessMethodTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer10/ObserverExceptionRethrown.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer11/CheckedExceptionWrappedTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer12/ObserverMethodOnIncorrectBeanTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer2/ObserverMethodWithTwoEventParametersTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer3/ObserverMethodAndWildcardedEventTypeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer4/ObserverMethodAnnotatedProducesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer5/ObserverMethodAnnotatedInitialzerTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer6/ObserverMethodAnnotatedDisposesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer7/TransactionalObserverMethodOnlyOnePhaseTest.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/broken/observer9/AsynchronousConditionalObserverTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/firesall/AllEventTypesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/ImplicitEventBeanTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/ConsumerNotifiedForEventTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/DuplicateBindingsToAddObserverTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/DuplicateBindingsToRemoveObserverTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/ManagerAddObserverTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/NonBindingTypesToAddObserverTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/NonBindingTypesToRemoveObserverTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/ObserverExceptionAbortsTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/DuplicateBindingsToRemoveObserverTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/ManagerRemoveObserverTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/NonBindingTypesToRemoveObserverTest.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/binding/ResolvingChecksBindingTypeTest.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/type/ChecksEventTypeWhenResolvingTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/type/ChecksTypeParametersWhenResolvingTest.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/commonAnnotations/ResourceInjectionTest.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/statelessDecorator/StatelessDecoratorTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/statelessInterceptor/StatelessInterceptorTest.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/newAndOtherBinding/NewAndOtherBindingTest.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/singletonWithConversationScope/SingletonWithConversationScopeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/singletonWithRequestScope/SingletonWithRequestScopeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/singletonWithSessionScope/SingletonWithSessionScopeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithApplicationScope/StatelessWithApplicationScopeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithConversationScope/StatelessWithConversationScopeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithRequestScope/StatelessWithRequestScopeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithSessionScope/StatelessWithSessionScopeTest.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/methodAnnotatedProduces/MethodAnnotatedProducesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/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/jms/JmsDefinitionTest.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/parameterizedReturnTypeWithWildcard/ParameterizedReturnTypeWithWildcardTest.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/definition/ProducerMethodDefinitionTest.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/producer/method/notBusinessMethod/NotABusinessMethodTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithTypeParameter/ParameterizedTypeWithTypeParameterTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithWildcard/PamaterizedTypeWithWildcardTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/stereotypeEnforcesRequiredTypes/StereotypeEnforcesRequiredTypesTest.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/interceptorAndDecorator/SimpleBeanIsDecoratorAndInterceptorTest.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/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/newSimpleBean/newAndOtherBindingType/NewAndOtherBindingTypeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/RealizationTest.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/directlyExtendsNothing/DirectlyExtendsNothingTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsSimpleBean/DirectlyExtendsSimpleBeanTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing/ImplementsInterfaceAndExtendsNothingTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/sameName/SameNameTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/samePrecedence/SamePrecedenceTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/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/indirectOverride/IndirectOverrideTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/lowerprecedence/SpecializingBeanDoesNotHaveHigherPrecedenceThanSpecializedBeanTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializesStaticMethod/SpecializesStaticMethodTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/SpecializingAndSpecializedBeanHaveNameTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/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/precedence/SpecializingBeanWithLowerPrecedenceTest.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/lookup/byname/InstantiationByNameTest.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/clientProxy/ClientProxyTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unknown/UnknownBeanTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/UnproxyableTest.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/InjectionPointTest.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/nonContextual/NonContextualInjectionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/nonContextual/servlet/InjectionIntoServletTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/InstantiationByTypeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java tck/trunk/impl/src/main/resources/tck-tests.xml Log: Switch to using harness project Modified: ri/trunk/jboss-tck-runner/pom.xml =================================================================== --- ri/trunk/jboss-tck-runner/pom.xml 2009-03-11 13:06:00 UTC (rev 1911) +++ ri/trunk/jboss-tck-runner/pom.xml 2009-03-11 13:16:34 UTC (rev 1912) @@ -163,7 +163,7 @@ </suiteXmlFiles> <systemProperties> <property> - <name>org.jboss.jsr299.tck.standalone</name> + <name>org.jboss.testharness.standalone</name> <value>false</value> </property> <property> @@ -175,11 +175,11 @@ <value>false</value> </property> <property> - <name>org.jboss.jsr299.tck.libraryDirectory</name> + <name>org.jboss.testharness.libraryDirectory</name> <value>target/dependency/lib</value> </property> <property> - <name>org.jboss.jsr299.tck.runIntegrationTests</name> + <name>org.jboss.testharness.runIntegrationTests</name> <value>true</value> </property> </systemProperties> @@ -206,7 +206,7 @@ </suiteXmlFiles> <systemProperties> <property> - <name>org.jboss.jsr299.tck.standalone</name> + <name>org.jboss.testharness.standalone</name> <value>false</value> </property> <property> @@ -218,15 +218,15 @@ <value>true</value> </property> <property> - <name>org.jboss.jsr299.tck.runIntegrationTests</name> + <name>org.jboss.testharness.runIntegrationTests</name> <value>true</value> </property> <property> - <name>org.jboss.jsr299.tck.libraryDirectory</name> + <name>org.jboss.testharness.libraryDirectory</name> <value>target/dependency/lib</value> </property> <property> - <name>org.jboss.jsr299.tck.outputDirectory</name> + <name>org.jboss.testharness.outputDirectory</name> <value>target</value> </property> </systemProperties> @@ -257,18 +257,18 @@ </execution> </executions> <configuration> - <mainClass>org.jboss.jsr299.tck.api.TCK</mainClass> + <mainClass>org.jboss.testharness.api.TCK</mainClass> <systemProperties> <systemProperty> <key>dumpArtifacts</key> <value>true</value> </systemProperty> <systemProperty> - <key>org.jboss.jsr299.tck.outputDirectory</key> + <key>org.jboss.testharness.outputDirectory</key> <value>target/jsr299-artifacts</value> </systemProperty> <systemProperty> - <key>org.jboss.jsr299.tck.libraryDirectory</key> + <key>org.jboss.testharness.libraryDirectory</key> <value>target/dependency/lib</value> </systemProperty> </systemProperties> Modified: ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/AbstractContainersImpl.java =================================================================== --- ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/AbstractContainersImpl.java 2009-03-11 13:06:00 UTC (rev 1911) +++ ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/AbstractContainersImpl.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -12,9 +12,9 @@ import java.net.URLConnection; import org.apache.log4j.Logger; -import org.jboss.jsr299.tck.api.Configurable; -import org.jboss.jsr299.tck.api.Configuration; -import org.jboss.jsr299.tck.spi.Containers; +import org.jboss.testharness.api.Configurable; +import org.jboss.testharness.api.Configuration; +import org.jboss.testharness.spi.Containers; import org.jboss.webbeans.tck.integration.jbossas.util.DeploymentProperties; /** Modified: ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/ProfileServiceContainersImpl.java =================================================================== --- ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/ProfileServiceContainersImpl.java 2009-03-11 13:06:00 UTC (rev 1911) +++ ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/ProfileServiceContainersImpl.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -14,10 +14,10 @@ import org.jboss.deployers.spi.management.deploy.DeploymentManager; import org.jboss.deployers.spi.management.deploy.DeploymentProgress; import org.jboss.deployers.spi.management.deploy.DeploymentStatus; -import org.jboss.jsr299.tck.api.DeploymentException; import org.jboss.managed.api.ManagedDeployment.DeploymentPhase; import org.jboss.profileservice.spi.ProfileKey; import org.jboss.profileservice.spi.ProfileService; +import org.jboss.testharness.api.DeploymentException; import org.jboss.virtual.VFS; public class ProfileServiceContainersImpl extends AbstractContainersImpl Modified: ri/trunk/jboss-tck-runner/src/main/resources/META-INF/web-beans-tck.properties =================================================================== --- ri/trunk/jboss-tck-runner/src/main/resources/META-INF/web-beans-tck.properties 2009-03-11 13:06:00 UTC (rev 1911) +++ ri/trunk/jboss-tck-runner/src/main/resources/META-INF/web-beans-tck.properties 2009-03-11 13:16:34 UTC (rev 1912) @@ -1,4 +1,4 @@ -org.jboss.jsr299.tck.spi.Containers=org.jboss.webbeans.tck.integration.jbossas.ProfileServiceContainersImpl -org.jboss.jsr299.tck.api.TestLauncher=org.jboss.jsr299.tck.impl.runner.servlet.ServletTestLauncher -org.jboss.jsr299.tck.connectDelay=1500 -org.jboss.jsr299.tck.connectRetries=8 \ No newline at end of file +org.jboss.testharness.spi.Containers=org.jboss.webbeans.tck.integration.jbossas.ProfileServiceContainersImpl +org.jboss.testharness.api.TestLauncher=org.jboss.testharness.impl.runner.servlet.ServletTestLauncher +org.jboss.testharness.connectDelay=1500 +org.jboss.testharness.connectRetries=8 \ No newline at end of file Modified: ri/trunk/jboss-tck-runner/src/test/debug-resources/META-INF/web-beans-tck.properties =================================================================== --- ri/trunk/jboss-tck-runner/src/test/debug-resources/META-INF/web-beans-tck.properties 2009-03-11 13:06:00 UTC (rev 1911) +++ ri/trunk/jboss-tck-runner/src/test/debug-resources/META-INF/web-beans-tck.properties 2009-03-11 13:16:34 UTC (rev 1912) @@ -1,7 +1,7 @@ # Configuration for running incontainer tests from your IDE # Alter the path webbeans accordingly (relative from the tck/impl dir) -org.jboss.jsr299.tck.standalone=false +org.jboss.testharness.standalone=false jboss-as.dir=../../webbeans/jboss-as jboss.force.restart=false -org.jboss.jsr299.tck.libraryDirectory=../../webbeans/jboss-tck-runner/target/dependency/lib -org.jboss.jsr299.tck.runIntegrationTests=true \ No newline at end of file +org.jboss.testharness.libraryDirectory=../../webbeans/jboss-tck-runner/target/dependency/lib +org.jboss.testharness.runIntegrationTests=true \ No newline at end of file Modified: ri/trunk/porting-package/src/main/java/org/jboss/webbeans/tck/ContextsImpl.java =================================================================== --- ri/trunk/porting-package/src/main/java/org/jboss/webbeans/tck/ContextsImpl.java 2009-03-11 13:06:00 UTC (rev 1911) +++ ri/trunk/porting-package/src/main/java/org/jboss/webbeans/tck/ContextsImpl.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -1,8 +1,8 @@ package org.jboss.webbeans.tck; import org.jboss.jsr299.tck.spi.Contexts; +import org.jboss.webbeans.context.AbstractContext; import org.jboss.webbeans.context.AbstractMapContext; -import org.jboss.webbeans.context.AbstractContext; import org.jboss.webbeans.context.DependentContext; import org.jboss.webbeans.context.RequestContext; Modified: ri/trunk/porting-package/src/main/java/org/jboss/webbeans/tck/StandaloneContainersImpl.java =================================================================== --- ri/trunk/porting-package/src/main/java/org/jboss/webbeans/tck/StandaloneContainersImpl.java 2009-03-11 13:06:00 UTC (rev 1911) +++ ri/trunk/porting-package/src/main/java/org/jboss/webbeans/tck/StandaloneContainersImpl.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -4,8 +4,8 @@ import java.net.URL; import java.util.List; -import org.jboss.jsr299.tck.api.DeploymentException; -import org.jboss.jsr299.tck.spi.StandaloneContainers; +import org.jboss.testharness.api.DeploymentException; +import org.jboss.testharness.spi.StandaloneContainers; import org.jboss.webbeans.CurrentManager; import org.jboss.webbeans.ManagerImpl; import org.jboss.webbeans.mock.MockLifecycle; Modified: ri/trunk/porting-package/src/main/resources/META-INF/web-beans-tck.properties =================================================================== --- ri/trunk/porting-package/src/main/resources/META-INF/web-beans-tck.properties 2009-03-11 13:06:00 UTC (rev 1911) +++ ri/trunk/porting-package/src/main/resources/META-INF/web-beans-tck.properties 2009-03-11 13:16:34 UTC (rev 1912) @@ -1,5 +1,5 @@ org.jboss.jsr299.tck.spi.Managers=org.jboss.webbeans.tck.ManagersImpl org.jboss.jsr299.tck.spi.Beans=org.jboss.webbeans.tck.BeansImpl org.jboss.jsr299.tck.spi.Contexts=org.jboss.webbeans.tck.ContextsImpl -org.jboss.jsr299.tck.spi.StandaloneContainers=org.jboss.webbeans.tck.StandaloneContainersImpl +org.jboss.testharness.spi.StandaloneContainers=org.jboss.webbeans.tck.StandaloneContainersImpl org.jboss.jsr299.tck.spi.EL=org.jboss.webbeans.tck.ELImpl \ No newline at end of file Modified: tck/trunk/api/pom.xml =================================================================== --- tck/trunk/api/pom.xml 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/api/pom.xml 2009-03-11 13:16:34 UTC (rev 1912) @@ -38,6 +38,11 @@ <groupId>org.jboss.webbeans</groupId> <artifactId>jsr299-api</artifactId> </dependency> + + <dependency> + <groupId>org.jboss.test-harness</groupId> + <artifactId>jboss-test-harness-api</artifactId> + </dependency> </dependencies> <build> Deleted: tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/Configurable.java =================================================================== --- tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/Configurable.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/Configurable.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -1,17 +0,0 @@ -package org.jboss.jsr299.tck.api; - -/** - * If you implement this interface, the TCK will inject the configuration into - * your implementation in the post-construct phase. - * - * This interface can be implemented by any implementation of a TCK SPI. - * - * @author Pete Muir - * - */ -public interface Configurable -{ - - public void setConfiguration(Configuration configuration); - -} Deleted: tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/Configuration.java =================================================================== --- tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/Configuration.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/Configuration.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -1,155 +0,0 @@ -package org.jboss.jsr299.tck.api; - -import javax.context.Context; - -import org.jboss.jsr299.tck.spi.Beans; -import org.jboss.jsr299.tck.spi.Containers; -import org.jboss.jsr299.tck.spi.Contexts; -import org.jboss.jsr299.tck.spi.EL; -import org.jboss.jsr299.tck.spi.Managers; -import org.jboss.jsr299.tck.spi.StandaloneContainers; - -/** - * The configuration of the TCK. - * - * The TCK may be configured using system properties or placed in a properties - * file called META-INF/web-beans-tck.properties. - * - * Porting package property names are the FQCN of the SPI class. Other property - * names (one for each non-porting package SPI configuration option) are - * specified here. The defaults are also listed here. - * - * The TCK may also be configured programatically through this interface - * - * @author Pete Muir - * - */ -public interface Configuration -{ - - public static final String OUTPUT_DIRECTORY_PROPERTY_NAME = "org.jboss.jsr299.tck.outputDirectory"; - public static final String STANDALONE_PROPERTY_NAME = "org.jboss.jsr299.tck.standalone"; - public static final String RUN_INTEGRATION_TESTS_PROPERTY_NAME = "org.jboss.jsr299.tck.runIntegrationTests"; - public static final String CONNECT_TIMEOUT_PROPERTY_NAME = "org.jboss.jsr299.tck.connectTimeout"; - public static final String LIBRARY_DIRECTORY_PROPERTY_NAME = "org.jboss.jsr299.tck.libraryDirectory"; - public static final String HOST_PROPERTY_NAME = "org.jboss.jsr299.tck.host"; - public static final String TEST_CLASS_PROPERTY_NAME = "org.jboss.jsr299.tck.testClass"; - - public static final String DEFAULT_OUTPUT_DIRECTORY = System.getProperty("java.io.tmpdir") + "/jsr-299-tck/"; - public static final boolean DEFAULT_STANDALONE = true; - public static final boolean DEFAULT_RUN_INTEGRATION_TESTS = false; - public static final int DEFAULT_CONNECT_DELAY = 5000; - public static final boolean DEFAULT_WRITE_DEPLOYED_ARCHIVES_TO_DISK = false; - public static final String DEFAULT_LIBRARY_DIRECTORY = null; - public static final String DEFAULT_HOST = "localhost:8080"; - public static final int DEFAULT_CONNECT_RETRIES = 2; - - /** - * The output directory to put TCK specific output. The TestNG output - * directory is configured via TestNG. - * - * By default set to ${tmp}/jsr-299-tck - */ - public String getOutputDirectory(); - - /** - * Whether the TCK is in standalone mode or not. - * - * By default true - */ - public boolean isStandalone(); - - /** - * When the TCK is running in container tests it will attempt to connect to - * the server every 200ms until the timeout is reached. - * - * By default 5000ms - */ - public int getConnectTimeout(); - - /** - * The TCK allows additional libraries to be put in the deployed test - * artifacts (for example the porting package for the implementation). Any - * jars in this directory will be added to the deployed artifact. - * - * By default no directory is used. - */ - public String getLibraryDirectory(); - - /** - * The TCK test launcher - * - * @see TestLauncher - * - */ - public TestLauncher getInContainerTestLauncher(); - - /** - * The implementation of {@link Beans} in use. - */ - public Beans getBeans(); - - /** - * The implementation of {@link Contexts} in use. - */ - public <T extends Context> Contexts<T> getContexts(); - - /** - * The implementation of {@link Managers} in use. - */ - public Managers getManagers(); - - /** - * The implementation of {@link Containers} in use. - */ - public Containers getContainers(); - - /** - * Whether to run integration tests, by default false. - */ - public boolean isRunIntegrationTests(); - - public void setOutputDirectory(String outputDirectory); - - public void setStandalone(boolean standalone); - - public void setConnectTimeout(int connectTimeout); - - public void setLibraryDirectory(String libraryDir); - - public void setInContainerTestLauncher(TestLauncher testLauncher); - - public void setBeans(Beans beans); - - public <T extends Context> void setContexts(Contexts<T> contexts); - - public void setManagers(Managers managers); - - public void setContainers(Containers containers); - - /** - * The implementation of {@link StandaloneContainers} in use. - */ - public StandaloneContainers getStandaloneContainers(); - - public void setStandaloneContainers(StandaloneContainers standaloneContainers); - - public void setRunIntegrationTests(boolean runIntegrationTests); - - public void setEl(EL el); - - /** - * The implementation of {@link EL} in use. - */ - public EL getEl(); - - /** - * The TCK will use this as the remote host to connect to run in container - * tests. By default localhost:8080 - * - */ - public String getHost(); - - public void setHost(String host); - -} \ No newline at end of file Deleted: tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/DeploymentException.java =================================================================== --- tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/DeploymentException.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/DeploymentException.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -1,32 +0,0 @@ -package org.jboss.jsr299.tck.api; - -/** - * Wraps the deployment exception, which can be obtained using - * {@link #getCause()} - * @author Pete Muir - * - */ -public class DeploymentException extends Exception -{ - - public DeploymentException() - { - super(); - } - - public DeploymentException(String arg0, Throwable arg1) - { - super(arg0, arg1); - } - - public DeploymentException(String arg0) - { - super(arg0); - } - - public DeploymentException(Throwable arg0) - { - super(arg0); - } - -} Copied: tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/JSR299Configuration.java (from rev 1900, tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/Configuration.java) =================================================================== --- tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/JSR299Configuration.java (rev 0) +++ tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/JSR299Configuration.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -0,0 +1,59 @@ +package org.jboss.jsr299.tck.api; + +import javax.context.Context; + +import org.jboss.jsr299.tck.spi.Beans; +import org.jboss.jsr299.tck.spi.Contexts; +import org.jboss.jsr299.tck.spi.EL; +import org.jboss.jsr299.tck.spi.Managers; +import org.jboss.testharness.api.Configuration; + +/** + * The configuration of the TCK. + * + * The TCK may be configured using system properties or placed in a properties + * file called META-INF/web-beans-tck.properties. + * + * Porting package property names are the FQCN of the SPI class. Other property + * names (one for each non-porting package SPI configuration option) are + * specified here. The defaults are also listed here. + * + * The TCK may also be configured programatically through this interface + * + * @author Pete Muir + * + */ +public interface JSR299Configuration extends Configuration +{ + + + + /** + * The implementation of {@link Beans} in use. + */ + public Beans getBeans(); + + /** + * The implementation of {@link Contexts} in use. + */ + public <T extends Context> Contexts<T> getContexts(); + + /** + * The implementation of {@link Managers} in use. + */ + public Managers getManagers(); + + public void setBeans(Beans beans); + + public <T extends Context> void setContexts(Contexts<T> contexts); + + public void setManagers(Managers managers); + + public void setEl(EL el); + + /** + * The implementation of {@link EL} in use. + */ + public EL getEl(); + +} \ No newline at end of file Property changes on: tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/JSR299Configuration.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/TCK.java =================================================================== --- tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/TCK.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/TCK.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -1,87 +0,0 @@ -package org.jboss.jsr299.tck.api; - - - -/** - * Programmatic TCK control - * - * @author Pete Muir - * - */ -public abstract class TCK -{ - - public static final String DUMP_ARTIFACTS_PROPERTY_NAME = "dumpArtifacts"; - - public static final String DUMP_CONFIGURATION_PROPERTY_NAME = "dumpConfiguration"; - - public static final String RUN_SUITE_PROPERTY_NAME = "runSuite"; - - /** - * Obtain an instance of the TCK - * - * @param configuration - * the TCK configuration; if null, the TCK should try to load - * configuration from system properties and - * web-beans-tck.properties - * @return - */ - public static final TCK newInstance() - { - TCK tCK; - try - { - tCK = (TCK) Class.forName("org.jboss.jsr299.tck.impl.TCKImpl").newInstance(); - } - catch (InstantiationException e) - { - throw new IllegalStateException("WebBeansTCK cannot be run unless webbeans-tck-impl.jar is on the classpath", e); - } - catch (IllegalAccessException e) - { - throw new IllegalStateException("WebBeansTCK cannot be run unless webbeans-tck-impl.jar is on the classpath", e); - } - catch (ClassNotFoundException e) - { - throw new IllegalStateException("WebBeansTCK cannot be run unless webbeans-tck-impl.jar is on the classpath", e); - } - return tCK; - } - - public static void main(String[] args) - { - if (isSystemPropertyTrue(DUMP_ARTIFACTS_PROPERTY_NAME)) - { - TCK tck = newInstance(); - tck.dumpArtifacts(); - } - if (isSystemPropertyTrue(DUMP_CONFIGURATION_PROPERTY_NAME)) - { - System.out.println(newInstance().getConfiguration()); - } - } - - protected TCK() - { - } - - /** - * Initiate a dump of all TCK artifacts - * - */ - public abstract void dumpArtifacts(); - - /** - * Get the current configuration - * - * @return - */ - public abstract Configuration getConfiguration(); - - private static boolean isSystemPropertyTrue(String propertyName) - { - String value = System.getProperty(propertyName); - return value != null && Boolean.valueOf(value); - } - -} Deleted: tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/TestLauncher.java =================================================================== --- tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/TestLauncher.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/TestLauncher.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -1,38 +0,0 @@ -package org.jboss.jsr299.tck.api; - -import java.io.IOException; -import java.lang.reflect.Method; - -/** - * Allow the TCK to launch a test remotely in a container. - * - * The TCK provides a built in launcher for use in an environment where Servlet - * is available such as EE6, EE5 or EE6 Web Profile. This can be used by - * specifying: - * - * org.jboss.jsr299.tck.api.TestLauncher=org.jboss.jsr299.tck.impl.runner.servlet.ServletTestLauncher - * - * A Servlet suitable for launching tests is included in the artifacts produced - * by the JSR299 TCK. - * - * @author Pete Muir - * - */ -public interface TestLauncher -{ - - public static final String PROPERTY_NAME = TestLauncher.class.getName(); - - /** - * Launch a test remotely, returning the result to the TCK. - * - * @param method - * the method to launch - * @return the test result - * @throws IOException - * if a communication error occured with the server. This will - * cause the test to fail - */ - public TestResult launchTest(Method method) throws IOException; - -} Deleted: tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/TestResult.java =================================================================== --- tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/TestResult.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/TestResult.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -1,47 +0,0 @@ -package org.jboss.jsr299.tck.api; - -import java.io.Serializable; - -/** - * A test result which may be serialized for communicate between client and - * server - * - * @author Pete Muir - * - */ -public interface TestResult extends Serializable -{ - - /** - * The test status - * @author Pete Muir - * - */ - public enum Status - { - /** - * The test passed - */ - PASSED, - /** - * The test failed - */ - FAILED, - /** - * The test was skipped due to some deployment problem - */ - SKIPPED; - } - - /** - * Get the status of this test - */ - public Status getStatus(); - - /** - * If the test failed, the exception that was thrown. It does not need to be - * the root cause. - */ - public Throwable getThrowable(); - -} \ No newline at end of file Deleted: tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/Containers.java =================================================================== --- tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/Containers.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/Containers.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -1,85 +0,0 @@ -package org.jboss.jsr299.tck.spi; - -import java.io.IOException; -import java.io.InputStream; - -import org.jboss.jsr299.tck.api.DeploymentException; - -/** - * Incontainer mode deployment related operations - * - * The TCK porting package must provide an implementation of this interface - * which is suitable for the target implementation and application server - * - * @author Pete Muir - * - */ -public interface Containers -{ - - public static final String PROPERTY_NAME = Containers.class.getName(); - - /** - * The war/ear to deploy to the container, it should be read using a - * JarInputStream. - * - * For a successful deployment, a symmetric {@link #undeploy(String)} will be - * called. - * - * @see #undeploy(String) - * - * @param archive - * the archive - * @param name - * the name the TCK uses to refer to this archive, unique within - * this tck run - * @throws DeploymentException - * if any exceptions are encountered during deployment, they - * should be rethrown wrapped in a {@link DeploymentException}. - * Note that the TCK checks deployment exceptions. - * @throws IOException - * if any communication problems with the server occur during - * deployment. These will cause the test suite to fail. - */ - public void deploy(InputStream archive, String name) throws DeploymentException, IOException; - - /** - * Undeploy the war/ear from the container. - * - * @see #deploy(InputStream, String) - * - * @param name - * the name the TCK uses to refer to this archive, unique within - * this tck run - * @throws IOException - * if any communication problems with the server occur during - * deployment. These will cause the test suite to fail. - */ - public void undeploy(String name) throws IOException; - - /** - * Called before the TCK starts executing the testsuite, but after the suite - * has been configured. - * - * A TCK suite lifecycle callback, useful for setting up the container. This - * method may be a no-op if no setup is required. - * - * @throws IOException - * if any communication problems with the server occur during - * setup. These will cause the test suite to fail. - */ - public void setup() throws IOException; - - /** - * Called after the TCK finishes executing the testsuite. - * - * A TCK suite lifecycle callback, useful for cleaning up and shutting down - * the container. This method may be a no-op if no setup is required. - * - * @throws IOException - * if any communication problems with the server occur during - * cleanup. These will cause the test suite to fail. - */ - public void cleanup() throws IOException; - -} \ No newline at end of file Deleted: tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/StandaloneContainers.java =================================================================== --- tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/StandaloneContainers.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/StandaloneContainers.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -1,92 +0,0 @@ -package org.jboss.jsr299.tck.spi; - -import java.net.URL; - -import org.jboss.jsr299.tck.api.DeploymentException; - -/** - * Standalone mode deployment related operations. If the TCK is placed in - * standalone mode, unit tests will be deployed via this interface. - * - * You must implement this as part of the porting package if you intend to run - * the TCK in standalone mode - * - * @author Pete Muir - * - */ -public interface StandaloneContainers -{ - - public static final String PROPERTY_NAME = StandaloneContainers.class.getName(); - - /** - * <p>Bootstrap the container by registering Beans and Observers, raising - * @Initialized event, validating the deployment, and raising the - * @Deployed event.</p> - * - * <p>Any classes passed in should be fully deployed. This includes:</p> - * - * <ul> - * <li>Simple beans</li> - * <li>Session beans</li> - * <li>Producer methods and producer fields</li> - * <li>Observer methods</li> - * <li>support for Event and Instance injection points</li> - * </ul> - * - * The container should be in an fully initialized state when the - * method returns - * - * @param classes the classes to deploy - */ - public void deploy(Iterable<Class<?>> classes) throws DeploymentException; - - /** - * <p>Bootstrap the container for a test by registering Beans and Observers, - * raising @Initialized event, validating the deployment, and raising the - * @Deployed event.</p> - * - * <p>Any classes passed in should be fully deployed. This includes:</p> - * - * <ul> - * <li>Simple beans</li> - * <li>Session beans</li> - * <li>Producer methods and producer fields</li> - * <li>Observer methods</li> - * <li>support for Event and Instance injection points</li> - * </ul> - * - * The container should be in an fully initialized state when the - * method returns - * - * @param classes the classes to deploy - * @param beansXmls the beans.xml files to deploy - */ - public void deploy(Iterable<Class<?>> classes, Iterable<URL> beansXmls) throws DeploymentException; - - /** - * Cleanup the container after this test - * - */ - public void undeploy(); - - /** - * Called before the TCK starts executing the testsuite, but after the suite - * has been configured. - * - * A TCK suite lifecycle callback, useful for setting up the container. This - * method may be a no-op if no setup is required. - * - */ - public void setup(); - - /** - * Called after the TCK finishes executing the testsuite. - * - * A TCK suite lifecycle callback, useful for cleaning up and shutting down - * the container. This method may be a no-op if no setup is required. - * - */ - public void cleanup(); - -} Modified: tck/trunk/impl/pom.xml =================================================================== --- tck/trunk/impl/pom.xml 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/pom.xml 2009-03-11 13:16:34 UTC (rev 1912) @@ -21,6 +21,11 @@ <groupId>org.jboss.jsr299.tck</groupId> <artifactId>jsr299-tck-api</artifactId> </dependency> + + <dependency> + <groupId>org.jboss.test-harness</groupId> + <artifactId>jboss-test-harness</artifactId> + </dependency> <dependency> <groupId>org.testng</groupId> @@ -145,15 +150,10 @@ <stripVersion>true</stripVersion> <artifactItems> <artifactItem> - <groupId>org.jboss.jsr299.tck</groupId> - <artifactId>jsr299-tck-api</artifactId> + <groupId>org.jboss.test-harness</groupId> + <artifactId>jboss-test-harness</artifactId> <overWrite>true</overWrite> </artifactItem> - <artifactItem> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - <classifier>jdk15</classifier> - </artifactItem> </artifactItems> </configuration> </execution> Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractDeclarativeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractDeclarativeTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractDeclarativeTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -1,253 +0,0 @@ -package org.jboss.jsr299.tck; - -import java.io.IOException; -import java.io.InputStream; -import java.lang.reflect.Method; -import java.util.Arrays; -import java.util.Set; - -import org.apache.log4j.Logger; -import org.jboss.jsr299.tck.api.DeploymentException; -import org.jboss.jsr299.tck.api.TestResult; -import org.jboss.jsr299.tck.api.TestResult.Status; -import org.jboss.jsr299.tck.impl.packaging.ArtifactGenerator; -import org.jboss.jsr299.tck.impl.packaging.jsr299.TCKArtifactDescriptor; -import org.testng.IHookCallBack; -import org.testng.IHookable; -import org.testng.ITestContext; -import org.testng.ITestResult; -import org.testng.annotations.AfterClass; -import org.testng.annotations.AfterMethod; -import org.testng.annotations.AfterSuite; -import org.testng.annotations.BeforeClass; -import org.testng.annotations.BeforeMethod; -import org.testng.annotations.BeforeSuite; - -public abstract class AbstractDeclarativeTest extends AbstractTest implements IHookable -{ - - private static Logger log = Logger.getLogger(AbstractDeclarativeTest.class); - - private static boolean inContainer = false; - - public static boolean isInContainer() - { - return inContainer; - } - - public static void setInContainer(boolean inContainer) - { - AbstractDeclarativeTest.inContainer = inContainer; - } - - private TCKArtifactDescriptor artifact; - private DeploymentException deploymentException; - private boolean skipTest = false; - - private boolean isSuiteDeployingTestsToContainer() - { - return !isInContainer() && (!getCurrentConfiguration().isStandalone() || getCurrentConfiguration().isRunIntegrationTests()); - } - - private void generateArtifact() - { - // If we are in the container, the artifact is already built - if (!isInContainer()) - { - ArtifactGenerator generator = new ArtifactGenerator(getCurrentConfiguration()); - artifact = generator.createArtifact(this.getClass()); - } - } - - private boolean isDeployToContainerNeeded() - { - /* - * If this isn't running inside the container - * AND - * there is an artifact to deploy - * AND - * EITHER - * we are in standalone mode and it isn't a unit test - * OR - * we aren't in standalone mode - * THEN - * we need to deploy - */ - return !isInContainer() && artifact != null && ((getCurrentConfiguration().isStandalone() && !artifact.isUnit() && getCurrentConfiguration().isRunIntegrationTests()) || !getCurrentConfiguration().isStandalone()); - } - - private void deployArtifact() - { - try - { - if (isDeployToContainerNeeded()) - { - InputStream jar = null; - try - { - jar = artifact.getJarAsStream(); - getCurrentConfiguration().getContainers().deploy(jar, artifact.getDefaultName()); - } - finally - { - if (jar != null) - { - jar.close(); - } - } - } - else if (artifact != null && artifact.isUnit()) - { - Set<Class<?>> classes = artifact.getClasses(); - getCurrentConfiguration().getStandaloneContainers().deploy(classes, Arrays.asList(artifact.getBeansXml().getSource())); - } - } - catch (IOException e) - { - throw new RuntimeException("Error connecting to the container", e); - } - catch (DeploymentException e) - { - deploymentException = e; - } - if (artifact != null && artifact.getExpectedDeploymentException() != null) - { - if (deploymentException != null) - { - if (isThrowablePresent(artifact.getExpectedDeploymentException(), deploymentException.getCause())) - { - // We expect this exception, so ignore it - deploymentException = null; - skipTest = true; - } - } - else - { - this.deploymentException = new DeploymentException(new ExpectedException("Expected exception " + artifact.getExpectedDeploymentException() + " but none was thrown")); - } - } - } - - private void undeployArtifact() throws Exception - { - if (isDeployToContainerNeeded()) - { - getCurrentConfiguration().getContainers().undeploy(artifact.getDefaultName()); - } - if (getCurrentConfiguration().isStandalone() && artifact != null && artifact.isUnit()) - { - getCurrentConfiguration().getStandaloneContainers().undeploy(); - } - } - - private void checkAssertionsEnabled() - { - boolean assertionsEnabled = false; - try - { - assert false; - } - catch (AssertionError error) - { - assertionsEnabled = true; - } - if (!assertionsEnabled) - { - throw new IllegalStateException("Assertions must be enabled!"); - } - } - - @BeforeSuite(alwaysRun=true) - public void beforeSuite(ITestContext context) throws Exception - { - if (isSuiteDeployingTestsToContainer()) - { - getCurrentConfiguration().getContainers().setup(); - } - if (getCurrentConfiguration().isStandalone()) - { - getCurrentConfiguration().getStandaloneContainers().setup(); - } - checkAssertionsEnabled(); - } - - - @AfterSuite(alwaysRun=true) - public void afterSuite() throws Exception - { - if (isSuiteDeployingTestsToContainer()) - { - getCurrentConfiguration().getContainers().cleanup(); - } - if (getCurrentConfiguration().isStandalone()) - { - getCurrentConfiguration().getStandaloneContainers().cleanup(); - } - } - - @BeforeClass(alwaysRun=true) - public void beforeClass() throws Throwable - { - generateArtifact(); - deployArtifact(); - - } - - @AfterClass(alwaysRun=true) - public void afterClass() throws Exception - { - undeployArtifact(); - this.artifact = null; - this.deploymentException = null; - skipTest = false; - } - - @BeforeMethod(alwaysRun=true) - public void beforeMethod(Method method) - { - setCurrentManager(getCurrentConfiguration().getManagers().getManager()); - } - - @AfterMethod(alwaysRun=true) - public void afterMethod() - { - setCurrentManager(null); - } - - - public void run(IHookCallBack callback, ITestResult testResult) - { - if (artifact == null && !isInContainer()) - { - log.warn("Non @Artifact-test for testcase " + testResult.getMethod()); - } - if (deploymentException != null) - { - testResult.setThrowable(deploymentException.getCause()); - } - else if ((!isDeployToContainerNeeded() || artifact.isRunLocally()) && !skipTest) - { - callback.runTestMethod(testResult); - if (!getCurrentConfiguration().isStandalone() && !isInContainer() && !artifact.isRunLocally()) - { - log.warn("Running testcase locally " + testResult.getMethod()); - } - } - else if (!skipTest) - { - try - { - TestResult result = getCurrentConfiguration().getInContainerTestLauncher().launchTest(testResult.getMethod().getMethod()); - if (result.getStatus().equals(Status.FAILED) || result.getStatus().equals(Status.SKIPPED)) - { - testResult.setThrowable(result.getThrowable()); - testResult.setStatus(ITestResult.FAILURE); - } - } - catch (IOException e) - { - throw new RuntimeException("Error connecting to the container", e); - } - } - } -} \ No newline at end of file Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -0,0 +1,144 @@ +package org.jboss.jsr299.tck; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.lang.annotation.Annotation; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Set; + +import javax.context.Context; +import javax.inject.manager.Manager; + +import org.jboss.jsr299.tck.api.JSR299Configuration; +import org.jboss.jsr299.tck.impl.JSR299ConfigurationImpl; + +public abstract class AbstractJSR299Test extends org.jboss.testharness.AbstractTest +{ + + protected abstract static class RunInDependentContext + { + + protected void setup() + { + getCurrentConfiguration().getContexts().setActive(getCurrentConfiguration().getContexts().getDependentContext()); + } + + protected void cleanup() + { + getCurrentConfiguration().getContexts().setInactive(getCurrentConfiguration().getContexts().getDependentContext()); + } + + public final void run() throws Exception + { + try + { + setup(); + execute(); + } + finally + { + cleanup(); + } + } + + protected JSR299Configuration getCurrentConfiguration() + { + return JSR299ConfigurationImpl.get(); + } + + protected abstract void execute() throws Exception; + + } + + private Manager currentManager; + + protected void setCurrentManager(Manager currentManager) + { + this.currentManager = currentManager; + } + + + protected Manager getCurrentManager() + { + return currentManager; + } + + protected byte[] serialize(Object instance) throws IOException + { + ByteArrayOutputStream bytes = new ByteArrayOutputStream(); + ObjectOutputStream out = new ObjectOutputStream(bytes); + out.writeObject(instance); + return bytes.toByteArray(); + } + + protected Object deserialize(byte[] bytes) throws IOException, ClassNotFoundException + { + ObjectInputStream in = new ObjectInputStream(new ByteArrayInputStream(bytes)); + return in.readObject(); + } + + protected void setContextActive(Context context) + { + getCurrentConfiguration().getContexts().setActive(context); + } + + protected void setContextInactive(Context context) + { + getCurrentConfiguration().getContexts().setInactive(context); + } + + protected void destroyContext(Context context) + { + getCurrentConfiguration().getContexts().destroyContext(context); + } + + protected JSR299Configuration getCurrentConfiguration() + { + return JSR299ConfigurationImpl.get(); + } + + @Override + public void beforeMethod() + { + super.beforeMethod(); + setCurrentManager(getCurrentConfiguration().getManagers().getManager()); + } + + @Override + public void afterMethod() + { + super.afterMethod(); + setCurrentManager(null); + } + + /** + * Checks if all annotations are in a given set of annotations + * + * @param annotations The annotation set + * @param annotationTypes The annotations to match + * @return True if match, false otherwise + */ + public boolean annotationSetMatches(Set<Annotation> annotations, Class<? extends Annotation>... annotationTypes) + { + List<Class<? extends Annotation>> annotationTypeList = new ArrayList<Class<? extends Annotation>>(); + annotationTypeList.addAll(Arrays.asList(annotationTypes)); + for (Annotation annotation : annotations) + { + if (annotationTypeList.contains(annotation.annotationType())) + { + annotationTypeList.remove(annotation.annotationType()); + } + else + { + return false; + } + } + return annotationTypeList.size() == 0; + } + +} \ No newline at end of file Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -1,116 +0,0 @@ -package org.jboss.jsr299.tck; - -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; - -import javax.context.Context; -import javax.inject.manager.Manager; - -import org.jboss.jsr299.tck.api.Configuration; -import org.jboss.jsr299.tck.impl.ConfigurationImpl; - -public abstract class AbstractTest -{ - - protected abstract static class RunInDependentContext - { - - protected void setup() - { - getCurrentConfiguration().getContexts().setActive(getCurrentConfiguration().getContexts().getDependentContext()); - } - - protected void cleanup() - { - getCurrentConfiguration().getContexts().setInactive(getCurrentConfiguration().getContexts().getDependentContext()); - } - - public final void run() throws Exception - { - try - { - setup(); - execute(); - } - finally - { - cleanup(); - } - } - - protected abstract void execute() throws Exception; - - } - - private Manager currentManager; - - protected void setCurrentManager(Manager currentManager) - { - this.currentManager = currentManager; - } - - - protected Manager getCurrentManager() - { - return currentManager; - } - - protected byte[] serialize(Object instance) throws IOException - { - ByteArrayOutputStream bytes = new ByteArrayOutputStream(); - ObjectOutputStream out = new ObjectOutputStream(bytes); - out.writeObject(instance); - return bytes.toByteArray(); - } - - protected Object deserialize(byte[] bytes) throws IOException, ClassNotFoundException - { - ObjectInputStream in = new ObjectInputStream(new ByteArrayInputStream(bytes)); - return in.readObject(); - } - - protected static void setContextActive(Context context) - { - getCurrentConfiguration().getContexts().setActive(context); - } - - protected static void setContextInactive(Context context) - { - getCurrentConfiguration().getContexts().setInactive(context); - } - - protected static void destroyContext(Context context) - { - getCurrentConfiguration().getContexts().destroyContext(context); - } - - protected static Configuration getCurrentConfiguration() - { - return ConfigurationImpl.get(); - } - - protected static boolean isThrowablePresent(Class<? extends Throwable> throwableType, Throwable throwable) - { - if (throwable == null) - { - return false; - } - else if (throwableType.isAssignableFrom(throwable.getClass())) - { - return true; - } - else - { - return isThrowablePresent(throwableType, throwable.getCause()); - } - } - - public String getContextPath() - { - return "http://" + getCurrentConfiguration().getHost() + "/" + this.getClass().getName() + "/"; - } - -} \ No newline at end of file Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/ExpectedException.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/ExpectedException.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/ExpectedException.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -1,34 +0,0 @@ -package org.jboss.jsr299.tck; - -/** - * Thrown if an exception was expected, but non occurred - * - * @author Pete Muir - * - */ -public class ExpectedException extends RuntimeException -{ - - public ExpectedException() - { - super(); - } - - public ExpectedException(String message, Throwable cause) - { - super(message, cause); - } - - public ExpectedException(String message) - { - super(message); - } - - public ExpectedException(Throwable cause) - { - super(cause); - } - - - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/ConfigurationImpl.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/ConfigurationImpl.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/ConfigurationImpl.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -1,230 +0,0 @@ -package org.jboss.jsr299.tck.impl; - -import javax.context.Context; - -import org.jboss.jsr299.tck.api.Configuration; -import org.jboss.jsr299.tck.api.TestLauncher; -import org.jboss.jsr299.tck.spi.Beans; -import org.jboss.jsr299.tck.spi.Containers; -import org.jboss.jsr299.tck.spi.Contexts; -import org.jboss.jsr299.tck.spi.EL; -import org.jboss.jsr299.tck.spi.Managers; -import org.jboss.jsr299.tck.spi.StandaloneContainers; - -public class ConfigurationImpl implements Configuration -{ - - public static final String INTEGRATION_TEST_PACKAGE_NAME = "org.jboss.jsr299.tck.integration"; - public static final String UNIT_TEST_PACKAGE_NAME = "org.jboss.jsr299.tck.unit"; - - private static Configuration current; - public static Configuration get() - { - if (ConfigurationImpl.current == null) - { - ConfigurationImpl.current = new PropertiesBasedConfigurationImpl().loadSPIImplementation(); - } - return ConfigurationImpl.current; - } - - private String outputDirectory; - private boolean standalone; - private boolean runIntegrationTests; - private int connectTimeout; - private String libraryDirectory; - private TestLauncher testLauncher; - private Beans beans; - private Contexts<? extends Context> contexts; - private Managers managers; - private Containers containers; - private StandaloneContainers standaloneContainers; - private EL el; - private String host; - - protected ConfigurationImpl() - { - } - - public ConfigurationImpl(Configuration configuration) - { - this.outputDirectory = configuration.getOutputDirectory(); - this.standalone = configuration.isStandalone(); - this.runIntegrationTests = configuration.isRunIntegrationTests(); - this.connectTimeout = configuration.getConnectTimeout(); - this.libraryDirectory = configuration.getLibraryDirectory(); - this.testLauncher = configuration.getInContainerTestLauncher(); - this.beans = configuration.getBeans(); - this.contexts = configuration.getContexts(); - this.managers = configuration.getManagers(); - this.containers = configuration.getContainers(); - this.el = configuration.getEl(); - this.standaloneContainers = configuration.getStandaloneContainers(); - this.host = configuration.getHost(); - } - - public String getOutputDirectory() - { - return outputDirectory; - } - - public void setOutputDirectory(String outputDirectory) - { - this.outputDirectory = outputDirectory; - } - - public boolean isStandalone() - { - return standalone; - } - - public void setStandalone(boolean standalone) - { - this.standalone = standalone; - } - - public int getConnectTimeout() - { - return connectTimeout; - } - - public void setConnectTimeout(int deploymentDelay) - { - this.connectTimeout = deploymentDelay; - } - - public String getLibraryDirectory() - { - return libraryDirectory; - } - - public void setLibraryDirectory(String libraryDir) - { - this.libraryDirectory = libraryDir; - } - - public TestLauncher getInContainerTestLauncher() - { - return testLauncher; - } - - public void setInContainerTestLauncher(TestLauncher testLauncher) - { - this.testLauncher = testLauncher; - } - - public Beans getBeans() - { - return beans; - } - - public void setBeans(Beans beans) - { - this.beans = beans; - } - - @SuppressWarnings("unchecked") - public <T extends Context> Contexts<T> getContexts() - { - return (Contexts<T>) contexts; - } - - public <T extends Context> void setContexts(Contexts<T> contexts) - { - this.contexts = contexts; - } - - public Managers getManagers() - { - return managers; - } - - public void setManagers(Managers managers) - { - this.managers = managers; - } - - public Containers getContainers() - { - return containers; - } - - public void setContainers(Containers containers) - { - this.containers = containers; - } - - public boolean isRunIntegrationTests() - { - return runIntegrationTests; - } - - public void setRunIntegrationTests(boolean runIntegrationTests) - { - this.runIntegrationTests = runIntegrationTests; - } - - @Deprecated - public EL getEl() - { - return el; - } - - @Deprecated - public void setEl(EL el) - { - this.el = el; - } - - public StandaloneContainers getStandaloneContainers() - { - return standaloneContainers; - } - - public void setStandaloneContainers(StandaloneContainers standaloneContainers) - { - this.standaloneContainers = standaloneContainers; - } - - public String getHost() - { - return host; - } - - public void setHost(String host) - { - this.host = host; - } - - public TestLauncher getTestLauncher() - { - return testLauncher; - } - - public void setTestLauncher(TestLauncher testLauncher) - { - this.testLauncher = testLauncher; - } - - @Override - public String toString() - { - StringBuilder configuration = new StringBuilder(); - configuration.append("TCK Configuration\n"); - configuration.append("-----------------\n"); - configuration.append("\tBeans: ").append(getBeans()).append("\n"); - configuration.append("\tContainers: ").append(getContainers()).append("\n"); - configuration.append("\tContexts: ").append(getContexts()).append("\n"); - configuration.append("\tConnect Timeout: ").append(getConnectTimeout()).append("\n"); - configuration.append("\tEL: ").append(getEl()).append("\n"); - configuration.append("\tHost: ").append(getHost()).append("\n"); - configuration.append("\tLibrary Directory: ").append(getLibraryDirectory()).append("\n"); - configuration.append("\tManagers: ").append(getManagers()).append("\n"); - configuration.append("\tOutput Directory: ").append(getOutputDirectory()).append("\n"); - configuration.append("\tRun Integration Tests: ").append(isRunIntegrationTests()).append("\n"); - configuration.append("\tStandalone: ").append(isStandalone()).append("\n"); - configuration.append("\tTest Launcher: ").append(getTestLauncher()).append("\n"); - - return configuration.toString(); - } - -} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/JSR299ConfigurationImpl.java (from rev 1900, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/ConfigurationImpl.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/JSR299ConfigurationImpl.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/JSR299ConfigurationImpl.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -0,0 +1,98 @@ +package org.jboss.jsr299.tck.impl; + +import javax.context.Context; + +import org.jboss.jsr299.tck.api.JSR299Configuration; +import org.jboss.jsr299.tck.spi.Beans; +import org.jboss.jsr299.tck.spi.Contexts; +import org.jboss.jsr299.tck.spi.EL; +import org.jboss.jsr299.tck.spi.Managers; +import org.jboss.testharness.impl.ConfigurationImpl; + +public class JSR299ConfigurationImpl extends ConfigurationImpl implements JSR299Configuration +{ + + public static JSR299Configuration get() + { + return ConfigurationImpl.get(JSR299Configuration.class); + } + + public static final String INTEGRATION_TEST_PACKAGE_NAME = "org.jboss.jsr299.tck.integration"; + public static final String UNIT_TEST_PACKAGE_NAME = "org.jboss.jsr299.tck.unit"; + + private Beans beans; + private Contexts<? extends Context> contexts; + private Managers managers; + private EL el; + + protected JSR299ConfigurationImpl() + { + } + + public JSR299ConfigurationImpl(JSR299Configuration configuration) + { + this.beans = configuration.getBeans(); + this.contexts = configuration.getContexts(); + this.managers = configuration.getManagers(); + this.el = configuration.getEl(); + } + + + public Beans getBeans() + { + return beans; + } + + public void setBeans(Beans beans) + { + this.beans = beans; + } + + @SuppressWarnings("unchecked") + public <T extends Context> Contexts<T> getContexts() + { + return (Contexts<T>) contexts; + } + + public <T extends Context> void setContexts(Contexts<T> contexts) + { + this.contexts = contexts; + } + + public Managers getManagers() + { + return managers; + } + + public void setManagers(Managers managers) + { + this.managers = managers; + } + + public EL getEl() + { + return el; + } + + public void setEl(EL el) + { + this.el = el; + } + + @Override + public String toString() + { + StringBuilder configuration = new StringBuilder(); + configuration.append("JSR 299 TCK Configuration\n"); + configuration.append("-----------------\n"); + configuration.append("\tBeans: ").append(getBeans()).append("\n"); + configuration.append("\tContainers: ").append(getContainers()).append("\n"); + configuration.append("\tContexts: ").append(getContexts()).append("\n"); + configuration.append("\tEL: ").append(getEl()).append("\n"); + configuration.append("\tManagers: ").append(getManagers()).append("\n"); + configuration.append("\n"); + configuration.append(super.toString()); + return configuration.toString(); + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/JSR299ConfigurationImpl.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/JSR299PropertiesBasedConfigurationBuilder.java (from rev 1900, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/PropertiesBasedConfigurationImpl.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/JSR299PropertiesBasedConfigurationBuilder.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/JSR299PropertiesBasedConfigurationBuilder.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -0,0 +1,45 @@ +package org.jboss.jsr299.tck.impl; + +import java.io.IOException; + +import javax.context.Context; + +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.jsr299.tck.api.JSR299Configuration; +import org.jboss.jsr299.tck.literals.NewLiteral; +import org.jboss.jsr299.tck.spi.Beans; +import org.jboss.jsr299.tck.spi.Contexts; +import org.jboss.jsr299.tck.spi.EL; +import org.jboss.jsr299.tck.spi.Managers; +import org.jboss.testharness.impl.PropertiesBasedConfigurationBuilder; + +public class JSR299PropertiesBasedConfigurationBuilder extends PropertiesBasedConfigurationBuilder<JSR299Configuration> +{ + + public JSR299PropertiesBasedConfigurationBuilder() throws IOException + { + super(new JSR299ConfigurationImpl()); + super.getConfiguration().getExtraPackages().add(NewLiteral.class.getPackage().getName()); + super.getConfiguration().getExtraPackages().add(AbstractJSR299Test.class.getPackage().getName()); + super.getConfiguration().getExtraPackages().add(JSR299ConfigurationImpl.class.getPackage().getName()); + super.getConfiguration().getExtraPackages().add(JSR299Configuration.class.getPackage().getName()); + super.getConfiguration().getExtraPackages().add(Managers.class.getPackage().getName()); + super.getConfiguration().getExtraDeploymentProperties().add("org.jboss.testharness.api.ConfigurationBuilder=org.jboss.jsr299.tck.impl.JSR299PropertiesBasedConfigurationBuilder"); + } + + @Override + public JSR299PropertiesBasedConfigurationBuilder init() + { + super.init(); + getConfiguration().setManagers(getInstanceValue(Managers.PROPERTY_NAME, Managers.class, true)); + getConfiguration().setBeans(getInstanceValue(Beans.PROPERTY_NAME, Beans.class, true)); + getConfiguration().setEl(getInstanceValue(EL.PROPERTY_NAME, EL.class, true)); + + @SuppressWarnings("unchecked") + Contexts<? extends Context> instanceValue = getInstanceValue(Contexts.PROPERTY_NAME, Contexts.class, true); + + getConfiguration().setContexts(instanceValue); + return this; + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/JSR299PropertiesBasedConfigurationBuilder.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/PropertiesBasedConfigurationImpl.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/PropertiesBasedConfigurationImpl.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/PropertiesBasedConfigurationImpl.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -1,58 +0,0 @@ -package org.jboss.jsr299.tck.impl; - -import javax.context.Context; - -import org.jboss.jsr299.tck.api.Configurable; -import org.jboss.jsr299.tck.api.TestLauncher; -import org.jboss.jsr299.tck.impl.util.DeploymentProperties; -import org.jboss.jsr299.tck.spi.Beans; -import org.jboss.jsr299.tck.spi.Containers; -import org.jboss.jsr299.tck.spi.Contexts; -import org.jboss.jsr299.tck.spi.EL; -import org.jboss.jsr299.tck.spi.Managers; -import org.jboss.jsr299.tck.spi.StandaloneContainers; - -public class PropertiesBasedConfigurationImpl extends ConfigurationImpl -{ - - private final DeploymentProperties deploymentProperties; - - public PropertiesBasedConfigurationImpl() - { - this.deploymentProperties = new DeploymentProperties(); - - setOutputDirectory(deploymentProperties.getStringValue(OUTPUT_DIRECTORY_PROPERTY_NAME, DEFAULT_OUTPUT_DIRECTORY, false)); - setStandalone(deploymentProperties.getBooleanValue(STANDALONE_PROPERTY_NAME, DEFAULT_STANDALONE, false)); - setRunIntegrationTests(deploymentProperties.getBooleanValue(RUN_INTEGRATION_TESTS_PROPERTY_NAME, DEFAULT_RUN_INTEGRATION_TESTS, false)); - setConnectTimeout(deploymentProperties.getIntValue(CONNECT_TIMEOUT_PROPERTY_NAME, DEFAULT_CONNECT_DELAY, false)); - setLibraryDirectory(deploymentProperties.getStringValue(LIBRARY_DIRECTORY_PROPERTY_NAME, DEFAULT_LIBRARY_DIRECTORY, false)); - setHost(deploymentProperties.getStringValue(HOST_PROPERTY_NAME, DEFAULT_HOST, false)); - } - - public PropertiesBasedConfigurationImpl loadSPIImplementation() - { - setInContainerTestLauncher(getInstanceValue(TestLauncher.PROPERTY_NAME, TestLauncher.class, isRunIntegrationTests() || !isStandalone())); - setManagers(getInstanceValue(Managers.PROPERTY_NAME, Managers.class, true)); - setContainers(getInstanceValue(Containers.PROPERTY_NAME, Containers.class, !isStandalone() || isRunIntegrationTests())); - setStandaloneContainers(getInstanceValue(StandaloneContainers.PROPERTY_NAME, StandaloneContainers.class, isStandalone())); - setBeans(getInstanceValue(Beans.PROPERTY_NAME, Beans.class, true)); - setEl(getInstanceValue(EL.PROPERTY_NAME, EL.class, true)); - - @SuppressWarnings("unchecked") - Contexts<? extends Context> instanceValue = getInstanceValue(Contexts.PROPERTY_NAME, Contexts.class, true); - - setContexts(instanceValue); - return this; - } - - private <T> T getInstanceValue(String propertyName, Class<T> expectedType, boolean required) - { - T instance = deploymentProperties.getInstanceValue(propertyName, expectedType, required); - if (instance instanceof Configurable) - { - ((Configurable) instance).setConfiguration(this); - } - return instance; - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/TCKImpl.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/TCKImpl.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/TCKImpl.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -1,77 +0,0 @@ -package org.jboss.jsr299.tck.impl; - -import java.io.IOException; -import java.io.InputStream; -import java.util.ArrayList; -import java.util.List; - -import javax.xml.parsers.ParserConfigurationException; - -import org.apache.log4j.Logger; -import org.jboss.jsr299.tck.api.Configuration; -import org.jboss.jsr299.tck.api.TCK; -import org.jboss.jsr299.tck.impl.packaging.ArtifactGenerator; -import org.testng.TestNG; -import org.testng.xml.Parser; -import org.testng.xml.XmlSuite; -import org.xml.sax.SAXException; - -public class TCKImpl extends TCK -{ - - private static Logger log = Logger.getLogger(TCKImpl.class); - - protected void runUnitTests() - { - TestNG testNG = new TestNG(); - addUnitTests(testNG); - if (getConfiguration().getOutputDirectory() != null) - { - testNG.setOutputDirectory(getConfiguration().getOutputDirectory()); - } - testNG.run(); - } - - private static void addUnitTests(TestNG testNG) - { - InputStream is = TCKImpl.class.getResourceAsStream("/tck-unit-tests.xml"); - if (is == null) - { - throw new IllegalStateException("Unable to load testng.xml"); - } - List<XmlSuite> suites = new ArrayList<XmlSuite>(); - try - { - suites.addAll(new Parser(is).parse()); - - } - catch (ParserConfigurationException e) - { - throw new IllegalStateException("Unable to load testng.xml", e); - } - catch (SAXException e) - { - throw new IllegalStateException("Unable to load testng.xml", e); - } - catch (IOException e) - { - throw new IllegalStateException("Unable to load testng.xml", e); - } - testNG.setXmlSuites(suites); - } - - @Override - public void dumpArtifacts() - { - Configuration configuration = new PropertiesBasedConfigurationImpl(); - configuration.setStandalone(false); - new ArtifactGenerator(configuration).dumpArtifacts(); - } - - @Override - public Configuration getConfiguration() - { - return ConfigurationImpl.get(); - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/Artifact.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/Artifact.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/Artifact.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -1,36 +0,0 @@ -package org.jboss.jsr299.tck.impl.packaging; - -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; - -/** - * Mark this class as requiring an JSR299 artifact to be deployed for the - * container. By default all classes in the current package, as well as support - * classes, will be deployed. The resultant artifact may not support session - * beans. - * - * This test may be a unit test (in which case, if the suite is run in - * standalone mode, the artifact itself won't be deployed, just the contained - * classes and /META-INF/beans.xml file). - * - * @see Classes - * @see IntegrationTest - * @see Packaging - * @see Resources - * - * @author Pete Muir - * - */ -@Documented -@Retention(RUNTIME) -@Target(TYPE) -public @interface Artifact -{ - - boolean addCurrentPackage() default true; - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ArtifactDescriptor.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ArtifactDescriptor.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ArtifactDescriptor.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -1,501 +0,0 @@ -package org.jboss.jsr299.tck.impl.packaging; - -import static org.jboss.jsr299.tck.impl.util.Reflections.loadClass; -import static org.jboss.jsr299.tck.impl.util.Reflections.loadResourceAsStream; -import static org.jboss.jsr299.tck.impl.util.Reflections.loadResources; -import static org.jboss.jsr299.tck.impl.util.Strings.isEmpty; - -import java.io.BufferedOutputStream; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.net.URL; -import java.net.URLClassLoader; -import java.net.URLDecoder; -import java.util.Enumeration; -import java.util.HashSet; -import java.util.Random; -import java.util.Set; -import java.util.jar.Attributes; -import java.util.jar.JarEntry; -import java.util.jar.JarOutputStream; -import java.util.jar.Manifest; -import java.util.zip.ZipEntry; -import java.util.zip.ZipException; -import java.util.zip.ZipFile; - -import org.apache.log4j.Logger; -import org.jboss.jsr299.tck.impl.util.Files; - -public class ArtifactDescriptor -{ - - private static final Logger log = Logger.getLogger(ArtifactScanner.class); - - /** - * Implementation of {@link Scanner} which can scan a {@link URLClassLoader} - * - * @author Thomas Heute - * @author Gavin King - * @author Norman Richards - * @author Pete Muir - * - */ - private static class URLPackageScanner - { - private static final Logger log = Logger.getLogger(URLPackageScanner.class); - - private final String packageName; - - private final String packageNamePath; - private final boolean addRecursively; - - private final Set<String> classes = new HashSet<String>(); - - public URLPackageScanner(Package pkg, boolean addRecursively) - { - this(pkg.getName(), addRecursively); - } - - public URLPackageScanner(String packageName, boolean addRecursively) - { - this.packageName = packageName; - this.packageNamePath = packageName.replace(".", "/"); - this.addRecursively = addRecursively; - } - - private void scanPackage() - { - try - { - Set<String> paths = new HashSet<String>(); - - for (URL url : loadResources(packageNamePath)) - { - String urlPath = url.getFile(); - urlPath = URLDecoder.decode(urlPath, "UTF-8"); - if ( urlPath.startsWith("file:") ) - { - urlPath = urlPath.substring(5); - } - if ( urlPath.indexOf('!')>0 ) - { - urlPath = urlPath.substring(0, urlPath.indexOf('!')); - } - paths.add(urlPath); - } - handle(paths); - } - catch (IOException ioe) - { - log.warn("could not read: " + packageName, ioe); - } - } - - private void handleArchiveByFile(File file) throws IOException - { - try - { - log.trace("archive: " + file); - ZipFile zip = new ZipFile(file); - Enumeration<? extends ZipEntry> entries = zip.entries(); - while ( entries.hasMoreElements() ) - { - ZipEntry entry = entries.nextElement(); - String name = entry.getName(); - if (name.startsWith(packageNamePath) && name.endsWith(".class") && (addRecursively || !name.substring(packageNamePath.length() + 1).contains("/"))) - { - String className = name.replace("/", ".").replace(".class", ""); - classes.add(className); - } - } - } - catch (ZipException e) - { - throw new RuntimeException("Error handling file " + file, e); - } - } - - private void handle(Set<String> paths) throws IOException - { - for ( String urlPath: paths ) - { - log.trace("scanning: " + urlPath); - File file = new File(urlPath); - if ( file.isDirectory() ) - { - handle(file, packageName); - } - else - { - handleArchiveByFile(file); - } - } - } - - private void handle(File file, String packageName) - { - for ( File child: file.listFiles() ) - { - if ( !child.isDirectory() && child.getName().endsWith(".class")) - { - classes.add(packageName + "." + child.getName().substring(0, child.getName().lastIndexOf(".class"))); - } - else if (child.isDirectory() && addRecursively) - { - handle(child, packageName + "." + child.getName()); - } - } - } - - public Set<String> getClassNames() - { - scanPackage(); - return classes; - } - - } - - private static class JarCreator - { - - private final File root; - - public JarCreator(File root) - { - this.root = root; - } - - public InputStream jar() throws IOException - { - ByteArrayOutputStream byteArrayOutputStream = null; - JarOutputStream jarOutputStream = null; - try - { - byteArrayOutputStream = new ByteArrayOutputStream(); - Manifest manifest = new Manifest(); - Attributes attributes = manifest.getMainAttributes(); - attributes.putValue("Created-By", "JSR-299 TCK Harness"); - attributes.put(Attributes.Name.MANIFEST_VERSION, "1.0"); - jarOutputStream = new JarOutputStream(byteArrayOutputStream, manifest); - jar(root, jarOutputStream); - jarOutputStream.close(); - return new ByteArrayInputStream(byteArrayOutputStream.toByteArray()); - } - finally - { - if (jarOutputStream != null) - { - jarOutputStream.close(); - } - else if (byteArrayOutputStream != null) - { - byteArrayOutputStream.close(); - } - } - } - - private void jar(File directory, JarOutputStream jarOutputStream) throws IOException - { - File[] children = directory.listFiles(); - //loop through dirList, and zip the files - for (File child : children) - { - if (child.isDirectory()) - { - jar(child, jarOutputStream); - } - else - { - FileInputStream fis = new FileInputStream(child); - JarEntry jarEntry = new JarEntry(child.getPath().substring(root.getPath().length() + 1).replaceAll("\\" + File.separator, "/")); - jarOutputStream.putNextEntry(jarEntry); - Files.copy(fis, jarOutputStream); - fis.close(); - } - } - } - - } - - public static final Random random = new Random(System.currentTimeMillis()); - - private final Set<Class<?>> classes; - private final Set<ResourceDescriptor> resources; - private final Set<ResourceDescriptor> libraries; - private final Class<?> declaringClass; - - // Cache - private InputStream jar; - private File explodedJar; - - private File classesRoot; - private File librariesRoot; - - public ArtifactDescriptor(Class<?> declaringClass) - { - classes = new HashSet<Class<?>>(); - resources = new HashSet<ResourceDescriptor>(); - this.declaringClass = declaringClass; - this.libraries = new HashSet<ResourceDescriptor>(); - } - - public InputStream getJarAsStream() throws IOException - { - if (jar == null) - { - jar = new JarCreator(getExplodedJar()).jar(); - } - return jar; - } - - public URL getJar() throws IOException - { - InputStream is = null; - try - { - is = getJarAsStream(); - File file = File.createTempFile(ArtifactDescriptor.class.getCanonicalName(), ".jar"); - file.deleteOnExit(); - Files.copy(is, file); - is.close(); - return file.toURI().toURL(); - } - finally - { - if (is != null) - { - is.close(); - } - } - } - - public File getExplodedJar() throws IOException - { - if (explodedJar == null) - { - create(); - } - return explodedJar; - } - - public void create() throws IOException - { - explodedJar = null; - jar = null; - - File root = new File(System.getProperty("java.io.tmpdir") + "/" + getClass().getName() + "." + random.nextInt()); - root.mkdir(); - root.deleteOnExit(); - for (Class<?> clazz : classes) - { - copyClass(clazz, getClassesRoot(root)); - } - for (ResourceDescriptor resourceDescriptor : resources) - { - copyResource(resourceDescriptor, root); - } - if (isLibrariesSupported()) - { - for (ResourceDescriptor resourceDescriptor : libraries) - { - copyResource(resourceDescriptor, getLibraryRoot(root)); - } - } - this.explodedJar = root; - } - - private static void copyClass(Class<?> clazz, File root) throws IOException - { - copyClass(clazz.getName(), root); - } - - private static void copyResource(ResourceDescriptor resourceDescriptor, File root) throws IOException - { - String directoryName; - String fileName; - if (resourceDescriptor.getName().lastIndexOf("/") > 0) - { - directoryName = resourceDescriptor.getName().substring(0, resourceDescriptor.getName().lastIndexOf("/")); - fileName = resourceDescriptor.getName().substring(resourceDescriptor.getName().lastIndexOf("/") + 1); - } - else - { - directoryName = ""; - fileName = resourceDescriptor.getName(); - } - if (isEmpty(fileName)) - { - throw new IllegalArgumentException("Unable to determine source file name of " + resourceDescriptor); - } - File directory = makeDirectoryStructure(root, directoryName); - File file = new File(directory, fileName); - file.createNewFile(); - file.deleteOnExit(); - Files.copy(resourceDescriptor.getSource().openStream(), file); - } - - private static void copyClass(String className, File root) throws IOException - { - InputStream clazzStream = null; - try - { - String classFilePathName = getClassFileName(className); - String directoryName = classFilePathName.substring(0, classFilePathName.lastIndexOf("/")); - String classFileName = classFilePathName.substring(classFilePathName.lastIndexOf("/") + 1); - File packageDirectory = makeDirectoryStructure(root, directoryName); - File classFile = new File(packageDirectory, classFileName); - classFile.createNewFile(); - classFile.deleteOnExit(); - clazzStream = loadResourceAsStream(classFilePathName); - Files.copy(clazzStream, classFile); - } - finally - { - if (clazzStream != null) - { - clazzStream.close(); - } - } - } - - private static File makeDirectoryStructure(File root, String directoryName) - { - for (String directory : directoryName.split("\\/")) - { - root = new File(root, directory); - root.mkdir(); - root.deleteOnExit(); - } - return root; - } - - public void writeArtifactToDisk(String outputDirectory) throws IOException - { - writeArtifactToDisk(outputDirectory, getDefaultName()); - } - - public void writeArtifactToDisk(String outputDirectory, String fileName) throws IOException - { - OutputStream os = null; - InputStream jar = null; - try - { - File file = new File(outputDirectory, fileName); - file.createNewFile(); - os = new BufferedOutputStream(new FileOutputStream(file)); - jar = getJarAsStream(); - Files.copy(jar, os); - } - finally - { - if (os != null) - { - os.close(); - } - if (jar != null) - { - jar.close(); - } - } - } - - public String getDefaultName() - { - return declaringClass.getName() + getExtension(); - } - - private static String getClassFileName(String className) - { - return className.replace('.', '/') + ".class"; - } - - public Set<Class<?>> getClasses() - { - return classes; - } - - public Set<ResourceDescriptor> getResources() - { - return resources; - } - - public void addPackage(Package pkg) - { - addPackage(pkg.getName(), false); - } - - public void addPackage(String packageName, boolean addRecursively) - { - URLPackageScanner packageScanner = new URLPackageScanner(packageName, addRecursively); - for (String className : packageScanner.getClassNames()) - { - Class<?> clazz = loadClass(className); - if (clazz == null) - { - System.out.println("Class null: " + className); - } - getClasses().add(clazz); - } - } - - public File getClassesRoot(File archiveRoot) - { - if (classesRoot == null) - { - classesRoot = makeDirectoryStructure(archiveRoot, getClassesRoot()); - } - return classesRoot; - } - - public String getClassesRoot() - { - return "/"; - } - - @Override - public String toString() - { - return "Declared by: " + declaringClass.getName() + " Classes: " + classes + " Resources: " + resources; - } - - public Class<?> getDeclaringClass() - { - return declaringClass; - } - - public String getExtension() - { - return ".jar"; - } - - public Set<ResourceDescriptor> getLibraries() - { - return libraries; - } - - public File getLibraryRoot(File archiveRoot) - { - if (librariesRoot == null) - { - librariesRoot = makeDirectoryStructure(archiveRoot, getLibrariesRoot()); - } - return librariesRoot; - } - - protected String getLibrariesRoot() - { - return "/"; - } - - public boolean isLibrariesSupported() - { - return false; - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ArtifactGenerator.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ArtifactGenerator.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ArtifactGenerator.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -1,278 +0,0 @@ -package org.jboss.jsr299.tck.impl.packaging; - -import static org.jboss.jsr299.tck.impl.packaging.PackagingType.EAR; -import static org.jboss.jsr299.tck.impl.packaging.PackagingType.WAR; - -import java.io.File; -import java.io.FilenameFilter; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - -import org.apache.log4j.Logger; -import org.jboss.jsr299.tck.AbstractTest; -import org.jboss.jsr299.tck.api.Configuration; -import org.jboss.jsr299.tck.impl.packaging.ear.EarArtifactDescriptor; -import org.jboss.jsr299.tck.impl.packaging.jsr299.BeansXml; -import org.jboss.jsr299.tck.impl.packaging.jsr299.TCKArtifactDescriptor; -import org.jboss.jsr299.tck.impl.packaging.war.WarArtifactDescriptor; - -public class ArtifactGenerator -{ - - private static class ArtifactProcessor - { - - private static final Logger log = Logger.getLogger(ArtifactProcessor.class); - - private final boolean unit; - private final boolean runLocally; - private final boolean addDeclaringPackage; - private final String beansXml; - private final PackagingType packagingType; - private final Collection<ResourceDescriptor> resources; - private final Collection<Class<?>> classes; - private final Class<? extends Throwable> expectedDeploymentException; - private final Set<ResourceDescriptor> extraLibraries; - - - private final Class<?> declaringClass; - private final boolean standalone; - - public ArtifactProcessor(Class<?> declaringClass, boolean standalone, String extraLibrariesDirectory) - { - this.standalone = standalone; - this.declaringClass = declaringClass; - - if (declaringClass.isAnnotationPresent(Artifact.class)) - { - this.addDeclaringPackage = declaringClass.getAnnotation(Artifact.class).addCurrentPackage(); - } - else - { - throw new IllegalStateException("Unable to find @Artifact on " + declaringClass); - } - - if (declaringClass.isAnnotationPresent(BeansXml.class)) - { - this.beansXml = asAbsolutePath(declaringClass.getAnnotation(BeansXml.class).value()); - } - else - { - this.beansXml = null; - } - - if (declaringClass.isAnnotationPresent(Packaging.class)) - { - this.packagingType = declaringClass.getAnnotation(Packaging.class).value(); - } - else - { - this.packagingType = WAR; - } - - if (declaringClass.isAnnotationPresent(IntegrationTest.class)) - { - this.unit = false; - this.runLocally = declaringClass.getAnnotation(IntegrationTest.class).runLocally(); - } - else - { - this.unit = true; - this.runLocally = false; - } - - if (declaringClass.isAnnotationPresent(Resources.class)) - { - this.resources = asResourceDescriptors(declaringClass.getAnnotation(Resources.class).value()); - } - else - { - this.resources = Collections.emptyList(); - } - - if (declaringClass.isAnnotationPresent(Classes.class)) - { - this.classes = Arrays.asList(declaringClass.getAnnotation(Classes.class).value()); - } - else - { - this.classes = Collections.emptyList(); - } - if (declaringClass.isAnnotationPresent(ExpectedDeploymentException.class)) - { - this.expectedDeploymentException = declaringClass.getAnnotation(ExpectedDeploymentException.class).value(); - } - else - { - this.expectedDeploymentException = null; - } - if (extraLibrariesDirectory != null) - { - File directory = new File(extraLibrariesDirectory); - this.extraLibraries = new HashSet<ResourceDescriptor>(); - if (directory.isDirectory()) - { - for (File file : directory.listFiles(new FilenameFilter() - { - - public boolean accept(File dir, String name) - { - return name.endsWith(".jar"); - } - - })) - { - try - { - this.extraLibraries.add(new ResourceDescriptor(file.getName(), file.toURI().toURL())); - } - catch (IOException e) - { - log.warn("Unable to load extra library", e); - } - } - } - } - else - { - this.extraLibraries = Collections.emptySet(); - } - } - - public TCKArtifactDescriptor createArtifact() - { - final TCKArtifactDescriptor artifact = newArtifact(packagingType, declaringClass, beansXml, standalone, addDeclaringPackage); - artifact.setUnit(unit); - artifact.setRunLocally(runLocally); - artifact.setExpectedDeploymentException(expectedDeploymentException); - artifact.getClasses().addAll(classes); - // Annoying hack - artifact.getResources().removeAll(resources); - artifact.getResources().addAll(resources); - artifact.getLibraries().addAll(extraLibraries); - return artifact; - } - - private Collection<ResourceDescriptor> asResourceDescriptors(Resource[] resources) - { - List<ResourceDescriptor> resourceDescriptors = new ArrayList<ResourceDescriptor>(); - for (Resource resource : resources) - { - resourceDescriptors.add(new ResourceDescriptor(resource.destination(), asAbsolutePath(resource.source()))); - } - return resourceDescriptors; - } - - private String asAbsolutePath(String path) - { - if (path.startsWith("/")) - { - return path.substring(1); - } - else - { - return declaringClass.getPackage().getName().replace(".", "/") + "/" + path; - } - } - - private static TCKArtifactDescriptor newArtifact(PackagingType packagingType, Class<?> declaringClass, String beansXml, boolean standalone, boolean addDeclaringPackage) - { - TCKArtifactDescriptor artifact; - if (!standalone && packagingType.equals(WAR)) - { - artifact = new WarArtifactDescriptor(declaringClass, beansXml); - } - else if (!standalone && packagingType.equals(EAR)) - { - artifact = new EarArtifactDescriptor(declaringClass, beansXml); - } - else - { - artifact = new TCKArtifactDescriptor(declaringClass, beansXml); - } - - if (addDeclaringPackage) - { - artifact.addPackage(declaringClass.getPackage()); - } - return artifact; - } - - public boolean isUnit() - { - return unit; - }; - - } - - private static final Logger log = Logger.getLogger(ArtifactGenerator.class); - - private final Configuration configuration; - - public ArtifactGenerator(Configuration configuration) - { - if (configuration == null) - { - throw new IllegalArgumentException("configuration must not be null"); - } - this.configuration = configuration; - } - - public List<ArtifactDescriptor> createArtifacts(String packageName) - { - Set<Class<?>> classes = new HashSet<Class<?>>(); - classes.addAll(new ArtifactScanner(packageName, null).getClasses()); - List<ArtifactDescriptor> artifacts = new ArrayList<ArtifactDescriptor>(); - for (Class<?> clazz : classes) - { - artifacts.add(createArtifact(clazz)); - } - return artifacts; - } - - public void dumpArtifacts() - { - List<ArtifactDescriptor> artifacts = createArtifacts(AbstractTest.class.getPackage().getName()); - File file = new File(configuration.getOutputDirectory()); - if (!file.exists()) - { - file.mkdirs(); - } - else if (file.isFile()) - { - throw new IllegalStateException("Cannot use debug directory " + configuration.getOutputDirectory() + ", it already exists"); - } - log.info("Writing artifacts to " + configuration.getOutputDirectory()); - for (ArtifactDescriptor artifact : artifacts) - { - try - { - artifact.writeArtifactToDisk(configuration.getOutputDirectory()); - log.info("Written artifact to disk " + artifact); - } - catch (IOException e) - { - log.warn("Error writing artifact to disk " + artifact, e); - } - } - } - - public TCKArtifactDescriptor createArtifact(Class<?> declaringClass) - { - if (declaringClass.isAnnotationPresent(Artifact.class)) - { - return new ArtifactProcessor(declaringClass, configuration.isStandalone(), configuration.getLibraryDirectory()).createArtifact(); - } - else - { - return null; - } - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ArtifactScanner.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ArtifactScanner.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ArtifactScanner.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -1,148 +0,0 @@ -/** - * - */ -package org.jboss.jsr299.tck.impl.packaging; - -import static org.jboss.jsr299.tck.impl.util.Reflections.loadResources; - -import java.io.File; -import java.io.IOException; -import java.lang.annotation.Annotation; -import java.net.URL; -import java.net.URLDecoder; -import java.util.Enumeration; -import java.util.HashSet; -import java.util.Set; -import java.util.zip.ZipEntry; -import java.util.zip.ZipException; -import java.util.zip.ZipFile; - -import org.apache.log4j.Logger; -import org.jboss.jsr299.tck.impl.util.Reflections; - -public class ArtifactScanner -{ - private static final Logger log = Logger.getLogger(ArtifactScanner.class); - - private final String packageName; - private final String packageNameAsPath; - private final Class<? extends Annotation> annotationType; - - private final Set<Class<?>> classes = new HashSet<Class<?>>(); - - public ArtifactScanner(String packageName, Class<? extends Annotation> annotation) - { - this.packageName = packageName; - this.packageNameAsPath = packageName.replace(".", "/"); - this.annotationType = annotation; - } - - private void scan() - { - try - { - Set<String> paths = new HashSet<String>(); - - for (URL url : loadResources(packageNameAsPath)) - { - String urlPath = url.getFile(); - urlPath = URLDecoder.decode(urlPath, "UTF-8"); - if ( urlPath.startsWith("file:") ) - { - urlPath = urlPath.substring(5); - } - if ( urlPath.indexOf('!')>0 ) - { - urlPath = urlPath.substring(0, urlPath.indexOf('!')); - } - paths.add(urlPath); - } - handle(paths); - } - catch (IOException ioe) - { - log.warn("could not read: " + this.packageName, ioe); - } - } - - private void handle(Set<String> paths) throws IOException - { - for ( String urlPath: paths ) - { - log.trace("scanning: " + urlPath); - handle(new File(urlPath), packageName.substring(0, packageName.lastIndexOf("."))); - - } - } - - private void handleArchiveByFile(File file) throws IOException - { - try - { - log.trace("archive: " + file); - ZipFile zip = new ZipFile(file); - Enumeration<? extends ZipEntry> entries = zip.entries(); - while ( entries.hasMoreElements() ) - { - ZipEntry entry = entries.nextElement(); - String name = entry.getName(); - if (name.startsWith(packageNameAsPath) && name.endsWith(".class")) - { - addClass(name.replace(".class", "").replace("/", ".")); - } - } - } - catch (ZipException e) - { - throw new RuntimeException("Error handling file " + file, e); - } - } - - private void handle(File file, String packageName) throws IOException - { - if ( file.isDirectory() ) - { - packageName = packageName + "." + file.getName(); - for ( File child: file.listFiles() ) - { - handle(child, packageName); - } - } - else if (file.getName().endsWith(".class") && ! file.getName().contains("$")) - { - addClass(packageName + "." + file.getName().replace(".class", "")); - - } - else if (file.getName().endsWith(".jar")) - { - handleArchiveByFile(file); - } - } - - private void addClass(String className) - { - Class<?> clazz = Reflections.loadClass(className); - if (clazz != null && clazz.isAnnotationPresent(Artifact.class)) - { - if (annotationType != null && clazz.isAnnotationPresent(annotationType)) - { - classes.add(clazz); - } - else - { - classes.add(clazz); - } - } - else if (clazz == null) - { - log.warn("Unable to load class " + className); - } - } - - public Set<Class<?>> getClasses() - { - scan(); - return classes; - } - -} \ No newline at end of file Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/Classes.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/Classes.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/Classes.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -1,27 +0,0 @@ -package org.jboss.jsr299.tck.impl.packaging; - -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; - -/** - * Add classes to the deployed artifact - * - * @see Artifact - * @see Resources - * - * @author Pete Muir - * - */ -@Documented -@Retention(RUNTIME) -@Target(TYPE) -public @interface Classes -{ - - Class<?>[] value(); - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ExpectedDeploymentException.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ExpectedDeploymentException.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ExpectedDeploymentException.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -1,25 +0,0 @@ -package org.jboss.jsr299.tck.impl.packaging; - -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; - -/** - * Mark this artifact as expecting to fail a deployment with the given exception - * or some subtype of it. - * - * @author Pete Muir - * - */ -@Documented -@Retention(RUNTIME) -@Target(TYPE) -public @interface ExpectedDeploymentException -{ - - Class<? extends Throwable> value(); - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/IntegrationTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/IntegrationTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/IntegrationTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -1,26 +0,0 @@ -package org.jboss.jsr299.tck.impl.packaging; - -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -/** - * Mark this test as an integration test, always requiring running in a - * container. - * - * @see Artifact - * @see IntegrationTest - * - * @author Pete Muir - * - */ -@Retention(RUNTIME) -@Target(TYPE) -public @interface IntegrationTest -{ - - boolean runLocally() default false; - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/Packaging.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/Packaging.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/Packaging.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -1,29 +0,0 @@ -package org.jboss.jsr299.tck.impl.packaging; - -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; -import static org.jboss.jsr299.tck.impl.packaging.PackagingType.WAR; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -/** - * Mark this test as requiring specific packaging when deployed to a container - * for intgration testing. - * - * @see IntegrationTest - * @see Artifact - * - * @author Pete Muir - * - */ -@Documented -@Retention(RUNTIME) -@Target(TYPE) -public @interface Packaging -{ - - PackagingType value() default WAR; - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/PackagingType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/PackagingType.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/PackagingType.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -1,8 +0,0 @@ -package org.jboss.jsr299.tck.impl.packaging; - -public enum PackagingType -{ - - EAR, WAR - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/Resource.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/Resource.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/Resource.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -1,40 +0,0 @@ -package org.jboss.jsr299.tck.impl.packaging; - -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 org.jboss.jsr299.tck.impl.packaging.jsr299.BeansXml; - -/** - * Specify an additional resource to be added to the artifact. - * - * @see Resources - * @see BeansXml - * - * @author Pete Muir - * - */ -@Documented -@Retention(RUNTIME) -@Target(TYPE) -public @interface Resource -{ - - /** - * Location, relative to the current package, or to the current archive - * to find the resource file - * - */ - String source(); - - /** - * Destination for the resource file within the generated artifact - * - */ - String destination(); - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ResourceDescriptor.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ResourceDescriptor.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ResourceDescriptor.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -1,83 +0,0 @@ -package org.jboss.jsr299.tck.impl.packaging; - -import static org.jboss.jsr299.tck.impl.util.Reflections.loadResource; - -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.net.URL; - -import org.jboss.jsr299.tck.impl.util.Files; - -public class ResourceDescriptor -{ - - private final String name; - private final URL source; - - public ResourceDescriptor(String name, InputStream source) throws IOException - { - this.name = name; - File file = File.createTempFile(ResourceDescriptor.class.getName(), null); - file.deleteOnExit(); - Files.copy(source, file); - this.source = file.toURI().toURL(); - } - - public ResourceDescriptor(String name, URL source) - { - this.name = name; - this.source = source; - } - - public ResourceDescriptor(String name, String source) - { - this.name = name; - if (name == null) - { - throw new IllegalArgumentException("Unable to have a null resource"); - } - this.source = loadResource(source); - if (this.source == null) - { - throw new IllegalArgumentException("Unable to load file for " + source); - } - } - - public String getName() - { - return name; - } - - public URL getSource() - { - return source; - } - - @Override - public boolean equals(Object obj) - { - if (obj instanceof ResourceDescriptor) - { - ResourceDescriptor that = (ResourceDescriptor) obj; - return this.getName().equals(that.getName()); - } - else - { - return false; - } - } - - @Override - public int hashCode() - { - return name.hashCode(); - } - - @Override - public String toString() - { - return name + " (" + source.toString() + ")"; - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/Resources.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/Resources.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/Resources.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -1,26 +0,0 @@ -package org.jboss.jsr299.tck.impl.packaging; - -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -/** - * Specify additional resources for an artifact - * - * @see Resource - * @see Classes - * @see Artifact - * - * @author Pete Muir - * - */ -@Retention(RUNTIME) -@Target(TYPE) -public @interface Resources -{ - - Resource[] value(); - -} Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/ContextIntegrationTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/ContextIntegrationTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/ContextIntegrationTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -18,8 +18,8 @@ package org.jboss.jsr299.tck.tests.context; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.IntegrationTest; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.IntegrationTest; import org.testng.annotations.Test; /** 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-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/ContextTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -9,8 +9,8 @@ import javax.context.RequestScoped; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; import org.testng.annotations.Test; /** @@ -18,7 +18,7 @@ * Spec version: PRD2 */ @Artifact -public class ContextTest extends AbstractDeclarativeTest +public class ContextTest extends AbstractJSR299Test { private @interface Dummy 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-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/DestroyedInstanceReturnedByGetTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -6,21 +6,21 @@ import javax.inject.manager.Bean; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.testng.annotations.BeforeMethod; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; import org.testng.annotations.Test; @Artifact -public class DestroyedInstanceReturnedByGetTest extends AbstractDeclarativeTest +public class DestroyedInstanceReturnedByGetTest extends AbstractJSR299Test { Context context; - @BeforeMethod(dependsOnMethods = "beforeMethod") - public void initContext() + @Override + public void beforeMethod() { + super.beforeMethod(); if (context == null) { context = new DummyContext(); 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-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/GetOnInactiveContextTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -6,12 +6,12 @@ import javax.context.SessionScoped; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; import org.testng.annotations.Test; @Artifact -public class GetOnInactiveContextTest extends AbstractDeclarativeTest +public class GetOnInactiveContextTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/GetTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/GetTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/GetTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -7,12 +7,12 @@ import javax.context.SessionScoped; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; import org.testng.annotations.Test; @Artifact -public class GetTest extends AbstractDeclarativeTest +public class GetTest extends AbstractJSR299Test { Context context; 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-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/GetWithNoCreationalContextTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -5,12 +5,12 @@ import javax.context.SessionScoped; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; import org.testng.annotations.Test; @Artifact -public class GetWithNoCreationalContextTest extends AbstractDeclarativeTest +public class GetWithNoCreationalContextTest extends AbstractJSR299Test { Context context; 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-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/InactiveContextTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -4,12 +4,12 @@ import javax.context.RequestScoped; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; import org.testng.annotations.Test; @Artifact -public class InactiveContextTest extends AbstractDeclarativeTest +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-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/NormalContextTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -6,8 +6,8 @@ import javax.context.SessionScoped; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; import org.testng.annotations.Test; /** @@ -22,7 +22,7 @@ * Spec version: PRD2 */ @Artifact -public class NormalContextTest extends AbstractDeclarativeTest +public class NormalContextTest extends AbstractJSR299Test { Context context; 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-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ApplicationContextTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -1,9 +1,9 @@ package org.jboss.jsr299.tck.tests.context.application; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.IntegrationTest; +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; /** @@ -12,7 +12,7 @@ */ @Artifact @IntegrationTest -public class ApplicationContextTest extends AbstractDeclarativeTest +public class ApplicationContextTest extends AbstractJSR299Test { @Test(groups = { "stub", "contexts", "servlet", "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-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationBeginTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -3,8 +3,8 @@ import javax.context.Conversation; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; import org.testng.annotations.Test; /** @@ -14,7 +14,7 @@ * Spec version: PRD2 */ @Artifact -public class ConversationBeginTest extends AbstractDeclarativeTest +public class ConversationBeginTest extends AbstractJSR299Test { @Test(groups = { "contexts" }) 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-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationContextTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -8,8 +8,8 @@ import javax.inject.Standard; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; import org.testng.annotations.Test; /** @@ -20,7 +20,7 @@ */ @Artifact -public class ConversationContextTest extends AbstractDeclarativeTest +public class ConversationContextTest extends AbstractJSR299Test { @Test(groups = { "contexts" }) 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-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationEndTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -3,8 +3,8 @@ import javax.context.Conversation; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; import org.testng.annotations.Test; /** @@ -14,7 +14,7 @@ * Spec version: PRD2 */ @Artifact -public class ConversationEndTest extends AbstractDeclarativeTest +public class ConversationEndTest extends AbstractJSR299Test { @Test(groups = { "contexts" }) 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-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationIdSetByApplicationTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -3,8 +3,8 @@ import javax.context.Conversation; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; import org.testng.annotations.Test; /** @@ -14,7 +14,7 @@ * Spec version: PRD2 */ @Artifact -public class ConversationIdSetByApplicationTest extends AbstractDeclarativeTest +public class ConversationIdSetByApplicationTest extends AbstractJSR299Test { @Test(groups = { "contexts" }) 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-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationIdSetByContainerTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -3,8 +3,8 @@ import javax.context.Conversation; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; import org.testng.annotations.Test; /** @@ -14,7 +14,7 @@ * Spec version: PRD2 */ @Artifact -public class ConversationIdSetByContainerTest extends AbstractDeclarativeTest +public class ConversationIdSetByContainerTest extends AbstractJSR299Test { @Test(groups = { "contexts" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/AbstractConversationTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/AbstractConversationTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/AbstractConversationTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -9,12 +9,12 @@ import org.apache.commons.httpclient.HttpClient; import org.apache.commons.httpclient.HttpMethod; import org.apache.commons.httpclient.methods.GetMethod; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; +import org.jboss.jsr299.tck.AbstractJSR299Test; import com.gargoylesoftware.htmlunit.html.HtmlElement; import com.gargoylesoftware.htmlunit.html.HtmlPage; -public abstract class AbstractConversationTest extends AbstractDeclarativeTest +public abstract class AbstractConversationTest extends AbstractJSR299Test { public static final String CID_HEADER_NAME = "org.jboss.jsr299.tck.cid"; 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-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ClientConversationContextTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -2,12 +2,12 @@ import org.apache.commons.httpclient.HttpClient; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.Classes; -import org.jboss.jsr299.tck.impl.packaging.IntegrationTest; -import org.jboss.jsr299.tck.impl.packaging.Resource; -import org.jboss.jsr299.tck.impl.packaging.Resources; -import org.jboss.jsr299.tck.impl.packaging.war.WarArtifactDescriptor; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.Classes; +import org.jboss.testharness.impl.packaging.IntegrationTest; +import org.jboss.testharness.impl.packaging.Resource; +import org.jboss.testharness.impl.packaging.Resources; +import org.jboss.testharness.impl.packaging.war.WarArtifactDescriptor; import org.testng.annotations.Test; /** 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-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ConversationStatusServlet.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -9,7 +9,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.jboss.jsr299.tck.impl.ConfigurationImpl; +import org.jboss.jsr299.tck.impl.JSR299ConfigurationImpl; public class ConversationStatusServlet extends HttpServlet { @@ -20,7 +20,7 @@ String method = req.getParameter("method"); if ("cid".equals(method)) { - serializeToResponse(ConfigurationImpl.get().getManagers().getManager().getInstanceByType(Conversation.class).getId(), resp); + serializeToResponse(JSR299ConfigurationImpl.get().getManagers().getManager().getInstanceByType(Conversation.class).getId(), resp); } else if ("cloudDestroyed".equals(method)) { 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-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ConversationTestPhaseListener.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -8,7 +8,7 @@ import javax.faces.event.PhaseListener; import javax.servlet.http.HttpServletResponse; -import org.jboss.jsr299.tck.impl.ConfigurationImpl; +import org.jboss.jsr299.tck.impl.JSR299ConfigurationImpl; public class ConversationTestPhaseListener implements PhaseListener { @@ -27,7 +27,7 @@ { try { - ConfigurationImpl.get().getManagers().getManager().getContext(ConversationScoped.class); + JSR299ConfigurationImpl.get().getManagers().getManager().getContext(ConversationScoped.class); activeBeforeApplyRequestValues = true; } catch (ContextNotActiveException e) @@ -38,8 +38,8 @@ if (event.getPhaseId().equals(PhaseId.RENDER_RESPONSE)) { HttpServletResponse response = (HttpServletResponse) event.getFacesContext().getExternalContext().getResponse(); - response.addHeader(AbstractConversationTest.CID_HEADER_NAME, ConfigurationImpl.get().getManagers().getManager().getInstanceByType(Conversation.class).getId()); - response.addHeader(Cloud.RAINED_HEADER_NAME, new Boolean(ConfigurationImpl.get().getManagers().getManager().getInstanceByType(Cloud.class).isRained()).toString()); + response.addHeader(AbstractConversationTest.CID_HEADER_NAME, JSR299ConfigurationImpl.get().getManagers().getManager().getInstanceByType(Conversation.class).getId()); + response.addHeader(Cloud.RAINED_HEADER_NAME, new Boolean(JSR299ConfigurationImpl.get().getManagers().getManager().getInstanceByType(Cloud.class).isRained()).toString()); response.addHeader(ACTIVE_BEFORE_APPLY_REQUEST_VALUES_HEADER_NAME, new Boolean(activeBeforeApplyRequestValues).toString()); } } 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-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/InvalidatingSessionDestroysConversationTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -2,12 +2,12 @@ import org.apache.commons.httpclient.HttpClient; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.Classes; -import org.jboss.jsr299.tck.impl.packaging.IntegrationTest; -import org.jboss.jsr299.tck.impl.packaging.Resource; -import org.jboss.jsr299.tck.impl.packaging.Resources; -import org.jboss.jsr299.tck.impl.packaging.war.WarArtifactDescriptor; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.Classes; +import org.jboss.testharness.impl.packaging.IntegrationTest; +import org.jboss.testharness.impl.packaging.Resource; +import org.jboss.testharness.impl.packaging.Resources; +import org.jboss.testharness.impl.packaging.war.WarArtifactDescriptor; import org.testng.annotations.Test; /** 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-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/LongRunningConversationPropagatedByFacesContextTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -1,12 +1,12 @@ package org.jboss.jsr299.tck.tests.context.conversation.client; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.Classes; -import org.jboss.jsr299.tck.impl.packaging.IntegrationTest; -import org.jboss.jsr299.tck.impl.packaging.Resource; -import org.jboss.jsr299.tck.impl.packaging.Resources; -import org.jboss.jsr299.tck.impl.packaging.war.WarArtifactDescriptor; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.Classes; +import org.jboss.testharness.impl.packaging.IntegrationTest; +import org.jboss.testharness.impl.packaging.Resource; +import org.jboss.testharness.impl.packaging.Resources; +import org.jboss.testharness.impl.packaging.war.WarArtifactDescriptor; import org.testng.annotations.Test; import com.gargoylesoftware.htmlunit.WebClient; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/LongRunningInstancesNotDestroyedTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/LongRunningInstancesNotDestroyedTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/LongRunningInstancesNotDestroyedTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -2,12 +2,12 @@ import org.apache.commons.httpclient.HttpClient; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.Classes; -import org.jboss.jsr299.tck.impl.packaging.IntegrationTest; -import org.jboss.jsr299.tck.impl.packaging.Resource; -import org.jboss.jsr299.tck.impl.packaging.Resources; -import org.jboss.jsr299.tck.impl.packaging.war.WarArtifactDescriptor; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.Classes; +import org.jboss.testharness.impl.packaging.IntegrationTest; +import org.jboss.testharness.impl.packaging.Resource; +import org.jboss.testharness.impl.packaging.Resources; +import org.jboss.testharness.impl.packaging.war.WarArtifactDescriptor; import org.testng.annotations.Test; /** 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-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/DependentContextTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -11,9 +11,9 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.jsr299.BeansXml; +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; /** @@ -21,7 +21,7 @@ */ @Artifact @BeansXml("beans.xml") -public class DependentContextTest extends AbstractDeclarativeTest +public class DependentContextTest extends AbstractJSR299Test { private static final Annotation TAME_LITERAL = new AnnotationLiteral<Tame> () {}; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Tarantula.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Tarantula.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Tarantula.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.context.dependent; -import org.jboss.jsr299.tck.impl.ConfigurationImpl; +import org.jboss.jsr299.tck.impl.JSR299ConfigurationImpl; class Tarantula extends Spider implements DeadlySpider { @@ -9,7 +9,7 @@ public Tarantula() { - dependentContextActive = ConfigurationImpl.get().getContexts().getDependentContext().isActive(); + dependentContextActive = JSR299ConfigurationImpl.get().getContexts().getDependentContext().isActive(); } public static boolean isDependentContextActive() 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-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/DependentContextEjbTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -22,11 +22,11 @@ import javax.inject.manager.Bean; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.IntegrationTest; -import org.jboss.jsr299.tck.impl.packaging.Packaging; -import org.jboss.jsr299.tck.impl.packaging.PackagingType; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.IntegrationTest; +import org.jboss.testharness.impl.packaging.Packaging; +import org.jboss.testharness.impl.packaging.PackagingType; import org.testng.annotations.Test; /** @@ -35,7 +35,7 @@ @IntegrationTest @Packaging(PackagingType.EAR) @Artifact -public class DependentContextEjbTest extends AbstractDeclarativeTest +public class DependentContextEjbTest extends AbstractJSR299Test { @Test(groups = { "contexts", "injection", "ejb3", "integration" }) @SpecAssertion(section = "8.3", id = "k") Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/PassivatingContextIntegrationTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/PassivatingContextIntegrationTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/PassivatingContextIntegrationTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -5,17 +5,17 @@ import javax.inject.IllegalProductException; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.IntegrationTest; -import org.jboss.jsr299.tck.impl.packaging.Packaging; -import org.jboss.jsr299.tck.impl.packaging.PackagingType; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.IntegrationTest; +import org.jboss.testharness.impl.packaging.Packaging; +import org.jboss.testharness.impl.packaging.PackagingType; import org.testng.annotations.Test; @Artifact @IntegrationTest @Packaging(PackagingType.EAR) -public class PassivatingContextIntegrationTest extends AbstractDeclarativeTest +public class PassivatingContextIntegrationTest extends AbstractJSR299Test { @Test(groups = { "stub", "contexts", "passivation", "jms" }) 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-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/PassivatingContextTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -12,11 +12,11 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.Packaging; -import org.jboss.jsr299.tck.impl.packaging.PackagingType; -import org.jboss.jsr299.tck.impl.packaging.jsr299.BeansXml; +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.jboss.testharness.impl.packaging.jsr299.BeansXml; import org.testng.annotations.Test; /** @@ -29,7 +29,7 @@ @Artifact @BeansXml("beans.xml") @Packaging(PackagingType.EAR) -public class PassivatingContextTest extends AbstractDeclarativeTest +public class PassivatingContextTest extends AbstractJSR299Test { private static final Annotation BIG_LITERAL = new AnnotationLiteral<Big>() {}; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken1/DependentInterceptorSerializableTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken1/DependentInterceptorSerializableTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken1/DependentInterceptorSerializableTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -3,14 +3,14 @@ import javax.inject.UnserializableDependencyException; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; @Artifact @ExpectedDeploymentException(UnserializableDependencyException.class) -public class DependentInterceptorSerializableTest extends AbstractDeclarativeTest +public class DependentInterceptorSerializableTest extends AbstractJSR299Test { @Test(groups = { "contexts", "passivation", "stub" }) @SpecAssertion(section = "8.4", id = "j") 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-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken2/NonSerializableTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -3,9 +3,9 @@ import javax.inject.DefinitionException; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; /** @@ -17,7 +17,7 @@ */ @Artifact @ExpectedDeploymentException(DefinitionException.class) -public class NonSerializableTest extends AbstractDeclarativeTest +public class NonSerializableTest extends AbstractJSR299Test { @Test(groups = { "contexts", "passivation" }) @SpecAssertion(section = "8.4", id = "b") Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken3/DependentDecoratorSerializableTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken3/DependentDecoratorSerializableTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken3/DependentDecoratorSerializableTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -3,14 +3,14 @@ import javax.inject.UnserializableDependencyException; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; @Artifact @ExpectedDeploymentException(UnserializableDependencyException.class) -public class DependentDecoratorSerializableTest extends AbstractDeclarativeTest +public class DependentDecoratorSerializableTest extends AbstractJSR299Test { @Test(groups = { "contexts", "passivation", "stub" }) @SpecAssertion(section = "8.4", id = "j") Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken4/DependentInterceptorSerializableTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken4/DependentInterceptorSerializableTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken4/DependentInterceptorSerializableTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -3,14 +3,14 @@ import javax.inject.UnserializableDependencyException; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; @Artifact @ExpectedDeploymentException(UnserializableDependencyException.class) -public class DependentInterceptorSerializableTest extends AbstractDeclarativeTest +public class DependentInterceptorSerializableTest extends AbstractJSR299Test { @Test(groups = { "contexts", "passivation", "stub" }) @SpecAssertion(section = "8.4", id = "k") Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken5/DependentDecoratorSerializableTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken5/DependentDecoratorSerializableTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken5/DependentDecoratorSerializableTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -3,8 +3,8 @@ import javax.inject.UnserializableDependencyException; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; @Artifact 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-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken6/NonSerializableTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -3,14 +3,14 @@ import javax.inject.UnserializableDependencyException; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; @Artifact @ExpectedDeploymentException(UnserializableDependencyException.class) -public class NonSerializableTest extends AbstractDeclarativeTest +public class NonSerializableTest extends AbstractJSR299Test { @Test(groups = { "contexts", "passivation" }) @SpecAssertion(section = "8.4", id = "l") 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-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken7/NonSerializableTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -3,14 +3,14 @@ import javax.inject.UnserializableDependencyException; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; @Artifact @ExpectedDeploymentException(UnserializableDependencyException.class) -public class NonSerializableTest extends AbstractDeclarativeTest +public class NonSerializableTest extends AbstractJSR299Test { @Test(groups = { "contexts", "passivation" }) @SpecAssertion(section = "8.4", id = "m") 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-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken8/NonSerializableTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -3,14 +3,14 @@ import javax.inject.UnserializableDependencyException; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; @Artifact @ExpectedDeploymentException(UnserializableDependencyException.class) -public class NonSerializableTest extends AbstractDeclarativeTest +public class NonSerializableTest extends AbstractJSR299Test { @Test(groups = { "contexts", "passivation" }) @SpecAssertion(section = "8.4", id = "n") 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-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken9/NonSerializableTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -3,14 +3,14 @@ import javax.inject.UnserializableDependencyException; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; @Artifact @ExpectedDeploymentException(UnserializableDependencyException.class) -public class NonSerializableTest extends AbstractDeclarativeTest +public class NonSerializableTest extends AbstractJSR299Test { @Test(groups = { "contexts", "passivation" }) @SpecAssertion(section = "8.4", id = "o") Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/unserializableSimpleInjectedIntoPassivatingEnterpriseBean/UnserializableSimpleInjectedIntoPassivatingEnterpriseBeanTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/unserializableSimpleInjectedIntoPassivatingEnterpriseBean/UnserializableSimpleInjectedIntoPassivatingEnterpriseBeanTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/unserializableSimpleInjectedIntoPassivatingEnterpriseBean/UnserializableSimpleInjectedIntoPassivatingEnterpriseBeanTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -3,17 +3,17 @@ import javax.inject.UnserializableDependencyException; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; -import org.jboss.jsr299.tck.impl.packaging.Packaging; -import org.jboss.jsr299.tck.impl.packaging.PackagingType; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; +import org.jboss.testharness.impl.packaging.Packaging; +import org.jboss.testharness.impl.packaging.PackagingType; import org.testng.annotations.Test; @Artifact @Packaging(PackagingType.EAR) @ExpectedDeploymentException(UnserializableDependencyException.class) -public class UnserializableSimpleInjectedIntoPassivatingEnterpriseBeanTest extends AbstractDeclarativeTest +public class UnserializableSimpleInjectedIntoPassivatingEnterpriseBeanTest 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-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/RequestContextTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -1,9 +1,9 @@ package org.jboss.jsr299.tck.tests.context.request; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.IntegrationTest; +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; /** @@ -12,7 +12,7 @@ */ @Artifact @IntegrationTest -public class RequestContextTest extends AbstractDeclarativeTest +public class RequestContextTest 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-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/SessionContextTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -1,9 +1,9 @@ package org.jboss.jsr299.tck.tests.context.session; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.IntegrationTest; +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; /** @@ -12,7 +12,7 @@ */ @Artifact @IntegrationTest -public class SessionContextTest extends AbstractDeclarativeTest +public class SessionContextTest extends AbstractJSR299Test { @Test(groups = { "stub", "contexts", "servlet", "integration" }) 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-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/BeanDefinitionTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -9,8 +9,8 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; import org.testng.annotations.Test; /** @@ -21,7 +21,7 @@ * Spec version: PRD2 */ @Artifact -public class BeanDefinitionTest extends AbstractDeclarativeTest +public class BeanDefinitionTest extends AbstractJSR299Test { private static Annotation TAME_LITERAL = new AnnotationLiteral<Tame>() {}; 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-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/BindingDefinitionTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -11,16 +11,16 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.literals.CurrentBinding; +import org.jboss.testharness.impl.packaging.Artifact; import org.testng.annotations.Test; /** * Spec version: PRD2 */ @Artifact -public class BindingDefinitionTest extends AbstractDeclarativeTest +public class BindingDefinitionTest extends AbstractJSR299Test { @Test Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/DeploymentTypeDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/DeploymentTypeDefinitionTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/DeploymentTypeDefinitionTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -7,9 +7,9 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.jsr299.BeansXml; +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; /** @@ -19,7 +19,7 @@ */ @Artifact @BeansXml("beans.xml") -public class DeploymentTypeDefinitionTest extends AbstractDeclarativeTest +public class DeploymentTypeDefinitionTest extends AbstractJSR299Test { /** Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/BrokenDeploymentTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/BrokenDeploymentTypeTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/BrokenDeploymentTypeTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -3,10 +3,10 @@ import javax.inject.DeploymentException; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; -import org.jboss.jsr299.tck.impl.packaging.jsr299.BeansXml; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; +import org.jboss.testharness.impl.packaging.jsr299.BeansXml; import org.testng.annotations.Test; /** @@ -16,7 +16,7 @@ @Artifact @BeansXml("beans.xml") @ExpectedDeploymentException(DeploymentException.class) -public class BrokenDeploymentTypeTest extends AbstractDeclarativeTest +public class BrokenDeploymentTypeTest extends AbstractJSR299Test { @SuppressWarnings("unchecked") Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/TooManyDeploymentTypesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/TooManyDeploymentTypesTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/TooManyDeploymentTypesTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -20,9 +20,9 @@ import javax.inject.DefinitionException; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; /** @@ -30,7 +30,7 @@ */ @Artifact @ExpectedDeploymentException(DefinitionException.class) -public class TooManyDeploymentTypesTest extends AbstractDeclarativeTest +public class TooManyDeploymentTypesTest extends AbstractJSR299Test { @Test(groups = { "deploymentType"}) @SpecAssertion(section = "2.5.3", id = "d") Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerField/ProducerFieldDeploymentTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerField/ProducerFieldDeploymentTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerField/ProducerFieldDeploymentTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -3,14 +3,14 @@ import javax.inject.DefinitionException; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; @Artifact @ExpectedDeploymentException(DefinitionException.class) -public class ProducerFieldDeploymentTest extends AbstractDeclarativeTest +public class ProducerFieldDeploymentTest extends AbstractJSR299Test { @Test(groups = { "deploymentType"}) @SpecAssertion(section = "2.5.3", id = "f") Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerMethod/ProducerMethodDeploymentTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerMethod/ProducerMethodDeploymentTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerMethod/ProducerMethodDeploymentTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -3,14 +3,14 @@ import javax.inject.DefinitionException; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; @Artifact @ExpectedDeploymentException(DefinitionException.class) -public class ProducerMethodDeploymentTest extends AbstractDeclarativeTest +public class ProducerMethodDeploymentTest extends AbstractJSR299Test { @Test(groups = { "deploymentType"}) @SpecAssertion(section = "2.5.3", id = "e") Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/typevariable/ParameterizedTypeInjectionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/typevariable/ParameterizedTypeInjectionTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/typevariable/ParameterizedTypeInjectionTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -3,9 +3,9 @@ import javax.inject.DefinitionException; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; /** @@ -14,7 +14,7 @@ */ @Artifact @ExpectedDeploymentException(DefinitionException.class) -public class ParameterizedTypeInjectionTest extends AbstractDeclarativeTest +public class ParameterizedTypeInjectionTest extends AbstractJSR299Test { @Test(groups = {"ri-broken"}) @SpecAssertion(section = "2.2", id = "c") Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/wildcard/WildcardTypeInjectionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/wildcard/WildcardTypeInjectionTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/wildcard/WildcardTypeInjectionTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -3,9 +3,9 @@ import javax.inject.DefinitionException; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; /** @@ -14,7 +14,7 @@ */ @Artifact @ExpectedDeploymentException(DefinitionException.class) -public class WildcardTypeInjectionTest extends AbstractDeclarativeTest +public class WildcardTypeInjectionTest extends AbstractJSR299Test { @Test(groups = {"ri-broken"}) @SpecAssertion(section = "2.2", id = "d") Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/custom/CustomDeploymentTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/custom/CustomDeploymentTypeTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/custom/CustomDeploymentTypeTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -4,9 +4,9 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.jsr299.BeansXml; +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; /** @@ -16,7 +16,7 @@ */ @Artifact @BeansXml("beans.xml") -public class CustomDeploymentTypeTest extends AbstractDeclarativeTest +public class CustomDeploymentTypeTest extends AbstractJSR299Test { @SuppressWarnings("unchecked") Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/defaultDeploymentType/DefaultDeploymentTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/defaultDeploymentType/DefaultDeploymentTypeTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/defaultDeploymentType/DefaultDeploymentTypeTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -5,8 +5,8 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; import org.testng.annotations.Test; /** @@ -15,7 +15,7 @@ * */ @Artifact -public class DefaultDeploymentTypeTest extends AbstractDeclarativeTest +public class DefaultDeploymentTypeTest extends AbstractJSR299Test { @Test Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/nonBuiltInUsesStandard/NonBuiltInUsesStandardTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/nonBuiltInUsesStandard/NonBuiltInUsesStandardTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/nonBuiltInUsesStandard/NonBuiltInUsesStandardTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -3,14 +3,14 @@ import javax.inject.DefinitionException; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; @Artifact @ExpectedDeploymentException(DefinitionException.class) -public class NonBuiltInUsesStandardTest extends AbstractDeclarativeTest +public class NonBuiltInUsesStandardTest extends AbstractJSR299Test { @Test(groups = { "deploymentType" }) 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-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/NameDefinitionTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -5,8 +5,8 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; import org.testng.annotations.Test; /** @@ -15,7 +15,7 @@ * */ @Artifact -public class NameDefinitionTest extends AbstractDeclarativeTest +public class NameDefinitionTest extends AbstractJSR299Test { @Test(groups="stub", expectedExceptions=DefinitionException.class) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/AnimalStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/AnimalStereotype.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/AnimalStereotype.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -11,8 +11,6 @@ import javax.annotation.Stereotype; import javax.context.RequestScoped; -import org.jboss.jsr299.tck.tests.definition.scope.Animal; - @Stereotype(requiredTypes=Animal.class) @Target( { TYPE, METHOD, FIELD }) @Retention(RUNTIME) 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-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/ScopeDefinitionTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -7,8 +7,8 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; import org.testng.annotations.Test; /** @@ -17,7 +17,7 @@ * */ @Artifact -public class ScopeDefinitionTest extends AbstractDeclarativeTest +public class ScopeDefinitionTest extends AbstractJSR299Test { @Test @SpecAssertion(section="2.4", id = "c") Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/incompatibleStereotypes/IncompatibleStereotypesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/incompatibleStereotypes/IncompatibleStereotypesTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/incompatibleStereotypes/IncompatibleStereotypesTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -3,14 +3,14 @@ import javax.inject.DefinitionException; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; @Artifact @ExpectedDeploymentException(DefinitionException.class) -public class IncompatibleStereotypesTest extends AbstractDeclarativeTest +public class IncompatibleStereotypesTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/tooMany/TooManyScopesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/tooMany/TooManyScopesTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/tooMany/TooManyScopesTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -3,14 +3,14 @@ import javax.inject.DefinitionException; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; @Artifact @ExpectedDeploymentException(DefinitionException.class) -public class TooManyScopesTest extends AbstractDeclarativeTest +public class TooManyScopesTest extends AbstractJSR299Test { @Test Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/StereotypeDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/StereotypeDefinitionTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/StereotypeDefinitionTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -11,9 +11,9 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.jsr299.BeansXml; +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; /** @@ -23,7 +23,7 @@ */ @Artifact @BeansXml("beans.xml") -public class StereotypeDefinitionTest extends AbstractDeclarativeTest +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/multipleStereotypesWithMultipleDeploymentTypes/MultipleStereotypesWithMultipleDeploymentTypesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/MultipleStereotypesWithMultipleDeploymentTypesTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/MultipleStereotypesWithMultipleDeploymentTypesTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -4,15 +4,15 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; @Artifact @ExpectedDeploymentException(DefinitionException.class) -public class MultipleStereotypesWithMultipleDeploymentTypesTest extends AbstractDeclarativeTest +public class MultipleStereotypesWithMultipleDeploymentTypesTest extends AbstractJSR299Test { @Test(groups="stub") Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleScopeTypes/MultipleStereotypesWithMultipleScopeTypesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleScopeTypes/MultipleStereotypesWithMultipleScopeTypesTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleScopeTypes/MultipleStereotypesWithMultipleScopeTypesTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -4,14 +4,14 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; @Artifact @ExpectedDeploymentException(DefinitionException.class) -public class MultipleStereotypesWithMultipleScopeTypesTest extends AbstractDeclarativeTest +public class MultipleStereotypesWithMultipleScopeTypesTest extends AbstractJSR299Test { @Test Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/nonEmptyNamed/NonEmptyNamedTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/nonEmptyNamed/NonEmptyNamedTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/nonEmptyNamed/NonEmptyNamedTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -4,14 +4,14 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; @Artifact @ExpectedDeploymentException(DefinitionException.class) -public class NonEmptyNamedTest extends AbstractDeclarativeTest +public class NonEmptyNamedTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/requiredTypeNotImplemented/RequiredTypeNotImplementedTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/requiredTypeNotImplemented/RequiredTypeNotImplementedTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/requiredTypeNotImplemented/RequiredTypeNotImplementedTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -4,14 +4,14 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; @Artifact @ExpectedDeploymentException(DefinitionException.class) -public class RequiredTypeNotImplementedTest extends AbstractDeclarativeTest +public class RequiredTypeNotImplementedTest extends AbstractJSR299Test { @Test Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/requiredTypesMerged/RequiredTypesMergedTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/requiredTypesMerged/RequiredTypesMergedTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/requiredTypesMerged/RequiredTypesMergedTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -4,14 +4,14 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; @Artifact @ExpectedDeploymentException(DefinitionException.class) -public class RequiredTypesMergedTest extends AbstractDeclarativeTest +public class RequiredTypesMergedTest extends AbstractJSR299Test { @Test Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/scopeNotSupported/ScopeNotSupportedTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/scopeNotSupported/ScopeNotSupportedTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/scopeNotSupported/ScopeNotSupportedTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -4,14 +4,14 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; @Artifact @ExpectedDeploymentException(DefinitionException.class) -public class ScopeNotSupportedTest extends AbstractDeclarativeTest +public class ScopeNotSupportedTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyDeployElements/TooManyDeployElementsTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyDeployElements/TooManyDeployElementsTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyDeployElements/TooManyDeployElementsTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -3,11 +3,11 @@ import javax.inject.DeploymentException; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; -import org.jboss.jsr299.tck.impl.packaging.IntegrationTest; -import org.jboss.jsr299.tck.impl.packaging.Resource; -import org.jboss.jsr299.tck.impl.packaging.Resources; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; +import org.jboss.testharness.impl.packaging.IntegrationTest; +import org.jboss.testharness.impl.packaging.Resource; +import org.jboss.testharness.impl.packaging.Resources; import org.testng.annotations.Test; @Artifact Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyDeploymentTypes/TooManyDeploymentTypesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyDeploymentTypes/TooManyDeploymentTypesTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyDeploymentTypes/TooManyDeploymentTypesTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -3,14 +3,14 @@ import javax.inject.DefinitionException; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; @Artifact @ExpectedDeploymentException(DefinitionException.class) -public class TooManyDeploymentTypesTest extends AbstractDeclarativeTest +public class TooManyDeploymentTypesTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyScopeTypes/TooManyScopeTypesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyScopeTypes/TooManyScopeTypesTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyScopeTypes/TooManyScopeTypesTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -3,14 +3,14 @@ import javax.inject.DefinitionException; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; @Artifact @ExpectedDeploymentException(DefinitionException.class) -public class TooManyScopeTypesTest extends AbstractDeclarativeTest +public class TooManyScopeTypesTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/withBindingTypes/StereoTypeWithBindingTypesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/withBindingTypes/StereoTypeWithBindingTypesTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/withBindingTypes/StereoTypeWithBindingTypesTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -3,14 +3,14 @@ import javax.inject.DefinitionException; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; @Artifact @ExpectedDeploymentException(DefinitionException.class) -public class StereoTypeWithBindingTypesTest extends AbstractDeclarativeTest +public class StereoTypeWithBindingTypesTest extends AbstractJSR299Test { 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-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -14,9 +14,9 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.jsr299.BeansXml; +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; /** @@ -29,7 +29,7 @@ */ @Artifact @BeansXml("beans.xml") -public class EventTest extends AbstractDeclarativeTest +public class EventTest extends AbstractJSR299Test { public static class AnEventType Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Role.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Role.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Role.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -1,8 +1,8 @@ package org.jboss.jsr299.tck.tests.event; -import static java.lang.annotation.RetentionPolicy.RUNTIME; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Retention; import java.lang.annotation.Target; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/event1/FiresOnNonEventTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/event1/FiresOnNonEventTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/event1/FiresOnNonEventTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -20,9 +20,9 @@ import javax.inject.DefinitionException; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; /** @@ -34,7 +34,7 @@ */ @Artifact @ExpectedDeploymentException(DefinitionException.class) -public class FiresOnNonEventTest extends AbstractDeclarativeTest +public class FiresOnNonEventTest extends AbstractJSR299Test { @Test(groups = { "events" }) @SpecAssertion(section = "7.6", id = "j") Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/event2/FiresOnEventWithoutTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/event2/FiresOnEventWithoutTypeTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/event2/FiresOnEventWithoutTypeTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -20,9 +20,9 @@ import javax.inject.DefinitionException; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; /** @@ -34,7 +34,7 @@ */ @Artifact @ExpectedDeploymentException(DefinitionException.class) -public class FiresOnEventWithoutTypeTest extends AbstractDeclarativeTest +public class FiresOnEventWithoutTypeTest extends AbstractJSR299Test { @Test(groups = { "events" }) @SpecAssertion(section = "7.6", id = "k") Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/event3/FiresOnEventWithWildcardTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/event3/FiresOnEventWithWildcardTypeTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/event3/FiresOnEventWithWildcardTypeTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -20,9 +20,9 @@ import javax.inject.DefinitionException; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; /** @@ -34,7 +34,7 @@ */ @Artifact @ExpectedDeploymentException(DefinitionException.class) -public class FiresOnEventWithWildcardTypeTest extends AbstractDeclarativeTest +public class FiresOnEventWithWildcardTypeTest extends AbstractJSR299Test { @Test(groups = { "events" }) @SpecAssertion(section = "7.6", id = "m") Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/event4/FiresOnEventWithTypeVariableTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/event4/FiresOnEventWithTypeVariableTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/event4/FiresOnEventWithTypeVariableTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -20,9 +20,9 @@ import javax.inject.DefinitionException; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; /** @@ -34,7 +34,7 @@ */ @Artifact @ExpectedDeploymentException(DefinitionException.class) -public class FiresOnEventWithTypeVariableTest extends AbstractDeclarativeTest +public class FiresOnEventWithTypeVariableTest extends AbstractJSR299Test { @Test(groups = { "events" }) @SpecAssertion(section = "7.6", id = "l") Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/jms1/MappedEventObserversAsynchronousTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/jms1/MappedEventObserversAsynchronousTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/jms1/MappedEventObserversAsynchronousTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -20,8 +20,8 @@ import javax.inject.DefinitionException; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer1/EJBObserverMethodNotBusinessMethodTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer1/EJBObserverMethodNotBusinessMethodTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer1/EJBObserverMethodNotBusinessMethodTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -21,11 +21,11 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; -import org.jboss.jsr299.tck.impl.packaging.Packaging; -import org.jboss.jsr299.tck.impl.packaging.PackagingType; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; +import org.jboss.testharness.impl.packaging.Packaging; +import org.jboss.testharness.impl.packaging.PackagingType; import org.testng.annotations.Test; /** @@ -38,7 +38,7 @@ @Artifact @ExpectedDeploymentException(DefinitionException.class) @Packaging(PackagingType.EAR) -public class EJBObserverMethodNotBusinessMethodTest extends AbstractDeclarativeTest +public class EJBObserverMethodNotBusinessMethodTest extends AbstractJSR299Test { @Test(groups = { "events" }) @SpecAssertions( { @SpecAssertion(section = "7.5", id = "d"), @SpecAssertion(section = "7.5.2", id = "f")} ) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer10/ObserverExceptionRethrown.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer10/ObserverExceptionRethrown.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer10/ObserverExceptionRethrown.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -18,8 +18,8 @@ package org.jboss.jsr299.tck.tests.event.broken.observer10; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; import org.testng.annotations.Test; /** @@ -30,7 +30,7 @@ * */ @Artifact -public class ObserverExceptionRethrown extends AbstractDeclarativeTest +public class ObserverExceptionRethrown extends AbstractJSR299Test { @Test(groups = { "events" }, expectedExceptions = { TeaCupPomeranian.OversizedException.class }) @SpecAssertion(section = "7.5.8", id = "q") Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer11/CheckedExceptionWrappedTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer11/CheckedExceptionWrappedTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer11/CheckedExceptionWrappedTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -20,8 +20,8 @@ import javax.event.ObserverException; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; import org.testng.annotations.Test; /** @@ -32,7 +32,7 @@ * */ @Artifact -public class CheckedExceptionWrappedTest extends AbstractDeclarativeTest +public class CheckedExceptionWrappedTest extends AbstractJSR299Test { @Test(groups = { "events" }, expectedExceptions = { ObserverException.class }) @SpecAssertion(section = "7.5.8", id = "r") Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer12/ObserverMethodOnIncorrectBeanTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer12/ObserverMethodOnIncorrectBeanTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer12/ObserverMethodOnIncorrectBeanTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -18,8 +18,8 @@ package org.jboss.jsr299.tck.tests.event.broken.observer12; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; import org.testng.annotations.Test; /** @@ -30,7 +30,7 @@ * */ @Artifact -public class ObserverMethodOnIncorrectBeanTest extends AbstractDeclarativeTest +public class ObserverMethodOnIncorrectBeanTest extends AbstractJSR299Test { @Test(groups = { "events" }) @SpecAssertion(section = "7.5", id = "b") Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer2/ObserverMethodWithTwoEventParametersTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer2/ObserverMethodWithTwoEventParametersTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer2/ObserverMethodWithTwoEventParametersTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -4,14 +4,14 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; @Artifact @ExpectedDeploymentException(DefinitionException.class) -public class ObserverMethodWithTwoEventParametersTest extends AbstractDeclarativeTest +public class ObserverMethodWithTwoEventParametersTest extends AbstractJSR299Test { @Test(groups = { "events" }) @SpecAssertions( { @SpecAssertion(section = "7.5.1", id = "a"), @SpecAssertion(section = "7.5.2", id = "b") }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer3/ObserverMethodAndWildcardedEventTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer3/ObserverMethodAndWildcardedEventTypeTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer3/ObserverMethodAndWildcardedEventTypeTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -20,9 +20,9 @@ import javax.inject.DefinitionException; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; /** @@ -34,7 +34,7 @@ */ @Artifact @ExpectedDeploymentException(DefinitionException.class) -public class ObserverMethodAndWildcardedEventTypeTest extends AbstractDeclarativeTest +public class ObserverMethodAndWildcardedEventTypeTest extends AbstractJSR299Test { @Test(groups = { "events" }) @SpecAssertion(section = "7.5.1", id = "c") Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer4/ObserverMethodAnnotatedProducesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer4/ObserverMethodAnnotatedProducesTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer4/ObserverMethodAnnotatedProducesTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -20,9 +20,9 @@ import javax.inject.DefinitionException; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; /** @@ -33,7 +33,7 @@ */ @Artifact @ExpectedDeploymentException(DefinitionException.class) -public class ObserverMethodAnnotatedProducesTest extends AbstractDeclarativeTest +public class ObserverMethodAnnotatedProducesTest extends AbstractJSR299Test { @Test(groups = { "events" }) @SpecAssertion(section = "7.5.2", id = "c") Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer5/ObserverMethodAnnotatedInitialzerTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer5/ObserverMethodAnnotatedInitialzerTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer5/ObserverMethodAnnotatedInitialzerTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -20,9 +20,9 @@ import javax.inject.DefinitionException; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; /** @@ -34,7 +34,7 @@ */ @Artifact @ExpectedDeploymentException(DefinitionException.class) -public class ObserverMethodAnnotatedInitialzerTest extends AbstractDeclarativeTest +public class ObserverMethodAnnotatedInitialzerTest extends AbstractJSR299Test { @Test(groups = { "events" }) @SpecAssertion(section = "7.5.2", id = "d") Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer6/ObserverMethodAnnotatedDisposesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer6/ObserverMethodAnnotatedDisposesTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer6/ObserverMethodAnnotatedDisposesTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -20,9 +20,9 @@ import javax.inject.DefinitionException; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; /** @@ -34,7 +34,7 @@ */ @Artifact @ExpectedDeploymentException(DefinitionException.class) -public class ObserverMethodAnnotatedDisposesTest extends AbstractDeclarativeTest +public class ObserverMethodAnnotatedDisposesTest extends AbstractJSR299Test { @Test(groups = { "events" }) @SpecAssertion(section = "7.5.2", id = "e") Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer7/TransactionalObserverMethodOnlyOnePhaseTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer7/TransactionalObserverMethodOnlyOnePhaseTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer7/TransactionalObserverMethodOnlyOnePhaseTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -20,9 +20,9 @@ import javax.inject.DefinitionException; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; /** @@ -34,7 +34,7 @@ */ @Artifact @ExpectedDeploymentException(DefinitionException.class) -public class TransactionalObserverMethodOnlyOnePhaseTest extends AbstractDeclarativeTest +public class TransactionalObserverMethodOnlyOnePhaseTest extends AbstractJSR299Test { @Test(groups = { "events" }) @SpecAssertion(section = "7.5.6", id = "l") 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-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer8/AsynchronousBeforeCompletionObserverTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -20,9 +20,9 @@ import javax.inject.DefinitionException; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; /** @@ -34,7 +34,7 @@ */ @Artifact @ExpectedDeploymentException(DefinitionException.class) -public class AsynchronousBeforeCompletionObserverTest extends AbstractDeclarativeTest +public class AsynchronousBeforeCompletionObserverTest extends AbstractJSR299Test { @Test(groups = { "events", "broken" }) @SpecAssertion(section = "7.5.7", id = "d") Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer9/AsynchronousConditionalObserverTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer9/AsynchronousConditionalObserverTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer9/AsynchronousConditionalObserverTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -20,9 +20,9 @@ import javax.inject.DefinitionException; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; /** @@ -34,7 +34,7 @@ */ @Artifact @ExpectedDeploymentException(DefinitionException.class) -public class AsynchronousConditionalObserverTest extends AbstractDeclarativeTest +public class AsynchronousConditionalObserverTest extends AbstractJSR299Test { @Test(groups = { "events", "broken" }) @SpecAssertion(section = "7.5.7", id = "e") Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/firesall/AllEventTypesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/firesall/AllEventTypesTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/firesall/AllEventTypesTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -1,12 +1,12 @@ package org.jboss.jsr299.tck.tests.event.firesall; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; import org.testng.annotations.Test; @Artifact -public class AllEventTypesTest extends AbstractDeclarativeTest +public class AllEventTypesTest extends AbstractJSR299Test { /** * The event types of the event include all superclasses and interfaces of Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/ImplicitEventBeanTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/ImplicitEventBeanTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/ImplicitEventBeanTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -25,9 +25,9 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.jsr299.BeansXml; +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; /** @@ -38,7 +38,7 @@ */ @Artifact @BeansXml("beans.xml") -public class ImplicitEventBeanTest extends AbstractDeclarativeTest +public class ImplicitEventBeanTest extends AbstractJSR299Test { @Test(groups = { "events", "broken" }) @SpecAssertions( { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/ConsumerNotifiedForEventTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/ConsumerNotifiedForEventTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/ConsumerNotifiedForEventTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -4,12 +4,12 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; import org.testng.annotations.Test; @Artifact -public class ConsumerNotifiedForEventTest extends AbstractDeclarativeTest +public class ConsumerNotifiedForEventTest extends AbstractJSR299Test { public static class AnEventType { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/DuplicateBindingsToAddObserverTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/DuplicateBindingsToAddObserverTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/DuplicateBindingsToAddObserverTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -4,12 +4,12 @@ import javax.inject.DuplicateBindingTypeException; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; import org.testng.annotations.Test; @Artifact -public class DuplicateBindingsToAddObserverTest extends AbstractDeclarativeTest +public class DuplicateBindingsToAddObserverTest extends AbstractJSR299Test { public static class AnEventType { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/DuplicateBindingsToRemoveObserverTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/DuplicateBindingsToRemoveObserverTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/DuplicateBindingsToRemoveObserverTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -4,12 +4,12 @@ import javax.inject.DuplicateBindingTypeException; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; import org.testng.annotations.Test; @Artifact -public class DuplicateBindingsToRemoveObserverTest extends AbstractDeclarativeTest +public class DuplicateBindingsToRemoveObserverTest extends AbstractJSR299Test { public static class AnEventType { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/ManagerAddObserverTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/ManagerAddObserverTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/ManagerAddObserverTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -25,8 +25,8 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; import org.testng.annotations.Test; /** @@ -36,7 +36,7 @@ * */ @Artifact -public class ManagerAddObserverTest extends AbstractDeclarativeTest +public class ManagerAddObserverTest extends AbstractJSR299Test { public static class AnEventType { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/NonBindingTypesToAddObserverTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/NonBindingTypesToAddObserverTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/NonBindingTypesToAddObserverTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -3,12 +3,12 @@ import javax.event.Observer; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; import org.testng.annotations.Test; @Artifact -public class NonBindingTypesToAddObserverTest extends AbstractDeclarativeTest +public class NonBindingTypesToAddObserverTest extends AbstractJSR299Test { public static class AnEventType { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/NonBindingTypesToRemoveObserverTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/NonBindingTypesToRemoveObserverTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/NonBindingTypesToRemoveObserverTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -3,12 +3,12 @@ import javax.event.Observer; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; import org.testng.annotations.Test; @Artifact -public class NonBindingTypesToRemoveObserverTest extends AbstractDeclarativeTest +public class NonBindingTypesToRemoveObserverTest extends AbstractJSR299Test { public static class AnEventType { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/ObserverExceptionAbortsTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/ObserverExceptionAbortsTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/ObserverExceptionAbortsTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -3,12 +3,12 @@ import javax.event.Observer; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; import org.testng.annotations.Test; @Artifact -public class ObserverExceptionAbortsTest extends AbstractDeclarativeTest +public class ObserverExceptionAbortsTest extends AbstractJSR299Test { public static class AnEventType { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/DuplicateBindingsToRemoveObserverTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/DuplicateBindingsToRemoveObserverTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/DuplicateBindingsToRemoveObserverTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -4,12 +4,12 @@ import javax.inject.DuplicateBindingTypeException; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; import org.testng.annotations.Test; @Artifact -public class DuplicateBindingsToRemoveObserverTest extends AbstractDeclarativeTest +public class DuplicateBindingsToRemoveObserverTest extends AbstractJSR299Test { public static class AnEventType { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/ManagerRemoveObserverTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/ManagerRemoveObserverTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/ManagerRemoveObserverTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -24,8 +24,8 @@ import javax.inject.TypeLiteral; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; import org.testng.annotations.Test; /** @@ -35,7 +35,7 @@ * */ @Artifact -public class ManagerRemoveObserverTest extends AbstractDeclarativeTest +public class ManagerRemoveObserverTest extends AbstractJSR299Test { public static class AnEventType { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/NonBindingTypesToRemoveObserverTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/NonBindingTypesToRemoveObserverTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/NonBindingTypesToRemoveObserverTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -3,12 +3,12 @@ import javax.event.Observer; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; import org.testng.annotations.Test; @Artifact -public class NonBindingTypesToRemoveObserverTest extends AbstractDeclarativeTest +public class NonBindingTypesToRemoveObserverTest extends AbstractJSR299Test { public static class AnEventType { 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-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/DuplicateBindingTypesWhenResolvingTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -4,12 +4,12 @@ import javax.inject.DuplicateBindingTypeException; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; import org.testng.annotations.Test; @Artifact -public class DuplicateBindingTypesWhenResolvingTest extends AbstractDeclarativeTest +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-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/ResolvingChecksBindingTypeMembersTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -5,12 +5,12 @@ import javax.event.Observer; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; import org.testng.annotations.Test; @Artifact -public class ResolvingChecksBindingTypeMembersTest extends AbstractDeclarativeTest +public class ResolvingChecksBindingTypeMembersTest extends AbstractJSR299Test { public static class AnEventType { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/ResolvingChecksBindingTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/ResolvingChecksBindingTypeTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/ResolvingChecksBindingTypeTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -5,12 +5,12 @@ import javax.event.Observer; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; import org.testng.annotations.Test; @Artifact -public class ResolvingChecksBindingTypeTest extends AbstractDeclarativeTest +public class ResolvingChecksBindingTypeTest 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-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/nonbinding/NonBindingTypesWhenResolvingTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -6,12 +6,12 @@ import javax.inject.TypeLiteral; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; import org.testng.annotations.Test; @Artifact -public class NonBindingTypesWhenResolvingTest extends AbstractDeclarativeTest +public class NonBindingTypesWhenResolvingTest extends AbstractJSR299Test { public static class AnEventType { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/type/ChecksEventTypeWhenResolvingTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/type/ChecksEventTypeWhenResolvingTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/type/ChecksEventTypeWhenResolvingTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -5,12 +5,12 @@ import javax.event.Observer; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; import org.testng.annotations.Test; @Artifact -public class ChecksEventTypeWhenResolvingTest extends AbstractDeclarativeTest +public class ChecksEventTypeWhenResolvingTest extends AbstractJSR299Test { public static class AnEventType { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/type/ChecksTypeParametersWhenResolvingTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/type/ChecksTypeParametersWhenResolvingTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/type/ChecksTypeParametersWhenResolvingTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -7,12 +7,12 @@ import javax.inject.TypeLiteral; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; import org.testng.annotations.Test; @Artifact -public class ChecksTypeParametersWhenResolvingTest extends AbstractDeclarativeTest +public class ChecksTypeParametersWhenResolvingTest extends AbstractJSR299Test { public static class AListObserver implements Observer<ArrayList<String>> { 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-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/transactionalObservers/EventTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -17,8 +17,6 @@ package org.jboss.jsr299.tck.tests.event.transactionalObservers; -import static org.jboss.jsr299.tck.impl.packaging.PackagingType.EAR; - import java.lang.annotation.Annotation; import java.math.BigInteger; @@ -26,12 +24,11 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.IntegrationTest; -import org.jboss.jsr299.tck.impl.packaging.Packaging; -import org.testng.annotations.AfterMethod; -import org.testng.annotations.BeforeMethod; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.IntegrationTest; +import org.jboss.testharness.impl.packaging.Packaging; +import org.jboss.testharness.impl.packaging.PackagingType; import org.testng.annotations.Test; /** @@ -43,19 +40,20 @@ * */ @Artifact -@Packaging(EAR) +(a)Packaging(PackagingType.EAR) @IntegrationTest -public class EventTest extends AbstractDeclarativeTest +@Test +public class EventTest extends AbstractJSR299Test { private static final Annotation TAME_LITERAL = new AnnotationLiteral<Tame>() { }; private PomeranianInterface dog = null; - - @BeforeMethod(alwaysRun = true, dependsOnMethods = "beforeMethod") - public void setupTest() + + public void beforeMethod() { + super.beforeMethod(); dog = (PomeranianInterface) getCurrentManager().getInstanceByName("Teddy"); } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/commonAnnotations/ResourceInjectionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/commonAnnotations/ResourceInjectionTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/commonAnnotations/ResourceInjectionTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.implementation.commonAnnotations; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.jsr299.tck.AbstractJSR299Test; import org.testng.annotations.Test; /** @@ -9,7 +9,7 @@ * Spec version: Public Release Draft 2 * */ -public class ResourceInjectionTest extends AbstractDeclarativeTest +public class ResourceInjectionTest extends AbstractJSR299Test { @Test(groups = "stub") @SpecAssertion(section = "3.10", id = "d") 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-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -2,10 +2,10 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.Packaging; -import org.jboss.jsr299.tck.impl.packaging.PackagingType; +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; /** @@ -15,7 +15,7 @@ */ @Artifact @Packaging(PackagingType.EAR) -public class EnterpriseBeanDefinitionTest extends AbstractDeclarativeTest +public class EnterpriseBeanDefinitionTest extends AbstractJSR299Test { @Test(groups = { "enterpriseBeans" }) @SpecAssertion(section = "3.3", id = "b") Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/statelessDecorator/StatelessDecoratorTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/statelessDecorator/StatelessDecoratorTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/statelessDecorator/StatelessDecoratorTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -3,17 +3,17 @@ import javax.inject.DefinitionException; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; -import org.jboss.jsr299.tck.impl.packaging.Packaging; -import org.jboss.jsr299.tck.impl.packaging.PackagingType; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; +import org.jboss.testharness.impl.packaging.Packaging; +import org.jboss.testharness.impl.packaging.PackagingType; import org.testng.annotations.Test; @Artifact @ExpectedDeploymentException(DefinitionException.class) @Packaging(PackagingType.EAR) -public class StatelessDecoratorTest extends AbstractDeclarativeTest +public class StatelessDecoratorTest extends AbstractJSR299Test { @Test Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/statelessInterceptor/StatelessInterceptorTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/statelessInterceptor/StatelessInterceptorTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/statelessInterceptor/StatelessInterceptorTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -3,17 +3,17 @@ import javax.inject.DefinitionException; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; -import org.jboss.jsr299.tck.impl.packaging.Packaging; -import org.jboss.jsr299.tck.impl.packaging.PackagingType; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; +import org.jboss.testharness.impl.packaging.Packaging; +import org.jboss.testharness.impl.packaging.PackagingType; import org.testng.annotations.Test; @Artifact @ExpectedDeploymentException(DefinitionException.class) @Packaging(PackagingType.EAR) -public class StatelessInterceptorTest extends AbstractDeclarativeTest +public class StatelessInterceptorTest 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-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -1,7 +1,5 @@ package org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle; -import static org.jboss.jsr299.tck.impl.packaging.PackagingType.EAR; - import java.util.Arrays; import java.util.HashSet; import java.util.Set; @@ -13,10 +11,11 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.IntegrationTest; -import org.jboss.jsr299.tck.impl.packaging.Packaging; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.IntegrationTest; +import org.jboss.testharness.impl.packaging.Packaging; +import org.jboss.testharness.impl.packaging.PackagingType; import org.testng.annotations.Test; /** @@ -35,9 +34,9 @@ * */ @Artifact -@Packaging(EAR) +(a)Packaging(PackagingType.EAR) @IntegrationTest -public class EnterpriseBeanLifecycleTest extends AbstractDeclarativeTest +public class EnterpriseBeanLifecycleTest extends AbstractJSR299Test { /** Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newAndOtherBinding/NewAndOtherBindingTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newAndOtherBinding/NewAndOtherBindingTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newAndOtherBinding/NewAndOtherBindingTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -3,14 +3,14 @@ import javax.inject.DefinitionException; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; @Artifact @ExpectedDeploymentException(DefinitionException.class) -public class NewAndOtherBindingTest extends AbstractDeclarativeTest +public class NewAndOtherBindingTest 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-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -12,11 +12,11 @@ import javax.inject.manager.Bean; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.Packaging; -import org.jboss.jsr299.tck.impl.packaging.PackagingType; +import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.literals.NewLiteral; +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; /** @@ -26,7 +26,7 @@ */ @Artifact @Packaging(PackagingType.EAR) -public class NewEnterpriseBeanTest extends AbstractDeclarativeTest +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-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/EnterpriseBeanRemoveMethodTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.implementation.enterprise.remove; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; +import org.jboss.jsr299.tck.AbstractJSR299Test; import org.testng.annotations.Test; /** @@ -10,7 +10,7 @@ * * Spec version: PRD2 */ -public class EnterpriseBeanRemoveMethodTest extends AbstractDeclarativeTest +public class EnterpriseBeanRemoveMethodTest extends AbstractJSR299Test { @Test(groups = { "enterpriseBeans", "removeMethod", "lifecycle", "stub" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/singletonWithConversationScope/SingletonWithConversationScopeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/singletonWithConversationScope/SingletonWithConversationScopeTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/singletonWithConversationScope/SingletonWithConversationScopeTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -3,17 +3,17 @@ import javax.inject.DefinitionException; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; -import org.jboss.jsr299.tck.impl.packaging.Packaging; -import org.jboss.jsr299.tck.impl.packaging.PackagingType; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; +import org.jboss.testharness.impl.packaging.Packaging; +import org.jboss.testharness.impl.packaging.PackagingType; import org.testng.annotations.Test; @ExpectedDeploymentException(DefinitionException.class) @Artifact @Packaging(PackagingType.EAR) -public class SingletonWithConversationScopeTest extends AbstractDeclarativeTest +public class SingletonWithConversationScopeTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/singletonWithRequestScope/SingletonWithRequestScopeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/singletonWithRequestScope/SingletonWithRequestScopeTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/singletonWithRequestScope/SingletonWithRequestScopeTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -3,17 +3,17 @@ import javax.inject.DefinitionException; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; -import org.jboss.jsr299.tck.impl.packaging.Packaging; -import org.jboss.jsr299.tck.impl.packaging.PackagingType; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; +import org.jboss.testharness.impl.packaging.Packaging; +import org.jboss.testharness.impl.packaging.PackagingType; import org.testng.annotations.Test; @Artifact @ExpectedDeploymentException(DefinitionException.class) @Packaging(PackagingType.EAR) -public class SingletonWithRequestScopeTest extends AbstractDeclarativeTest +public class SingletonWithRequestScopeTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/singletonWithSessionScope/SingletonWithSessionScopeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/singletonWithSessionScope/SingletonWithSessionScopeTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/singletonWithSessionScope/SingletonWithSessionScopeTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -3,17 +3,17 @@ import javax.inject.DefinitionException; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; -import org.jboss.jsr299.tck.impl.packaging.Packaging; -import org.jboss.jsr299.tck.impl.packaging.PackagingType; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; +import org.jboss.testharness.impl.packaging.Packaging; +import org.jboss.testharness.impl.packaging.PackagingType; import org.testng.annotations.Test; @Artifact @ExpectedDeploymentException(DefinitionException.class) @Packaging(PackagingType.EAR) -public class SingletonWithSessionScopeTest extends AbstractDeclarativeTest +public class SingletonWithSessionScopeTest extends AbstractJSR299Test { @Test(groups = { "enterpriseBeans", "stub" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithApplicationScope/StatelessWithApplicationScopeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithApplicationScope/StatelessWithApplicationScopeTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithApplicationScope/StatelessWithApplicationScopeTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -3,17 +3,17 @@ import javax.inject.DefinitionException; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; -import org.jboss.jsr299.tck.impl.packaging.Packaging; -import org.jboss.jsr299.tck.impl.packaging.PackagingType; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; +import org.jboss.testharness.impl.packaging.Packaging; +import org.jboss.testharness.impl.packaging.PackagingType; import org.testng.annotations.Test; @Artifact @ExpectedDeploymentException(DefinitionException.class) @Packaging(PackagingType.EAR) -public class StatelessWithApplicationScopeTest extends AbstractDeclarativeTest +public class StatelessWithApplicationScopeTest extends AbstractJSR299Test { @Test(groups = { "enterpriseBeans" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithConversationScope/StatelessWithConversationScopeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithConversationScope/StatelessWithConversationScopeTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithConversationScope/StatelessWithConversationScopeTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -3,17 +3,17 @@ import javax.inject.DefinitionException; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; -import org.jboss.jsr299.tck.impl.packaging.Packaging; -import org.jboss.jsr299.tck.impl.packaging.PackagingType; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; +import org.jboss.testharness.impl.packaging.Packaging; +import org.jboss.testharness.impl.packaging.PackagingType; import org.testng.annotations.Test; @Artifact @ExpectedDeploymentException(DefinitionException.class) @Packaging(PackagingType.EAR) -public class StatelessWithConversationScopeTest extends AbstractDeclarativeTest +public class StatelessWithConversationScopeTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithRequestScope/StatelessWithRequestScopeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithRequestScope/StatelessWithRequestScopeTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithRequestScope/StatelessWithRequestScopeTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -3,17 +3,17 @@ import javax.inject.DefinitionException; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; -import org.jboss.jsr299.tck.impl.packaging.Packaging; -import org.jboss.jsr299.tck.impl.packaging.PackagingType; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; +import org.jboss.testharness.impl.packaging.Packaging; +import org.jboss.testharness.impl.packaging.PackagingType; import org.testng.annotations.Test; @Artifact @ExpectedDeploymentException(DefinitionException.class) @Packaging(PackagingType.EAR) -public class StatelessWithRequestScopeTest extends AbstractDeclarativeTest +public class StatelessWithRequestScopeTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithSessionScope/StatelessWithSessionScopeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithSessionScope/StatelessWithSessionScopeTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithSessionScope/StatelessWithSessionScopeTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -3,17 +3,17 @@ import javax.inject.DefinitionException; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; -import org.jboss.jsr299.tck.impl.packaging.Packaging; -import org.jboss.jsr299.tck.impl.packaging.PackagingType; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; +import org.jboss.testharness.impl.packaging.Packaging; +import org.jboss.testharness.impl.packaging.PackagingType; import org.testng.annotations.Test; @Artifact @ExpectedDeploymentException(DefinitionException.class) @Packaging(PackagingType.EAR) -public class StatelessWithSessionScopeTest extends AbstractDeclarativeTest +public class StatelessWithSessionScopeTest extends AbstractJSR299Test { @Test(groups = { "enterpriseBeans" }) 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-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/EjbInitializerMethodTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -2,17 +2,17 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.IntegrationTest; -import org.jboss.jsr299.tck.impl.packaging.Packaging; -import org.jboss.jsr299.tck.impl.packaging.PackagingType; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.IntegrationTest; +import org.jboss.testharness.impl.packaging.Packaging; +import org.jboss.testharness.impl.packaging.PackagingType; import org.testng.annotations.Test; @Artifact @Packaging(PackagingType.EAR) @IntegrationTest -public class EjbInitializerMethodTest extends AbstractDeclarativeTest +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-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/InitializerMethodTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -4,10 +4,10 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.Packaging; -import org.jboss.jsr299.tck.impl.packaging.PackagingType; +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; /** @@ -16,7 +16,7 @@ */ @Artifact @Packaging(PackagingType.EAR) -public class InitializerMethodTest extends AbstractDeclarativeTest +public class InitializerMethodTest extends AbstractJSR299Test { @Test(groups = { "stub", "initializerMethod", "servlet", "integration" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/methodAnnotatedProduces/MethodAnnotatedProducesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/methodAnnotatedProduces/MethodAnnotatedProducesTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/methodAnnotatedProduces/MethodAnnotatedProducesTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -4,14 +4,14 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; @Artifact @ExpectedDeploymentException(DefinitionException.class) -public class MethodAnnotatedProducesTest extends AbstractDeclarativeTest +public class MethodAnnotatedProducesTest extends AbstractJSR299Test { @Test(groups = "initializerMethod") Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -3,14 +3,14 @@ import javax.inject.DefinitionException; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; @Artifact @ExpectedDeploymentException(DefinitionException.class) -public class ParameterAnnotatedDisposesTest extends AbstractDeclarativeTest +public class ParameterAnnotatedDisposesTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -3,14 +3,14 @@ import javax.inject.DefinitionException; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; @Artifact @ExpectedDeploymentException(DefinitionException.class) -public class ParameterAnnotatedObservesTest extends AbstractDeclarativeTest +public class ParameterAnnotatedObservesTest extends AbstractJSR299Test { 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-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/staticInitializer/StaticInitializerTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -3,14 +3,14 @@ import javax.inject.DefinitionException; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; @Artifact @ExpectedDeploymentException(DefinitionException.class) -public class StaticInitializerTest extends AbstractDeclarativeTest +public class StaticInitializerTest extends AbstractJSR299Test { @Test(groups = "initializerMethod") Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/jms/JmsDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/jms/JmsDefinitionTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/jms/JmsDefinitionTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -1,13 +1,14 @@ package org.jboss.jsr299.tck.tests.implementation.jms; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; +import org.jboss.jsr299.tck.AbstractJSR299Test; + /** * * Spec version: PRD2 * */ -public class JmsDefinitionTest extends AbstractDeclarativeTest +public class JmsDefinitionTest 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-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/ProducerFieldDefinitionTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -10,10 +10,10 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.jsr299.BeansXml; +import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.literals.CurrentBinding; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.jsr299.BeansXml; import org.testng.annotations.Test; /** @@ -23,7 +23,7 @@ */ @Artifact @BeansXml("beans.xml") -public class ProducerFieldDefinitionTest extends AbstractDeclarativeTest +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/parameterizedReturnTypeWithWildcard/ParameterizedReturnTypeWithWildcardTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/parameterizedReturnTypeWithWildcard/ParameterizedReturnTypeWithWildcardTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/parameterizedReturnTypeWithWildcard/ParameterizedReturnTypeWithWildcardTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -3,14 +3,14 @@ import javax.inject.DefinitionException; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; @Artifact @ExpectedDeploymentException(DefinitionException.class) -public class ParameterizedReturnTypeWithWildcardTest extends AbstractDeclarativeTest +public class ParameterizedReturnTypeWithWildcardTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/ProducerFieldLifecycleTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/ProducerFieldLifecycleTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/ProducerFieldLifecycleTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -4,9 +4,9 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.jsr299.BeansXml; +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; /** @@ -16,7 +16,7 @@ */ @Artifact @BeansXml("beans.xml") -public class ProducerFieldLifecycleTest extends AbstractDeclarativeTest +public class ProducerFieldLifecycleTest extends AbstractJSR299Test { @Test(groups = { "producerField" }) 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-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/ProducerMethodDefinitionTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -10,9 +10,9 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.jsr299.BeansXml; +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; /** @@ -22,7 +22,7 @@ */ @Artifact @BeansXml("beans.xml") -public class ProducerMethodDefinitionTest extends AbstractDeclarativeTest +public class ProducerMethodDefinitionTest 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/method/lifecycle/ProducerMethodLifecycleTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/ProducerMethodLifecycleTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/ProducerMethodLifecycleTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -8,9 +8,9 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.jsr299.BeansXml; +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; /** @@ -20,7 +20,7 @@ */ @Artifact @BeansXml("beans.xml") -public class ProducerMethodLifecycleTest extends AbstractDeclarativeTest +public class ProducerMethodLifecycleTest extends AbstractJSR299Test { @Test(groups = { "producerMethod" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/notBusinessMethod/NotABusinessMethodTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/notBusinessMethod/NotABusinessMethodTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/notBusinessMethod/NotABusinessMethodTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -3,8 +3,8 @@ import javax.inject.DefinitionException; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; @Artifact Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -3,14 +3,14 @@ import javax.inject.DefinitionException; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; @Artifact @ExpectedDeploymentException(DefinitionException.class) -public class ParameterAnnotatedDisposesTest extends AbstractDeclarativeTest +public class ParameterAnnotatedDisposesTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -3,14 +3,14 @@ import javax.inject.DefinitionException; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; @Artifact @ExpectedDeploymentException(DefinitionException.class) -public class ParameterAnnotatedObservesTest extends AbstractDeclarativeTest +public class ParameterAnnotatedObservesTest extends AbstractJSR299Test { @Test(groups = "producerMethod") Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithTypeParameter/ParameterizedTypeWithTypeParameterTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithTypeParameter/ParameterizedTypeWithTypeParameterTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithTypeParameter/ParameterizedTypeWithTypeParameterTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -3,14 +3,14 @@ import javax.inject.DefinitionException; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; @Artifact @ExpectedDeploymentException(DefinitionException.class) -public class ParameterizedTypeWithTypeParameterTest extends AbstractDeclarativeTest +public class ParameterizedTypeWithTypeParameterTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithWildcard/PamaterizedTypeWithWildcardTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithWildcard/PamaterizedTypeWithWildcardTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithWildcard/PamaterizedTypeWithWildcardTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -3,14 +3,14 @@ import javax.inject.DefinitionException; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; @Artifact @ExpectedDeploymentException(DefinitionException.class) -public class PamaterizedTypeWithWildcardTest extends AbstractDeclarativeTest +public class PamaterizedTypeWithWildcardTest extends AbstractJSR299Test { @Test(groups = "producerMethod") Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/stereotypeEnforcesRequiredTypes/StereotypeEnforcesRequiredTypesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/stereotypeEnforcesRequiredTypes/StereotypeEnforcesRequiredTypesTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/stereotypeEnforcesRequiredTypes/StereotypeEnforcesRequiredTypesTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -4,14 +4,14 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; @Artifact @ExpectedDeploymentException(DefinitionException.class) -public class StereotypeEnforcesRequiredTypesTest extends AbstractDeclarativeTest +public class StereotypeEnforcesRequiredTypesTest extends AbstractJSR299Test { 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-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanDefinitionTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -4,10 +4,10 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; +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; /** @@ -16,7 +16,7 @@ * */ @Artifact -public class SimpleBeanDefinitionTest extends AbstractDeclarativeTest +public class SimpleBeanDefinitionTest extends AbstractJSR299Test { @Test 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-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasDisposesParameter/ConstructorHasDisposesParameterTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -3,14 +3,14 @@ import javax.inject.DefinitionException; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; @Artifact @ExpectedDeploymentException(DefinitionException.class) -public class ConstructorHasDisposesParameterTest extends AbstractDeclarativeTest +public class ConstructorHasDisposesParameterTest extends AbstractJSR299Test { @Test(groups = { "disposalMethod", "stub" }) 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-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasObservesParameter/ConstructorHasObservesParameterTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -3,14 +3,14 @@ import javax.inject.DefinitionException; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; @Artifact @ExpectedDeploymentException(DefinitionException.class) -public class ConstructorHasObservesParameterTest extends AbstractDeclarativeTest +public class ConstructorHasObservesParameterTest extends AbstractJSR299Test { @Test(groups = { "stub", "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-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/dependentWithPublicField/DependentWithPublicFieldTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -3,14 +3,14 @@ import javax.inject.DefinitionException; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; @Artifact @ExpectedDeploymentException(DefinitionException.class) -public class DependentWithPublicFieldTest extends AbstractDeclarativeTest +public class DependentWithPublicFieldTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/interceptorAndDecorator/SimpleBeanIsDecoratorAndInterceptorTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/interceptorAndDecorator/SimpleBeanIsDecoratorAndInterceptorTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/interceptorAndDecorator/SimpleBeanIsDecoratorAndInterceptorTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -3,14 +3,14 @@ import javax.inject.DefinitionException; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; @Artifact @ExpectedDeploymentException(DefinitionException.class) -public class SimpleBeanIsDecoratorAndInterceptorTest extends AbstractDeclarativeTest +public class SimpleBeanIsDecoratorAndInterceptorTest extends AbstractJSR299Test { @Test(groups = "ri-broken") @SpecAssertion(section = "3.2", id = "d") 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-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/tooManyInitializerAnnotatedConstructors/TooManyInitializerAnnotatedConstructorsTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -3,14 +3,14 @@ import javax.inject.DefinitionException; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; @Artifact @ExpectedDeploymentException(DefinitionException.class) -public class TooManyInitializerAnnotatedConstructorsTest extends AbstractDeclarativeTest +public class TooManyInitializerAnnotatedConstructorsTest extends AbstractJSR299Test { @Test 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-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -8,9 +8,9 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.jsr299.BeansXml; +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; /** @@ -20,7 +20,7 @@ */ @Artifact @BeansXml("beans.xml") -public class SimpleBeanLifecycleTest extends AbstractDeclarativeTest +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-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/NewSimpleBeanTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -13,9 +13,9 @@ import javax.inject.manager.Bean; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.literals.NewLiteral; +import org.jboss.testharness.impl.packaging.Artifact; import org.testng.annotations.Test; /** @@ -24,7 +24,7 @@ * */ @Artifact -public class NewSimpleBeanTest extends AbstractDeclarativeTest +public class NewSimpleBeanTest 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/newAndOtherBindingType/NewAndOtherBindingTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/newAndOtherBindingType/NewAndOtherBindingTypeTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/newAndOtherBindingType/NewAndOtherBindingTypeTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -3,14 +3,14 @@ import javax.inject.DefinitionException; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; @Artifact @ExpectedDeploymentException(DefinitionException.class) -public class NewAndOtherBindingTypeTest extends AbstractDeclarativeTest +public class NewAndOtherBindingTypeTest extends AbstractJSR299Test { @Test(groups = { "new" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/RealizationTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/RealizationTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/RealizationTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -1,16 +1,14 @@ package org.jboss.jsr299.tck.tests.inheritance.realization; -import static org.jboss.jsr299.tck.impl.util.Reflections.annotationSetMatches; - import java.lang.annotation.Annotation; import javax.context.RequestScoped; import javax.inject.AnnotationLiteral; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.jsr299.BeansXml; +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; /** @@ -20,7 +18,7 @@ */ @Artifact @BeansXml("beans.xml") -public class RealizationTest extends AbstractDeclarativeTest +public class RealizationTest extends AbstractJSR299Test { private static Annotation SMELLY_LITERAL = new AnnotationLiteral<Smelly>() 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-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationIntegrationTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -6,19 +6,19 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.IntegrationTest; -import org.jboss.jsr299.tck.impl.packaging.Packaging; -import org.jboss.jsr299.tck.impl.packaging.PackagingType; -import org.jboss.jsr299.tck.impl.packaging.jsr299.BeansXml; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.IntegrationTest; +import org.jboss.testharness.impl.packaging.Packaging; +import org.jboss.testharness.impl.packaging.PackagingType; +import org.jboss.testharness.impl.packaging.jsr299.BeansXml; import org.testng.annotations.Test; @Artifact @IntegrationTest @Packaging(PackagingType.EAR) @BeansXml("beans.xml") -public class EnterpriseBeanSpecializationIntegrationTest extends AbstractDeclarativeTest +public class EnterpriseBeanSpecializationIntegrationTest extends AbstractJSR299Test { private static Annotation LANDOWNER_LITERAL = new AnnotationLiteral<Landowner>() {}; 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-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -1,7 +1,5 @@ package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise; -import static org.jboss.jsr299.tck.impl.util.Reflections.annotationSetMatches; - import java.lang.annotation.Annotation; import javax.inject.AnnotationLiteral; @@ -10,11 +8,11 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.Packaging; -import org.jboss.jsr299.tck.impl.packaging.PackagingType; -import org.jboss.jsr299.tck.impl.packaging.jsr299.BeansXml; +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.jboss.testharness.impl.packaging.jsr299.BeansXml; import org.testng.annotations.Test; /** @@ -24,7 +22,7 @@ @Artifact @Packaging(PackagingType.EAR) @BeansXml("beans.xml") -public class EnterpriseBeanSpecializationTest extends AbstractDeclarativeTest +public class EnterpriseBeanSpecializationTest extends AbstractJSR299Test { private static Annotation LANDOWNER_LITERAL = new AnnotationLiteral<Landowner>() {}; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsNothing/DirectlyExtendsNothingTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsNothing/DirectlyExtendsNothingTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsNothing/DirectlyExtendsNothingTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -3,17 +3,17 @@ import javax.inject.DefinitionException; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; -import org.jboss.jsr299.tck.impl.packaging.Packaging; -import org.jboss.jsr299.tck.impl.packaging.PackagingType; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; +import org.jboss.testharness.impl.packaging.Packaging; +import org.jboss.testharness.impl.packaging.PackagingType; import org.testng.annotations.Test; @Artifact @ExpectedDeploymentException(DefinitionException.class) @Packaging(PackagingType.EAR) -public class DirectlyExtendsNothingTest extends AbstractDeclarativeTest +public class DirectlyExtendsNothingTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsSimpleBean/DirectlyExtendsSimpleBeanTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsSimpleBean/DirectlyExtendsSimpleBeanTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsSimpleBean/DirectlyExtendsSimpleBeanTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -3,17 +3,17 @@ import javax.inject.DefinitionException; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; -import org.jboss.jsr299.tck.impl.packaging.Packaging; -import org.jboss.jsr299.tck.impl.packaging.PackagingType; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; +import org.jboss.testharness.impl.packaging.Packaging; +import org.jboss.testharness.impl.packaging.PackagingType; import org.testng.annotations.Test; @Artifact @Packaging(PackagingType.EAR) @ExpectedDeploymentException(DefinitionException.class) -public class DirectlyExtendsSimpleBeanTest extends AbstractDeclarativeTest +public class DirectlyExtendsSimpleBeanTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing/ImplementsInterfaceAndExtendsNothingTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing/ImplementsInterfaceAndExtendsNothingTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing/ImplementsInterfaceAndExtendsNothingTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -3,17 +3,17 @@ import javax.inject.DefinitionException; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; -import org.jboss.jsr299.tck.impl.packaging.Packaging; -import org.jboss.jsr299.tck.impl.packaging.PackagingType; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; +import org.jboss.testharness.impl.packaging.Packaging; +import org.jboss.testharness.impl.packaging.PackagingType; import org.testng.annotations.Test; @ExpectedDeploymentException(DefinitionException.class) @Artifact @Packaging(PackagingType.EAR) -public class ImplementsInterfaceAndExtendsNothingTest extends AbstractDeclarativeTest +public class ImplementsInterfaceAndExtendsNothingTest extends AbstractJSR299Test { @Test(groups={"specialization"}) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/sameName/SameNameTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/sameName/SameNameTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/sameName/SameNameTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -3,19 +3,19 @@ import javax.inject.DefinitionException; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; -import org.jboss.jsr299.tck.impl.packaging.Packaging; -import org.jboss.jsr299.tck.impl.packaging.PackagingType; -import org.jboss.jsr299.tck.impl.packaging.jsr299.BeansXml; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; +import org.jboss.testharness.impl.packaging.Packaging; +import org.jboss.testharness.impl.packaging.PackagingType; +import org.jboss.testharness.impl.packaging.jsr299.BeansXml; import org.testng.annotations.Test; @Artifact @ExpectedDeploymentException(DefinitionException.class) @Packaging(PackagingType.EAR) @BeansXml("beans.xml") -public class SameNameTest extends AbstractDeclarativeTest +public class SameNameTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/samePrecedence/SamePrecedenceTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/samePrecedence/SamePrecedenceTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/samePrecedence/SamePrecedenceTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -3,17 +3,17 @@ import javax.inject.InconsistentSpecializationException; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; -import org.jboss.jsr299.tck.impl.packaging.Packaging; -import org.jboss.jsr299.tck.impl.packaging.PackagingType; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; +import org.jboss.testharness.impl.packaging.Packaging; +import org.jboss.testharness.impl.packaging.PackagingType; import org.testng.annotations.Test; @Artifact @Packaging(PackagingType.EAR) @ExpectedDeploymentException(InconsistentSpecializationException.class) -public class SamePrecedenceTest extends AbstractDeclarativeTest +public class SamePrecedenceTest extends AbstractJSR299Test { @Test Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -3,19 +3,19 @@ import javax.inject.InconsistentSpecializationException; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; -import org.jboss.jsr299.tck.impl.packaging.Packaging; -import org.jboss.jsr299.tck.impl.packaging.PackagingType; -import org.jboss.jsr299.tck.impl.packaging.jsr299.BeansXml; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; +import org.jboss.testharness.impl.packaging.Packaging; +import org.jboss.testharness.impl.packaging.PackagingType; +import org.jboss.testharness.impl.packaging.jsr299.BeansXml; import org.testng.annotations.Test; @Artifact @Packaging(PackagingType.EAR) @ExpectedDeploymentException(InconsistentSpecializationException.class) @BeansXml("beans.xml") -public class TwoBeansSpecializeTheSameBeanTest extends AbstractDeclarativeTest +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-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/ProducerMethodSpecializationTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -1,16 +1,14 @@ package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method; -import static org.jboss.jsr299.tck.impl.util.Reflections.annotationSetMatches; - import java.lang.annotation.Annotation; import javax.inject.AnnotationLiteral; import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.jsr299.BeansXml; +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; /** @@ -19,7 +17,7 @@ */ @Artifact @BeansXml("beans.xml") -public class ProducerMethodSpecializationTest extends AbstractDeclarativeTest +public class ProducerMethodSpecializationTest extends AbstractJSR299Test { private static Annotation EXPENSIVE_LITERAL = new AnnotationLiteral<Expensive>() {}; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/indirectOverride/IndirectOverrideTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/indirectOverride/IndirectOverrideTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/indirectOverride/IndirectOverrideTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -3,14 +3,14 @@ import javax.inject.DefinitionException; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; @Artifact @ExpectedDeploymentException(DefinitionException.class) -public class IndirectOverrideTest extends AbstractDeclarativeTest +public class IndirectOverrideTest extends AbstractJSR299Test { @Test Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/lowerprecedence/SpecializingBeanDoesNotHaveHigherPrecedenceThanSpecializedBeanTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/lowerprecedence/SpecializingBeanDoesNotHaveHigherPrecedenceThanSpecializedBeanTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/lowerprecedence/SpecializingBeanDoesNotHaveHigherPrecedenceThanSpecializedBeanTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -3,14 +3,14 @@ import javax.inject.InconsistentSpecializationException; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; @Artifact @ExpectedDeploymentException(InconsistentSpecializationException.class) -public class SpecializingBeanDoesNotHaveHigherPrecedenceThanSpecializedBeanTest extends AbstractDeclarativeTest +public class SpecializingBeanDoesNotHaveHigherPrecedenceThanSpecializedBeanTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializesStaticMethod/SpecializesStaticMethodTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializesStaticMethod/SpecializesStaticMethodTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializesStaticMethod/SpecializesStaticMethodTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -3,14 +3,14 @@ import javax.inject.DefinitionException; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; @Artifact @ExpectedDeploymentException(DefinitionException.class) -public class SpecializesStaticMethodTest extends AbstractDeclarativeTest +public class SpecializesStaticMethodTest extends AbstractJSR299Test { @Test Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/SpecializingAndSpecializedBeanHaveNameTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/SpecializingAndSpecializedBeanHaveNameTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/SpecializingAndSpecializedBeanHaveNameTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -3,14 +3,14 @@ import javax.inject.DefinitionException; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; @Artifact @ExpectedDeploymentException(DefinitionException.class) -public class SpecializingAndSpecializedBeanHaveNameTest extends AbstractDeclarativeTest +public class SpecializingAndSpecializedBeanHaveNameTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -3,14 +3,14 @@ import javax.inject.InconsistentSpecializationException; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; @Artifact @ExpectedDeploymentException(InconsistentSpecializationException.class) -public class TwoBeansSpecializeTheSameBeanTest extends AbstractDeclarativeTest +public class TwoBeansSpecializeTheSameBeanTest extends AbstractJSR299Test { @Test 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-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/SimpleBeanSpecializationTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -1,18 +1,14 @@ package org.jboss.jsr299.tck.tests.inheritance.specialization.simple; -import static org.jboss.jsr299.tck.impl.util.Reflections.annotationSetMatches; - import java.lang.annotation.Annotation; import javax.inject.AnnotationLiteral; -import javax.inject.DefinitionException; -import javax.inject.InconsistentSpecializationException; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.jsr299.BeansXml; import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; +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; /** @@ -21,7 +17,7 @@ */ @Artifact @BeansXml("beans.xml") -public class SimpleBeanSpecializationTest extends AbstractDeclarativeTest +public class SimpleBeanSpecializationTest extends AbstractJSR299Test { private static Annotation LANDOWNER_LITERAL = new AnnotationLiteral<Landowner>() 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-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/SpecializingBeanExtendsEnterpriseBeanTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -3,17 +3,17 @@ import javax.inject.DefinitionException; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; -import org.jboss.jsr299.tck.impl.packaging.Packaging; -import org.jboss.jsr299.tck.impl.packaging.PackagingType; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; +import org.jboss.testharness.impl.packaging.Packaging; +import org.jboss.testharness.impl.packaging.PackagingType; import org.testng.annotations.Test; @Artifact @Packaging(PackagingType.EAR) @ExpectedDeploymentException(DefinitionException.class) -public class SpecializingBeanExtendsEnterpriseBeanTest extends AbstractDeclarativeTest +public class SpecializingBeanExtendsEnterpriseBeanTest extends AbstractJSR299Test { @Test(groups = { "specialization" }) @SpecAssertion(section = "3.2.7", id = "a") 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-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/SpecializingAndSpecializedBeanHasNameTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -3,8 +3,8 @@ import javax.inject.DefinitionException; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; @Artifact 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-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/SpecializingBeanImplementsInterfaceOnly.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -3,8 +3,8 @@ import javax.inject.DefinitionException; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; @Artifact 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-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/SpecializingBeanExtendsNothingTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -3,8 +3,8 @@ import javax.inject.DefinitionException; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; @Artifact Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/precedence/SpecializingBeanWithLowerPrecedenceTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/precedence/SpecializingBeanWithLowerPrecedenceTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/precedence/SpecializingBeanWithLowerPrecedenceTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -3,8 +3,8 @@ import javax.inject.InconsistentSpecializationException; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; @Artifact 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-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/TwoSpecializingBeansForOneSpecializedTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -3,14 +3,14 @@ import javax.inject.InconsistentSpecializationException; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; @Artifact @ExpectedDeploymentException(InconsistentSpecializationException.class) -public class TwoSpecializingBeansForOneSpecializedTest extends AbstractDeclarativeTest +public class TwoSpecializingBeansForOneSpecializedTest extends AbstractJSR299Test { @Test @SpecAssertion(section="4.3.3", id="a") Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/InstantiationByNameTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/InstantiationByNameTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/InstantiationByNameTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -2,8 +2,8 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; import org.testng.annotations.Test; /** @@ -12,7 +12,7 @@ * */ @Artifact -public class InstantiationByNameTest extends AbstractDeclarativeTest +public class InstantiationByNameTest extends AbstractJSR299Test { @Test(groups={"stub", "resolution", "el"}) @SpecAssertion(section="5.10", id = "f") 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-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/ResolutionByNameTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -1,9 +1,9 @@ package org.jboss.jsr299.tck.tests.lookup.byname; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.jsr299.BeansXml; +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; /** @@ -13,7 +13,7 @@ */ @Artifact @BeansXml("beans.xml") -public class ResolutionByNameTest extends AbstractDeclarativeTest +public class ResolutionByNameTest extends AbstractJSR299Test { @Test(groups = { "resolution" }) 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-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicateNameResolution/DuplicateNameResolutionTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -20,8 +20,8 @@ import javax.inject.AmbiguousDependencyException; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; import org.testng.annotations.Test; /** @@ -30,7 +30,7 @@ * */ @Artifact -public class DuplicateNameResolutionTest extends AbstractDeclarativeTest +public class DuplicateNameResolutionTest extends AbstractJSR299Test { /** * Otherwise, if resolveByName() returned more than one Web Bean, throw an 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-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/ClientProxyTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -5,8 +5,8 @@ import javax.inject.manager.Bean; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; import org.testng.annotations.Test; /** @@ -15,7 +15,7 @@ * */ @Artifact -public class ClientProxyTest extends AbstractDeclarativeTest +public class ClientProxyTest extends AbstractJSR299Test { @Test Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unknown/UnknownBeanTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unknown/UnknownBeanTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unknown/UnknownBeanTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -3,12 +3,12 @@ import javax.inject.DefinitionException; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; import org.testng.annotations.Test; @Artifact -public class UnknownBeanTest extends AbstractDeclarativeTest +public class UnknownBeanTest extends AbstractJSR299Test { //TODO What is this trying to test, and where in the spec is the assertion? @Test(groups = {"configuration().getBeans()", "broken"}, expectedExceptions=DefinitionException.class) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/UnproxyableTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/UnproxyableTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/UnproxyableTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -3,14 +3,14 @@ import javax.inject.UnproxyableDependencyException; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; @Artifact @ExpectedDeploymentException(UnproxyableDependencyException.class) -public class UnproxyableTest extends AbstractDeclarativeTest +public class UnproxyableTest extends AbstractJSR299Test { @Test @SpecAssertion(section = "5.4.1", id = "ba") 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-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/el/ResolutionByNameTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.lookup.el; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; +import org.jboss.jsr299.tck.AbstractJSR299Test; import org.testng.annotations.Test; /** @@ -9,7 +9,7 @@ * Spec version: PRD2 * */ -public class ResolutionByNameTest extends AbstractDeclarativeTest +public class ResolutionByNameTest extends AbstractJSR299Test { @Test(groups={"stub", "el"}) @SpecAssertion(section="5.10", id = "ab") 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-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/InjectionTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -4,9 +4,9 @@ import javax.inject.DefinitionException; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.jsr299.BeansXml; +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; /** @@ -16,7 +16,7 @@ */ @Artifact @BeansXml("beans.xml") -public class InjectionTest extends AbstractDeclarativeTest +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-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/nullableBean/NullableBeanTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -3,14 +3,14 @@ import javax.inject.NullableDependencyException; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; @Artifact @ExpectedDeploymentException(NullableDependencyException.class) -public class NullableBeanTest extends AbstractDeclarativeTest +public class NullableBeanTest extends AbstractJSR299Test { 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-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/InjectionPointTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -32,9 +32,9 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.literals.CurrentBinding; +import org.jboss.testharness.impl.packaging.Artifact; import org.testng.annotations.Test; /** @@ -45,7 +45,7 @@ * Spec version: PRD2 */ @Artifact -public class InjectionPointTest extends AbstractDeclarativeTest +public class InjectionPointTest extends AbstractJSR299Test { @Test(groups = { "injectionPoint" }) 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-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/ManagerTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -1,8 +1,8 @@ package org.jboss.jsr299.tck.tests.lookup.manager; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; import org.testng.annotations.Test; /** @@ -11,7 +11,7 @@ * */ @Artifact -public class ManagerTest extends AbstractDeclarativeTest +public class ManagerTest extends AbstractJSR299Test { @Test(groups={"manager", "injection", "deployment"}) @SpecAssertion(section="5.7.2", id = "a") 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-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/jndi/ManagerTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -1,10 +1,10 @@ package org.jboss.jsr299.tck.tests.lookup.manager.jndi; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; +import org.jboss.jsr299.tck.AbstractJSR299Test; import org.testng.annotations.Test; -public class ManagerTest extends AbstractDeclarativeTest +public class ManagerTest extends AbstractJSR299Test { @Test(groups = { "stub", "manager", "ejb3", "integration" }) @SpecAssertion(section = "5.7.2", id = "b") Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/nonContextual/NonContextualInjectionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/nonContextual/NonContextualInjectionTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/nonContextual/NonContextualInjectionTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -1,11 +1,11 @@ package org.jboss.jsr299.tck.tests.lookup.nonContextual; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.IntegrationTest; -import org.jboss.jsr299.tck.impl.packaging.Packaging; -import org.jboss.jsr299.tck.impl.packaging.PackagingType; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.IntegrationTest; +import org.jboss.testharness.impl.packaging.Packaging; +import org.jboss.testharness.impl.packaging.PackagingType; import org.testng.annotations.Test; /** @@ -16,7 +16,7 @@ @Artifact @IntegrationTest @Packaging(PackagingType.EAR) -public class NonContextualInjectionTest extends AbstractDeclarativeTest +public class NonContextualInjectionTest extends AbstractJSR299Test { @Test(groups = { "integration", "stub" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/nonContextual/servlet/InjectionIntoServletTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/nonContextual/servlet/InjectionIntoServletTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/nonContextual/servlet/InjectionIntoServletTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -4,12 +4,12 @@ import org.apache.commons.httpclient.HttpMethod; import org.apache.commons.httpclient.methods.GetMethod; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.IntegrationTest; -import org.jboss.jsr299.tck.impl.packaging.Resource; -import org.jboss.jsr299.tck.impl.packaging.Resources; -import org.jboss.jsr299.tck.impl.packaging.war.WarArtifactDescriptor; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.IntegrationTest; +import org.jboss.testharness.impl.packaging.Resource; +import org.jboss.testharness.impl.packaging.Resources; +import org.jboss.testharness.impl.packaging.war.WarArtifactDescriptor; import org.testng.annotations.Test; @Artifact @@ -17,7 +17,7 @@ @Resources({ @Resource(destination=WarArtifactDescriptor.WEB_XML_DESTINATION, source="web.xml") }) -public class InjectionIntoServletTest extends AbstractDeclarativeTest +public class InjectionIntoServletTest extends AbstractJSR299Test { @Test(groups = { "ri-broken", "integration" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/InstantiationByTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/InstantiationByTypeTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/InstantiationByTypeTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -7,10 +7,10 @@ import javax.inject.UnsatisfiedDependencyException; import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.jsr299.BeansXml; +import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.literals.CurrentBinding; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.jsr299.BeansXml; import org.testng.annotations.Test; /** @@ -20,7 +20,7 @@ */ @Artifact @BeansXml("beans.xml") -public class InstantiationByTypeTest extends AbstractDeclarativeTest +public class InstantiationByTypeTest extends AbstractJSR299Test { @Test(groups={"resolution", "beanLifecycle"}) 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-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -12,10 +12,10 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.jsr299.BeansXml; +import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.literals.CurrentBinding; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.jsr299.BeansXml; import org.testng.annotations.Test; /** @@ -25,7 +25,7 @@ */ @Artifact @BeansXml("beans.xml") -public class ResolutionByTypeTest extends AbstractDeclarativeTest +public class ResolutionByTypeTest extends AbstractJSR299Test { @Test(groups="resolution") Added: tck/trunk/impl/src/main/resources/META-INF/web-beans-tck.properties =================================================================== --- tck/trunk/impl/src/main/resources/META-INF/web-beans-tck.properties (rev 0) +++ tck/trunk/impl/src/main/resources/META-INF/web-beans-tck.properties 2009-03-11 13:16:34 UTC (rev 1912) @@ -0,0 +1,2 @@ +org.jboss.testharness.api.ConfigurationBuilder=org.jboss.jsr299.tck.impl.JSR299PropertiesBasedConfigurationBuilder +org.jboss.testharness.testPackage=org.jboss.jsr299.tck.tests \ No newline at end of file Property changes on: tck/trunk/impl/src/main/resources/META-INF/web-beans-tck.properties ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/resources/org/jboss/testharness/impl/packaging/ear (from rev 1900, tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/impl/packaging/ear) Deleted: tck/trunk/impl/src/main/resources/org/jboss/testharness/impl/packaging/ear/ejb-jar.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/impl/packaging/ear/ejb-jar.xml 2009-03-10 08:35:42 UTC (rev 1900) +++ tck/trunk/impl/src/main/resources/org/jboss/testharness/impl/packaging/ear/ejb-jar.xml 2009-03-11 13:16:34 UTC (rev 1912) @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<ejb-jar xmlns="http://java.sun.com/xml/ns/javaee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd" - version="3.0"> - -</ejb-jar> Copied: tck/trunk/impl/src/main/resources/org/jboss/testharness/impl/packaging/ear/ejb-jar.xml (from rev 1910, tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/impl/packaging/ear/ejb-jar.xml) =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/testharness/impl/packaging/ear/ejb-jar.xml (rev 0) +++ tck/trunk/impl/src/main/resources/org/jboss/testharness/impl/packaging/ear/ejb-jar.xml 2009-03-11 13:16:34 UTC (rev 1912) @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ejb-jar xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd" + version="3.0"> + +</ejb-jar> Copied: tck/trunk/impl/src/main/resources/org/jboss/testharness/impl/packaging/jsr299/default (from rev 1900, tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/impl/packaging/jsr299/default) Deleted: tck/trunk/impl/src/main/resources/org/jboss/testharness/impl/packaging/jsr299/default/beans.xml =================================================================== Copied: tck/trunk/impl/src/main/resources/org/jboss/testharness/impl/packaging/jsr299/default/beans.xml (from rev 1910, tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/impl/packaging/jsr299/default/beans.xml) =================================================================== Modified: tck/trunk/impl/src/main/resources/tck-tests.xml =================================================================== --- tck/trunk/impl/src/main/resources/tck-tests.xml 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/main/resources/tck-tests.xml 2009-03-11 13:16:34 UTC (rev 1912) @@ -4,10 +4,10 @@ <test name="JSR-299 TCK" > <method-selectors> <method-selector> - <selector-class name="org.jboss.jsr299.tck.impl.testng.DisableIntegrationTestsMethodSelector" /> + <selector-class name="org.jboss.testharness.impl.testng.DisableIntegrationTestsMethodSelector" /> </method-selector> <method-selector> - <selector-class name="org.jboss.jsr299.tck.impl.testng.ExcludeIncontainerUnderInvestigationMethodSelector" /> + <selector-class name="org.jboss.testharness.impl.testng.ExcludeIncontainerUnderInvestigationMethodSelector" /> </method-selector> </method-selectors> <groups> Deleted: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/AbstractArtifactTest.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/AbstractArtifactTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/AbstractArtifactTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -1,134 +0,0 @@ -package org.jboss.jsr299.tck.test.impl.packaging; - -import java.io.BufferedInputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.FilenameFilter; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.OutputStream; -import java.io.Reader; -import java.util.Arrays; - -public abstract class AbstractArtifactTest -{ - - protected static final FilenameFilter WEB_INF_FILTER = new FilenameFilter() - { - public boolean accept(File dir, String name) - { - return name.equals("WEB-INF"); - } - }; - - protected static final FilenameFilter CLASSES_FILTER = new FilenameFilter() - { - public boolean accept(File dir, String name) - { - return name.equals("classes"); - } - }; - - protected static final FilenameFilter META_INF_FILTER = new FilenameFilter() - { - public boolean accept(File dir, String name) - { - return name.equals("META-INF"); - } - }; - - protected static final FilenameFilter BEANS_XML_FILTER = new FilenameFilter() - { - - public boolean accept(File dir, String name) - { - return name.equals("beans.xml"); - } - - }; - - - - protected static final FilenameFilter WEB_XML_FILTER = new FilenameFilter() - { - - public boolean accept(File dir, String name) - { - return name.equals("web.xml"); - } - - }; - - protected File getCurrentPackageAsFile(File root) - { - return getPackageAsFile(getClass().getPackage(), root); - } - - protected File getPackageAsFile(Package pkg, File root) - { - String[] packageHierarchy = pkg.getName().split("\\."); - for (final String packageName : packageHierarchy) - { - File[] files = root.listFiles(new FilenameFilter() - { - - public boolean accept(File dir, String name) - { - return name.equals(packageName); - } - - }); - if (files.length == 1) - { - root = files[0]; - } - else - { - throw new IllegalStateException("Unable to traverse package hierarchy " + Arrays.asList(packageHierarchy) + ", unable to open directory " + packageName); - } - } - return root; - } - - protected String readFile(File file) throws IOException - { - if (file.isFile()) - { - Reader reader = new InputStreamReader(new BufferedInputStream(new FileInputStream(file))); - StringBuffer buffer = new StringBuffer(1024); - char[] bytes = new char[1024]; - while (reader.read(bytes) > -1) - { - buffer.append(String.valueOf(bytes)); - } - reader.close(); - return buffer.toString(); - } - else - { - return null; - } - } - - protected static void copy(InputStream inputStream, File file) throws IOException - { - OutputStream os = new FileOutputStream(file); - try - { - byte[] buf = new byte[1024]; - int i = 0; - while ((i = inputStream.read(buf)) != -1) - { - os.write(buf, 0, i); - } - } - finally - { - os.close(); - } - - } - -} Deleted: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/Cow.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/Cow.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/Cow.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -1,6 +0,0 @@ -package org.jboss.jsr299.tck.test.impl.packaging.declarative.standalone; - -class Cow -{ - -} Deleted: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DeclarativeStandaloneTest.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DeclarativeStandaloneTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DeclarativeStandaloneTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -1,162 +0,0 @@ -package org.jboss.jsr299.tck.test.impl.packaging.declarative.standalone; - -import java.io.File; -import java.io.FilenameFilter; - -import org.jboss.jsr299.tck.api.Configuration; -import org.jboss.jsr299.tck.impl.packaging.ArtifactGenerator; -import org.jboss.jsr299.tck.impl.packaging.ear.EarArtifactDescriptor; -import org.jboss.jsr299.tck.impl.packaging.jsr299.TCKArtifactDescriptor; -import org.jboss.jsr299.tck.impl.packaging.war.WarArtifactDescriptor; -import org.jboss.jsr299.tck.test.impl.mock.MockConfiguration; -import org.jboss.jsr299.tck.test.impl.packaging.AbstractArtifactTest; -import org.testng.annotations.BeforeClass; -import org.testng.annotations.Test; - -public class DeclarativeStandaloneTest extends AbstractArtifactTest -{ - - private Configuration standaloneConfiguration; - private Configuration nonStandaloneConfiguration; - - @BeforeClass - public void beforeClass() - { - standaloneConfiguration = new MockConfiguration(); - standaloneConfiguration.setStandalone(true); - nonStandaloneConfiguration = new MockConfiguration(); - nonStandaloneConfiguration.setStandalone(false); - } - - @Test - public void testDefaultDeclartiveArtifact() throws Exception - { - TCKArtifactDescriptor artifact = new ArtifactGenerator(standaloneConfiguration).createArtifact(DummyTest.class); - assert artifact.getClass().equals(TCKArtifactDescriptor.class); - assert artifact.isUnit(); - File root = artifact.getExplodedJar(); - File currentPackage = getCurrentPackageAsFile(root); - File[] cowClasses = currentPackage.listFiles(new FilenameFilter() - { - - public boolean accept(File dir, String name) - { - return name.equals("Cow.class"); - } - - }); - assert cowClasses.length == 1; - assert cowClasses[0].getName().equals("Cow.class"); - assert cowClasses[0].isFile(); - File[] foxClasses = currentPackage.listFiles(new FilenameFilter() - { - - public boolean accept(File dir, String name) - { - return name.equals("Fox.class"); - } - - }); - assert foxClasses.length == 1; - assert foxClasses[0].getName().equals("Fox.class"); - assert foxClasses[0].isFile(); - - File[] testClasses = currentPackage.listFiles(new FilenameFilter() - { - - public boolean accept(File dir, String name) - { - return name.startsWith("DummyTest"); - } - - }); - assert testClasses.length == 1; - - assert root.listFiles(META_INF_FILTER).length == 1; - File metaInf = root.listFiles(META_INF_FILTER)[0]; - assert metaInf.listFiles().length == 1; - assert metaInf.listFiles(BEANS_XML_FILTER).length == 1; - assert metaInf.listFiles(BEANS_XML_FILTER)[0].length() == 0; - } - - @Test - public void testClassesSpecifiedArtifact() throws Exception - { - TCKArtifactDescriptor artifact = new ArtifactGenerator(standaloneConfiguration).createArtifact(DummyClassesSpecifiedTest.class); - File root = artifact.getExplodedJar(); - File currentPackage = getCurrentPackageAsFile(root); - assert currentPackage.listFiles().length == 1; - File[] subPackages = currentPackage.listFiles(new FilenameFilter() - { - - public boolean accept(File dir, String name) - { - return name.startsWith("subpackage"); - } - - }); - assert subPackages.length == 1; - File subPackage = subPackages[0]; - assert subPackage.listFiles().length == 1; - assert subPackage.listFiles()[0].getName().equals("Rat.class"); - } - - @Test - public void testResourcesSpecifiedArtifact() throws Exception - { - TCKArtifactDescriptor artifact = new ArtifactGenerator(standaloneConfiguration).createArtifact(DummyResourcesSpecifiedTest.class); - File root = artifact.getExplodedJar(); - assert root.listFiles(META_INF_FILTER).length == 1; - File metaInf = root.listFiles(META_INF_FILTER)[0]; - assert metaInf.listFiles(new FilenameFilter() - { - - public boolean accept(File dir, String name) - { - return name.equals("bar.xml"); - } - - }).length == 1; - } - - @Test - public void testIntegrationTestDeclartiveArtifact() throws Exception - { - TCKArtifactDescriptor artifact = new ArtifactGenerator(standaloneConfiguration).createArtifact(DummyIntegrationTest.class); - assert !artifact.isUnit(); - } - - @Test - public void testCustomBeansXml() throws Exception - { - TCKArtifactDescriptor artifact = new ArtifactGenerator(standaloneConfiguration).createArtifact(DummyCustomBeansXmlTest.class); - File root = artifact.getExplodedJar(); - File metaInf = root.listFiles(META_INF_FILTER)[0]; - assert metaInf.listFiles(BEANS_XML_FILTER).length == 1; - assert metaInf.listFiles(BEANS_XML_FILTER)[0].length() != 0; - String beans = readFile(metaInf.listFiles(BEANS_XML_FILTER)[0]); - assert beans.startsWith("<my></my>"); - } - - @Test - public void testEjbTestDeclartiveArtifact() throws Exception - { - TCKArtifactDescriptor artifact = new ArtifactGenerator(nonStandaloneConfiguration).createArtifact(DummyEjbTest.class); - assert artifact.getClass().equals(EarArtifactDescriptor.class); - } - - @Test - public void testStandaloneEjbTestDeclartiveArtifact() throws Exception - { - TCKArtifactDescriptor artifact = new ArtifactGenerator(standaloneConfiguration).createArtifact(DummyEjbTest.class); - assert artifact.getClass().equals(TCKArtifactDescriptor.class); - } - - @Test - public void testWarDeclarativePackaging() - { - TCKArtifactDescriptor artifact = new ArtifactGenerator(nonStandaloneConfiguration).createArtifact(DummyWarUnitTest.class); - assert artifact.getClass().equals(WarArtifactDescriptor.class); - } - -} Deleted: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DummyClassesSpecifiedTest.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DummyClassesSpecifiedTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DummyClassesSpecifiedTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -1,18 +0,0 @@ -package org.jboss.jsr299.tck.test.impl.packaging.declarative.standalone; - -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.Classes; -import org.jboss.jsr299.tck.test.impl.packaging.declarative.standalone.subpackage.Rat; - - -@Artifact(addCurrentPackage=false) -(a)Classes(Rat.class) -class DummyClassesSpecifiedTest -{ - - public void test() - { - assert true; - } - -} Deleted: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DummyCustomBeansXmlTest.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DummyCustomBeansXmlTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DummyCustomBeansXmlTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -1,16 +0,0 @@ -package org.jboss.jsr299.tck.test.impl.packaging.declarative.standalone; - -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.jsr299.BeansXml; - - -@Artifact @BeansXml(value="my-web-beans.xml") -class DummyCustomBeansXmlTest -{ - - public void test() - { - assert true; - } - -} Deleted: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DummyEjbTest.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DummyEjbTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DummyEjbTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -1,17 +0,0 @@ -package org.jboss.jsr299.tck.test.impl.packaging.declarative.standalone; - -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.Packaging; -import org.jboss.jsr299.tck.impl.packaging.PackagingType; - - -@Artifact @Packaging(PackagingType.EAR) -class DummyEjbTest -{ - - public void test() - { - assert true; - } - -} Deleted: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DummyIntegrationTest.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DummyIntegrationTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DummyIntegrationTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -1,17 +0,0 @@ -package org.jboss.jsr299.tck.test.impl.packaging.declarative.standalone; - -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.IntegrationTest; - - -@Artifact -@IntegrationTest -class DummyIntegrationTest -{ - - public void test() - { - assert true; - } - -} Deleted: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DummyResourcesSpecifiedTest.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DummyResourcesSpecifiedTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DummyResourcesSpecifiedTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -1,18 +0,0 @@ -package org.jboss.jsr299.tck.test.impl.packaging.declarative.standalone; - -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.Resource; -import org.jboss.jsr299.tck.impl.packaging.Resources; - - -@Artifact(addCurrentPackage=false) -@Resources(value=@Resource(destination = "/META-INF/bar.xml", source="foo/foo.xml")) -class DummyResourcesSpecifiedTest -{ - - public void test() - { - assert true; - } - -} Deleted: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DummyTest.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DummyTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DummyTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -1,15 +0,0 @@ -package org.jboss.jsr299.tck.test.impl.packaging.declarative.standalone; - -import org.jboss.jsr299.tck.impl.packaging.Artifact; - - -@Artifact -class DummyTest -{ - - public void test() - { - assert true; - } - -} Deleted: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DummyWarUnitTest.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DummyWarUnitTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DummyWarUnitTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -1,18 +0,0 @@ -package org.jboss.jsr299.tck.test.impl.packaging.declarative.standalone; - -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.Packaging; -import org.jboss.jsr299.tck.impl.packaging.PackagingType; - - -@Artifact -(a)Packaging(PackagingType.WAR) -class DummyWarUnitTest -{ - - public void test() - { - assert true; - } - -} Deleted: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/Fox.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/Fox.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/Fox.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -1,6 +0,0 @@ -package org.jboss.jsr299.tck.test.impl.packaging.declarative.standalone; - -class Fox -{ - -} Deleted: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/subpackages/Cow.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/subpackages/Cow.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/subpackages/Cow.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -1,6 +0,0 @@ -package org.jboss.jsr299.tck.test.impl.packaging.descriptors.subpackages; - -class Cow -{ - -} Deleted: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/subpackages/SubpackagesArtifactTest.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/subpackages/SubpackagesArtifactTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/subpackages/SubpackagesArtifactTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -1,46 +0,0 @@ -package org.jboss.jsr299.tck.test.impl.packaging.descriptors.subpackages; - -import java.io.File; -import java.io.FilenameFilter; - -import org.jboss.jsr299.tck.impl.packaging.ArtifactDescriptor; -import org.jboss.jsr299.tck.test.impl.packaging.AbstractArtifactTest; -import org.testng.annotations.Test; - -public class SubpackagesArtifactTest extends AbstractArtifactTest -{ - - @Test - public void testAllClassesInPackageAndNotSubPackages() throws Exception - { - ArtifactDescriptor artifactDescriptor = new ArtifactDescriptor(null); - artifactDescriptor.addPackage(SubpackagesArtifactTest.class.getPackage()); - File root = artifactDescriptor.getExplodedJar(); - File currentPackage = getCurrentPackageAsFile(root); - assert currentPackage.listFiles().length == 4; - File[] cowClasses = currentPackage.listFiles(new FilenameFilter() - { - - public boolean accept(File dir, String name) - { - return name.equals("Cow.class"); - } - - }); - assert cowClasses.length == 1; - assert cowClasses[0].getName().equals("Cow.class"); - assert cowClasses[0].isFile(); - - File[] testClasses = currentPackage.listFiles(new FilenameFilter() - { - - public boolean accept(File dir, String name) - { - return name.startsWith("SubpackagesArtifactTest"); - } - - }); - assert testClasses.length == 3; - } - -} Deleted: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/scanner/ArtifactScannerTest.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/scanner/ArtifactScannerTest.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/scanner/ArtifactScannerTest.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -1,54 +0,0 @@ -package org.jboss.jsr299.tck.test.impl.packaging.scanner; - -import java.util.List; -import java.util.Set; - -import org.jboss.jsr299.tck.api.Configuration; -import org.jboss.jsr299.tck.impl.packaging.ArtifactDescriptor; -import org.jboss.jsr299.tck.impl.packaging.ArtifactGenerator; -import org.jboss.jsr299.tck.impl.packaging.ArtifactScanner; -import org.jboss.jsr299.tck.test.impl.mock.MockConfiguration; -import org.jboss.jsr299.tck.test.impl.packaging.scanner.subpackage.AnotherDummyArtifact; -import org.jboss.jsr299.tck.test.impl.packaging.scanner.subpackage.NotAnArtifact; -import org.testng.annotations.Test; - -public class ArtifactScannerTest -{ - - @Test - public void testScanner() - { - ArtifactScanner scanner = new ArtifactScanner(ArtifactScannerTest.class.getPackage().getName(), null); - Set<Class<?>> classes = scanner.getClasses(); - assert classes.contains(DummyArtifact.class); - assert classes.contains(AnotherDummyArtifact.class); - assert !classes.contains(NotAnArtifact.class); - } - - @Test - public void testMockArtifactGenerator() throws Exception - { - Configuration configuration = new MockConfiguration(); - ArtifactGenerator generator = new ArtifactGenerator(configuration); - List<ArtifactDescriptor> artifacts = generator.createArtifacts(DummyArtifact.class.getPackage().getName()); - assert artifacts.size() == 2; - for (ArtifactDescriptor artifact : artifacts) - { - if (artifact.getDeclaringClass().equals(DummyArtifact.class)) - { - assert artifact.getClasses().contains(ArtifactScannerTest.class); - assert artifact.getClasses().contains(DummyArtifact.class); - assert !artifact.getClasses().contains(AnotherDummyArtifact.class); - assert !artifact.getClasses().contains(NotAnArtifact.class); - } - if (artifact.getDeclaringClass().equals(AnotherDummyArtifact.class)) - { - assert !artifact.getClasses().contains(ArtifactScannerTest.class); - assert !artifact.getClasses().contains(DummyArtifact.class); - assert artifact.getClasses().contains(AnotherDummyArtifact.class); - assert artifact.getClasses().contains(NotAnArtifact.class); - } - } - } - -} Deleted: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/scanner/DummyArtifact.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/scanner/DummyArtifact.java 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/scanner/DummyArtifact.java 2009-03-11 13:16:34 UTC (rev 1912) @@ -1,9 +0,0 @@ -package org.jboss.jsr299.tck.test.impl.packaging.scanner; - -import org.jboss.jsr299.tck.impl.packaging.Artifact; - -@Artifact -public class DummyArtifact -{ - -} Deleted: tck/trunk/impl/src/test/resources/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/my-web-beans.xml =================================================================== --- tck/trunk/impl/src/test/resources/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/my-web-beans.xml 2009-03-11 13:06:00 UTC (rev 1911) +++ tck/trunk/impl/src/test/resources/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/my-web-beans.xml 2009-03-11 13:16:34 UTC (rev 1912) @@ -1 +0,0 @@ -<my></my> \ No newline at end of file