Make XRunner ready for Orchestrator V2.

The changes are based on the implementation of AndroidJUnitRunner and TestEventClient.

Author: Piotr Zawadzki

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

@@ -10,6 +10,7 @@ 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
@@ -103,15 +104,18 @@ open class AndroidJUnitXRunner : AndroidJUnitRunner() {
     }
 
     private fun shouldUpdateTestSuiteForXRunner(): Boolean {
-        // TODO: 12/08/2021 check for orchestration V2
         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(testEventClient: TestEventClient) {
         val runnerArgs = getRunnerArgsWithReflection()
         SuperReflect.on(runnerArgs).set(
-            RUNNER_ARGS_FIELD_LISTENERS, mutableListOf<RunListener>(
+            RUNNER_ARGS_FIELD_LISTENERS,
+            mutableListOf<RunListener>(
                 OrchestratorListenerWrapper(
                     testEventClient.runListener!!,
                     originalTestToRun

xrunner-library/src/main/java/com/stepstone/xrunner/internal/TestArgumentsProvider.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/XRunnerConstants.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"