You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by st...@apache.org on 2017/10/25 12:22:16 UTC
tomee git commit: more CDI TCK tests
Repository: tomee
Updated Branches:
refs/heads/fb_tomee8 cde4122a4 -> 199823f29
more CDI TCK tests
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/199823f2
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/199823f2
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/199823f2
Branch: refs/heads/fb_tomee8
Commit: 199823f2916172e20d1902114a69e1a3f77d02fe
Parents: cde4122
Author: Mark Struberg <st...@apache.org>
Authored: Wed Oct 25 14:21:48 2017 +0200
Committer: Mark Struberg <st...@apache.org>
Committed: Wed Oct 25 14:21:48 2017 +0200
----------------------------------------------------------------------
pom.xml | 2 +-
tck/cdi-embedded/pom.xml | 6 +-
tck/cdi-embedded/src/test/resources/passing.xml | 35 +-
tck/cdi-tomee/pom.xml | 2 +-
tck/cdi-tomee/src/test/resources/passing.xml | 363 ++++++-------------
tck/pom.xml | 2 +-
6 files changed, 150 insertions(+), 260 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/199823f2/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 2f02617..745f80d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -129,7 +129,7 @@
<batchee.version>0.4-incubating</batchee.version>
<version.arquillian>1.1.13.Final</version.arquillian>
- <version.shrinkwrap.descriptor>2.0.0</version.shrinkwrap.descriptor>
+ <version.shrinkwrap.descriptor>2.0.0-alpha-10</version.shrinkwrap.descriptor>
<version.shrinkwrap.shrinkwrap>1.2.6</version.shrinkwrap.shrinkwrap>
<tomcat.version>8.5.23</tomcat.version>
http://git-wip-us.apache.org/repos/asf/tomee/blob/199823f2/tck/cdi-embedded/pom.xml
----------------------------------------------------------------------
diff --git a/tck/cdi-embedded/pom.xml b/tck/cdi-embedded/pom.xml
index 12a9483..5aabbd8 100644
--- a/tck/cdi-embedded/pom.xml
+++ b/tck/cdi-embedded/pom.xml
@@ -28,6 +28,10 @@
<name>OpenEJB :: TCK :: CDI Embedded</name>
<version>8.0.0-SNAPSHOT</version>
+ <properties>
+ <testngSuiteXml>src/test/resources/passing.xml</testngSuiteXml>
+ </properties>
+
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -189,7 +193,7 @@
<useFile>false</useFile>
<disableXmlReport>true</disableXmlReport>
<suiteXmlFiles>
- <suiteXmlFile>src/test/resources/passing.xml</suiteXmlFile>
+ <suiteXmlFile>${testngSuiteXml}</suiteXmlFile>
</suiteXmlFiles>
<properties>
<property> <!-- broken cause @RequestScoped beans are parameters and testng logs parameters -->
http://git-wip-us.apache.org/repos/asf/tomee/blob/199823f2/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 4c5d146..3644a08 100644
--- a/tck/cdi-embedded/src/test/resources/passing.xml
+++ b/tck/cdi-embedded/src/test/resources/passing.xml
@@ -37,8 +37,8 @@
<test name="JSR-346 TCK">
<groups>
- <run>
- <!--
+ <run>
+ <!--
The SE TCK currently uses an invalid setup.
We have to verify this again when it is setup in a sane way.
-->
@@ -46,11 +46,6 @@
</run>
</groups>
- <packages>
- <package name="org.jboss.cdi.tck.tests.*">
- </package>
- </packages>
-
<classes>
<!-- somehow blocks forever, we finally need to pass this test, just commented out temporarily! -->
<class name="org.jboss.cdi.tck.tests.context.conversation.determination.ConversationDeterminationTest">
@@ -62,6 +57,27 @@
<!-- Tests broken in the CDI-2.0 TCK: -->
+ <!-- https://issues.jboss.org/projects/CDITCK/issues/CDITCK-602, invalid assumption that a situation cannot be resolved -->
+ <class name="org.jboss.cdi.tck.tests.lookup.modules.specialization.SpecializationModularity03Test">
+ <methods><exclude name=".*"/></methods>
+ </class>
+ <class name="org.jboss.cdi.tck.tests.lookup.modules.specialization.SpecializationModularity05Test">
+ <methods><exclude name=".*"/></methods>
+ </class>
+ <class name="org.jboss.cdi.tck.tests.lookup.modules.specialization.SpecializationModularity06Test">
+ <methods><exclude name=".*"/></methods>
+ </class>
+ <class name="org.jboss.cdi.tck.tests.lookup.modules.specialization.SpecializationModularity07Test">
+ <methods><exclude name=".*"/></methods>
+ </class>
+
+ <!-- https://issues.jboss.org/projects/CDITCK/issues/CDITCK-600, uses illegal fireEvent to @ApplicationScoped bean in ProcessInjectionTarget -->
+ <class name="org.jboss.cdi.tck.tests.extensions.lifecycle.processInjectionTarget.WrappedInjectionTargetTest">
+ <methods>
+ <exclude name=".*"/>
+ </methods>
+ </class>
+
<!-- https://issues.jboss.org/projects/CDITCK/issues/CDITCK-576 -->
<class name="org.jboss.cdi.tck.tests.context.passivating.dependency.builtin.BuiltinBeanPassivationDependencyTest">
<methods>
@@ -152,6 +168,11 @@
</class>
</classes>
+
+ <packages>
+ <package name="org.jboss.cdi.tck.tests.*">
+ </package>
+ </packages>
</test>
</suite>
http://git-wip-us.apache.org/repos/asf/tomee/blob/199823f2/tck/cdi-tomee/pom.xml
----------------------------------------------------------------------
diff --git a/tck/cdi-tomee/pom.xml b/tck/cdi-tomee/pom.xml
index 1650699..09b3fec 100644
--- a/tck/cdi-tomee/pom.xml
+++ b/tck/cdi-tomee/pom.xml
@@ -60,7 +60,7 @@
<dependency>
<groupId>org.jboss.shrinkwrap.descriptors</groupId>
<artifactId>shrinkwrap-descriptors-impl-javaee</artifactId>
- <version>2.0.0-alpha-3</version>
+ <version>${version.shrinkwrap.descriptor}</version>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/tomee/blob/199823f2/tck/cdi-tomee/src/test/resources/passing.xml
----------------------------------------------------------------------
diff --git a/tck/cdi-tomee/src/test/resources/passing.xml b/tck/cdi-tomee/src/test/resources/passing.xml
index e8524e8..a306935 100644
--- a/tck/cdi-tomee/src/test/resources/passing.xml
+++ b/tck/cdi-tomee/src/test/resources/passing.xml
@@ -55,255 +55,120 @@
</methods>
</class>
- <!-- Issues in the spec -->
- <!-- CDI-437 -->
- <class name="org.jboss.cdi.tck.tests.lookup.byname.ambiguous.broken.AmbiguousELNamesTest">
- <methods>
- <exclude name=".*"/>
- </methods>
- </class>
-
- <!-- Issues in the TCK -->
- <!-- CDITCK-482 -->
- <class name="org.jboss.cdi.tck.tests.context.session.listener.shutdown.SessionContextListenerShutdownTest">
- <methods>
- <exclude name=".*"/>
- </methods>
- </class>
- <class name="org.jboss.cdi.tck.tests.deployment.shutdown.ApplicationShutdownLifecycleTest">
- <methods>
- <exclude name=".*"/>
- </methods>
- </class>
-
-
- <!-- CDITCK-480 -->
- <class name="org.jboss.cdi.tck.tests.context.conversation.ClientConversationContextTest">
- <methods>
- <exclude name="testSuppressedConversationPropagation"/>
- </methods>
- </class>
-
- <!-- CDITCK-476 -->
- <class name="org.jboss.cdi.tck.tests.context.conversation.filter.ConversationFilterTest">
- <methods>
- <exclude name=".*"/>
- </methods>
- </class>
-
- <!-- CDITCK-444 -->
- <class name="org.jboss.cdi.tck.tests.extensions.lifecycle.processBeanAttributes.broken.invalid.InvalidStereotypeTest">
- <methods>
- <exclude name=".*"/>
- </methods>
- </class>
-
- <!-- CDITCK-418 -->
- <class name="org.jboss.cdi.tck.interceptors.tests.contract.interceptorLifeCycle.environment.jndi.ejb.InterceptorEnvironmentJNDISessionBeanTest">
- <methods>
- <exclude name=".*"/>
- </methods>
- </class>
-
- <!-- CDITCK-417 -->
- <class name="org.jboss.cdi.tck.tests.extensions.registration.BeanRegistrationByExtensionInEarLibraryTest">
- <methods>
- <exclude name=".*"/>
- </methods>
- </class>
-
- <!-- CDITCK-421 -->
- <class name="org.jboss.cdi.tck.interceptors.tests.contract.aroundInvoke.AroundInvokeAccessInterceptorTest">
- <methods>
- <exclude name=".*"/>
- </methods>
- </class>
-
- <!-- CDITCK-427 -->
- <class name="org.jboss.cdi.tck.tests.lookup.circular.CircularDependencyTest">
- <methods>
- <exclude name="testDependentProducerMethodDeclaredOnNormalBeanWhichInjectsProducedBean"/>
- </methods>
- </class>
-
- <!-- CDITCK-428 -->
- <class name="org.jboss.cdi.tck.interceptors.tests.contract.interceptorLifeCycle.InterceptorLifeCycleTest">
- <methods>
- <exclude name="testInterceptorInstanceCreatedWhenTargetInstanceCreated"/>
- </methods>
- </class>
-
- <class name="org.jboss.cdi.tck.interceptors.tests.contract.aroundTimeout.AroundTimeoutInterceptorTest">
- <methods>
- <exclude name=".*"/>
- </methods>
- </class>
-
- <!-- CDITCK-423 -->
- <class name="org.jboss.cdi.tck.tests.implementation.enterprise.definition.remote.RemoteInterfaceNotInAPITypesTest">
- <methods>
- <exclude name=".*"/>
- </methods>
- </class>
-
- <!-- CDITCK-437 -->
- <class name="org.jboss.cdi.tck.tests.decorators.interceptor.DecoratorAndInterceptorTest">
- <methods>
- <exclude name="testLifecycleCallbacks"/>
- </methods>
- </class>
-
- <!-- CDITCK-449 -->
- <class name="org.jboss.cdi.tck.tests.extensions.beanManager.beanAttributes.CreateBeanAttributesTest">
- <methods>
- <exclude name="testBeanAttributesForManagedBeanWithModifiedAnnotatedType"/>
- </methods>
- </class>
- <!-- CDITCK-459 -->
- <class name="org.jboss.cdi.tck.tests.implementation.enterprise.newBean.NewEnterpriseBeanTest">
- <methods>
- <exclude name="testNewBeanCreatedForFieldInjectionPoint"/>
- <exclude name="testNewBeanCreatedForInitializerInjectionPoint"/>
- <exclude name="testNewBeanCreatedForConstructorInjectionPoint"/>
- <exclude name="testNewBeanCreatedForProducerMethod"/>
- <exclude name="testNewBeanCreatedForObserverMethod"/>
- <exclude name="testNewBeanCreatedForDisposerMethod"/>
- </methods>
- </class>
-
- <!-- 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">
- <methods>
- <exclude name="testConversationPropagatedAjax" />
- </methods>
- </class>
-
- <!-- CDITCK-466 -->
- <class name="org.jboss.cdi.tck.tests.extensions.lifecycle.bbd.broken.passivatingScope.AddingPassivatingScopeTest">
- <methods>
- <exclude name=".*"/>
- </methods>
- </class>
-
- <!-- CDITCK-467 -->
- <class name="org.jboss.cdi.tck.tests.extensions.lifecycle.processBeanAttributes.specialization.SpecializationTest">
- <methods>
- <exclude name=".*"/>
- </methods>
- </class>
- <class name="org.jboss.cdi.tck.tests.extensions.lifecycle.processBeanAttributes.VerifyValuesTest">
- <methods>
- <exclude name="testManagedBeanAttributes"/>
- </methods>
- </class>
-
- <!-- CDI-514 (issue got moved from original CDITCK-467) -->
- <class name="org.jboss.cdi.tck.tests.event.fires.FireEventTest">
- <methods>
- <exclude name="testDuplicateBindingsToFireEventFails"/>
- </methods>
- </class>
- <class name="org.jboss.cdi.tck.tests.event.select.SelectEventTest">
- <methods>
- <exclude name=".*DuplicateBindingType"/>
- </methods>
- </class>
- <class name="org.jboss.cdi.tck.tests.event.resolve.binding.DuplicateBindingTypesWhenResolvingTest">
- <methods>
- <exclude name=".*"/>
- </methods>
- </class>
- <class name="org.jboss.cdi.tck.tests.lookup.dynamic.DynamicLookupTest">
- <methods>
- <exclude name="testDuplicateBindingsThrowsException"/>
- </methods>
- </class>
- <class name="org.jboss.cdi.tck.tests.extensions.bean.bytype.BeanByTypeTest">
- <methods>
- <exclude name="testSameBindingTwice"/>
- </methods>
- </class>
- <class name="org.jboss.cdi.tck.tests.interceptors.definition.InterceptorDefinitionTest">
- <methods>
- <exclude name="testSameBindingTypesToResolveInterceptorsFails"/>
- </methods>
- </class>
-
-
- <!-- CDI-312 ambiguous BDA definition (EE-module vs JAR) -->
- <class name="org.jboss.cdi.tck.tests.interceptors.ordering.global.GlobalInterceptorOrderingTest">
- <methods>
- <exclude name=".*"/>
- </methods>
- </class>
- <class name="org.jboss.cdi.tck.tests.extensions.interceptors.InterceptorExtensionTest">
- <methods>
- <exclude name=".*"/>
- </methods>
- </class>
- <class name="org.jboss.cdi.tck.tests.lookup.modules.specialization.alternative.Specialization02Test">
- <methods>
- <exclude name=".*"/>
- </methods>
- </class>
- <class name="org.jboss.cdi.tck.tests.lookup.modules.specialization.alternative.Specialization03Test">
- <methods>
- <exclude name=".*"/>
- </methods>
- </class>
- <class name="org.jboss.cdi.tck.tests.lookup.modules.specialization.alternative.Specialization05Test">
- <methods>
- <exclude name=".*"/>
- </methods>
- </class>
- <class name="org.jboss.cdi.tck.tests.lookup.manager.provider.runtime.CDIProviderRuntimeTest">
- <methods>
- <exclude name=".*"/>
- </methods>
- </class>
- <class name="org.jboss.cdi.tck.tests.deployment.packaging.war.modules.WebArchiveModulesTest">
- <methods>
- <exclude name="testAlternatives"/>
- <exclude name="testInjectionChainVisibilityAndInterceptorEnablement"/>
- <exclude name="testDecoratorAndCrossModuleEventObserver"/>
- </methods>
- </class>
- <class name="org.jboss.cdi.tck.tests.lookup.manager.provider.init.CDIProviderInitTest">
- <methods>
- <exclude name=".*"/>
- </methods>
- </class>
-
- <!-- CDI-517 -->
- <class name="org.jboss.cdi.tck.tests.lookup.typesafe.resolution.parameterized.raw.RawBeanTypeParameterizedRequiredTypeTest">
- <methods>
- <exclude name="testNotAssignableTypeParams"/>
- </methods>
- </class>
-
- <!-- CDI-581 / CDITCK-509 -->
- <class name="org.jboss.cdi.tck.tests.extensions.lifecycle.processBeanAttributes.specialization.VetoTest">
- <methods>
- <exclude name=".*"/>
- </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>
- </class>
-
- <!-- ears so not in web profile, Note: can be switch on if passing but dont let them block the build -->
+ <!-- Tests broken in the CDI-2.0 TCK: -->
+
+ <!-- https://issues.jboss.org/projects/CDITCK/issues/CDITCK-602, invalid assumption that a situation cannot be resolved -->
+ <class name="org.jboss.cdi.tck.tests.lookup.modules.specialization.SpecializationModularity03Test">
+ <methods><exclude name=".*"/></methods>
+ </class>
+ <class name="org.jboss.cdi.tck.tests.lookup.modules.specialization.SpecializationModularity05Test">
+ <methods><exclude name=".*"/></methods>
+ </class>
+ <class name="org.jboss.cdi.tck.tests.lookup.modules.specialization.SpecializationModularity06Test">
+ <methods><exclude name=".*"/></methods>
+ </class>
+ <class name="org.jboss.cdi.tck.tests.lookup.modules.specialization.SpecializationModularity07Test">
+ <methods><exclude name=".*"/></methods>
+ </class>
+
+ <!-- https://issues.jboss.org/projects/CDITCK/issues/CDITCK-600, uses illegal fireEvent to @ApplicationScoped bean in ProcessInjectionTarget -->
+ <class name="org.jboss.cdi.tck.tests.extensions.lifecycle.processInjectionTarget.WrappedInjectionTargetTest">
+ <methods>
+ <exclude name=".*"/>
+ </methods>
+ </class>
+
+ <!-- https://issues.jboss.org/projects/CDITCK/issues/CDITCK-576 -->
+ <class name="org.jboss.cdi.tck.tests.context.passivating.dependency.builtin.BuiltinBeanPassivationDependencyTest">
+ <methods>
+ <exclude name="testInjectionPoint"/>
+ </methods>
+ </class>
+
+ <!-- https://issues.jboss.org/browse/CDITCK-577 -->
+ <class name="org.jboss.cdi.tck.tests.definition.bean.BeanDefinitionTest">
+ <methods>
+ <exclude name="testRawBeanTypes"/>
+ </methods>
+ </class>
+
+ <!-- https://issues.jboss.org/browse/CDITCK-432 -->
+ <class name="org.jboss.cdi.tck.tests.decorators.builtin.event.complex.ComplexEventDecoratorTest">
+ <methods><exclude name=".*"/></methods>
+ </class>
+
+ <!-- https://issues.jboss.org/browse/CDITCK-578, https://issues.jboss.org/browse/CDITCK-579 -->
+ <class name="org.jboss.cdi.tck.tests.definition.bean.custom.CustomBeanImplementationTest">
+ <methods>
+ <exclude name="testCustomBeanIsPassivationCapable"/>
+ <exclude name="testCustomBeanIsPassivationCapableDependency"/>
+ <exclude name="testInjectionPointGetMemberIsUsedToDetermineTheClassThatDeclaresAnInjectionPoint"/>
+ </methods>
+ </class>
+
+ <!-- this tests Weld specific internals -->
+ <class name="org.jboss.cdi.tck.tests.definition.bean.types.illegal.BeanTypesWithIllegalTypeTest">
+ <methods><exclude name=".*"/></methods>
+ </class>
+
+ <!-- https://issues.jboss.org/browse/CDITCK-580 -->
+ <class name="org.jboss.cdi.tck.tests.inheritance.specialization.simple.SimpleBeanSpecializationTest">
+ <methods><exclude name=".*"/></methods>
+ </class>
+
+ <!-- https://issues.jboss.org/browse/CDI-498 dots in EL names are not allowed by the EL spec. -->
+ <class name="org.jboss.cdi.tck.tests.lookup.el.ResolutionByNameTest">
+ <methods><exclude name="testBeanNameWithSeparatedListOfELIdentifiers"/></methods>
+ </class>
+
+ <!-- OWB provides a bit more for @New than CDI requires
+ https://issues.jboss.org/browse/CDITCK-581
+ -->
+ <class name="org.jboss.cdi.tck.tests.lookup.dynamic.DynamicLookupTest">
+ <methods>
+ <exclude name="testNewBeanNotEnabledWithouInjectionPoint"/>
+ <exclude name="testDuplicateBindingsThrowsException"/>
+ </methods>
+ </class>
+
+ <!-- https://issues.jboss.org/browse/CDITCK-586 -->
+ <class name="org.jboss.cdi.tck.tests.event.observer.async.basic.MixedObserversTest">
+ <methods><exclude name="testAsyncObserversCalledInDifferentThread"/></methods>
+ </class>
+
+ <!-- https://issues.jboss.org/browse/CDITCK-588 equals on AnnotatedType -->
+ <!-- https://issues.jboss.org/browse/CDITCK-589 because the ct predicate ends up randomly removing from the wrong ct -->
+ <class name="org.jboss.cdi.tck.tests.extensions.configurators.annotatedTypeConfigurator.AnnotatedTypeConfiguratorTest">
+ <methods><exclude name=".*"/></methods>
+ </class>
+
+ <!-- https://issues.jboss.org/browse/CDITCK-573 should be solved with tck 2.0.1.Final -->
+ <class name="org.jboss.cdi.tck.tests.extensions.configurators.bean.BeanConfiguratorTest">
+ <methods><exclude name=".*"/></methods>
+ </class>
+
+ <!-- https://issues.jboss.org/browse/CDITCK-591 -->
+ <class name="org.jboss.cdi.tck.tests.extensions.alternative.metadata.AlternativeMetadataTest">
+ <methods><exclude name=".*"/></methods>
+ </class>
+
+ <!-- https://issues.jboss.org/browse/CDI-581 , both tests...-->
+ <class name="org.jboss.cdi.tck.tests.extensions.lifecycle.processBeanAttributes.specialization.VetoTest">
+ <methods><exclude name=".*"/></methods>
+ </class>
+ <class name="org.jboss.cdi.tck.tests.extensions.lifecycle.processBeanAttributes.specialization.SpecializationTest">
+ <methods><exclude name=".*"/></methods>
+ </class>
+
+ <!-- CDITCK-466 -->
+ <class name="org.jboss.cdi.tck.tests.extensions.lifecycle.bbd.broken.passivatingScope.AddingPassivatingScopeTest">
+ <methods>
+ <exclude name=".*"/>
+ </methods>
+ </class>
+
+
+ <!-- ears so not in web profile, Note: can be switch on if passing but dont let them block the build -->
<class name="org.jboss.cdi.tck.tests.lookup.dependency.resolution.broken.ambiguous.ear.MultiModuleSessionBeanAmbiguousDependencyTest"><methods><exclude name=".*" /></methods></class>
<class name="org.jboss.cdi.tck.tests.lookup.modules.interceptors.InterceptorModularityTest"><methods><exclude name=".*" /></methods></class>
<class name="org.jboss.cdi.tck.tests.lookup.modules.specialization.SpecializationModularity03Test"><methods><exclude name=".*" /></methods></class>
http://git-wip-us.apache.org/repos/asf/tomee/blob/199823f2/tck/pom.xml
----------------------------------------------------------------------
diff --git a/tck/pom.xml b/tck/pom.xml
index 68e4beb..687ccc7 100644
--- a/tck/pom.xml
+++ b/tck/pom.xml
@@ -28,7 +28,7 @@
<name>OpenEJB :: TCK</name>
<properties>
- <cdi.tck.20.version>2.0.0.Final</cdi.tck.20.version>
+ <cdi.tck.20.version>2.0.3.Final</cdi.tck.20.version>
</properties>
<modules>