diff --git a/.github/workflows/tck-coreprofile.yml b/.github/workflows/tck-coreprofile.yml index c40cc22e45..1e5d987eb7 100644 --- a/.github/workflows/tck-coreprofile.yml +++ b/.github/workflows/tck-coreprofile.yml @@ -136,10 +136,41 @@ jobs: test/tck/coreprofile/jsonp/installer/target/tck/bin/tck-tests/target/surefire-reports/TEST-*.xml test/tck/coreprofile/jsonp/installer/target/tck/bin/tck-tests-pluggability/target/surefire-reports/TEST-*.xml if: always() + rest: + if: ${{ always() }} && github.repository == 'piranhacloud/piranha' + runs-on: ${{ matrix.os }} + strategy: + matrix: + java: [ '21' ] + os: [ubuntu-latest] + steps: + - name: Checkout Sources + uses: actions/checkout@v4 + - name: Set up Java ${{ matrix.java }} + uses: actions/setup-java@v4 + with: + distribution: 'temurin' + java-version: ${{ matrix.java }} + - name: Run TCK + run: | + mvn -B -DskipTests=true -DskipITs=true -ntp install + cd test/tck/coreprofile/rest + mvn -B -ntp install + - name: Test Summary + uses: test-summary/action@v2 + id: test_summary + with: + paths: "test/tck/coreprofile/rest/runner/target/failsafe-reports/**/TEST-*.xml" + output: test-summary.md + if: always() + - name: Job Summary + run: | + echo "${{ steps.test_summary.outputs.passed }} out of ${{ steps.test_summary.outputs.total }} tests passed" >> $GITHUB_STEP_SUMMARY + if: always() result: if: ${{ always() }} && github.repository == 'piranhacloud/piranha' runs-on: ubuntu-latest - needs: [annotations, inject, jsonb, jsonp] + needs: [annotations, coreprofile, inject, jsonb, jsonp, rest] steps: - name: Check build results run: | diff --git a/test/tck/coreprofile/pom.xml b/test/tck/coreprofile/pom.xml index 39efb59fd7..17a8364a5a 100644 --- a/test/tck/coreprofile/pom.xml +++ b/test/tck/coreprofile/pom.xml @@ -21,6 +21,7 @@ 2.0.2 3.0.0 2.1.1 + 4.0.1 2.4 @@ -46,5 +47,6 @@ inject jsonb jsonp + rest diff --git a/test/tck/coreprofile/rest/installer/pom.xml b/test/tck/coreprofile/rest/installer/pom.xml new file mode 100644 index 0000000000..2c550bc8c8 --- /dev/null +++ b/test/tck/coreprofile/rest/installer/pom.xml @@ -0,0 +1,49 @@ + + + + 4.0.0 + + cloud.piranha.test.tck.coreprofile.rest + project + 25.3.0-SNAPSHOT + + installer + pom + Piranha - Test - TCK - Core Profile - REST TCK - Installer + + ${project.build.directory}/tck + + + + + org.apache.maven.plugins + maven-antrun-plugin + + + pre-integration-test + pre-integration-test + + run + + + + + + + + + + + + + + + + + + + diff --git a/test/tck/coreprofile/rest/pom.xml b/test/tck/coreprofile/rest/pom.xml new file mode 100644 index 0000000000..3aeefcb580 --- /dev/null +++ b/test/tck/coreprofile/rest/pom.xml @@ -0,0 +1,21 @@ + + + + 4.0.0 + + cloud.piranha.test.tck.coreprofile + project + 25.3.0-SNAPSHOT + + cloud.piranha.test.tck.coreprofile.rest + project + pom + Piranha - Test - TCK - Core Profile - REST TCK - Project + + installer + runner + + diff --git a/test/tck/coreprofile/rest/runner/pom.xml b/test/tck/coreprofile/rest/runner/pom.xml new file mode 100644 index 0000000000..2cb868ebdd --- /dev/null +++ b/test/tck/coreprofile/rest/runner/pom.xml @@ -0,0 +1,117 @@ + + + + 4.0.0 + + cloud.piranha.test.tck.coreprofile.rest + project + 25.3.0-SNAPSHOT + + runner + jar + Piranha - Test - TCK - Core Profile - REST TCK - Runner + + 3.1 + 3.0 + + + + + org.jboss.arquillian + arquillian-bom + ${arquillian.version} + pom + test + + + + + + cloud.piranha.arquillian + piranha-arquillian-managed + ${project.version} + test + + + jakarta.ws.rs + jakarta-restful-ws-tck + ${rest.tck.version} + test + + + org.jboss.arquillian.junit5 + arquillian-junit5-container + ${arquillian.version} + test + + + org.junit.jupiter + junit-jupiter + test + + + org.junit.jupiter + junit-jupiter-api + test + + + org.junit.jupiter + junit-jupiter-engine + test + + + org.hamcrest + hamcrest + ${hamcrest.version} + test + + + org.omnifaces.arquillian + glassfish-client-ee11 + ${glassfish-client-ee11.version} + test + + + commons-httpclient + commons-httpclient + ${commons-httpclient.version} + test + + + + + + org.apache.maven.plugins + maven-failsafe-plugin + + + verify + + integration-test + verify + + + + + + jakarta.ws.rs:jakarta-restful-ws-tck + + 1 + false + + piranha + true + true + ee.jakarta.tck.ws.rs.lib.implementation.sun.common.SunRIURL + org.glassfish.jersey.servlet.ServletContainer + localhost + 8080 + + + + + + diff --git a/test/tck/coreprofile/rest/runner/src/test/resources/arquillian.xml b/test/tck/coreprofile/rest/runner/src/test/resources/arquillian.xml new file mode 100644 index 0000000000..f197532934 --- /dev/null +++ b/test/tck/coreprofile/rest/runner/src/test/resources/arquillian.xml @@ -0,0 +1,13 @@ + + + + + + + 8080 + + +