Merge branch 'f-77-unit-tests-unter-windows' into 'dev'

Resolve "Unit tests unter Windows"

See merge request !56

include/linkahead/configuration.h

@@ -103,10 +103,8 @@ public:
  */
 class ConfigurationManager {
 public:
-  static ConfigurationManager &GetInstance() {
-    static ConfigurationManager instance;
-    return instance;
-  };
+  static ConfigurationManager &GetInstance();
+  ;
 
   /**
    * See mReset.
@@ -156,6 +154,7 @@ public:
 private:
   Arena arena;
   JsonValue json_configuration;
+  static ConfigurationManager mInstance;
 
   inline ConfigurationManager()
     : json_configuration(nullptr){

include/linkahead/connection.h

@@ -170,6 +170,9 @@ class ConnectionManager {
 private:
   mutable std::map<std::string, std::shared_ptr<Connection>> connections;
   mutable std::string default_connection_name;
+
+  static ConnectionManager mInstance;
+
   inline ConnectionManager(){};
 
   auto mHasConnection(const std::string &name) const -> bool;
@@ -184,10 +187,7 @@ private:
   }
 
 public:
-  static ConnectionManager &GetInstance() {
-    static ConnectionManager instance;
-    return instance;
-  };
+  static ConnectionManager &GetInstance();
 
   inline static auto HasConnection(const std::string &name) -> bool {
     return ConnectionManager::GetInstance().mHasConnection(name);

src/linkahead/configuration.cpp

@@ -70,6 +70,9 @@
   }
 
 namespace linkahead::configuration {
+
+ConfigurationManager ConfigurationManager::mInstance;
+
 using boost::json::object;
 using boost::json::value;
 using grpc::InsecureChannelCredentials;
@@ -424,6 +427,8 @@ auto ConfigurationManager::mGetDefaultConnectionName() const -> std::string {
   throw ConfigurationError("Could not determine the default connection.");
 }
 
+ConfigurationManager &ConfigurationManager::GetInstance() { return mInstance; }
+
 // TODO(tf) This has apparently a cognitive complexity of 34>25 (threshold).
 auto ConfigurationManager::InitializeDefaults() -> int { // NOLINT
 

src/linkahead/connection.cpp

@@ -66,6 +66,13 @@ using linkahead::info::VersionInfo;
 using linkahead::transaction::Transaction;
 using linkahead::transaction::TransactionStatus;
 
+
+ConnectionManager ConnectionManager::mInstance;
+
+ConnectionManager &ConnectionManager::GetInstance() {
+  return mInstance;
+}
+
 Connection::Connection(const ConnectionConfiguration &configuration) {
   const std::string target =
     configuration.GetHost() + ":" + std::to_string(configuration.GetPort());

test/test_clinkahead.cpp

@@ -44,8 +44,9 @@ protected:
 };
 
 TEST_F(test_clinkahead, test_get_env_fallback) {
-  const char *const some_var = linkahead_utility_get_env_fallback("SOME_ENV_VAR", "fall-back");
-  EXPECT_EQ("fall-back", some_var);
+  constexpr auto fall_back = "fall-back";
+  const char *const some_var = linkahead_utility_get_env_fallback("SOME_ENV_VAR", fall_back);
+  EXPECT_EQ(fall_back, some_var);
 }
 
 TEST_F(test_clinkahead, test_other_client_error) {

test/test_file_transmission.cpp

@@ -43,18 +43,22 @@ protected:
 TEST_F(test_file_transmission, test_file_writer_reader) {
   ASSERT_FALSE(fs::exists(test_file_name));
 
-  FileWriter writer(test_file_name);
-  std::string buffer_out(1024, 'c');
-  for (int i = 0; i < 8; i++) {
-    writer.write(buffer_out);
-    EXPECT_EQ(fs::file_size(test_file_name), 1024 * (i + 1));
+  {
+    FileWriter writer(test_file_name);
+    std::string buffer_out(1024, 'c');
+    for (int i = 0; i < 8; i++) {
+      writer.write(buffer_out);      
+    }
   }
-
-  FileReader reader(test_file_name);
-  std::string buffer_in(1024, '\0');
-  for (int i = 0; i < 8; i++) {
-    reader.read(buffer_in);
-    EXPECT_EQ(buffer_in, std::string(1024, 'c'));
+  EXPECT_EQ(fs::file_size(test_file_name), 1024 * 8);
+  
+  {
+    FileReader reader(test_file_name);
+    std::string buffer_in(1024, '\0');
+    for (int i = 0; i < 8; i++) {
+      reader.read(buffer_in);
+      EXPECT_EQ(buffer_in, std::string(1024, 'c'));
+    }
   }
 }