Merge pull request #7 from zawadz88/bugfix/runner_1_4_0_compatibility

Bugfix/runner 1 4 0 compatibility
Remove bintray upload scripts.

Author: RobertZagorski

README.md

@@ -85,6 +85,7 @@ Here are some samples:
 
 | XRunner version                                                          | Test runner version                     |
 |:------------------------------------------------------------------------:|:---------------------------------------:|
+| [X.Y.Z](https://github.com/stepstone-tech/AndroidTestXRunner/tree/X.Y.Z) | `androidx.test:runner:1.4.0`            |
 | [2.1.0](https://github.com/stepstone-tech/AndroidTestXRunner/tree/2.1.0) | `androidx.test:runner:1.2.0`            |
 | [2.0.0](https://github.com/stepstone-tech/AndroidTestXRunner/tree/2.0.0) | `androidx.test:runner:1.1.0`            |
 | [1.0.0](https://github.com/stepstone-tech/AndroidTestXRunner/tree/1.0.0) | `com.android.support.test:runner:1.0.2` |

build.gradle

@@ -1,48 +1,46 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.KOTLIN_VERSION = '1.3.41'
-    ext.ANDROID_GRADLE_PLUGIN_VERSION = '3.5.0'
-    ext.DOKKA_VERSION = '0.9.17'
-    ext.BINTRAY_VERSION = '1.8.4'
+    ext.KOTLIN_VERSION = '1.5.21'
+    ext.ANDROID_GRADLE_PLUGIN_VERSION = '7.0.1'
+    ext.DOKKA_VERSION = '1.5.0'
     repositories {
         google()
-        jcenter()
         maven {
             url 'https://dl.bintray.com/kotlin/kotlin-eap'
         }
+        mavenCentral()
     }
     dependencies {
         classpath "com.android.tools.build:gradle:$ANDROID_GRADLE_PLUGIN_VERSION"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$KOTLIN_VERSION"
-        classpath "org.jetbrains.dokka:dokka-android-gradle-plugin:$DOKKA_VERSION"
-        classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:$BINTRAY_VERSION"
+        classpath "org.jetbrains.dokka:dokka-gradle-plugin:$DOKKA_VERSION"
     }
 }
 
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
 
 configure(allprojects) {
     ext {
         ANDROID_MIN_SDK_VERSION             = 19
-        ANDROID_TARGET_SDK_VERSION          = 28
-        ANDROID_COMPILE_SDK_VERSION         = 28
+        ANDROID_TARGET_SDK_VERSION          = 30
+        ANDROID_COMPILE_SDK_VERSION         = 30
 
-        TEST_RUNNER_VERSION                 = '1.2.0'
+        TEST_RUNNER_VERSION                 = '1.4.0'
         SUPER_REFLEKT_VERSION               = '1.0.1'
 
         // Sample app only
-        TEST_RULES_VERSION                  = '1.2.0'
-        TEST_EXT_VERSION                    = '1.1.1'
-        TEST_ORCHESTRATOR_VERSION           = '1.2.0'
-        ESPRESSO_VERSION                    = '3.2.0'
+        TEST_RULES_VERSION                  = '1.4.0'
+        TEST_EXT_VERSION                    = '1.1.3'
+        TEST_ORCHESTRATOR_VERSION           = '1.4.0'
+        ESPRESSO_VERSION                    = '3.4.0'
         APPCOMPAT_VERSION                   = '1.1.0'
-        MATERIAL_VERSION                    = '1.1.0-alpha10'
+        MATERIAL_VERSION                    = '1.1.0'
         CONSTRAINT_VERSION                  = '1.1.3'
     }
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

xrunner-library/bintrayv1.gradle

@@ -1,6 +1,6 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
-apply plugin: 'org.jetbrains.dokka-android'
+apply plugin: 'org.jetbrains.dokka'
 apply plugin: 'maven-publish'
 
 apply from: '../ktlint.gradle'
@@ -30,30 +30,6 @@ dependencies {
     implementation "de.jodamob.android:SuperReflect:$SUPER_REFLEKT_VERSION"
 }
 
-dokka {
-    outputDirectory = "$rootDir/docs"
-}
-
-task dokkaJavadoc(type: org.jetbrains.dokka.gradle.DokkaAndroidTask) {
-    delete "$buildDir/docs"
-
-    outputFormat = 'javadoc'
-    outputDirectory = "$buildDir/docs"
-
-    externalDocumentationLink {
-        url = new URL("https://developer.android.com/reference/")
-    }
-
-    // Always recreate documentation
-    outputs.upToDateWhen { return false }
-}
-
-afterEvaluate {
-    if (project.hasProperty("javadocJar")) {
-        tasks.javadocJar.dependsOn dokkaJavadoc
-    }
-}
-
 ext {
     bintrayRepo = 'maven'
     bintrayName = 'android-test-xrunner'
@@ -74,28 +50,22 @@ ext {
     allLicenses = ["Apache-2.0"]
 }
 
-
-tasks.withType(Javadoc) {
-    excludes = ['**/*.kt']
-}
-
 task sourcesJar(type: Jar) {
     classifier = 'sources'
     from android.sourceSets.main.java.srcDirs
 }
 
-task javadoc(type: Javadoc) {
-    source = android.sourceSets.main.java.srcDirs
-    classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
+dokkaJavadoc.configure {
+    dokkaSourceSets {
+        named("main") {
+            noAndroidSdkLink.set(false)
+        }
+    }
 }
 
-task javadocJar(type: Jar, dependsOn: javadoc) {
-
-    // Always recreate documentation
-    outputs.upToDateWhen { return false }
-
+task javadocJar(type: Jar, dependsOn: dokkaJavadoc) {
     classifier = 'javadoc'
-    from new File("$buildDir/docs")
+    from "$buildDir/dokka/javadoc"
 }
 
 publishing {
@@ -108,6 +78,7 @@ publishing {
 
             groupId publishedGroupId
             artifactId artifact
+            version libraryVersion
 
             pom {
                 packaging 'aar'
@@ -148,7 +119,5 @@ publishing {
         }
     }
 }
-// Bintray Upload
-apply from: 'bintrayv1.gradle'
 
 publishToMavenLocal.dependsOn 'assembleRelease'

xrunner-library/build.gradle

@@ -1,15 +1,16 @@
 package com.stepstone.xrunner
 
 import android.os.Bundle
+import android.util.Log
+import androidx.test.internal.events.client.TestEventClient
 import androidx.test.internal.runner.RunnerArgs
 import androidx.test.internal.runner.TestRequestBuilder
-import androidx.test.orchestrator.instrumentationlistener.OrchestratedInstrumentationListener
 import androidx.test.runner.AndroidJUnitRunner
-import android.util.Log
 import com.stepstone.xrunner.internal.ARGUMENT_CLASS
 import com.stepstone.xrunner.internal.ARGUMENT_LIST_TESTS_FOR_ORCHESTRATOR
 import com.stepstone.xrunner.internal.ARGUMENT_NOT_CLASS
 import com.stepstone.xrunner.internal.ARGUMENT_NOT_PACKAGE
+import com.stepstone.xrunner.internal.ARGUMENT_ORCHESTRATOR_DISCOVERY_SERVICE
 import com.stepstone.xrunner.internal.ARGUMENT_PACKAGE
 import com.stepstone.xrunner.internal.ARGUMENT_TARGET_PROCESS
 import com.stepstone.xrunner.internal.OrchestratorListenerWrapper
@@ -33,7 +34,7 @@ open class AndroidJUnitXRunner : AndroidJUnitRunner() {
     companion object {
         private const val TAG = "XRunner"
 
-        private const val RUNNER_FIELD_ORCHESTRATOR_LISTENER = "orchestratorListener"
+        private const val RUNNER_FIELD_TEST_EVENT_CLIENT = "testEventClient"
         private const val RUNNER_FIELD_RUNNER_ARGS = "runnerArgs"
         private const val RUNNER_METHOD_CREATE_TEST_REQUEST_BUILDER = "createTestRequestBuilder"
         private const val RUNNER_ARGS_FIELD_LISTENERS = "listeners"
@@ -61,13 +62,13 @@ open class AndroidJUnitXRunner : AndroidJUnitRunner() {
     }
 
     override fun onStart() {
-        val orchestratorListener = SuperReflect.on(this).get<OrchestratedInstrumentationListener>(RUNNER_FIELD_ORCHESTRATOR_LISTENER)
+        val testEventClient = SuperReflect.on(this).get<TestEventClient>(RUNNER_FIELD_TEST_EVENT_CLIENT)
 
         if (shouldUpdateTestSuiteForXRunner()) {
             val runCount = getXRunnerCountArgument(modifiedBundle)
-            addXRunnerTestsWithOrchestrator(runCount, modifiedBundle, orchestratorListener)
+            addXRunnerTestsWithOrchestrator(runCount, modifiedBundle, testEventClient)
         } else if (isXRunnerTestExecution(originalBundle)) {
-            updateListenersBeforeXRunnerTestExecution(orchestratorListener)
+            updateListenersBeforeXRunnerTestExecution(testEventClient)
         }
         super.onStart()
     }
@@ -87,7 +88,7 @@ open class AndroidJUnitXRunner : AndroidJUnitRunner() {
     @Suppress("DEPRECATION")
     private fun isPrimaryInstrumentationProcess(): Boolean = isPrimaryInstrProcess(originalBundle.getString(ARGUMENT_TARGET_PROCESS))
 
-    private fun addXRunnerTestsWithOrchestrator(runCount: Int, bundle: Bundle, orchestratorListener: OrchestratedInstrumentationListener) {
+    private fun addXRunnerTestsWithOrchestrator(runCount: Int, bundle: Bundle, testEventClient: TestEventClient) {
         val testDescriptionFromBundle = getTestDescriptionFromBundle(bundle)
         val testsToRerun = getMethodTestArgumentsFromDescription(testDescriptionFromBundle)
 
@@ -98,29 +99,33 @@ open class AndroidJUnitXRunner : AndroidJUnitRunner() {
             .flatMap { testArg -> (1 until runCount).map { createXRunnerTestDescription(testArg, it) }.asSequence() }
             .forEach {
                 Log.d(TAG, "Adding '$it' to test suite")
-                orchestratorListener.addTests(it)
+                testEventClient.addTests(it)
             }
     }
 
     private fun shouldUpdateTestSuiteForXRunner(): Boolean {
         val listTestsForOrchestrator = (originalBundle.getString(ARGUMENT_LIST_TESTS_FOR_ORCHESTRATOR, false.toString())!!).toBoolean()
-        return listTestsForOrchestrator && isPrimaryInstrumentationProcess() && shouldUseXRunner(originalBundle)
+        val testDiscoveryForOrchestratorV2Provided = !originalBundle.getString(ARGUMENT_ORCHESTRATOR_DISCOVERY_SERVICE).isNullOrEmpty()
+        return isPrimaryInstrumentationProcess() &&
+            (testDiscoveryForOrchestratorV2Provided || listTestsForOrchestrator) &&
+            shouldUseXRunner(originalBundle)
     }
 
-    private fun updateListenersBeforeXRunnerTestExecution(orchestratorListener: OrchestratedInstrumentationListener) {
+    private fun updateListenersBeforeXRunnerTestExecution(testEventClient: TestEventClient) {
         val runnerArgs = getRunnerArgsWithReflection()
         SuperReflect.on(runnerArgs).set(
-            RUNNER_ARGS_FIELD_LISTENERS, mutableListOf<RunListener>(
+            RUNNER_ARGS_FIELD_LISTENERS,
+            mutableListOf<RunListener>(
                 OrchestratorListenerWrapper(
-                    orchestratorListener,
+                    testEventClient.runListener!!,
                     originalTestToRun
                 )
             )
         )
-        /* We need to set this listener to null as otherwise it would be added in AndroidJUnitRunner#addListeners()
+        /* We need to set test event client to no-op as otherwise it would be added in AndroidJUnitRunner#addListeners()
          * and it would duplicate what SCXRunnerOrchestratorListenerWrapper is already doing.
          */
-        SuperReflect.on(this).set(RUNNER_FIELD_ORCHESTRATOR_LISTENER, null)
+        SuperReflect.on(this).set(RUNNER_FIELD_TEST_EVENT_CLIENT, TestEventClient.NO_OP_CLIENT)
     }
 
     private fun getRunnerArgsWithReflection() = SuperReflect.on(this).get<RunnerArgs>(RUNNER_FIELD_RUNNER_ARGS)

xrunner-library/src/main/java/com/stepstone/xrunner/AndroidJUnitXRunner.kt

@@ -1,20 +1,20 @@
 package com.stepstone.xrunner.internal
 
-import androidx.test.orchestrator.instrumentationlistener.OrchestratedInstrumentationListener
+import androidx.test.internal.events.client.OrchestratedInstrumentationListener
 import org.junit.runner.Description
 import org.junit.runner.Result
 import org.junit.runner.notification.Failure
 import org.junit.runner.notification.RunListener
 
 /**
- * This is a wrapper for the original [OrchestratedInstrumentationListener] set in [android.support.test.runner.AndroidJUnitRunner].
+ * This is a wrapper for the original [OrchestratedInstrumentationListener] set in [androidx.test.runner.AndroidJUnitRunner].
  * It's purpose is to report to Android Test Orchestrator correct XRunner test methods e.g.
  * if [com.stepstone.xrunner.AndroidJUnitXRunner] was originally triggered to run "com.android.foo.FooTest#testFoo_XRUNNER_RUN_1"
  * this class would make sure that [OrchestratedInstrumentationListener] would get a test description with "_XRUNNER_RUN_1" suffix.
  * This is because [com.stepstone.xrunner.AndroidJUnitXRunner] removes this suffix when running the test.
  */
 class OrchestratorListenerWrapper(
-    private val orchestratorListener: OrchestratedInstrumentationListener,
+    private val orchestratorListener: RunListener,
     private val originalTestToRun: String?
 ) : RunListener() {
 

xrunner-library/src/main/java/com/stepstone/xrunner/internal/OrchestratorListenerWrapper.kt

@@ -1,18 +1,20 @@
 package com.stepstone.xrunner.internal
 
 import android.os.Bundle
+import kotlin.math.max
 
 private const val XRUNNER_DEFAULT_COUNT = "10"
 
 fun getClassArgument(bundle: Bundle): String? = bundle.getString(ARGUMENT_CLASS)
 
 fun isXRunnerTestExecution(bundle: Bundle): Boolean = isXRunnerTest(getClassArgument(bundle))
 
-fun getXRunnerCountArgument(bundle: Bundle): Int = Math.max(
+fun getXRunnerCountArgument(bundle: Bundle): Int = max(
     bundle.getString(
         ARGUMENT_XRUNNER_COUNT,
         XRUNNER_DEFAULT_COUNT
-    ).toInt(), 0
+    ).toInt(),
+    0
 )
 
 fun shouldUseXRunner(bundle: Bundle): Boolean = !getXRunnerClassArgument(bundle).isNullOrEmpty() ||

xrunner-library/src/main/java/com/stepstone/xrunner/internal/TestArgumentsProvider.kt

@@ -6,6 +6,7 @@ internal const val ARGUMENT_PACKAGE = "package"
 internal const val ARGUMENT_NOT_PACKAGE = "notPackage"
 internal const val ARGUMENT_TARGET_PROCESS = "targetProcess"
 internal const val ARGUMENT_LIST_TESTS_FOR_ORCHESTRATOR = "listTestsForOrchestrator"
+internal const val ARGUMENT_ORCHESTRATOR_DISCOVERY_SERVICE = "testDiscoveryService"
 
 internal const val ARGUMENT_XRUNNER_CLASS = "xrunnerClass"
 internal const val ARGUMENT_XRUNNER_NOT_CLASS = "xrunnerNotClass"