Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

WELD-2778 Re-introduce EE parts of CDI TCKs into regular coverage #3081

Merged
merged 3 commits into from
Nov 11, 2024
Merged

WELD-2778 Re-introduce EE parts of CDI TCKs into regular coverage #3081

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d57a22d
WELD-2778 Re-introduce EE parts of CDI TCKs into regular coverage
manovotn Nov 8, 2024
430c34f
Remove several leftover configurations
manovotn Nov 8, 2024
ab0e734
Use correct exclusion list for relaxed construction testing
manovotn Nov 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci-actions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ jobs:
run: |
JBOSS_HOME=`pwd`'/wildfly'
export JBOSS_HOME=`echo $JBOSS_HOME`
mvn clean verify -Dincontainer -Dno-format -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 -Dcdi.tck.suite.xml.file=src/test/tck/tck-tests.xml -Dadditional.vm.args="-Dorg.jboss.weld.construction.relaxed=true" -f jboss-tck-runner/pom.xml
mvn clean verify -Dincontainer -Dno-format -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 -Dcdi.tck.suite.xml.file=src/test/tck/tck-tests-web.xml -Dadditional.vm.args="-Dorg.jboss.weld.construction.relaxed=true" -f jboss-tck-runner/pom.xml
- name: Prepare failure archive (if maven failed)
if: failure()
shell: bash
Expand Down
47 changes: 32 additions & 15 deletions jboss-tck-runner/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>weld-jboss-runner-tck</artifactId>
<name>CDI TCK runner (4.0) for Weld (WildFly)</name>
<name>CDI TCK runner (4.1) for Weld (WildFly)</name>
<description>Aggregates dependencies and runs the CDI TCK (both standalone and on WildFly)</description>

<licenses>
Expand Down Expand Up @@ -163,17 +163,17 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
<configuration>
<!-- http://bugs.java.com/bugdatabase/view_bug.do?bug_id=4425695 -->
<argLine>-Xmx768m -Dsun.zip.disableMemoryMapping=true</argLine>
<forkMode>once</forkMode>
<properties>
<property>
<name>usedefaultlisteners</name>
<value>false</value>
</property>
</properties>
<dependenciesToScan>
<!-- Jakarta CDI spec TCK part -->
<dependency>jakarta.enterprise:cdi-tck-core-impl</dependency>
<!-- Jakarta Platform TCK bits -->
<dependency>jakarta.tck:cdi-tck-ee-impl</dependency>
</dependenciesToScan>
</configuration>
</plugin>
Expand Down Expand Up @@ -231,7 +231,7 @@
<activation>
<activeByDefault>true</activeByDefault>
<property>
<name>!tck12</name>
<name>!skipCopyTestSuites</name>
</property>
</activation>
<build>
Expand Down Expand Up @@ -259,6 +259,15 @@
<overWrite>false</overWrite>
<destFileName>tck-core-suite.xml</destFileName>
</artifactItem>
<artifactItem>
<groupId>jakarta.tck</groupId>
<artifactId>cdi-tck-ee-impl</artifactId>
<version>${platform.tck-4-1.version}</version>
<type>xml</type>
<classifier>suite</classifier>
<overWrite>false</overWrite>
<destFileName>tck-web-suite.xml</destFileName>
</artifactItem>
</artifactItems>
<outputDirectory>target/suites</outputDirectory>
<overWriteReleases>false</overWriteReleases>
Expand Down Expand Up @@ -332,8 +341,6 @@
available during in-container test execution -->
<org.jboss.cdi.tck.libraryDirectory>target/dependency/lib</org.jboss.cdi.tck.libraryDirectory>
<org.jboss.cdi.tck.testDataSource>java:jboss/datasources/ExampleDS</org.jboss.cdi.tck.testDataSource>
<!-- Travis CI build workaround -->
<argLine>${travis.surefire.argLine}</argLine>
</systemPropertyVariables>
<suiteXmlFiles>
<suiteXmlFile>${cdi.tck.suite.xml.file}</suiteXmlFile>
Expand All @@ -356,10 +363,26 @@
</activation>
<properties>
<excluded.groups>se</excluded.groups>
<!-- Note that this is the CDI CORE exclude list; it doesn't include TCKs living in EE platform suite -->
<cdi.tck.suite.xml.file>target/suites/tck-core-suite.xml</cdi.tck.suite.xml.file>
<!-- This is an exlude list taken from EE Platform TCK repo -->
<!-- Note that we run those tests combined with TCKs from CDI repo that do have their own file -->
<!-- In case the Platform TCK isn't a superset of the CDI TCK, we will need to adjust this -->
<cdi.tck.suite.xml.file>target/suites/tck-web-suite.xml</cdi.tck.suite.xml.file>
</properties>
<dependencies>
<dependency>
<groupId>jakarta.tck</groupId>
<artifactId>cdi-tck-ee-impl</artifactId>
<version>${platform.tck-4-1.version}</version>
<type>xml</type>
<classifier>suite</classifier>
<scope>test</scope>
</dependency>
<dependency>
<groupId>jakarta.tck</groupId>
<artifactId>cdi-tck-ee-impl</artifactId>
<version>${platform.tck-4-1.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.wildfly.arquillian</groupId>
<artifactId>wildfly-arquillian-container-managed</artifactId>
Expand All @@ -377,12 +400,6 @@
<groupId>org.jboss.logmanager</groupId>
<artifactId>log4j-jboss-logmanager</artifactId>
</exclusion>
<!-- Needs to be excluded, otherwise needs an extra dependency on org.slf4j:slf4j-api -->
<!-- Future versions of wildfly-arquillian-container-managed will no longer need this exclusion, see https://issues.redhat.com/browse/WFARQ-119 -->
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
Expand Down
16 changes: 15 additions & 1 deletion jboss-tck-runner/src/test/tck/tck-tests-web.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,21 @@
<!-- Issues in the spec -->

<!-- Issues in the TCK -->
<!-- CDITCK-597; test is only part of web profile of TCK and excluded there as well -->
<!-- https://github.com/jakartaee/cdi-tck/issues/440 -->
<class name="org.jboss.cdi.tck.tests.full.extensions.lifecycle.processBeanAttributes.specialization.VetoTest">
<methods>
<exclude name=".*"/>
</methods>
</class>

<!-- CDITCK-587 -->
<class name="org.jboss.cdi.tck.tests.event.observer.transactional.roolback.TransactionalObserverRollbackTest">
<methods>
<exclude name=".*"/>
</methods>
</class>

<!-- CDITCK-597 -->
<class name="org.jboss.cdi.tck.tests.deployment.packaging.ejb.EJBJarDeploymentTest">
<methods>
<exclude name=".*"/>
Expand Down
6 changes: 3 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@
<jdk.min.version>11</jdk.min.version>

<build.timestamp>${maven.build.timestamp}</build.timestamp>
<!-- Travis CI build workaround -->
<travis.surefire.argLine>-Xmx1024m</travis.surefire.argLine>

<!-- Only initialized in JDK 9 profile to provide extra CMD args to surefire -->
<surefire.plugin.jdk17.args />
Expand All @@ -56,8 +54,10 @@
<arquillian.se.container.version>1.0.2.Final</arquillian.se.container.version>
<arquillian.tomcat.version>1.2.1.Final</arquillian.tomcat.version>
<atinject.tck.version>2.0.1</atinject.tck.version>
<!-- Version of the CDI 4.x release TCK -->
<!-- Version of the CDI 4.1 TCK release -->
<cdi.tck-4-1.version>4.1.0</cdi.tck-4-1.version>
<!-- Version of the Jakarta Platform TCK 4.1 release -->
<platform.tck-4-1.version>11.0.0.M1</platform.tck-4-1.version>
<!-- By default, each mvn profile uses corresponding file from TCK repo, see jboss-tck-runner/pom.xml -->
<!-- We can also use our own file, needed for relaxed mode testing (see WeldMethodInterceptor) -->
<!-- Our variant is under src/test/tck/tck-tests.xml -->
Expand Down
Loading