TestFixture: added SettingsBuilder to allow inline initialization of objects

Author: firewave

test/fixture.cpp

@@ -365,3 +365,8 @@ void TestFixture::reportErr(const ErrorMessage &msg)
     if (errout.str().find(errormessage) == std::string::npos)
         errout << errormessage << std::endl;
 }
+
+TestFixture::SettingsBuilder& TestFixture::SettingsBuilder::library(const char lib[]) {
+    LOAD_LIB_2_EXE(settings.library, lib, fixture.exename.c_str());
+    return *this;
+}

test/fixture.h

@@ -24,6 +24,7 @@
 #include "color.h"
 #include "config.h"
 #include "errorlogger.h"
+#include "settings.h"
 
 #include <cstddef>
 #include <set>
@@ -45,6 +46,7 @@ class TestFixture : public ErrorLogger {
     std::string mTestname;
 
 protected:
+    friend class SettingsBuilder;
     std::string exename;
     std::string testToRun;
     bool quiet_tests;
@@ -120,6 +122,31 @@ class TestFixture : public ErrorLogger {
         T& check = getCheck<T>();
         check.runChecks(tokenizer, settings, errorLogger);
     }
+
+    class SettingsBuilder
+    {
+    public:
+        SettingsBuilder(const TestFixture &fixture) : fixture(fixture) {}
+
+        SettingsBuilder& severity(Severity::SeverityType sev) {
+            settings.severity.enable(sev);
+            return *this;
+        }
+
+        SettingsBuilder& library(const char lib[]);
+
+        Settings build() {
+            return std::move(settings);
+        }
+    private:
+        Settings settings;
+        const TestFixture &fixture;
+    };
+
+    SettingsBuilder settingsBuilder() const {
+        return SettingsBuilder(*this);
+    }
+
 public:
     void reportOut(const std::string &outmsg, Color c = Color::Reset) override;
     void reportErr(const ErrorMessage &msg) override;
@@ -157,7 +184,8 @@ extern std::ostringstream output;
 #define EXPECT_EQ( EXPECTED, ACTUAL ) assertEquals(__FILE__, __LINE__, EXPECTED, ACTUAL)
 #define REGISTER_TEST( CLASSNAME ) namespace { CLASSNAME instance_ ## CLASSNAME; }
 
-#define LOAD_LIB_2( LIB, NAME ) do { if (((LIB).load(exename.c_str(), NAME).errorcode != Library::ErrorCode::OK)) throw std::runtime_error("library '" + std::string(NAME) + "' not found"); } while (false)
+#define LOAD_LIB_2_EXE( LIB, NAME, EXE ) do { if (((LIB).load((EXE), NAME).errorcode != Library::ErrorCode::OK)) throw std::runtime_error("library '" + std::string(NAME) + "' not found"); } while (false)
+#define LOAD_LIB_2( LIB, NAME ) LOAD_LIB_2_EXE(LIB, NAME, exename.c_str())
 
 #define PLATFORM( S, P ) do { std::string errstr; assertEquals(__FILE__, __LINE__, true, S.platform(cppcheck::Platform::platformString(P), errstr, {exename}), errstr); } while (false)