[camel-kafka-connector] branch master updated: Fix issue #67: Flaky test: CamelSinkCassandraITCase

[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 f5f1915  Fix issue #67: Flaky test: CamelSinkCassandraITCase
     new d9bade3  Merge pull request #71 from orpiske/issue-67-cassandra-it-case
f5f1915 is described below

commit f5f1915fa1fa2d26e3bdbfbc75edaaf10cc6fe1d
Author: Otavio R. Piske <angusyo...@gmail.com>
AuthorDate: Sun Jan 12 10:40:33 2020 +0100

    Fix issue #67: Flaky test: CamelSinkCassandraITCase
    
    Check for the expected amount of data in the destination table instead of 
just whether any data is present
---
 .../camel/kafkaconnector/clients/cassandra/dao/TestDataDao.java   | 8 +++++---
 .../kafkaconnector/sink/cassandra/CamelSinkCassandraITCase.java   | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git 
a/tests/src/test/java/org/apache/camel/kafkaconnector/clients/cassandra/dao/TestDataDao.java
 
b/tests/src/test/java/org/apache/camel/kafkaconnector/clients/cassandra/dao/TestDataDao.java
index 24dfce8..1059675 100644
--- 
a/tests/src/test/java/org/apache/camel/kafkaconnector/clients/cassandra/dao/TestDataDao.java
+++ 
b/tests/src/test/java/org/apache/camel/kafkaconnector/clients/cassandra/dao/TestDataDao.java
@@ -78,8 +78,8 @@ public class TestDataDao {
         session.execute(statement);
     }
 
-    public boolean hasData() {
-        ResultSet rs = session.execute("select * from test_data");
+    public boolean hasEnoughData(long expected) {
+        ResultSet rs = session.execute("select count(*) from test_data");
 
         if (rs == null) {
             return false;
@@ -90,7 +90,9 @@ public class TestDataDao {
             return false;
         }
 
-        return true;
+        long count = all.get(0).getLong("count");
+
+        return count == expected;
     }
 
     public String getInsertStatement() {
diff --git 
a/tests/src/test/java/org/apache/camel/kafkaconnector/sink/cassandra/CamelSinkCassandraITCase.java
 
b/tests/src/test/java/org/apache/camel/kafkaconnector/sink/cassandra/CamelSinkCassandraITCase.java
index be541cc..856016b 100644
--- 
a/tests/src/test/java/org/apache/camel/kafkaconnector/sink/cassandra/CamelSinkCassandraITCase.java
+++ 
b/tests/src/test/java/org/apache/camel/kafkaconnector/sink/cassandra/CamelSinkCassandraITCase.java
@@ -109,7 +109,7 @@ public class CamelSinkCassandraITCase extends 
AbstractKafkaTest {
             fail("Timed out wait for data to be added to the Kafka cluster");
         }
 
-        TestCommon.waitFor(testDataDao::hasData);
+        TestCommon.waitFor(testDataDao::hasEnoughData, (long) expect);
         testDataDao.getData(this::checkRetrievedData);
         assertTrue(String.format("Did not receive as much data as expected: %d 
< %d", received, expect),
                 received >= expect);