This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 5e5830a276414b657690afac6e410de0bc4e71fe Author: James Netherton <jamesnether...@gmail.com> AuthorDate: Fri Aug 16 14:04:23 2024 +0100 Revert "Disable extension tests that use MongoDB due to #6341" This reverts commit 1d1dd60bb074dfc4e7fac7f22ea1410f710e7d4f. --- .../component/mongodb/gridfs/it/MongodbGridfsIT.java | 2 -- .../component/mongodb/gridfs/it/MongodbGridfsTest.java | 2 -- .../camel/quarkus/component/mongodb/it/MongoDbIT.java | 2 -- .../camel/quarkus/component/mongodb/it/MongoDbTest.java | 2 -- integration-tests/debezium/pom.xml | 2 -- .../debezium/common/it/mongodb/DebeziumMongodbIT.java | 2 +- .../debezium/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 fa07890e80..03e1e6649e 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 855f35a543..bad3a710ae 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.RestAssured; 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 @WithTestResource(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 f741a3c2ea..60fc464e1c 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 c56fd625cf..d0f3c8de6d 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.eclipse.microprofile.config.ConfigProvider; 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.hamcrest.Matchers.nullValue; 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 @WithTestResource(MongoDbTestResource.class) class MongoDbTest { diff --git a/integration-tests/debezium/pom.xml b/integration-tests/debezium/pom.xml index 308ae9cc43..0463e98cc7 100644 --- a/integration-tests/debezium/pom.xml +++ b/integration-tests/debezium/pom.xml @@ -128,7 +128,6 @@ <profiles> - <!-- TODO: https://github.com/apache/camel-quarkus/issues/6341 <profile> <id>native</id> <activation> @@ -156,7 +155,6 @@ </plugins> </build> </profile> - --> <profile> <id>mysqlDriver</id> <activation> 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 bf8e1fb75a..c4daf9bbf7 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 @@ package org.apache.camel.quarkus.component.debezium.common.it.mongodb; 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 a27b28ca73..af717a45ed 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.eclipse.microprofile.config.ConfigProvider; 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.assertNotNull; 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 @WithTestResource(DebeziumMongodbTestResource.class) @TestMethodOrder(MethodOrderer.OrderAnnotation.class) diff --git a/integration-tests/mongodb-grouped/pom.xml b/integration-tests/mongodb-grouped/pom.xml index 7115168f1a..d0cb9f91ca 100644 --- a/integration-tests/mongodb-grouped/pom.xml +++ b/integration-tests/mongodb-grouped/pom.xml @@ -103,7 +103,6 @@ </build> <profiles> - <!-- TODO: https://github.com/apache/camel-quarkus/issues/6341 <profile> <id>native</id> <activation> @@ -131,7 +130,6 @@ </plugins> </build> </profile> - --> <profile> <id>virtualDependencies</id> <activation> diff --git a/integration-tests/slack/pom.xml b/integration-tests/slack/pom.xml index 98324b3406..3d6486ffed 100644 --- a/integration-tests/slack/pom.xml +++ b/integration-tests/slack/pom.xml @@ -32,12 +32,10 @@ <dependencies> <!-- Mongo dependency exists as a test for https://github.com/apache/camel-quarkus/issues/2489 --> - <!-- TODO: https://github.com/apache/camel-quarkus/issues/6341 <dependency> <groupId>org.apache.camel.quarkus</groupId> <artifactId>camel-quarkus-mongodb</artifactId> </dependency> - --> <dependency> <groupId>org.apache.camel.quarkus</groupId> <artifactId>camel-quarkus-slack</artifactId> @@ -103,6 +101,19 @@ </activation> <dependencies> <!-- The following dependencies guarantee that this module is built after them. You can update them by running `mvn process-resources -Pformat -N` from the source tree root directory --> + <dependency> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-mongodb-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-slack-deployment</artifactId>