Skip to content

Commit

Permalink
Initial update to remove the web integration tests from the core tck (#…
Browse files Browse the repository at this point in the history 
…532)

* Initial update to remove the web integration tests from the core tck, #529
* Restore the ability to run against a different TCK version using the cdi.tck.version property
* Update the sigtest plugin, signature file and docs

---------

Signed-off-by: Scott M Stark <[email protected]>
  • Loading branch information
@starksm64
starksm64 committed Feb 26, 2024
1 parent b972d38 commit 70ca0a8
Show file tree
Hide file tree
Showing 15 changed files with 78 additions and 473 deletions.
5 changes: 2 additions & 3 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ or when compiling against staged Jakarta artifacts:
`mvn -Pstaging install`

## Building the CDI TCK distribution
The CDI TCK distribution artifact is built by specifing an additional `-Drelease` property to build the TCK reference
The CDI TCK distribution artifact is built by specifying an additional `-Drelease` property to build the TCK reference
documentation and distribution bundle, e.g.:

`mvn -Drelease install`
Expand All @@ -24,7 +24,7 @@ The https://github.com/jakartaee/cdi/wiki/Eclipse-CI-Release-Jobs page describes

## Sources in GIT

Master branch contains the CDI TCK 4.0
Master branch contains the CDI TCK 4.1

### Source Layout

Expand All @@ -37,5 +37,4 @@ Master branch contains the CDI TCK 4.0
* ide-configs - useful settings for Eclipse and Intellij IDEs
* impl - The core set of tests, excluding those that depend on web and full platform containers
* lang-model - A standalone test suite for the CDI language model; see its [README](./lang-model/README.adoc)
* web - The extra tests that depend on the web profile and full platform
* README.md - this doc
15 changes: 9 additions & 6 deletions dist-build/README.adoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ porting-package-lib/

== Software Requirements

* A Java SE 11 runtime
* A Java SE 17 runtime
* Maven 3.6.x +

== Installation
Expand Down Expand Up @@ -72,11 +72,12 @@ Run the tests:

* Run embedded container tests:
`mvn clean verify -f jboss-tck-runner/pom.xml`
* Run incontainer, full EE set [1800+ tests]
`mvn clean verify -Dincontainer -f jboss-tck-runner/pom.xml`
* Run SE tests [30+ tests]
`mvn clean verify -Dincontainer=se -f jboss-tck-runner/pom.xml`

To run with an alternate version of the CDI TCK, you can pass in the cdi.tck.version property on the command line, e.g.:
`mvn -Dcdi.tck.version=4.1.1 clean verify -f jboss-tck-runner/pom.xml`

=== Running the Language Model TCK against Wildfly / Weld

Follow the `Configuration`` instructions as for the main TCK above.
Expand All @@ -85,11 +86,13 @@ Then:

* `mvn install -f $CDI_TCK_ROOT/artifacts/pom.xml`
* `mvn -Dtck package -f $CDI_TCK_ROOT/weld/jboss-as/pom.xml` - to enable CDI Extension
* `mvn clean verify -Dincontainer -Dcdi.tck-4-0.version=${TCK_VERSION} -f $CDI_TCK_ROOT/weld/lang-model-tck-runner/pom.xml`` - to run the TCK against WildFly
* `mvn clean verify -Dincontainer -f $CDI_TCK_ROOT/weld/lang-model-tck-runner/pom.xml`` - to run the TCK against WildFly

Alternatively, run against Weld in plain Java SE:

Alternatively, run against Weld in plane Java SE:
* `mvn clean verify -f $CDI_TCK_ROOT/weld/lang-model-tck-runner/pom.xml`

* `mvn clean verify -Dcdi.tck-4-0.version=${TCK_VERSION} -f $CDI_TCK_ROOT/weld/lang-model-tck-runner/pom.xml`
You can specify the `cdi.tck.version` property on the command line to override the version from the CDI TCK bundle distribution.

== Where to file challenges

Expand Down
32 changes: 0 additions & 32 deletions dist-build/artifact-install.pom
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,38 +109,6 @@
</configuration>
</execution>

<execution>
<id>install-cdi-tck-web-impl</id>
<phase>package</phase>
<goals>
<goal>install-file</goal>
</goals>
<configuration>
<groupId>jakarta.enterprise</groupId>
<artifactId>cdi-tck-web-impl</artifactId>
<version>${project.version}</version>
<packaging>jar</packaging>
<file>cdi-tck-web-impl-${project.version}.jar</file>
<generatePom>true</generatePom>
</configuration>
</execution>
<execution>
<id>install-cdi-web-tck-suite</id>
<phase>package</phase>
<goals>
<goal>install-file</goal>
</goals>
<configuration>
<groupId>jakarta.enterprise</groupId>
<artifactId>cdi-tck-web-impl</artifactId>
<version>${project.version}</version>
<packaging>xml</packaging>
<classifier>suite</classifier>
<file>cdi-tck-web-impl-${project.version}-suite.xml</file>
<generatePom>false</generatePom>
</configuration>
</execution>

<execution>
<id>install-cdi-tck-lang-model</id>
<phase>package</phase>
Expand Down
233 changes: 5 additions & 228 deletions dist-build/jboss-runner.pom
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
<properties>
<!-- This matches the htmlunit version in TCK -->
<htmlunit.version>2.50.0</htmlunit.version>
<cdi.tck.version>${project.version}</cdi.tck.version>
</properties>

<dependencies>
Expand Down Expand Up @@ -69,7 +70,7 @@
<dependency>
<groupId>jakarta.enterprise</groupId>
<artifactId>cdi-tck-api</artifactId>
<version>${cdi.tck-4-0.version}</version>
<version>${cdi.tck.version}</version>
<exclusions>
<exclusion>
<groupId>jakarta.el</groupId>
Expand All @@ -81,7 +82,7 @@
<dependency>
<groupId>jakarta.enterprise</groupId>
<artifactId>cdi-tck-core-impl</artifactId>
<version>${cdi.tck-4-0.version}</version>
<version>${cdi.tck.version}</version>
<type>xml</type>
<classifier>suite</classifier>
<scope>test</scope>
Expand Down Expand Up @@ -112,7 +113,7 @@
<dependency>
<groupId>jakarta.enterprise</groupId>
<artifactId>cdi-tck-core-impl</artifactId>
<version>${cdi.tck-4-0.version}</version>
<version>${cdi.tck.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
Expand Down Expand Up @@ -187,7 +188,6 @@
<!-- https://issues.apache.org/jira/browse/SUREFIRE-569 -->
<dependenciesToScan>
<dependency>jakarta.enterprise:cdi-tck-core-impl</dependency>
<dependency>jakarta.enterprise:cdi-tck-web-impl</dependency>
</dependenciesToScan>
</configuration>
</plugin>
Expand Down Expand Up @@ -267,21 +267,12 @@
<artifactItem>
<groupId>jakarta.enterprise</groupId>
<artifactId>cdi-tck-core-impl</artifactId>
<version>${cdi.tck-4-0.version}</version>
<version>${cdi.tck.version}</version>
<type>xml</type>
<classifier>suite</classifier>
<overWrite>false</overWrite>
<destFileName>tck-core-suite.xml</destFileName>
</artifactItem>
<artifactItem>
<groupId>jakarta.enterprise</groupId>
<artifactId>cdi-tck-web-impl</artifactId>
<version>${cdi.tck-4-0.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 @@ -364,205 +355,6 @@
</build>
</profile>

<!-- Run the TCK in the managed container (full Java EE platform) -->
<profile>
<id>incontainer</id>
<activation>
<activeByDefault>false</activeByDefault>
<property>
<name>incontainer</name>
<value>true</value>
</property>
</activation>
<properties>
<excluded.groups>se</excluded.groups>
</properties>
<dependencies>
<dependency>
<groupId>jakarta.enterprise</groupId>
<artifactId>cdi-tck-web-impl</artifactId>
<version>${cdi.tck-4-0.version}</version>
<type>xml</type>
<classifier>suite</classifier>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>jakarta.el</groupId>
<artifactId>jakarta.el-api</artifactId>
</exclusion>
<exclusion>
<groupId>jakarta.faces</groupId>
<artifactId>jakarta.faces-api</artifactId>
</exclusion>
<exclusion>
<artifactId>container-se-api</artifactId>
<groupId>org.jboss.arquillian.container</groupId>
</exclusion>
<exclusion>
<groupId>org.jboss.test-audit</groupId>
<artifactId>jboss-test-audit-api</artifactId>
</exclusion>
<exclusion>
<groupId>org.jboss.test-audit</groupId>
<artifactId>jboss-test-audit-impl</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>jakarta.enterprise</groupId>
<artifactId>cdi-tck-web-impl</artifactId>
<version>${cdi.tck-4-0.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>jakarta.el</groupId>
<artifactId>jakarta.el-api</artifactId>
</exclusion>
<exclusion>
<groupId>jakarta.faces</groupId>
<artifactId>jakarta.faces-api</artifactId>
</exclusion>
<exclusion>
<artifactId>container-se-api</artifactId>
<groupId>org.jboss.arquillian.container</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.wildfly.arquillian</groupId>
<artifactId>wildfly-arquillian-container-managed</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.jboss.arquillian.core</groupId>
<artifactId>arquillian-core-spi</artifactId>
</exclusion>
<exclusion>
<groupId>org.jboss.arquillian.core</groupId>
<artifactId>arquillian-core-api</artifactId>
</exclusion>
<exclusion>
<groupId>org.jboss.logmanager</groupId>
<artifactId>log4j-jboss-logmanager</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.protocol</groupId>
<artifactId>arquillian-protocol-servlet-jakarta</artifactId>
<version>${arquillian.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
</dependencies>
<build>
<resources>
<resource>
<directory>src/test/resources</directory>
</resource>
<resource>
<directory>src/test/wildfly8</directory>
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<executions>
<execution>
<id>enforce-jboss-home-is-set</id>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<rules>
<requireEnvironmentVariable>
<variableName>JBOSS_HOME</variableName>
<message>Environment variable "JBOSS_HOME" must be set in order to execute in-container tests. Please configure it so that it points to your WildFly installation.</message>
</requireEnvironmentVariable>
</rules>
<fail>true</fail>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
<id>copy-resources</id>
<!-- perform this any time before the tests are executed -->
<phase>validate</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${JBOSS_HOME}/standalone/configuration</outputDirectory>
<resources>
<resource>
<directory>${JBOSS_HOME}/docs/examples/configs</directory>
<includes>standalone-activemq-embedded.xml</includes>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
<configuration>
<excludedGroups>${excluded.groups}</excludedGroups>

<argLine>
--add-exports=java.desktop/sun.awt=ALL-UNNAMED
--add-opens=java.base/java.io=ALL-UNNAMED
--add-opens=java.base/java.lang=ALL-UNNAMED
--add-opens=java.base/java.lang.invoke=ALL-UNNAMED
--add-opens=java.base/java.security=ALL-UNNAMED
--add-opens=java.base/java.util=ALL-UNNAMED
--add-opens=java.management/javax.management=ALL-UNNAMED
--add-opens=java.naming/javax.naming=ALL-UNNAMED
</argLine>
<properties>
<property>
<!-- Note a 7.4.0 issue results in NPEs and useless output if you go higher than 1 here -->
<name>surefire.testng.verbose</name>
<value>0</value>
</property>
</properties>
<systemPropertyVariables>
<!-- Silencing the broken code in getActiveConfiguration(),
see https://github.com/arquillian/arquillian/blob/master/impl-base/src/main/java/org/jboss/arquillian/impl/client/container/ContainerRegistryCreator.java -->
<arquillian.launch>wildfly-23</arquillian.launch>
<!-- Specified system properties are not
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>
</systemPropertyVariables>
<systemProperties>
<jacoco.agent>${jacoco.agent}</jacoco.agent>
<!-- Specifiy any garbage collection related args here -->
<gc.args />
<!-- This property propagates to the javaVmArguments in arquillian.xml -->
<additional.vm.args>
${surefire.plugin.jdk17.args}
</additional.vm.args>
</systemProperties>
<suiteXmlFiles>
<suiteXmlFile>target/suites/tck-web-suite.xml</suiteXmlFile>
</suiteXmlFiles>
</configuration>
</plugin>
</plugins>
</build>
</profile>

<profile>
<id>weld-se</id>
Expand Down Expand Up @@ -636,21 +428,6 @@
</build>
</profile>

<!-- Run only web profile tests -->
<profile>
<id>webprofile</id>
<activation>
<activeByDefault>false</activeByDefault>
<property>
<name>webprofile</name>
<value>true</value>
</property>
</activation>
<properties>
<excluded.groups>javaee-full,se</excluded.groups>
</properties>
</profile>

</profiles>

</project>
Loading

0 comments on commit 70ca0a8

Please sign in to comment.