test(android): add instrumentation tests

the unit tests don't work

Author: ObserverOfTime

.github/workflows/ci.yml

@@ -49,7 +49,7 @@ jobs:
             lib_arch: aarch64
           # - os: ubuntu-latest
           #   platform: Android
-          #   targets: testDebugUnitTest
+          #   targets: connectedDebugAndroidTest
           - os: ubuntu-latest
             platform: Linux
             targets: compileKotlinLinuxArm64 linuxX64Test

.github/workflows/publish.yml

@@ -93,9 +93,9 @@ jobs:
           - os: ubuntu-latest
             platform: JVM
             targets: :ktreesitter:publishJvmPublicationToLocalRepository
-          # - os: ubuntu-latest
-          #  platform: Android
-          #  targets: :ktreesitter:publishAndroidReleasePublicationToLocalRepository
+          - os: ubuntu-latest
+            platform: Android
+            targets: :ktreesitter:publishAndroidReleasePublicationToLocalRepository
           - os: ubuntu-latest
             platform: Linux
             targets: >-

gradle.properties

@@ -4,7 +4,7 @@ project.version=0.1.0
 # The Android SDK version that is used to compile the project.
 sdk.version.compile=34
 # The minimum supported Android SDK version.
-sdk.version.min=21
+sdk.version.min=23
 # The Android NDK version that is used to compile the project.
 ndk.version=26.3.11579264
 # The CMake version that is used to compile the project.

gradle/libs.versions.toml

@@ -25,6 +25,14 @@ version.ref = "kotest"
 module = "io.kotest:kotest-extensions-junitxml"
 version.ref = "kotest"
 
+[libraries.kotest-android-runner]
+module = "br.com.colman:kotest-runner-android"
+version = "1.1.1"
+
+[libraries.androidx-test-runner]
+module = "androidx.test:runner"
+version = "1.5.2"
+
 [libraries.dokka-base]
 module = "org.jetbrains.dokka:dokka-base"
 version.ref = "dokka"
@@ -54,3 +62,7 @@ kotest-junit = [
   "kotest-junit-runner",
   "kotest-junit-reporter",
 ]
+kotest-android = [
+  "kotest-android-runner",
+  "androidx-test-runner",
+]

ktreesitter/build.gradle.kts

@@ -98,11 +98,22 @@ kotlin {
             }
         }
 
+        /*
         getByName("androidUnitTest") {
             dependencies {
                 implementation(libs.kotest.junit.runner)
             }
         }
+         */
+        getByName("androidInstrumentedTest") {
+            dependencies {
+                implementation(libs.bundles.kotest.core)
+                implementation(libs.bundles.kotest.android)
+                rootProject.project("languages").subprojects.forEach {
+                    implementation(project(":languages:${it.name}"))
+                }
+            }
+        }
     }
 }
 
@@ -117,6 +128,7 @@ android {
             //noinspection ChromeOsAbiSupport
             abiFilters += setOf("x86_64", "arm64-v8a", "armeabi-v7a")
         }
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
     externalNativeBuild {
         cmake {
@@ -132,6 +144,15 @@ android {
     testOptions.unitTests.all {
         it.useJUnitPlatform()
     }
+    packaging.resources {
+        excludes += setOf(
+            "META-INF/AL2.0",
+            "META-INF/LGPL2.1",
+            "META-INF/licenses/ASM",
+            "win32-x86-64/attach_hotspot_windows.dll",
+            "win32-x86/attach_hotspot_windows.dll"
+        )
+    }
     buildFeatures {
         resValues = false
     }
@@ -302,22 +323,3 @@ tasks.getByName<Test>("jvmTest") {
 tasks.withType<AbstractPublishToMaven>().configureEach {
     mustRunAfter(tasks.withType<Sign>())
 }
-
-gradle.taskGraph.whenReady {
-    tasks.getByName<Test>("testDebugUnitTest") {
-        val buildTasks = rootProject.subprojects.mapNotNull {
-            it.tasks.findByName("buildCMakeDebug[x86_64]")
-        }
-        val sep = if (os.isWindows) ";" else ":"
-        val path = buildTasks.joinToString(sep) {
-            it.outputs.files.singleFile.path
-        }
-        systemProperty("java.library.path", path)
-        val toolchain = android.ndkDirectory.resolve(
-            "toolchains/llvm/prebuilt/linux-x86_64/sysroot" +
-                "/usr/lib/x86_64-linux-android/${android.compileSdk}"
-        )
-        assert(toolchain.isDirectory) { "$toolchain is not a directory" }
-        environment("LD_LIBRARY_PATH", toolchain.path)
-    }
-}

ktreesitter/src/androidInstrumentedTest/kotlin/io/github/treesitter/ktreesitter/LanguageTest.kt

@@ -0,0 +1,86 @@
+package io.github.treesitter.ktreesitter
+
+import br.com.colman.kotest.KotestRunnerAndroid
+import io.github.treesitter.ktreesitter.java.TreeSitterJava
+import io.kotest.assertions.throwables.shouldNotThrowAny
+import io.kotest.core.spec.style.FunSpec
+import io.kotest.matchers.*
+import io.kotest.matchers.comparables.*
+import io.kotest.matchers.nulls.*
+import io.kotest.matchers.string.*
+import io.kotest.matchers.types.*
+import org.junit.runner.RunWith
+
+@RunWith(KotestRunnerAndroid::class)
+class LanguageTest : FunSpec({
+    val language = Language(TreeSitterJava.language())
+
+    test("version") {
+        language.version shouldBe 14U
+    }
+
+    test("symbolCount") {
+        language.symbolCount shouldBeGreaterThan 1U
+    }
+
+    test("stateCount") {
+        language.stateCount shouldBeGreaterThan 1U
+    }
+
+    test("fieldCount") {
+        language.fieldCount shouldBeGreaterThan 1U
+    }
+
+    test("symbolName()") {
+        language.symbolName(1U) shouldBe "identifier"
+    }
+
+    test("symbolForName()") {
+        language.symbolForName(";", false) shouldBeGreaterThan 0U
+        language.symbolForName("program", true) shouldBeGreaterThan 0U
+    }
+
+    test("isNamed()") {
+        language.isNamed(1U) shouldBe true
+    }
+
+    test("isVisible()") {
+        language.isVisible(1U) shouldBe true
+    }
+
+    test("fieldNameForId()") {
+        language.fieldNameForId(1U).shouldNotBeNull()
+    }
+
+    test("fieldIdForName()") {
+        language.fieldIdForName("body") shouldBeGreaterThan 0U
+    }
+
+    test("nextState()") {
+        val program = language.symbolForName("program", true)
+        language.nextState(1U, program) shouldBeGreaterThan 0U
+    }
+
+    test("lookaheadIterator()") {
+        val program = language.symbolForName("program", true)
+        val state = language.nextState(1U, program)
+        val lookahead = language.lookaheadIterator(state)
+        lookahead.language shouldBe language
+    }
+
+    test("query()") {
+        shouldNotThrowAny { language.query("(program) @root") }
+    }
+
+    test("equals()") {
+        Language(TreeSitterJava.language()) shouldBe Language(TreeSitterJava.language())
+    }
+
+    test("hashCode()") {
+        language shouldHaveSameHashCodeAs TreeSitterJava.language()
+    }
+
+    test("toString()") {
+        language.toString() shouldMatch Regex("""Language\(id=0x[0-9a-z]+, version=14\)""")
+    }
+})

ktreesitter/src/androidInstrumentedTest/kotlin/io/github/treesitter/ktreesitter/LookaheadIteratorTest.kt

@@ -0,0 +1,45 @@
+package io.github.treesitter.ktreesitter
+
+import br.com.colman.kotest.KotestRunnerAndroid
+import io.github.treesitter.ktreesitter.java.TreeSitterJava
+import io.kotest.core.spec.style.FunSpec
+import io.kotest.matchers.*
+import io.kotest.matchers.collections.*
+import org.junit.runner.RunWith
+
+@RunWith(KotestRunnerAndroid::class)
+class LookaheadIteratorTest : FunSpec({
+    val language = Language(TreeSitterJava.language())
+    val state = language.nextState(1U, 138U)
+    val lookahead = language.lookaheadIterator(state)
+
+    test("currentSymbol") {
+        lookahead.currentSymbol shouldBe UShort.MAX_VALUE
+        lookahead.currentSymbolName shouldBe "ERROR"
+    }
+
+    test("next()") {
+        lookahead.next() shouldBe true
+    }
+
+    test("reset()") {
+        lookahead.reset(state) shouldBe true
+        lookahead.reset(state, language) shouldBe true
+    }
+
+    test("symbols()") {
+        lookahead.symbols().shouldBeStrictlyIncreasing()
+    }
+
+    test("names()") {
+        val names = lookahead.symbolNames().toList()
+        names shouldContainExactly listOf("end", "line_comment", "block_comment")
+    }
+
+    test("iterator()") {
+        for ((symbol, name) in lookahead) {
+            symbol shouldBe lookahead.currentSymbol
+            name shouldBe lookahead.currentSymbolName
+        }
+    }
+})