do not use static const settings in tests

firewave · firewave · commit bcaa6c745468 · 2023-04-15T11:43:21.000+02:00
diff --git a/test/helpers.cpp b/test/helpers.cpp
@@ -62,5 +62,3 @@ ScopedFile::~ScopedFile() {
 #endif
     }
 }
-
-const Settings givenACodeSampleToTokenize::settings;
diff --git a/test/helpers.h b/test/helpers.h
@@ -37,7 +37,7 @@ class Token;
 class givenACodeSampleToTokenize {
 private:
     Tokenizer tokenizer;
-    static const Settings settings;
+    const Settings settings;
 
 public:
     explicit givenACodeSampleToTokenize(const char sample[], bool createOnly = false, bool cpp = true)
diff --git a/test/testastutils.cpp b/test/testastutils.cpp
@@ -50,7 +50,7 @@ class TestAstUtils : public TestFixture {
 
 #define findLambdaEndToken(code) findLambdaEndToken_(code, __FILE__, __LINE__)
     bool findLambdaEndToken_(const char code[], const char* file, int line) {
-        static const Settings settings;
+        const Settings settings;
         Tokenizer tokenizer(&settings, this);
         std::istringstream istr(code);
         ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
@@ -84,7 +84,7 @@ class TestAstUtils : public TestFixture {
 
 #define findLambdaStartToken(code) findLambdaStartToken_(code, __FILE__, __LINE__)
     bool findLambdaStartToken_(const char code[], const char* file, int line) {
-        static const Settings settings;
+        const Settings settings;
         Tokenizer tokenizer(&settings, this);
         std::istringstream istr(code);
         ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
@@ -117,7 +117,7 @@ class TestAstUtils : public TestFixture {
 
 #define isNullOperand(code) isNullOperand_(code, __FILE__, __LINE__)
     bool isNullOperand_(const char code[], const char* file, int line) {
-        static const Settings settings;
+        const Settings settings;
         Tokenizer tokenizer(&settings, this);
         std::istringstream istr(code);
         ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
@@ -139,7 +139,7 @@ class TestAstUtils : public TestFixture {
 
 #define isReturnScope(code, offset) isReturnScope_(code, offset, __FILE__, __LINE__)
     bool isReturnScope_(const char code[], int offset, const char* file, int line) {
-        static const Settings settings;
+        const Settings settings;
         Tokenizer tokenizer(&settings, this);
         std::istringstream istr(code);
         ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
@@ -170,7 +170,7 @@ class TestAstUtils : public TestFixture {
 
 #define isSameExpression(code, tokStr1, tokStr2) isSameExpression_(code, tokStr1, tokStr2, __FILE__, __LINE__)
     bool isSameExpression_(const char code[], const char tokStr1[], const char tokStr2[], const char* file, int line) {
-        static const Settings settings;
+        const Settings settings;
         Library library;
         Tokenizer tokenizer(&settings, this);
         std::istringstream istr(code);
@@ -210,7 +210,7 @@ class TestAstUtils : public TestFixture {
 
 #define isVariableChanged(code, startPattern, endPattern) isVariableChanged_(code, startPattern, endPattern, __FILE__, __LINE__)
     bool isVariableChanged_(const char code[], const char startPattern[], const char endPattern[], const char* file, int line) {
-        static const Settings settings;
+        const Settings settings;
         Tokenizer tokenizer(&settings, this);
         std::istringstream istr(code);
         ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
@@ -240,7 +240,7 @@ class TestAstUtils : public TestFixture {
 
 #define isVariableChangedByFunctionCall(code, pattern, inconclusive) isVariableChangedByFunctionCall_(code, pattern, inconclusive, __FILE__, __LINE__)
     bool isVariableChangedByFunctionCall_(const char code[], const char pattern[], bool *inconclusive, const char* file, int line) {
-        static const Settings settings;
+        const Settings settings;
         Tokenizer tokenizer(&settings, this);
         std::istringstream istr(code);
         ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
@@ -416,7 +416,7 @@ class TestAstUtils : public TestFixture {
 
 #define nextAfterAstRightmostLeaf(code, parentPattern, rightPattern) nextAfterAstRightmostLeaf_(code, parentPattern, rightPattern, __FILE__, __LINE__)
     bool nextAfterAstRightmostLeaf_(const char code[], const char parentPattern[], const char rightPattern[], const char* file, int line) {
-        static const Settings settings;
+        const Settings settings;
         Tokenizer tokenizer(&settings, this);
         std::istringstream istr(code);
         ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
@@ -441,7 +441,7 @@ class TestAstUtils : public TestFixture {
     enum class Result {False, True, Fail};
 
     Result isUsedAsBool(const char code[], const char pattern[]) {
-        static const Settings settings;
+        const Settings settings;
         Tokenizer tokenizer(&settings, this);
         std::istringstream istr(code);
         if (!tokenizer.tokenize(istr, "test.cpp"))
diff --git a/test/testbufferoverrun.cpp b/test/testbufferoverrun.cpp
@@ -5499,7 +5499,7 @@ class TestBufferOverrun : public TestFixture {
 
     void checkPipeParameterSize() { // #3521
 
-        static const Settings settings = settingsBuilder().library("posix.cfg").build();
+        const Settings settings = settingsBuilder().library("posix.cfg").build();
 
         check("void f(){\n"
               "int pipefd[1];\n" // <--  array of two integers is needed
diff --git a/test/testclangimport.cpp b/test/testclangimport.cpp
@@ -137,7 +137,7 @@ class TestClangImport : public TestFixture {
     }
 
     std::string parse(const char clang[]) {
-        static const Settings settings = settingsBuilder().clang().build();
+        const Settings settings = settingsBuilder().clang().build();
         Tokenizer tokenizer(&settings, this);
         std::istringstream istr(clang);
         clangimport::parseClangAstDump(&tokenizer, istr);
diff --git a/test/testclass.cpp b/test/testclass.cpp
@@ -8317,7 +8317,7 @@ class TestClass : public TestFixture {
 
 
     void ctu(const std::vector<std::string> &code) {
-        static const Settings settings;
+        const Settings settings;
         auto &check = getCheck<CheckClass>();
 
         // getFileInfo
diff --git a/test/testconstructors.cpp b/test/testconstructors.cpp
@@ -1948,7 +1948,7 @@ class TestConstructors : public TestFixture {
 
     void initvar_smartptr() { // #10237
         // TODO: test should probably not pass without library
-        static const Settings s = settingsBuilder() /*.library("std.cfg")*/.build();
+        const Settings s = settingsBuilder() /*.library("std.cfg")*/.build();
         check("struct S {\n"
               "    explicit S(const std::shared_ptr<S>& sp) {\n"
               "        set(*sp);\n"
@@ -1990,7 +1990,7 @@ class TestConstructors : public TestFixture {
               "{ }", true);
         ASSERT_EQUALS("[test.cpp:13]: (warning, inconclusive) Member variable 'Fred::ints' is not assigned a value in 'Fred::operator='.\n", errout.str());
 
-        static const Settings s = settingsBuilder().certainty(Certainty::inconclusive).severity(Severity::style).severity(Severity::warning).library("std.cfg").build();
+        const Settings s = settingsBuilder().certainty(Certainty::inconclusive).severity(Severity::style).severity(Severity::warning).library("std.cfg").build();
         check("struct S {\n"
               "    S& operator=(const S& s) { return *this; }\n"
               "    std::mutex m;\n"
@@ -3603,7 +3603,7 @@ class TestConstructors : public TestFixture {
 
     void uninitVarInheritClassInit() {
         // TODO: test should probably not pass without library
-        static const Settings s = settingsBuilder() /*.library("vcl.cfg")*/.build();
+        const Settings s = settingsBuilder() /*.library("vcl.cfg")*/.build();
 
         check("class Fred: public TObject\n"
               "{\n"
diff --git a/test/testnullpointer.cpp b/test/testnullpointer.cpp
@@ -194,7 +194,7 @@ class TestNullPointer : public TestFixture {
         // Clear the error buffer..
         errout.str("");
 
-        static const Settings settings1 = settingsBuilder(settings).certainty(Certainty::inconclusive, false).build();
+        const Settings settings1 = settingsBuilder(settings).certainty(Certainty::inconclusive, false).build();
 
         // Raw tokens..
         std::vector<std::string> files(1, "test.cpp");
diff --git a/test/testsimplifytypedef.cpp b/test/testsimplifytypedef.cpp
@@ -279,7 +279,7 @@ class TestSimplifyTypedef : public TestFixture {
         errout.str("");
         // Tokenize..
         // show warnings about unhandled typedef
-        static const Settings settings = settingsBuilder(settings2).certainty(Certainty::inconclusive).debugwarnings().build();
+        const Settings settings = settingsBuilder(settings2).certainty(Certainty::inconclusive).debugwarnings().build();
         Tokenizer tokenizer(&settings, this);
         std::istringstream istr(code);
         ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
diff --git a/test/testsummaries.cpp b/test/testsummaries.cpp
@@ -44,7 +44,7 @@ class TestSummaries : public TestFixture {
         errout.str("");
 
         // tokenize..
-        static const Settings settings;
+        const Settings settings;
         Tokenizer tokenizer(&settings, this);
         std::istringstream istr(code);
         ASSERT_LOC(tokenizer.tokenize(istr, filename), file, line);
diff --git a/test/testtoken.cpp b/test/testtoken.cpp
@@ -135,7 +135,7 @@ class TestToken : public TestFixture {
 
 #define MatchCheck(...) MatchCheck_(__FILE__, __LINE__, __VA_ARGS__)
     bool MatchCheck_(const char* file, int line, const std::string& code, const std::string& pattern, unsigned int varid = 0) {
-        static const Settings settings;
+        const Settings settings;
         Tokenizer tokenizer(&settings, this);
         std::istringstream istr(";" + code + ";");
         try {
@@ -395,7 +395,7 @@ class TestToken : public TestFixture {
 
     void getStrSize() const {
         Token tok;
-        static const Settings settings;
+        const Settings settings;
 
         tok.str("\"\"");
         ASSERT_EQUALS(sizeof(""), Token::getStrSize(&tok, &settings));
diff --git a/test/testtokenize.cpp b/test/testtokenize.cpp
@@ -523,7 +523,7 @@ class TestTokenizer : public TestFixture {
     std::string tokenizeDebugListing_(const char* file, int line, const char code[], const char filename[] = "test.cpp") {
         errout.str("");
 
-        static const Settings settings = settingsBuilder(settings2).c(Standards::C89).cpp(Standards::CPP03).build();
+        const Settings settings = settingsBuilder(settings2).c(Standards::C89).cpp(Standards::CPP03).build();
 
         Tokenizer tokenizer(&settings, this);
         std::istringstream istr(code);
diff --git a/test/testtokenrange.cpp b/test/testtokenrange.cpp
@@ -101,7 +101,7 @@ class TestTokenRange : public TestFixture {
     }
 
     void scopeExample() const {
-        static const Settings settings;
+        const Settings settings;
         Tokenizer tokenizer{ &settings, nullptr };
         std::istringstream sample("void a(){} void main(){ if(true){a();} }");
         ASSERT(tokenizer.tokenize(sample, "test.cpp"));

Original file line number	Diff line number	Diff line change
`@@ -62,5 +62,3 @@ ScopedFile::~ScopedFile() {`
`62`	`62`	`#endif`
`63`	`63`	`}`
`64`	`64`	`}`
`65`		`-`
`66`		`-const Settings givenACodeSampleToTokenize::settings;`
Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ class TestClangImport : public TestFixture {`
`137`	`137`	`}`
`138`	`138`
`139`	`139`	`std::string parse(const char clang[]) {`
`140`		`- static const Settings settings = settingsBuilder().clang().build();`
	`140`	`+ const Settings settings = settingsBuilder().clang().build();`
`141`	`141`	`Tokenizer tokenizer(&settings, this);`
`142`	`142`	`std::istringstream istr(clang);`
`143`	`143`	`clangimport::parseClangAstDump(&tokenizer, istr);`