review

Author: danmar

test/testcmdlineparser.cpp

@@ -116,23 +116,11 @@ class TestCmdlineParser : public TestFixture {
         logger->destroy();
     }
 
-    class AsPremium {
-    public:
-        AsPremium(Settings* settings) : settings(settings), productName(settings->cppcheckCfgProductName), premium(settings->premium)
-        {
-            // set this so we think it is the premium
-            settings->cppcheckCfgProductName = "Cppcheck Premium 0.0.0";
-            settings->premium = true;
-        }
-        ~AsPremium() {
-            settings->cppcheckCfgProductName = productName;
-            settings->premium = premium;
-        }
-    private:
-        Settings* const settings;
-        const std::string productName;
-        const bool premium;
-    };
+    void asPremium() {
+        // set this so we think it is the premium
+        settings->cppcheckCfgProductName = "Cppcheck Premium 0.0.0";
+        settings->premium = true;
+    }
 
     template<size_t size>
     CmdLineParser::Result parseFromArgs(const char* const (&argv)[size]) {
@@ -1546,7 +1534,7 @@ class TestCmdlineParser : public TestFixture {
 
     void premiumOptions1() {
         REDIRECT;
-        AsPremium asPremium(settings.get());
+        asPremium();
         const char * const argv[] = {"cppcheck", "--premium=autosar", "file.c"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
         ASSERT(settings->severity.isEnabled(Severity::error));
@@ -1555,7 +1543,7 @@ class TestCmdlineParser : public TestFixture {
 
     void premiumOptions2() {
         REDIRECT;
-        AsPremium asPremium(settings.get());
+        asPremium();
         const char * const argv[] = {"cppcheck", "--premium=misra-c-2012", "file.c"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
         ASSERT(settings->severity.isEnabled(Severity::error));
@@ -1564,7 +1552,7 @@ class TestCmdlineParser : public TestFixture {
 
     void premiumOptions3() {
         REDIRECT;
-        AsPremium asPremium(settings.get());
+        asPremium();
         const char * const argv[] = {"cppcheck", "--premium=misra-c++-2023", "file.c"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
         ASSERT(settings->severity.isEnabled(Severity::error));
@@ -1573,7 +1561,7 @@ class TestCmdlineParser : public TestFixture {
 
     void premiumOptions4() {
         REDIRECT;
-        AsPremium asPremium(settings.get());
+        asPremium();
         const char * const argv[] = {"cppcheck", "--premium=cert-c++-2016", "file.c"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
         ASSERT(settings->severity.isEnabled(Severity::error));
@@ -1582,7 +1570,7 @@ class TestCmdlineParser : public TestFixture {
 
     void premiumOptions5() {
         REDIRECT;
-        AsPremium asPremium(settings.get());
+        asPremium();
         const char * const argv[] = {"cppcheck", "--premium=safety", "file.c"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
         ASSERT(settings->severity.isEnabled(Severity::error));
@@ -1591,7 +1579,7 @@ class TestCmdlineParser : public TestFixture {
 
     void premiumOptionsAll() {
         REDIRECT;
-        AsPremium asPremium(settings.get());
+        asPremium();
         const char * const argv[] = {
             "cppcheck",
             "--premium=autosar:all",
@@ -1608,7 +1596,7 @@ class TestCmdlineParser : public TestFixture {
 
     void premiumOptionsMetrics() {
         REDIRECT;
-        AsPremium asPremium(settings.get());
+        asPremium();
         const char * const argv[] = {"cppcheck", "--premium=metrics", "file.c"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
         ASSERT_EQUALS("--metrics", settings->premiumArgs);
@@ -1619,47 +1607,47 @@ class TestCmdlineParser : public TestFixture {
 
     void premiumOptionsCertCIntPrecision() {
         REDIRECT;
-        AsPremium asPremium(settings.get());
+        asPremium();
         const char * const argv[] = {"cppcheck", "--premium-cert-c-int-precision=12", "file.c"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
         ASSERT_EQUALS("--cert-c-int-precision=12", settings->premiumArgs);
     }
 
     void premiumOptionsLicenseFile() {
         REDIRECT;
-        AsPremium asPremium(settings.get());
+        asPremium();
         const char * const argv[] = {"cppcheck", "--premium-license-file=file.lic", "file.c"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
         ASSERT_EQUALS("--license-file=file.lic", settings->premiumArgs);
     }
 
     void premiumOptionsInvalid1() {
         REDIRECT;
-        AsPremium asPremium(settings.get());
+        asPremium();
         const char * const argv[] = {"cppcheck", "--premium=misra", "file.c"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
         ASSERT_EQUALS("cppcheck: error: invalid --premium option 'misra'.\n", logger->str());
     }
 
     void premiumOptionsInvalid2() {
         REDIRECT;
-        AsPremium asPremium(settings.get());
+        asPremium();
         const char * const argv[] = {"cppcheck", "--premium=cert", "file.c"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
         ASSERT_EQUALS("cppcheck: error: invalid --premium option 'cert'.\n", logger->str());
     }
 
     void premiumSafety() {
         REDIRECT;
-        AsPremium asPremium(settings.get());
+        asPremium();
         const char * const argv[] = {"cppcheck", "--premium=safety", "file.cpp"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
         ASSERT_EQUALS(true, settings->safety);
     }
 
     void premiumDebugProgress() {
         REDIRECT;
-        AsPremium asPremium(settings.get());
+        asPremium();
         const char * const argv[] = {"cppcheck", "--premium=debug-progress", "file.cpp"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
         ASSERT_EQUALS("--debug-progress", settings->premiumArgs);