This is an automated email from the ASF dual-hosted git repository. fmariani pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
The following commit(s) were added to refs/heads/main by this push: new b65c5b21f0a Remove custom mongodb version b65c5b21f0a is described below commit b65c5b21f0a21cbbb6dbd01f2337ce156dda15e8 Author: Croway <federico.mariani.1...@gmail.com> AuthorDate: Thu Dec 14 15:23:32 2023 +0100 Remove custom mongodb version --- .../integration/MongoDbFindOperationIT.java | 27 +--------------------- 1 file changed, 1 insertion(+), 26 deletions(-) diff --git a/components-starter/camel-mongodb-starter/src/test/java/org/apache/camel/component/mongodb/integration/MongoDbFindOperationIT.java b/components-starter/camel-mongodb-starter/src/test/java/org/apache/camel/component/mongodb/integration/MongoDbFindOperationIT.java index d2ad75fd7c0..155b4b636ee 100644 --- a/components-starter/camel-mongodb-starter/src/test/java/org/apache/camel/component/mongodb/integration/MongoDbFindOperationIT.java +++ b/components-starter/camel-mongodb-starter/src/test/java/org/apache/camel/component/mongodb/integration/MongoDbFindOperationIT.java @@ -31,11 +31,9 @@ import org.apache.camel.CamelContext; import org.apache.camel.Exchange; import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.component.mongodb.MongoDbComponent; import org.apache.camel.component.mongodb.MongoDbConstants; import org.apache.camel.spring.boot.CamelAutoConfiguration; -import org.apache.camel.test.infra.mongodb.services.MongoDBLocalContainerService; import org.apache.camel.test.spring.junit5.CamelSpringBootTest; import org.apache.camel.util.IOHelper; import org.apache.commons.lang3.ObjectUtils; @@ -43,7 +41,6 @@ import org.apache.commons.lang3.ObjectUtils; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.RegisterExtension; import org.bson.Document; import org.bson.conversions.Bson; @@ -53,7 +50,6 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.testcontainers.containers.wait.strategy.Wait; import com.mongodb.client.MongoClient; import com.mongodb.client.MongoClients; @@ -75,10 +71,7 @@ import java.util.Map; MongoDbFindOperationIT.TestConfiguration.class } ) -public class MongoDbFindOperationIT { - - @RegisterExtension - public static MongoDBLocalContainerService service; +public class MongoDbFindOperationIT extends AbstractMongoDbITSupport { protected static String dbName = "test"; protected static String testCollectionName; @@ -90,20 +83,6 @@ public class MongoDbFindOperationIT { CamelContext context; private ProducerTemplate template; - static { - // This one requires Mongo 4.4. This is related to - // "CAMEL-15604 support allowDiskUse for MongoDB find operations" - service = new MongoDBLocalContainerService("mongo:4.4"); - - service.getContainer() - .waitingFor(Wait.forListeningPort()) - .withCommand( - "--replSet", "replicationName", - "--oplogSize", "5000", - "--syncdelay", "0", - "--noauth"); - } - @BeforeAll public static void beforeClass() { mongo = MongoClients.create(service.getReplicaSetUrl()); @@ -123,10 +102,6 @@ public class MongoDbFindOperationIT { template = context.createProducerTemplate(); } - private MockEndpoint getMockEndpoint(String endpoint) { - return (MockEndpoint) context.getEndpoint(endpoint); - } - protected void pumpDataIntoTestCollection() { // there should be 100 of each String[] scientists