fix integration tests

quarkiverse · Aug 9, 2024 · c759912 · c759912
1 parent 49d03f4
commit c759912
Show file tree

Hide file tree

Showing 12 changed files with 57 additions and 63 deletions.
diff --git a/docs/modules/ROOT/pages/includes/quarkus-temporal.adoc b/docs/modules/ROOT/pages/includes/quarkus-temporal.adoc
@@ -13,6 +13,23 @@ h|Default
 a|icon:lock[title=Fixed at build time] [[quarkus-temporal_quarkus-temporal-enable-mock]]`link:#quarkus-temporal_quarkus-temporal-enable-mock[quarkus.temporal.enable-mock]`
 
 
+[.description]
+--
+enable mock for testing
+
+ifdef::add-copy-button-to-env-var[]
+Environment variable: env_var_with_copy_button:+++QUARKUS_TEMPORAL_ENABLE_MOCK+++[]
+endif::add-copy-button-to-env-var[]
+ifndef::add-copy-button-to-env-var[]
+Environment variable: `+++QUARKUS_TEMPORAL_ENABLE_MOCK+++`
+endif::add-copy-button-to-env-var[]
+--|boolean 
+|`false`
+
+
+a|icon:lock[title=Fixed at build time] [[quarkus-temporal_quarkus-temporal-enable-mock]]`link:#quarkus-temporal_quarkus-temporal-enable-mock[quarkus.temporal.enable-mock]`
+
+
 [.description]
 --
 enable mock for testing

diff --git a/integration-test/pom.xml → integration-tests/pom.xml b/integration-test/pom.xml → integration-tests/pom.xml
@@ -8,28 +8,13 @@
         <version>999-SNAPSHOT</version>
     </parent>
 
-    <artifactId>integration-test</artifactId>
+    <artifactId>integration-tests</artifactId>
+    <name>Temporal - Integration Tests</name>
 
     <properties>
-        <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
-        <quarkus.platform.group-id>io.quarkus.platform</quarkus.platform.group-id>
-        <quarkus.platform.version>3.13.2</quarkus.platform.version>
         <skipITs>true</skipITs>
-        <surefire-plugin.version>3.3.1</surefire-plugin.version>
     </properties>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>${quarkus.platform.group-id}</groupId>
-                <artifactId>${quarkus.platform.artifact-id}</artifactId>
-                <version>${quarkus.platform.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
     <dependencies>
         <dependency>
             <groupId>io.quarkus</groupId>
@@ -59,43 +44,18 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>${quarkus.platform.group-id}</groupId>
+                <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-maven-plugin</artifactId>
-                <version>${quarkus.platform.version}</version>
-                <extensions>true</extensions>
                 <executions>
                     <execution>
                         <goals>
                             <goal>build</goal>
-                            <goal>generate-code</goal>
-                            <goal>generate-code-tests</goal>
-                            <goal>native-image-agent</goal>
                         </goals>
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>${compiler-plugin.version}</version>
-                <configuration>
-                    <compilerArgs>
-                        <arg>-parameters</arg>
-                    </compilerArgs>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>${surefire-plugin.version}</version>
-                <configuration>
-                    <systemPropertyVariables>
-                        <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
-                        <maven.home>${maven.home}</maven.home>
-                    </systemPropertyVariables>
-                </configuration>
-            </plugin>
             <plugin>
                 <artifactId>maven-failsafe-plugin</artifactId>
-                <version>${surefire-plugin.version}</version>
                 <executions>
                     <execution>
                         <goals>
@@ -117,12 +77,22 @@
 
     <profiles>
         <profile>
-            <id>native</id>
+            <id>native-image</id>
             <activation>
                 <property>
                     <name>native</name>
                 </property>
             </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <skipTests>${native.surefire.skip}</skipTests>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
             <properties>
                 <skipITs>false</skipITs>
                 <quarkus.native.enabled>true</quarkus.native.enabled>

diff --git a/...erse/temporal/app/client/TransferApp.java → ...verse/temporal/it/client/TransferApp.java b/...erse/temporal/app/client/TransferApp.java → ...verse/temporal/it/client/TransferApp.java
@@ -1,6 +1,6 @@
-package io.quarkiverse.temporal.app.client;
+package io.quarkiverse.temporal.it.client;
 
-import static io.quarkiverse.temporal.app.shared.Shared.MONEY_TRANSFER_TASK_QUEUE;
+import static io.quarkiverse.temporal.it.shared.Shared.MONEY_TRANSFER_TASK_QUEUE;
 
 import java.security.SecureRandom;
 import java.time.Instant;
@@ -14,9 +14,9 @@
 import jakarta.ws.rs.GET;
 import jakarta.ws.rs.Path;
 
-import io.quarkiverse.temporal.app.shared.MoneyTransferWorkflow;
-import io.quarkiverse.temporal.app.shared.TransactionDetails;
-import io.quarkiverse.temporal.app.worker.CoreTransactionDetails;
+import io.quarkiverse.temporal.it.shared.MoneyTransferWorkflow;
+import io.quarkiverse.temporal.it.shared.TransactionDetails;
+import io.quarkiverse.temporal.it.worker.CoreTransactionDetails;
 import io.temporal.api.common.v1.WorkflowExecution;
 import io.temporal.client.WorkflowClient;
 import io.temporal.client.WorkflowOptions;

diff --git a/.../temporal/app/shared/AccountActivity.java → ...e/temporal/it/shared/AccountActivity.java b/.../temporal/app/shared/AccountActivity.java → ...e/temporal/it/shared/AccountActivity.java
@@ -1,4 +1,4 @@
-package io.quarkiverse.temporal.app.shared;
+package io.quarkiverse.temporal.it.shared;
 
 import io.temporal.activity.ActivityInterface;
 import io.temporal.activity.ActivityMethod;

diff --git a/...ral/app/shared/MoneyTransferWorkflow.java → ...oral/it/shared/MoneyTransferWorkflow.java b/...ral/app/shared/MoneyTransferWorkflow.java → ...oral/it/shared/MoneyTransferWorkflow.java
@@ -1,4 +1,4 @@
-package io.quarkiverse.temporal.app.shared;
+package io.quarkiverse.temporal.it.shared;
 
 import io.temporal.workflow.WorkflowInterface;
 import io.temporal.workflow.WorkflowMethod;

diff --git a/...arkiverse/temporal/app/shared/Shared.java → ...uarkiverse/temporal/it/shared/Shared.java b/...arkiverse/temporal/app/shared/Shared.java → ...uarkiverse/temporal/it/shared/Shared.java
@@ -1,4 +1,4 @@
-package io.quarkiverse.temporal.app.shared;
+package io.quarkiverse.temporal.it.shared;
 
 public class Shared {
     public static final String MONEY_TRANSFER_TASK_QUEUE = "MONEY_TRANSFER_TASK_QUEUE";

diff --git a/...mporal/app/shared/TransactionDetails.java → ...emporal/it/shared/TransactionDetails.java b/...mporal/app/shared/TransactionDetails.java → ...emporal/it/shared/TransactionDetails.java
@@ -1,8 +1,8 @@
-package io.quarkiverse.temporal.app.shared;
+package io.quarkiverse.temporal.it.shared;
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 
-import io.quarkiverse.temporal.app.worker.CoreTransactionDetails;
+import io.quarkiverse.temporal.it.worker.CoreTransactionDetails;
 
 @JsonDeserialize(as = CoreTransactionDetails.class)
 public interface TransactionDetails {

diff --git a/...poral/app/worker/AccountActivityImpl.java → ...mporal/it/worker/AccountActivityImpl.java b/...poral/app/worker/AccountActivityImpl.java → ...mporal/it/worker/AccountActivityImpl.java
@@ -1,6 +1,6 @@
-package io.quarkiverse.temporal.app.worker;
+package io.quarkiverse.temporal.it.worker;
 
-import io.quarkiverse.temporal.app.shared.AccountActivity;
+import io.quarkiverse.temporal.it.shared.AccountActivity;
 import io.temporal.activity.Activity;
 
 public class AccountActivityImpl implements AccountActivity {

diff --git a/...al/app/worker/CoreTransactionDetails.java → ...ral/it/worker/CoreTransactionDetails.java b/...al/app/worker/CoreTransactionDetails.java → ...ral/it/worker/CoreTransactionDetails.java
@@ -1,6 +1,6 @@
-package io.quarkiverse.temporal.app.worker;
+package io.quarkiverse.temporal.it.worker;
 
-import io.quarkiverse.temporal.app.shared.TransactionDetails;
+import io.quarkiverse.temporal.it.shared.TransactionDetails;
 
 public class CoreTransactionDetails implements TransactionDetails {
 

diff --git a/...app/worker/MoneyTransferWorkflowImpl.java → .../it/worker/MoneyTransferWorkflowImpl.java b/...app/worker/MoneyTransferWorkflowImpl.java → .../it/worker/MoneyTransferWorkflowImpl.java
@@ -1,12 +1,12 @@
-package io.quarkiverse.temporal.app.worker;
+package io.quarkiverse.temporal.it.worker;
 
 import java.time.Duration;
 import java.util.HashMap;
 import java.util.Map;
 
-import io.quarkiverse.temporal.app.shared.AccountActivity;
-import io.quarkiverse.temporal.app.shared.MoneyTransferWorkflow;
-import io.quarkiverse.temporal.app.shared.TransactionDetails;
+import io.quarkiverse.temporal.it.shared.AccountActivity;
+import io.quarkiverse.temporal.it.shared.MoneyTransferWorkflow;
+import io.quarkiverse.temporal.it.shared.TransactionDetails;
 import io.temporal.activity.ActivityOptions;
 import io.temporal.common.RetryOptions;
 import io.temporal.workflow.Workflow;

diff --git a/integration-tests/src/test/java/io/quarkiverse/temporal/it/TemporalIT.java b/integration-tests/src/test/java/io/quarkiverse/temporal/it/TemporalIT.java
@@ -0,0 +1,7 @@
+package io.quarkiverse.temporal.it;
+
+import io.quarkus.test.junit.QuarkusTest;
+
+@QuarkusTest
+public class TemporalIT {
+}
diff --git a/pom.xml b/pom.xml
@@ -15,7 +15,7 @@
     <modules>
         <module>extension</module>
         <module>test-extension</module>
-        <module>integration-test</module>
+        <module>integration-tests</module>
         <module>docs</module>
     </modules>
     <scm>