From 63b448be52a25c16c7323253ea445c3b79bc2a06 Mon Sep 17 00:00:00 2001
From: Manfred Riem <mriem@manorrock.com>
Date: Sat, 28 Sep 2024 09:54:48 -0500
Subject: [PATCH] Fixes #4033 - Add Inject TCK for Piranha Web Profile (#4034)

---
 .github/workflows/tck-webprofile.yml     | 25 +++++++
 external/webprofile-tck/atinject/pom.xml | 93 ++++++++++++++++++++++++
 external/webprofile-tck/pom.xml          |  4 +
 3 files changed, 122 insertions(+)
 create mode 100644 external/webprofile-tck/atinject/pom.xml

diff --git a/.github/workflows/tck-webprofile.yml b/.github/workflows/tck-webprofile.yml
index 645f63674..528c754c6 100644
--- a/.github/workflows/tck-webprofile.yml
+++ b/.github/workflows/tck-webprofile.yml
@@ -16,6 +16,31 @@ on:
   - cron: "0 0 * * *"
   workflow_dispatch:
 jobs:
+  atinject:
+    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: Setup for TCK
+      run: mvn -B -DskipTests=true -ntp install
+    - name: Run TCK
+      run: |
+        cd external/webprofile-tck/atinject
+        mvn -B -ntp verify
+    - name: Test Summary
+      uses: test-summary/action@v2
+      with:
+        paths: "external/webprofile-tck/atinject/target/tck/example/target/surefire-reports/TEST-*.xml"
+      if: always()
   jsonb:
     runs-on: ${{ matrix.os }}
     strategy:
diff --git a/external/webprofile-tck/atinject/pom.xml b/external/webprofile-tck/atinject/pom.xml
new file mode 100644
index 000000000..f6fd0900d
--- /dev/null
+++ b/external/webprofile-tck/atinject/pom.xml
@@ -0,0 +1,93 @@
+<?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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>cloud.piranha.external.webprofiletck</groupId>
+        <artifactId>project</artifactId>
+        <version>24.10.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>inject-tck</artifactId>
+    <packaging>pom</packaging>
+
+    <name>Piranha Web Profile - Inject TCK</name>
+
+    <properties>
+        <tck.home>${project.build.directory}/tck</tck.home>
+    </properties>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>cloud.piranha</groupId>
+                <artifactId>bom</artifactId>
+                <version>${project.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>pre-integration-test</id>
+                        <phase>pre-integration-test</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <target>
+                                <echo>Executing UNIX profile</echo>
+                                        
+                                <!-- Download, unzip and rename TCK -->
+                                <get src="https://download.eclipse.org/jakartaee/dependency-injection/2.0/jakarta.inject-tck-${inject.tck.version}-bin.zip"
+                                     dest="${project.build.directory}/tck.zip"
+                                     skipexisting="true"/>
+                                <unzip src="${project.build.directory}/tck.zip"
+                                       dest="${project.build.directory}"/>
+                                <move file="${project.build.directory}/jakarta.inject-tck-${inject.tck.version}"
+                                      tofile="${project.build.directory}/tck"/>
+
+                                <!-- Install the TCK into local Maven repository -->
+                                <exec executable="mvn">
+                                    <arg value="install:install-file"/>
+                                    <arg value="-Dfile=${project.build.directory}/tck/jakarta.inject-tck-${inject.tck.version}.jar"/>
+                                </exec>
+                                        
+                                <!-- Setup example/pom.xml for correct Weld version -->
+                                <replaceregexp file="${tck.home}/example/pom.xml"
+                                               match="&lt;weld.version>(.*)&lt;/weld.version>"
+                                               replace="&lt;weld.version>${weld.version}&lt;/weld.version>"
+                                               byline="true"/>
+                            </target>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>integration-test</id>
+                        <phase>integration-test</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <target>
+                                <!-- Run the tests -->
+                                <exec dir="${project.build.directory}/tck/example"
+                                      executable="mvn"
+                                      failonerror="true">
+                                    <arg value="verify"/>
+                                </exec>
+                            </target>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/external/webprofile-tck/pom.xml b/external/webprofile-tck/pom.xml
index 69529c8c7..70bdbd082 100644
--- a/external/webprofile-tck/pom.xml
+++ b/external/webprofile-tck/pom.xml
@@ -15,7 +15,11 @@
     <artifactId>project</artifactId>
     <packaging>pom</packaging>
     <name>Piranha - External - Web Profile TCK - Project</name>
+    <properties>
+        <inject.tck.version>2.0.2</inject.tck.version>
+    </properties>
     <modules>
+        <module>atinject</module>
         <module>jsonb</module>
         <module>jsonp</module>
     </modules>