first round of SettingsBuilder usage in tests

Author: firewave

test/test64bit.cpp

@@ -30,11 +30,9 @@ class Test64BitPortability : public TestFixture {
     Test64BitPortability() : TestFixture("Test64BitPortability") {}
 
 private:
-    Settings settings;
+    const Settings settings = settingsBuilder().severity(Severity::portability).library("std.cfg").build();
 
     void run() override {
-        settings.severity.enable(Severity::portability);
-
         TEST_CASE(novardecl);
         TEST_CASE(functionpar);
         TEST_CASE(structmember);
@@ -51,7 +49,6 @@ class Test64BitPortability : public TestFixture {
 
         // Tokenize..
         Tokenizer tokenizer(&settings, this);
-        LOAD_LIB_2(settings.library, "std.cfg");
         std::istringstream istr(code);
         ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
 

test/testassert.cpp

@@ -31,7 +31,7 @@ class TestAssert : public TestFixture {
     TestAssert() : TestFixture("TestAssert") {}
 
 private:
-    Settings settings;
+    const Settings settings = settingsBuilder().severity(Severity::warning).build();
 
 #define check(...) check_(__FILE__, __LINE__, __VA_ARGS__)
     void check_(const char* file, int line, const char code[], const char *filename = "test.cpp") {
@@ -48,8 +48,6 @@ class TestAssert : public TestFixture {
     }
 
     void run() override {
-        settings.severity.enable(Severity::warning);
-
         TEST_CASE(assignmentInAssert);
         TEST_CASE(functionCallInAssert);
         TEST_CASE(memberFunctionCallInAssert);

test/testautovariables.cpp

@@ -30,30 +30,24 @@ class TestAutoVariables : public TestFixture {
     TestAutoVariables() : TestFixture("TestAutoVariables") {}
 
 private:
-    Settings settings;
+    const Settings settings = settingsBuilder().severity(Severity::warning).severity(Severity::style).library("std.cfg").library("qt.cfg").build();
 
 #define check(...) check_(__FILE__, __LINE__, __VA_ARGS__)
     void check_(const char* file, int line, const char code[], bool inconclusive = true, const char* filename = "test.cpp") {
         // Clear the error buffer..
         errout.str("");
 
-        settings.certainty.setEnabled(Certainty::inconclusive, inconclusive);
+        const Settings settings1 = settingsBuilder(settings).certainty(Certainty::inconclusive, inconclusive).build();
 
         // Tokenize..
-        Tokenizer tokenizer(&settings, this);
+        Tokenizer tokenizer(&settings1, this);
         std::istringstream istr(code);
         ASSERT_LOC(tokenizer.tokenize(istr, filename), file, line);
 
-        runChecks<CheckAutoVariables>(&tokenizer, &settings, this);
+        runChecks<CheckAutoVariables>(&tokenizer, &settings1, this);
     }
 
     void run() override {
-        settings.severity.enable(Severity::warning);
-        settings.severity.enable(Severity::style);
-        LOAD_LIB_2(settings.library, "std.cfg");
-        LOAD_LIB_2(settings.library, "qt.cfg");
-        settings.libraries.emplace_back("qt");
-
         TEST_CASE(testautovar1);
         TEST_CASE(testautovar2);
         TEST_CASE(testautovar3); // ticket #2925

test/testbool.cpp

@@ -30,13 +30,9 @@ class TestBool : public TestFixture {
     TestBool() : TestFixture("TestBool") {}
 
 private:
-    Settings settings;
+    const Settings settings = settingsBuilder().severity(Severity::style).severity(Severity::warning).certainty(Certainty::inconclusive).build();
 
     void run() override {
-        settings.severity.enable(Severity::style);
-        settings.severity.enable(Severity::warning);
-        settings.certainty.enable(Certainty::inconclusive);
-
         TEST_CASE(bitwiseOnBoolean);      // if (bool & bool)
         TEST_CASE(incrementBoolean);
         TEST_CASE(assignBoolToPointer);

test/testboost.cpp

@@ -30,12 +30,9 @@ class TestBoost : public TestFixture {
     TestBoost() : TestFixture("TestBoost") {}
 
 private:
-    Settings settings;
+    const Settings settings = settingsBuilder().severity(Severity::style).severity(Severity::performance).build();
 
     void run() override {
-        settings.severity.enable(Severity::style);
-        settings.severity.enable(Severity::performance);
-
         TEST_CASE(BoostForeachContainerModification);
     }
 

test/testbufferoverrun.cpp

@@ -44,22 +44,22 @@ class TestBufferOverrun : public TestFixture {
     TestBufferOverrun() : TestFixture("TestBufferOverrun") {}
 
 private:
-    Settings settings0;
+    Settings settings0 = settingsBuilder().library("std.cfg").severity(Severity::warning).severity(Severity::style).severity(Severity::portability).build();
 
 #define check(...) check_(__FILE__, __LINE__, __VA_ARGS__)
     void check_(const char* file, int line, const char code[], const char filename[] = "test.cpp") {
         // Clear the error buffer..
         errout.str("");
 
-        settings0.certainty.enable(Certainty::inconclusive);
+        const Settings settings = settingsBuilder(settings0).certainty(Certainty::inconclusive).build();
 
         // Tokenize..
-        Tokenizer tokenizer(&settings0, this);
+        Tokenizer tokenizer(&settings, this);
         std::istringstream istr(code);
         ASSERT_LOC(tokenizer.tokenize(istr, filename), file, line);
 
         // Check for buffer overruns..
-        runChecks<CheckBufferOverrun>(&tokenizer, &settings0, this);
+        runChecks<CheckBufferOverrun>(&tokenizer, &settings, this);
     }
 
     void check_(const char* file, int line, const char code[], const Settings &settings, const char filename[] = "test.cpp") {
@@ -79,15 +79,15 @@ class TestBufferOverrun : public TestFixture {
         // Clear the error buffer..
         errout.str("");
 
-        Settings* settings = &settings0;
-        settings->severity.enable(Severity::style);
-        settings->severity.enable(Severity::warning);
-        settings->severity.enable(Severity::portability);
-        settings->severity.enable(Severity::performance);
-        settings->standards.c = Standards::CLatest;
-        settings->standards.cpp = Standards::CPPLatest;
-        settings->certainty.enable(Certainty::inconclusive);
-        settings->certainty.disable(Certainty::experimental);
+        Settings settings = settings0;
+        settings.severity.enable(Severity::style);
+        settings.severity.enable(Severity::warning);
+        settings.severity.enable(Severity::portability);
+        settings.severity.enable(Severity::performance);
+        settings.standards.c = Standards::CLatest;
+        settings.standards.cpp = Standards::CPPLatest;
+        settings.certainty.enable(Certainty::inconclusive);
+        settings.certainty.disable(Certainty::experimental);
 
         // Raw tokens..
         std::vector<std::string> files(1, filename);
@@ -99,26 +99,20 @@ class TestBufferOverrun : public TestFixture {
         std::map<std::string, simplecpp::TokenList*> filedata;
         simplecpp::preprocess(tokens2, tokens1, files, filedata, simplecpp::DUI());
 
-        Preprocessor preprocessor(*settings, nullptr);
+        Preprocessor preprocessor(settings, nullptr);
         preprocessor.setDirectives(tokens1);
 
         // Tokenizer..
-        Tokenizer tokenizer(settings, this);
+        Tokenizer tokenizer(&settings, this);
         tokenizer.createTokens(std::move(tokens2));
         tokenizer.simplifyTokens1("");
         tokenizer.setPreprocessor(&preprocessor);
 
         // Check for buffer overruns..
-        runChecks<CheckBufferOverrun>(&tokenizer, settings, this);
+        runChecks<CheckBufferOverrun>(&tokenizer, &settings, this);
     }
 
     void run() override {
-        LOAD_LIB_2(settings0.library, "std.cfg");
-
-        settings0.severity.enable(Severity::warning);
-        settings0.severity.enable(Severity::style);
-        settings0.severity.enable(Severity::portability);
-
         TEST_CASE(noerr1);
         TEST_CASE(noerr2);
         TEST_CASE(noerr3);
@@ -5493,9 +5487,7 @@ class TestBufferOverrun : public TestFixture {
 
     void checkPipeParameterSize() { // #3521
 
-        Settings settings;
-        LOAD_LIB_2(settings.library, "posix.cfg");
-        settings.libraries.emplace_back("posix");
+        const Settings settings = settingsBuilder().library("posix.cfg").build();
 
         check("void f(){\n"
               "int pipefd[1];\n" // <--  array of two integers is needed

test/testcharvar.cpp

@@ -31,12 +31,10 @@ class TestCharVar : public TestFixture {
     TestCharVar() : TestFixture("TestCharVar") {}
 
 private:
-    Settings settings;
+    Settings settings = settingsBuilder().severity(Severity::warning).severity(Severity::portability).build();
 
     void run() override {
         PLATFORM(settings, Settings::Unspecified);
-        settings.severity.enable(Severity::warning);
-        settings.severity.enable(Severity::portability);
 
         TEST_CASE(array_index_1);
         TEST_CASE(array_index_2);

test/testclangimport.cpp

@@ -138,8 +138,7 @@ class TestClangImport : public TestFixture {
     }
 
     std::string parse(const char clang[]) {
-        Settings settings;
-        settings.clang = true;
+        const Settings settings = settingsBuilder().clang().build();
         Tokenizer tokenizer(&settings, this);
         std::istringstream istr(clang);
         clangimport::parseClangAstDump(&tokenizer, istr);
@@ -1050,8 +1049,7 @@ class TestClangImport : public TestFixture {
 
 
 #define GET_SYMBOL_DB(AST) \
-    Settings settings; \
-    settings.clang = true; \
+    Settings settings = settingsBuilder().clang().build(); \
     { \
         std::string errstr; \
         ASSERT_EQUALS_MSG(true, settings.platform("unix64", errstr, {exename.c_str()}), errstr); \

test/testclass.cpp

@@ -37,13 +37,10 @@ class TestClass : public TestFixture {
     TestClass() : TestFixture("TestClass") {}
 
 private:
-    Settings settings0;
-    Settings settings1;
+    Settings settings0 = settingsBuilder().severity(Severity::style).build();
+    Settings settings1 = settingsBuilder().severity(Severity::warning).build();
 
     void run() override {
-        settings0.severity.enable(Severity::style);
-        settings1.severity.enable(Severity::warning);
-
         // Load std.cfg configuration
         {
             const char xmldata[] = "<?xml version=\"1.0\"?>\n"
@@ -257,8 +254,7 @@ class TestClass : public TestFixture {
     void checkCopyCtorAndEqOperator_(const char code[], const char* file, int line) {
         // Clear the error log
         errout.str("");
-        Settings settings;
-        settings.severity.enable(Severity::warning);
+        const Settings settings = settingsBuilder().severity(Severity::warning).build();
 
         // Tokenize..
         Tokenizer tokenizer(&settings, this);
@@ -2871,9 +2867,7 @@ class TestClass : public TestFixture {
 
 #define checkNoMemset(...) checkNoMemset_(__FILE__, __LINE__, __VA_ARGS__)
     void checkNoMemset_(const char* file, int line, const char code[]) {
-        Settings settings;
-        settings.severity.enable(Severity::warning);
-        settings.severity.enable(Severity::portability);
+        const Settings settings = settingsBuilder().severity(Severity::warning).severity(Severity::portability).build();
         checkNoMemset_(file, line, code, settings);
     }
 
@@ -3135,8 +3129,7 @@ class TestClass : public TestFixture {
                       errout.str());
 
         // #1655
-        Settings s;
-        LOAD_LIB_2(s.library, "std.cfg");
+        const Settings s = settingsBuilder().library("std.cfg").build();
         checkNoMemset("void f() {\n"
                       "    char c[] = \"abc\";\n"
                       "    std::string s;\n"
@@ -7037,10 +7030,7 @@ class TestClass : public TestFixture {
     }
 
     void qualifiedNameMember() { // #10872
-        Settings s;
-        s.severity.enable(Severity::style);
-        s.debugwarnings = true;
-        LOAD_LIB_2(s.library, "std.cfg");
+        Settings s = settingsBuilder().severity(Severity::style).debugwarnings().library("std.cfg").build();
         checkConst("struct data {};\n"
                    "    struct S {\n"
                    "    std::vector<data> std;\n"
@@ -7093,8 +7083,7 @@ class TestClass : public TestFixture {
         errout.str("");
 
         // Check..
-        Settings settings;
-        settings.severity.enable(Severity::performance);
+        const Settings settings = settingsBuilder().severity(Severity::performance).build();
 
         // Tokenize..
         Tokenizer tokenizer(&settings, this);
@@ -7771,8 +7760,8 @@ class TestClass : public TestFixture {
     void checkOverride_(const char code[], const char* file, int line) {
         // Clear the error log
         errout.str("");
-        Settings settings;
-        settings.severity.enable(Severity::style);
+
+        const Settings settings = settingsBuilder().severity(Severity::style).build();
 
         // Tokenize..
         Tokenizer tokenizer(&settings, this);
@@ -7946,9 +7935,9 @@ class TestClass : public TestFixture {
     void checkUnsafeClassRefMember_(const char code[], const char* file, int line) {
         // Clear the error log
         errout.str("");
-        Settings settings;
+
+        Settings settings = settingsBuilder().severity(Severity::warning).build();
         settings.safeChecks.classes = true;
-        settings.severity.enable(Severity::warning);
 
         // Tokenize..
         Tokenizer tokenizer(&settings, this);
@@ -8123,7 +8112,7 @@ class TestClass : public TestFixture {
 
 
     void ctu(const std::vector<std::string> &code) {
-        Settings settings;
+        const Settings settings;
         auto &check = getCheck<CheckClass>();
 
         // getFileInfo

test/testcondition.cpp

@@ -40,28 +40,19 @@ class TestCondition : public TestFixture {
     TestCondition() : TestFixture("TestCondition") {}
 
 private:
-    Settings settings0;
-    Settings settings1;
+    Settings settings0 = settingsBuilder().library("qt.cfg").library("std.cfg").severity(Severity::style).severity(Severity::warning).build();
+    Settings settings1 = settingsBuilder().severity(Severity::style).severity(Severity::warning).build();
 
     void run() override {
         // known platform..
         PLATFORM(settings0, cppcheck::Platform::Native);
         PLATFORM(settings1, cppcheck::Platform::Native);
 
-        LOAD_LIB_2(settings0.library, "qt.cfg");
-        settings0.libraries.emplace_back("qt");
-        LOAD_LIB_2(settings0.library, "std.cfg");
-
-        settings0.severity.enable(Severity::style);
-        settings0.severity.enable(Severity::warning);
-
         const char cfg[] = "<?xml version=\"1.0\"?>\n"
                            "<def>\n"
                            "  <function name=\"bar\"> <pure/> </function>\n"
                            "</def>";
         ASSERT(settings1.library.loadxmldata(cfg, sizeof(cfg)));
-        settings1.severity.enable(Severity::style);
-        settings1.severity.enable(Severity::warning);
 
         TEST_CASE(assignAndCompare);   // assignment and comparison don't match
         TEST_CASE(mismatchingBitAnd);  // overlapping bitmasks
@@ -5603,8 +5594,7 @@ class TestCondition : public TestFixture {
     }
 
     void compareOutOfTypeRange() {
-        Settings settingsUnix64;
-        settingsUnix64.severity.enable(Severity::style);
+        Settings settingsUnix64 = settingsBuilder().severity(Severity::style).build();
         PLATFORM(settingsUnix64, cppcheck::Platform::PlatformType::Unix64);
 
         check("void f(unsigned char c) {\n"