added rust tests support

Author: matrixdev

example/app/build.gradle.kts

@@ -23,6 +23,12 @@ android {
         }
     }
 
+    sourceSets {
+        getByName("main") {
+            java.srcDir("src/rust_library")
+        }
+    }
+
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_1_8
         targetCompatibility = JavaVersion.VERSION_1_8
@@ -36,6 +42,10 @@ android {
 androidRust {
     module("library") {
         path = file("src/rust_library")
+
+        buildType("release") {
+            runTests = true
+        }
     }
     minimumSupportedRustVersion = "1.62.1"
 }

example/app/src/rust_library/src/lib.rs

@@ -4,5 +4,13 @@ use jni::sys::jstring;
 
 #[no_mangle]
 extern fn Java_dev_matrix_rust_MainActivity_callRustCode(env: JNIEnv, _: JObject) -> jstring {
-    env.new_string("hello from rust").unwrap().into_inner()
+    env.new_string("Hello from rust!").unwrap().into_inner()
+}
+
+#[cfg(test)]
+mod test {
+    #[test]
+    fn test() {
+        println!("Hello from rust test!")
+    }
 }

plugin/src/main/java/dev/matrix/agp/rust/AndroidRustExtension.kt

@@ -44,4 +44,5 @@ class AndroidRustBuildType : AndroidRustConfiguration()
 open class AndroidRustConfiguration {
     var profile = ""
     var targets = ArrayList<String>()
+    var runTests: Boolean? = null
 }

plugin/src/main/java/dev/matrix/agp/rust/AndroidRustPlugin.kt

@@ -36,7 +36,7 @@ class AndroidRustPlugin : Plugin<Project> {
                 val variantBuildDirectory = File(extensionBuildDirectory, buildType.name)
                 val variantJniLibsDirectory = File(variantBuildDirectory, "jniLibs")
 
-                val cleanTaskName = "cleanRust${buildTypeNameCap}"
+                val cleanTaskName = "clean${buildTypeNameCap}RustJniLibs"
                 val cleanTask = project.tasks.register(cleanTaskName, RustCleanTask::class.java) {
                     this.variantJniLibsDirectory.set(variantJniLibsDirectory)
                 }
@@ -48,11 +48,22 @@ class AndroidRustPlugin : Plugin<Project> {
                     val rustBuildType = module.buildTypes[buildType.name]
                     val rustConfiguration = mergeRustConfigurations(rustBuildType, module, extension)
 
+                    val testTask = when (rustConfiguration.runTests) {
+                        true -> {
+                            val testTaskName = "test${moduleNameCap}Rust"
+                            project.tasks.register(testTaskName, RustTestTask::class.java) {
+                                this.rustProjectDirectory.set(module.path)
+                                this.cargoTargetDirectory.set(moduleBuildDirectory)
+                            }.dependsOn(cleanTask)
+                        }
+                        else -> null
+                    }
+
                     val rustAbiSet = resolveAbiList(project, rustConfiguration.targets)
                     allRustAbiSet.addAll(rustAbiSet)
 
                     for (rustAbi in rustAbiSet) {
-                        val buildTaskName = "buildRust${buildTypeNameCap}${moduleNameCap}[${rustAbi.androidName}]"
+                        val buildTaskName = "build${buildTypeNameCap}${moduleNameCap}Rust[${rustAbi.androidName}]"
                         val buildTask = project.tasks.register(buildTaskName, RustBuildTask::class.java) {
                             this.abi.set(rustAbi)
                             this.apiLevel.set(dsl.defaultConfig.minSdk ?: 21)
@@ -63,7 +74,7 @@ class AndroidRustPlugin : Plugin<Project> {
                             this.cargoTargetDirectory.set(moduleBuildDirectory)
                             this.variantJniLibsDirectory.set(variantJniLibsDirectory)
                         }
-                        buildTask.dependsOn(cleanTask)
+                        buildTask.dependsOn(testTask ?: cleanTask)
                         tasksByBuildType.getOrPut(buildType.name, ::ArrayList).add(buildTask)
                     }
                 }
@@ -111,6 +122,7 @@ class AndroidRustPlugin : Plugin<Project> {
         val defaultConfiguration = AndroidRustConfiguration().also {
             it.profile = "release"
             it.targets = Abi.values().mapTo(ArrayList(), Abi::rustName)
+            it.runTests = null
         }
 
         return configurations.asSequence()
@@ -123,6 +135,9 @@ class AndroidRustPlugin : Plugin<Project> {
                 if (result.targets.isEmpty()) {
                     result.targets = base.targets
                 }
+                if (result.runTests == null) {
+                    result.runTests = base.runTests
+                }
                 result
             }
     }

plugin/src/main/java/dev/matrix/agp/rust/RustTestTask.kt

@@ -0,0 +1,33 @@
+package dev.matrix.agp.rust
+
+import org.gradle.api.DefaultTask
+import org.gradle.api.provider.Property
+import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.TaskAction
+import java.io.File
+
+internal abstract class RustTestTask : DefaultTask() {
+    @get:Input
+    abstract val rustProjectDirectory: Property<File>
+
+    @get:Input
+    abstract val cargoTargetDirectory: Property<File>
+
+    @TaskAction
+    fun taskAction() {
+        val rustProjectDirectory = rustProjectDirectory.get()
+        val cargoTargetDirectory = cargoTargetDirectory.get()
+
+        project.exec {
+            standardOutput = System.out
+            errorOutput = System.out
+            workingDir = rustProjectDirectory
+
+            environment("CARGO_TARGET_DIR", cargoTargetDirectory.absolutePath)
+
+            commandLine("cargo")
+
+            args("test")
+        }.assertNormalExitValue()
+    }
+}