diff --git a/cmake/findDependencies.cmake b/cmake/findDependencies.cmake index da6d639755e..90b7c137e75 100644 --- a/cmake/findDependencies.cmake +++ b/cmake/findDependencies.cmake @@ -39,13 +39,23 @@ endif() set(CMAKE_INCLUDE_CURRENT_DIR ON) -find_package(PythonInterp 3 QUIET) -if (NOT PYTHONINTERP_FOUND) - set(PYTHONINTERP_FOUND "") - find_package(PythonInterp 2.7 QUIET) - if (NOT PYTHONINTERP_FOUND AND NOT USE_MATCHCOMPILER_OPT STREQUAL "Off") +if (CMAKE_VERSION VERSION_EQUAL "3.12" OR CMAKE_VERSION VERSION_GREATER "3.12") + find_package(Python COMPONENTS Interpreter) + if (NOT Python_Interpreter_FOUND) message(WARNING "No python interpreter found. Therefore, the match compiler is switched off.") set(USE_MATCHCOMPILER_OPT "Off") + else() + set(PYTHON_EXECUTABLE ${Python_EXECUTABLE}) + endif() +else() + find_package(PythonInterp 3 QUIET) + if (NOT PYTHONINTERP_FOUND) + set(PYTHONINTERP_FOUND "") + find_package(PythonInterp 2.7 QUIET) + if (NOT PYTHONINTERP_FOUND AND NOT USE_MATCHCOMPILER_OPT STREQUAL "Off") + message(WARNING "No python interpreter found. Therefore, the match compiler is switched off.") + set(USE_MATCHCOMPILER_OPT "Off") + endif() endif() endif() diff --git a/lib/symboldatabase.cpp b/lib/symboldatabase.cpp index d12376830fa..1f50548fc5e 100644 --- a/lib/symboldatabase.cpp +++ b/lib/symboldatabase.cpp @@ -1522,6 +1522,13 @@ void SymbolDatabase::createSymbolDatabaseIncompleteVars() } if (mSettings.library.functions.find(fstr) != mSettings.library.functions.end()) continue; + if (mTokenizer.isCPP()) { + const Token* parent = tok->astParent(); + while (Token::Match(parent, "::|[|{")) + parent = parent->astParent(); + if (Token::simpleMatch(parent, "new")) + continue; + } tok->isIncompleteVar(true); } } diff --git a/test/fixture.cpp b/test/fixture.cpp index 7b2841316d5..bc0c930baa8 100644 --- a/test/fixture.cpp +++ b/test/fixture.cpp @@ -104,6 +104,7 @@ bool TestFixture::prepareTest(const char testname[]) } else { std::cout << classname << "::" << mTestname << std::endl; } + teardownTestInternal(); return true; } return false; diff --git a/test/fixture.h b/test/fixture.h index 6ec0c83f13a..ac3e9fd9741 100644 --- a/test/fixture.h +++ b/test/fixture.h @@ -61,6 +61,7 @@ class TestFixture : public ErrorLogger { bool prepareTest(const char testname[]); virtual void prepareTestInternal() {} + virtual void teardownTestInternal() {} std::string getLocationStr(const char * const filename, const unsigned int linenr) const; bool assert_(const char * const filename, const unsigned int linenr, const bool condition) const; diff --git a/test/testcmdlineparser.cpp b/test/testcmdlineparser.cpp index ab360dcc6c1..c2761239cb7 100644 --- a/test/testcmdlineparser.cpp +++ b/test/testcmdlineparser.cpp @@ -51,22 +51,49 @@ class TestCmdlineParser : public TestFixture { void printMessage(const std::string &message) override { - std::cout << "cppcheck: " << message << std::endl; + printInternal("cppcheck: " + message + '\n'); } void printError(const std::string &message) override { printMessage("error: " + message); } + + std::string str() + { + std::string s; + std::swap(buf, s); + return s; + } + + void destroy() + { + if (!buf.empty()) + throw std::runtime_error("unconsumed messages"); + } + + private: + void printInternal(const std::string &message) + { + buf += message; + } + + std::string buf; }; - CmdLineLoggerTest logger; + std::unique_ptr logger; std::unique_ptr settings; std::unique_ptr parser; void prepareTestInternal() override { + logger.reset(new CmdLineLoggerTest()); settings.reset(new Settings()); - parser.reset(new CmdLineParser(logger, *settings, settings->nomsg, settings->nofail)); + parser.reset(new CmdLineParser(*logger, *settings, settings->nomsg, settings->nofail)); + } + + void teardownTestInternal() override { + logger->destroy(); + // TODO: verify that the redirect output is empty } void run() override { @@ -275,6 +302,7 @@ class TestCmdlineParser : public TestFixture { const char * const argv[] = {"cppcheck"}; ASSERT(parser->parseFromArgs(1, argv)); ASSERT(startsWith(GET_REDIRECT_OUTPUT, "Cppcheck - A tool for static C/C++ code analysis")); + ASSERT_EQUALS("", logger->str()); } void helpshort() { @@ -282,6 +310,7 @@ class TestCmdlineParser : public TestFixture { const char * const argv[] = {"cppcheck", "-h"}; ASSERT(parser->parseFromArgs(2, argv)); ASSERT(startsWith(GET_REDIRECT_OUTPUT, "Cppcheck - A tool for static C/C++ code analysis")); + ASSERT_EQUALS("", logger->str()); } void helplong() { @@ -289,6 +318,7 @@ class TestCmdlineParser : public TestFixture { const char * const argv[] = {"cppcheck", "--help"}; ASSERT(parser->parseFromArgs(2, argv)); ASSERT(startsWith(GET_REDIRECT_OUTPUT, "Cppcheck - A tool for static C/C++ code analysis")); + ASSERT_EQUALS("", logger->str()); } void showversion() { @@ -296,7 +326,7 @@ class TestCmdlineParser : public TestFixture { const char * const argv[] = {"cppcheck", "--version"}; ASSERT(parser->parseFromArgs(2, argv)); ASSERT_EQUALS(true, parser->getShowVersion()); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); // version is not actually shown + ASSERT_EQUALS("", logger->str()); // version is not actually shown } void onefile() { @@ -305,7 +335,7 @@ class TestCmdlineParser : public TestFixture { ASSERT(parser->parseFromArgs(2, argv)); ASSERT_EQUALS(1, (int)parser->getPathNames().size()); ASSERT_EQUALS("file.cpp", parser->getPathNames().at(0)); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void onepath() { @@ -314,7 +344,7 @@ class TestCmdlineParser : public TestFixture { ASSERT(parser->parseFromArgs(2, argv)); ASSERT_EQUALS(1, (int)parser->getPathNames().size()); ASSERT_EQUALS("src", parser->getPathNames().at(0)); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void optionwithoutfile() { @@ -322,7 +352,7 @@ class TestCmdlineParser : public TestFixture { const char * const argv[] = {"cppcheck", "-v"}; ASSERT_EQUALS(false, parser->parseFromArgs(2, argv)); ASSERT_EQUALS(0, (int)parser->getPathNames().size()); - ASSERT_EQUALS("cppcheck: error: no C or C++ source files found.\n", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("cppcheck: error: no C or C++ source files found.\n", logger->str()); } void verboseshort() { @@ -331,7 +361,7 @@ class TestCmdlineParser : public TestFixture { settings->verbose = false; ASSERT(parser->parseFromArgs(3, argv)); ASSERT_EQUALS(true, settings->verbose); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void verboselong() { @@ -340,7 +370,7 @@ class TestCmdlineParser : public TestFixture { settings->verbose = false; ASSERT(parser->parseFromArgs(3, argv)); ASSERT_EQUALS(true, settings->verbose); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void debugSimplified() { @@ -349,7 +379,7 @@ class TestCmdlineParser : public TestFixture { settings->debugSimplified = false; ASSERT(parser->parseFromArgs(3, argv)); ASSERT_EQUALS(true, settings->debugSimplified); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void debugwarnings() { @@ -358,7 +388,7 @@ class TestCmdlineParser : public TestFixture { settings->debugwarnings = false; ASSERT(parser->parseFromArgs(3, argv)); ASSERT_EQUALS(true, settings->debugwarnings); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void forceshort() { @@ -367,7 +397,7 @@ class TestCmdlineParser : public TestFixture { settings->force = false; ASSERT(parser->parseFromArgs(3, argv)); ASSERT_EQUALS(true, settings->force); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void forcelong() { @@ -376,7 +406,7 @@ class TestCmdlineParser : public TestFixture { settings->force = false; ASSERT(parser->parseFromArgs(3, argv)); ASSERT_EQUALS(true, settings->force); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void relativePaths1() { @@ -385,7 +415,7 @@ class TestCmdlineParser : public TestFixture { const char * const argv[] = {"cppcheck", "-rp", "file.cpp"}; ASSERT(parser->parseFromArgs(3, argv)); ASSERT_EQUALS(true, settings->relativePaths); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void relativePaths2() { @@ -394,7 +424,7 @@ class TestCmdlineParser : public TestFixture { const char * const argv[] = {"cppcheck", "--relative-paths", "file.cpp"}; ASSERT(parser->parseFromArgs(3, argv)); ASSERT_EQUALS(true, settings->relativePaths); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void relativePaths3() { @@ -407,7 +437,7 @@ class TestCmdlineParser : public TestFixture { ASSERT_EQUALS(2, settings->basePaths.size()); ASSERT_EQUALS("C:/foo", settings->basePaths[0]); ASSERT_EQUALS("C:/bar", settings->basePaths[1]); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void relativePaths4() { @@ -421,7 +451,7 @@ class TestCmdlineParser : public TestFixture { ASSERT_EQUALS(2, settings->basePaths.size()); ASSERT_EQUALS("C:/foo", settings->basePaths[0]); ASSERT_EQUALS("C:/bar", settings->basePaths[1]); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void quietshort() { @@ -430,7 +460,7 @@ class TestCmdlineParser : public TestFixture { settings->quiet = false; ASSERT(parser->parseFromArgs(3, argv)); ASSERT_EQUALS(true, settings->quiet); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void quietlong() { @@ -439,7 +469,7 @@ class TestCmdlineParser : public TestFixture { settings->quiet = false; ASSERT(parser->parseFromArgs(3, argv)); ASSERT_EQUALS(true, settings->quiet); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void defines_noarg() { @@ -447,7 +477,7 @@ class TestCmdlineParser : public TestFixture { const char * const argv[] = {"cppcheck", "-D"}; // Fails since -D has no param ASSERT_EQUALS(false, parser->parseFromArgs(2, argv)); - ASSERT_EQUALS("cppcheck: error: argument to '-D' is missing.\n", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("cppcheck: error: argument to '-D' is missing.\n", logger->str()); } void defines_noarg2() { @@ -455,7 +485,7 @@ class TestCmdlineParser : public TestFixture { const char * const argv[] = {"cppcheck", "-D", "-v", "file.cpp"}; // Fails since -D has no param ASSERT_EQUALS(false, parser->parseFromArgs(4, argv)); - ASSERT_EQUALS("cppcheck: error: argument to '-D' is missing.\n", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("cppcheck: error: argument to '-D' is missing.\n", logger->str()); } void defines_noarg3() { @@ -463,7 +493,7 @@ class TestCmdlineParser : public TestFixture { const char * const argv[] = {"cppcheck", "-D", "--quiet", "file.cpp"}; // Fails since -D has no param ASSERT_EQUALS(false, parser->parseFromArgs(4, argv)); - ASSERT_EQUALS("cppcheck: error: argument to '-D' is missing.\n", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("cppcheck: error: argument to '-D' is missing.\n", logger->str()); } void defines() { @@ -472,7 +502,7 @@ class TestCmdlineParser : public TestFixture { settings->userDefines.clear(); ASSERT(parser->parseFromArgs(3, argv)); ASSERT_EQUALS("_WIN32=1", settings->userDefines); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void defines2() { @@ -481,7 +511,7 @@ class TestCmdlineParser : public TestFixture { settings->userDefines.clear(); ASSERT(parser->parseFromArgs(4, argv)); ASSERT_EQUALS("_WIN32=1;NODEBUG=1", settings->userDefines); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void defines3() { @@ -490,7 +520,7 @@ class TestCmdlineParser : public TestFixture { settings->userDefines.clear(); ASSERT(parser->parseFromArgs(4, argv)); ASSERT_EQUALS("DEBUG=1", settings->userDefines); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void defines4() { @@ -499,7 +529,7 @@ class TestCmdlineParser : public TestFixture { settings->userDefines.clear(); ASSERT(parser->parseFromArgs(3, argv)); ASSERT_EQUALS("DEBUG=", settings->userDefines); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void enforceLanguage1() { @@ -508,7 +538,7 @@ class TestCmdlineParser : public TestFixture { settings->enforcedLang = Settings::Language::None; ASSERT(parser->parseFromArgs(2, argv)); ASSERT_EQUALS(Settings::Language::None, settings->enforcedLang); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void enforceLanguage2() { @@ -517,21 +547,21 @@ class TestCmdlineParser : public TestFixture { settings->enforcedLang = Settings::Language::None; ASSERT(parser->parseFromArgs(4, argv)); ASSERT_EQUALS(Settings::Language::CPP, settings->enforcedLang); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void enforceLanguage3() { REDIRECT; const char * const argv[] = {"cppcheck", "-x"}; ASSERT(!parser->parseFromArgs(2, argv)); - ASSERT_EQUALS("cppcheck: error: no language given to '-x' option.\n", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("cppcheck: error: no language given to '-x' option.\n", logger->str()); } void enforceLanguage4() { REDIRECT; const char * const argv[] = {"cppcheck", "-x", "--inconclusive", "file.cpp"}; ASSERT(!parser->parseFromArgs(4, argv)); - ASSERT_EQUALS("cppcheck: error: no language given to '-x' option.\n", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("cppcheck: error: no language given to '-x' option.\n", logger->str()); } void enforceLanguage5() { @@ -540,7 +570,7 @@ class TestCmdlineParser : public TestFixture { settings->enforcedLang = Settings::Language::None; ASSERT(parser->parseFromArgs(3, argv)); ASSERT_EQUALS(Settings::Language::CPP, settings->enforcedLang); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void enforceLanguage6() { @@ -549,14 +579,14 @@ class TestCmdlineParser : public TestFixture { settings->enforcedLang = Settings::Language::None; ASSERT(parser->parseFromArgs(3, argv)); ASSERT_EQUALS(Settings::Language::C, settings->enforcedLang); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void enforceLanguage7() { REDIRECT; const char * const argv[] = {"cppcheck", "--language=unknownLanguage", "file.cpp"}; ASSERT(!parser->parseFromArgs(3, argv)); - ASSERT_EQUALS("cppcheck: error: unknown language 'unknownLanguage' enforced.\n", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("cppcheck: error: unknown language 'unknownLanguage' enforced.\n", logger->str()); } void includesnopath() { @@ -564,7 +594,7 @@ class TestCmdlineParser : public TestFixture { const char * const argv[] = {"cppcheck", "-I"}; // Fails since -I has no param ASSERT_EQUALS(false, parser->parseFromArgs(2, argv)); - ASSERT_EQUALS("cppcheck: error: argument to '-I' is missing.\n", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("cppcheck: error: argument to '-I' is missing.\n", logger->str()); } void includes() { @@ -573,7 +603,7 @@ class TestCmdlineParser : public TestFixture { settings->includePaths.clear(); ASSERT(parser->parseFromArgs(4, argv)); ASSERT_EQUALS("include/", settings->includePaths.front()); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void includesslash() { @@ -582,7 +612,7 @@ class TestCmdlineParser : public TestFixture { settings->includePaths.clear(); ASSERT(parser->parseFromArgs(4, argv)); ASSERT_EQUALS("include/", settings->includePaths.front()); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void includesbackslash() { @@ -591,7 +621,7 @@ class TestCmdlineParser : public TestFixture { settings->includePaths.clear(); ASSERT(parser->parseFromArgs(4, argv)); ASSERT_EQUALS("include/", settings->includePaths.front()); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void includesnospace() { @@ -600,7 +630,7 @@ class TestCmdlineParser : public TestFixture { settings->includePaths.clear(); ASSERT(parser->parseFromArgs(3, argv)); ASSERT_EQUALS("include/", settings->includePaths.front()); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void includes2() { @@ -611,7 +641,7 @@ class TestCmdlineParser : public TestFixture { ASSERT_EQUALS("include/", settings->includePaths.front()); settings->includePaths.pop_front(); ASSERT_EQUALS("framework/", settings->includePaths.front()); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void includesFile() { @@ -625,14 +655,14 @@ class TestCmdlineParser : public TestFixture { auto it = settings->includePaths.cbegin(); ASSERT_EQUALS("path/sub/", *it++); ASSERT_EQUALS("path2/sub1/", *it); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void includesFileNoFile() { REDIRECT; const char * const argv[] = {"cppcheck", "--includes-file=fileThatDoesNotExist.txt", "file.cpp"}; ASSERT_EQUALS(false, parser->parseFromArgs(3, argv)); - ASSERT_EQUALS("cppcheck: error: unable to open includes file at 'fileThatDoesNotExist.txt'\n", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("cppcheck: error: unable to open includes file at 'fileThatDoesNotExist.txt'\n", logger->str()); } void configExcludesFile() { @@ -647,14 +677,14 @@ class TestCmdlineParser : public TestFixture { auto it = settings->configExcludePaths.cbegin(); ASSERT_EQUALS("path/sub/", *it++); ASSERT_EQUALS("path2/sub1/", *it); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void configExcludesFileNoFile() { REDIRECT; const char * const argv[] = {"cppcheck", "--config-excludes-file=fileThatDoesNotExist.txt", "file.cpp"}; ASSERT_EQUALS( false, parser->parseFromArgs(3, argv)); - ASSERT_EQUALS("cppcheck: error: unable to open config excludes file at 'fileThatDoesNotExist.txt'\n", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("cppcheck: error: unable to open config excludes file at 'fileThatDoesNotExist.txt'\n", logger->str()); } void enabledAll() { @@ -666,7 +696,7 @@ class TestCmdlineParser : public TestFixture { ASSERT(settings->checks.isEnabled(Checks::unusedFunction)); ASSERT(settings->checks.isEnabled(Checks::missingInclude)); ASSERT(!settings->checks.isEnabled(Checks::internalCheck)); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void enabledStyle() { @@ -679,7 +709,7 @@ class TestCmdlineParser : public TestFixture { ASSERT(settings->severity.isEnabled(Severity::portability)); ASSERT(!settings->checks.isEnabled(Checks::unusedFunction)); ASSERT(!settings->checks.isEnabled(Checks::internalCheck)); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void enabledPerformance() { @@ -692,7 +722,7 @@ class TestCmdlineParser : public TestFixture { ASSERT(!settings->severity.isEnabled(Severity::portability)); ASSERT(!settings->checks.isEnabled(Checks::unusedFunction)); ASSERT(!settings->checks.isEnabled(Checks::missingInclude)); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void enabledPortability() { @@ -705,7 +735,7 @@ class TestCmdlineParser : public TestFixture { ASSERT(settings->severity.isEnabled(Severity::portability)); ASSERT(!settings->checks.isEnabled(Checks::unusedFunction)); ASSERT(!settings->checks.isEnabled(Checks::missingInclude)); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void enabledInformation() { @@ -714,7 +744,7 @@ class TestCmdlineParser : public TestFixture { ASSERT(parser->parseFromArgs(3, argv)); ASSERT(settings->severity.isEnabled(Severity::information)); ASSERT(settings->checks.isEnabled(Checks::missingInclude)); - ASSERT_EQUALS("cppcheck: '--enable=information' will no longer implicitly enable 'missingInclude' starting with 2.16. Please enable it explicitly if you require it.\n", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("cppcheck: '--enable=information' will no longer implicitly enable 'missingInclude' starting with 2.16. Please enable it explicitly if you require it.\n", logger->str()); } void enabledUnusedFunction() { @@ -722,7 +752,7 @@ class TestCmdlineParser : public TestFixture { const char * const argv[] = {"cppcheck", "--enable=unusedFunction", "file.cpp"}; ASSERT(parser->parseFromArgs(3, argv)); ASSERT(settings->checks.isEnabled(Checks::unusedFunction)); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void enabledMissingInclude() { @@ -730,7 +760,7 @@ class TestCmdlineParser : public TestFixture { const char * const argv[] = {"cppcheck", "--enable=missingInclude", "file.cpp"}; ASSERT(parser->parseFromArgs(3, argv)); ASSERT(settings->checks.isEnabled(Checks::missingInclude)); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } #ifdef CHECK_INTERNAL @@ -739,7 +769,7 @@ class TestCmdlineParser : public TestFixture { const char * const argv[] = {"cppcheck", "--enable=internal", "file.cpp"}; ASSERT(parser->parseFromArgs(3, argv)); ASSERT(settings->checks.isEnabled(Checks::internalCheck)); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } #endif @@ -753,28 +783,28 @@ class TestCmdlineParser : public TestFixture { ASSERT(settings->severity.isEnabled(Severity::portability)); ASSERT(!settings->checks.isEnabled(Checks::unusedFunction)); ASSERT(settings->checks.isEnabled(Checks::missingInclude)); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void enabledInvalid() { REDIRECT; const char * const argv[] = {"cppcheck", "--enable=warning,missingIncludeSystem,style", "file.cpp"}; ASSERT(!parser->parseFromArgs(3, argv)); - ASSERT_EQUALS("cppcheck: error: --enable parameter with the unknown name 'missingIncludeSystem'\n", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("cppcheck: error: --enable parameter with the unknown name 'missingIncludeSystem'\n", logger->str()); } void enabledError() { REDIRECT; const char * const argv[] = {"cppcheck", "--enable=error", "file.cpp"}; ASSERT(!parser->parseFromArgs(3, argv)); - ASSERT_EQUALS("cppcheck: error: --enable parameter with the unknown name 'error'\n", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("cppcheck: error: --enable parameter with the unknown name 'error'\n", logger->str()); } void enabledEmpty() { REDIRECT; const char * const argv[] = {"cppcheck", "--enable=", "file.cpp"}; ASSERT(!parser->parseFromArgs(3, argv)); - ASSERT_EQUALS("cppcheck: error: --enable parameter is empty\n", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("cppcheck: error: --enable parameter is empty\n", logger->str()); } @@ -793,7 +823,7 @@ class TestCmdlineParser : public TestFixture { ASSERT_EQUALS(false, settings->checks.isEnabled(Checks::unusedFunction)); ASSERT_EQUALS(false, settings->checks.isEnabled(Checks::missingInclude)); ASSERT_EQUALS(false, settings->checks.isEnabled(Checks::internalCheck)); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void disableMultiple() { @@ -811,7 +841,7 @@ class TestCmdlineParser : public TestFixture { ASSERT_EQUALS(false, settings->checks.isEnabled(Checks::unusedFunction)); ASSERT_EQUALS(true, settings->checks.isEnabled(Checks::missingInclude)); ASSERT_EQUALS(false, settings->checks.isEnabled(Checks::internalCheck)); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } // make sure the implied "style" checks are not added when "--enable=style" is specified @@ -830,7 +860,7 @@ class TestCmdlineParser : public TestFixture { ASSERT_EQUALS(true, settings->checks.isEnabled(Checks::unusedFunction)); ASSERT_EQUALS(false, settings->checks.isEnabled(Checks::missingInclude)); ASSERT_EQUALS(false, settings->checks.isEnabled(Checks::internalCheck)); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void disableInformationPartial() { @@ -839,7 +869,7 @@ class TestCmdlineParser : public TestFixture { ASSERT(parser->parseFromArgs(4, argv)); ASSERT(settings->severity.isEnabled(Severity::information)); ASSERT(!settings->checks.isEnabled(Checks::missingInclude)); - ASSERT_EQUALS("cppcheck: '--enable=information' will no longer implicitly enable 'missingInclude' starting with 2.16. Please enable it explicitly if you require it.\n", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("cppcheck: '--enable=information' will no longer implicitly enable 'missingInclude' starting with 2.16. Please enable it explicitly if you require it.\n", logger->str()); } void disableInformationPartial2() { @@ -848,28 +878,28 @@ class TestCmdlineParser : public TestFixture { ASSERT(parser->parseFromArgs(4, argv)); ASSERT(!settings->severity.isEnabled(Severity::information)); ASSERT(settings->checks.isEnabled(Checks::missingInclude)); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void disableInvalid() { REDIRECT; const char * const argv[] = {"cppcheck", "--disable=leaks", "file.cpp"}; ASSERT(!parser->parseFromArgs(3, argv)); - ASSERT_EQUALS("cppcheck: error: --disable parameter with the unknown name 'leaks'\n", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("cppcheck: error: --disable parameter with the unknown name 'leaks'\n", logger->str()); } void disableError() { REDIRECT; const char * const argv[] = {"cppcheck", "--disable=error", "file.cpp"}; ASSERT(!parser->parseFromArgs(3, argv)); - ASSERT_EQUALS("cppcheck: error: --disable parameter with the unknown name 'error'\n", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("cppcheck: error: --disable parameter with the unknown name 'error'\n", logger->str()); } void disableEmpty() { REDIRECT; const char * const argv[] = {"cppcheck", "--disable=", "file.cpp"}; ASSERT(!parser->parseFromArgs(3, argv)); - ASSERT_EQUALS("cppcheck: error: --disable parameter is empty\n", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("cppcheck: error: --disable parameter is empty\n", logger->str()); } void inconclusive() { @@ -878,7 +908,7 @@ class TestCmdlineParser : public TestFixture { settings->certainty.clear(); ASSERT(parser->parseFromArgs(3, argv)); ASSERT_EQUALS(true, settings->certainty.isEnabled(Certainty::inconclusive)); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void errorExitcode() { @@ -887,7 +917,7 @@ class TestCmdlineParser : public TestFixture { settings->exitCode = 0; ASSERT(parser->parseFromArgs(3, argv)); ASSERT_EQUALS(5, settings->exitCode); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void errorExitcodeMissing() { @@ -895,7 +925,7 @@ class TestCmdlineParser : public TestFixture { const char * const argv[] = {"cppcheck", "--error-exitcode=", "file.cpp"}; // Fails since exit code not given ASSERT_EQUALS(false, parser->parseFromArgs(3, argv)); - ASSERT_EQUALS("cppcheck: error: argument to '--error-exitcode=' is not valid - not an integer.\n", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("cppcheck: error: argument to '--error-exitcode=' is not valid - not an integer.\n", logger->str()); } void errorExitcodeStr() { @@ -903,14 +933,14 @@ class TestCmdlineParser : public TestFixture { const char * const argv[] = {"cppcheck", "--error-exitcode=foo", "file.cpp"}; // Fails since invalid exit code ASSERT_EQUALS(false, parser->parseFromArgs(3, argv)); - ASSERT_EQUALS("cppcheck: error: argument to '--error-exitcode=' is not valid - not an integer.\n", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("cppcheck: error: argument to '--error-exitcode=' is not valid - not an integer.\n", logger->str()); } void exitcodeSuppressionsOld() { REDIRECT; const char * const argv[] = {"cppcheck", "--exitcode-suppressions", "suppr.txt", "file.cpp"}; ASSERT_EQUALS(false, parser->parseFromArgs(4, argv)); - ASSERT_EQUALS("cppcheck: error: unrecognized command line option: \"--exitcode-suppressions\".\n", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("cppcheck: error: unrecognized command line option: \"--exitcode-suppressions\".\n", logger->str()); } void exitcodeSuppressions() { @@ -924,14 +954,14 @@ class TestCmdlineParser : public TestFixture { auto it = settings->nofail.getSuppressions().cbegin(); ASSERT_EQUALS("uninitvar", (*it++).errorId); ASSERT_EQUALS("unusedFunction", (*it).errorId); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void exitcodeSuppressionsNoFile() { REDIRECT; const char * const argv[] = {"cppcheck", "--exitcode-suppressions", "file.cpp"}; ASSERT_EQUALS(false, parser->parseFromArgs(3, argv)); - ASSERT_EQUALS("cppcheck: error: unrecognized command line option: \"--exitcode-suppressions\".\n", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("cppcheck: error: unrecognized command line option: \"--exitcode-suppressions\".\n", logger->str()); } void fileList() { @@ -946,14 +976,14 @@ class TestCmdlineParser : public TestFixture { ASSERT_EQUALS("file1.c", *it++); ASSERT_EQUALS("file2.cpp", *it++); ASSERT_EQUALS("file.cpp", *it); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void fileListNoFile() { REDIRECT; const char * const argv[] = {"cppcheck", "--file-list=files.txt", "file.cpp"}; ASSERT_EQUALS(false, parser->parseFromArgs(3, argv)); - ASSERT_EQUALS("cppcheck: error: couldn't open the file: \"files.txt\".\n", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("cppcheck: error: couldn't open the file: \"files.txt\".\n", logger->str()); } /* void fileListStdin() { @@ -962,14 +992,14 @@ class TestCmdlineParser : public TestFixture { REDIRECT; const char * const argv[] = {"cppcheck", "--file-list=-", "file.cpp"}; TODO_ASSERT_EQUALS(true, false, parser->parseFromArgs(3, argv)); - TODO_ASSERT_EQUALS("", "", GET_REDIRECT_OUTPUT); + TODO_ASSERT_EQUALS("", "", logger->str()); } */ void fileListInvalid() { REDIRECT; const char * const argv[] = {"cppcheck", "--file-list", "files.txt", "file.cpp"}; ASSERT_EQUALS(false, parser->parseFromArgs(4, argv)); - ASSERT_EQUALS("cppcheck: error: unrecognized command line option: \"--file-list\".\n", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("cppcheck: error: unrecognized command line option: \"--file-list\".\n", logger->str()); } void inlineSuppr() { @@ -978,7 +1008,7 @@ class TestCmdlineParser : public TestFixture { settings->inlineSuppressions = false; ASSERT(parser->parseFromArgs(3, argv)); ASSERT(settings->inlineSuppressions); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void jobs() { @@ -987,7 +1017,7 @@ class TestCmdlineParser : public TestFixture { settings->jobs = 0; ASSERT(parser->parseFromArgs(4, argv)); ASSERT_EQUALS(3, settings->jobs); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void jobs2() { @@ -996,7 +1026,7 @@ class TestCmdlineParser : public TestFixture { settings->jobs = 0; ASSERT(parser->parseFromArgs(3, argv)); ASSERT_EQUALS(3, settings->jobs); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void jobsMissingCount() { @@ -1004,7 +1034,7 @@ class TestCmdlineParser : public TestFixture { const char * const argv[] = {"cppcheck", "-j", "file.cpp"}; // Fails since -j is missing thread count ASSERT_EQUALS(false, parser->parseFromArgs(3, argv)); - ASSERT_EQUALS("cppcheck: error: argument to '-j' is not valid - not an integer.\n", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("cppcheck: error: argument to '-j' is not valid - not an integer.\n", logger->str()); } void jobsInvalid() { @@ -1012,21 +1042,21 @@ class TestCmdlineParser : public TestFixture { const char * const argv[] = {"cppcheck", "-j", "e", "file.cpp"}; // Fails since invalid count given for -j ASSERT_EQUALS(false, parser->parseFromArgs(4, argv)); - ASSERT_EQUALS("cppcheck: error: argument to '-j' is not valid - not an integer.\n", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("cppcheck: error: argument to '-j' is not valid - not an integer.\n", logger->str()); } void jobsNoJobs() { REDIRECT; const char * const argv[] = {"cppcheck", "-j0", "file.cpp"}; ASSERT(!parser->parseFromArgs(3, argv)); - ASSERT_EQUALS("cppcheck: error: argument for '-j' must be greater than 0.\n", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("cppcheck: error: argument for '-j' must be greater than 0.\n", logger->str()); } void jobsTooBig() { REDIRECT; const char * const argv[] = {"cppcheck", "-j1025", "file.cpp"}; ASSERT(!parser->parseFromArgs(3, argv)); - ASSERT_EQUALS("cppcheck: error: argument for '-j' is allowed to be 1024 at max.\n", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("cppcheck: error: argument for '-j' is allowed to be 1024 at max.\n", logger->str()); } void maxConfigs() { @@ -1037,7 +1067,7 @@ class TestCmdlineParser : public TestFixture { ASSERT(parser->parseFromArgs(4, argv)); ASSERT_EQUALS(12, settings->maxConfigs); ASSERT_EQUALS(false, settings->force); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void maxConfigsMissingCount() { @@ -1045,7 +1075,7 @@ class TestCmdlineParser : public TestFixture { const char * const argv[] = {"cppcheck", "--max-configs=", "file.cpp"}; // Fails since --max-configs= is missing limit ASSERT_EQUALS(false, parser->parseFromArgs(3, argv)); - ASSERT_EQUALS("cppcheck: error: argument to '--max-configs=' is not valid - not an integer.\n", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("cppcheck: error: argument to '--max-configs=' is not valid - not an integer.\n", logger->str()); } void maxConfigsInvalid() { @@ -1053,7 +1083,7 @@ class TestCmdlineParser : public TestFixture { const char * const argv[] = {"cppcheck", "--max-configs=e", "file.cpp"}; // Fails since invalid count given for --max-configs= ASSERT_EQUALS(false, parser->parseFromArgs(3, argv)); - ASSERT_EQUALS("cppcheck: error: argument to '--max-configs=' is not valid - not an integer.\n", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("cppcheck: error: argument to '--max-configs=' is not valid - not an integer.\n", logger->str()); } void maxConfigsTooSmall() { @@ -1061,7 +1091,7 @@ class TestCmdlineParser : public TestFixture { const char * const argv[] = {"cppcheck", "--max-configs=0", "file.cpp"}; // Fails since limit must be greater than 0 ASSERT_EQUALS(false, parser->parseFromArgs(3, argv)); - ASSERT_EQUALS("cppcheck: error: argument to '--max-configs=' must be greater than 0.\n", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("cppcheck: error: argument to '--max-configs=' must be greater than 0.\n", logger->str()); } void reportProgress1() { @@ -1070,7 +1100,7 @@ class TestCmdlineParser : public TestFixture { settings->reportProgress = -1; ASSERT(parser->parseFromArgs(3, argv)); ASSERT_EQUALS(10, settings->reportProgress); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void reportProgress2() { @@ -1078,7 +1108,7 @@ class TestCmdlineParser : public TestFixture { const char * const argv[] = {"cppcheck", "--report-progress=", "file.cpp"}; settings->reportProgress = -1; ASSERT(!parser->parseFromArgs(3, argv)); - ASSERT_EQUALS("cppcheck: error: argument to '--report-progress=' is not valid - not an integer.\n", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("cppcheck: error: argument to '--report-progress=' is not valid - not an integer.\n", logger->str()); } void reportProgress3() { @@ -1086,7 +1116,7 @@ class TestCmdlineParser : public TestFixture { const char * const argv[] = {"cppcheck", "--report-progress=-1", "file.cpp"}; settings->reportProgress = -1; ASSERT(!parser->parseFromArgs(3, argv)); - ASSERT_EQUALS("cppcheck: error: argument to '--report-progress=' needs to be a positive integer.\n", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("cppcheck: error: argument to '--report-progress=' needs to be a positive integer.\n", logger->str()); } void reportProgress4() { @@ -1095,7 +1125,7 @@ class TestCmdlineParser : public TestFixture { settings->reportProgress = -1; ASSERT(parser->parseFromArgs(3, argv)); ASSERT_EQUALS(0, settings->reportProgress); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void reportProgress5() { @@ -1104,7 +1134,7 @@ class TestCmdlineParser : public TestFixture { settings->reportProgress = -1; ASSERT(parser->parseFromArgs(3, argv)); ASSERT_EQUALS(1, settings->reportProgress); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void stdc99() { @@ -1113,7 +1143,7 @@ class TestCmdlineParser : public TestFixture { settings->standards.c = Standards::C89; ASSERT(parser->parseFromArgs(3, argv)); ASSERT(settings->standards.c == Standards::C99); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void stdcpp11() { @@ -1122,21 +1152,21 @@ class TestCmdlineParser : public TestFixture { settings->standards.cpp = Standards::CPP03; ASSERT(parser->parseFromArgs(3, argv)); ASSERT(settings->standards.cpp == Standards::CPP11); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void stdunknown1() { REDIRECT; const char *const argv[] = {"cppcheck", "--std=d++11", "file.cpp"}; ASSERT(!parser->parseFromArgs(3, argv)); - ASSERT_EQUALS("cppcheck: error: unknown --std value 'd++11'\n", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("cppcheck: error: unknown --std value 'd++11'\n", logger->str()); } void stdunknown2() { REDIRECT; const char *const argv[] = {"cppcheck", "--std=cplusplus11", "file.cpp"}; TODO_ASSERT(!parser->parseFromArgs(3, argv)); - TODO_ASSERT_EQUALS("cppcheck: error: unknown --std value 'cplusplus11'\n", "", GET_REDIRECT_OUTPUT); + TODO_ASSERT_EQUALS("cppcheck: error: unknown --std value 'cplusplus11'\n", "", logger->str()); } void platformWin64() { @@ -1145,7 +1175,7 @@ class TestCmdlineParser : public TestFixture { ASSERT(settings->platform.set(cppcheck::Platform::Type::Unspecified)); ASSERT(parser->parseFromArgs(3, argv)); ASSERT_EQUALS(cppcheck::Platform::Type::Win64, settings->platform.type); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void platformWin32A() { @@ -1154,7 +1184,7 @@ class TestCmdlineParser : public TestFixture { ASSERT(settings->platform.set(cppcheck::Platform::Type::Unspecified)); ASSERT(parser->parseFromArgs(3, argv)); ASSERT_EQUALS(cppcheck::Platform::Type::Win32A, settings->platform.type); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void platformWin32W() { @@ -1163,7 +1193,7 @@ class TestCmdlineParser : public TestFixture { ASSERT(settings->platform.set(cppcheck::Platform::Type::Unspecified)); ASSERT(parser->parseFromArgs(3, argv)); ASSERT_EQUALS(cppcheck::Platform::Type::Win32W, settings->platform.type); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void platformUnix32() { @@ -1172,7 +1202,7 @@ class TestCmdlineParser : public TestFixture { ASSERT(settings->platform.set(cppcheck::Platform::Type::Unspecified)); ASSERT(parser->parseFromArgs(3, argv)); ASSERT_EQUALS(cppcheck::Platform::Type::Unix32, settings->platform.type); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void platformUnix32Unsigned() { @@ -1181,7 +1211,7 @@ class TestCmdlineParser : public TestFixture { ASSERT(settings->platform.set(cppcheck::Platform::Type::Unspecified)); ASSERT(parser->parseFromArgs(3, argv)); ASSERT_EQUALS(cppcheck::Platform::Type::Unix32, settings->platform.type); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void platformUnix64() { @@ -1190,7 +1220,7 @@ class TestCmdlineParser : public TestFixture { ASSERT(settings->platform.set(cppcheck::Platform::Type::Unspecified)); ASSERT(parser->parseFromArgs(3, argv)); ASSERT_EQUALS(cppcheck::Platform::Type::Unix64, settings->platform.type); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void platformUnix64Unsigned() { @@ -1199,7 +1229,7 @@ class TestCmdlineParser : public TestFixture { ASSERT(settings->platform.set(cppcheck::Platform::Type::Unspecified)); ASSERT(parser->parseFromArgs(3, argv)); ASSERT_EQUALS(cppcheck::Platform::Type::Unix64, settings->platform.type); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void platformNative() { @@ -1208,7 +1238,7 @@ class TestCmdlineParser : public TestFixture { ASSERT(settings->platform.set(cppcheck::Platform::Type::Unspecified)); ASSERT(parser->parseFromArgs(3, argv)); ASSERT_EQUALS(cppcheck::Platform::Type::Native, settings->platform.type); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void platformUnspecified() { @@ -1217,7 +1247,7 @@ class TestCmdlineParser : public TestFixture { ASSERT(settings->platform.set(cppcheck::Platform::Type::Native)); ASSERT(parser->parseFromArgs(3, argv)); ASSERT_EQUALS(cppcheck::Platform::Type::Unspecified, settings->platform.type); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void platformPlatformFile() { @@ -1226,14 +1256,14 @@ class TestCmdlineParser : public TestFixture { ASSERT(settings->platform.set(cppcheck::Platform::Type::Unspecified)); ASSERT_EQUALS(true, parser->parseFromArgs(3, argv)); ASSERT_EQUALS(cppcheck::Platform::Type::File, settings->platform.type); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void platformUnknown() { REDIRECT; const char * const argv[] = {"cppcheck", "--platform=win128", "file.cpp"}; ASSERT(!parser->parseFromArgs(3, argv)); - ASSERT_EQUALS("cppcheck: error: unrecognized platform: 'win128'.\n", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("cppcheck: error: unrecognized platform: 'win128'.\n", logger->str()); } void plistEmpty() { @@ -1242,7 +1272,7 @@ class TestCmdlineParser : public TestFixture { settings->plistOutput = ""; ASSERT(parser->parseFromArgs(3, argv)); ASSERT(settings->plistOutput == "./"); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void plistDoesNotExist() { @@ -1251,14 +1281,14 @@ class TestCmdlineParser : public TestFixture { // Fails since folder pointed by --plist-output= does not exist ASSERT_EQUALS(false, parser->parseFromArgs(3, argv)); // TODO: output contains non-native separator - //ASSERT_EQUALS("cppcheck: error: plist folder does not exist: \"cppcheck_reports/\".\n", GET_REDIRECT_OUTPUT); + //ASSERT_EQUALS("cppcheck: error: plist folder does not exist: \"cppcheck_reports/\".\n", logger->str()); } void suppressionsOld() { REDIRECT; const char * const argv[] = {"cppcheck", "--suppressions", "suppr.txt", "file.cpp"}; ASSERT(!parser->parseFromArgs(4, argv)); - ASSERT_EQUALS("cppcheck: error: unrecognized command line option: \"--suppressions\".\n", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("cppcheck: error: unrecognized command line option: \"--suppressions\".\n", logger->str()); } void suppressions() { @@ -1272,28 +1302,28 @@ class TestCmdlineParser : public TestFixture { auto it = settings->nomsg.getSuppressions().cbegin(); ASSERT_EQUALS("uninitvar", (*it++).errorId); ASSERT_EQUALS("unusedFunction", (*it).errorId); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void suppressionsNoFile1() { REDIRECT; const char * const argv[] = {"cppcheck", "--suppressions-list=", "file.cpp"}; ASSERT_EQUALS(false, parser->parseFromArgs(3, argv)); - ASSERT_EQUALS(false, GET_REDIRECT_OUTPUT.find("If you want to pass two files") != std::string::npos); + ASSERT_EQUALS(false, logger->str().find("If you want to pass two files") != std::string::npos); } void suppressionsNoFile2() { REDIRECT; const char * const argv[] = {"cppcheck", "--suppressions-list=a.suppr,b.suppr", "file.cpp"}; ASSERT_EQUALS(false, parser->parseFromArgs(3, argv)); - ASSERT_EQUALS(true, GET_REDIRECT_OUTPUT.find("If you want to pass two files") != std::string::npos); + ASSERT_EQUALS(true, logger->str().find("If you want to pass two files") != std::string::npos); } void suppressionsNoFile3() { REDIRECT; const char * const argv[] = {"cppcheck", "--suppressions-list=a.suppr b.suppr", "file.cpp"}; ASSERT_EQUALS(false, parser->parseFromArgs(3, argv)); - ASSERT_EQUALS(true, GET_REDIRECT_OUTPUT.find("If you want to pass two files") != std::string::npos); + ASSERT_EQUALS(true, logger->str().find("If you want to pass two files") != std::string::npos); } static Suppressions::ErrorMessage errorMessage(const std::string &errorId, const std::string &fileName, int lineNumber) { @@ -1309,7 +1339,7 @@ class TestCmdlineParser : public TestFixture { const char * const argv[] = {"cppcheck", "--suppress=uninitvar", "file.cpp"}; ASSERT(parser->parseFromArgs(3, argv)); ASSERT_EQUALS(true, settings->nomsg.isSuppressed(errorMessage("uninitvar", "file.cpp", 1))); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void suppressionSingleFile() { @@ -1317,7 +1347,7 @@ class TestCmdlineParser : public TestFixture { const char * const argv[] = {"cppcheck", "--suppress=uninitvar:file.cpp", "file.cpp"}; ASSERT(parser->parseFromArgs(3, argv)); ASSERT_EQUALS(true, settings->nomsg.isSuppressed(errorMessage("uninitvar", "file.cpp", 1U))); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void suppressionTwo() { @@ -1326,7 +1356,7 @@ class TestCmdlineParser : public TestFixture { TODO_ASSERT_EQUALS(true, false, parser->parseFromArgs(3, argv)); TODO_ASSERT_EQUALS(true, false, settings->nomsg.isSuppressed(errorMessage("uninitvar", "file.cpp", 1U))); TODO_ASSERT_EQUALS(true, false, settings->nomsg.isSuppressed(errorMessage("noConstructor", "file.cpp", 1U))); - TODO_ASSERT_EQUALS("", "cppcheck: error: Failed to add suppression. Invalid id \"uninitvar,noConstructor\"\n", GET_REDIRECT_OUTPUT); + TODO_ASSERT_EQUALS("", "cppcheck: error: Failed to add suppression. Invalid id \"uninitvar,noConstructor\"\n", logger->str()); } void suppressionTwoSeparate() { @@ -1335,7 +1365,7 @@ class TestCmdlineParser : public TestFixture { ASSERT(parser->parseFromArgs(4, argv)); ASSERT_EQUALS(true, settings->nomsg.isSuppressed(errorMessage("uninitvar", "file.cpp", 1U))); ASSERT_EQUALS(true, settings->nomsg.isSuppressed(errorMessage("noConstructor", "file.cpp", 1U))); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void templates() { @@ -1346,7 +1376,7 @@ class TestCmdlineParser : public TestFixture { ASSERT(parser->parseFromArgs(4, argv)); ASSERT_EQUALS("{file}:{line},{severity},{id},{message}", settings->templateFormat); ASSERT_EQUALS("{file}:{line}:{column} {info}", settings->templateLocation); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void templatesGcc() { @@ -1357,7 +1387,7 @@ class TestCmdlineParser : public TestFixture { ASSERT(parser->parseFromArgs(3, argv)); ASSERT_EQUALS("{file}:{line}:{column}: warning: {message} [{id}]\n{code}", settings->templateFormat); ASSERT_EQUALS("{file}:{line}:{column}: note: {info}\n{code}", settings->templateLocation); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void templatesVs() { @@ -1368,7 +1398,7 @@ class TestCmdlineParser : public TestFixture { ASSERT(parser->parseFromArgs(3, argv)); ASSERT_EQUALS("{file}({line}): {severity}: {message}", settings->templateFormat); ASSERT_EQUALS("", settings->templateLocation); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void templatesEdit() { @@ -1379,7 +1409,7 @@ class TestCmdlineParser : public TestFixture { ASSERT(parser->parseFromArgs(3, argv)); ASSERT_EQUALS("{file} +{line}: {severity}: {message}", settings->templateFormat); ASSERT_EQUALS("", settings->templateLocation); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void templatesCppcheck1() { @@ -1390,7 +1420,7 @@ class TestCmdlineParser : public TestFixture { ASSERT(parser->parseFromArgs(3, argv)); ASSERT_EQUALS("{callstack}: ({severity}{inconclusive:, inconclusive}) {message}", settings->templateFormat); ASSERT_EQUALS("", settings->templateLocation); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void templatesDaca2() { @@ -1402,7 +1432,7 @@ class TestCmdlineParser : public TestFixture { ASSERT_EQUALS("{file}:{line}:{column}: {severity}:{inconclusive:inconclusive:} {message} [{id}]", settings->templateFormat); ASSERT_EQUALS("{file}:{line}:{column}: note: {info}", settings->templateLocation); ASSERT_EQUALS(true, settings->daca); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void templatesSelfcheck() { @@ -1413,7 +1443,7 @@ class TestCmdlineParser : public TestFixture { ASSERT(parser->parseFromArgs(3, argv)); ASSERT_EQUALS("{file}:{line}:{column}: {severity}:{inconclusive:inconclusive:} {message} [{id}]\n{code}", settings->templateFormat); ASSERT_EQUALS("{file}:{line}:{column}: note: {info}\n{code}", settings->templateLocation); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } // TODO: we should bail out on this @@ -1425,7 +1455,7 @@ class TestCmdlineParser : public TestFixture { TODO_ASSERT(!parser->parseFromArgs(3, argv)); ASSERT_EQUALS("selfchek", settings->templateFormat); ASSERT_EQUALS("", settings->templateLocation); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void templateFormatInvalid() { @@ -1434,7 +1464,7 @@ class TestCmdlineParser : public TestFixture { settings->templateLocation.clear(); const char* const argv[] = { "cppcheck", "--template", "file.cpp" }; ASSERT(!parser->parseFromArgs(3, argv)); - ASSERT_EQUALS("cppcheck: error: unrecognized command line option: \"--template\".\n", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("cppcheck: error: unrecognized command line option: \"--template\".\n", logger->str()); } // will use the default @@ -1447,14 +1477,14 @@ class TestCmdlineParser : public TestFixture { ASSERT(parser->parseFromArgs(3, argv)); ASSERT_EQUALS("{file}:{line}:{column}: {inconclusive:}{severity}:{inconclusive: inconclusive:} {message} [{id}]\n{code}", settings->templateFormat); ASSERT_EQUALS("{file}:{line}:{column}: note: {info}\n{code}", settings->templateLocation); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void templateLocationInvalid() { REDIRECT; const char* const argv[] = { "cppcheck", "--template-location", "--template={file}", "file.cpp" }; ASSERT(!parser->parseFromArgs(4, argv)); - ASSERT_EQUALS("cppcheck: error: unrecognized command line option: \"--template-location\".\n", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("cppcheck: error: unrecognized command line option: \"--template-location\".\n", logger->str()); } // will use the default @@ -1467,7 +1497,7 @@ class TestCmdlineParser : public TestFixture { ASSERT(parser->parseFromArgs(3, argv)); ASSERT_EQUALS("{file}:{line}:{column}: {inconclusive:}{severity}:{inconclusive: inconclusive:} {message} [{id}]\n{code}", settings->templateFormat); ASSERT_EQUALS("{file}:{line}:{column}: note: {info}\n{code}", settings->templateLocation); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void xml() { @@ -1478,7 +1508,7 @@ class TestCmdlineParser : public TestFixture { ASSERT(parser->parseFromArgs(3, argv)); ASSERT(settings->xml); ASSERT_EQUALS(1, settings->xml_version); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void xmlver2() { @@ -1489,7 +1519,7 @@ class TestCmdlineParser : public TestFixture { ASSERT(parser->parseFromArgs(3, argv)); ASSERT(settings->xml); ASSERT_EQUALS(2, settings->xml_version); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void xmlver2both() { @@ -1500,7 +1530,7 @@ class TestCmdlineParser : public TestFixture { ASSERT(parser->parseFromArgs(4, argv)); ASSERT(settings->xml); ASSERT_EQUALS(2, settings->xml_version); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void xmlver2both2() { @@ -1511,7 +1541,7 @@ class TestCmdlineParser : public TestFixture { ASSERT(parser->parseFromArgs(4, argv)); ASSERT(settings->xml); ASSERT_EQUALS(2, settings->xml_version); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void xmlverunknown() { @@ -1519,7 +1549,7 @@ class TestCmdlineParser : public TestFixture { const char * const argv[] = {"cppcheck", "--xml", "--xml-version=3", "file.cpp"}; // FAils since unknown XML format version ASSERT_EQUALS(false, parser->parseFromArgs(4, argv)); - ASSERT_EQUALS("cppcheck: error: '--xml-version' can only be 2.\n", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("cppcheck: error: '--xml-version' can only be 2.\n", logger->str()); } void xmlverinvalid() { @@ -1527,7 +1557,7 @@ class TestCmdlineParser : public TestFixture { const char * const argv[] = {"cppcheck", "--xml", "--xml-version=a", "file.cpp"}; // FAils since unknown XML format version ASSERT_EQUALS(false, parser->parseFromArgs(4, argv)); - ASSERT_EQUALS("cppcheck: error: argument to '--xml-version=' is not valid - not an integer.\n", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("cppcheck: error: argument to '--xml-version=' is not valid - not an integer.\n", logger->str()); } void doc() { @@ -1536,6 +1566,7 @@ class TestCmdlineParser : public TestFixture { ASSERT(parser->parseFromArgs(2, argv)); ASSERT(parser->exitAfterPrinting()); ASSERT(startsWith(GET_REDIRECT_OUTPUT, "## ")); + ASSERT_EQUALS("", logger->str()); } void showtime() { @@ -1544,7 +1575,7 @@ class TestCmdlineParser : public TestFixture { settings->showtime = SHOWTIME_MODES::SHOWTIME_NONE; ASSERT(parser->parseFromArgs(3, argv)); ASSERT(settings->showtime == SHOWTIME_MODES::SHOWTIME_SUMMARY); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void errorlist1() { @@ -1552,7 +1583,7 @@ class TestCmdlineParser : public TestFixture { const char * const argv[] = {"cppcheck", "--errorlist"}; ASSERT(parser->parseFromArgs(2, argv)); ASSERT(parser->getShowErrorMessages()); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void errorlistverbose1() { @@ -1561,7 +1592,7 @@ class TestCmdlineParser : public TestFixture { settings->verbose = false; ASSERT(parser->parseFromArgs(3, argv)); ASSERT(settings->verbose); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void errorlistverbose2() { @@ -1570,7 +1601,7 @@ class TestCmdlineParser : public TestFixture { settings->verbose = false; ASSERT(parser->parseFromArgs(3, argv)); ASSERT(settings->verbose); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void ignorepathsnopath() { @@ -1578,7 +1609,7 @@ class TestCmdlineParser : public TestFixture { const char * const argv[] = {"cppcheck", "-i"}; // Fails since no ignored path given ASSERT_EQUALS(false, parser->parseFromArgs(2, argv)); - ASSERT_EQUALS("cppcheck: error: argument to '-i' is missing.\n", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("cppcheck: error: argument to '-i' is missing.\n", logger->str()); } void exceptionhandling() { @@ -1589,7 +1620,7 @@ class TestCmdlineParser : public TestFixture { ASSERT(parser->parseFromArgs(3, argv)); ASSERT(settings->exceptionHandling); ASSERT_EQUALS(stderr, CppCheckExecutor::getExceptionOutput()); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void exceptionhandling2() { @@ -1600,7 +1631,7 @@ class TestCmdlineParser : public TestFixture { ASSERT(parser->parseFromArgs(3, argv)); ASSERT(settings->exceptionHandling); ASSERT_EQUALS(stderr, CppCheckExecutor::getExceptionOutput()); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void exceptionhandling3() { @@ -1611,21 +1642,21 @@ class TestCmdlineParser : public TestFixture { ASSERT(parser->parseFromArgs(3, argv)); ASSERT(settings->exceptionHandling); ASSERT_EQUALS(stdout, CppCheckExecutor::getExceptionOutput()); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void exceptionhandlingInvalid() { REDIRECT; const char * const argv[] = {"cppcheck", "--exception-handling=exfile"}; ASSERT_EQUALS(false, parser->parseFromArgs(2, argv)); - ASSERT_EQUALS("cppcheck: error: invalid '--exception-handling' argument\n", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("cppcheck: error: invalid '--exception-handling' argument\n", logger->str()); } void exceptionhandlingInvalid2() { REDIRECT; const char * const argv[] = {"cppcheck", "--exception-handling-foo"}; ASSERT_EQUALS(false, parser->parseFromArgs(2, argv)); - ASSERT_EQUALS("cppcheck: error: unrecognized command line option: \"--exception-handling-foo\".\n", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("cppcheck: error: unrecognized command line option: \"--exception-handling-foo\".\n", logger->str()); } void clang() { @@ -1636,7 +1667,7 @@ class TestCmdlineParser : public TestFixture { ASSERT(parser->parseFromArgs(3, argv)); ASSERT(settings->clang); ASSERT_EQUALS("exe", settings->clangExecutable); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void clang2() { @@ -1647,14 +1678,14 @@ class TestCmdlineParser : public TestFixture { ASSERT(parser->parseFromArgs(3, argv)); ASSERT(settings->clang); ASSERT_EQUALS("clang-14", settings->clangExecutable); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void clangInvalid() { REDIRECT; const char * const argv[] = {"cppcheck", "--clang-foo"}; ASSERT_EQUALS(false, parser->parseFromArgs(2, argv)); - ASSERT_EQUALS("cppcheck: error: unrecognized command line option: \"--clang-foo\".\n", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("cppcheck: error: unrecognized command line option: \"--clang-foo\".\n", logger->str()); } void valueFlowMaxIterations() { @@ -1663,7 +1694,7 @@ class TestCmdlineParser : public TestFixture { settings->valueFlowMaxIterations = SIZE_MAX; ASSERT(parser->parseFromArgs(3, argv)); ASSERT_EQUALS(0, settings->valueFlowMaxIterations); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void valueFlowMaxIterations2() { @@ -1672,28 +1703,28 @@ class TestCmdlineParser : public TestFixture { settings->valueFlowMaxIterations = SIZE_MAX; ASSERT(parser->parseFromArgs(3, argv)); ASSERT_EQUALS(11, settings->valueFlowMaxIterations); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void valueFlowMaxIterationsInvalid() { REDIRECT; const char * const argv[] = {"cppcheck", "--valueflow-max-iterations"}; ASSERT(!parser->parseFromArgs(2, argv)); - ASSERT_EQUALS("cppcheck: error: unrecognized command line option: \"--valueflow-max-iterations\".\n", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("cppcheck: error: unrecognized command line option: \"--valueflow-max-iterations\".\n", logger->str()); } void valueFlowMaxIterationsInvalid2() { REDIRECT; const char * const argv[] = {"cppcheck", "--valueflow-max-iterations=seven"}; ASSERT(!parser->parseFromArgs(2, argv)); - ASSERT_EQUALS("cppcheck: error: argument to '--valueflow-max-iterations=' is not valid - not an integer.\n", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("cppcheck: error: argument to '--valueflow-max-iterations=' is not valid - not an integer.\n", logger->str()); } void valueFlowMaxIterationsInvalid3() { REDIRECT; const char * const argv[] = {"cppcheck", "--valueflow-max-iterations=-1"}; ASSERT(!parser->parseFromArgs(2, argv)); - ASSERT_EQUALS("cppcheck: error: argument to '--valueflow-max-iterations=' is not valid - needs to be positive.\n", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("cppcheck: error: argument to '--valueflow-max-iterations=' is not valid - needs to be positive.\n", logger->str()); } void checksMaxTime() { @@ -1702,21 +1733,21 @@ class TestCmdlineParser : public TestFixture { settings->checksMaxTime = 0; ASSERT(parser->parseFromArgs(3, argv)); ASSERT_EQUALS(12, settings->checksMaxTime); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void checksMaxTime2() { REDIRECT; const char * const argv[] = {"cppcheck", "--checks-max-time=-1", "file.cpp"}; ASSERT(!parser->parseFromArgs(3, argv)); - ASSERT_EQUALS("cppcheck: error: argument to '--checks-max-time=' needs to be a positive integer.\n", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("cppcheck: error: argument to '--checks-max-time=' needs to be a positive integer.\n", logger->str()); } void checksMaxTimeInvalid() { REDIRECT; const char * const argv[] = {"cppcheck", "--checks-max-time=one", "file.cpp"}; ASSERT(!parser->parseFromArgs(3, argv)); - ASSERT_EQUALS("cppcheck: error: argument to '--checks-max-time=' is not valid - not an integer.\n", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("cppcheck: error: argument to '--checks-max-time=' is not valid - not an integer.\n", logger->str()); } #ifdef THREADING_MODEL_FORK @@ -1726,7 +1757,7 @@ class TestCmdlineParser : public TestFixture { settings->loadAverage = 0; ASSERT(parser->parseFromArgs(4, argv)); ASSERT_EQUALS(12, settings->loadAverage); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void loadAverage2() { @@ -1735,14 +1766,14 @@ class TestCmdlineParser : public TestFixture { settings->loadAverage = 0; ASSERT(parser->parseFromArgs(3, argv)); ASSERT_EQUALS(12, settings->loadAverage); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void loadAverageInvalid() { REDIRECT; const char * const argv[] = {"cppcheck", "-l", "one", "file.cpp"}; ASSERT(!parser->parseFromArgs(4, argv)); - ASSERT_EQUALS("cppcheck: error: argument to '-l' is not valid - not an integer.\n", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("cppcheck: error: argument to '-l' is not valid - not an integer.\n", logger->str()); } #endif @@ -1752,14 +1783,14 @@ class TestCmdlineParser : public TestFixture { settings->maxCtuDepth = 0; ASSERT(parser->parseFromArgs(3, argv)); ASSERT_EQUALS(12, settings->maxCtuDepth); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void maxCtuDepthInvalid() { REDIRECT; const char * const argv[] = {"cppcheck", "--max-ctu-depth=one", "file.cpp"}; ASSERT(!parser->parseFromArgs(3, argv)); - ASSERT_EQUALS("cppcheck: error: argument to '--max-ctu-depth=' is not valid - not an integer.\n", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("cppcheck: error: argument to '--max-ctu-depth=' is not valid - not an integer.\n", logger->str()); } void performanceValueflowMaxTime() { @@ -1768,14 +1799,14 @@ class TestCmdlineParser : public TestFixture { settings->performanceValueFlowMaxTime = 0; ASSERT(parser->parseFromArgs(3, argv)); ASSERT_EQUALS(12, settings->performanceValueFlowMaxTime); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void performanceValueflowMaxTimeInvalid() { REDIRECT; const char * const argv[] = {"cppcheck", "--performance-valueflow-max-time=one", "file.cpp"}; ASSERT(!parser->parseFromArgs(3, argv)); - ASSERT_EQUALS("cppcheck: error: argument to '--performance-valueflow-max-time=' is not valid - not an integer.\n", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("cppcheck: error: argument to '--performance-valueflow-max-time=' is not valid - not an integer.\n", logger->str()); } void performanceValueFlowMaxIfCount() { @@ -1784,14 +1815,14 @@ class TestCmdlineParser : public TestFixture { settings->performanceValueFlowMaxIfCount = 0; ASSERT(parser->parseFromArgs(3, argv)); ASSERT_EQUALS(12, settings->performanceValueFlowMaxIfCount); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void performanceValueFlowMaxIfCountInvalid() { REDIRECT; const char * const argv[] = {"cppcheck", "--performance-valueflow-max-if-count=one", "file.cpp"}; ASSERT(!parser->parseFromArgs(3, argv)); - ASSERT_EQUALS("cppcheck: error: argument to '--performance-valueflow-max-if-count=' is not valid - not an integer.\n", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("cppcheck: error: argument to '--performance-valueflow-max-if-count=' is not valid - not an integer.\n", logger->str()); } void templateMaxTime() { @@ -1800,21 +1831,21 @@ class TestCmdlineParser : public TestFixture { settings->templateMaxTime = 0; ASSERT(parser->parseFromArgs(3, argv)); ASSERT_EQUALS(12, settings->templateMaxTime); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void templateMaxTimeInvalid() { REDIRECT; const char * const argv[] = {"cppcheck", "--template-max-time=one", "file.cpp"}; ASSERT(!parser->parseFromArgs(3, argv)); - ASSERT_EQUALS("cppcheck: error: argument to '--template-max-time=' is not valid - not an integer.\n", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("cppcheck: error: argument to '--template-max-time=' is not valid - not an integer.\n", logger->str()); } void templateMaxTimeInvalid2() { REDIRECT; const char * const argv[] = {"cppcheck", "--template-max-time=-1", "file.cpp"}; ASSERT(!parser->parseFromArgs(3, argv)); - ASSERT_EQUALS("cppcheck: error: argument to '--template-max-time=' is not valid - needs to be positive.\n", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("cppcheck: error: argument to '--template-max-time=' is not valid - needs to be positive.\n", logger->str()); } void typedefMaxTime() { @@ -1823,21 +1854,21 @@ class TestCmdlineParser : public TestFixture { settings->typedefMaxTime = 0; ASSERT(parser->parseFromArgs(3, argv)); ASSERT_EQUALS(12, settings->typedefMaxTime); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void typedefMaxTimeInvalid() { REDIRECT; const char * const argv[] = {"cppcheck", "--typedef-max-time=one", "file.cpp"}; ASSERT(!parser->parseFromArgs(3, argv)); - ASSERT_EQUALS("cppcheck: error: argument to '--typedef-max-time=' is not valid - not an integer.\n", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("cppcheck: error: argument to '--typedef-max-time=' is not valid - not an integer.\n", logger->str()); } void typedefMaxTimeInvalid2() { REDIRECT; const char * const argv[] = {"cppcheck", "--typedef-max-time=-1", "file.cpp"}; ASSERT(!parser->parseFromArgs(3, argv)); - ASSERT_EQUALS("cppcheck: error: argument to '--typedef-max-time=' is not valid - needs to be positive.\n", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("cppcheck: error: argument to '--typedef-max-time=' is not valid - needs to be positive.\n", logger->str()); } void ignorepaths1() { @@ -1846,7 +1877,7 @@ class TestCmdlineParser : public TestFixture { ASSERT(parser->parseFromArgs(3, argv)); ASSERT_EQUALS(1, parser->getIgnoredPaths().size()); ASSERT_EQUALS("src", parser->getIgnoredPaths()[0]); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void ignorepaths2() { @@ -1855,7 +1886,7 @@ class TestCmdlineParser : public TestFixture { ASSERT(parser->parseFromArgs(4, argv)); ASSERT_EQUALS(1, parser->getIgnoredPaths().size()); ASSERT_EQUALS("src", parser->getIgnoredPaths()[0]); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void ignorepaths3() { @@ -1865,7 +1896,7 @@ class TestCmdlineParser : public TestFixture { ASSERT_EQUALS(2, parser->getIgnoredPaths().size()); ASSERT_EQUALS("src", parser->getIgnoredPaths()[0]); ASSERT_EQUALS("module", parser->getIgnoredPaths()[1]); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void ignorepaths4() { @@ -1875,7 +1906,7 @@ class TestCmdlineParser : public TestFixture { ASSERT_EQUALS(2, parser->getIgnoredPaths().size()); ASSERT_EQUALS("src", parser->getIgnoredPaths()[0]); ASSERT_EQUALS("module", parser->getIgnoredPaths()[1]); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void ignorefilepaths1() { @@ -1884,7 +1915,7 @@ class TestCmdlineParser : public TestFixture { ASSERT(parser->parseFromArgs(3, argv)); ASSERT_EQUALS(1, parser->getIgnoredPaths().size()); ASSERT_EQUALS("foo.cpp", parser->getIgnoredPaths()[0]); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void ignorefilepaths2() { @@ -1893,7 +1924,7 @@ class TestCmdlineParser : public TestFixture { ASSERT(parser->parseFromArgs(3, argv)); ASSERT_EQUALS(1, parser->getIgnoredPaths().size()); ASSERT_EQUALS("src/foo.cpp", parser->getIgnoredPaths()[0]); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void checkconfig() { @@ -1902,14 +1933,14 @@ class TestCmdlineParser : public TestFixture { settings->checkConfiguration = false; ASSERT(parser->parseFromArgs(3, argv)); ASSERT_EQUALS(true, settings->checkConfiguration); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void unknownParam() { REDIRECT; const char * const argv[] = {"cppcheck", "--foo", "file.cpp"}; ASSERT(!parser->parseFromArgs(3, argv)); - ASSERT_EQUALS("cppcheck: error: unrecognized command line option: \"--foo\".\n", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("cppcheck: error: unrecognized command line option: \"--foo\".\n", logger->str()); } void undefs() { @@ -1918,7 +1949,7 @@ class TestCmdlineParser : public TestFixture { ASSERT(parser->parseFromArgs(3, argv)); ASSERT_EQUALS(1, settings->userUndefs.size()); ASSERT(settings->userUndefs.find("_WIN32") != settings->userUndefs.end()); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void undefs2() { @@ -1928,7 +1959,7 @@ class TestCmdlineParser : public TestFixture { ASSERT_EQUALS(2, settings->userUndefs.size()); ASSERT(settings->userUndefs.find("_WIN32") != settings->userUndefs.end()); ASSERT(settings->userUndefs.find("NODEBUG") != settings->userUndefs.end()); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void undefs_noarg() { @@ -1936,7 +1967,7 @@ class TestCmdlineParser : public TestFixture { const char * const argv[] = {"cppcheck", "-U"}; // Fails since -U has no param ASSERT_EQUALS(false, parser->parseFromArgs(2, argv)); - ASSERT_EQUALS("cppcheck: error: argument to '-U' is missing.\n", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("cppcheck: error: argument to '-U' is missing.\n", logger->str()); } void undefs_noarg2() { @@ -1944,7 +1975,7 @@ class TestCmdlineParser : public TestFixture { const char * const argv[] = {"cppcheck", "-U", "-v", "file.cpp"}; // Fails since -U has no param ASSERT_EQUALS(false, parser->parseFromArgs(4, argv)); - ASSERT_EQUALS("cppcheck: error: argument to '-U' is missing.\n", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("cppcheck: error: argument to '-U' is missing.\n", logger->str()); } void undefs_noarg3() { @@ -1952,28 +1983,28 @@ class TestCmdlineParser : public TestFixture { const char * const argv[] = {"cppcheck", "-U", "--quiet", "file.cpp"}; // Fails since -U has no param ASSERT_EQUALS(false, parser->parseFromArgs(4, argv)); - ASSERT_EQUALS("cppcheck: error: argument to '-U' is missing.\n", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("cppcheck: error: argument to '-U' is missing.\n", logger->str()); } void cppcheckBuildDirExistent() { REDIRECT; const char * const argv[] = {"cppcheck", "--cppcheck-build-dir=.", "file.cpp"}; ASSERT_EQUALS(true, parser->parseFromArgs(3, argv)); - ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("", logger->str()); } void cppcheckBuildDirNonExistent() { REDIRECT; const char * const argv[] = {"cppcheck", "--cppcheck-build-dir=non-existent-path"}; ASSERT_EQUALS(false, parser->parseFromArgs(2, argv)); - ASSERT_EQUALS("cppcheck: error: Directory 'non-existent-path' specified by --cppcheck-build-dir argument has to be existent.\n", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("cppcheck: error: Directory 'non-existent-path' specified by --cppcheck-build-dir argument has to be existent.\n", logger->str()); } void cppcheckBuildDirEmpty() { REDIRECT; const char * const argv[] = {"cppcheck", "--cppcheck-build-dir="}; ASSERT_EQUALS(false, parser->parseFromArgs(2, argv)); - ASSERT_EQUALS("cppcheck: error: Directory '' specified by --cppcheck-build-dir argument has to be existent.\n", GET_REDIRECT_OUTPUT); + ASSERT_EQUALS("cppcheck: error: Directory '' specified by --cppcheck-build-dir argument has to be existent.\n", logger->str()); } }; diff --git a/test/testsymboldatabase.cpp b/test/testsymboldatabase.cpp index bbd76e181dd..9bf295a29a1 100644 --- a/test/testsymboldatabase.cpp +++ b/test/testsymboldatabase.cpp @@ -5494,6 +5494,23 @@ class TestSymbolDatabase : public TestFixture { const Token* u = Token::findsimplematch(s, "uint64_t"); ASSERT(u && !u->isIncompleteVar()); } + { + GET_SYMBOL_DB("void f() {\n" + " std::string* p = new std::string;\n" + " std::string* q = new std::string(\"abc\");\n" + " std::string* r = new std::string{ \"def\" };\n" + " std::string* s = new std::string[3]{ \"ghi\" };\n" + "}\n"); + ASSERT(db && errout.str().empty()); + const Token* s1 = Token::findsimplematch(tokenizer.tokens(), "string ;"); + ASSERT(s1 && !s1->isIncompleteVar()); + const Token* s2 = Token::findsimplematch(s1->next(), "string ("); + ASSERT(s2 && !s2->isIncompleteVar()); + const Token* s3 = Token::findsimplematch(s2->next(), "string {"); + ASSERT(s3 && !s3->isIncompleteVar()); + const Token* s4 = Token::findsimplematch(s3->next(), "string ["); + ASSERT(s4 && !s4->isIncompleteVar()); + } { GET_SYMBOL_DB("void f() {\n" " T** p;\n"