Skip to content

Commit

Permalink
Merge pull request #1702 from arjantijms/gf_runner_ejb_profiles
Browse files Browse the repository at this point in the history 
Introduce several profiles to run sub-sets of Enterprise Bean tests.
  • Loading branch information
@arjantijms
arjantijms authored Dec 12, 2024
2 parents 6641e0b + b9659a1 commit 5038b04
Show file tree
Hide file tree
Showing 2 changed files with 241 additions and 43 deletions.
29 changes: 1 addition & 28 deletions glassfish-runner/enterprise-beans-tck/enterprise-beans-tck-install/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,17 +53,7 @@
<configuration>
<excludes>**/extensions.xml</excludes>
<url>https://github.com/jakartaee/platform-tck/archive/refs/heads/main.zip</url>
</configuration>
</execution>

<execution>
<id>download-tck-tools</id>
<goals>
<goal>wget</goal>
</goals>
<phase>generate-resources</phase>
<configuration>
<url>https://github.com/eclipse-ee4j/jakartaee-tck-tools/archive/refs/heads/master.zip</url>
<skipCache>true</skipCache>
</configuration>
</execution>
</executions>
Expand Down Expand Up @@ -107,23 +97,6 @@
<goals>clean source:jar install -pl ":ejb30" -pl ":ejb32"</goals>
</configuration>
</execution>

<!-- Build and install the Arquillian tools for the TCK -->
<execution>
<id>tools_build</id>
<goals>
<goal>run</goal>
</goals>
<phase>process-resources</phase>
<configuration>
<streamLogs>true</streamLogs>
<projectsDirectory>${project.build.directory}/jakartaee-tck-tools-master/arquillian</projectsDirectory>
<pomIncludes>
<pomInclude>pom.xml</pomInclude>
</pomIncludes>
<goals>clean source:jar install</goals>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
Expand Down
255 changes: 240 additions & 15 deletions glassfish-runner/enterprise-beans-tck/enterprise-beans-tck-run/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,24 @@
<!--
Copyright (c) 2024 Contributors to the Eclipse Foundation.
~ Copyright 2010, Red Hat, Inc., and individual contributors
Running all tests (except timeout)
mvn clean install
Running separate clusters of tests
ejb30 lite env tests:
mvn spotless:apply && mvn clean install -Dglassfish.version=8.0.0-SNAPSHOT -Dmaven.build.cache.enabled=false -Pejb30,exclude-timeout,ejb30_lite_env
ejb30 assembly, misc and tx tests:
mvn spotless:apply && mvn clean install -Dglassfish.version=8.0.0-SNAPSHOT -Dmaven.build.cache.enabled=false -Pejb30,exclude-timeout,ejb30_assembly_misc_tx
etc
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
Expand Down Expand Up @@ -68,6 +86,11 @@
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.5.2</version>
</dependency>
</dependencies>
</dependencyManagement>

Expand Down Expand Up @@ -280,16 +303,6 @@
<include>**/*TestCase.java</include>
<include>**/*TestSuite.java</include>
</includes>
<excludes>
<exclude>com.sun.ts.tests.ejb30.assembly.initorder.warejb.ClientTest</exclude>
<exclude>com.sun.ts.tests.ejb30.lite.singleton.concurrency.container.annotated.ClientEjblitejspTest</exclude>
<exclude>com.sun.ts.tests.ejb30.lite.singleton.concurrency.container.annotated.ClientEjbliteservlet2Test</exclude>
<exclude>com.sun.ts.tests.ejb30.lite.singleton.concurrency.container.annotated.ClientEjbliteservletTest</exclude>
<exclude>com.sun.ts.tests.ejb30.misc.datasource.twowars.ClientTest</exclude>
<exclude>com.sun.ts.tests.ejb30.misc.moduleName.twowars.ClientTest</exclude>
<exclude>com.sun.ts.tests.ejb30.misc.moduleName.conflict.ClientTest</exclude>
<exclude>com.sun.ts.tests.ejb30.tx.session.stateless.cm.covariant.ClientTest</exclude>
</excludes>

<systemPropertyVariables>
<glassfish.home>${glassfish.home}</glassfish.home>
Expand Down Expand Up @@ -354,6 +367,16 @@
<configuration>
<dependenciesToScan>jakarta.tck:ejb30</dependenciesToScan>
<groups>tck-javatest</groups>
<excludes>
<exclude>com.sun.ts.tests.ejb30.assembly.initorder.warejb.ClientTest</exclude>
<exclude>com.sun.ts.tests.ejb30.lite.singleton.concurrency.container.annotated.ClientEjblitejspTest</exclude>
<exclude>com.sun.ts.tests.ejb30.lite.singleton.concurrency.container.annotated.ClientEjbliteservlet2Test</exclude>
<exclude>com.sun.ts.tests.ejb30.lite.singleton.concurrency.container.annotated.ClientEjbliteservletTest</exclude>
<exclude>com.sun.ts.tests.ejb30.misc.datasource.twowars.ClientTest</exclude>
<exclude>com.sun.ts.tests.ejb30.misc.moduleName.twowars.ClientTest</exclude>
<exclude>com.sun.ts.tests.ejb30.misc.moduleName.conflict.ClientTest</exclude>
<exclude>com.sun.ts.tests.ejb30.tx.session.stateless.cm.covariant.ClientTest</exclude>
</excludes>
</configuration>
</execution>
</executions>
Expand Down Expand Up @@ -405,20 +428,203 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>3.3.1</version>
<configuration>
<!-- These take about 1 hour each: move to profile
and/or look at reducing timeout settings -->
<excludes>
<!-- These take about 1 hour each: look at reducing timeout settings -->
<exclude>com.sun.ts.tests.ejb30.bb.session.stateful.timeout.annotated.ClientEjblitejspTest</exclude>
<exclude>com.sun.ts.tests.ejb30.bb.session.stateful.timeout.descriptor.ClientEjblitejspTest</exclude>
<exclude>com.sun.ts.tests.ejb30.lite.stateful.timeout.annotated.ClientEjblitejspTest</exclude>
<exclude>com.sun.ts.tests.ejb30.lite.stateful.timeout.descriptor.ClientEjblitejspTest</exclude>

<!-- [INFO] Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 91.29 s -->
<exclude>com.sun.ts.tests.ejb30.bb.session.stateful.concurrency.accesstimeout.annotated.ClientEjbliteservlet2Test</exclude>

<!-- [INFO] Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 91.20 s -->
<exclude>com.sun.ts.tests.ejb30.bb.session.stateful.concurrency.accesstimeout.annotated.ClientEjbliteservletTest</exclude>

<!-- [INFO] Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 91.23 s -->
<exclude>com.sun.ts.tests.ejb30.bb.session.stateful.concurrency.accesstimeout.annotated.JsfClientEjblitejsfTest</exclude>

<!-- [INFO] Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 141.3 s -->
<exclude>com.sun.ts.tests.ejb30.bb.session.stateful.concurrency.metadata.annotated.ClientEjblitejspTest</exclude>

<!-- [INFO] Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 141.2 s -->
<exclude>com.sun.ts.tests.ejb30.bb.session.stateful.concurrency.metadata.annotated.ClientEjbliteservlet2Test</exclude>

<!-- [INFO] Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 141.2 s -->
<exclude>com.sun.ts.tests.ejb30.bb.session.stateful.concurrency.metadata.annotated.ClientEjbliteservletTest</exclude>

<!-- [INFO] Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 141.3 s -->
<exclude>com.sun.ts.tests.ejb30.bb.session.stateful.concurrency.metadata.annotated.JsfClientEjblitejsfTest</exclude>
</excludes>
</configuration>
</plugin>
</plugins>
</build>
</profile>

<profile>
<id>ejb30_assembly_misc_tx</id>
<build>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<includes>
<include>com.sun.ts.tests.ejb30.assembly.**.*Test</include>
<include>com.sun.ts.tests.ejb30.misc.**.*Test</include>
<include>com.sun.ts.tests.ejb30.tx.**.*Test</include>
</includes>
</configuration>
</plugin>
</plugins>
</build>
</profile>

<profile>
<id>ejb30_bb</id>
<build>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<includes>
<include>com.sun.ts.tests.ejb30.bb.**.*Test</include>
</includes>
</configuration>
</plugin>
</plugins>
</build>
</profile>

<profile>
<id>ejb30_timer</id>
<build>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<includes>
<include>com.sun.ts.tests.ejb30.timer.**.*Test</include>
</includes>
</configuration>
</plugin>
</plugins>
</build>
</profile>

<!-- [INFO] Tests run: 166, Failures: 0, Errors: 0, Skipped: 0
[INFO] Total time: 10:53 min
-->
<profile>
<id>ejb30_lite_singleton</id>
<build>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<includes>
<include>com.sun.ts.tests.ejb30.lite.singleton.**.*Test</include>
</includes>
</configuration>
</plugin>
</plugins>
</build>
</profile>

<!-- [INFO] Tests run: 292, Failures: 0, Errors: 0, Skipped: 0
[INFO] Total time: 12:06 min
-->
<profile>
<id>ejb30_lite_appexception</id>
<build>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<includes>
<include>com.sun.ts.tests.ejb30.lite.appexception.**.*Test</include>
</includes>
</configuration>
</plugin>
</plugins>
</build>
</profile>

<!-- [INFO] Tests run: 40, Failures: 0, Errors: 0, Skipped: 0
[INFO] Total time: 44.032 s
-->
<profile>
<id>ejb30_lite_rest</id>
<build>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<includes>
<include>com.sun.ts.tests.ejb30.lite.ejbcontext.**.*Test</include>
<include>com.sun.ts.tests.ejb30.lite.basic.**.*Test</include>
<include>com.sun.ts.tests.ejb30.lite.naming.**.*Test</include>
<include>com.sun.ts.tests.ejb30.lite.lookup.**.*Test</include>
<include>com.sun.ts.tests.ejb30.lite.async.**.*Test</include>
<include>com.sun.ts.tests.ejb30.lite.interceptor.**.*Test</include>
<include>com.sun.ts.tests.ejb30.lite.packaging.**.*Test</include>
<include>com.sun.ts.tests.ejb30.lite.nointerface.**.*Test</include>
<include>com.sun.ts.tests.ejb30.lite.view.**.*Test</include>
<include>com.sun.ts.tests.ejb30.lite.xmloverride.**.*Test</include>
</includes>
</configuration>
</plugin>
</plugins>
</build>
</profile>

<!--
[INFO] Tests run: 24, Failures: 0, Errors: 0, Skipped: 0
[INFO] Total time: 52.573 s

Containts unstable tests:

com.sun.ts.tests.ejb30.lite.enventry.singleton.ClientEjbliteservlet2Test.clientPostConstructRecords
com.sun.ts.tests.ejb30.lite.enventry.stateful.ClientEjbliteservlet2Test.clientPostConstructRecords
com.sun.ts.tests.ejb30.lite.enventry.stateless.ClientEjbliteservlet2Test.clientPostConstructRecords

Failure occurance on local macOS laptop ~1/3 of runs
-->
<profile>
<id>ejb30_lite_env</id>
<build>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<includes>
<include>com.sun.ts.tests.ejb30.lite.enventry.**.*Test</include>
</includes>
</configuration>
</plugin>
</plugins>
</build>
</profile>

<!-- [INFO] Tests run: 61, Failures: 0, Errors: 0, Skipped: 0
[INFO] Total time: 23:19 min
-->
<profile>
<id>ejb30_lite_stateful_concurrency</id>
<build>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<includes>
<include>com.sun.ts.tests.ejb30.lite.stateful.concurrency.**.*Test</include>
</includes>
</configuration>
</plugin>
</plugins>
</build>
</profile>

<profile>
<id>timeout1</id>

Expand All @@ -430,9 +636,7 @@
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.3.1</version>
<configuration>
<test>com.sun.ts.tests.ejb30.bb.session.stateful.timeout.annotated.ClientEjblitejspTest</test>
<systemPropertyVariables>
Expand Down Expand Up @@ -517,6 +721,27 @@
</build>
</profile>

<profile>
<id>timeout5</id>

<build>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<test>com.sun.ts.tests.ejb30.bb.session.stateful.concurrency.accesstimeout.annotated.ClientEjbliteservlet2Test,
com.sun.ts.tests.ejb30.bb.session.stateful.concurrency.accesstimeout.annotated.ClientEjbliteservletTest
com.sun.ts.tests.ejb30.bb.session.stateful.concurrency.accesstimeout.annotated.JsfClientEjblitejsfTest,
com.sun.ts.tests.ejb30.bb.session.stateful.concurrency.metadata.annotated.ClientEjblitejspTest,
com.sun.ts.tests.ejb30.bb.session.stateful.concurrency.metadata.annotated.ClientEjbliteservlet2Test,
com.sun.ts.tests.ejb30.bb.session.stateful.concurrency.metadata.annotated.ClientEjbliteservletTest,
com.sun.ts.tests.ejb30.bb.session.stateful.concurrency.metadata.annotated.JsfClientEjblitejsfTest</test>
</configuration>
</plugin>
</plugins>
</build>
</profile>

<profile>
<id>failures</id>

Expand All @@ -533,7 +758,7 @@
com.sun.ts.tests.ejb30.misc.datasource.twowars.ClientTest,
com.sun.ts.tests.ejb30.misc.moduleName.twowars.ClientTest,
com.sun.ts.tests.ejb30.misc.moduleName.conflict.ClientTest,
com.sun.ts.tests.ejb30.tx.session.stateless.cm.covariant.ClientTest,</test>
com.sun.ts.tests.ejb30.tx.session.stateless.cm.covariant.ClientTest</test>
</configuration>
</plugin>
</plugins>
Expand Down

0 comments on commit 5038b04

Please sign in to comment.