s

Author: firewave

test/testcmdlineparser.cpp

@@ -545,8 +545,9 @@ class TestCmdlineParser : public TestFixture {
                         "}\n");
         const char * const argv[] = {"cppcheck"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Exit, parseFromArgs(argv));
-        ASSERT(startsWith(logger->str(), "Cppcheck - A tool for static C/C++ code analysis"));
-        ASSERT(logger->str().find("https://files.cppchecksolutions.com/manual.pdf") != std::string::npos);
+        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 helpshort() {
@@ -571,8 +572,9 @@ class TestCmdlineParser : public TestFixture {
                         "}\n");
         const char * const argv[] = {"cppcheck", "-h"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Exit, parseFromArgs(argv));
-        ASSERT(startsWith(logger->str(), "Cppcheck - A tool for static C/C++ code analysis"));
-        ASSERT(logger->str().find("https://files.cppchecksolutions.com/manual.pdf") != std::string::npos);
+        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 helplong() {
@@ -597,8 +599,9 @@ class TestCmdlineParser : public TestFixture {
                         "}\n");
         const char * const argv[] = {"cppcheck", "--help"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Exit, parseFromArgs(argv));
-        ASSERT(startsWith(logger->str(), "Cppcheck - A tool for static C/C++ code analysis"));
-        ASSERT(logger->str().find("https://files.cppchecksolutions.com/manual.pdf") != std::string::npos);
+        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 version() {
@@ -616,8 +619,7 @@ class TestCmdlineParser : public TestFixture {
                         "}\n");
         const char * const argv[] = {"cppcheck", "--version"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Exit, parseFromArgs(argv));
-        // TODO: somehow the config is not loaded on some systems
-        (void)logger->str(); //ASSERT_EQUALS("The Product\n", logger->str()); // TODO: include version?
+        ASSERT_EQUALS("The Product\n", logger->str()); // TODO: include version?
     }
 
     // TODO: test --version with extraVersion