test: it seems questdb needs now some execution time to return expect…

…ed output
iWeltAG · Mar 4, 2024 · 4be0d1a · 4be0d1a
1 parent f441784
commit 4be0d1a
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/src/test/scala/de/iwelt/quest4s/AbstractBatchWriterSuite.scala b/src/test/scala/de/iwelt/quest4s/AbstractBatchWriterSuite.scala
@@ -17,17 +17,20 @@ abstract class AbstractBatchWriterSuite extends BaseSuite {
     val sqlQuery        = s"CREATE TABLE IF NOT EXISTS $secondTable(date TIMESTAMP, message String, target String) timestamp(date) PARTITION BY DAY"
     val executionResult = questDbClient.executeSql(sqlQuery, 60.seconds)
     assertEquals(executionResult.get("ddl"), Some("OK"))
+    waitForQuestDbExecution()
   }
 
   override def afterAll(): Unit = {
     super.afterAll()
     val sqlQuery        = s"DROP TABLE '$secondTable';"
     val executionResult = questDbClient.executeSql(sqlQuery, 60.seconds)
     assertEquals(executionResult.get("ddl"), Some("OK"))
+    waitForQuestDbExecution()
   }
 
   override def beforeEach(context: BeforeEach): Unit = {
     batchWriter.flush(true)
+    waitForQuestDbExecution()
   }
 
   test("Insert Data by individual Global Batch Writer") {
@@ -41,6 +44,7 @@ abstract class AbstractBatchWriterSuite extends BaseSuite {
       batchWriter.addRecord(secondTable, baseMap)
     })
 
+    Thread.sleep(1.seconds.toMillis)
     assertEquals(batchWriter.countCurrentRecords, 30L)
     assertEquals(countRows(secondTable), countRowsStartSecondTable)
     assertEquals(countRows(table), countRowsStartTable)
@@ -55,7 +59,7 @@ abstract class AbstractBatchWriterSuite extends BaseSuite {
       )
       batchWriter.addRecord(table, baseMap)
     })
-
+    Thread.sleep(1.seconds.toMillis)
     assertEquals(batchWriter.countCurrentRecords, 10L)
     assertEquals(countRows(secondTable), countRowsStartSecondTable + 30)
     assertEquals(countRows(table), countRowsStartTable + 20)

diff --git a/src/test/scala/de/iwelt/quest4s/AbstractImportSuite.scala b/src/test/scala/de/iwelt/quest4s/AbstractImportSuite.scala
@@ -16,6 +16,7 @@ abstract class AbstractImportSuite extends BaseSuite {
     val countBeforeUpload = countRows
     val file              = File("src/test/resources/import-test.csv")
     questDbClient.importCsv(table, file, 300.seconds)
+    waitForQuestDbExecution()
     val countAfterUpload = countRows
     assertEquals(countBeforeUpload + 4, countAfterUpload)
   }

diff --git a/src/test/scala/de/iwelt/quest4s/BaseSuite.scala b/src/test/scala/de/iwelt/quest4s/BaseSuite.scala
@@ -6,6 +6,10 @@ import scala.concurrent.Future
 import scala.concurrent.duration.DurationInt
 
 abstract class BaseSuite extends FunSuite {
+  protected def waitForQuestDbExecution(): Unit = {
+    Thread.sleep(1000)
+  }
+
   val backend: SttpBackend[Future, _]
 
   lazy val questDbClient: QuestDbClient = QuestDbClient("http://localhost:9000", backend)
@@ -27,11 +31,13 @@ abstract class BaseSuite extends FunSuite {
 
     val executionResultML = questDbClient.executeSql(sqlQueryML, 60.seconds)
     assertEquals(executionResultML.get("ddl"), Some("OK"))
+    waitForQuestDbExecution()
   }
 
   override def afterAll(): Unit = {
     val sqlQuery        = s"DROP TABLE '$table';"
     val executionResult = questDbClient.executeSql(sqlQuery, 60.seconds)
     assertEquals(executionResult.get("ddl"), Some("OK"))
+    waitForQuestDbExecution()
   }
 }
diff --git a/src/test/scala/de/iwelt/quest4s/okhttp/OkHttpBatchWriterSuite.scala b/src/test/scala/de/iwelt/quest4s/okhttp/OkHttpBatchWriterSuite.scala
@@ -35,7 +35,7 @@ class OkHttpBatchWriterSuite extends AbstractBatchWriterSuite {
       }
       QuestDbBatchWriter.addRecord(secondTable, baseMap)
     })
-
+    waitForQuestDbExecution()
     assertEquals(QuestDbBatchWriter.countCurrentRecords, 30L)
     assertEquals(countRows(secondTable), countRowsStartSecondTable)
     assertEquals(countRows(table), countRowsStartTable)
@@ -50,7 +50,6 @@ class OkHttpBatchWriterSuite extends AbstractBatchWriterSuite {
       )
       QuestDbBatchWriter.addRecord(table, baseMap)
     })
-
     assertEquals(QuestDbBatchWriter.countCurrentRecords, 35L)
     assertEquals(countRows(secondTable), countRowsStartSecondTable)
     assertEquals(countRows(table), countRowsStartTable)