fix and refactoring

Author: Evleaps

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

@@ -233,8 +233,8 @@ class AffectedModuleDetectorPlugin : Plugin<Project> {
         internal const val CUSTOM_TASK_GROUP_NAME = "Affected Module Detector custom tasks"
 
         private const val PLUGIN_ANDROID_APPLICATION = "com.android.application"
-        private const val PLUGIN_ANDROID_LIBRARY = "java"
-        private const val PLUGIN_JAVA_LIBRARY = "com.android.library"
+        private const val PLUGIN_ANDROID_LIBRARY = "com.android.library"
+        private const val PLUGIN_JAVA_LIBRARY = "java"
         private const val PLUGIN_KOTLIN = "kotlin"
 
         private const val ANDROID_TEST_PATTERN = "AndroidTest"

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

@@ -8,12 +8,16 @@ package com.dropbox.affectedmoduledetector
  */
 open class AffectedTestConfiguration {
 
-    var assembleAndroidTestTask : String? = "assembleDebugAndroidTest"
-    var runAndroidTestTask : String?  = "connectedDebugAndroidTest"
+    var assembleAndroidTestTask : String? = DEFAULT_ASSEMBLE_ANDROID_TEST_TASK
+    var runAndroidTestTask : String?  = DEFAULT_ANDROID_TEST_TASK
     var jvmTestTask : String? = DEFAULT_JVM_TEST_TASK
 
     companion object {
         const val name = "affectedTestConfiguration"
+
         internal const val DEFAULT_JVM_TEST_TASK = "testDebugUnitTest"
+        internal const val DEFAULT_NON_ANDROID_JVM_TEST_TASK = "test"
+        internal const val DEFAULT_ASSEMBLE_ANDROID_TEST_TASK = "assembleDebugAndroidTest"
+        internal const val DEFAULT_ANDROID_TEST_TASK = "connectedDebugAndroidTest"
     }
 }

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

@@ -8,25 +8,25 @@ internal enum class InternalTaskType(
 
     ANDROID_TEST(
         commandByImpact = "runAffectedAndroidTests",
-        originalGradleCommand = "connectedDebugAndroidTest",
+        originalGradleCommand = AffectedTestConfiguration.DEFAULT_ANDROID_TEST_TASK,
         taskDescription = "Runs all affected Android Tests. Requires a connected device."
     ),
 
     ASSEMBLE_ANDROID_TEST(
         commandByImpact = "assembleAffectedAndroidTests",
-        originalGradleCommand = "assembleDebugAndroidTest",
+        originalGradleCommand = AffectedTestConfiguration.DEFAULT_ASSEMBLE_ANDROID_TEST_TASK,
         taskDescription = "Assembles all affected Android Tests. Useful when working with device labs."
     ),
 
     ANDROID_JVM_TEST(
         commandByImpact = "runAffectedUnitTests",
-        originalGradleCommand = "testDebugUnitTest",
+        originalGradleCommand = AffectedTestConfiguration.DEFAULT_JVM_TEST_TASK,
         taskDescription = "Runs all affected unit tests."
     ),
 
     JVM_TEST(
         commandByImpact = "", // inner type. This type doesn't registered in gradle
-        originalGradleCommand = "test",
+        originalGradleCommand = AffectedTestConfiguration.DEFAULT_NON_ANDROID_JVM_TEST_TASK,
         taskDescription = "Runs all affected unit tests for non Android modules."
     )
 }