Consolidate microprofile integration tests apache#433

lburgazzoli · Nov 17, 2019 · d8fda80 · d8fda80
1 parent a2d7095
commit d8fda80
Show file tree

Hide file tree

Showing 17 changed files with 31 additions and 172 deletions.
diff --git a/integration-tests/microprofile-health/pom.xml b/integration-tests/microprofile-health/pom.xml
diff --git a/integration-tests/microprofile-health/src/main/resources/application.properties b/integration-tests/microprofile-health/src/main/resources/application.properties
diff --git a/...ration-tests/microprofile-metrics/pom.xml → integration-tests/microprofile/pom.xml b/...ration-tests/microprofile-metrics/pom.xml → integration-tests/microprofile/pom.xml
@@ -25,11 +25,15 @@
         <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>

diff --git a/...profile/health/it/FailingHealthCheck.java → ...profile/it/health/FailingHealthCheck.java b/...profile/health/it/FailingHealthCheck.java → ...profile/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/...microprofile/health/it/LivenessCheck.java → ...microprofile/it/health/LivenessCheck.java b/...microprofile/health/it/LivenessCheck.java → ...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/...health/it/MicroProfileHealthResource.java → ...it/health/MicroProfileHealthResource.java b/...health/it/MicroProfileHealthResource.java → ...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/...th/it/MicroProfileHealthRouteBuilder.java → ...ealth/MicroProfileHealthRouteBuilder.java b/...th/it/MicroProfileHealthRouteBuilder.java → ...ealth/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/...icroprofile/health/it/ReadinessCheck.java → ...icroprofile/it/health/ReadinessCheck.java b/...icroprofile/health/it/ReadinessCheck.java → ...icroprofile/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/...oprofile/health/it/SimpleHealthCheck.java → ...oprofile/it/health/SimpleHealthCheck.java b/...oprofile/health/it/SimpleHealthCheck.java → ...oprofile/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/...trics/it/MicroProfileMetricsResource.java → .../metrics/MicroProfileMetricsResource.java b/...trics/it/MicroProfileMetricsResource.java → .../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/...s/it/MicroProfileMetricsRouteBuilder.java → ...rics/MicroProfileMetricsRouteBuilder.java b/...s/it/MicroProfileMetricsRouteBuilder.java → ...rics/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/...src/main/resources/application.properties → ...src/main/resources/application.properties b/...src/main/resources/application.properties → ...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
diff --git a/...ile/health/it/MicroProfileHealthTest.java → ...ile/it/health/MicroProfileHealthTest.java b/...ile/health/it/MicroProfileHealthTest.java → ...ile/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/...ofile/health/it/MicroprofileHealthIT.java → ...ofile/it/health/MicroprofileHealthIT.java b/...ofile/health/it/MicroprofileHealthIT.java → ...ofile/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/...e/metrics/it/MicroProfileMetricsTest.java → ...e/it/metrics/MicroProfileMetricsTest.java b/...e/metrics/it/MicroProfileMetricsTest.java → ...e/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 @@ public void testMicroProfileMetricsMessageHistoryFactory() {
     }
 
     @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/...ile/metrics/it/MicroprofileMetricsIT.java → ...ile/it/metrics/MicroprofileMetricsIT.java b/...ile/metrics/it/MicroprofileMetricsIT.java → ...ile/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
@@ -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>