[camel-kafka-connector] branch master updated: Re-enable a Cassandra test disabled due to CAMEL-15219

[acosentino]

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 87abdb3  Re-enable a Cassandra test disabled due to CAMEL-15219
     new 85784b5  Merge pull request #337 from 
orpiske/enable-test-ref-CAMEL-15219
87abdb3 is described below

commit 87abdb3a8bc70daff0e87f5870d249d1ecbd4c9c
Author: Otavio R. Piske <angusyo...@gmail.com>
AuthorDate: Thu Jul 23 06:53:24 2020 +0200

    Re-enable a Cassandra test disabled due to CAMEL-15219
---
 .../cassandra/source/CamelSourceCassandraITCase.java    | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git 
a/tests/itests-cassandra/src/test/java/org/apache/camel/kafkaconnector/cassandra/source/CamelSourceCassandraITCase.java
 
b/tests/itests-cassandra/src/test/java/org/apache/camel/kafkaconnector/cassandra/source/CamelSourceCassandraITCase.java
index 41300e4..3e8f887 100644
--- 
a/tests/itests-cassandra/src/test/java/org/apache/camel/kafkaconnector/cassandra/source/CamelSourceCassandraITCase.java
+++ 
b/tests/itests-cassandra/src/test/java/org/apache/camel/kafkaconnector/cassandra/source/CamelSourceCassandraITCase.java
@@ -30,14 +30,15 @@ import 
org.apache.camel.kafkaconnector.common.ConnectorPropertyFactory;
 import org.apache.camel.kafkaconnector.common.clients.kafka.KafkaClient;
 import org.apache.camel.kafkaconnector.common.utils.TestUtils;
 import org.apache.kafka.clients.consumer.ConsumerRecord;
+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.Timeout;
 import org.junit.jupiter.api.extension.RegisterExtension;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static 
org.apache.camel.kafkaconnector.common.BasicConnectorPropertyFactory.classRef;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class CamelSourceCassandraITCase extends AbstractKafkaTest {
@@ -72,6 +73,17 @@ public class CamelSourceCassandraITCase extends 
AbstractKafkaTest {
         }
     }
 
+    @AfterEach
+    public void tearDown() {
+        cassandraClient = cassandraService.getClient();
+
+        if (testDataDao != null) {
+            testDataDao.dropTable();
+        }
+
+        deleteKafkaTopic(TestUtils.getDefaultTestTopic(this.getClass()));
+    }
+
     private <T> boolean checkRecord(ConsumerRecord<String, T> record) {
 
         LOG.debug("Received: {}", record.value());
@@ -111,7 +123,6 @@ public class CamelSourceCassandraITCase extends 
AbstractKafkaTest {
         runTest(connectorPropertyFactory);
     }
 
-    @Disabled("Disabled due to CAMEL-15219")
     @Timeout(90)
     @Test
     public void testRetrieveFromCassandraWithCustomStrategy() throws 
ExecutionException, InterruptedException {
@@ -123,7 +134,7 @@ public class CamelSourceCassandraITCase extends 
AbstractKafkaTest {
                 .withHosts(cassandraService.getCassandraHost())
                 .withPort(cassandraService.getCQL3Port())
                 .withKeySpace(TestDataDao.KEY_SPACE)
-                .withResultSetConversionStrategy("#:" + 
TestResultSetConversionStrategy.class.getName())
+                
.withResultSetConversionStrategy(classRef(TestResultSetConversionStrategy.class.getName()))
                 .withCql(testDataDao.getSelectStatement());
 
         runTest(connectorPropertyFactory);