You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by lb...@apache.org on 2019/11/18 08:11:32 UTC

[camel-quarkus] branch master updated: Consolidate microprofile integration tests #433

This is an automated email from the ASF dual-hosted git repository.

lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git


The following commit(s) were added to refs/heads/master by this push:
     new d93ef5b  Consolidate microprofile integration tests #433
d93ef5b is described below

commit d93ef5b8ad9a0e1fc94d07fe79f07bc26623a6d3
Author: lburgazzoli <lb...@gmail.com>
AuthorDate: Sun Nov 17 13:27:13 2019 +0100

    Consolidate microprofile integration tests #433
---
 integration-tests/microprofile-health/pom.xml      | 128 ---------------------
 .../src/main/resources/application.properties      |  21 ----
 .../{microprofile-metrics => microprofile}/pom.xml |  10 +-
 .../it/health}/FailingHealthCheck.java             |   2 +-
 .../microprofile/it/health}/LivenessCheck.java     |   2 +-
 .../it/health}/MicroProfileHealthResource.java     |   2 +-
 .../it/health}/MicroProfileHealthRouteBuilder.java |   2 +-
 .../microprofile/it/health}/ReadinessCheck.java    |   2 +-
 .../microprofile/it/health}/SimpleHealthCheck.java |   2 +-
 .../it/metrics}/MicroProfileMetricsResource.java   |   2 +-
 .../metrics}/MicroProfileMetricsRouteBuilder.java  |   2 +-
 .../src/main/resources/application.properties      |   9 +-
 .../it/health}/MicroProfileHealthTest.java         |   2 +-
 .../it/health}/MicroprofileHealthIT.java           |   2 +-
 .../it/metrics}/MicroProfileMetricsTest.java       |  10 +-
 .../it/metrics}/MicroprofileMetricsIT.java         |   2 +-
 integration-tests/pom.xml                          |   3 +-
 17 files changed, 31 insertions(+), 172 deletions(-)

diff --git a/integration-tests/microprofile-health/pom.xml b/integration-tests/microprofile-health/pom.xml
deleted file mode 100644
index 0d5fe8f..0000000
--- a/integration-tests/microprofile-health/pom.xml
+++ /dev/null
@@ -1,128 +0,0 @@
-<?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-integration-tests</artifactId>
-        <version>0.4.1-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>camel-quarkus-integration-test-microprofile-health</artifactId>
-    <name>Camel Quarkus :: Integration Tests :: MicroProfile Health</name>
-    <description>Integration tests for Camel Quarkus microprofile-health extension</description>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.camel.quarkus</groupId>
-            <artifactId>camel-quarkus-microprofile-health</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.camel.quarkus</groupId>
-            <artifactId>camel-quarkus-direct</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-resteasy</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>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>build</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-    <profiles>
-        <profile>
-            <id>native</id>
-            <activation>
-                <property>
-                    <name>native</name>
-                </property>
-            </activation>
-            <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>
-                                <configuration>
-                                    <systemProperties>
-                                        <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
-                                    </systemProperties>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>native-image</id>
-                                <goals>
-                                    <goal>native-image</goal>
-                                </goals>
-                                <configuration>
-                                    <cleanupServer>true</cleanupServer>
-                                    <enableHttpsUrlHandler>true</enableHttpsUrlHandler>
-                                    <enableServer>false</enableServer>
-                                    <dumpProxies>false</dumpProxies>
-                                    <enableJni>true</enableJni>
-                                    <enableAllSecurityServices>true</enableAllSecurityServices>
-                                    <disableReports>true</disableReports>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
-</project>
diff --git a/integration-tests/microprofile-health/src/main/resources/application.properties b/integration-tests/microprofile-health/src/main/resources/application.properties
deleted file mode 100644
index 936eeb8..0000000
--- a/integration-tests/microprofile-health/src/main/resources/application.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-## ---------------------------------------------------------------------------
-## 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.
-## ---------------------------------------------------------------------------
-
-#
-# Camel
-#
-camel.context.name = quarkus-camel-example
diff --git a/integration-tests/microprofile-metrics/pom.xml b/integration-tests/microprofile/pom.xml
similarity index 92%
rename from integration-tests/microprofile-metrics/pom.xml
rename to integration-tests/microprofile/pom.xml
index 70add49..c234a80 100644
--- a/integration-tests/microprofile-metrics/pom.xml
+++ b/integration-tests/microprofile/pom.xml
@@ -25,13 +25,17 @@
         <version>0.4.1-SNAPSHOT</version>
     </parent>
 
-    <artifactId>camel-quarkus-integration-test-microprofile-metrics</artifactId>
-    <name>Camel Quarkus :: Integration Tests :: Microprofile Metrics</name>
-    <description>Integration tests for Camel Quarkus microprofile-metrics extension</description>
+    <artifactId>camel-quarkus-integration-test-microprofile</artifactId>
+    <name>Camel Quarkus :: Integration Tests :: MicroProfile</name>
+    <description>Integration tests for Camel Quarkus MicroProfile extensions</description>
 
     <dependencies>
         <dependency>
             <groupId>org.apache.camel.quarkus</groupId>
+            <artifactId>camel-quarkus-microprofile-health</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.camel.quarkus</groupId>
             <artifactId>camel-quarkus-microprofile-metrics</artifactId>
         </dependency>
         <dependency>
diff --git a/integration-tests/microprofile-health/src/main/java/org/apache/camel/quarkus/component/microprofile/health/it/FailingHealthCheck.java b/integration-tests/microprofile/src/main/java/org/apache/camel/quarkus/component/microprofile/it/health/FailingHealthCheck.java
similarity index 94%
rename from integration-tests/microprofile-health/src/main/java/org/apache/camel/quarkus/component/microprofile/health/it/FailingHealthCheck.java
rename to integration-tests/microprofile/src/main/java/org/apache/camel/quarkus/component/microprofile/it/health/FailingHealthCheck.java
index da581c9..834040a 100644
--- a/integration-tests/microprofile-health/src/main/java/org/apache/camel/quarkus/component/microprofile/health/it/FailingHealthCheck.java
+++ b/integration-tests/microprofile/src/main/java/org/apache/camel/quarkus/component/microprofile/it/health/FailingHealthCheck.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.microprofile.health.it;
+package org.apache.camel.quarkus.component.microprofile.it.health;
 
 import java.util.Map;
 
diff --git a/integration-tests/microprofile-health/src/main/java/org/apache/camel/quarkus/component/microprofile/health/it/LivenessCheck.java b/integration-tests/microprofile/src/main/java/org/apache/camel/quarkus/component/microprofile/it/health/LivenessCheck.java
similarity index 95%
rename from integration-tests/microprofile-health/src/main/java/org/apache/camel/quarkus/component/microprofile/health/it/LivenessCheck.java
rename to integration-tests/microprofile/src/main/java/org/apache/camel/quarkus/component/microprofile/it/health/LivenessCheck.java
index 74953b8..f98a9c5 100644
--- a/integration-tests/microprofile-health/src/main/java/org/apache/camel/quarkus/component/microprofile/health/it/LivenessCheck.java
+++ b/integration-tests/microprofile/src/main/java/org/apache/camel/quarkus/component/microprofile/it/health/LivenessCheck.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.microprofile.health.it;
+package org.apache.camel.quarkus.component.microprofile.it.health;
 
 import java.util.Map;
 
diff --git a/integration-tests/microprofile-health/src/main/java/org/apache/camel/quarkus/component/microprofile/health/it/MicroProfileHealthResource.java b/integration-tests/microprofile/src/main/java/org/apache/camel/quarkus/component/microprofile/it/health/MicroProfileHealthResource.java
similarity index 96%
rename from integration-tests/microprofile-health/src/main/java/org/apache/camel/quarkus/component/microprofile/health/it/MicroProfileHealthResource.java
rename to integration-tests/microprofile/src/main/java/org/apache/camel/quarkus/component/microprofile/it/health/MicroProfileHealthResource.java
index 3c19446..dab6016 100644
--- a/integration-tests/microprofile-health/src/main/java/org/apache/camel/quarkus/component/microprofile/health/it/MicroProfileHealthResource.java
+++ b/integration-tests/microprofile/src/main/java/org/apache/camel/quarkus/component/microprofile/it/health/MicroProfileHealthResource.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.microprofile.health.it;
+package org.apache.camel.quarkus.component.microprofile.it.health;
 
 import javax.enterprise.context.ApplicationScoped;
 import javax.inject.Inject;
diff --git a/integration-tests/microprofile-health/src/main/java/org/apache/camel/quarkus/component/microprofile/health/it/MicroProfileHealthRouteBuilder.java b/integration-tests/microprofile/src/main/java/org/apache/camel/quarkus/component/microprofile/it/health/MicroProfileHealthRouteBuilder.java
similarity index 94%
rename from integration-tests/microprofile-health/src/main/java/org/apache/camel/quarkus/component/microprofile/health/it/MicroProfileHealthRouteBuilder.java
rename to integration-tests/microprofile/src/main/java/org/apache/camel/quarkus/component/microprofile/it/health/MicroProfileHealthRouteBuilder.java
index 25bb2a1..aa0710a 100644
--- a/integration-tests/microprofile-health/src/main/java/org/apache/camel/quarkus/component/microprofile/health/it/MicroProfileHealthRouteBuilder.java
+++ b/integration-tests/microprofile/src/main/java/org/apache/camel/quarkus/component/microprofile/it/health/MicroProfileHealthRouteBuilder.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.microprofile.health.it;
+package org.apache.camel.quarkus.component.microprofile.it.health;
 
 import org.apache.camel.builder.RouteBuilder;
 
diff --git a/integration-tests/microprofile-health/src/main/java/org/apache/camel/quarkus/component/microprofile/health/it/ReadinessCheck.java b/integration-tests/microprofile/src/main/java/org/apache/camel/quarkus/component/microprofile/it/health/ReadinessCheck.java
similarity index 95%
rename from integration-tests/microprofile-health/src/main/java/org/apache/camel/quarkus/component/microprofile/health/it/ReadinessCheck.java
rename to integration-tests/microprofile/src/main/java/org/apache/camel/quarkus/component/microprofile/it/health/ReadinessCheck.java
index 1e416f3..381e7e6 100644
--- a/integration-tests/microprofile-health/src/main/java/org/apache/camel/quarkus/component/microprofile/health/it/ReadinessCheck.java
+++ b/integration-tests/microprofile/src/main/java/org/apache/camel/quarkus/component/microprofile/it/health/ReadinessCheck.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.microprofile.health.it;
+package org.apache.camel.quarkus.component.microprofile.it.health;
 
 import java.util.Map;
 
diff --git a/integration-tests/microprofile-health/src/main/java/org/apache/camel/quarkus/component/microprofile/health/it/SimpleHealthCheck.java b/integration-tests/microprofile/src/main/java/org/apache/camel/quarkus/component/microprofile/it/health/SimpleHealthCheck.java
similarity index 94%
rename from integration-tests/microprofile-health/src/main/java/org/apache/camel/quarkus/component/microprofile/health/it/SimpleHealthCheck.java
rename to integration-tests/microprofile/src/main/java/org/apache/camel/quarkus/component/microprofile/it/health/SimpleHealthCheck.java
index 190afe5..519aef1 100644
--- a/integration-tests/microprofile-health/src/main/java/org/apache/camel/quarkus/component/microprofile/health/it/SimpleHealthCheck.java
+++ b/integration-tests/microprofile/src/main/java/org/apache/camel/quarkus/component/microprofile/it/health/SimpleHealthCheck.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.microprofile.health.it;
+package org.apache.camel.quarkus.component.microprofile.it.health;
 
 import java.util.Map;
 
diff --git a/integration-tests/microprofile-metrics/src/main/java/org/apache/camel/quarkus/component/microprofile/metrics/it/MicroProfileMetricsResource.java b/integration-tests/microprofile/src/main/java/org/apache/camel/quarkus/component/microprofile/it/metrics/MicroProfileMetricsResource.java
similarity index 97%
rename from integration-tests/microprofile-metrics/src/main/java/org/apache/camel/quarkus/component/microprofile/metrics/it/MicroProfileMetricsResource.java
rename to integration-tests/microprofile/src/main/java/org/apache/camel/quarkus/component/microprofile/it/metrics/MicroProfileMetricsResource.java
index 0b8a90d..7caa318 100644
--- a/integration-tests/microprofile-metrics/src/main/java/org/apache/camel/quarkus/component/microprofile/metrics/it/MicroProfileMetricsResource.java
+++ b/integration-tests/microprofile/src/main/java/org/apache/camel/quarkus/component/microprofile/it/metrics/MicroProfileMetricsResource.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.microprofile.metrics.it;
+package org.apache.camel.quarkus.component.microprofile.it.metrics;
 
 import javax.enterprise.context.ApplicationScoped;
 import javax.inject.Inject;
diff --git a/integration-tests/microprofile-metrics/src/main/java/org/apache/camel/quarkus/component/microprofile/metrics/it/MicroProfileMetricsRouteBuilder.java b/integration-tests/microprofile/src/main/java/org/apache/camel/quarkus/component/microprofile/it/metrics/MicroProfileMetricsRouteBuilder.java
similarity index 97%
rename from integration-tests/microprofile-metrics/src/main/java/org/apache/camel/quarkus/component/microprofile/metrics/it/MicroProfileMetricsRouteBuilder.java
rename to integration-tests/microprofile/src/main/java/org/apache/camel/quarkus/component/microprofile/it/metrics/MicroProfileMetricsRouteBuilder.java
index 4b01d82..ab9c0f5 100644
--- a/integration-tests/microprofile-metrics/src/main/java/org/apache/camel/quarkus/component/microprofile/metrics/it/MicroProfileMetricsRouteBuilder.java
+++ b/integration-tests/microprofile/src/main/java/org/apache/camel/quarkus/component/microprofile/it/metrics/MicroProfileMetricsRouteBuilder.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.microprofile.metrics.it;
+package org.apache.camel.quarkus.component.microprofile.it.metrics;
 
 import org.apache.camel.builder.RouteBuilder;
 import static org.apache.camel.component.microprofile.metrics.MicroProfileMetricsConstants.HEADER_GAUGE_VALUE;
diff --git a/integration-tests/microprofile-metrics/src/main/resources/application.properties b/integration-tests/microprofile/src/main/resources/application.properties
similarity index 93%
rename from integration-tests/microprofile-metrics/src/main/resources/application.properties
rename to integration-tests/microprofile/src/main/resources/application.properties
index 430f808..99ae16b 100644
--- a/integration-tests/microprofile-metrics/src/main/resources/application.properties
+++ b/integration-tests/microprofile/src/main/resources/application.properties
@@ -16,7 +16,12 @@
 ## ---------------------------------------------------------------------------
 
 #
-# Camel
+# Quarkus - Camel
 #
-camel.context.name = quarkus-camel-example
 quarkus.camel.metrics.enable-message-history = true
+
+
+#
+# Camel
+#
+camel.context.name = quarkus-camel-example
\ No newline at end of file
diff --git a/integration-tests/microprofile-health/src/test/java/org/apache/camel/quarkus/component/microprofile/health/it/MicroProfileHealthTest.java b/integration-tests/microprofile/src/test/java/org/apache/camel/quarkus/component/microprofile/it/health/MicroProfileHealthTest.java
similarity index 99%
rename from integration-tests/microprofile-health/src/test/java/org/apache/camel/quarkus/component/microprofile/health/it/MicroProfileHealthTest.java
rename to integration-tests/microprofile/src/test/java/org/apache/camel/quarkus/component/microprofile/it/health/MicroProfileHealthTest.java
index 71d7686..745c202 100644
--- a/integration-tests/microprofile-health/src/test/java/org/apache/camel/quarkus/component/microprofile/health/it/MicroProfileHealthTest.java
+++ b/integration-tests/microprofile/src/test/java/org/apache/camel/quarkus/component/microprofile/it/health/MicroProfileHealthTest.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.microprofile.health.it;
+package org.apache.camel.quarkus.component.microprofile.it.health;
 
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.RestAssured;
diff --git a/integration-tests/microprofile-health/src/test/java/org/apache/camel/quarkus/component/microprofile/health/it/MicroprofileHealthIT.java b/integration-tests/microprofile/src/test/java/org/apache/camel/quarkus/component/microprofile/it/health/MicroprofileHealthIT.java
similarity index 93%
rename from integration-tests/microprofile-health/src/test/java/org/apache/camel/quarkus/component/microprofile/health/it/MicroprofileHealthIT.java
rename to integration-tests/microprofile/src/test/java/org/apache/camel/quarkus/component/microprofile/it/health/MicroprofileHealthIT.java
index 1f8f693..9d3e33b 100644
--- a/integration-tests/microprofile-health/src/test/java/org/apache/camel/quarkus/component/microprofile/health/it/MicroprofileHealthIT.java
+++ b/integration-tests/microprofile/src/test/java/org/apache/camel/quarkus/component/microprofile/it/health/MicroprofileHealthIT.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.microprofile.health.it;
+package org.apache.camel.quarkus.component.microprofile.it.health;
 
 import io.quarkus.test.junit.NativeImageTest;
 
diff --git a/integration-tests/microprofile-metrics/src/test/java/org/apache/camel/quarkus/component/microprofile/metrics/it/MicroProfileMetricsTest.java b/integration-tests/microprofile/src/test/java/org/apache/camel/quarkus/component/microprofile/it/metrics/MicroProfileMetricsTest.java
similarity index 95%
rename from integration-tests/microprofile-metrics/src/test/java/org/apache/camel/quarkus/component/microprofile/metrics/it/MicroProfileMetricsTest.java
rename to integration-tests/microprofile/src/test/java/org/apache/camel/quarkus/component/microprofile/it/metrics/MicroProfileMetricsTest.java
index 1bda434..c511ac8 100644
--- a/integration-tests/microprofile-metrics/src/test/java/org/apache/camel/quarkus/component/microprofile/metrics/it/MicroProfileMetricsTest.java
+++ b/integration-tests/microprofile/src/test/java/org/apache/camel/quarkus/component/microprofile/it/metrics/MicroProfileMetricsTest.java
@@ -14,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.quarkus.component.microprofile.metrics.it;
+package org.apache.camel.quarkus.component.microprofile.it.metrics;
 
 import java.util.Map;
 
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.RestAssured;
 import io.restassured.path.json.JsonPath;
-
 import org.apache.camel.ServiceStatus;
 import org.junit.jupiter.api.Test;
+
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
@@ -112,9 +112,9 @@ class MicroProfileMetricsTest {
     }
 
     @Test
-    public void testMicroProfileMetricsRouteEventNotifier() throws InterruptedException {
-        assertEquals(7, getMetricIntValue("camel.route.count"));
-        assertEquals(7, getMetricIntValue("camel.route.running.count"));
+    public void testMicroProfileMetricsRouteEventNotifier() {
+        assertTrue(getMetricIntValue("camel.route.count") >= 7);
+        assertTrue(getMetricIntValue("camel.route.running.count") >= 7);
     }
 
     @Test
diff --git a/integration-tests/microprofile-metrics/src/test/java/org/apache/camel/quarkus/component/microprofile/metrics/it/MicroprofileMetricsIT.java b/integration-tests/microprofile/src/test/java/org/apache/camel/quarkus/component/microprofile/it/metrics/MicroprofileMetricsIT.java
similarity index 93%
rename from integration-tests/microprofile-metrics/src/test/java/org/apache/camel/quarkus/component/microprofile/metrics/it/MicroprofileMetricsIT.java
rename to integration-tests/microprofile/src/test/java/org/apache/camel/quarkus/component/microprofile/it/metrics/MicroprofileMetricsIT.java
index 3b44a24..f594fcd 100644
--- a/integration-tests/microprofile-metrics/src/test/java/org/apache/camel/quarkus/component/microprofile/metrics/it/MicroprofileMetricsIT.java
+++ b/integration-tests/microprofile/src/test/java/org/apache/camel/quarkus/component/microprofile/it/metrics/MicroprofileMetricsIT.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.microprofile.metrics.it;
+package org.apache.camel.quarkus.component.microprofile.it.metrics;
 
 import io.quarkus.test.junit.NativeImageTest;
 
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index 468c7ce..d5c0b15 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -92,8 +92,7 @@
         <module>jackson</module>
         <module>jdbc</module>
         <module>mail</module>
-        <module>microprofile-health</module>
-        <module>microprofile-metrics</module>
+        <module>microprofile</module>
         <module>netty</module>
         <module>netty-http</module>
         <module>opentracing</module>