Add Android target to test-mokkery

Author: lupuuss

.github/workflows/tests.yml

@@ -13,5 +13,7 @@ jobs:
         uses: actions/checkout@v4
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v3
+      - name: Setup Android SDK
+        uses: android-actions/setup-android@v3
       - name: Gradle build
         run: ./gradlew build --no-daemon --stacktrace

build.gradle.kts

@@ -19,6 +19,7 @@ buildscript {
     dependencies {
         classpath(":build-mokkery")
         classpath(libs.dokka.base)
+        classpath(libs.agp)
     }
 }
 

gradle/libs.versions.toml

@@ -9,13 +9,16 @@ dokka = "2.1.0"
 poko = "0.21.1"
 vanniktech-publish-plugin = "0.36.0"
 gradle-portal-publish = "2.0.0"
+agp = "9.0.1"
+androidx-runner = "1.7.0"
 
 [plugins]
 dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
 poko = { id = "dev.drewhamilton.poko", version.ref = "poko" }
 kotlinx-atomicfu = { id = "org.jetbrains.kotlinx.atomicfu", version.ref = "atomicfu" }
 kotlin-allopen = { id = "org.jetbrains.kotlin.plugin.allopen", version.ref = "kotlin" }
 gradle-portal-publish = { id = "com.gradle.plugin-publish", version.ref = "gradle-portal-publish" }
+agp-multiplatform = { id = "com.android.kotlin.multiplatform.library" }
 
 [libraries]
 kotlin-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
@@ -27,6 +30,7 @@ kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref =
 kotlin-script-runtime = { module = "org.jetbrains.kotlin:kotlin-script-runtime", version.ref = "kotlin" }
 kotlin-test-junit5 = { module = "org.jetbrains.kotlin:kotlin-test-junit5", version.ref = "kotlin" }
 kotlin-compiler-test-framework = { module = "org.jetbrains.kotlin:kotlin-compiler-internal-test-framework", version.ref = "kotlin" }
+agp = { module = "com.android.tools.build:gradle", version.ref = "agp" }
 
 vanniktech-publish-plugin = { module = "com.vanniktech:gradle-maven-publish-plugin", version.ref = "vanniktech-publish-plugin" }
 
@@ -39,3 +43,5 @@ dokka-base = { module = "org.jetbrains.dokka:dokka-base", version.ref = "dokka"
 
 google-autoservice = { module = "com.google.auto.service:auto-service", version.ref = "google-autoservice"}
 google-autoservice-annotations = { module = "com.google.auto.service:auto-service-annotations", version.ref = "google-autoservice"}
+
+androidx-runner = { group = "androidx.test", name = "runner", version.ref = "androidx-runner" }

mokkery-gradle/build.gradle.kts

@@ -1,8 +1,8 @@
 @file:Suppress("UnstableApiUsage")
 
+import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
 import org.jetbrains.kotlin.konan.target.HostManager
 import org.jetbrains.kotlin.konan.target.KonanTarget
-import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
 
 plugins {
     kotlin("jvm")
@@ -54,6 +54,7 @@ buildConfig {
             .find { it.name == "testing" }
             .let { it as MavenArtifactRepository }
         buildConfigField("TESTING_REPO_URL", testingRepository.url)
+        buildConfigField("AGP_VERSION", libs.versions.agp.get())
     }
 }
 

mokkery-gradle/src/functionalTest/kotlin/dev/mokkery/gradle/MokkeryGradlePluginFunctionalTest.kt

@@ -17,6 +17,7 @@ class MokkeryGradlePluginFunctionalTest {
 
     private val buildFile by lazy { testProjectDir.resolve("build.gradle.kts") }
     private val settingsFile by lazy { testProjectDir.resolve("settings.gradle.kts") }
+    private val localPropertiesFile by lazy { testProjectDir.resolve("local.properties") }
 
     @Test
     fun `test minimum Kotlin version`() {
@@ -27,6 +28,10 @@ class MokkeryGradlePluginFunctionalTest {
     private fun test(kotlinVersion: String) {
         settingsFile.writeText(settingsFileContent)
         buildFile.writeText(buildFileContent)
+        File("../local.properties")
+            .takeIf { it.exists() }
+            ?.copyTo(localPropertiesFile)
+
         File("../test-mokkery/src").toPath()
             .copyToRecursively(
                 testProjectDir
@@ -40,6 +45,7 @@ class MokkeryGradlePluginFunctionalTest {
             .withArguments(
                 "-PkotlinVersion=${kotlinVersion}",
                 "-PmokkeryVersion=${MokkeryConfig.VERSION}",
+                "-PagpVersion=${BuildConfig.AGP_VERSION}",
                 "-Porg.gradle.jvmargs=-Xmx1g",
                 "-Pkotlin.daemon.jvmargs=-Xmx1g",
                 "clean",
@@ -57,17 +63,20 @@ private val settingsFileContent = """
     pluginManagement {
         val kotlinVersion: String by settings
         val mokkeryVersion: String by settings
+        val agpVersion: String by settings
         plugins {
             kotlin("multiplatform") version kotlinVersion
             id("org.jetbrains.kotlin.plugin.allopen") version kotlinVersion
             id("dev.mokkery") version mokkeryVersion
+            id("com.android.kotlin.multiplatform.library") version agpVersion
         }
         repositories { 
             mavenCentral {
                 content {
                     excludeGroup("dev.mokkery")
                 }
             }
+            google()
             maven {
                 name = "testing"
                 url = uri("${BuildConfig.TESTING_REPO_URL}")
@@ -82,6 +91,7 @@ private val settingsFileContent = """
                     excludeGroup("dev.mokkery")
                 }
             }
+            google()
             maven {
                 name = "testing"
                 url = uri("${BuildConfig.TESTING_REPO_URL}")
@@ -94,6 +104,7 @@ private val settingsFileContent = """
 private val buildFileContent = $$"""
     @file:OptIn(ExperimentalKotlinGradlePluginApi::class, ExperimentalWasmDsl::class)
 
+    import com.android.build.api.dsl.KotlinMultiplatformAndroidLibraryTarget
     import dev.mokkery.gradle.ApplicationRule
     import dev.mokkery.gradle.mokkery
     import dev.mokkery.options.AnnotationSelector.Companion.all
@@ -107,6 +118,7 @@ private val buildFileContent = $$"""
         kotlin("multiplatform")
         id("dev.mokkery")
         id("org.jetbrains.kotlin.plugin.allopen")
+        id("com.android.kotlin.multiplatform.library")
     }
 
     allOpen {
@@ -127,9 +139,22 @@ private val buildFileContent = $$"""
                 group("wasm") {
                     withWasmJs()
                 }
+                group("jvmShared") {
+                    withJvm()
+                    withCompilations { it.target is KotlinMultiplatformAndroidLibraryTarget  }
+                }
             }
         }
         
+        android {
+            namespace = "dev.mokkery.test"
+            compileSdk = 36
+            minSdk = 21
+            withHostTest { }
+            withDeviceTestBuilder {
+                sourceSetTreeName = "test"
+            }
+        }
         jvm()
         js(IR) { nodejs() }
         wasmJs { nodejs() }

test-mokkery/build.gradle.kts

@@ -1,10 +1,32 @@
-import org.jetbrains.kotlin.gradle.plugin.SubpluginOption
+import com.android.build.api.dsl.KotlinMultiplatformAndroidLibraryTarget
 
 plugins {
     id("mokkery-multiplatform")
+    alias(libs.plugins.agp.multiplatform)
     alias(libs.plugins.kotlin.allopen)
 }
 
+kotlin {
+    android {
+        namespace = "dev.mokkery.test"
+        compileSdk = 36
+        minSdk = 21
+        withHostTest { }
+        withDeviceTestBuilder {
+            sourceSetTreeName = "test"
+        }
+    }
+    @Suppress("OPT_IN_USAGE")
+    applyDefaultHierarchyTemplate {
+        common {
+            group("jvmShared") {
+                withJvm()
+                withCompilations { it.target is KotlinMultiplatformAndroidLibraryTarget  }
+            }
+        }
+    }
+}
+
 allOpen {
     annotation("dev.mokkery.test.OpenForMokkery")
 }
@@ -24,4 +46,6 @@ dependencies {
     commonMainImplementation(project(":mokkery-coroutines"))
     commonTestImplementation(kotlin("test"))
     commonTestImplementation(libs.kotlinx.coroutines.test)
+
+    "androidDeviceTestImplementation"(libs.androidx.runner)
 }

…v/mokkery/annotations/AnnotationsTest.kt …v/mokkery/annotations/AnnotationsTest.kttest-mokkery/src/jvmTest/kotlin/dev/mokkery/annotations/AnnotationsTest.kt renamed to test-mokkery/src/jvmSharedTest/kotlin/dev/mokkery/annotations/AnnotationsTest.kt test-mokkery/src/jvmTest/kotlin/dev/mokkery/annotations/AnnotationsTest.kt renamed to test-mokkery/src/jvmSharedTest/kotlin/dev/mokkery/annotations/AnnotationsTest.kt

@@ -0,0 +1,27 @@
+package dev.mokkery.types
+
+import dev.mokkery.answering.SuperCall.Companion.original
+import dev.mokkery.answering.calls
+import dev.mokkery.answering.returns
+import dev.mokkery.every
+import dev.mokkery.mock
+import kotlin.test.Test
+import kotlin.test.assertContentEquals
+
+class JavaSuperCallsTest {
+
+    private val list = mock<List<Int>>()
+
+    @Test
+    fun test() {
+        every(list::size::get) returns 3
+        every { list.iterator() } returns iterator {
+            yield(1)
+            yield(2)
+            yield(3)
+        }
+        every { list.spliterator() } calls original
+        every { list.stream() } calls original
+        assertContentEquals(arrayOf(1, 2, 3), list.stream().toArray())
+    }
+}