From adeedfaa4220fe3f88c8cb87c09e414988f4e59d Mon Sep 17 00:00:00 2001
From: JiriOndrusek <ondrusek.jiri@gmail.com>
Date: Thu, 21 Mar 2024 15:57:31 +0100
Subject: [PATCH] Separation of jt400 test module into mocked one integration
 one.

---
 integration-tests/jt400-mocked/pom.xml        | 126 ++++++++++++++++++
 .../java/com/ibm/as400/access/MockAS400.java  |   0
 .../ibm/as400/access/MockAS400ImplRemote.java |   0
 .../com/ibm/as400/access/MockAS400Server.java |   0
 .../com/ibm/as400/access/MockDataStream.java  |   0
 .../ibm/as400/access/MockSocketContainer.java |   0
 .../com/ibm/as400/access/MockedResponses.java |   0
 .../com/ibm/as400/access/ReplyDQCommon.java   |   0
 .../ibm/as400/access/ReplyDQReadNormal.java   |   0
 .../ReplyDQRequestAttributesNormal.java       |   0
 .../java/com/ibm/as400/access/ReplyOk.java    |   0
 .../ibm/as400/access/ReplyRCCallProgram.java  |   0
 .../access/ReplyRCExchangeAttributes.java     |   0
 .../jt400/mocked/it}/Jt400MockProducers.java  |   2 +-
 .../jt400/mocked/it}/Jt400MockResource.java   |   2 +-
 .../mocked/it}/MockAS400ConnectionPool.java   |   2 +-
 .../src/main/resources/application.properties |  19 +++
 .../component/jt400/mocked}/Jt400MockIT.java  |   4 +-
 .../jt400/mocked}/Jt400MockTest.java          |   7 +-
 integration-tests/pom.xml                     |   1 +
 tooling/scripts/test-categories.yaml          |   1 +
 21 files changed, 153 insertions(+), 11 deletions(-)
 create mode 100644 integration-tests/jt400-mocked/pom.xml
 rename integration-tests/{jt400 => jt400-mocked}/src/main/java/com/ibm/as400/access/MockAS400.java (100%)
 rename integration-tests/{jt400 => jt400-mocked}/src/main/java/com/ibm/as400/access/MockAS400ImplRemote.java (100%)
 rename integration-tests/{jt400 => jt400-mocked}/src/main/java/com/ibm/as400/access/MockAS400Server.java (100%)
 rename integration-tests/{jt400 => jt400-mocked}/src/main/java/com/ibm/as400/access/MockDataStream.java (100%)
 rename integration-tests/{jt400 => jt400-mocked}/src/main/java/com/ibm/as400/access/MockSocketContainer.java (100%)
 rename integration-tests/{jt400 => jt400-mocked}/src/main/java/com/ibm/as400/access/MockedResponses.java (100%)
 rename integration-tests/{jt400 => jt400-mocked}/src/main/java/com/ibm/as400/access/ReplyDQCommon.java (100%)
 rename integration-tests/{jt400 => jt400-mocked}/src/main/java/com/ibm/as400/access/ReplyDQReadNormal.java (100%)
 rename integration-tests/{jt400 => jt400-mocked}/src/main/java/com/ibm/as400/access/ReplyDQRequestAttributesNormal.java (100%)
 rename integration-tests/{jt400 => jt400-mocked}/src/main/java/com/ibm/as400/access/ReplyOk.java (100%)
 rename integration-tests/{jt400 => jt400-mocked}/src/main/java/com/ibm/as400/access/ReplyRCCallProgram.java (100%)
 rename integration-tests/{jt400 => jt400-mocked}/src/main/java/com/ibm/as400/access/ReplyRCExchangeAttributes.java (100%)
 rename integration-tests/{jt400/src/main/java/org/apache/camel/quarkus/component/jt400/it/mock => jt400-mocked/src/main/java/org/apache/camel/quarkus/component/jt400/mocked/it}/Jt400MockProducers.java (97%)
 rename integration-tests/{jt400/src/main/java/org/apache/camel/quarkus/component/jt400/it/mock => jt400-mocked/src/main/java/org/apache/camel/quarkus/component/jt400/mocked/it}/Jt400MockResource.java (98%)
 rename integration-tests/{jt400/src/main/java/org/apache/camel/quarkus/component/jt400/it/mock => jt400-mocked/src/main/java/org/apache/camel/quarkus/component/jt400/mocked/it}/MockAS400ConnectionPool.java (97%)
 create mode 100644 integration-tests/jt400-mocked/src/main/resources/application.properties
 rename integration-tests/{jt400/src/test/java/org/apache/camel/quarkus/component/jt400/it => jt400-mocked/src/test/java/org/apache/camel/quarkus/component/jt400/mocked}/Jt400MockIT.java (83%)
 rename integration-tests/{jt400/src/test/java/org/apache/camel/quarkus/component/jt400/it => jt400-mocked/src/test/java/org/apache/camel/quarkus/component/jt400/mocked}/Jt400MockTest.java (95%)

diff --git a/integration-tests/jt400-mocked/pom.xml b/integration-tests/jt400-mocked/pom.xml
new file mode 100644
index 000000000000..5ee9a12d01e8
--- /dev/null
+++ b/integration-tests/jt400-mocked/pom.xml
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<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>
+    <parent>
+        <groupId>org.apache.camel.quarkus</groupId>
+        <artifactId>camel-quarkus-build-parent-it</artifactId>
+        <version>3.9.1-SNAPSHOT</version>
+        <relativePath>../../poms/build-parent-it/pom.xml</relativePath>
+    </parent>
+
+    <artifactId>camel-quarkus-integration-test-jt400-mocked</artifactId>
+    <name>Camel Quarkus :: Integration Tests :: JT400 Mocked</name>
+    <description>Mocked tests for Camel Quarkus JT400 extension</description>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+                <includes>
+                    <include>application.properties</include>
+                </includes>
+            </resource>
+        </resources>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.camel.quarkus</groupId>
+            <artifactId>camel-quarkus-jt400</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-jackson</artifactId>
+        </dependency>
+
+        <!-- test dependencies -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.rest-assured</groupId>
+            <artifactId>rest-assured</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <profiles>
+        <profile>
+            <id>native</id>
+            <activation>
+                <property>
+                    <name>native</name>
+                </property>
+            </activation>
+            <properties>
+                <quarkus.package.type>native</quarkus.package.type>
+            </properties>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-failsafe-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>integration-test</goal>
+                                    <goal>verify</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>virtualDependencies</id>
+            <activation>
+                <property>
+                    <name>!noVirtualDependencies</name>
+                </property>
+            </activation>
+            <dependencies>
+                <!-- The following dependencies guarantee that this module is built after them. You can update them by running `mvn process-resources -Pformat -N` from the source tree root directory -->
+                <dependency>
+                    <groupId>org.apache.camel.quarkus</groupId>
+                    <artifactId>camel-quarkus-jt400-deployment</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
+
+</project>
diff --git a/integration-tests/jt400/src/main/java/com/ibm/as400/access/MockAS400.java b/integration-tests/jt400-mocked/src/main/java/com/ibm/as400/access/MockAS400.java
similarity index 100%
rename from integration-tests/jt400/src/main/java/com/ibm/as400/access/MockAS400.java
rename to integration-tests/jt400-mocked/src/main/java/com/ibm/as400/access/MockAS400.java
diff --git a/integration-tests/jt400/src/main/java/com/ibm/as400/access/MockAS400ImplRemote.java b/integration-tests/jt400-mocked/src/main/java/com/ibm/as400/access/MockAS400ImplRemote.java
similarity index 100%
rename from integration-tests/jt400/src/main/java/com/ibm/as400/access/MockAS400ImplRemote.java
rename to integration-tests/jt400-mocked/src/main/java/com/ibm/as400/access/MockAS400ImplRemote.java
diff --git a/integration-tests/jt400/src/main/java/com/ibm/as400/access/MockAS400Server.java b/integration-tests/jt400-mocked/src/main/java/com/ibm/as400/access/MockAS400Server.java
similarity index 100%
rename from integration-tests/jt400/src/main/java/com/ibm/as400/access/MockAS400Server.java
rename to integration-tests/jt400-mocked/src/main/java/com/ibm/as400/access/MockAS400Server.java
diff --git a/integration-tests/jt400/src/main/java/com/ibm/as400/access/MockDataStream.java b/integration-tests/jt400-mocked/src/main/java/com/ibm/as400/access/MockDataStream.java
similarity index 100%
rename from integration-tests/jt400/src/main/java/com/ibm/as400/access/MockDataStream.java
rename to integration-tests/jt400-mocked/src/main/java/com/ibm/as400/access/MockDataStream.java
diff --git a/integration-tests/jt400/src/main/java/com/ibm/as400/access/MockSocketContainer.java b/integration-tests/jt400-mocked/src/main/java/com/ibm/as400/access/MockSocketContainer.java
similarity index 100%
rename from integration-tests/jt400/src/main/java/com/ibm/as400/access/MockSocketContainer.java
rename to integration-tests/jt400-mocked/src/main/java/com/ibm/as400/access/MockSocketContainer.java
diff --git a/integration-tests/jt400/src/main/java/com/ibm/as400/access/MockedResponses.java b/integration-tests/jt400-mocked/src/main/java/com/ibm/as400/access/MockedResponses.java
similarity index 100%
rename from integration-tests/jt400/src/main/java/com/ibm/as400/access/MockedResponses.java
rename to integration-tests/jt400-mocked/src/main/java/com/ibm/as400/access/MockedResponses.java
diff --git a/integration-tests/jt400/src/main/java/com/ibm/as400/access/ReplyDQCommon.java b/integration-tests/jt400-mocked/src/main/java/com/ibm/as400/access/ReplyDQCommon.java
similarity index 100%
rename from integration-tests/jt400/src/main/java/com/ibm/as400/access/ReplyDQCommon.java
rename to integration-tests/jt400-mocked/src/main/java/com/ibm/as400/access/ReplyDQCommon.java
diff --git a/integration-tests/jt400/src/main/java/com/ibm/as400/access/ReplyDQReadNormal.java b/integration-tests/jt400-mocked/src/main/java/com/ibm/as400/access/ReplyDQReadNormal.java
similarity index 100%
rename from integration-tests/jt400/src/main/java/com/ibm/as400/access/ReplyDQReadNormal.java
rename to integration-tests/jt400-mocked/src/main/java/com/ibm/as400/access/ReplyDQReadNormal.java
diff --git a/integration-tests/jt400/src/main/java/com/ibm/as400/access/ReplyDQRequestAttributesNormal.java b/integration-tests/jt400-mocked/src/main/java/com/ibm/as400/access/ReplyDQRequestAttributesNormal.java
similarity index 100%
rename from integration-tests/jt400/src/main/java/com/ibm/as400/access/ReplyDQRequestAttributesNormal.java
rename to integration-tests/jt400-mocked/src/main/java/com/ibm/as400/access/ReplyDQRequestAttributesNormal.java
diff --git a/integration-tests/jt400/src/main/java/com/ibm/as400/access/ReplyOk.java b/integration-tests/jt400-mocked/src/main/java/com/ibm/as400/access/ReplyOk.java
similarity index 100%
rename from integration-tests/jt400/src/main/java/com/ibm/as400/access/ReplyOk.java
rename to integration-tests/jt400-mocked/src/main/java/com/ibm/as400/access/ReplyOk.java
diff --git a/integration-tests/jt400/src/main/java/com/ibm/as400/access/ReplyRCCallProgram.java b/integration-tests/jt400-mocked/src/main/java/com/ibm/as400/access/ReplyRCCallProgram.java
similarity index 100%
rename from integration-tests/jt400/src/main/java/com/ibm/as400/access/ReplyRCCallProgram.java
rename to integration-tests/jt400-mocked/src/main/java/com/ibm/as400/access/ReplyRCCallProgram.java
diff --git a/integration-tests/jt400/src/main/java/com/ibm/as400/access/ReplyRCExchangeAttributes.java b/integration-tests/jt400-mocked/src/main/java/com/ibm/as400/access/ReplyRCExchangeAttributes.java
similarity index 100%
rename from integration-tests/jt400/src/main/java/com/ibm/as400/access/ReplyRCExchangeAttributes.java
rename to integration-tests/jt400-mocked/src/main/java/com/ibm/as400/access/ReplyRCExchangeAttributes.java
diff --git a/integration-tests/jt400/src/main/java/org/apache/camel/quarkus/component/jt400/it/mock/Jt400MockProducers.java b/integration-tests/jt400-mocked/src/main/java/org/apache/camel/quarkus/component/jt400/mocked/it/Jt400MockProducers.java
similarity index 97%
rename from integration-tests/jt400/src/main/java/org/apache/camel/quarkus/component/jt400/it/mock/Jt400MockProducers.java
rename to integration-tests/jt400-mocked/src/main/java/org/apache/camel/quarkus/component/jt400/mocked/it/Jt400MockProducers.java
index 319e8dc0a4c8..9c6568f14af7 100644
--- a/integration-tests/jt400/src/main/java/org/apache/camel/quarkus/component/jt400/it/mock/Jt400MockProducers.java
+++ b/integration-tests/jt400-mocked/src/main/java/org/apache/camel/quarkus/component/jt400/mocked/it/Jt400MockProducers.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.quarkus.component.jt400.it.mock;
+package org.apache.camel.quarkus.component.jt400.mocked.it;
 
 import java.util.HashMap;
 import java.util.List;
diff --git a/integration-tests/jt400/src/main/java/org/apache/camel/quarkus/component/jt400/it/mock/Jt400MockResource.java b/integration-tests/jt400-mocked/src/main/java/org/apache/camel/quarkus/component/jt400/mocked/it/Jt400MockResource.java
similarity index 98%
rename from integration-tests/jt400/src/main/java/org/apache/camel/quarkus/component/jt400/it/mock/Jt400MockResource.java
rename to integration-tests/jt400-mocked/src/main/java/org/apache/camel/quarkus/component/jt400/mocked/it/Jt400MockResource.java
index 21a561efd803..fa3247e2dbeb 100644
--- a/integration-tests/jt400/src/main/java/org/apache/camel/quarkus/component/jt400/it/mock/Jt400MockResource.java
+++ b/integration-tests/jt400-mocked/src/main/java/org/apache/camel/quarkus/component/jt400/mocked/it/Jt400MockResource.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.quarkus.component.jt400.it.mock;
+package org.apache.camel.quarkus.component.jt400.mocked.it;
 
 import java.util.Map;
 
diff --git a/integration-tests/jt400/src/main/java/org/apache/camel/quarkus/component/jt400/it/mock/MockAS400ConnectionPool.java b/integration-tests/jt400-mocked/src/main/java/org/apache/camel/quarkus/component/jt400/mocked/it/MockAS400ConnectionPool.java
similarity index 97%
rename from integration-tests/jt400/src/main/java/org/apache/camel/quarkus/component/jt400/it/mock/MockAS400ConnectionPool.java
rename to integration-tests/jt400-mocked/src/main/java/org/apache/camel/quarkus/component/jt400/mocked/it/MockAS400ConnectionPool.java
index 751e6fa119c0..c91519e6acad 100644
--- a/integration-tests/jt400/src/main/java/org/apache/camel/quarkus/component/jt400/it/mock/MockAS400ConnectionPool.java
+++ b/integration-tests/jt400-mocked/src/main/java/org/apache/camel/quarkus/component/jt400/mocked/it/MockAS400ConnectionPool.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.quarkus.component.jt400.it.mock;
+package org.apache.camel.quarkus.component.jt400.mocked.it;
 
 import java.util.Locale;
 
diff --git a/integration-tests/jt400-mocked/src/main/resources/application.properties b/integration-tests/jt400-mocked/src/main/resources/application.properties
new file mode 100644
index 000000000000..7674bd15b413
--- /dev/null
+++ b/integration-tests/jt400-mocked/src/main/resources/application.properties
@@ -0,0 +1,19 @@
+## ---------------------------------------------------------------------------
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements.  See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License.  You may obtain a copy of the License at
+##
+##      http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+## ---------------------------------------------------------------------------
+
+#mocked tests requires flat classpath (that's why they are separated from jt400 integration tests)
+quarkus.test.flat-class-path=true
diff --git a/integration-tests/jt400/src/test/java/org/apache/camel/quarkus/component/jt400/it/Jt400MockIT.java b/integration-tests/jt400-mocked/src/test/java/org/apache/camel/quarkus/component/jt400/mocked/Jt400MockIT.java
similarity index 83%
rename from integration-tests/jt400/src/test/java/org/apache/camel/quarkus/component/jt400/it/Jt400MockIT.java
rename to integration-tests/jt400-mocked/src/test/java/org/apache/camel/quarkus/component/jt400/mocked/Jt400MockIT.java
index 7bd64e0e2d52..5c43d82d817b 100644
--- a/integration-tests/jt400/src/test/java/org/apache/camel/quarkus/component/jt400/it/Jt400MockIT.java
+++ b/integration-tests/jt400-mocked/src/test/java/org/apache/camel/quarkus/component/jt400/mocked/Jt400MockIT.java
@@ -14,13 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.quarkus.component.jt400.it;
+package org.apache.camel.quarkus.component.jt400.mocked;
 
 import io.quarkus.test.junit.QuarkusIntegrationTest;
-import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
 
 @QuarkusIntegrationTest
-@DisabledIfSystemProperty(named = "skip-mock-tests", matches = "true")
 class Jt400MockIT extends Jt400MockTest {
 
 }
diff --git a/integration-tests/jt400/src/test/java/org/apache/camel/quarkus/component/jt400/it/Jt400MockTest.java b/integration-tests/jt400-mocked/src/test/java/org/apache/camel/quarkus/component/jt400/mocked/Jt400MockTest.java
similarity index 95%
rename from integration-tests/jt400/src/test/java/org/apache/camel/quarkus/component/jt400/it/Jt400MockTest.java
rename to integration-tests/jt400-mocked/src/test/java/org/apache/camel/quarkus/component/jt400/mocked/Jt400MockTest.java
index 5af533476a9e..e44c1c66348c 100644
--- a/integration-tests/jt400/src/test/java/org/apache/camel/quarkus/component/jt400/it/Jt400MockTest.java
+++ b/integration-tests/jt400-mocked/src/test/java/org/apache/camel/quarkus/component/jt400/mocked/Jt400MockTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.quarkus.component.jt400.it;
+package org.apache.camel.quarkus.component.jt400.mocked;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -22,15 +22,12 @@
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.RestAssured;
 import io.restassured.http.ContentType;
-import org.apache.camel.quarkus.component.jt400.it.mock.Jt400MockResource;
+import org.apache.camel.quarkus.component.jt400.mocked.it.Jt400MockResource;
 import org.apache.camel.util.CollectionHelper;
 import org.hamcrest.Matchers;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
 
 @QuarkusTest
-@DisabledIfSystemProperty(named = "skip-mock-tests", matches = "true")
-
 public class Jt400MockTest {
 
     @Test
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index 923f9b9d457e..b573603714ba 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -139,6 +139,7 @@
         <module>jsonata</module>
         <module>jsonpath</module>
         <module>jt400</module>
+        <module>jt400-mocked</module>
         <module>jta</module>
         <module>kafka</module>
         <module>kafka-oauth</module>
diff --git a/tooling/scripts/test-categories.yaml b/tooling/scripts/test-categories.yaml
index 403a15ab71d4..f414b481145a 100644
--- a/tooling/scripts/test-categories.yaml
+++ b/tooling/scripts/test-categories.yaml
@@ -148,6 +148,7 @@ group-09:
   - ftp
   - graphql
   - jt400
+  - jt400-mocked
   - kafka-sasl-ssl
   - kafka-ssl
   - paho