You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2020/08/27 06:38:07 UTC
[camel-kafka-connector] branch master updated: Fix mongodb test
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git
The following commit(s) were added to refs/heads/master by this push:
new ee394eb Fix mongodb test
new 766e05d Merge pull request #396 from unsortedhashsets/fix-mongodb
ee394eb is described below
commit ee394ebdc6764c4a78d115fddc8e3fb644fc688a
Author: Mikhail Abramov <ma...@redhat.com>
AuthorDate: Wed Aug 26 19:48:58 2020 +0200
Fix mongodb test
---
README.adoc | 3 +--
.../mongodb/services/MongoDBLocalContainerService.java | 14 ++------------
.../mongodb/services/MongoDBService.java | 4 ----
.../mongodb/services/RemoteMongoDBService.java | 18 +-----------------
.../mongodb/sink/CamelSinkMongoDBITCase.java | 5 ++---
.../mongodb/source/CamelSourceMongoDBITCase.java | 5 ++---
6 files changed, 8 insertions(+), 41 deletions(-)
diff --git a/README.adoc b/README.adoc
index 70bf759..b6e614a 100644
--- a/README.adoc
+++ b/README.adoc
@@ -65,8 +65,7 @@ for remote testing:
** hdfs.host
** hdfs.port
* mongodb.instance.type
-** mongodb.host
-** mongodb.port
+** mongodb.url
Additionally, a few manual tests can be enabled and executed with adequate configuration on the accounts and
environments used by those services. This is very specific to the nature of each of those services, therefore
diff --git a/tests/itests-mongodb/src/test/java/org/apache/camel/kafkaconnector/mongodb/services/MongoDBLocalContainerService.java b/tests/itests-mongodb/src/test/java/org/apache/camel/kafkaconnector/mongodb/services/MongoDBLocalContainerService.java
index 508659c..27d647e 100644
--- a/tests/itests-mongodb/src/test/java/org/apache/camel/kafkaconnector/mongodb/services/MongoDBLocalContainerService.java
+++ b/tests/itests-mongodb/src/test/java/org/apache/camel/kafkaconnector/mongodb/services/MongoDBLocalContainerService.java
@@ -41,18 +41,8 @@ public class MongoDBLocalContainerService implements MongoDBService {
}
@Override
- public String getReplicaSetUrl() {
- return container.getReplicaSetUrl();
- }
-
- @Override
- public String getHost() {
- return container.getContainerIpAddress();
- }
-
- @Override
- public int getPort() {
- return container.getMappedPort(DEFAULT_MONGODB_PORT);
+ public String getReplicaSetUrl() {
+ return "mongodb://" + container.getContainerIpAddress() + ":" + container.getMappedPort(DEFAULT_MONGODB_PORT);
}
@Override
diff --git a/tests/itests-mongodb/src/test/java/org/apache/camel/kafkaconnector/mongodb/services/MongoDBService.java b/tests/itests-mongodb/src/test/java/org/apache/camel/kafkaconnector/mongodb/services/MongoDBService.java
index 8077b44..106a705 100644
--- a/tests/itests-mongodb/src/test/java/org/apache/camel/kafkaconnector/mongodb/services/MongoDBService.java
+++ b/tests/itests-mongodb/src/test/java/org/apache/camel/kafkaconnector/mongodb/services/MongoDBService.java
@@ -35,10 +35,6 @@ public interface MongoDBService extends BeforeAllCallback, AfterAllCallback {
String getReplicaSetUrl();
- String getHost();
-
- int getPort();
-
MongoClient getClient();
@Override
diff --git a/tests/itests-mongodb/src/test/java/org/apache/camel/kafkaconnector/mongodb/services/RemoteMongoDBService.java b/tests/itests-mongodb/src/test/java/org/apache/camel/kafkaconnector/mongodb/services/RemoteMongoDBService.java
index 256717c..c495d7c 100644
--- a/tests/itests-mongodb/src/test/java/org/apache/camel/kafkaconnector/mongodb/services/RemoteMongoDBService.java
+++ b/tests/itests-mongodb/src/test/java/org/apache/camel/kafkaconnector/mongodb/services/RemoteMongoDBService.java
@@ -21,25 +21,9 @@ import com.mongodb.client.MongoClient;
import com.mongodb.client.MongoClients;
public class RemoteMongoDBService implements MongoDBService {
- private static final int MONGODB_PORT = 27017;
- public int getPort() {
- String strPort = System.getProperty("mongodb.port");
-
- if (strPort != null) {
- return Integer.parseInt(strPort);
- }
-
- return MONGODB_PORT;
- }
-
- public String getHost() {
- return System.getProperty("mongodb.host");
- }
-
- @Override
public String getReplicaSetUrl() {
- return getHost() + ":" + getPort();
+ return System.getProperty("mongodb.url");
}
@Override
diff --git a/tests/itests-mongodb/src/test/java/org/apache/camel/kafkaconnector/mongodb/sink/CamelSinkMongoDBITCase.java b/tests/itests-mongodb/src/test/java/org/apache/camel/kafkaconnector/mongodb/sink/CamelSinkMongoDBITCase.java
index c7ea369..a381f38 100644
--- a/tests/itests-mongodb/src/test/java/org/apache/camel/kafkaconnector/mongodb/sink/CamelSinkMongoDBITCase.java
+++ b/tests/itests-mongodb/src/test/java/org/apache/camel/kafkaconnector/mongodb/sink/CamelSinkMongoDBITCase.java
@@ -105,9 +105,8 @@ public class CamelSinkMongoDBITCase extends AbstractKafkaTest {
@Test
@Timeout(90)
public void testBasicSendReceive() throws ExecutionException, InterruptedException {
- String connectionBeanRef = String.format("com.mongodb.client.MongoClients#create('mongodb://%s:%d')",
- mongoDBService.getHost(),
- mongoDBService.getPort());
+ String connectionBeanRef = String.format("com.mongodb.client.MongoClients#create('%s')",
+ mongoDBService.getReplicaSetUrl());
CamelMongoDBPropertyFactory factory = CamelMongoDBPropertyFactory.basic()
.withTopics(TestUtils.getDefaultTestTopic(this.getClass()))
diff --git a/tests/itests-mongodb/src/test/java/org/apache/camel/kafkaconnector/mongodb/source/CamelSourceMongoDBITCase.java b/tests/itests-mongodb/src/test/java/org/apache/camel/kafkaconnector/mongodb/source/CamelSourceMongoDBITCase.java
index c1a8bb7..0ce470a 100644
--- a/tests/itests-mongodb/src/test/java/org/apache/camel/kafkaconnector/mongodb/source/CamelSourceMongoDBITCase.java
+++ b/tests/itests-mongodb/src/test/java/org/apache/camel/kafkaconnector/mongodb/source/CamelSourceMongoDBITCase.java
@@ -118,9 +118,8 @@ public class CamelSourceMongoDBITCase extends AbstractKafkaTest {
@Test
@Timeout(90)
public void testFindAll() throws ExecutionException, InterruptedException {
- String connectionBeanRef = String.format("com.mongodb.client.MongoClients#create('mongodb://%s:%d')",
- mongoDBService.getHost(),
- mongoDBService.getPort());
+ String connectionBeanRef = String.format("com.mongodb.client.MongoClients#create('%s')",
+ mongoDBService.getReplicaSetUrl());
ConnectorPropertyFactory factory = CamelMongoDBPropertyFactory.basic()
.withKafkaTopic(TestUtils.getDefaultTestTopic(this.getClass()))