Allow null task to indicate skipping a module

Author: chris-mitchell

affectedmoduledetector/src/main/kotlin/com/dropbox/affectedmoduledetector/AffectedModuleDetectorPlugin.kt

@@ -8,7 +8,6 @@ import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.api.Task
 import org.gradle.api.tasks.testing.Test
-import java.util.*
 
 /**
  * This plugin creates and registers all affected test tasks.
@@ -107,9 +106,9 @@ class AffectedModuleDetectorPlugin : Plugin<Project> {
  } as AffectedTestConfiguration
 
  val pathName = when (testType) {
- is TestType.RunAndroidTest -> "${project.path}:${tasks.runAndroidTestTask}"
- is TestType.AssembleAndroidTest -> "${project.path}:${tasks.assembleAndroidTestTask}"
- is TestType.JvmTest -> "${project.path}:${tasks.jvmTest}"
+ is TestType.RunAndroidTest -> getPathAndTask(project, tasks.runAndroidTestTask)
+ is TestType.AssembleAndroidTest -> getPathAndTask(project, tasks.assembleAndroidTestTask)
+ is TestType.JvmTest -> getPathAndTask(project, tasks.jvmTestTask)
  }
 
  return if (AffectedModuleDetector.isProjectAffected(project)) {
@@ -119,6 +118,14 @@ class AffectedModuleDetectorPlugin : Plugin<Project> {
  }
  }
 
+ private fun getPathAndTask(project: Project, task: String?): String? {
+ return if (task.isNullOrEmpty()) {
+ null
+ } else {
+ "${project.path}:${task}"
+ }
+ }
+
  private fun filterAndroidTests(project: Project) {
  val tracker = DependencyTracker(project, null)
  project.tasks.all { task ->

affectedmoduledetector/src/main/kotlin/com/dropbox/affectedmoduledetector/AffectedTestConfiguration.kt

@@ -8,9 +8,9 @@ package com.dropbox.affectedmoduledetector
  */
 open class AffectedTestConfiguration {
 
- var assembleAndroidTestTask = "assembleDebugAndroidTest"
- var runAndroidTestTask = "connectedDebugAndroidTest"
- var jvmTest = "testDebugUnitTest"
+ var assembleAndroidTestTask : String? = "assembleDebugAndroidTest"
+ var runAndroidTestTask : String?  = "connectedDebugAndroidTest"
+ var jvmTestTask : String? = "testDebugUnitTest"
 
  companion object {
  const val name = "affectedTestConfiguration"

affectedmoduledetector/src/test/kotlin/com/dropbox/affectedmoduledetector/AffectedModuleDetectorPluginTest.kt

@@ -4,7 +4,6 @@ import com.google.common.truth.Truth.assertThat
 import junit.framework.Assert.fail
 import org.gradle.api.Project
 import org.gradle.api.internal.project.DefaultProject
-import org.gradle.api.plugins.JavaLibraryPlugin
 import org.gradle.testfixtures.ProjectBuilder
 import org.junit.Before
 import org.junit.Rule
@@ -94,7 +93,7 @@ class AffectedModuleDetectorPluginTest {
  // WHEN
  rootProject.pluginManager.apply(AffectedModuleDetectorPlugin::class.java)
  val ext = requireNotNull(childProject.extensions.findByType(AffectedTestConfiguration::class.java))
- ext.jvmTest = "myfaketest"
+ ext.jvmTestTask = "myfaketest"
 
  (rootProject as DefaultProject).evaluate()
 

affectedmoduledetector/src/test/kotlin/com/dropbox/affectedmoduledetector/AffectedTestConfigurationTest.kt

@@ -17,7 +17,7 @@ class AffectedTestConfigurationTest {
  fun `GIVEN AffectedTestConfiguration WHEN default values THEN default values returned`() {
  assertThat(config.assembleAndroidTestTask).isEqualTo("assembleDebugAndroidTest")
  assertThat(config.runAndroidTestTask).isEqualTo("connectedDebugAndroidTest")
- assertThat(config.jvmTest).isEqualTo("testDebugUnitTest")
+ assertThat(config.jvmTestTask).isEqualTo("testDebugUnitTest")
  }
 
  @Test
@@ -30,12 +30,12 @@ class AffectedTestConfigurationTest {
  // WHEN
  config.assembleAndroidTestTask = assembleAndroidTestTask
  config.runAndroidTestTask = runAndroidTestTask
- config.jvmTest = jvmTest
+ config.jvmTestTask = jvmTest
 
  // THEN
  assertThat(config.assembleAndroidTestTask).isEqualTo(assembleAndroidTestTask)
  assertThat(config.runAndroidTestTask).isEqualTo(runAndroidTestTask)
- assertThat(config.jvmTest).isEqualTo(jvmTest)
+ assertThat(config.jvmTestTask).isEqualTo(jvmTest)
  }
 
  @Test

gradle/releasing.gradle

@@ -1,6 +1,6 @@
 ext {
  DESCRIPTION = "A Gradle Plugin and library to determine which modules were affected in a commit."
- VERSION = "0.1.1-SNAPSHOT"
+ VERSION = "0.1.2-SNAPSHOT"
  GIT_URL = 'https://github.com/Dropbox/AffectedModuleDetector'
  GROUP_ID = "com.dropbox.affectedmoduledetector"
  SONATYPE_SNAPSHOT_URL = "https://oss.sonatype.org/content/repositories/snapshots/"