[camel-kafka-connector] branch master updated: Re-enabled Google pub/sub test

[or...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

orpiske 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 3612081  Re-enabled Google pub/sub test
3612081 is described below

commit 361208110931564d092e8576677d41067d59cac0
Author: Otavio R. Piske <an...@gmail.com>
AuthorDate: Fri Apr 2 12:35:19 2021 +0200

    Re-enabled Google pub/sub test
    
    As noted on #1086 it was failing due to incorrect setting of the
    endpoint.
---
 .../google/pubsub/sink/CamelSinkGooglePubSubITCase.java           | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/itests-google-pubsub/src/test/java/org/apache/camel/kafkaconnector/google/pubsub/sink/CamelSinkGooglePubSubITCase.java b/tests/itests-google-pubsub/src/test/java/org/apache/camel/kafkaconnector/google/pubsub/sink/CamelSinkGooglePubSubITCase.java
index ff1adf7..af99586 100644
--- a/tests/itests-google-pubsub/src/test/java/org/apache/camel/kafkaconnector/google/pubsub/sink/CamelSinkGooglePubSubITCase.java
+++ b/tests/itests-google-pubsub/src/test/java/org/apache/camel/kafkaconnector/google/pubsub/sink/CamelSinkGooglePubSubITCase.java
@@ -30,7 +30,6 @@ import org.apache.camel.test.infra.google.pubsub.services.GooglePubSubService;
 import org.apache.camel.test.infra.google.pubsub.services.GooglePubSubServiceFactory;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 import org.slf4j.Logger;
@@ -48,6 +47,7 @@ public class CamelSinkGooglePubSubITCase extends CamelSinkTestSupport {
     private GooglePubEasy easyClient;
 
     private String googlePubSubTopic;
+    private String testSubscription;
 
     private final int expected = 10;
 
@@ -60,13 +60,14 @@ public class CamelSinkGooglePubSubITCase extends CamelSinkTestSupport {
     @BeforeEach
     public void setUp() {
         googlePubSubTopic = "ckctopic" + TestUtils.randomWithRange(0, 100);
+        testSubscription = "test-subscription" + TestUtils.randomWithRange(0, 100);
         LOG.info("Requesting topic {} for the pub/sub client", googlePubSubTopic);
 
         easyClient = new GooglePubEasy(service.getServiceAddress(), project);
 
         try {
             easyClient.createTopic(googlePubSubTopic);
-            easyClient.createSubscription("test-subscription", googlePubSubTopic);
+            easyClient.createSubscription(testSubscription, googlePubSubTopic);
         } catch (InterruptedException | IOException e) {
             fail(e.getMessage());
         }
@@ -112,7 +113,6 @@ public class CamelSinkGooglePubSubITCase extends CamelSinkTestSupport {
         runTest(connectorPropertyFactory, topicName, expected);
     }
 
-    @Disabled("Disabled due to #1086")
     @Test
     public void testBasicSendReceiveUrl() throws Exception {
         String topicName = getTopicForTest(this);
@@ -120,8 +120,8 @@ public class CamelSinkGooglePubSubITCase extends CamelSinkTestSupport {
         ConnectorPropertyFactory connectorPropertyFactory = CamelGooglePubSubPropertyFactory
                 .basic()
                 .withTopics(topicName)
+                .withEndpoint(service.getServiceAddress())
                 .withUrl(project, googlePubSubTopic)
-                .append("endpoint", service.getServiceAddress())
                 .buildUrl();
 
         runTest(connectorPropertyFactory, topicName, expected);