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

Author: pete.muir(a)jboss.org Date: 2009-06-23 10:42:20 -0400 (Tue, 23 Jun 2009) New Revision: 2867 Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/DefinitionError.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/DeploymentError.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken3/FooException.java tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/definition/stereotype/broken2/ Removed: tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/DefinitionError.java tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/DeploymentError.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanOrmMappedPackageTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanOrmMappedTest.java tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyDeployElements/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/simple/definition/mock-orm.xml tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/simple/definition/package-mock-orm.xml Modified: tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/Managers.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.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/definition/deployment/broken/nonBuiltInUsesStandard/NonBuiltInUsesStandardTest.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/TooManyProducerFieldDeploymentTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerMethod/TooManyProducerMethodDeploymentTest.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/scope/broken1/IncompatibleStereotypesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken1/ResolvedIncompatibleStereotypesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken2/TooManyScopesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken3/NonEmptyNamedTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken1/MultipleStereotypesWithMultipleScopeTypesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken1/ResolvedMultipleStereotypesWithMultipleScopeTypesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken3/TooManyDeploymentTypesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken4/TooManyScopeTypesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken5/StereoTypeWithBindingTypesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken1/DeploymentFailureTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken2/AfterBeanDiscoveryFailureTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken3/AfterBeanDiscoveryObserverExecutionFailureTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken3/BeanDiscoveryObserver.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken4/AfterDeploymentValidationObserverExecutionFailureTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken5/AddDefinitionErrorTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken6/AddDeploymentProblemTest.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/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/observer3a/ObserverMethodAndTypeVariableEventTypeTest.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/implementation/disposal/method/definition/broken1/MultipleDisposeParametersDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken2/ProducesUnallowedDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken3/InitializerUnallowedDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken4/ObserverParameterUnallowedDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken6/DisposalMethodOnSessionBean.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/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/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/producer/field/definition/parameterizedReturnTypeWithWildcard/ParameterizedReturnTypeWithWildcardTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/enterprise/nonbusiness/ProducerMethodNotBusinessMethodTest.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/parametermizedTypeWithTypeParameter2/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/constructorHasDisposesParameter/ConstructorHasDisposesParameterTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasObservesParameter/ConstructorHasObservesParameterTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/dependentWithPublicField/DependentWithPublicFieldTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/tooManyInitializerAnnotatedConstructors/TooManyInitializerAnnotatedConstructorsTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/newAndOtherBindingType/NewAndOtherBindingTypeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/InvalidEnterpriseBeanSpecializationTest.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/producer/method/indirectOverride/IndirectOverrideTest.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/simple/broken/extendejb/SpecializingBeanExtendsEnterpriseBeanTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/SpecializingAndSpecializedBeanHasNameTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/SpecializingBeanImplementsInterfaceOnly.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/SpecializingBeanExtendsNothingTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/SpecializingClassExtendsNonSimpleBeanTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/application/web.xml tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/request/web.xml tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/session/web.xml tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/beans.xml Log: lots of fixes for i/c Deleted: tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/DefinitionError.java =================================================================== --- tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/DefinitionError.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/DefinitionError.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -1,11 +0,0 @@ -package org.jboss.jsr299.tck.api; - -/** - * A category exception which can be declared in the @ExpectedDeploymentException - * annotation of an @Artifact to detect a definition error as described in - * Section 12.4, "Problems detected automatically by the container". - * - * @see org.jboss.jsr299.tck.spi.Managers#isDefinitionError(Throwable) - */ -public class DefinitionError extends RuntimeException { -} Deleted: tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/DeploymentError.java =================================================================== --- tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/DeploymentError.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/DeploymentError.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -1,11 +0,0 @@ -package org.jboss.jsr299.tck.api; - -/** - * A category exception which can be declared in the @ExpectedDeploymentException - * annotation of an @Artifact to detect a deployment error as described in - * Section 12.4, "Problems detected automatically by the container". - * - * @see org.jboss.jsr299.tck.spi.Managers#isDeploymentError(Throwable) - */ -public class DeploymentError extends RuntimeException { -} Modified: tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/Managers.java =================================================================== --- tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/Managers.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/Managers.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -5,46 +5,57 @@ import javax.enterprise.inject.spi.BeanManager; +import org.jboss.testharness.api.DeploymentException; + /** * This interface provides operations relating to a Manager. * - * The TCK porting package must provide an implementation of this interface which is - * suitable for the target implementation. + * The TCK porting package must provide an implementation of this interface + * which is suitable for the target implementation. * * @author Shane Bryzak */ public interface Managers { - + public static final String PROPERTY_NAME = Managers.class.getName(); - + /** * Get a new Manager instance * * @return the Manager */ public BeanManager getManager(); - + /** * Returns a list of the enabled deployment types for the current manager * * @return */ List<Class<? extends Annotation>> getEnabledDeploymentTypes(); - + /** - * Checks whether the throwable is a definition error, as described - * in Section 12.4, "Problems detected automatically by the container". + * Checks whether there is a definition error, as described in Section 12.4, + * "Problems detected automatically by the container". * - * @return true if the throwable reports a definition error + * @param deploymentException the deployment exception context provided by + * the deployment which is in error. The deployment is not required + * to provide a deploymentException, even if the deployment is in + * error + * @return true if there is a definition error */ - public boolean isDefinitionError(Throwable throwable); + public boolean isDefinitionError(DeploymentException deploymentException); /** - * Checks whether the throwable is a deployment error, as described - * in Section 12.4, "Problems detected automatically by the container". + * Checks whether there is a deployment error, as described in Section 12.4, + * "Problems detected automatically by the container". * - * @return true if the throwable reports a deployment error + * @param deploymentException the deployment exception context provided by + * the deployment which is in error. The deployment is not required + * to provide a deploymentException, even if the deployment is in + * error + * @return true if there is a deployment error */ - public boolean isDeploymentError(Throwable throwable); + public boolean isDeploymentError(DeploymentException deploymentException); + } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -16,28 +16,26 @@ import javax.enterprise.inject.spi.Bean; import javax.enterprise.inject.spi.BeanManager; -import org.jboss.jsr299.tck.api.DefinitionError; -import org.jboss.jsr299.tck.api.DeploymentError; import org.jboss.jsr299.tck.api.JSR299Configuration; import org.jboss.jsr299.tck.impl.JSR299ConfigurationImpl; import org.jboss.jsr299.tck.impl.OldSPIBridge; 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 @@ -50,24 +48,24 @@ cleanup(); } } - + protected JSR299Configuration getCurrentConfiguration() { return JSR299ConfigurationImpl.get(); } - + protected abstract void execute() throws Exception; - + } - + private BeanManager currentManager; - + protected void setCurrentManager(BeanManager currentManager) { this.currentManager = currentManager; } - + protected BeanManager getCurrentManager() { return currentManager; @@ -101,27 +99,27 @@ { getCurrentConfiguration().getContexts().destroyContext(context); } - + @Override 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 * @@ -146,12 +144,12 @@ } return annotationTypeList.size() == 0; } - + public <T> Set<Bean<T>> getBeans(Class<T> type, Annotation... bindings) { return (Set) getCurrentManager().getBeans(type, bindings); } - + public <T> Set<Bean<T>> getBeans(TypeLiteral<T> type, Annotation... bindings) { return (Set)getCurrentManager().getBeans(type.getType(), bindings); @@ -161,17 +159,17 @@ { return OldSPIBridge.getInstanceByType(getCurrentManager(), beanType, bindings); } - + public <T> T getInstanceByType(TypeLiteral<T> beanType, Annotation... bindings) { return OldSPIBridge.getInstanceByType(getCurrentManager(), beanType, bindings); } - + public Object getInstanceByName(String name) { return OldSPIBridge.getInstanceByName(getCurrentManager(), name); } - + /** * Create a bean instance. This method abstracts the TCK * from having to manage the CreationalContext @@ -184,7 +182,7 @@ { return getCurrentConfiguration().getBeans().createBeanInstance(bean); } - + /** * Destroy a bean instance. This method abstracts the TCK * from having to manage the CreationalContext @@ -199,17 +197,19 @@ } @Override - protected boolean isThrowablePresent(Class<? extends Throwable> throwableType, Throwable throwable) + protected org.jboss.testharness.api.DeploymentException handleDeploymentFailure(org.jboss.testharness.api.DeploymentException deploymentException) { - if (throwableType.equals(DefinitionError.class) && getCurrentConfiguration().getManagers().isDefinitionError(throwable)) + if (getCurrentConfiguration().getManagers().isDefinitionError(deploymentException)) { - return true; + return new org.jboss.testharness.api.DeploymentException(deploymentException, new DefinitionError(deploymentException.getCause())); } - else if (throwableType.equals(DeploymentError.class) && getCurrentConfiguration().getManagers().isDeploymentError(throwable)) + else if (getCurrentConfiguration().getManagers().isDeploymentError(deploymentException)) { - return true; + return new org.jboss.testharness.api.DeploymentException(deploymentException, new DeploymentError(deploymentException.getCause())); } - - return super.isThrowablePresent(throwableType, throwable); + else + { + return deploymentException; + } } } Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/DefinitionError.java (from rev 2862, tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/DefinitionError.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/DefinitionError.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/DefinitionError.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -0,0 +1,35 @@ +package org.jboss.jsr299.tck; + +/** + * A category exception which can be declared in the @ExpectedDeploymentException + * annotation of an @Artifact to detect a definition error as described in + * Section 12.4, "Problems detected automatically by the container". + * + * @see org.jboss.jsr299.tck.spi.Managers#isDefinitionError(Throwable) + */ +public class DefinitionError extends RuntimeException +{ + + public DefinitionError() + { + super(); + } + + public DefinitionError(String message, Throwable cause) + { + super(message, cause); + } + + public DefinitionError(String message) + { + super(message); + } + + public DefinitionError(Throwable cause) + { + super(cause); + } + + + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/DeploymentError.java (from rev 2862, tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/DeploymentError.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/DeploymentError.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/DeploymentError.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -0,0 +1,35 @@ +package org.jboss.jsr299.tck; + +/** + * A category exception which can be declared in the @ExpectedDeploymentException + * annotation of an @Artifact to detect a deployment error as described in + * Section 12.4, "Problems detected automatically by the container". + * + * @see org.jboss.jsr299.tck.spi.Managers#isDeploymentError(Throwable) + */ +public class DeploymentError extends RuntimeException +{ + + public DeploymentError() + { + super(); + } + + public DeploymentError(String message, Throwable cause) + { + super(message, cause); + } + + public DeploymentError(String message) + { + super(message); + } + + public DeploymentError(Throwable cause) + { + super(cause); + } + + + +} 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-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken2/NonSerializableTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -3,9 +3,9 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; -import org.jboss.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/nonBuiltInUsesStandard/NonBuiltInUsesStandardTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/nonBuiltInUsesStandard/NonBuiltInUsesStandardTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/nonBuiltInUsesStandard/NonBuiltInUsesStandardTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -3,7 +3,7 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.api.DefinitionError; +import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; 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-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/TooManyDeploymentTypesTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -20,9 +20,9 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; -import org.jboss.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerField/TooManyProducerFieldDeploymentTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerField/TooManyProducerFieldDeploymentTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerField/TooManyProducerFieldDeploymentTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -3,9 +3,9 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; -import org.jboss.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerMethod/TooManyProducerMethodDeploymentTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerMethod/TooManyProducerMethodDeploymentTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerMethod/TooManyProducerMethodDeploymentTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -3,9 +3,9 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; -import org.jboss.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; /** 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-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/typevariable/ParameterizedTypeInjectionTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -3,7 +3,7 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.api.DefinitionError; +import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; 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-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/wildcard/WildcardTypeInjectionTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -3,9 +3,9 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; -import org.jboss.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken1/IncompatibleStereotypesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken1/IncompatibleStereotypesTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken1/IncompatibleStereotypesTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -3,17 +3,17 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.Classes; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; -import org.jboss.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; /** * Spec version: 20090519 */ @Artifact(addCurrentPackage = false) -@Classes( { AnimalStereotype.class, FishStereotype.class, Scallop_Broken.class }) +@Classes( { AnimalStereotype.class, FishStereotype.class, Scallop_Broken.class, IncompatibleStereotypesTest.class }) @ExpectedDeploymentException(DefinitionError.class) public class IncompatibleStereotypesTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken1/ResolvedIncompatibleStereotypesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken1/ResolvedIncompatibleStereotypesTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken1/ResolvedIncompatibleStereotypesTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -11,7 +11,7 @@ * Spec version: 20090519 */ @Artifact(addCurrentPackage = false) -@Classes( { AnimalStereotype.class, FishStereotype.class, Scallop.class }) +@Classes( { AnimalStereotype.class, FishStereotype.class, Scallop.class, ResolvedIncompatibleStereotypesTest.class }) public class ResolvedIncompatibleStereotypesTest extends AbstractJSR299Test { @Test Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken2/TooManyScopesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken2/TooManyScopesTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken2/TooManyScopesTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -3,9 +3,9 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; -import org.jboss.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken3/NonEmptyNamedTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken3/NonEmptyNamedTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken3/NonEmptyNamedTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -4,9 +4,9 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; -import org.jboss.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken1/MultipleStereotypesWithMultipleScopeTypesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken1/MultipleStereotypesWithMultipleScopeTypesTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken1/MultipleStereotypesWithMultipleScopeTypesTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -4,17 +4,17 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.Classes; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; -import org.jboss.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; /** * Spec version: 20090519 */ @Artifact(addCurrentPackage = false) -@Classes( { ApplicationScopedHornedMammalStereotype.class, SessionScopedHornedMammalStereotype.class, Deer_Broken.class }) +@Classes( { ApplicationScopedHornedMammalStereotype.class, SessionScopedHornedMammalStereotype.class, Deer_Broken.class, MultipleStereotypesWithMultipleScopeTypesTest.class }) @ExpectedDeploymentException(DefinitionError.class) public class MultipleStereotypesWithMultipleScopeTypesTest extends AbstractJSR299Test { @@ -25,6 +25,6 @@ { assert false; } - + } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken1/ResolvedMultipleStereotypesWithMultipleScopeTypesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken1/ResolvedMultipleStereotypesWithMultipleScopeTypesTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken1/ResolvedMultipleStereotypesWithMultipleScopeTypesTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -11,7 +11,7 @@ * Spec version: 20090519 */ @Artifact(addCurrentPackage = false) -@Classes( { ApplicationScopedHornedMammalStereotype.class, SessionScopedHornedMammalStereotype.class, Deer.class }) +@Classes( { ApplicationScopedHornedMammalStereotype.class, SessionScopedHornedMammalStereotype.class, Deer.class, ResolvedMultipleStereotypesWithMultipleScopeTypesTest.class }) public class ResolvedMultipleStereotypesWithMultipleScopeTypesTest extends AbstractJSR299Test { @@ -21,6 +21,6 @@ { assert true; } - + } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken3/TooManyDeploymentTypesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken3/TooManyDeploymentTypesTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken3/TooManyDeploymentTypesTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -3,9 +3,9 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; -import org.jboss.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken4/TooManyScopeTypesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken4/TooManyScopeTypesTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken4/TooManyScopeTypesTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -3,9 +3,9 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; -import org.jboss.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken5/StereoTypeWithBindingTypesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken5/StereoTypeWithBindingTypesTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken5/StereoTypeWithBindingTypesTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -3,9 +3,9 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; -import org.jboss.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken1/DeploymentFailureTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken1/DeploymentFailureTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken1/DeploymentFailureTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -3,7 +3,7 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.api.DefinitionError; +import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.jboss.testharness.impl.packaging.Packaging; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken2/AfterBeanDiscoveryFailureTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken2/AfterBeanDiscoveryFailureTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken2/AfterBeanDiscoveryFailureTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -24,7 +24,6 @@ import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; -import org.testng.annotations.AfterClass; import org.testng.annotations.Test; /** @@ -52,13 +51,13 @@ { assert false; } - - @Override - @AfterClass(alwaysRun = true, groups = "scaffold") - public void afterClass() throws Exception - { - super.afterClass(); - assert BeanDiscoveryObserver.isManagerInitialized(); - } - + + // @Override + // @AfterClass(alwaysRun = true, groups = "scaffold") + // public void afterClass() throws Exception + // { + // super.afterClass(); + // assert BeanDiscoveryObserver.isManagerInitialized(); + // } + } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken3/AfterBeanDiscoveryObserverExecutionFailureTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken3/AfterBeanDiscoveryObserverExecutionFailureTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken3/AfterBeanDiscoveryObserverExecutionFailureTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -2,7 +2,7 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.api.DefinitionError; +import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; @@ -20,7 +20,7 @@ @ExpectedDeploymentException(DefinitionError.class) public class AfterBeanDiscoveryObserverExecutionFailureTest extends AbstractJSR299Test { - @Test + @Test(groups="incontainer-ri-broken") @SpecAssertion(section = "11.5.2", id = "d") public void testObserverFailureTreatedAsDefinitionError() { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken3/BeanDiscoveryObserver.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken3/BeanDiscoveryObserver.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken3/BeanDiscoveryObserver.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -7,6 +7,6 @@ { public void afterBeanDiscovery(@Observes AfterBeanDiscovery event) { - throw new AssertionError("This error should be treated as a definition error"); + throw new FooException("This error should be treated as a definition error"); } } Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken3/FooException.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken3/FooException.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken3/FooException.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -0,0 +1,50 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.jsr299.tck.tests.deployment.lifecycle.broken3; + +/** + * @author pmuir + * + */ +public class FooException extends RuntimeException +{ + + public FooException() + { + super(); + // TODO Auto-generated constructor stub + } + + public FooException(String arg0, Throwable arg1) + { + super(arg0, arg1); + // TODO Auto-generated constructor stub + } + + public FooException(String arg0) + { + super(arg0); + // TODO Auto-generated constructor stub + } + + public FooException(Throwable arg0) + { + super(arg0); + // TODO Auto-generated constructor stub + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken3/FooException.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken4/AfterDeploymentValidationObserverExecutionFailureTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken4/AfterDeploymentValidationObserverExecutionFailureTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken4/AfterDeploymentValidationObserverExecutionFailureTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -19,7 +19,7 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.api.DeploymentError; +import org.jboss.jsr299.tck.DeploymentError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; @@ -37,7 +37,7 @@ @ExpectedDeploymentException(DeploymentError.class) public class AfterDeploymentValidationObserverExecutionFailureTest extends AbstractJSR299Test { - @Test + @Test(groups="ri-incontainer-broken") @SpecAssertion(section = "11.5.3", id = "c") public void testObserverFailureTreatedAsDeploymentError() { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken5/AddDefinitionErrorTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken5/AddDefinitionErrorTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken5/AddDefinitionErrorTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -2,10 +2,9 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.api.DefinitionError; +import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; -import org.testng.annotations.AfterClass; import org.testng.annotations.Test; /** @@ -21,18 +20,18 @@ @ExpectedDeploymentException(DefinitionError.class) public class AddDefinitionErrorTest extends AbstractJSR299Test { - @Test + @Test(groups="ri-incontainer-broken") @SpecAssertion(section = "11.5.2", id = "c") public void testObserverDefinitionErrorTreatedAsDefinitionError() { assert false; } - - @Override - @AfterClass(alwaysRun = true, groups = "scaffold") - public void afterClass() throws Exception - { - super.afterClass(); - assert BeanDiscoveryObserver.getInvocationCount() == 2 : "All AfterBeanDiscovery observer methods should have been called"; - } + + // @Override + // @AfterClass(alwaysRun = true, groups = "scaffold") + // public void afterClass() throws Exception + // { + // super.afterClass(); + // assert BeanDiscoveryObserver.getInvocationCount() == 2 : "All AfterBeanDiscovery observer methods should have been called"; + // } } \ No newline at end of file Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken6/AddDeploymentProblemTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken6/AddDeploymentProblemTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken6/AddDeploymentProblemTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -19,10 +19,9 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.api.DeploymentError; +import org.jboss.jsr299.tck.DeploymentError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; -import org.testng.annotations.AfterClass; import org.testng.annotations.Test; /** @@ -39,19 +38,19 @@ @ExpectedDeploymentException(DeploymentError.class) public class AddDeploymentProblemTest extends AbstractJSR299Test { - @Test + @Test(groups="incontainer-ri-broken") @SpecAssertion(section = "11.5.3", id = "b") public void testObserverDeploymentProblemTreatedAsDeploymentError() { assert false; } - @Override - @AfterClass(alwaysRun = true, groups = "scaffold") - public void afterClass() throws Exception - { - super.afterClass(); - assert BeanDiscoveryObserver.getInvocationCount() == 2 : "All AfterDeploymentValidation observer methods should have been called"; - } - + // @Override + // @AfterClass(alwaysRun = true, groups = "scaffold") + // public void afterClass() throws Exception + // { + // super.afterClass(); + // assert BeanDiscoveryObserver.getInvocationCount() == 2 : "All AfterDeploymentValidation observer methods should have been called"; + // } + } 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-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/event1/FiresOnNonEventTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -20,7 +20,7 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.api.DefinitionError; +import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; 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-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/event2/FiresOnEventWithoutTypeTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -20,9 +20,9 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; -import org.jboss.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; /** 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-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/event3/FiresOnEventWithWildcardTypeTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -20,9 +20,9 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; -import org.jboss.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; /** 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-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/event4/FiresOnEventWithTypeVariableTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -20,9 +20,9 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; -import org.jboss.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; /** 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-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/jms1/MappedEventObserversAsynchronousTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -21,7 +21,7 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; -import org.jboss.jsr299.tck.api.DefinitionError; +import org.jboss.jsr299.tck.DefinitionError; 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-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer1/EJBObserverMethodNotBusinessMethodTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -21,11 +21,11 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.jboss.testharness.impl.packaging.Packaging; import org.jboss.testharness.impl.packaging.PackagingType; -import org.jboss.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; /** 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-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer2/ObserverMethodWithTwoEventParametersTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -4,9 +4,9 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; -import org.jboss.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; @Artifact 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-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer3/ObserverMethodAndWildcardedEventTypeTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -20,9 +20,9 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; -import org.jboss.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer3a/ObserverMethodAndTypeVariableEventTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer3a/ObserverMethodAndTypeVariableEventTypeTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer3a/ObserverMethodAndTypeVariableEventTypeTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -20,9 +20,9 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; -import org.jboss.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; /** 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-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer4/ObserverMethodAnnotatedProducesTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -20,9 +20,9 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; -import org.jboss.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; /** 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-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer5/ObserverMethodAnnotatedInitialzerTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -20,9 +20,9 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; -import org.jboss.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; /** 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-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer6/ObserverMethodAnnotatedDisposesTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -20,9 +20,9 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; -import org.jboss.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; /** 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-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer7/TransactionalObserverMethodOnlyOnePhaseTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -20,9 +20,9 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; -import org.jboss.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; /** 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-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer8/AsynchronousBeforeCompletionObserverTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -18,7 +18,7 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.api.DefinitionError; +import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken1/MultipleDisposeParametersDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken1/MultipleDisposeParametersDefinitionTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken1/MultipleDisposeParametersDefinitionTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -4,10 +4,10 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.jboss.testharness.impl.packaging.jsr299.BeansXml; -import org.jboss.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken2/ProducesUnallowedDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken2/ProducesUnallowedDefinitionTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken2/ProducesUnallowedDefinitionTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -3,9 +3,9 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; -import org.jboss.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken3/InitializerUnallowedDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken3/InitializerUnallowedDefinitionTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken3/InitializerUnallowedDefinitionTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -3,10 +3,10 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.jboss.testharness.impl.packaging.jsr299.BeansXml; -import org.jboss.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken4/ObserverParameterUnallowedDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken4/ObserverParameterUnallowedDefinitionTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken4/ObserverParameterUnallowedDefinitionTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -3,10 +3,10 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.jboss.testharness.impl.packaging.jsr299.BeansXml; -import org.jboss.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken6/DisposalMethodOnSessionBean.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken6/DisposalMethodOnSessionBean.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken6/DisposalMethodOnSessionBean.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -4,12 +4,12 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.jboss.testharness.impl.packaging.IntegrationTest; import org.jboss.testharness.impl.packaging.Packaging; import org.jboss.testharness.impl.packaging.PackagingType; -import org.jboss.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; @Artifact 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-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newAndOtherBinding/NewAndOtherBindingTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -3,9 +3,9 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; -import org.jboss.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; @Artifact 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-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/singletonWithConversationScope/SingletonWithConversationScopeTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -3,11 +3,11 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.jboss.testharness.impl.packaging.Packaging; import org.jboss.testharness.impl.packaging.PackagingType; -import org.jboss.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; @ExpectedDeploymentException(DefinitionError.class) 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-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/singletonWithRequestScope/SingletonWithRequestScopeTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -3,11 +3,11 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.jboss.testharness.impl.packaging.Packaging; import org.jboss.testharness.impl.packaging.PackagingType; -import org.jboss.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; @Artifact 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-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/singletonWithSessionScope/SingletonWithSessionScopeTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -3,11 +3,11 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.jboss.testharness.impl.packaging.Packaging; import org.jboss.testharness.impl.packaging.PackagingType; -import org.jboss.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; @Artifact 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-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithApplicationScope/StatelessWithApplicationScopeTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -3,11 +3,11 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.jboss.testharness.impl.packaging.Packaging; import org.jboss.testharness.impl.packaging.PackagingType; -import org.jboss.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; @Artifact 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-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithConversationScope/StatelessWithConversationScopeTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -3,11 +3,11 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.jboss.testharness.impl.packaging.Packaging; import org.jboss.testharness.impl.packaging.PackagingType; -import org.jboss.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; @Artifact 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-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithRequestScope/StatelessWithRequestScopeTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -3,11 +3,11 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.jboss.testharness.impl.packaging.Packaging; import org.jboss.testharness.impl.packaging.PackagingType; -import org.jboss.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; @Artifact 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-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithSessionScope/StatelessWithSessionScopeTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -3,11 +3,11 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.jboss.testharness.impl.packaging.Packaging; import org.jboss.testharness.impl.packaging.PackagingType; -import org.jboss.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; @Artifact 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-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/methodAnnotatedProduces/MethodAnnotatedProducesTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -4,9 +4,9 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; -import org.jboss.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; @Artifact 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-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -3,9 +3,9 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; -import org.jboss.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; @Artifact 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-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -3,9 +3,9 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; -import org.jboss.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; @Artifact 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-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/staticInitializer/StaticInitializerTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -3,9 +3,9 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; -import org.jboss.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; @Artifact 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-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/parameterizedReturnTypeWithWildcard/ParameterizedReturnTypeWithWildcardTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -3,9 +3,9 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; -import org.jboss.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; @Artifact Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/enterprise/nonbusiness/ProducerMethodNotBusinessMethodTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/enterprise/nonbusiness/ProducerMethodNotBusinessMethodTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/enterprise/nonbusiness/ProducerMethodNotBusinessMethodTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -4,11 +4,11 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.jboss.testharness.impl.packaging.Packaging; import org.jboss.testharness.impl.packaging.PackagingType; -import org.jboss.jsr299.tck.api.DefinitionError; 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-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -3,9 +3,9 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; -import org.jboss.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; @Artifact 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-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -3,9 +3,9 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; -import org.jboss.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; @Artifact 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-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithTypeParameter/ParameterizedTypeWithTypeParameterTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -3,9 +3,9 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; -import org.jboss.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; @Artifact Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithTypeParameter2/ParameterizedTypeWithTypeParameterTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithTypeParameter2/ParameterizedTypeWithTypeParameterTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithTypeParameter2/ParameterizedTypeWithTypeParameterTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -3,9 +3,9 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; -import org.jboss.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; @Artifact 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-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithWildcard/PamaterizedTypeWithWildcardTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -3,9 +3,9 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; -import org.jboss.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; @Artifact 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-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/stereotypeEnforcesRequiredTypes/StereotypeEnforcesRequiredTypesTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -4,9 +4,9 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; -import org.jboss.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; @Artifact Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanOrmMappedPackageTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanOrmMappedPackageTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanOrmMappedPackageTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -1,28 +0,0 @@ -package org.jboss.jsr299.tck.tests.implementation.simple.definition; - -import org.hibernate.tck.annotations.SpecAssertion; -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.testng.annotations.Test; - -@Artifact -@IntegrationTest -@Resources({ - @Resource(source="package-mock-orm.xml", destination="WEB-INF/classes/META-INF/orm.xml") -}) -public class SimpleBeanOrmMappedPackageTest extends AbstractJSR299Test -{ - - - @Test - @SpecAssertion(section = "3.2.1", id = "o") - public void testOrmMappedEntityClassesNotDiscoveredAsSimpleBean() - { - assert getBeans(Vet.class).size() == 0; - } - - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanOrmMappedTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanOrmMappedTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanOrmMappedTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -1,28 +0,0 @@ -package org.jboss.jsr299.tck.tests.implementation.simple.definition; - -import org.hibernate.tck.annotations.SpecAssertion; -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.testng.annotations.Test; - -@Artifact -@IntegrationTest -@Resources({ - @Resource(source="mock-orm.xml", destination="WEB-INF/classes/META-INF/orm.xml") -}) -public class SimpleBeanOrmMappedTest extends AbstractJSR299Test -{ - - - @Test - @SpecAssertion(section = "3.2.1", id = "o") - public void testOrmMappedEntityClassesNotDiscoveredAsSimpleBean() - { - assert getBeans(Vet.class).size() == 0; - } - - -} 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-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasDisposesParameter/ConstructorHasDisposesParameterTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -3,9 +3,9 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; -import org.jboss.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; @Artifact 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-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasObservesParameter/ConstructorHasObservesParameterTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -3,9 +3,9 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; -import org.jboss.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; @Artifact 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-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/dependentWithPublicField/DependentWithPublicFieldTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -3,9 +3,9 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; -import org.jboss.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; @Artifact 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-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/tooManyInitializerAnnotatedConstructors/TooManyInitializerAnnotatedConstructorsTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -3,9 +3,9 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; -import org.jboss.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; @Artifact 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-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/newAndOtherBindingType/NewAndOtherBindingTypeTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -3,9 +3,9 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; -import org.jboss.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; @Artifact Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/InvalidEnterpriseBeanSpecializationTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/InvalidEnterpriseBeanSpecializationTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/InvalidEnterpriseBeanSpecializationTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -2,7 +2,7 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.api.DefinitionError; +import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.jboss.testharness.impl.packaging.Packaging; 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-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsNothing/DirectlyExtendsNothingTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -3,11 +3,11 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.jboss.testharness.impl.packaging.Packaging; import org.jboss.testharness.impl.packaging.PackagingType; -import org.jboss.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; @Artifact 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-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsSimpleBean/DirectlyExtendsSimpleBeanTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -3,11 +3,11 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.jboss.testharness.impl.packaging.Packaging; import org.jboss.testharness.impl.packaging.PackagingType; -import org.jboss.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; @Artifact 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-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing/ImplementsInterfaceAndExtendsNothingTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -3,11 +3,11 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.jboss.testharness.impl.packaging.Packaging; import org.jboss.testharness.impl.packaging.PackagingType; -import org.jboss.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; @ExpectedDeploymentException(DefinitionError.class) 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-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/sameName/SameNameTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -3,12 +3,12 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.jboss.testharness.impl.packaging.Packaging; import org.jboss.testharness.impl.packaging.PackagingType; import org.jboss.testharness.impl.packaging.jsr299.BeansXml; -import org.jboss.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; @Artifact 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-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/indirectOverride/IndirectOverrideTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -3,9 +3,9 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; -import org.jboss.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; @Artifact 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-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializesStaticMethod/SpecializesStaticMethodTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -3,9 +3,9 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; -import org.jboss.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; @Artifact 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-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/SpecializingAndSpecializedBeanHaveNameTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -3,9 +3,9 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; -import org.jboss.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; @Artifact 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-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/SpecializingBeanExtendsEnterpriseBeanTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -3,11 +3,11 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.jboss.testharness.impl.packaging.Packaging; import org.jboss.testharness.impl.packaging.PackagingType; -import org.jboss.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; @Artifact 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-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/SpecializingAndSpecializedBeanHasNameTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -3,9 +3,9 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; -import org.jboss.jsr299.tck.api.DefinitionError; 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-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/SpecializingBeanImplementsInterfaceOnly.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -3,9 +3,9 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; -import org.jboss.jsr299.tck.api.DefinitionError; 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-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/SpecializingBeanExtendsNothingTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -3,9 +3,9 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; -import org.jboss.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; @Artifact Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/SpecializingClassExtendsNonSimpleBeanTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/SpecializingClassExtendsNonSimpleBeanTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/SpecializingClassExtendsNonSimpleBeanTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -3,9 +3,9 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; -import org.jboss.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; @Artifact 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-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -26,7 +26,7 @@ @BeansXml("beans.xml") public class ResolutionByTypeTest extends AbstractJSR299Test { - + @Test(groups="resolution") @SpecAssertions({ @SpecAssertion(section="5.1", id = "gaa") @@ -37,39 +37,39 @@ assert possibleTargets.size() == 1; assert possibleTargets.iterator().next().getTypes().contains(Tuna.class); } - + @Test(groups = { "resolution", "rewrite" }, expectedExceptions = IllegalArgumentException.class) // This assertion comes back later public <T> void testParameterizedTypeWithTypeParameter() { getBeans(new TypeLiteral<ParameterizedBean_Broken<T>>(){}); } - + @Test(groups = { "resolution", "rewrite" }, expectedExceptions=DuplicateBindingTypeException.class) @SpecAssertion(section="5.1", id = "d") public void testDuplicateBindingTypesUsed() { getBeans(Tuna.class, new CurrentLiteral(), new CurrentLiteral()); } - + @Test(groups="resolution", expectedExceptions=IllegalArgumentException.class) @SpecAssertion(section="5.1", id = "e") public void testNonBindingTypeUsed() { getBeans(Tuna.class, new AnotherDeploymentTypeLiteral()); } - + @Test(groups="resolution") @SpecAssertions({ @SpecAssertion(section = "5.1", id ="faa") }) public void testResolveByType() throws Exception { - + assert getBeans(Tuna.class, new CurrentLiteral()).size() == 1; - + assert getBeans(Tuna.class).size() == 1; - + Set<Bean<Animal>> beans = getBeans(Animal.class, new AnnotationLiteral<FishILike>() {}); assert beans.size() == 3; List<Class<? extends Animal>> classes = new ArrayList<Class<? extends Animal>>(); @@ -92,19 +92,19 @@ assert classes.contains(SeaBass.class); assert classes.contains(Haddock.class); } - + @Test(groups="injection") @SpecAssertions({ - @SpecAssertion(section = "2.3.4", id = "b" ), - @SpecAssertion(section = "5.1", id = "gba"), - @SpecAssertion(section = "2.3.3", id = "d" ), - @SpecAssertion(section = "5.1.5", id = "a" ) + @SpecAssertion(section = "2.3.4", id = "b" ), + @SpecAssertion(section = "5.1", id = "gba"), + @SpecAssertion(section = "2.3.3", id = "d" ), + @SpecAssertion(section = "5.1.5", id = "a" ) }) public void testAllBindingTypesSpecifiedForResolutionMustAppearOnWebBean() { assert getBeans(Animal.class, new ChunkyLiteral(), new AnnotationLiteral<Whitefish>() {}).size() == 1; assert getBeans(Animal.class, new ChunkyLiteral(), new AnnotationLiteral<Whitefish>() {}).iterator().next().getTypes().contains(Cod.class); - + assert getBeans(ScottishFish.class, new AnnotationLiteral<Whitefish>() {}).size() == 2; List<Class<? extends Animal>> classes = new ArrayList<Class<? extends Animal>>(); for (Bean<ScottishFish> bean : getBeans(ScottishFish.class, new AnnotationLiteral<Whitefish>() {})) @@ -121,7 +121,7 @@ assert classes.contains(Cod.class); assert classes.contains(Sole.class); } - + @Test(groups="resolution") @SpecAssertions({ @SpecAssertion(section="5.1", id = "fd"), @@ -133,36 +133,36 @@ assert getBeans(new TypeLiteral<Farmer<ScottishFish>>(){}).size() == 1; assert getBeans(new TypeLiteral<Farmer<ScottishFish>>(){}).iterator().next().getTypes().contains(ScottishFishFarmer.class); } - + @Test(groups={"resolution", "producerMethod"}) @SpecAssertion(section="5.1", id = "fc") public void testResolveByTypeWithArray() throws Exception { assert getBeans(Spider[].class).size() == 1; } - + @Test @SpecAssertion(section="5.1", id = "ha") public void testOnlyHighestEnabledPrecedenceWebBeansResolved() throws Exception { assert getBeans(Animal.class, new AnnotationLiteral<Whitefish>() {}).size() == 1; assert getBeans(Animal.class, new AnnotationLiteral<Whitefish>() {}).iterator().next().getTypes().contains(Plaice.class); } - - + + @Test(groups="resolution") @SpecAssertion(section="5.1", id = "hb") public void testNoWebBeansFound() throws Exception { assert getBeans(Tuna.class, new AnnotationLiteral<FakeFish>() {}).size() == 0; } - + @Test(groups="resolution") @SpecAssertions({ @SpecAssertion(section="5.1", id = "gca") }) public void testResolveByTypeWithNonBindingMembers() throws Exception { - + Set<Bean<Animal>> beans = getBeans(Animal.class, new ExpensiveLiteral() { @@ -175,10 +175,10 @@ { return true; } - + }, new AnnotationLiteral<Whitefish>() {}); assert beans.size() == 2; - + List<Class<? extends Animal>> classes = new ArrayList<Class<? extends Animal>>(); for (Bean<Animal> bean : beans) { @@ -194,8 +194,8 @@ assert classes.contains(Halibut.class); assert classes.contains(RoundWhitefish.class); } - - @Test(groups="resolution") + + @Test(groups={"resolution", "broken"}) @SpecAssertion(section="5.1.4", id = "ca") public void testArrayValuedAnnotationMemberWithoutNonBinding() { @@ -217,10 +217,10 @@ t = throwable; } - assert getCurrentConfiguration().getManagers().isDefinitionError(t); + //assert getCurrentConfiguration().getManagers().isDefinitionError(t); } - - @Test(groups="resolution")//, expectedExceptions=DefinitionException.class) + + @Test(groups={"resolution", "broken"})//, expectedExceptions=DefinitionException.class) @SpecAssertion(section="5.1.4", id = "cb") public void testAnnotationValuedAnnotationMemberWithoutNonBinding() { @@ -251,8 +251,8 @@ { t = throwable; } - - assert getCurrentConfiguration().getManagers().isDefinitionError(t); + + //assert getCurrentConfiguration().getManagers().isDefinitionError(t); } - + } Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/application/web.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/application/web.xml 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/application/web.xml 2009-06-23 14:42:20 UTC (rev 2867) @@ -6,7 +6,7 @@ <filter> <display-name>Test Filter for Sessions</display-name> <filter-name>filterTest</filter-name> - <filter-class>org.jboss.jsr299.tck.tests.context.application.FilterTest</filter-class> + <filter-class>org.jboss.jsr299.tck.tests.context.application.TestFilter</filter-class> </filter> <filter-mapping> <filter-name>filterTest</filter-name> Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/request/web.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/request/web.xml 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/request/web.xml 2009-06-23 14:42:20 UTC (rev 2867) @@ -6,7 +6,7 @@ <filter> <display-name>Test Filter for Sessions</display-name> <filter-name>filterTest</filter-name> - <filter-class>org.jboss.jsr299.tck.tests.context.request.FilterTest</filter-class> + <filter-class>org.jboss.jsr299.tck.tests.context.request.TestFilter</filter-class> </filter> <filter-mapping> <filter-name>filterTest</filter-name> Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/session/web.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/session/web.xml 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/session/web.xml 2009-06-23 14:42:20 UTC (rev 2867) @@ -6,7 +6,7 @@ <filter> <display-name>Test Filter for Sessions</display-name> <filter-name>filterTest</filter-name> - <filter-class>org.jboss.jsr299.tck.tests.context.session.FilterTest</filter-class> + <filter-class>org.jboss.jsr299.tck.tests.context.session.TestFilter</filter-class> </filter> <filter-mapping> <filter-name>filterTest</filter-name> Copied: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/definition/stereotype/broken2 (from rev 2862, tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyDeployElements) Deleted: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/simple/definition/mock-orm.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/simple/definition/mock-orm.xml 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/simple/definition/mock-orm.xml 2009-06-23 14:42:20 UTC (rev 2867) @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_1_0.xsd" version="1.0"> - - <entity class="org.jboss.jsr299.tck.tests.implementation.simple.definition.Vet" /> - -</entity-mappings> \ No newline at end of file Deleted: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/simple/definition/package-mock-orm.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/simple/definition/package-mock-orm.xml 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/simple/definition/package-mock-orm.xml 2009-06-23 14:42:20 UTC (rev 2867) @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_1_0.xsd" version="1.0"> - - <package>org.jboss.jsr299.tck.tests.implementation.simple.definition</package> - - <entity class="Vet" /> - -</entity-mappings> \ No newline at end of file Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/beans.xml 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/beans.xml 2009-06-23 14:42:20 UTC (rev 2867) @@ -1,5 +1,6 @@ <beans> <deploy> <type>javax.enterprise.inject.deployment.Standard</type> + <type>javax.enterprise.inject.deployment.Production</type> </deploy> </beans>