From d373bc6ed0c3b97526fc350b01d2d407409d0fce Mon Sep 17 00:00:00 2001
From: Egor Tensin <Egor.Tensin@gmail.com>
Date: Mon, 14 Sep 2020 02:17:43 +0300
Subject: clang-format: regroup #includes

---
 test/unit_tests/dbghelp.cpp  |  7 ++---
 test/unit_tests/dbghelp.hpp  | 74 --------------------------------------------
 test/unit_tests/fixtures.hpp | 74 ++++++++++++++++++++++++++++++++++++++++++++
 test/unit_tests/paths.hpp    | 37 ++++++++++++++++++++++
 test/unit_tests/utils.hpp    | 37 ----------------------
 5 files changed, 114 insertions(+), 115 deletions(-)
 delete mode 100644 test/unit_tests/dbghelp.hpp
 create mode 100644 test/unit_tests/fixtures.hpp
 create mode 100644 test/unit_tests/paths.hpp
 delete mode 100644 test/unit_tests/utils.hpp

(limited to 'test/unit_tests')

diff --git a/test/unit_tests/dbghelp.cpp b/test/unit_tests/dbghelp.cpp
index ddf5a71..aab292f 100644
--- a/test/unit_tests/dbghelp.cpp
+++ b/test/unit_tests/dbghelp.cpp
@@ -1,9 +1,8 @@
-#include "dbghelp.hpp"
-#include "utils.hpp"
-
-#include <test_lib.hpp>
+#include "fixtures.hpp"
+#include "paths.hpp"
 
 #include <pdb/all.hpp>
+#include <test_lib.hpp>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/test/unit_tests/dbghelp.hpp b/test/unit_tests/dbghelp.hpp
deleted file mode 100644
index daede68..0000000
--- a/test/unit_tests/dbghelp.hpp
+++ /dev/null
@@ -1,74 +0,0 @@
-#pragma once
-
-#include "utils.hpp"
-
-#include <pdb/all.hpp>
-
-#include <boost/filesystem.hpp>
-#include <boost/test/unit_test.hpp>
-
-#include <iterator>
-#include <string>
-#include <unordered_set>
-#include <utility>
-
-class DbgHelp {
-public:
-    DbgHelp() : dbghelp{pdb::DbgHelp::post_mortem()} { BOOST_TEST_MESSAGE("Initializing DbgHelp"); }
-
-    ~DbgHelp() { BOOST_TEST_MESSAGE("Cleaning up DbgHelp"); }
-
-    const pdb::DbgHelp dbghelp;
-
-private:
-    DbgHelp(const DbgHelp&) = delete;
-    DbgHelp& operator=(const DbgHelp&) = delete;
-};
-
-template <typename T>
-using Set = std::unordered_set<T>;
-
-template <typename T>
-Set<T> join(Set<T>&& xs, Set<T>&& ys) {
-    xs.insert(std::make_move_iterator(ys.begin()), std::make_move_iterator(ys.end()));
-    return std::move(xs);
-}
-
-class DbgHelpWithSymbols : public DbgHelp {
-public:
-    DbgHelpWithSymbols() { load_test_lib_pdb(); }
-
-    static const std::string& get_namespace() {
-        static const std::string name{"test"};
-        return name;
-    }
-
-    typedef Set<std::string> SymbolList;
-
-    static SymbolList expected_functions() { return make_qualified({"foo", "bar", "baz"}); }
-
-    static SymbolList expected_variables() { return make_qualified({"var"}); }
-
-    static SymbolList expected_symbols() {
-        return join(expected_functions(), expected_variables());
-    }
-
-private:
-    static SymbolList make_qualified(SymbolList&& plain) {
-        SymbolList qualified;
-        for (auto&& name : plain) {
-            qualified.emplace(get_namespace() + "::" + std::move(name));
-        }
-        return qualified;
-    }
-
-    void load_test_lib_pdb() {
-        const auto pdb_path = get_test_lib_pdb_path().string();
-        BOOST_TEST_MESSAGE("Loading PDB: " << pdb_path);
-        dbghelp.load_pdb(pdb_path);
-    }
-
-    static boost::filesystem::path get_test_lib_pdb_path() {
-        return Paths::get().exe_dir / "test_lib.pdb";
-    }
-};
diff --git a/test/unit_tests/fixtures.hpp b/test/unit_tests/fixtures.hpp
new file mode 100644
index 0000000..f6571d1
--- /dev/null
+++ b/test/unit_tests/fixtures.hpp
@@ -0,0 +1,74 @@
+#pragma once
+
+#include "paths.hpp"
+
+#include <pdb/all.hpp>
+
+#include <boost/filesystem.hpp>
+#include <boost/test/unit_test.hpp>
+
+#include <iterator>
+#include <string>
+#include <unordered_set>
+#include <utility>
+
+class DbgHelp {
+public:
+    DbgHelp() : dbghelp{pdb::DbgHelp::post_mortem()} { BOOST_TEST_MESSAGE("Initializing DbgHelp"); }
+
+    ~DbgHelp() { BOOST_TEST_MESSAGE("Cleaning up DbgHelp"); }
+
+    const pdb::DbgHelp dbghelp;
+
+private:
+    DbgHelp(const DbgHelp&) = delete;
+    DbgHelp& operator=(const DbgHelp&) = delete;
+};
+
+template <typename T>
+using Set = std::unordered_set<T>;
+
+template <typename T>
+Set<T> join(Set<T>&& xs, Set<T>&& ys) {
+    xs.insert(std::make_move_iterator(ys.begin()), std::make_move_iterator(ys.end()));
+    return std::move(xs);
+}
+
+class DbgHelpWithSymbols : public DbgHelp {
+public:
+    DbgHelpWithSymbols() { load_test_lib_pdb(); }
+
+    static const std::string& get_namespace() {
+        static const std::string name{"test"};
+        return name;
+    }
+
+    typedef Set<std::string> SymbolList;
+
+    static SymbolList expected_functions() { return make_qualified({"foo", "bar", "baz"}); }
+
+    static SymbolList expected_variables() { return make_qualified({"var"}); }
+
+    static SymbolList expected_symbols() {
+        return join(expected_functions(), expected_variables());
+    }
+
+private:
+    static SymbolList make_qualified(SymbolList&& plain) {
+        SymbolList qualified;
+        for (auto&& name : plain) {
+            qualified.emplace(get_namespace() + "::" + std::move(name));
+        }
+        return qualified;
+    }
+
+    void load_test_lib_pdb() {
+        const auto pdb_path = get_test_lib_pdb_path().string();
+        BOOST_TEST_MESSAGE("Loading PDB: " << pdb_path);
+        dbghelp.load_pdb(pdb_path);
+    }
+
+    static boost::filesystem::path get_test_lib_pdb_path() {
+        return Paths::get().exe_dir / "test_lib.pdb";
+    }
+};
diff --git a/test/unit_tests/paths.hpp b/test/unit_tests/paths.hpp
new file mode 100644
index 0000000..561ca4d
--- /dev/null
+++ b/test/unit_tests/paths.hpp
@@ -0,0 +1,37 @@
+#pragma once
+
+#include <boost/filesystem.hpp>
+#include <boost/nowide/filesystem.hpp>
+#include <boost/test/unit_test.hpp>
+
+using path = boost::filesystem::path;
+
+class FixFilesystem {
+public:
+    FixFilesystem() { boost::nowide::nowide_filesystem(); }
+};
+
+class Paths {
+public:
+    typedef boost::filesystem::path path;
+
+    static Paths& get() {
+        static FixFilesystem fix_filesystem;
+        static Paths instance;
+        return instance;
+    }
+
+    Paths() : exe_path{get_executable_path()}, exe_dir{exe_path.parent_path()} {}
+
+    const path exe_path;
+    const path exe_dir;
+
+private:
+    static path get_executable_path() {
+        const auto argv0 = boost::unit_test::framework::master_test_suite().argv[0];
+        return boost::filesystem::system_complete(argv0);
+    }
+
+    Paths(const Paths&) = delete;
+    Paths& operator=(const Paths&) = delete;
+};
diff --git a/test/unit_tests/utils.hpp b/test/unit_tests/utils.hpp
deleted file mode 100644
index 561ca4d..0000000
--- a/test/unit_tests/utils.hpp
+++ /dev/null
@@ -1,37 +0,0 @@
-#pragma once
-
-#include <boost/filesystem.hpp>
-#include <boost/nowide/filesystem.hpp>
-#include <boost/test/unit_test.hpp>
-
-using path = boost::filesystem::path;
-
-class FixFilesystem {
-public:
-    FixFilesystem() { boost::nowide::nowide_filesystem(); }
-};
-
-class Paths {
-public:
-    typedef boost::filesystem::path path;
-
-    static Paths& get() {
-        static FixFilesystem fix_filesystem;
-        static Paths instance;
-        return instance;
-    }
-
-    Paths() : exe_path{get_executable_path()}, exe_dir{exe_path.parent_path()} {}
-
-    const path exe_path;
-    const path exe_dir;
-
-private:
-    static path get_executable_path() {
-        const auto argv0 = boost::unit_test::framework::master_test_suite().argv[0];
-        return boost::filesystem::system_complete(argv0);
-    }
-
-    Paths(const Paths&) = delete;
-    Paths& operator=(const Paths&) = delete;
-};
-- 
cgit v1.2.3