Add integration tests

Author: simolus3

.github/workflows/test.yml

@@ -16,7 +16,7 @@ jobs:
       matrix:
         include:
           - os: macos-latest
-            targets: iosSimulatorArm64Test jvmTest
+            targets: iosSimulatorArm64Test jvmTest lintKotlin
           - os: ubuntu-latest
             targets: testDebugUnitTest testReleaseUnitTest jvmTest
           - os: windows-latest

core/build.gradle.kts

@@ -145,7 +145,7 @@ kotlin {
         }
     }
 
-//    iosX64()
+    iosX64()
     iosArm64()
     iosSimulatorArm64()
 
@@ -166,39 +166,42 @@ kotlin {
             cinterops.create("powersync-sqlite-core")
         }
 
-        if (konanTarget.family == Family.IOS) {
+        if (konanTarget.family == Family.IOS && konanTarget.name.contains("simulator")) {
             binaries.withType<TestExecutable>().configureEach {
                 linkTaskProvider.dependsOn(unzipPowersyncFramework)
                 linkerOpts("-framework", "powersync-sqlite-core")
-
-                val framework = if (konanTarget.name.contains("simulator")) {
-                    "ios-arm64_x86_64-simulator"
-                } else {
-                    "ios-arm64"
-                }
-                val frameworkRoot = binariesFolder.map { it.dir("framework/powersync-sqlite-core.xcframework/$framework") }.get().asFile.path
+                val frameworkRoot = binariesFolder.map { it.dir("framework/powersync-sqlite-core.xcframework/ios-arm64_x86_64-simulator") }.get().asFile.path
 
                 linkerOpts("-F", frameworkRoot)
                 linkerOpts("-rpath", frameworkRoot)
             }
-        } else {
+        }
+        /*
+        If we ever need macOS support:
+        {
             binaries.withType<TestExecutable>().configureEach {
                 linkTaskProvider.dependsOn(downloadPowersyncDesktopBinaries)
                 linkerOpts("-lpowersync")
                 linkerOpts("-L", binariesFolder.map { it.dir("powersync") }.get().asFile.path)
             }
         }
+         */
     }
 
     explicitApi()
 
+    applyDefaultHierarchyTemplate()
     sourceSets {
         all {
             languageSettings {
                 optIn("kotlinx.cinterop.ExperimentalForeignApi")
             }
         }
 
+        val commonIntegrationTest by creating {
+            dependsOn(commonTest.get())
+        }
+
         commonMain.dependencies {
             implementation(libs.uuid)
             implementation(libs.kotlin.stdlib)
@@ -233,6 +236,13 @@ kotlin {
             implementation(libs.test.turbine)
             implementation(libs.kermit.test)
         }
+
+        // We're putting the native libraries into our JAR, so integration tests for the JVM can run as part of the unit
+        // tests.
+        jvmTest.get().dependsOn(commonIntegrationTest)
+
+        // We're linking the xcframework for the simulator tests, so they can use integration tests too
+        iosSimulatorArm64Test.orNull?.dependsOn(commonIntegrationTest)
     }
 }
 

core/src/androidUnitTest/kotlin/com/powersync/testutils/TestUtils.android.kt

@@ -6,25 +6,21 @@ import com.powersync.db.getString
 import com.powersync.db.schema.Column
 import com.powersync.db.schema.Schema
 import com.powersync.db.schema.Table
-import com.powersync.testutils.IgnoreOnAndroid
-import com.powersync.testutils.cleanup
-import com.powersync.testutils.factory
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.test.runTest
 import kotlin.test.AfterTest
 import kotlin.test.BeforeTest
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
-@IgnoreOnAndroid
 class DatabaseTest {
     private lateinit var database: PowerSyncDatabase
 
     @BeforeTest
     fun setupDatabase() {
         database =
             PowerSyncDatabase(
-                factory = factory,
+                factory = com.powersync.testutils.factory,
                 schema =
                     Schema(
                         Table(name = "users", columns = listOf(Column.text("name"), Column.text("email"))),
@@ -40,7 +36,7 @@ class DatabaseTest {
     @AfterTest
     fun tearDown() {
         runBlocking { database.disconnectAndClear(true) }
-        cleanup("testdb")
+        com.powersync.testutils.cleanup("testdb")
     }
 
     @Test
@@ -58,12 +54,21 @@ class DatabaseTest {
                 // Wait for initial query
                 assertEquals(0, query.awaitItem().size)
 
-                database.execute("INSERT INTO users (id, name, email) VALUES (uuid(), ?, ?)", listOf("Test", "[email protected]"))
+                database.execute(
+                    "INSERT INTO users (id, name, email) VALUES (uuid(), ?, ?)",
+                    listOf("Test", "[email protected]"),
+                )
                 assertEquals(1, query.awaitItem().size)
 
                 database.writeTransaction {
-                    it.execute("INSERT INTO users (id, name, email) VALUES (uuid(), ?, ?)", listOf("Test2", "[email protected]"))
-                    it.execute("INSERT INTO users (id, name, email) VALUES (uuid(), ?, ?)", listOf("Test3", "[email protected]"))
+                    it.execute(
+                        "INSERT INTO users (id, name, email) VALUES (uuid(), ?, ?)",
+                        listOf("Test2", "[email protected]"),
+                    )
+                    it.execute(
+                        "INSERT INTO users (id, name, email) VALUES (uuid(), ?, ?)",
+                        listOf("Test3", "[email protected]"),
+                    )
                 }
 
                 assertEquals(3, query.awaitItem().size)
@@ -77,7 +82,10 @@ class DatabaseTest {
                     // Ignore
                 }
 
-                database.execute("INSERT INTO users (id, name, email) VALUES (uuid(), ?, ?)", listOf("Test4", "[email protected]"))
+                database.execute(
+                    "INSERT INTO users (id, name, email) VALUES (uuid(), ?, ?)",
+                    listOf("Test4", "[email protected]"),
+                )
                 assertEquals(4, query.awaitItem().size)
 
                 query.expectNoEvents()

core/src/commonTest/kotlin/com/powersync/DatabaseTest.kt renamed to core/src/commonIntegrationTest/kotlin/com/powersync/DatabaseTest.kt

@@ -2,8 +2,6 @@ package com.powersync.testutils
 
 import com.powersync.DatabaseDriverFactory
 
-expect annotation class IgnoreOnAndroid()
-
 expect val factory: DatabaseDriverFactory
 
 expect fun cleanup(path: String)

core/src/commonTest/kotlin/com/powersync/testutils/TestUtils.kt renamed to core/src/commonIntegrationTest/kotlin/com/powersync/testutils/TestUtils.kt

@@ -4,8 +4,6 @@ import com.powersync.DatabaseDriverFactory
 import kotlinx.io.files.Path
 import kotlinx.io.files.SystemFileSystem
 
-actual annotation class IgnoreOnAndroid
-
 actual val factory: DatabaseDriverFactory
     get() = DatabaseDriverFactory()
 

core/src/iosTest/kotlin/com/powersync/testutils/TestUtils.ios.kt renamed to core/src/iosSimulatorArm64Test/kotlin/com/powersync/testutils/TestUtils.iosSimulatorArm64.kt

@@ -3,10 +3,8 @@ package com.powersync.testutils
 import com.powersync.DatabaseDriverFactory
 import java.io.File
 
-actual annotation class IgnoreOnAndroid
-
 actual val factory: DatabaseDriverFactory
-    get() = DatabaseDriverFactory()
+    get() =   DatabaseDriverFactory()
 
 actual fun cleanup(path: String) {
     File(path).delete()