You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2015/03/04 09:29:12 UTC
tomee git commit: upgrade tck for cdi
Repository: tomee
Updated Branches:
refs/heads/develop bdff275a1 -> 431c16566
upgrade tck for cdi
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/431c1656
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/431c1656
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/431c1656
Branch: refs/heads/develop
Commit: 431c1656661e93b381a15f0e88bdb1043e6de9e8
Parents: bdff275
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Wed Mar 4 09:28:54 2015 +0100
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Wed Mar 4 09:28:54 2015 +0100
----------------------------------------------------------------------
tck/cdi-embedded/pom.xml | 2 +-
tck/cdi-embedded/src/test/resources/passing.xml | 313 +++----------------
2 files changed, 41 insertions(+), 274 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/431c1656/tck/cdi-embedded/pom.xml
----------------------------------------------------------------------
diff --git a/tck/cdi-embedded/pom.xml b/tck/cdi-embedded/pom.xml
index d33af5d..784bdf6 100644
--- a/tck/cdi-embedded/pom.xml
+++ b/tck/cdi-embedded/pom.xml
@@ -98,7 +98,7 @@
<dependency>
<groupId>org.jboss.cdi.tck</groupId>
<artifactId>cdi-tck-impl</artifactId>
- <version>1.2.2.Final</version>
+ <version>1.2.4.Final</version>
<exclusions>
<exclusion>
<groupId>javax.enterprise</groupId>
http://git-wip-us.apache.org/repos/asf/tomee/blob/431c1656/tck/cdi-embedded/src/test/resources/passing.xml
----------------------------------------------------------------------
diff --git a/tck/cdi-embedded/src/test/resources/passing.xml b/tck/cdi-embedded/src/test/resources/passing.xml
index c079edd..2aa532b 100644
--- a/tck/cdi-embedded/src/test/resources/passing.xml
+++ b/tck/cdi-embedded/src/test/resources/passing.xml
@@ -151,12 +151,13 @@
</methods>
</class>
- <!-- CDITCK-461 -->
+ <!-- CDITCK-461
<class name="org.jboss.cdi.tck.tests.interceptors.definition.broken.finalClassInterceptor.FinalMethodClassLevelInterceptorTest">
<methods>
<exclude name="testFinalMethodWithClassLevelInterceptor" />
</methods>
</class>
+ -->
<!-- CDITCK-462 javax.enterprise.context.conversation.id is not el compliant -->
<class name="org.jboss.cdi.tck.tests.context.conversation.LongRunningConversationPropagatedByFacesContextTest">
@@ -172,293 +173,59 @@
</methods>
</class>
- <!-- not in web profile and not supported by embedded adapter anyway -->
- <class name="org.jboss.cdi.tck.tests.deployment.packaging.rar.ResourceAdapterArchiveTest">
- <methods>
- <exclude name=".*" />
- </methods>
+ <!-- CDITCK-466 -->
+ <class name="org.jboss.cdi.tck.tests.extensions.lifecycle.bbd.broken.passivatingScope.AddingPassivatingScopeTest">
+ <methods>
+ <exclude name=".*"/>
+ </methods>
</class>
- <!-- not supported by embedded adapter -->
- <class name="org.jboss.cdi.tck.tests.lookup.injection.non.contextual.InjectionIntoNonContextualComponentTest">
- <methods>
- <exclude name="testInjectionIntoTagHandler" />
- </methods>
- </class>
- </classes>
- </test>
-</suite>
-
-<!--
-<suite name="CDI 1.0 TCK" verbose="0">
- <test name="CDI TCK">
- <packages>
- <package name="org.jboss.jsr299.tck.tests.*"/>
- <package name="org.jboss.jsr299.tck.interceptors.tests.*"/>
- </packages>
- <classes>
- <class name="org.jboss.jsr299.tck.tests.context.ContextDestroysBeansTest">
- <methods>
- <exclude name="testContextDestroysBeansWhenDestroyed"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.context.ContextTest">
- <methods>
- <exclude name="testBuiltInContexts"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.context.DestroyForSameCreationalContext2Test">
- <methods>
- <exclude name="testDestroyForSameCreationalContextOnly"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.context.DestroyForSameCreationalContextTest">
- <methods>
- <exclude name="testDestroyForSameCreationalContextOnly"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.context.DestroyedInstanceReturnedByGetTest">
- <methods>
- <exclude name="testDestroyedInstanceMustNotBeReturnedByGet"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.context.GetFromContextualTest">
- <methods>
- <exclude name="testGetMayNotCreateNewInstanceUnlessCreationalContextGiven"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.context.GetWithNoCreationalContextTest">
- <methods>
- <exclude name="testGetWithoutCreationalContextReturnsNull"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.context.NormalContextTest">
- <methods>
- <exclude name="testGetMayNotReturnNullUnlessContextualCreateReturnsNull"/>
- <exclude name="testGetReturnsExistingInstance"/>
- <exclude name="testGetWithCreationalContextReturnsNewInstance"/>
- <exclude name="testSameNormalScopeBeanInjectedEverywhere"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.context.application.ApplicationContextTest">
- <methods>
- <exclude name="testApplicationContextSharedBetweenServletRequests"/>
- <exclude name="testApplicationScopeActiveDuringDoFilterMethod"/>
- <exclude name="testApplicationScopeActiveDuringHttpSessionListenerInvocation"/>
- <exclude name="testApplicationScopeActiveDuringServiceMethod"/>
- <exclude name="testApplicationScopeActiveDuringServletContextListenerInvocation"/>
- <exclude name="testApplicationScopeActiveDuringServletRequestListenerInvocation"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.context.conversation.ClientConversationContextTest">
- <methods>
- <exclude name="testBeanWithDefaultQualifier"/>
- <exclude name="testBeanWithNameJavaxEnterpriseContextConversation"/>
- <exclude name="testBeanWithRequestScope"/>
- <exclude name="testBeginAlreadyLongRunningConversationThrowsException"/>
- <exclude name="testConversationActiveDuringNonFacesRequest"/>
- <exclude name="testConversationBeginMakesConversationLongRunning"/>
- <exclude name="testConversationEndMakesConversationTransient"/>
- <exclude name="testConversationHasDefaultTimeout"/>
- <exclude name="testConversationIdMayBeSetByApplication"/>
- <exclude name="testConversationIdMayBeSetByContainer"/>
- <exclude name="testConversationIdSetByContainerIsUnique"/>
- <exclude name="testConversationsDontCrossSessionBoundary1"/>
- <exclude name="testConversationsDontCrossSessionBoundary2"/>
- <exclude name="testEndTransientConversationThrowsException"/>
- <exclude name="testLongRunningConversationInstancesNotDestroyedAtRequestEnd"/>
- <exclude name="testSetConversationTimeoutOverride"/>
- <exclude name="testTransientConversationHasNullId"/>
- <exclude name="testTransientConversationInstancesDestroyedAtRequestEnd"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.context.conversation.InvalidatingSessionDestroysConversationTest">
- <methods>
- <exclude name="testInvalidatingSessionDestroysConversation"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.context.conversation.LongRunningConversationPropagatedByFacesContextTest">
- <methods>
- <exclude name="testConversationPropagated"/>
- <exclude name="testConversationPropagatedOverRedirect"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.context.conversation.ManualCidPropagationTest">
- <methods>
- <exclude name="testManualCidPropagation"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.context.dependent.DependentContextTest">
- <methods>
- <exclude name="testContextIsActiveWhenEvaluatingElExpression"/>
- <exclude name="testDependentsDestroyedWhenElEvaluationCompletes"/>
- <exclude name="testInstanceUsedForElEvaluationNotShared"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.context.passivating.PassivatingContextTest">
- <methods>
- <exclude name="testNonSerializableProducerFieldDeclaredPassivatingThrowsIllegalProductException"/>
- <exclude name="testPassivatingScopeProducerMethodReturnsUnserializableObjectNotOk"/>
- <exclude name="testPassivationOccurs"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.context.passivating.broken.dependentScopedProducerFieldReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean.EnterpriseBeanWithIllegalDependencyTest">
- <methods>
- <exclude name="test"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.context.passivating.broken.dependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean.EnterpriseBeanWithIllegalDependencyTest">
- <methods>
- <exclude name="test"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.context.passivating.broken.enterpriseBeanWithNonPassivatingDecorator.EnterpriseBeanWithNonPassivatingDecoratorTest">
- <methods>
- <exclude name="testEnterpriseBeanWithNonPassivatingDecoratorFails"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.context.request.RequestContextTest">
- <methods>
- <exclude name="testRequestScopeActiveDuringServiceMethod"/>
- <exclude name="testRequestScopeActiveDuringServletFilter"/>
- <exclude name="testRequestScopeIsDestroyedAfterServletRequest"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.context.session.SessionContextTest">
- <methods>
- <exclude name="testSessionContextDestroyedWhenHttpSessionInvalidated"/>
- <exclude name="testSessionContextDestroyedWhenHttpSessionTimesOut"/>
- <exclude name="testSessionContextSharedBetweenServletRequestsInSameHttpSession"/>
- <exclude name="testSessionScopeActiveDuringDoFilterMethod"/>
- <exclude name="testSessionScopeActiveDuringServiceMethod"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.deployment.packaging.bundledLibrary.LibraryInEarTest">
- <methods>
- <exclude name="test"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.deployment.packaging.bundledLibrary.LibraryInWarTest">
- <methods>
- <exclude name="test"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle.EnterpriseBeanLifecycleTest">
- <methods>
- <exclude name="testCreateSFSB"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.implementation.enterprise.newBean.NewEnterpriseBeanICTest">
- <methods>
- <exclude name="testNewBeanHasNoDisposalMethods"/>
- <exclude name="testNewBeanHasNoProducerMethods"/>
- <exclude name="testNewBeanHasSameInitializers"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.implementation.enterprise.remove.EnterpriseBeanRemoveMethodTest">
- <methods>
- <exclude name="testApplicationCannotCallRemoveMethodOnNonDependentScopedSessionEnterpriseBean"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.implementation.simple.lifecycle.SimpleBeanLifecycleTest">
- <methods>
- <exclude name="testSerializeSessionScoped"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.implementation.simple.newSimpleBean.NewSimpleBeanTest">
- <methods>
- <exclude name="testNewBeanHasSameConstructor"/>
- <exclude name="testNewBeanHasSameInitializers"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.implementation.simple.resource.env.EnvInjectionTest">
- <methods>
- <exclude name="testInjectionOfEnv"/>
- <exclude name="testProduceEnvProxy"/>
- </methods>
+ <!-- CDITCK-467 -->
+ <class name="org.jboss.cdi.tck.tests.event.fires.FireEventTest">
+ <methods>
+ <exclude name="testDuplicateBindingsToFireEventFails"/>
+ </methods>
</class>
- <class name="org.jboss.jsr299.tck.tests.implementation.simple.resource.persistenceContext.PersistenceContextInjectionTest">
- <methods>
- <exclude name="testBeanTypesAndBindingTypesOfPersistenceContext"/>
- <exclude name="testInjectionOfPersistenceContext"/>
- <exclude name="testInjectionOfPersistenceUnit"/>
- <exclude name="testPassivationOfPersistenceContext"/>
- <exclude name="testPassivationOfPersistenceUnit"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.implementation.simple.resource.resource.InjectionOfResourceTest">
- <methods>
- <exclude name="testInjectionOfResource"/>
- <exclude name="testPassivatingResource"/>
- <exclude name="testProduceResourceProxy"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.interceptors.definition.enterprise.nonContextualReference.SessionBeanInterceptorOnNonContextualEjbReferenceTest">
- <methods>
- <exclude name="testNonContextualSessionBeanReferenceIsIntercepted"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.lookup.circular.CircularDependencyTest">
- <methods>
- <exclude name="testCircularInjectionOnTwoNormalBeans"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.lookup.clientProxy.incontainer.ClientProxyTest">
- <methods>
- <exclude name="testInvocationIsProcessedOnCurrentInstance"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.lookup.el.ResolutionByNameTest">
- <methods>
- <exclude name="testContextCreatesNewInstanceForInjection"/>
- <exclude name="testELResolverReturnsContextualInstance"/>
- <exclude name="testQualifiedNameLookup"/>
- </methods>
+ <class name="org.jboss.cdi.tck.tests.event.select.SelectEventTest">
+ <methods>
+ <exclude name=".*DuplicateBindingType"/>
+ </methods>
</class>
- <class name="org.jboss.jsr299.tck.tests.lookup.el.integration.IntegrationWithUnifiedELTest">
- <methods>
- <exclude name="testELResolverRegisteredWithJsf"/>
- <exclude name="testELResolverRegisteredWithServletContainer"/>
- </methods>
+ <class name="org.jboss.cdi.tck.tests.event.resolve.binding.DuplicateBindingTypesWhenResolvingTest">
+ <methods>
+ <exclude name=".*"/>
+ </methods>
</class>
- <class name="org.jboss.jsr299.tck.tests.lookup.injection.non.contextual.InjectionIntoNonContextualComponentTest">
- <methods>
- <exclude name="testFilterInitializerMethodCalled"/>
- <exclude name="testInjectionIntoFilter"/>
- <exclude name="testInjectionIntoJSFManagedBean"/>
- <exclude name="testInjectionIntoServlet"/>
- <exclude name="testInjectionIntoServletListener"/>
- <exclude name="testInjectionIntoTagHandler"/>
- <exclude name="testInjectionIntoTagLibraryListener"/>
- <exclude name="testServletInitializerMethodCalled"/>
- <exclude name="testServletListenerInitializerMethodCalled"/>
- <exclude name="testTagLibraryListenerInitializerMethodCalled"/>
- </methods>
+ <class name="org.jboss.cdi.tck.tests.lookup.dynamic.DynamicLookupTest">
+ <methods>
+ <exclude name="testDuplicateBindingsThrowsException"/>
+ </methods>
</class>
- <class name="org.jboss.jsr299.tck.tests.lookup.injection.non.contextual.ws.InjectionIntoWebServiceEndPointTest">
- <methods>
- <exclude name="testInjectionIntoWebServiceEndpoint"/>
- </methods>
+ <class name="org.jboss.cdi.tck.tests.extensions.bean.bytype.BeanByTypeTest">
+ <methods>
+ <exclude name="testSameBindingTwice"/>
+ </methods>
</class>
- <class name="org.jboss.jsr299.tck.tests.lookup.injectionpoint.broken.not.bean.InjectionPointTest">
- <methods>
- <exclude name="testDefinitionErrorDetected"/>
- </methods>
+ <class name="org.jboss.cdi.tck.tests.interceptors.definition.InterceptorDefinitionTest">
+ <methods>
+ <exclude name="testSameBindingTypesToResolveInterceptorsFails"/>
+ </methods>
</class>
- <class name="org.jboss.jsr299.tck.tests.lookup.manager.jndi.ManagerTest">
+
+ <!-- not in web profile and not supported by embedded adapter anyway -->
+ <class name="org.jboss.cdi.tck.tests.deployment.packaging.rar.ResourceAdapterArchiveTest">
<methods>
- <exclude name="testManagerLookupInJndi"/>
+ <exclude name=".*" />
</methods>
</class>
- CDI-140
- <class
- name="org.jboss.jsr299.tck.tests.context.passivating.broken.passivatingProducerMethodWithNonPassivatingParameter.PassivatingProducerMethodWithNonPassivatingParameterTest">
+ <!-- not supported by embedded adapter -->
+ <class name="org.jboss.cdi.tck.tests.lookup.injection.non.contextual.InjectionIntoNonContextualComponentTest">
<methods>
- <exclude name="testSimpleDependentWebBeanWithNonSerializableImplementationInjectedIntoProducerMethodParameterWithPassivatingScopeFails"></exclude>
+ <exclude name="testInjectionIntoTagHandler" />
</methods>
</class>
</classes>
</test>
</suite>
--->
+