small test classes initialization cleanup

Author: firewave

test/testcmdlineparser.cpp

@@ -35,9 +35,8 @@
 
 class TestCmdlineParser : public TestFixture {
 public:
-    TestCmdlineParser()
-        : TestFixture("TestCmdlineParser")
-        , defParser(&settings) {
+    TestCmdlineParser() : TestFixture("TestCmdlineParser")
+    {
 #if defined(_WIN64) || defined(_WIN32)
         CmdLineParser::SHOW_DEF_PLATFORM_MSG = false;
 #endif
@@ -51,7 +50,7 @@ class TestCmdlineParser : public TestFixture {
 
 private:
     Settings settings; // TODO: reset after each test
-    CmdLineParser defParser; // TODO: reset after each test
+    CmdLineParser defParser{&settings}; // TODO: reset after each test
 
     void run() override {
         TEST_CASE(nooptions);

test/testerrorlogger.cpp

@@ -32,11 +32,11 @@
 
 class TestErrorLogger : public TestFixture {
 public:
-    TestErrorLogger() : TestFixture("TestErrorLogger"), fooCpp5("foo.cpp", 5, 1), barCpp8("bar.cpp", 8, 1) {}
+    TestErrorLogger() : TestFixture("TestErrorLogger") {}
 
 private:
-    const ErrorMessage::FileLocation fooCpp5;
-    const ErrorMessage::FileLocation barCpp8;
+    const ErrorMessage::FileLocation fooCpp5{"foo.cpp", 5, 1};
+    const ErrorMessage::FileLocation barCpp8{"bar.cpp", 8, 1};
 
     void run() override {
         TEST_CASE(PatternSearchReplace);

test/testfilelister.cpp

@@ -29,8 +29,7 @@
 
 class TestFileLister : public TestFixture {
 public:
-    TestFileLister()
-        : TestFixture("TestFileLister") {}
+    TestFileLister() : TestFixture("TestFileLister") {}
 
 private:
     void run() override {

test/testpathmatch.cpp

@@ -25,18 +25,13 @@
 
 class TestPathMatch : public TestFixture {
 public:
-    TestPathMatch()
-        : TestFixture("TestPathMatch")
-        , emptyMatcher(std::vector<std::string>())
-        , srcMatcher(std::vector<std::string>(1, "src/"))
-        , fooCppMatcher(std::vector<std::string>(1, "foo.cpp"))
-        , srcFooCppMatcher(std::vector<std::string>(1, "src/foo.cpp")) {}
+    TestPathMatch() : TestFixture("TestPathMatch") {}
 
 private:
-    const PathMatch emptyMatcher;
-    const PathMatch srcMatcher;
-    const PathMatch fooCppMatcher;
-    const PathMatch srcFooCppMatcher;
+    const PathMatch emptyMatcher{std::vector<std::string>()};
+    const PathMatch srcMatcher{std::vector<std::string>(1, "src/")};
+    const PathMatch fooCppMatcher{std::vector<std::string>(1, "foo.cpp")};
+    const PathMatch srcFooCppMatcher{std::vector<std::string>(1, "src/foo.cpp")};
 
     void run() override {
         TEST_CASE(emptymaskemptyfile);

test/testpreprocessor.cpp

@@ -45,9 +45,7 @@ class ErrorLogger;
 
 class TestPreprocessor : public TestFixture {
 public:
-    TestPreprocessor()
-        : TestFixture("TestPreprocessor")
-        , preprocessor0(settings0, this) {}
+    TestPreprocessor() : TestFixture("TestPreprocessor") {}
 
     class OurPreprocessor : public Preprocessor {
     public:
@@ -73,7 +71,7 @@ class TestPreprocessor : public TestFixture {
 
 private:
     Settings settings0 = settingsBuilder().severity(Severity::information).build();
-    Preprocessor preprocessor0;
+    Preprocessor preprocessor0{settings0, this};
 
     void run() override {
 

test/testsymboldatabase.cpp

@@ -65,14 +65,11 @@ class TestSymbolDatabase;
 
 class TestSymbolDatabase : public TestFixture {
 public:
-    TestSymbolDatabase()
-        : TestFixture("TestSymbolDatabase")
-        ,vartok(nullptr)
-        ,typetok(nullptr) {}
+    TestSymbolDatabase() : TestFixture("TestSymbolDatabase") {}
 
 private:
-    const Token* vartok;
-    const Token* typetok;
+    const Token* vartok{nullptr};
+    const Token* typetok{nullptr};
     // If there are unused templates, keep those
     Settings settings1 = settingsBuilder().library("std.cfg").checkUnusedTemplates().build();
     Settings settings2 = settingsBuilder().checkUnusedTemplates().build();

test/testvarid.cpp

@@ -32,13 +32,13 @@ struct InternalError;
 
 class TestVarID : public TestFixture {
 public:
-    TestVarID() : TestFixture("TestVarID") {
-        PLATFORM(settings, cppcheck::Platform::Unix64);
-    }
+    TestVarID() : TestFixture("TestVarID") {}
 
 private:
     Settings settings = settingsBuilder().c(Standards::C89).cpp(Standards::CPPLatest).checkUnusedTemplates().build();
     void run() override {
+        PLATFORM(settings, cppcheck::Platform::Unix64);
+
         TEST_CASE(varid1);
         TEST_CASE(varid2);
         TEST_CASE(varid3);