[weld-commits] Weld SVN: r5568 - in core/trunk: jboss-tck-runner/src/test/resources and 1 other directory.
weld-commits at lists.jboss.org
weld-commits at lists.jboss.org
Fri Jan 22 07:52:24 EST 2010
Author: pete.muir at jboss.org
Date: 2010-01-22 07:52:24 -0500 (Fri, 22 Jan 2010)
New Revision: 5568
Removed:
core/trunk/jboss-tck-runner/src/test/resources/tck-tests-1.0.1.xml
Modified:
core/trunk/bom/pom.xml
core/trunk/jboss-tck-runner/src/test/resources/tck-tests.xml
Log:
switch to using 1.0.1 CR1 tck
Modified: core/trunk/bom/pom.xml
===================================================================
--- core/trunk/bom/pom.xml 2010-01-22 08:19:03 UTC (rev 5567)
+++ core/trunk/bom/pom.xml 2010-01-22 12:52:24 UTC (rev 5568)
@@ -74,7 +74,7 @@
<weld.api.version>1.0</weld.api.version>
<google.collections.version>1.0</google.collections.version>
<javassist.version>3.11.0.GA</javassist.version>
- <cdi.tck.version>1.0.0</cdi.tck.version>
+ <cdi.tck.version>1.0.1-CR1</cdi.tck.version>
<atinject.tck.version>1.0.0-PFD-3</atinject.tck.version>
<jboss.interceptor.version>1.0.0-CR8</jboss.interceptor.version>
<slf4j.version>1.5.10</slf4j.version>
Deleted: core/trunk/jboss-tck-runner/src/test/resources/tck-tests-1.0.1.xml
===================================================================
--- core/trunk/jboss-tck-runner/src/test/resources/tck-tests-1.0.1.xml 2010-01-22 08:19:03 UTC (rev 5567)
+++ core/trunk/jboss-tck-runner/src/test/resources/tck-tests-1.0.1.xml 2010-01-22 12:52:24 UTC (rev 5568)
@@ -1,159 +0,0 @@
-<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
-
-<!-- JSR-299 TCK TestNG configuration for Weld -->
-
-<suite name="Weld / JBoss AS run of CDI TCK" verbose="0" >
- <test name="CDI TCK">
- <method-selectors>
- <method-selector>
- <selector-class name="org.jboss.testharness.impl.testng.DisableIntegrationTestsMethodSelector" />
- </method-selector>
- </method-selectors>
- <packages>
- <package name="org.jboss.jsr299.tck.tests.*" />
- <package name="org.jboss.jsr299.tck.interceptors.tests.*" />
- </packages>
- <classes>
-
- <!-- Issues in Weld (the RI) -->
-
- <!-- WELD-393 -->
- <class name="org.jboss.jsr299.tck.interceptors.tests.definition.DefinitionTest">
- <methods>
- <exclude name="testInterceptorMethodDefinedOnTargetClass" />
- </methods>
- </class>
-
- <!-- WELD-390 -->
- <class name="org.jboss.jsr299.tck.interceptors.tests.lifecycleCallback.order.InvocationOrderTest">
- <methods>
- <exclude name="testInvocationOrder" />
- </methods>
- </class>
- <!-- WELD-269 -->
- <class name="org.jboss.jsr299.tck.tests.decorators.custom.CustomDecoratorTest">
- <methods>
- <exclude name="testCustomImplementationOfDecoratorInterface" />
- </methods>
- </class>
- <!-- WELD-272 -->
- <class name="org.jboss.jsr299.tck.tests.decorators.definition.broken.finalBeanClass.FinalBeanClassTest">
- <methods>
- <exclude name="testAppliesToFinalManagedBeanClass" />
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.decorators.definition.broken.finalBeanMethod.FinalBeanMethodTest">
- <methods>
- <exclude name="testAppliesToFinalMethodOnManagedBeanClass" />
- </methods>
- </class>
- <!-- WELD-377 -->
- <class name="org.jboss.jsr299.tck.tests.decorators.invocation.EJBDecoratorInvocationTest">
- <methods>
- <exclude name="testEJBDecoratorInvocation" />
- </methods>
- </class>
-
- <!-- Issues in JBoss AS -->
-
- <!-- JBAS-7421 -->
- <class name="org.jboss.jsr299.tck.interceptors.tests.invocationContext.InvocationContextTest">
- <methods>
- <exclude name="testGetTimerMethod" />
- </methods>
- </class>
-
- <!-- Requires EJB 3.1 -->
-
- <class name="org.jboss.jsr299.tck.tests.context.request.ejb.EJBRequestContextTest">
- <methods>
- <exclude name="testRequestScopeActiveDuringCallToEjbTimeoutMethod" />
- <exclude name="testRequestScopeDestroyedAfterCallToEjbTimeoutMethod" />
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.implementation.enterprise.broken.singletonWithRequestScope.SingletonWithRequestScopeTest">
- <methods>
- <exclude name="testSingletonWithRequestScopeFails" />
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.implementation.enterprise.broken.singletonWithSessionScope.SingletonWithSessionScopeTest">
- <methods>
- <exclude name="testSingletonWithSessionScopeFails" />
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.implementation.enterprise.definition.EnterpriseBeanDefinitionTest">
- <methods>
- <exclude name="testEnterpriseBeanClassLocalView" />
- <!-- WELDINT-31 -->
- <exclude name="testConstructorAnnotatedInjectCalled" />
- </methods>
- </class>
- <!-- WELDINT-1 -->
- <class name="org.jboss.jsr299.tck.tests.deployment.packaging.bundledLibrary.LibraryInEarTest">
- <methods>
- <exclude name="test" />
- </methods>
- </class>
- <!-- WELDINT-31 -->
- <class name="org.jboss.jsr299.tck.tests.implementation.enterprise.newBean.NewEnterpriseBeanICTest">
- <methods>
- <exclude name="testNewBeanHasSameConstructor" />
- </methods>
- </class>
- <!-- WELDINT-27 -->
- <class name="org.jboss.jsr299.tck.tests.interceptors.definition.enterprise.interceptorOrder.SessionBeanInterceptorOrderTest">
- <methods>
- <exclude name="testInterceptorsDeclaredUsingInterceptorsCalledBeforeInterceptorBinding" />
- </methods>
- </class>
- <!-- JBAS-7046 -->
- <class name="org.jboss.jsr299.tck.tests.lookup.injection.enterprise.SessionBeanInjectionTest">
- <methods>
- <exclude name="" />
- </methods>
- </class>
- <!-- JBAS-7046 -->
- <class name="org.jboss.jsr299.tck.tests.lookup.injection.non.contextual.ws.InjectionIntoWebServiceEndPointTest">
- <methods>
- <exclude name="testInjectionIntoWebServiceEndpoint" />
- </methods>
- </class>
- <!-- JBAS-7046 -->
- <class name="org.jboss.jsr299.tck.tests.lookup.injection.enterprise.SessionBeanInjectionTest">
- <methods>
- <exclude name="testInjectionOnEJBInterceptor" />
- </methods>
- </class>
- <!-- JBAS-7046 -->
- <class name="org.jboss.jsr299.tck.tests.context.application.ejb.EJBApplicationContextTest">
- <methods>
- <exclude name="testApplicationScopeActiveDuringWebServiceInvocation" />
- </methods>
- </class>
- <!-- WELDINT-22 -->
- <class name="org.jboss.jsr299.tck.tests.lookup.injection.non.contextual.ContainerEventTest">
- <methods>
- <exclude name="testProcessInjectionTargetEventFiredForServletListener" />
- <exclude name="testProcessInjectionTargetEventFiredForTagLibraryListener" />
- <exclude name="testProcessInjectionTargetEventFiredForFilter" />
- <exclude name="testTypeOfProcessInjectionTargetParameter" />
- <exclude name="testProcessInjectionTargetEventFiredForServlet" />
- </methods>
- </class>
- <!-- WELDINT-26 -->
- <class name="org.jboss.jsr299.tck.tests.lookup.injectionpoint.broken.not.bean.InjectionPointTest">
- <methods>
- <exclude name="testDefinitionErrorDetected" />
- </methods>
- </class>
- <!-- WELDINT-19 -->
- <class name="org.jboss.jsr299.tck.tests.lookup.manager.jndi.ManagerTest">
- <methods>
- <exclude name="testManagerLookupInJndi" />
- </methods>
- </class>
-
- </classes>
- </test>
-
-</suite>
Modified: core/trunk/jboss-tck-runner/src/test/resources/tck-tests.xml
===================================================================
--- core/trunk/jboss-tck-runner/src/test/resources/tck-tests.xml 2010-01-22 08:19:03 UTC (rev 5567)
+++ core/trunk/jboss-tck-runner/src/test/resources/tck-tests.xml 2010-01-22 12:52:24 UTC (rev 5568)
@@ -1,6 +1,6 @@
<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
-<!-- JSR-299 TCK with mods (add excludes) -->
+<!-- JSR-299 TCK TestNG configuration for Weld -->
<suite name="Weld / JBoss AS run of CDI TCK" verbose="0" >
<test name="CDI TCK">
@@ -9,120 +9,150 @@
<selector-class name="org.jboss.testharness.impl.testng.DisableIntegrationTestsMethodSelector" />
</method-selector>
</method-selectors>
- <groups>
- <run>
- <exclude name="broken" />
- <exclude name="ri-broken" />
- <exclude name="jboss-as-broken" />
- </run>
- </groups>
<packages>
<package name="org.jboss.jsr299.tck.tests.*" />
<package name="org.jboss.jsr299.tck.interceptors.tests.*" />
</packages>
<classes>
- <!-- JBoss AS 6.0.0.M1 is still using EJB 3.0 Interceptor API - JBAS-7421 -->
+
+ <!-- Issues in Weld (the RI) -->
+
+ <!-- WELD-393 -->
+ <class name="org.jboss.jsr299.tck.interceptors.tests.definition.DefinitionTest">
+ <methods>
+ <exclude name="testInterceptorMethodDefinedOnTargetClass" />
+ </methods>
+ </class>
+
+ <!-- WELD-390 -->
+ <class name="org.jboss.jsr299.tck.interceptors.tests.lifecycleCallback.order.InvocationOrderTest">
+ <methods>
+ <exclude name="testInvocationOrder" />
+ </methods>
+ </class>
+ <!-- WELD-269 -->
+ <class name="org.jboss.jsr299.tck.tests.decorators.custom.CustomDecoratorTest">
+ <methods>
+ <exclude name="testCustomImplementationOfDecoratorInterface" />
+ </methods>
+ </class>
+ <!-- WELD-272 -->
+ <class name="org.jboss.jsr299.tck.tests.decorators.definition.broken.finalBeanClass.FinalBeanClassTest">
+ <methods>
+ <exclude name="testAppliesToFinalManagedBeanClass" />
+ </methods>
+ </class>
+ <class name="org.jboss.jsr299.tck.tests.decorators.definition.broken.finalBeanMethod.FinalBeanMethodTest">
+ <methods>
+ <exclude name="testAppliesToFinalMethodOnManagedBeanClass" />
+ </methods>
+ </class>
+ <!-- WELD-377 -->
+ <class name="org.jboss.jsr299.tck.tests.decorators.invocation.EJBDecoratorInvocationTest">
+ <methods>
+ <exclude name="testEJBDecoratorInvocation" />
+ </methods>
+ </class>
+
+ <!-- Issues in JBoss AS -->
+
+ <!-- JBAS-7421 -->
<class name="org.jboss.jsr299.tck.interceptors.tests.invocationContext.InvocationContextTest">
<methods>
<exclude name="testGetTimerMethod" />
</methods>
</class>
- <!--
- The following tests are broken in TCK 1.0.0 and succeed because of a bug in the 1.0.0 version of the RI
- The fix for the 1.0.1 version of the RI requires version 1.0.1 or later of the TCK.
- The tests must be re-enabled once CDI TCK 1.0.1 or later is used.
- -->
- <class name="org.jboss.jsr299.tck.tests.context.dependent.DependentContextTest">
- <methods>
- <exclude name="testDependentScopedDecoratorsAreDependentObjectsOfBean"/>
- </methods>
+
+ <!-- Requires EJB 3.1 -->
+
+ <class name="org.jboss.jsr299.tck.tests.context.request.ejb.EJBRequestContextTest">
+ <methods>
+ <exclude name="testRequestScopeActiveDuringCallToEjbTimeoutMethod" />
+ <exclude name="testRequestScopeDestroyedAfterCallToEjbTimeoutMethod" />
+ </methods>
</class>
- <class name="org.jboss.jsr299.tck.tests.decorators.definition.DecoratorDefinitionTest">
- <methods>
- <exclude name="testDecoratorIsManagedBean"/>
- </methods>
+ <class name="org.jboss.jsr299.tck.tests.implementation.enterprise.broken.singletonWithRequestScope.SingletonWithRequestScopeTest">
+ <methods>
+ <exclude name="testSingletonWithRequestScopeFails" />
+ </methods>
</class>
- <class name="org.jboss.jsr299.tck.tests.decorators.definition.inject.delegateConstructor.DelegateInjectionPointTest">
- <methods>
- <exclude name="testDecoratorDelegateInjectionPoints"/>
- </methods>
+ <class name="org.jboss.jsr299.tck.tests.implementation.enterprise.broken.singletonWithSessionScope.SingletonWithSessionScopeTest">
+ <methods>
+ <exclude name="testSingletonWithSessionScopeFails" />
+ </methods>
</class>
- <class name="org.jboss.jsr299.tck.tests.decorators.definition.inject.delegateField.DelegateFieldInjectionPointTest">
- <methods>
- <exclude name="testDecoratorDelegateInjectionPoints"/>
- </methods>
+ <class name="org.jboss.jsr299.tck.tests.implementation.enterprise.definition.EnterpriseBeanDefinitionTest">
+ <methods>
+ <exclude name="testEnterpriseBeanClassLocalView" />
+ <!-- WELDINT-31 -->
+ <exclude name="testConstructorAnnotatedInjectCalled" />
+ </methods>
</class>
- <class name="org.jboss.jsr299.tck.tests.decorators.definition.inject.delegateInitializerMethod.DelegateInjectionPointTest">
- <methods>
- <exclude name="testDecoratorDelegateInjectionPoints"/>
- </methods>
+ <!-- WELDINT-1 -->
+ <class name="org.jboss.jsr299.tck.tests.deployment.packaging.bundledLibrary.LibraryInEarTest">
+ <methods>
+ <exclude name="test" />
+ </methods>
</class>
- <class name="org.jboss.jsr299.tck.tests.decorators.invocation.DecoratorInvocationTest">
- <methods>
- <exclude name="testChainedDecoratorInvocation"/>
- <exclude name="testDecoratorInvocation"/>
- </methods>
+ <!-- WELDINT-31 -->
+ <class name="org.jboss.jsr299.tck.tests.implementation.enterprise.newBean.NewEnterpriseBeanICTest">
+ <methods>
+ <exclude name="testNewBeanHasSameConstructor" />
+ </methods>
</class>
- <class name="org.jboss.jsr299.tck.tests.decorators.invocation.observer.DecoratorInvocationTest">
+ <!-- WELDINT-27 -->
+ <class name="org.jboss.jsr299.tck.tests.interceptors.definition.enterprise.interceptorOrder.SessionBeanInterceptorOrderTest">
<methods>
- <exclude name="testDecoratorInvocation"/>
+ <exclude name="testInterceptorsDeclaredUsingInterceptorsCalledBeforeInterceptorBinding" />
</methods>
</class>
- <class name="org.jboss.jsr299.tck.tests.decorators.invocation.producer.method.DecoratorInvocationTest">
+ <!-- JBAS-7046 -->
+ <class name="org.jboss.jsr299.tck.tests.lookup.injection.enterprise.SessionBeanInjectionTest">
<methods>
- <exclude name="testDecoratorInvocation"/>
+ <exclude name="" />
</methods>
</class>
- <class name="org.jboss.jsr299.tck.tests.implementation.producer.field.definition.ProducerFieldDefinitionTest">
+ <!-- JBAS-7046 -->
+ <class name="org.jboss.jsr299.tck.tests.lookup.injection.non.contextual.ws.InjectionIntoWebServiceEndPointTest">
<methods>
- <exclude name="testApiTypeForArrayTypeReturn"/>
- <exclude name="testApiTypeForClassReturn"/>
- <exclude name="testApiTypeForInterfaceReturn"/>
- <exclude name="testApiTypeForPrimitiveReturn"/>
- <exclude name="testBeanDeclaresMultipleProducerFields"/>
- <exclude name="testBindingType"/>
- <exclude name="testDefaultBindingType"/>
- <exclude name="testDefaultNamedField"/>
- <exclude name="testNamedField"/>
- <exclude name="testNonStaticProducerFieldNotIndirectlyInherited"/>
- <exclude name="testNonStaticProducerFieldNotInherited"/>
- <exclude name="testParameterizedReturnType"/>
- <exclude name="testScopeType"/>
- <exclude name="testStereotype"/>
+ <exclude name="testInjectionIntoWebServiceEndpoint" />
</methods>
</class>
- <class name="org.jboss.jsr299.tck.tests.lookup.injectionpoint.InjectionPointTest">
- <methods>
- <exclude name="testIsDelegate"/>
- </methods>
+ <!-- JBAS-7046 -->
+ <class name="org.jboss.jsr299.tck.tests.lookup.injection.enterprise.SessionBeanInjectionTest">
+ <methods>
+ <exclude name="testInjectionOnEJBInterceptor" />
+ </methods>
</class>
- <class name="org.jboss.jsr299.tck.tests.implementation.producer.method.definition.ProducerMethodDefinitionTest">
- <methods>
- <exclude name="testParameterizedReturnType"/>
- </methods>
+ <!-- JBAS-7046 -->
+ <class name="org.jboss.jsr299.tck.tests.context.application.ejb.EJBApplicationContextTest">
+ <methods>
+ <exclude name="testApplicationScopeActiveDuringWebServiceInvocation" />
+ </methods>
</class>
- <class name="org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.ResolutionByTypeTest">
- <methods>
- <exclude name="testGenericBeanTypesOnManagedBean"/>
- <exclude name="testResolveByTypeWithTypeParameter"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.policy.PolicyAvailabilityTest">
+ <!-- WELDINT-22 -->
+ <class name="org.jboss.jsr299.tck.tests.lookup.injection.non.contextual.ContainerEventTest">
<methods>
- <exclude name="testProducerPoliciesOnClass" />
- <exclude name="testProducerPoliciesOnMethodAndField" />
- </methods>
+ <exclude name="testProcessInjectionTargetEventFiredForServletListener" />
+ <exclude name="testProcessInjectionTargetEventFiredForTagLibraryListener" />
+ <exclude name="testProcessInjectionTargetEventFiredForFilter" />
+ <exclude name="testTypeOfProcessInjectionTargetParameter" />
+ <exclude name="testProcessInjectionTargetEventFiredForServlet" />
+ </methods>
</class>
- <class name="org.jboss.jsr299.tck.tests.implementation.simple.lifecycle.SimpleBeanLifecycleTest">
+ <!-- WELDINT-26 -->
+ <class name="org.jboss.jsr299.tck.tests.lookup.injectionpoint.broken.not.bean.InjectionPointTest">
<methods>
- <exclude name="testSpecializedBeanExtendsManagedBean" />
+ <exclude name="testDefinitionErrorDetected" />
</methods>
</class>
- <class name="org.jboss.jsr299.tck.tests.lookup.byname.ResolutionByNameTest">
+ <!-- WELDINT-19 -->
+ <class name="org.jboss.jsr299.tck.tests.lookup.manager.jndi.ManagerTest">
<methods>
- <exclude name="testAmbiguousELNamesResolved" />
+ <exclude name="testManagerLookupInJndi" />
</methods>
</class>
+
</classes>
</test>
More information about the weld-commits
mailing list