1 files changed, 63 insertions, 19 deletions

diff --git a/test/unit_tests/fixtures.hpp b/test/unit_tests/fixtures.hpp
index eb7dcc0..fadd393 100644
--- a/test/unit_tests/fixtures.hpp
+++ b/test/unit_tests/fixtures.hpp
@@ -3,6 +3,7 @@
 #include "paths.hpp"
 
 #include <pdb/all.hpp>
+#include <test_lib.hpp>
 
 #include <boost/filesystem.hpp>
 #include <boost/test/unit_test.hpp>
@@ -12,19 +13,6 @@
 #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>;
 
@@ -34,9 +22,18 @@ Set<T> join(Set<T>&& xs, Set<T>&& ys) {
     return std::move(xs);
 }
 
-class DbgHelpWithSymbols : public DbgHelp {
+class DbgHelp {
 public:
-    DbgHelpWithSymbols() { load_test_lib_pdb(); }
+    DbgHelp(pdb::DbgHelp&& dbghelp) : dbghelp{std::move(dbghelp)} {}
+
+    ~DbgHelp() { BOOST_TEST_MESSAGE("Cleaning up DbgHelp"); }
+
+    const pdb::DbgHelp dbghelp;
+
+    static const std::string& get_module_name() {
+        static const std::string name{"test_lib"};
+        return name;
+    }
 
     static const std::string& get_namespace() {
         static const std::string name{"test_ns"};
@@ -44,16 +41,41 @@ public:
     }
 
     typedef Set<std::string> SymbolList;
+    typedef Set<pdb::Address> AddressList;
+
+    static AddressList expected_function_addresses() {
+        return cast({&test_ns::foo, &test_ns::bar, &test_ns::baz});
+    }
 
     static SymbolList expected_functions() { return make_qualified({"foo", "bar", "baz"}); }
 
+    static SymbolList expected_functions_full() { return add_module(expected_functions()); }
+
     static SymbolList expected_variables() { return make_qualified({"var"}); }
 
     static SymbolList expected_symbols() {
         return join(expected_functions(), expected_variables());
     }
 
+protected:
+    static pdb::DbgHelp init_dbghelp(bool current_process) {
+        BOOST_TEST_MESSAGE("Initializing DbgHelp");
+        if (current_process) {
+            return pdb::DbgHelp::current_process();
+        } else {
+            return pdb::DbgHelp::post_mortem();
+        }
+    }
+
 private:
+    static AddressList cast(Set<void*>&& fs) {
+        AddressList addresses;
+        for (auto&& f : fs) {
+            addresses.emplace(reinterpret_cast<pdb::Address>(f));
+        }
+        return addresses;
+    }
+
     static SymbolList make_qualified(SymbolList&& plain) {
         SymbolList qualified;
         for (auto&& name : plain) {
@@ -62,13 +84,35 @@ private:
         return qualified;
     }
 
-    void load_test_lib_pdb() {
-        const auto pdb_path = get_test_lib_pdb_path().string();
+    static SymbolList add_module(SymbolList&& plain) {
+        SymbolList full;
+        for (auto&& name : plain) {
+            full.emplace(get_module_name() + "!" + std::move(name));
+        }
+        return full;
+    }
+
+    DbgHelp(const DbgHelp&) = delete;
+    DbgHelp& operator=(const DbgHelp&) = delete;
+};
+
+class PostMortem : public DbgHelp {
+public:
+    PostMortem() : DbgHelp{init_dbghelp(false)} { load_module_pdb(); }
+
+private:
+    void load_module_pdb() {
+        const auto pdb_path = get_module_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";
+    static boost::filesystem::path get_module_pdb_path() {
+        return Paths::get().exe_dir / (get_module_name() + ".pdb");
     }
 };
+
+class CurrentProcess : public DbgHelp {
+public:
+    CurrentProcess() : DbgHelp{init_dbghelp(true)} {}
+};