TST: refactor file storage consistency tests

makefile

@@ -24,20 +24,17 @@
 SHELL:=/bin/bash
 
 runserver:
-	mvn exec:java
+	mvn exec:java@run
 
 run: compile
-	mvn exec:java
+	mvn exec:java@run
 
 run-debug: compile
-	mvn exec:java -Dexec.args="silent debug"
+	mvn exec:java@run-debug
 
 compile: easy-units
 	mvn compile
 
-run-nobackend: compile
-	mvn exec:java -Dexec.args="silent debug nobackend insecure"
-
 start-portforwarding:
 	sudo iptables -t nat -N CAOSDB
 	sudo iptables -t nat -A PREROUTING -p tcp --dport 80 -g CAOSDB

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

@@ -33,6 +33,7 @@ import caosdb.server.transaction.Transaction;
 import caosdb.server.utils.FileStorageConsistencyCheck;
 import caosdb.server.utils.Observable;
 import caosdb.server.utils.Observer;
+import caosdb.server.utils.Undoable;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -195,6 +196,7 @@ public class CheckFileStorageConsistency extends FlagJob {
         if (f2 == null) {
           return;
         }
+
         final String oldPath2 = f2.getAbsolutePath();
         final File tmp2 =
             new File(
@@ -202,7 +204,7 @@ public class CheckFileStorageConsistency extends FlagJob {
                     + "test_file_storage_consistecy"
                     + Integer.toString(hashCode()));
 
-        f2.renameTo(tmp2);
+        final Undoable undo = caosdb.server.utils.FileUtils.rename(f2, tmp2);
 
         final File overridden = new File(oldPath2);
         overridden.createNewFile();
@@ -218,7 +220,7 @@ public class CheckFileStorageConsistency extends FlagJob {
                   @Override
                   public boolean notifyObserver(final String e, final Observable sender) {
                     if (e.equals(Transaction.CLEAN_UP)) {
-                      tmp2.renameTo(overridden);
+                      undo.undo();
                       return false;
                     }
                     return true;