refactor test actions

Author: vinniefalco

include/mrdox/Corpus.hpp

@@ -16,6 +16,7 @@
 #include <mrdox/Config.hpp>
 #include <mrdox/Errors.hpp>
 #include <clang/Tooling/Execution.h>
+#include <llvm/Support/Mutex.h>
 
 namespace clang {
 namespace mrdox {
@@ -24,10 +25,6 @@ namespace mrdox {
 */
 struct Corpus
 {
-    Corpus() = default;
-    Corpus(Corpus&&) noexcept = default;
-    Corpus& operator=(Corpus const&) = delete;
-
     /** Index of all emitted symbols.
     */
     Index Idx;
@@ -107,6 +104,13 @@ struct Corpus
         tooling::ToolExecutor& ex,
         Config const& cfg,
         Reporter& R);
+
+private:
+    Corpus() = default;
+
+    llvm::sys::Mutex infoMutex;
+    llvm::sys::Mutex allResultsMutex;
+    llvm::sys::Mutex indexMutexMutex;
 };
 
 } // mrdox

include/mrdox/XML.hpp

@@ -13,6 +13,7 @@
 #define MRDOX_XML_HPP
 
 #include <mrdox/Config.hpp>
+#include <mrdox/Corpus.hpp>
 #include <llvm/ADT/StringRef.h>
 #include <llvm/Support/Error.h>
 #include <string>

source/lib/Corpus.cpp

@@ -132,7 +132,8 @@ build(
     Config const& cfg,
     Reporter& R)
 {
-    Corpus corpus;
+    auto up = std::unique_ptr<Corpus>(new Corpus);
+    Corpus& corpus = *up;
 
     // Traverse the AST for all translation
     // units and emit serializd bitcode into
@@ -153,8 +154,8 @@ build(
         }
 
         llvm::errs() <<
-            "Error mapping decls in files. mrdox will ignore "
-            "these files and continue:\n" <<
+            "Error mapping decls in files. "
+            "MrDox will ignore these files and continue:\n" <<
             toString(std::move(err)) << "\n";
     }
 
@@ -265,7 +266,7 @@ build(
             });
     }
 
-    return std::make_unique<Corpus>(std::move(corpus));
+    return std::move(up);
 }
 
 } // mrdox

source/tests/TestAction.cpp

@@ -8,10 +8,11 @@
 // Official repository: https://github.com/cppalliance/mrdox
 //
 
-#include "TestAction.hpp"
+#include <mrdox/XML.hpp>
 #include <mrdox/Errors.hpp>
 #include <clang/Tooling/AllTUsExecution.h>
 #include <clang/Tooling/CompilationDatabase.h>
+#include <clang/Tooling/StandaloneExecution.h>
 #include <llvm/ADT/SmallString.h>
 #include <llvm/ADT/Twine.h>
 #include <llvm/Support/Signals.h>
@@ -122,6 +123,48 @@ visitDirectory(
     return true;
 }
 
+void
+testResult(
+    Corpus const& corpus,
+    Config const& cfg,
+    llvm::StringRef file,
+    llvm::StringRef out,
+    Reporter& R)
+{
+    std::string xml;
+    renderToXMLString(xml, corpus, cfg);
+    std::error_code ec;
+    fs::file_status stat;
+    ec = fs::status(out, stat, false);
+    if(ec == std::errc::no_such_file_or_directory)
+    {
+        // create the xml file and write to it
+    }
+    else if(! R.failed("fs::status", ec))
+    {
+        if(stat.type() == fs::file_type::regular_file)
+        {
+            auto bufferResult = llvm::MemoryBuffer::getFile(out, true);
+            if(R.failed("MemoryBuffer::getFile", bufferResult))
+                return;
+            if(xml != bufferResult->get()->getBuffer())
+            {
+                llvm::errs() <<
+                    "File: \"" << file << "\" failed.\n"
+                    "Expected:\n" <<
+                    bufferResult->get()->getBuffer() << "\n" <<
+                    "Got:\n" <<
+                    xml << "\n";
+                R.testFailed();
+            }
+        }
+        else
+        {
+            // VFALCO report that it is not a regular file
+        }
+    }
+}
+
 //------------------------------------------------
 
 int
@@ -147,12 +190,9 @@ testMain(int argc, const char** argv)
                 SingleFile db(dir, file, out);
                 tooling::StandaloneToolExecutor ex(
                     db, { std::string(file) });
-                Corpus corpus;
-                llvm::Error err = ex.execute(
-                    std::make_unique<TestFactory>(ex, cfg, R));
-                if(! err)
-                {
-                }
+                auto corpus = Corpus::build(ex, cfg, R);
+                if(corpus)
+                    testResult(*corpus, cfg, file, out, R);
             });
         });
     }