Merge pull request #324 from brunobowden/testing

projectClearDir

Author: brunobowden

src/main/groovy/com/github/j2objccontrib/j2objcgradle/tasks/TranslateTask.groovy

@@ -113,10 +113,7 @@ class TranslateTask extends DefaultTask {
             // if the user requests it with the UNSAFE_incrementalBuildClosure argument.
             // TODO: One correct way to incrementally compile with --build-closure would be to use
             // allInputFiles someway, but this will require some research.
-            if (srcGenDir.exists()) {
-                srcGenDir.deleteDir()
-                srcGenDir.mkdirs()
-            }
+            Utils.projectClearDir(project, srcGenDir)
             srcFilesChanged = originalSrcFiles
         } else {
             boolean nonSourceFileChanged = false
@@ -194,10 +191,7 @@ class TranslateTask extends DefaultTask {
                 // A change outside of the source set directories has occurred, so an incremental build isn't possible.
                 // The most common such change is in the JAR for a dependent library, for example if Java project
                 // that this project depends on had its source changed and was recompiled.
-                if (srcGenDir.exists()) {
-                    srcGenDir.deleteDir()
-                    srcGenDir.mkdirs()
-                }
+                Utils.projectClearDir(project, srcGenDir)
                 srcFilesChanged = originalSrcFiles
             }
         }

src/main/groovy/com/github/j2objccontrib/j2objcgradle/tasks/Utils.groovy

@@ -382,6 +382,24 @@ class Utils {
         return proj.delete(paths)
     }
 
+    /**
+     * Delete a directory and recreate it using project.delete(...) and project.mkdir(...)
+     *
+     * Must be called instead of project.delete(...) to allow mocking of project calls in testing.
+     * May fail in the case where the parent directory doesn't exist. This is because it uses
+     * Project.mkdir(...) instead of File.mkdirs(...). Note that if the parameter is an
+     * @OutputDirectory, then the directory is automatically created before the task runs.
+     *
+     * @param proj Calls proj.delete(...) method and then project.mkdir(...)
+     * @param paths Variable length list of paths to be deleted, can be String or File
+     */
+    // See projectExec for explanation of the code
+    @CompileStatic(TypeCheckingMode.SKIP)
+    static boolean projectClearDir(Project proj, File path) {
+        proj.delete(path)
+        proj.mkdir(path)
+    }
+
     /**
      * Executes command line and returns result by calling project.exec(...)
      *

src/test/groovy/com/github/j2objccontrib/j2objcgradle/tasks/MockProjectExec.groovy

@@ -128,7 +128,7 @@ class MockProjectExec {
     }
 
     void verify() {
-        mockForProj.verify(projectProxyInstance())
+        mockForProj.verify((GroovyObject) projectProxyInstance())
     }
 
     void demandCopyAndReturn(String intoParam, String... fromParam) {
@@ -209,6 +209,16 @@ class MockProjectExec {
         }
     }
 
+    void demandDeleteThenMkDirAndReturn(String expectedPath) {
+
+        mockForProj.demand.delete { Object path ->
+            assert expectedPath == getAbsolutePath(path)
+        }
+        mockForProj.demand.mkdir { Object path ->
+            assert expectedPath == getAbsolutePath(path)
+        }
+    }
+
     void demandExecAndReturn(List<String> expectedCommandLine) {
         demandExecAndReturn(null, expectedCommandLine, null, null, null)
     }