clang-format

Base/Utils/FileSystemUtils.cpp

@@ -15,12 +15,12 @@
 #include "Base/Utils/FileSystemUtils.h"
 #include "Base/Utils/Assert.h"
 #include <codecvt>
+#include <filesystem>
 #include <locale>
 #include <regex>
 #include <stdexcept>
-#include <filesystem>
 
-namespace fs = std::filesystem;   // make the code more readable
+namespace fs = std::filesystem; // make the code more readable
 
 std::string FileSystemUtils::extension(const std::string& path) {
     return fs::path(path).extension().string();
@@ -31,7 +31,7 @@ std::string FileSystemUtils::extensions(const std::string& path) {
     if (name == "..")
         return {};
 
-    const auto pos = name.find_first_of('.', 1);   // 1: ignore any file-is-hidden dot
+    const auto pos = name.find_first_of('.', 1); // 1: ignore any file-is-hidden dot
     return pos != std::string::npos ? name.substr(pos, name.size() - pos) : std::string();
 }
 
@@ -67,7 +67,7 @@ std::vector<std::string> FileSystemUtils::filesInDirectory(const std::string& di
 std::string FileSystemUtils::jointPath(const std::string& path1, const std::string& path2) {
     ASSERT(path1 != "");
     ASSERT(path2 != "");
-    
+
     return (fs::path(path1) / fs::path(path2)).string();
 }
 
@@ -92,7 +92,7 @@ std::string FileSystemUtils::stem_ext(const std::string& path) {
     if (name == "..")
         return name;
 
-    const auto pos = name.find_first_of('.', 1);    // 1: ignore any file-is-hidden dot
+    const auto pos = name.find_first_of('.', 1); // 1: ignore any file-is-hidden dot
     return pos != std::string::npos ? name.substr(0, pos) : name;
 }
 

Core/Export/INodeUtils.h

@@ -18,6 +18,7 @@
 #include "Param/Node/INode.h"
 
 namespace INodeUtils {
+
 template <typename T> std::vector<const T*> ChildNodesOfType(const INode& node) {
     std::vector<const T*> result;
     for (const auto& p_child : node.getChildren()) {
@@ -44,6 +45,7 @@ template <typename T> std::vector<const T*> AllDescendantsOfType(const INode& no
     }
     return result;
 }
+
 } // namespace INodeUtils
 
 #endif // BORNAGAIN_CORE_EXPORT_INODEUTILS_H

Tests/UnitTests/Core/Other/FileSystemUtilsTest.cpp

 #include "Base/Utils/FileSystemUtils.h"
+#include "BATesting.h"
 #include "Tests/GTestWrapper/google_test.h"
 #include <filesystem>
 #include <fstream>
-#include "BATesting.h"
 
 class FileSystemUtilsTest : public ::testing::Test {
-    protected:
-        void SetUp() override {
-            FileSystemUtils::createDirectories(BATesting::TestOutDir_Core());
-            ASSERT_TRUE(std::filesystem::exists(BATesting::TestOutDir_Core()));
-            ASSERT_TRUE(assureNonExistingTestCasePath());
-        }
-
-        void TearDown() override {
-            EXPECT_TRUE(assureNonExistingTestCasePath());
-            // by design no removing of BATesting::TestOutDir_Core() which may have been 
-            // created in SetUp
-        }
-
-        std::string testCaseFolderName() const {
-            const auto test_info = ::testing::UnitTest::GetInstance()->current_test_info();
-            return test_info->test_case_name() + std::string("_") + test_info->name();
-        }
-
-        std::string testCasePath() const {
-            return FileSystemUtils::jointPath(BATesting::TestOutDir_Core(), testCaseFolderName());
-        }
-
-        //! Assures the test case specific path is not existent. Removes it if necessary.
-        bool assureNonExistingTestCasePath() const {
-            // current dir must not be the dir to be removed
-            std::filesystem::current_path(BATesting::TestOutDir_Core());    
-            std::filesystem::remove_all(testCasePath());
-            return !std::filesystem::exists(testCasePath());
-        }
+protected:
+    void SetUp() override {
+        FileSystemUtils::createDirectories(BATesting::TestOutDir_Core());
+        ASSERT_TRUE(std::filesystem::exists(BATesting::TestOutDir_Core()));
+        ASSERT_TRUE(assureNonExistingTestCasePath());
+    }
+
+    void TearDown() override {
+        EXPECT_TRUE(assureNonExistingTestCasePath());
+        // by design no removing of BATesting::TestOutDir_Core() which may have been
+        // created in SetUp
+    }
+
+    std::string testCaseFolderName() const {
+        const auto test_info = ::testing::UnitTest::GetInstance()->current_test_info();
+        return test_info->test_case_name() + std::string("_") + test_info->name();
+    }
+
+    std::string testCasePath() const {
+        return FileSystemUtils::jointPath(BATesting::TestOutDir_Core(), testCaseFolderName());
+    }
+
+    //! Assures the test case specific path is not existent. Removes it if necessary.
+    bool assureNonExistingTestCasePath() const {
+        // current dir must not be the dir to be removed
+        std::filesystem::current_path(BATesting::TestOutDir_Core());
+        std::filesystem::remove_all(testCasePath());
+        return !std::filesystem::exists(testCasePath());
+    }
 };
 
 TEST_F(FileSystemUtilsTest, extension) {
@@ -64,10 +64,10 @@ TEST_F(FileSystemUtilsTest, extensions) {
 
 TEST_F(FileSystemUtilsTest, filename) {
     EXPECT_EQ(FileSystemUtils::filename(""), "");
-	EXPECT_EQ(FileSystemUtils::filename("/home/james/"), "");
-    EXPECT_EQ(FileSystemUtils::filename("/home/james/."), ".");     // sic! according to C++17
-    EXPECT_EQ(FileSystemUtils::filename("/home/james/.."), "..");   // sic! according to C++17
-	EXPECT_EQ(FileSystemUtils::filename("/home/james/.hidden"), ".hidden");
+    EXPECT_EQ(FileSystemUtils::filename("/home/james/"), "");
+    EXPECT_EQ(FileSystemUtils::filename("/home/james/."), ".");   // sic! according to C++17
+    EXPECT_EQ(FileSystemUtils::filename("/home/james/.."), ".."); // sic! according to C++17
+    EXPECT_EQ(FileSystemUtils::filename("/home/james/.hidden"), ".hidden");
     EXPECT_EQ(FileSystemUtils::filename("/home/james/file.txt"), "file.txt");
     EXPECT_EQ(FileSystemUtils::filename("/home/james/file"), "file");
 }
@@ -128,7 +128,7 @@ TEST_F(FileSystemUtilsTest, createDirectories) {
     EXPECT_FALSE(FileSystemUtils::createDirectories(sub4));
     EXPECT_TRUE(std::filesystem::exists("sub3"));
     EXPECT_TRUE(std::filesystem::exists("sub3/sub4"));
-    EXPECT_TRUE(std::filesystem::exists(FileSystemUtils::jointPath(sub2,sub4)));
+    EXPECT_TRUE(std::filesystem::exists(FileSystemUtils::jointPath(sub2, sub4)));
 }
 
 TEST_F(FileSystemUtilsTest, jointPath) {
@@ -156,8 +156,8 @@ TEST_F(FileSystemUtilsTest, filesInDirectory_IsFileExists) {
     std::ofstream("file2.txt");
     std::ofstream("file3.txt");
 
-    EXPECT_EQ(FileSystemUtils::filesInDirectory(testCasePath()).size(), 3);    // abs
-    EXPECT_EQ(FileSystemUtils::filesInDirectory(".").size(), 3);        // rel
+    EXPECT_EQ(FileSystemUtils::filesInDirectory(testCasePath()).size(), 3); // abs
+    EXPECT_EQ(FileSystemUtils::filesInDirectory(".").size(), 3);            // rel
     const auto files = FileSystemUtils::filesInDirectory(".");
     EXPECT_TRUE(std::find(files.begin(), files.end(), "file1.txt") != files.end());
     EXPECT_TRUE(std::find(files.begin(), files.end(), "file2.txt") != files.end());