Replace FlowAssert with Turbine (#1863)

Same code, separate project!
cashapp · Aug 4, 2020 · 03c2ecd · 03c2ecd
1 parent dcdb71a
commit 03c2ecd
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 140 deletions.
diff --git a/extensions/coroutines-extensions/build.gradle b/extensions/coroutines-extensions/build.gradle
@@ -21,6 +21,7 @@ kotlin {
         implementation deps.kotlin.test.common
         implementation deps.kotlin.test.commonAnnotations
         implementation deps.stately.collections
+        implementation deps.turbine
       }
     }
     jvmMain {
@@ -54,6 +55,11 @@ kotlin {
     nativeTest {
       dependencies {
         implementation project(':drivers:native-driver')
+        implementation(deps.kotlin.coroutines.native) {
+          version {
+            strictly("${versions.kotlinCoroutines}-native-mt")
+          }
+        }
       }
     }
   }
@@ -85,6 +91,13 @@ kotlin {
       kotlinOptions.freeCompilerArgs += ['-linker-options', '-lsqlite3']
     }
   }
+
+  sourceSets.matching { it.name.endsWith("Test") }.all {
+    it.languageSettings {
+      useExperimentalAnnotation('kotlin.time.ExperimentalTime')
+      useExperimentalAnnotation('kotlinx.coroutines.ExperimentalCoroutinesApi')
+    }
+  }
 }
 
 apply from: "$rootDir/gradle/gradle-mvn-push.gradle"
diff --git a/...extensions/src/commonTest/kotlin/com/squareup/sqldelight/runtime/coroutines/FlowAssert.kt b/...extensions/src/commonTest/kotlin/com/squareup/sqldelight/runtime/coroutines/FlowAssert.kt
diff --git a/...xtensions/src/commonTest/kotlin/com/squareup/sqldelight/runtime/coroutines/MappingTest.kt b/...xtensions/src/commonTest/kotlin/com/squareup/sqldelight/runtime/coroutines/MappingTest.kt
@@ -1,5 +1,6 @@
 package com.squareup.sqldelight.runtime.coroutines
 
+import app.cash.turbine.test
 import com.squareup.sqldelight.Query
 import com.squareup.sqldelight.internal.copyOnWriteList
 import com.squareup.sqldelight.runtime.coroutines.Employee.Companion.MAPPER

diff --git a/...sions/src/commonTest/kotlin/com/squareup/sqldelight/runtime/coroutines/QueryAsFlowTest.kt b/...sions/src/commonTest/kotlin/com/squareup/sqldelight/runtime/coroutines/QueryAsFlowTest.kt
@@ -1,5 +1,6 @@
 package com.squareup.sqldelight.runtime.coroutines
 
+import app.cash.turbine.test
 import com.squareup.sqldelight.runtime.coroutines.Employee.Companion.MAPPER
 import com.squareup.sqldelight.runtime.coroutines.Employee.Companion.SELECT_EMPLOYEES
 import com.squareup.sqldelight.runtime.coroutines.Employee.Companion.USERNAME
@@ -9,6 +10,7 @@ import kotlin.test.BeforeTest
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlinx.coroutines.flow.zip
+import kotlinx.coroutines.yield
 
 class QueryAsFlowTest {
   private lateinit var db: TestDb
@@ -70,7 +72,8 @@ class QueryAsFlowTest {
           cancel()
 
           db.employee(Employee("john", "John Johnson"))
-          expectNoMoreEvents()
+          yield() // Ensure any events can be delivered.
+          expectNoEvents()
         }
   }
 

diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
@@ -67,6 +67,7 @@ ext.deps = [
     kotlinPoet: 'com.squareup:kotlinpoet:1.5.0',
     junit: 'junit:junit:4.12',
     truth: 'com.google.truth:truth:0.42',
+    turbine: 'app.cash.turbine:turbine:0.1.0',
     bugsnag: 'com.bugsnag:bugsnag:2.0.0',
     intellijCore: fileTree(dir: "$rootDir/lib/intellij-core/lib", include: [
         'idea.jar', 'openapi.jar', 'util.jar', 'trove4j.jar', 'extensions.jar',