Update tests

dropbox · Feb 10, 2024 · 61d8dde · 61d8dde
1 parent 3871eec
commit 61d8dde
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/...c/test/kotlin/com/dropbox/affectedmoduledetector/AffectedModuleDetectorIntegrationTest.kt b/...c/test/kotlin/com/dropbox/affectedmoduledetector/AffectedModuleDetectorIntegrationTest.kt
@@ -112,6 +112,9 @@ class AffectedModuleDetectorIntegrationTest {
 
         // THEN
         assertThat(result.output).contains(":sample-app:assembleDebugAndroidTest SKIPPED")
+        assertThat(result.output).contains(":sample-core:mergeDexDebugAndroidTest SKIPPED")
+        assertThat(result.output).contains(":sample-core:packageDebugAndroidTest SKIPPED")
+        assertThat(result.output).contains(":sample-core:assembleDebugAndroidTest SKIPPED")
         assertThat(result.output).contains(":sample-core:assembleAndroidTest SKIPPED")
         assertThat(result.output).contains(":assembleAffectedAndroidTests SKIPPED")
     }
@@ -190,6 +193,9 @@ class AffectedModuleDetectorIntegrationTest {
 
         // THEN
         assertThat(result.output).contains(":sample-app:assembleDebugAndroidTest SKIPPED")
+        assertThat(result.output).doesNotContain(":sample-core:mergeDexDebugAndroidTest")
+        assertThat(result.output).doesNotContain(":sample-core:packageDebugAndroidTest")
+        assertThat(result.output).doesNotContain(":sample-core:assembleDebugAndroidTest")
         assertThat(result.output).doesNotContain(":sample-core:assembleAndroidTest")
         assertThat(result.output).contains(":assembleAffectedAndroidTests SKIPPED")
     }

diff --git a/sample/buildSrc/src/main/kotlin/com/dropbox/sample/tasks/AffectedTasksPlugin.kt b/sample/buildSrc/src/main/kotlin/com/dropbox/sample/tasks/AffectedTasksPlugin.kt
@@ -53,16 +53,15 @@ class AffectedTasksPlugin : Plugin<Project> {
     private fun registerAffectedTestTask(
         taskName: String, testTask: String, testTaskBackup: String?,
         rootProject: Project
-    ): Task {
-        val task = rootProject.tasks.register(taskName) { task ->
+    ) {
+        rootProject.tasks.register(taskName) { task ->
             val paths = getAffectedPaths(testTask, testTaskBackup, rootProject)
             paths.forEach { path ->
                 task.dependsOn(path)
             }
             task.enabled = paths.isNotEmpty()
             task.onlyIf { paths.isNotEmpty() }
         }
-        return task.get()
     }
 
     private fun getAffectedPaths(