Merge branch 'dev' into f-int64

test/caosdb_test_utility.h

@@ -32,15 +32,13 @@
  * @date 2021-07-07
  */
 #define EXPECT_THROW_MESSAGE(statement, exeption_type, message)                \
-  EXPECT_THROW(                                                                \
-    try { statement; } catch (const exeption_type &e) {                        \
+  EXPECT_THROW(try { statement; } catch (const exeption_type &e) {             \
     EXPECT_EQ(std::string(e.what()), message);                                 \
     throw;                                                                     \
   },                                                                           \
                exeption_type)
 #define ASSERT_THROW_MESSAGE(statement, exeption_type, message)                \
-  ASSERT_THROW(                                                                \
-    try { statement; } catch (const exeption_type &e) {                        \
+  ASSERT_THROW(try { statement; } catch (const exeption_type &e) {             \
     ASSERT_EQ(std::string(e.what()), message);                                 \
     throw;                                                                     \
   },                                                                           \

test/test_ccaosdb.cpp

@@ -124,8 +124,8 @@ TEST_F(test_ccaosdb, test_count_query) {
   EXPECT_EQ(return_code, 0);
 
   caosdb_transaction_transaction transaction;
-  return_code =
-    caosdb_connection_connection_create_transaction(&connection, &transaction);
+  return_code = caosdb_connection_connection_create_transaction(&connection,
+                                                                &transaction);
   EXPECT_EQ(return_code, 0);
 
   // COUNT query with an empty result
@@ -154,8 +154,8 @@ TEST_F(test_ccaosdb, test_query) {
   EXPECT_EQ(return_code, 0);
 
   caosdb_transaction_transaction transaction;
-  return_code =
-    caosdb_connection_connection_create_transaction(&connection, &transaction);
+  return_code = caosdb_connection_connection_create_transaction(&connection,
+                                                                &transaction);
   EXPECT_EQ(return_code, 0);
 
   return_code = caosdb_transaction_transaction_query(&transaction,
@@ -187,8 +187,8 @@ TEST_F(test_ccaosdb, test_single_id_retrieve) {
   EXPECT_EQ(return_code, 0);
 
   caosdb_transaction_transaction transaction;
-  return_code =
-    caosdb_connection_connection_create_transaction(&connection, &transaction);
+  return_code = caosdb_connection_connection_create_transaction(&connection,
+                                                                &transaction);
   EXPECT_EQ(return_code, 0);
 
   return_code =
@@ -233,8 +233,8 @@ TEST_F(test_ccaosdb, test_multi_id_retrieve) {
   EXPECT_EQ(return_code, 0);
 
   caosdb_transaction_transaction transaction;
-  return_code =
-    caosdb_connection_connection_create_transaction(&connection, &transaction);
+  return_code = caosdb_connection_connection_create_transaction(&connection,
+                                                                &transaction);
   EXPECT_EQ(return_code, 0);
 
   const char *ids[] = {"20", "21", "22"}; // NOLINT

test/test_connection.cpp

@@ -74,8 +74,8 @@ TEST(test_connection, connection_insecure_authentication_error_anonymous) {
 }
 
 TEST(test_connection, connection_ssl_authentication_error_anonymous) {
-  const auto *port_str =
-    caosdb::utility::get_env_fallback("CAOSDB_SERVER_GRPC_PORT_HTTPS", "8443");
+  const auto *port_str = caosdb::utility::get_env_fallback(
+      "CAOSDB_SERVER_GRPC_PORT_HTTPS", "8443");
   auto port = std::stoi(port_str);
   const auto *const host =
       caosdb::utility::get_env_fallback("CAOSDB_SERVER_HOST", "localhost");
@@ -93,8 +93,8 @@ TEST(test_connection, connection_ssl_authentication_error_anonymous) {
 }
 
 TEST(test_connection, connection_ssl_authentication_error_wrong_credentials) {
-  const auto *port_str =
-    caosdb::utility::get_env_fallback("CAOSDB_SERVER_GRPC_PORT_HTTPS", "8443");
+  const auto *port_str = caosdb::utility::get_env_fallback(
+      "CAOSDB_SERVER_GRPC_PORT_HTTPS", "8443");
   auto port = std::stoi(port_str);
   const auto *const host =
       caosdb::utility::get_env_fallback("CAOSDB_SERVER_HOST", "localhost");

test/test_issues.cpp

@@ -168,4 +168,32 @@ TEST_F(test_issues, server_issue_171) {
   std::cout << inserted_rec.ToString() << std::endl;
 }
 
+/*
+ * Inserting a non-file property with an empty file path should work.
+ *
+ * The file attributes should be ignored by the server.
+ */
+TEST_F(test_issues, server_issue_174) {
+  const auto &connection =
+      caosdb::connection::ConnectionManager::GetDefaultConnection();
+
+  auto insert_transaction(connection->CreateTransaction());
+
+  // Create and insert RT
+  Entity rt;
+  rt.SetRole(Role::RECORD_TYPE);
+  rt.SetName("Not a FILE");
+  rt.SetFilePath("");
+  insert_transaction->InsertEntity(&rt);
+  insert_transaction->ExecuteAsynchronously();
+
+  auto insert_status = insert_transaction->WaitForIt();
+  ASSERT_TRUE(insert_status.IsTerminated());
+  // TODO(tf) Remove the EXPECT_NONFATAL_FAILURE after fixing #174.
+  EXPECT_NONFATAL_FAILURE(
+      EXPECT_FALSE(insert_status.IsError())
+      , "");
+
+}
+
 } // namespace caosdb::transaction

test/test_transaction.cpp

@@ -103,7 +103,8 @@ public:
 protected:
   fs::path test_upload_file_1;
   fs::path test_download_file_1;
-  size_t test_file_size_kib = 20;  // We should test at least something over 16kiB
+  size_t test_file_size_kib =
+      20; // We should test at least something over 16kiB
 
   // Fixture methods //////////////////////////////////////////////////////////