Fix for running android ui tests with testOrchestrator

Author: k4k7us23

plugin/src/main/kotlin/org/neotech/plugin/rootcoverage/JaCoCoConfiguration.kt

@@ -67,6 +67,9 @@ internal fun Project.getExecutionDataFileTree(includeUnitTestResults: Boolean, i
 
         // Android Build Tools Plugin 7.1+
         buildFolderPatterns.add("outputs/code_coverage/*/connected/*/coverage.ec")
+
+        // Android Build Tools Plugin 7.1+ with test execution under testOrchestrator
+        buildFolderPatterns.add("outputs/code_coverage/*/connected/*/*.ec")
     }
     if(includeGradleManagedDevicesResults) {
         // Gradle Managed Devices 7.4
@@ -76,6 +79,11 @@ internal fun Project.getExecutionDataFileTree(includeUnitTestResults: Boolean, i
         buildFolderPatterns.add("outputs/managed_device_code_coverage/*/*/coverage.ec")
         // In case of flavors coverage is nested an additional 2 folder deeper
         buildFolderPatterns.add("outputs/managed_device_code_coverage/*/flavors/*/*/coverage.ec")
+
+        // Gradle Managed Devices 8.3+ with test execution under testOrchestrator
+        buildFolderPatterns.add("outputs/managed_device_code_coverage/*/*/*.ec")
+        // In case of flavors coverage is nested an additional 2 folder deeper
+        buildFolderPatterns.add("outputs/managed_device_code_coverage/*/flavors/*/*/*.ec")
     }
     return if(buildFolderPatterns.isEmpty()) {
         null

plugin/src/test/kotlin/org/neotech/plugin/rootcoverage/IntegrationTest.kt

@@ -102,9 +102,9 @@ class IntegrationTest(
                 executeGradleTasks(listOf("clean", "nexusoneapi30DebugAndroidTest", "nexusoneapi30DemoDebugAndroidTest"))
             }
 
-            listOf("coverageReport", "rootCodeCoverageReport", "--stacktrace")
+            listOf("coverageReport", "rootCodeCoverageReport", "--stacktrace", "--rerun-tasks")
         } else {
-            listOf("clean", "coverageReport", "rootCodeCoverageReport", "--stacktrace")
+            listOf("clean", "coverageReport", "rootCodeCoverageReport", "--stacktrace", "--rerun-tasks")
         }
 
         val result = executeGradleTasks(gradleCommands)

plugin/src/test/test-fixtures/multi-module/configurations/connected-device-clear-package-data.yaml

@@ -1,13 +1,5 @@
 # This test was added in reaction to:
 # https://github.com/NeoTech-Software/Android-Root-Coverage-Plugin/issues/83
-#
-# Currently this test case fails, but probably not because of this plugin as it seems to be
-# an Android tooling issue:
-# - https://issuetracker.google.com/issues/126258801
-# - https://issuetracker.google.com/issues/123987001
-#
-# For now this test configuration is ignored (until Google fixes this)
-ignore: true
 projectConfiguration:
   addGradleManagedDevice: false
   clearPackageData: true

plugin/src/test/test-fixtures/multi-module/configurations/gradle-managed-device-clear-package-data.yaml

@@ -0,0 +1,33 @@
+projectConfiguration:
+  addGradleManagedDevice: true
+  clearPackageData: true
+  testOrchestrator: true
+pluginConfiguration:
+  properties:
+    - name: generateHtml
+      value: true
+    - name: generateXml
+      value: false
+    - name: generateCsv
+      value: true
+
+    - name: buildVariant
+      value: debug
+    - name: buildVariantOverrides
+      value:
+        ":library_android_flavors": "demoDebug"
+
+    - name: executeTests
+      value: true
+
+    - name: includeUnitTestResults
+      value: true
+    - name: includeAndroidTestResults
+      value: true
+    - name: includeNoLocationClasses
+      value: true
+
+    - name: runOnGradleManagedDevices
+      value: true
+    - name: gradleManagedDeviceName
+      value: nexusoneapi30