Merge branch 'f-files' into f-consolidation

test/test_transaction.cpp

@@ -21,7 +21,7 @@
 #include "caosdb/connection.h" // for Connection, ConnectionManager
 #include "caosdb/data_type.h"  // for AtomicDataType
 #include "caosdb/entity.h"     // for Entity, Messages, Message
-#include "caosdb/file_transmission/FileWriter.h" // for FileWriter
+#include "caosdb/file_transmission/file_writer.h" // for FileWriter
 #include "caosdb/message_code.h"       // for ENTITY_DOES_NOT_EXIST, Messag...
 #include "caosdb/status_code.h"        // for SUCCESS, StatusCode
 #include "caosdb/transaction.h"        // for Entity, Transaction,...
@@ -686,7 +686,7 @@ TEST_F(test_transaction, test_file_download) {
   download_transaction->RetrieveAndDownloadFilesById(
     inserted_file.GetId(), test_download_file_1.string());
   download_transaction->ExecuteAsynchronously();
-  download_transaction->WaitForIt();
+  ASSERT_EQ(download_transaction->WaitForIt().GetCode(), StatusCode::SUCCESS);
 
   const auto &download_results = download_transaction->GetResultSet();
   ASSERT_EQ(download_results.size(), 1);