TST: refactoring of file storage consistency tests

src/main/java/caosdb/server/jobs/core/CheckFileStorageConsistency.java

@@ -31,6 +31,7 @@ import caosdb.server.jobs.JobAnnotation;
 import caosdb.server.transaction.Retrieve;
 import caosdb.server.transaction.Transaction;
 import caosdb.server.utils.FileStorageConsistencyCheck;
+import caosdb.server.utils.FileUtils;
 import caosdb.server.utils.Observable;
 import caosdb.server.utils.Observer;
 import caosdb.server.utils.Undoable;
@@ -149,7 +150,7 @@ public class CheckFileStorageConsistency extends FlagJob {
                     + "test_file_storage_consistecy"
                     + Integer.toString(hashCode()));
 
-        f1.renameTo(tmp1);
+        Undoable undo1 = FileUtils.rename(f1, tmp1);
 
         getTransaction()
             .acceptObserver(
@@ -157,7 +158,7 @@ public class CheckFileStorageConsistency extends FlagJob {
                   @Override
                   public boolean notifyObserver(final String e, final Observable sender) {
                     if (e.equals(Transaction.CLEAN_UP)) {
-                      tmp1.renameTo(f1);
+                      undo1.undo();
                       return false;
                     }
                     return true;
@@ -204,7 +205,7 @@ public class CheckFileStorageConsistency extends FlagJob {
                     + "test_file_storage_consistecy"
                     + Integer.toString(hashCode()));
 
-        final Undoable undo = caosdb.server.utils.FileUtils.rename(f2, tmp2);
+        final Undoable undo2 = caosdb.server.utils.FileUtils.rename(f2, tmp2);
 
         final File overridden = new File(oldPath2);
         overridden.createNewFile();
@@ -220,7 +221,7 @@ public class CheckFileStorageConsistency extends FlagJob {
                   @Override
                   public boolean notifyObserver(final String e, final Observable sender) {
                     if (e.equals(Transaction.CLEAN_UP)) {
-                      undo.undo();
+                      undo2.undo();
                       return false;
                     }
                     return true;