Fixes #4021 - Move Servlet TCK into the Piranha Servlet TCK sub direc…

…tory (#4022)
piranhacloud · Sep 26, 2024 · fc13428 · fc13428
1 parent 5c94abe
commit fc13428
Show file tree

Hide file tree

Showing 12 changed files with 344 additions and 713 deletions.
diff --git a/.github/workflows/tck-server.yml b/.github/workflows/tck-server.yml
@@ -27,7 +27,7 @@ jobs:
       run: mvn -B -DskipTests=true install
     - name: Run TCK
       run: mvn -amd -B -P external -pl external/tck/el verify
-  jakarta-servlet:
+  jakarta-pages:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
@@ -36,20 +36,16 @@ jobs:
     steps:
     - name: Checkout sources
       uses: actions/checkout@v4
-    - name: Setup Java
+    - name: Set up Java ${{ matrix.java }}
       uses: actions/setup-java@v4
       with:
         distribution: 'temurin'
         java-version: ${{ matrix.java }}
-    - name: Setup for TCK
-      run: mvn -B -DskipTests=true install -P${{ github.event.inputs.httpImplementation }}
-      if: ${{ github.event.inputs.httpImplementation }}
     - name: Setup for TCK
       run: mvn -B -DskipTests=true install
-      if: ${{ !github.event.inputs.httpImplementation }}
     - name: Run TCK
-      run: mvn -amd -B -P external -pl external/tck/servlet verify
-  jakarta-pages:
+      run: mvn -amd -B -P external -pl external/tck/wasp verify
+  servlet:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
@@ -63,7 +59,13 @@ jobs:
       with:
         distribution: 'temurin'
         java-version: ${{ matrix.java }}
+    - name: Setup for TCK
+      run: mvn -B -DskipTests=true install -P${{ github.event.inputs.httpImplementation }}
+      if: ${{ github.event.inputs.httpImplementation }}
     - name: Setup for TCK
       run: mvn -B -DskipTests=true install
+      if: ${{ !github.event.inputs.httpImplementation }}
     - name: Run TCK
-      run: mvn -amd -B -P external -pl external/tck/wasp verify
+      run: |
+        mvn -amd -B -P external -pl external/tck/server/servlet verify
+        cat external/tck/server/servlet/target/piranha/report/text/summary.txt >> $GITHUB_STEP_SUMMARY
diff --git a/external/tck/server/pom.xml b/external/tck/server/pom.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<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"
+    xmlns:if="ant:if">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>cloud.piranha.external.tck</groupId>
+        <artifactId>project</artifactId>
+        <version>24.9.0-SNAPSHOT</version>
+    </parent>
+    <groupId>cloud.piranha.external.tck.server</groupId>
+    <artifactId>project</artifactId>
+    <packaging>pom</packaging>
+    <name>Piranha - External - TCK - Server - Project</name>
+    <properties>
+        <!-- TCK versions -->
+        <servlet.tck.version>6.0.1</servlet.tck.version>
+        <!-- Implementation versions -->
+    </properties>
+    <modules>
+        <module>servlet</module>
+    </modules>
+</project>
diff --git a/external/tck/server/servlet/pom.xml b/external/tck/server/servlet/pom.xml
diff --git a/.../servlet/src/test/etc/piranha-callers.xml → .../servlet/src/test/etc/piranha-callers.xml b/.../servlet/src/test/etc/piranha-callers.xml → .../servlet/src/test/etc/piranha-callers.xml
diff --git a/external/tck/servlet/src/test/etc/ts-all.jtx → ...ck/server/servlet/src/test/etc/ts-all.jtx b/external/tck/servlet/src/test/etc/ts-all.jtx → ...ck/server/servlet/src/test/etc/ts-all.jtx
diff --git a/...l/tck/servlet/src/test/etc/ts-exclude.jtx → ...erver/servlet/src/test/etc/ts-exclude.jtx b/...l/tck/servlet/src/test/etc/ts-exclude.jtx → ...erver/servlet/src/test/etc/ts-exclude.jtx
diff --git a/external/tck/servlet/src/test/etc/ts-failed → ...tck/server/servlet/src/test/etc/ts-failed b/external/tck/servlet/src/test/etc/ts-failed → ...tck/server/servlet/src/test/etc/ts-failed
diff --git a/external/tck/servlet/src/test/etc/ts.jtx → ...al/tck/server/servlet/src/test/etc/ts.jtx b/external/tck/servlet/src/test/etc/ts.jtx → ...al/tck/server/servlet/src/test/etc/ts.jtx
diff --git a/.../tck/servlet/src/test/etc/user.properties → ...rver/servlet/src/test/etc/user.properties b/.../tck/servlet/src/test/etc/user.properties → ...rver/servlet/src/test/etc/user.properties
diff --git a/.../servlet/src/test/etc/userrole.properties → .../servlet/src/test/etc/userrole.properties b/.../servlet/src/test/etc/userrole.properties → .../servlet/src/test/etc/userrole.properties
diff --git a/...l/tck/servlet/src/test/piranha/deploy.xml → ...erver/servlet/src/test/piranha/deploy.xml b/...l/tck/servlet/src/test/piranha/deploy.xml → ...erver/servlet/src/test/piranha/deploy.xml
diff --git a/external/tck/servlet/pom.xml b/external/tck/servlet/pom.xml