From 6c8321443c3aa6e4b0173497a2ec3fd0281525b3 Mon Sep 17 00:00:00 2001 From: James Netherton Date: Fri, 16 Aug 2024 14:04:23 +0100 Subject: [PATCH] Revert "Disable extension tests that use MongoDB due to #6341" This reverts commit 1d1dd60bb074dfc4e7fac7f22ea1410f710e7d4f. --- .../mongodb/gridfs/it/MongodbGridfsIT.java | 2 -- .../mongodb/gridfs/it/MongodbGridfsTest.java | 2 -- .../quarkus/component/mongodb/it/MongoDbIT.java | 2 -- .../quarkus/component/mongodb/it/MongoDbTest.java | 2 -- integration-tests/debezium/pom.xml | 2 -- .../common/it/mongodb/DebeziumMongodbIT.java | 2 +- .../common/it/mongodb/DebeziumMongodbTest.java | 2 -- integration-tests/mongodb-grouped/pom.xml | 2 -- integration-tests/slack/pom.xml | 15 +++++++++++++-- 9 files changed, 14 insertions(+), 17 deletions(-) diff --git a/integration-test-groups/mongodb/mongodb-gridfs/src/test/java/org/apache/camel/quarkus/component/mongodb/gridfs/it/MongodbGridfsIT.java b/integration-test-groups/mongodb/mongodb-gridfs/src/test/java/org/apache/camel/quarkus/component/mongodb/gridfs/it/MongodbGridfsIT.java index fa07890e80fa..03e1e6649eda 100644 --- a/integration-test-groups/mongodb/mongodb-gridfs/src/test/java/org/apache/camel/quarkus/component/mongodb/gridfs/it/MongodbGridfsIT.java +++ b/integration-test-groups/mongodb/mongodb-gridfs/src/test/java/org/apache/camel/quarkus/component/mongodb/gridfs/it/MongodbGridfsIT.java @@ -17,9 +17,7 @@ package org.apache.camel.quarkus.component.mongodb.gridfs.it; import io.quarkus.test.junit.QuarkusIntegrationTest; -import org.junit.jupiter.api.Disabled; -@Disabled("https://github.com/apache/camel-quarkus/issues/6341") @QuarkusIntegrationTest class MongodbGridfsIT extends MongodbGridfsTest { } diff --git a/integration-test-groups/mongodb/mongodb-gridfs/src/test/java/org/apache/camel/quarkus/component/mongodb/gridfs/it/MongodbGridfsTest.java b/integration-test-groups/mongodb/mongodb-gridfs/src/test/java/org/apache/camel/quarkus/component/mongodb/gridfs/it/MongodbGridfsTest.java index 5e0735509069..566bc3f43923 100644 --- a/integration-test-groups/mongodb/mongodb-gridfs/src/test/java/org/apache/camel/quarkus/component/mongodb/gridfs/it/MongodbGridfsTest.java +++ b/integration-test-groups/mongodb/mongodb-gridfs/src/test/java/org/apache/camel/quarkus/component/mongodb/gridfs/it/MongodbGridfsTest.java @@ -22,13 +22,11 @@ import io.restassured.http.ContentType; import org.apache.camel.quarkus.test.support.mongodb.MongoDbTestResource; import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; import static org.hamcrest.Matchers.is; -@Disabled("https://github.com/apache/camel-quarkus/issues/6341") @QuarkusTest @QuarkusTestResource(MongoDbTestResource.class) class MongodbGridfsTest { diff --git a/integration-test-groups/mongodb/mongodb/src/test/java/org/apache/camel/quarkus/component/mongodb/it/MongoDbIT.java b/integration-test-groups/mongodb/mongodb/src/test/java/org/apache/camel/quarkus/component/mongodb/it/MongoDbIT.java index f741a3c2ea28..60fc464e1c45 100644 --- a/integration-test-groups/mongodb/mongodb/src/test/java/org/apache/camel/quarkus/component/mongodb/it/MongoDbIT.java +++ b/integration-test-groups/mongodb/mongodb/src/test/java/org/apache/camel/quarkus/component/mongodb/it/MongoDbIT.java @@ -17,9 +17,7 @@ package org.apache.camel.quarkus.component.mongodb.it; import io.quarkus.test.junit.QuarkusIntegrationTest; -import org.junit.jupiter.api.Disabled; -@Disabled("https://github.com/apache/camel-quarkus/issues/6341") @QuarkusIntegrationTest class MongoDbIT extends MongoDbTest { diff --git a/integration-test-groups/mongodb/mongodb/src/test/java/org/apache/camel/quarkus/component/mongodb/it/MongoDbTest.java b/integration-test-groups/mongodb/mongodb/src/test/java/org/apache/camel/quarkus/component/mongodb/it/MongoDbTest.java index 19c232895d1f..3dbc48b506fe 100644 --- a/integration-test-groups/mongodb/mongodb/src/test/java/org/apache/camel/quarkus/component/mongodb/it/MongoDbTest.java +++ b/integration-test-groups/mongodb/mongodb/src/test/java/org/apache/camel/quarkus/component/mongodb/it/MongoDbTest.java @@ -39,7 +39,6 @@ import org.jboss.logging.Logger; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; @@ -51,7 +50,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -@Disabled("https://github.com/apache/camel-quarkus/issues/6341") @QuarkusTest @QuarkusTestResource(MongoDbTestResource.class) class MongoDbTest { diff --git a/integration-tests/debezium/pom.xml b/integration-tests/debezium/pom.xml index a69b4a20a586..3c7e81f49bd1 100644 --- a/integration-tests/debezium/pom.xml +++ b/integration-tests/debezium/pom.xml @@ -128,7 +128,6 @@ - mysqlDriver diff --git a/integration-tests/debezium/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/mongodb/DebeziumMongodbIT.java b/integration-tests/debezium/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/mongodb/DebeziumMongodbIT.java index bf8e1fb75a43..c4daf9bbf761 100644 --- a/integration-tests/debezium/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/mongodb/DebeziumMongodbIT.java +++ b/integration-tests/debezium/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/mongodb/DebeziumMongodbIT.java @@ -19,7 +19,7 @@ import io.quarkus.test.junit.QuarkusIntegrationTest; import org.junit.jupiter.api.Disabled; -@Disabled("https://github.com/apache/camel-quarkus/issues/4638, https://github.com/apache/camel-quarkus/issues/6341") +@Disabled("https://github.com/apache/camel-quarkus/issues/4638") @QuarkusIntegrationTest class DebeziumMongodbIT extends DebeziumMongodbTest { diff --git a/integration-tests/debezium/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/mongodb/DebeziumMongodbTest.java b/integration-tests/debezium/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/mongodb/DebeziumMongodbTest.java index f65c20123b58..04a847420843 100644 --- a/integration-tests/debezium/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/mongodb/DebeziumMongodbTest.java +++ b/integration-tests/debezium/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/mongodb/DebeziumMongodbTest.java @@ -35,7 +35,6 @@ import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.MethodOrderer; import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; @@ -48,7 +47,6 @@ import static org.junit.jupiter.api.Assertions.fail; import static org.junit.jupiter.api.Assumptions.assumeTrue; -@Disabled("https://github.com/apache/camel-quarkus/issues/6341") @QuarkusTest @QuarkusTestResource(DebeziumMongodbTestResource.class) @TestMethodOrder(MethodOrderer.OrderAnnotation.class) diff --git a/integration-tests/mongodb-grouped/pom.xml b/integration-tests/mongodb-grouped/pom.xml index a29407f134ad..dc2dd807eec4 100644 --- a/integration-tests/mongodb-grouped/pom.xml +++ b/integration-tests/mongodb-grouped/pom.xml @@ -103,7 +103,6 @@ - virtualDependencies diff --git a/integration-tests/slack/pom.xml b/integration-tests/slack/pom.xml index 06c3e161885a..f5973f0bbd04 100644 --- a/integration-tests/slack/pom.xml +++ b/integration-tests/slack/pom.xml @@ -32,12 +32,10 @@ - org.apache.camel.quarkus camel-quarkus-slack @@ -103,6 +101,19 @@ + + org.apache.camel.quarkus + camel-quarkus-mongodb-deployment + ${project.version} + pom + test + + + * + * + + + org.apache.camel.quarkus camel-quarkus-slack-deployment