This is an automated email from the ASF dual-hosted git repository.
struberg pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/openwebbeans.git
The following commit(s) were added to refs/heads/main by this push:
new bc9f839dd OWB-1417 enable tck again
bc9f839dd is described below
commit bc9f839dd315d7f2ebced95483f76ca013cd48b0
Author: Mark Struberg <[email protected]>
AuthorDate: Tue Jan 24 21:09:50 2023 +0100
OWB-1417 enable tck again
Quite a few are failing as some packages got moved around
---
pom.xml | 4 +-
webbeans-tck/pom.xml | 160 ++++++++++++++++++++++----------------
webbeans-tck/standalone-suite.xml | 36 +++++----
3 files changed, 115 insertions(+), 85 deletions(-)
diff --git a/pom.xml b/pom.xml
index 8a2f50f26..41e3f458a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -769,14 +769,12 @@
<module>webbeans-ee-common</module>
<module>webbeans-ee</module>
<module>webbeans-jms</module>
+ <module>webbeans-tck</module>
<!--X TODO re-enable
<module>webbeans-jetty9</module>
<module>webbeans-jsf</module>
- <module>webbeans-resource</module>
<module>webbeans-osgi</module>
<module>samples</module>
- <module>atinject-tck</module>
- <module>webbeans-tck</module>
<module>webbeans-tck-jakarta</module>
<module>distribution</module>
<module>bom</module>
diff --git a/webbeans-tck/pom.xml b/webbeans-tck/pom.xml
index 52d2afd42..70bca227d 100644
--- a/webbeans-tck/pom.xml
+++ b/webbeans-tck/pom.xml
@@ -33,25 +33,26 @@
<dependencyManagement>
<dependencies>
- <dependency>
- <groupId>org.jboss.arquillian</groupId>
- <artifactId>arquillian-bom</artifactId>
- <version>${arquillian.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
+ <!--X
+ <dependency>
+ <groupId>org.jboss.arquillian</groupId>
+ <artifactId>arquillian-bom</artifactId>
+ <version>${arquillian.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ -->
</dependencies>
</dependencyManagement>
<dependencies>
<!-- Those dependencies are required for standalone TCK testing -->
-
+
<dependency>
<groupId>jakarta.interceptor</groupId>
<artifactId>jakarta.interceptor-api</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-finder-shaded</artifactId>
@@ -60,7 +61,7 @@
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
- <version>6.14.3</version>
+ <version>7.4.0</version>
<scope>test</scope>
</dependency>
@@ -74,30 +75,48 @@
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-spi</artifactId>
</dependency>
-
- <dependency>
- <groupId>jakarta.enterprise</groupId>
- <artifactId>jakarta.enterprise.cdi-api</artifactId>
- </dependency>
-
+
+ <dependency>
+ <groupId>jakarta.enterprise</groupId>
+ <artifactId>jakarta.enterprise.cdi-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-servlet-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-jsp-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-porting</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.openwebbeans.arquillian</groupId>
+ <artifactId>owb-arquillian-standalone</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ejb_3.1_spec</artifactId>
+ <!-- arquillian dependency hell hitting us again... -->
+ <groupId>org.jboss.arquillian.container</groupId>
+ <artifactId>arquillian-container-test-impl-base</artifactId>
+ <version>${arquillian.version}</version>
</dependency>
<dependency>
- <groupId>org.jboss.cdi.tck</groupId>
- <artifactId>cdi-tck-impl</artifactId>
+ <groupId>jakarta.enterprise</groupId>
+ <artifactId>cdi-tck-core-impl</artifactId>
<version>${cdi.tck.version}</version>
- <scope>compile</scope>
<exclusions>
<exclusion>
- <groupId>javax.enterprise</groupId>
- <artifactId>cdi-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
+ <groupId>jakarta.enterprise</groupId>
+ <artifactId>jakarta.enterprise.cdi-api</artifactId>
</exclusion>
<exclusion>
<groupId>jakarta.servlet</groupId>
@@ -105,12 +124,58 @@
</exclusion>
<exclusion>
<groupId>jakarta.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
+ <artifactId>jakarta.servlet.jsp-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jakarta.interceptor</groupId>
+ <artifactId>jakarta.interceptor-api</artifactId>
</exclusion>
<exclusion>
- <groupId>jakarta.transaction</groupId>
- <artifactId>jta</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>jakarta.el</groupId>
+ <artifactId>jakarta.el-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jakarta.inject</groupId>
+ <artifactId>jakarta.inject-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jakarta.ejb</groupId>
+ <artifactId>jakarta.ejb-api</artifactId>
+ </exclusion>
+ <!-- not yet G jakarta jars
+ <exclusion>
+ <groupId>jakarta.resource</groupId>
+ <artifactId>jakarta.resource-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jakarta.jms</groupId>
+ <artifactId>jakarta.jms-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jakarta.persistence</groupId>
+ <artifactId>jakarta.persistence-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jakarta.ws.rs</groupId>
+ <artifactId>jakarta.ws.rs-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jakarta.xml.ws</groupId>
+ <artifactId>jakarta.xml.ws-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jakarta.transaction</groupId>
+ <artifactId>jakarta.transaction-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jakarta.faces</groupId>
+ <artifactId>jakarta.faces-api</artifactId>
+ </exclusion>
+ -->
</exclusions>
</dependency>
@@ -124,42 +189,7 @@
</activation>
<dependencies>
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-porting</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.openwebbeans.arquillian</groupId>
- <artifactId>owb-arquillian-standalone</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <!-- arquillian dependency hell hitting us again... -->
- <groupId>org.jboss.arquillian.container</groupId>
-
<artifactId>arquillian-container-test-impl-base</artifactId>
- <version>${arquillian.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jsp_2.2_spec</artifactId>
- <version>1.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.1_spec</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_3.0_spec</artifactId>
- <scope>test</scope>
- </dependency>
-
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
diff --git a/webbeans-tck/standalone-suite.xml
b/webbeans-tck/standalone-suite.xml
index d2582f928..6b98b038e 100644
--- a/webbeans-tck/standalone-suite.xml
+++ b/webbeans-tck/standalone-suite.xml
@@ -57,27 +57,28 @@
<classes>
<!-- Tests broken in the CDI-2.0 TCK: -->
+<!--
- <!-- https://issues.jboss.org/projects/CDITCK/issues/CDITCK-576 -->
+ <!–
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 -->
+ <!– 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 -->
+ <!– 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 -->
+ <!– 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"/>
@@ -86,24 +87,24 @@
</methods>
</class>
- <!-- this tests Weld specific internals -->
+ <!– 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 -->
+ <!– 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. -->
+ <!– 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
+ <!– 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"/>
@@ -111,33 +112,33 @@
</methods>
</class>
- <!-- https://issues.jboss.org/browse/CDITCK-582 -->
+ <!– https://issues.jboss.org/browse/CDITCK-582 –>
<class
name="org.jboss.cdi.tck.tests.deployment.discovery.BeanDiscoveryTest">
<methods><exclude name=".*"/></methods>
</class>
- <!-- https://issues.jboss.org/browse/CDITCK-586 -->
+ <!– 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 -->
+ <!– 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 -->
+ <!– 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 -->
+ <!– 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...-->
+ <!– 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>
@@ -145,12 +146,13 @@
<methods><exclude name=".*"/></methods>
</class>
- <!-- CDITCK-466 -->
+ <!– CDITCK-466 –>
<class
name="org.jboss.cdi.tck.tests.extensions.lifecycle.bbd.broken.passivatingScope.AddingPassivatingScopeTest">
<methods>
<exclude name=".*"/>
</methods>
</class>
+-->
</classes>
