Add unit tests for FileUtilsTest

Author: kinow

pom.xml

@@ -174,10 +174,11 @@
       <version>1.17.3</version>
       <scope>test</scope>
     </dependency>
+    <!-- We use mockito-inline as it supports mocking static methods -->
     <dependency>
       <groupId>org.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
-      <version>1.10.19</version>
+      <artifactId>mockito-inline</artifactId>
+      <version>4.7.0</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

src/main/java/org/commonwl/view/researchobject/ROBundleFactory.java

@@ -19,11 +19,11 @@
 
 package org.commonwl.view.researchobject;
 
-import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.taverna.robundle.Bundle;
 import org.apache.taverna.robundle.fs.BundleFileSystem;
 import org.commonwl.view.git.GitDetails;
+import org.commonwl.view.util.FileUtils;
 import org.commonwl.view.workflow.Workflow;
 import org.commonwl.view.workflow.WorkflowRepository;
 import org.slf4j.Logger;
@@ -81,25 +81,10 @@ public void createWorkflowRO(Workflow workflow)
 
         // Save the bundle to the storage location in properties
         Path bundleLocation = roBundleService.saveToFile(bundle);
-        // The RoBundleService#saveToFile call above will delegate to Taverna's
-        // Bundles.closeAndSaveBundle, which empties the bundle temporary
-        // directory without deleting the directory itself. The following call is
-        // just for cleaning it up.
-        if (bundle != null) {
-            try {
-                BundleFileSystem fs = (BundleFileSystem) bundle.getFileSystem();
-                File tmpDir = new File(System.getProperty("java.io.tmpdir"));
-                // The file system source will be something like /tmp/bundles_dir/hash/bundle.zip,
-                // and we want /tmp/hash to be deleted. N.B. Taverna uses the temporary directory
-                // for the temporary bundles' directory, not the bundles file specified by Spring.
-                String bundleTmpDirName = fs.getSource().toAbsolutePath().getParent().getFileName().toString();
-                File bundleTmpDir = new File(tmpDir, bundleTmpDirName);
-                if (bundleTmpDir.exists() && bundleTmpDir.isDirectory()) {
-                    FileUtils.forceDelete(bundleTmpDir);
-                }
-            } catch (IOException e) {
-                logger.warn(String.format("Failed to delete temporary directory for bundle [%s]: %s", bundle.getSource(), e.getMessage()), e);
-            }
+        try {
+            FileUtils.deleteBundleTemporaryDirectory(bundle);
+        } catch (IOException e) {
+            logger.warn(String.format("Failed to delete temporary directory for bundle [%s]: %s", bundle.getSource(), e.getMessage()), e);
         }
 
         // Add RO Bundle to associated workflow model