Revert "Disable microprofile-fault-tolerance testing due to #5995"

This reverts commit 17a5596.
apache · Apr 26, 2024 · 3bf23d8 · 3bf23d8
1 parent 88fdbbb
commit 3bf23d8
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 43 deletions.
diff --git a/integration-test-groups/foundation/core-fault-tolerance/pom.xml b/integration-test-groups/foundation/core-fault-tolerance/pom.xml
@@ -59,7 +59,6 @@
     </dependencies>
 
     <profiles>
-        <!-- TODO: https://github.com/apache/camel-quarkus/issues/5995
         <profile>
             <id>native</id>
             <activation>
@@ -87,7 +86,6 @@
                 </plugins>
             </build>
         </profile>
-        -->
         <profile>
             <id>virtualDependencies</id>
             <activation>

diff --git a/...e/src/test/java/org/apache/camel/quarkus/core/faulttolerance/it/CoreFaultToleranceIT.java b/...e/src/test/java/org/apache/camel/quarkus/core/faulttolerance/it/CoreFaultToleranceIT.java
@@ -17,9 +17,7 @@
 package org.apache.camel.quarkus.core.faulttolerance.it;
 
 import io.quarkus.test.junit.QuarkusIntegrationTest;
-import org.junit.jupiter.api.Disabled;
 
-@Disabled("https://github.com/apache/camel-quarkus/issues/5995")
 @QuarkusIntegrationTest
 public class CoreFaultToleranceIT extends CoreFaultToleranceTest {
 }
diff --git a/...src/test/java/org/apache/camel/quarkus/core/faulttolerance/it/CoreFaultToleranceTest.java b/...src/test/java/org/apache/camel/quarkus/core/faulttolerance/it/CoreFaultToleranceTest.java
@@ -17,13 +17,11 @@
 package org.apache.camel.quarkus.core.faulttolerance.it;
 
 import io.quarkus.test.junit.QuarkusTest;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import static io.restassured.RestAssured.get;
 import static org.hamcrest.Matchers.is;
 
-@Disabled("https://github.com/apache/camel-quarkus/issues/5995")
 @QuarkusTest
 public class CoreFaultToleranceTest {
 

diff --git a/integration-tests/foundation-grouped/pom.xml b/integration-tests/foundation-grouped/pom.xml
@@ -112,12 +112,10 @@
             <groupId>org.apache.camel.quarkus</groupId>
             <artifactId>camel-quarkus-log</artifactId>
         </dependency>
-        <!-- TODO: https://github.com/apache/camel-quarkus/issues/5995
         <dependency>
             <groupId>org.apache.camel.quarkus</groupId>
             <artifactId>camel-quarkus-microprofile-fault-tolerance</artifactId>
         </dependency>
-        -->
         <dependency>
             <groupId>org.apache.camel.quarkus</groupId>
             <artifactId>camel-quarkus-mock</artifactId>
@@ -214,8 +212,6 @@
                                 <group-tests.source.dir>${maven.multiModuleProjectDirectory}/integration-test-groups/foundation</group-tests.source.dir>
                                 <group-tests.dest.module.dir>${project.basedir}</group-tests.dest.module.dir>
                                 <group-tests.concat.rel.paths>src/main/resources/application.properties</group-tests.concat.rel.paths>
-                                <!-- TODO: https://github.com/apache/camel-quarkus/issues/5995 -->
-                                <group-tests.files.excludes>core-fault-tolerance</group-tests.files.excludes>
                             </properties>
                         </configuration>
                     </execution>
@@ -456,6 +452,19 @@
                         </exclusion>
                     </exclusions>
                 </dependency>
+                <dependency>
+                    <groupId>org.apache.camel.quarkus</groupId>
+                    <artifactId>camel-quarkus-microprofile-fault-tolerance-deployment</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
                 <dependency>
                     <groupId>org.apache.camel.quarkus</groupId>
                     <artifactId>camel-quarkus-mock-deployment</artifactId>

diff --git a/integration-tests/microprofile/pom.xml b/integration-tests/microprofile/pom.xml
@@ -43,12 +43,10 @@
             <groupId>org.apache.camel.quarkus</groupId>
             <artifactId>camel-quarkus-log</artifactId>
         </dependency>
-        <!-- TODO: https://github.com/apache/camel-quarkus/issues/5995
         <dependency>
             <groupId>org.apache.camel.quarkus</groupId>
             <artifactId>camel-quarkus-microprofile-fault-tolerance</artifactId>
         </dependency>
-        -->
         <dependency>
             <groupId>org.apache.camel.quarkus</groupId>
             <artifactId>camel-quarkus-microprofile-health</artifactId>
@@ -80,31 +78,6 @@
         </dependency>
     </dependencies>
 
-    <!-- TODO: https://github.com/apache/camel-quarkus/issues/5995 -->
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <excludes>
-                        <exclude>org/apache/camel/quarkus/component/microprofile/it/faulttolerance/**</exclude>
-                    </excludes>
-                    <testExcludes>
-                        <exclude>org/apache/camel/quarkus/component/microprofile/it/faulttolerance/**</exclude>
-                    </testExcludes>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <configuration>
-                    <excludePackageNames>org.apache.camel.quarkus.component.microprofile.it.faulttolerance</excludePackageNames>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
     <profiles>
         <profile>
             <id>native</id>
@@ -181,6 +154,19 @@
                         </exclusion>
                     </exclusions>
                 </dependency>
+                <dependency>
+                    <groupId>org.apache.camel.quarkus</groupId>
+                    <artifactId>camel-quarkus-microprofile-fault-tolerance-deployment</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
                 <dependency>
                     <groupId>org.apache.camel.quarkus</groupId>
                     <artifactId>camel-quarkus-microprofile-health-deployment</artifactId>

diff --git a/.../camel/quarkus/component/microprofile/it/faulttolerance/MicroprofileFaultToleranceIT.java b/.../camel/quarkus/component/microprofile/it/faulttolerance/MicroprofileFaultToleranceIT.java
@@ -17,9 +17,7 @@
 package org.apache.camel.quarkus.component.microprofile.it.faulttolerance;
 
 import io.quarkus.test.junit.QuarkusIntegrationTest;
-import org.junit.jupiter.api.Disabled;
 
-@Disabled("https://github.com/apache/camel-quarkus/issues/5995")
 @QuarkusIntegrationTest
 class MicroprofileFaultToleranceIT extends MicroprofileFaultToleranceTest {
 

diff --git a/...amel/quarkus/component/microprofile/it/faulttolerance/MicroprofileFaultToleranceTest.java b/...amel/quarkus/component/microprofile/it/faulttolerance/MicroprofileFaultToleranceTest.java
@@ -18,7 +18,6 @@
 
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.RestAssured;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
@@ -27,7 +26,6 @@
 import static org.apache.camel.quarkus.component.microprofile.it.faulttolerance.MicroProfileFaultToleranceRoutes.EXCEPTION_MESSAGE;
 import static org.hamcrest.Matchers.is;
 
-@Disabled("https://github.com/apache/camel-quarkus/issues/5995")
 @QuarkusTest
 class MicroprofileFaultToleranceTest {
 

diff --git a/pom.xml b/pom.xml
@@ -975,7 +975,6 @@
                                             </sourcePoms>
                                             <destinationPom>${basedir}/integration-tests/compression-grouped/pom.xml</destinationPom>
                                         </mergePom>
-                                        <!-- TODO: https://github.com/apache/camel-quarkus/issues/5995
                                         <mergePom>
                                             <sourcePoms>
                                                 <directory>${basedir}/integration-test-groups/foundation</directory>
@@ -985,7 +984,6 @@
                                             </sourcePoms>
                                             <destinationPom>${basedir}/integration-tests/foundation-grouped/pom.xml</destinationPom>
                                         </mergePom>
-                                        -->
                                         <mergePom>
                                             <sourcePoms>
                                                 <directory>${basedir}/integration-test-groups/mongodb</directory>