Merge pull request #895 from kubode/kubode/fix_android_fails_dispatcher

Fix an issue that Android Instrumentation Test fails

buildSrc/src/main/kotlin/buildsrc/config/Deps.kt

@@ -24,6 +24,8 @@ object Deps {
         const val dexmaker = "2.28.1"
         const val androidxEspresso = "3.4.0"
         const val androidxTestRules = "1.4.0"
+        const val androidxTestRunner = "1.4.0"
+        const val androidxTestExtJunit = "1.1.3"
     }
 
     object Libs {

buildSrc/src/main/kotlin/buildsrc/convention/android-application.gradle.kts

@@ -1,15 +1,10 @@
 package buildsrc.convention
 
 import buildsrc.config.Deps
-import org.gradle.jvm.tasks.Jar
 
 plugins {
     id("com.android.application")
 
-    kotlin("android")
-    kotlin("kapt")
-    kotlin("plugin.allopen")
-
     id("org.jetbrains.dokka")
 
     id("buildsrc.convention.base")
@@ -18,10 +13,6 @@ plugins {
 android {
     compileSdkVersion = "android-32"
 
-    kotlinOptions {
-        jvmTarget = Deps.Versions.jvmTarget.toString()
-    }
-
     lint {
         abortOnError = false
         disable += "InvalidPackage"

buildSrc/src/main/kotlin/buildsrc/convention/android-library.gradle.kts

@@ -36,6 +36,11 @@ android {
     defaultConfig {
         minSdk = 21
         targetSdk = 32
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+    }
+
+    testOptions {
+        execution = "ANDROIDX_TEST_ORCHESTRATOR"
     }
 
     compileOptions {
@@ -44,6 +49,20 @@ android {
     }
 }
 
+dependencies {
+    testImplementation("junit:junit:${Deps.Versions.junit4}")
+    androidTestImplementation("androidx.test.espresso:espresso-core:${Deps.Versions.androidxEspresso}") {
+        exclude("com.android.support:support-annotations")
+    }
+
+    androidTestImplementation("androidx.test:rules:${Deps.Versions.androidxTestRules}")
+    androidTestImplementation("androidx.test:runner:${Deps.Versions.androidxTestRunner}")
+    androidTestImplementation("androidx.test.ext:junit-ktx:${Deps.Versions.androidxTestExtJunit}")
+
+    androidTestImplementation(kotlin("test"))
+    androidTestImplementation(kotlin("test-junit"))
+}
+
 val javadocJar by tasks.registering(Jar::class) {
     from(tasks.dokkaJavadoc)
     archiveClassifier.set("javadoc")

modules/mockk-agent-android/build.gradle.kts

@@ -29,8 +29,6 @@ android {
     }
 
     defaultConfig {
-        testInstrumentationRunner = "android.support.test.runner.AndroidJUnitRunner"
-        testInstrumentationRunnerArguments["notAnnotation"] = "io.mockk.test.SkipInstrumentedAndroidTest"
         ndk {
             abiFilters += setOf("armeabi-v7a", "x86", "x86_64", "arm64-v8a")
         }
@@ -51,12 +49,6 @@ dependencies {
     implementation("com.linkedin.dexmaker:dexmaker:${buildsrc.config.Deps.Versions.dexmaker}")
     implementation("org.objenesis:objenesis:${buildsrc.config.Deps.Versions.objenesis}")
 
-    androidTestImplementation("androidx.test.espresso:espresso-core:${buildsrc.config.Deps.Versions.androidxEspresso}") {
-        exclude("com.android.support:support-annotations")
-    }
-
-    androidTestImplementation(kotlin("test"))
-
     androidClassesDex(projects.modules.mockkAgentAndroidDispatcher)
 }
 

modules/mockk-agent-android/src/androidTest/java/io/mockk/proxy/android/AndroidMockKProxyMakerTest.java

@@ -5,6 +5,7 @@
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 
 import java.lang.reflect.Method;
 import java.util.ArrayList;
@@ -14,7 +15,10 @@
 
 import static org.junit.Assert.*;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
 @SuppressWarnings("Duplicates")
+@RunWith(AndroidJUnit4.class)
 public class AndroidMockKProxyMakerTest {
 
     static boolean[] executed = new boolean[10];

modules/mockk-android/build.gradle.kts

@@ -11,40 +11,17 @@ description = "Mocking library for Kotlin (Android instrumented test)"
 val mavenName: String by extra("MockK Android")
 val mavenDescription: String by extra("${project.description}")
 
-@Suppress("UnstableApiUsage")
 android {
     packagingOptions {
         resources {
             excludes += "META-INF/LICENSE.md"
             excludes += "META-INF/LICENSE-notice.md"
         }
     }
-
-    defaultConfig {
-        testInstrumentationRunner = "android.support.test.runner.AndroidJUnitRunner"
-        testInstrumentationRunnerArguments["notAnnotation"] = "io.mockk.test.SkipInstrumentedAndroidTest"
-    }
-
-    sourceSets {
-        getByName("androidTest").assets.srcDirs("$projectDir/common/src/test/kotlin")
-    }
 }
 
 dependencies {
     api(projects.modules.mockk)
     api(projects.modules.mockkAgentApi)
     api(projects.modules.mockkAgentAndroid)
-
-    testImplementation("junit:junit:${Deps.Versions.junit4}")
-    androidTestImplementation("androidx.test.espresso:espresso-core:${Deps.Versions.androidxEspresso}") {
-        exclude(group = "com.android.support", module = "support-annotations")
-    }
-    androidTestImplementation(kotlin("reflect"))
-
-    androidTestImplementation("androidx.test:rules:${Deps.Versions.androidxTestRules}")
-
-    androidTestImplementation(kotlin("test"))
-    androidTestImplementation(kotlin("test-junit"))
-    androidTestImplementation(Deps.Libs.junitJupiter)
-    androidTestImplementation(Deps.Libs.junitVintageEngine)
 }

modules/mockk-android/src/androidTest/java/TestKeep.java

@@ -1,5 +1,9 @@
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
 import org.junit.Test;
+import org.junit.runner.RunWith;
 
+@RunWith(AndroidJUnit4.class)
 public class TestKeep {
     @Test
     public void neededToRunAutomatedTask() {

modules/mockk-android/src/androidTest/java/io/mockk/MethodDescriptionTest.kt

@@ -1,9 +1,12 @@
 package io.mockk
 
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.junit.runner.RunWith
 import java.util.concurrent.Callable
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
+@RunWith(AndroidJUnit4::class)
 class MethodDescriptionTest {
 
     /**
@@ -15,4 +18,4 @@ class MethodDescriptionTest {
         every { mock.call() } returns "test"
         assertEquals("test", mock.call())
     }
-}
+}

modules/mockk-android/src/androidTest/java/io/mockk/ait/MockAbstractArgTest.kt

@@ -1,7 +1,9 @@
 package io.mockk.ait
 
+import androidx.test.ext.junit.runners.AndroidJUnit4
 import io.mockk.mockk
 import io.mockk.verify
+import org.junit.runner.RunWith
 import kotlin.test.Test
 
 abstract class MyAbstractClass
@@ -14,6 +16,7 @@ interface IMockableInterface {
     fun doSomethingWithString(s: String)
 }
 
+@RunWith(AndroidJUnit4::class)
 class MockAbstractArgTest {
 
     @Test
@@ -45,4 +48,4 @@ class MockAbstractArgTest {
         // works
         verify { myMock.doSomethingWithInterface(any()) }
     }
-}
+}

modules/mockk-android/src/androidTest/java/io/mockk/ait/PrePTest.kt

@@ -1,10 +1,13 @@
 package io.mockk.ait
 
+import androidx.test.ext.junit.runners.AndroidJUnit4
 import io.mockk.every
 import io.mockk.mockk
+import org.junit.runner.RunWith
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
+@RunWith(AndroidJUnit4::class)
 class PrePTest {
     open class MockCls {
         open fun sum(a: Int, b: Int) = a + b
@@ -18,4 +21,4 @@ class PrePTest {
 
         assertEquals(4, mock.sum(1, 2))
     }
-}
+}

modules/mockk-android/src/androidTest/java/io/mockk/proxy/android/AndroidMockKAgentFactoryTest.kt

@@ -1,18 +1,14 @@
 package io.mockk.proxy.android
 
 import android.widget.FrameLayout
-import androidx.test.rule.ActivityTestRule
-import io.mockk.debug.TestActivity
+import androidx.test.ext.junit.runners.AndroidJUnit4
 import io.mockk.mockk
-import org.junit.Rule
 import org.junit.Test
+import org.junit.runner.RunWith
 
+@RunWith(AndroidJUnit4::class)
 class AndroidMockKAgentFactoryTest {
 
-    @Rule
-    @JvmField
-    val rule = ActivityTestRule(TestActivity::class.java)
-
     /**
      * This tests that the hidden api logic in [AndroidMockKAgentFactory] works. Otherwise, we would fail when mocking
      * the FrameLayout.