s

Author: firewave

test/testcmdlineparser.cpp

@@ -125,6 +125,7 @@ class TestCmdlineParser : public TestFixture {
     void run() override {
         TEST_CASE(nooptions);
         TEST_CASE(nooptionsWithCfg);
+        TEST_CASE(nooptionsWithInvalidCfg);
         TEST_CASE(helpshort);
         TEST_CASE(helpshortExclusive);
         TEST_CASE(helpshortWithCfg);
@@ -134,7 +135,6 @@ class TestCmdlineParser : public TestFixture {
         TEST_CASE(version);
         TEST_CASE(versionWithCfg);
         TEST_CASE(versionExclusive);
-        TEST_CASE(versionWithInvalidCfg);
         TEST_CASE(checkVersionCorrect);
         TEST_CASE(checkVersionIncorrect);
         TEST_CASE(onefile);
@@ -328,7 +328,6 @@ class TestCmdlineParser : public TestFixture {
         TEST_CASE(errorlist);
         TEST_CASE(errorlistWithCfg);
         TEST_CASE(errorlistExclusive);
-        TEST_CASE(errorlistWithInvalidCfg);
         TEST_CASE(ignorepathsnopath);
 #if defined(USE_WINDOWS_SEH) || defined(USE_UNIX_SIGNAL_HANDLING)
         TEST_CASE(exceptionhandling);
@@ -545,11 +544,22 @@ class TestCmdlineParser : public TestFixture {
                         "}\n");
         const char * const argv[] = {"cppcheck"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Exit, parseFromArgs(argv));
+        ASSERT_EQUALS(1, settings->settingsFiles.size());
+        ASSERT_EQUALS(file.path(), *settings->settingsFiles.cbegin());
         std::string log_str = logger->str();
         ASSERT_MSG(startsWith(log_str, "Cppcheck - A tool for static C/C++ code analysis"), "header");
         ASSERT_MSG(log_str.find("https://files.cppchecksolutions.com/manual.pdf") != std::string::npos, "help url");
     }
 
+    void nooptionsWithInvalidCfg() {
+        REDIRECT;
+        ScopedFile file(Path::join(Path::getPathFromFilename(Path::getCurrentExecutablePath("")), "cppcheck.cfg"),
+                        "{\n");
+        const char * const argv[] = {"cppcheck"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: could not load cppcheck.cfg - not a valid JSON - syntax error at line 2 near: \n", logger->str());
+    }
+
     void helpshort() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "-h"};
@@ -572,6 +582,8 @@ class TestCmdlineParser : public TestFixture {
                         "}\n");
         const char * const argv[] = {"cppcheck", "-h"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Exit, parseFromArgs(argv));
+        ASSERT_EQUALS(1, settings->settingsFiles.size());
+        ASSERT_EQUALS(file.path(), *settings->settingsFiles.cbegin());
         std::string log_str = logger->str();
         ASSERT_MSG(startsWith(log_str, "Cppcheck - A tool for static C/C++ code analysis"), "header");
         ASSERT_MSG(log_str.find("https://files.cppchecksolutions.com/manual.pdf") != std::string::npos, "help url");
@@ -599,6 +611,8 @@ class TestCmdlineParser : public TestFixture {
                         "}\n");
         const char * const argv[] = {"cppcheck", "--help"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Exit, parseFromArgs(argv));
+        ASSERT_EQUALS(1, settings->settingsFiles.size());
+        ASSERT_EQUALS(file.path(), *settings->settingsFiles.cbegin());
         std::string log_str = logger->str();
         ASSERT_MSG(startsWith(log_str, "Cppcheck - A tool for static C/C++ code analysis"), "header");
         ASSERT_MSG(log_str.find("https://files.cppchecksolutions.com/manual.pdf") != std::string::npos, "help url");
@@ -619,6 +633,8 @@ class TestCmdlineParser : public TestFixture {
                         "}\n");
         const char * const argv[] = {"cppcheck", "--version"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Exit, parseFromArgs(argv));
+        ASSERT_EQUALS(1, settings->settingsFiles.size());
+        ASSERT_EQUALS(file.path(), *settings->settingsFiles.cbegin());
         ASSERT_EQUALS("The Product\n", logger->str()); // TODO: include version?
     }
 
@@ -631,15 +647,6 @@ class TestCmdlineParser : public TestFixture {
         ASSERT(logger->str().compare(0, 11, "Cppcheck 2.") == 0);
     }
 
-    void versionWithInvalidCfg() {
-        REDIRECT;
-        ScopedFile file(Path::join(Path::getPathFromFilename(Path::getCurrentExecutablePath("")), "cppcheck.cfg"),
-                        "{\n");
-        const char * const argv[] = {"cppcheck", "--version"};
-        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
-        ASSERT_EQUALS("cppcheck: error: could not load cppcheck.cfg - not a valid JSON - syntax error at line 2 near: \n", logger->str());
-    }
-
     void checkVersionCorrect() {
         REDIRECT;
         const std::string currentVersion = parser->getVersion();
@@ -2214,6 +2221,8 @@ class TestCmdlineParser : public TestFixture {
                         R"({"productName": "The Product"}\n)");
         const char * const argv[] = {"cppcheck", "--errorlist"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Exit, parseFromArgs(argv));
+        ASSERT_EQUALS(1, settings->settingsFiles.size());
+        ASSERT_EQUALS(file.path(), *settings->settingsFiles.cbegin());
         ASSERT_EQUALS("", logger->str()); // empty since it is logged via ErrorLogger
         ASSERT(startsWith(GET_REDIRECT_OUTPUT, ErrorMessage::getXMLHeader("The Product")));
     }
@@ -2228,15 +2237,6 @@ class TestCmdlineParser : public TestFixture {
         ASSERT(endsWith(errout_s, "</results>\n"));
     }
 
-    void errorlistWithInvalidCfg() {
-        REDIRECT;
-        ScopedFile file(Path::join(Path::getPathFromFilename(Path::getCurrentExecutablePath("")), "cppcheck.cfg"),
-                        "{\n");
-        const char * const argv[] = {"cppcheck", "--errorlist"};
-        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
-        ASSERT_EQUALS("cppcheck: error: could not load cppcheck.cfg - not a valid JSON - syntax error at line 2 near: \n", logger->str());
-    }
-
     void ignorepathsnopath() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "-i"};