loeschg · August 29, 2015 14:07 · Nov 21, 2014 · Oct 7, 2014 · Oct 7, 2014 · Oct 7, 2014
diff --git a/build.gradle b/build.gradle
@@ -27,7 +27,7 @@ def excludeEspressoFilesIfNecessary(theTask) {
 
         // Exclude espresso and add the task as a dependency.
         project.task(cleanupTaskName) << {
-            FileTree tree = fileTree(dir: TEST_SRC_DIR)
+            def FileTree tree = fileTree(dir: TEST_SRC_DIR)
             tree.exclude TO_EXCLUDE 
             theTask.source = tree
         }

diff --git a/build.gradle b/build.gradle
@@ -13,17 +13,22 @@ tasks.whenTaskAdded { theTask ->
  * Android Testing. (╯°□°）╯︵ ┻━┻
  */
 def excludeEspressoFilesIfNecessary(theTask) {
-    def compileTestPattern= /compileTest([^ ]*)Java/ 
+
+    // Modify these if needed.
+    def final TEST_SRC_DIR = 'src/test/java'
+    def final TO_EXCLUDE = '**/espresso/**/*.java'
+
+    def final compileTestPattern= /compileTest([^ ]*)Java/
     if (theTask.name.matches(compileTestPattern)) { // find all task names.
-        
+
         // Grabs the name of the variant to use when naming the new task.
         def matcher = (theTask.name =~ compileTestPattern)
         def cleanupTaskName = "touchUp${matcher[0][1]}RobolectricSourceSet"
-        
+
         // Exclude espresso and add the task as a dependency.
         project.task(cleanupTaskName) << {
-            FileTree tree = fileTree(dir: 'src/test/java')
-            tree.exclude '**/espresso/**/*.java'
+            FileTree tree = fileTree(dir: TEST_SRC_DIR)
+            tree.exclude TO_EXCLUDE 
             theTask.source = tree
         }
         theTask.dependsOn(cleanupTaskName)

diff --git a/build.gradle b/build.gradle
@@ -1,6 +1,6 @@
 /** Hook into existing tasks. */
 tasks.whenTaskAdded { theTask ->
-    checkAndExcludeEspressoFilesFromTask(theTask)
+    excludeEspressoFilesIfNecessary(theTask)
 }
 
 /**
@@ -12,7 +12,7 @@ tasks.whenTaskAdded { theTask ->
  *
  * Android Testing. (╯°□°）╯︵ ┻━┻
  */
-def checkAndExcludeEspressoFilesFromTask(theTask) {
+def excludeEspressoFilesIfNecessary(theTask) {
     def compileTestPattern= /compileTest([^ ]*)Java/ 
     if (theTask.name.matches(compileTestPattern)) { // find all task names.
 

diff --git a/build.gradle b/build.gradle
@@ -1,6 +1,6 @@
 /** Hook into existing tasks. */
 tasks.whenTaskAdded { theTask ->
-    excludeEspressoFilesFromTask(theTask)
+    checkAndExcludeEspressoFilesFromTask(theTask)
 }
 
 /**
@@ -12,7 +12,7 @@ tasks.whenTaskAdded { theTask ->
  *
  * Android Testing. (╯°□°）╯︵ ┻━┻
  */
-def excludeEspressoFilesFromTask(theTask) {
+def checkAndExcludeEspressoFilesFromTask(theTask) {
     def compileTestPattern= /compileTest([^ ]*)Java/ 
     if (theTask.name.matches(compileTestPattern)) { // find all task names.
 

diff --git a/build.gradle b/build.gradle
@@ -10,15 +10,17 @@ tasks.whenTaskAdded { theTask ->
  * normally unless doing this. Double-espresso is used to fix a conflicting Dagger 1.2 dependency
  * with Espresso.
  *
- * Android Testing. It's a mess. (╯°□°）╯︵ ┻━┻
+ * Android Testing. (╯°□°）╯︵ ┻━┻
  */
 def excludeEspressoFilesFromTask(theTask) {
-    def tasks = ['compileTestStagingDebugJava', 'compileTestProdDebugJava']
-    if (tasks.contains(theTask.name.toString())) {
-
-        def variantPattern = /compileTest(.*)Java/
-        def matcher = (theTask.name =~ variantPattern)
+    def compileTestPattern= /compileTest([^ ]*)Java/ 
+    if (theTask.name.matches(compileTestPattern)) { // find all task names.
+        
+        // Grabs the name of the variant to use when naming the new task.
+        def matcher = (theTask.name =~ compileTestPattern)
         def cleanupTaskName = "touchUp${matcher[0][1]}RobolectricSourceSet"
+
+        // Exclude espresso and add the task as a dependency.
         project.task(cleanupTaskName) << {
             FileTree tree = fileTree(dir: 'src/test/java')
             tree.exclude '**/espresso/**/*.java'

diff --git a/build.gradle b/build.gradle
@@ -0,0 +1,29 @@
+/** Hook into existing tasks. */
+tasks.whenTaskAdded { theTask ->
+    excludeEspressoFilesFromTask(theTask)
+}
+
+/**
+ * This excludes Espresso tests from Robolectric. http://stackoverflow.com/a/24706452/413254
+ *
+ * This was needed when using double-espresso.  I couldn't get Robolectric to exclude them
+ * normally unless doing this. Double-espresso is used to fix a conflicting Dagger 1.2 dependency
+ * with Espresso.
+ *
+ * Android Testing. It's a mess. (╯°□°）╯︵ ┻━┻
+ */
+def excludeEspressoFilesFromTask(theTask) {
+    def tasks = ['compileTestStagingDebugJava', 'compileTestProdDebugJava']
+    if (tasks.contains(theTask.name.toString())) {
+
+        def variantPattern = /compileTest(.*)Java/
+        def matcher = (theTask.name =~ variantPattern)
+        def cleanupTaskName = "touchUp${matcher[0][1]}RobolectricSourceSet"
+        project.task(cleanupTaskName) << {
+            FileTree tree = fileTree(dir: 'src/test/java')
+            tree.exclude '**/espresso/**/*.java'
+            theTask.source = tree
+        }
+        theTask.dependsOn(cleanupTaskName)
+    }
+}