walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

TestCmdlineParser: fixed some TODO test cases (#5325)

This commit is contained in:
Oliver Stöneberg 2023-08-14 11:37:59 +02:00 committed by GitHub
parent d076da8f7c
commit 693084470d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 51 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -716,7 +716,7 @@ test/testclangimport.o: test/testclangimport.cpp lib/check.h lib/clangimport.h l
test/testclass.o: test/testclass.cpp externals/simplecpp/simplecpp.h lib/check.h lib/checkclass.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/preprocessor.h lib/settings.h lib/sourcelocation.h lib/standards.h lib/suppressions.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h test/testclass.o: test/testclass.cpp externals/simplecpp/simplecpp.h lib/check.h lib/checkclass.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/preprocessor.h lib/settings.h lib/sourcelocation.h lib/standards.h lib/suppressions.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h
$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testclass.cpp $(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testclass.cpp
test/testcmdlineparser.o: test/testcmdlineparser.cpp cli/cmdlineparser.h cli/cppcheckexecutor.h lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/timer.h lib/utils.h test/fixture.h test/redirect.h test/testcmdlineparser.o: test/testcmdlineparser.cpp cli/cmdlineparser.h cli/cppcheckexecutor.h lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/templatesimplifier.h lib/timer.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h test/helpers.h test/redirect.h
$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testcmdlineparser.cpp $(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testcmdlineparser.cpp
test/testcolor.o: test/testcolor.cpp lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/utils.h test/fixture.h test/testcolor.o: test/testcolor.cpp lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/utils.h test/fixture.h

71
test/testcmdlineparser.cpp
View File

@ -20,6 +20,7 @@
#include "config.h" #include "config.h"
#include "cppcheckexecutor.h" #include "cppcheckexecutor.h"
#include "errortypes.h" #include "errortypes.h"
#include "helpers.h"
#include "platform.h" #include "platform.h"
#include "redirect.h" #include "redirect.h"
#include "settings.h" #include "settings.h"
@ -608,12 +609,18 @@ private:
ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
} }
// TODO: fails since the file is not found
void includesFile() { void includesFile() {
REDIRECT; REDIRECT;
const char * const argv[] = {"cppcheck", "--includes-file=fileThatDoesNotExist.txt", "file.cpp"}; ScopedFile file("includes.txt",
TODO_ASSERT_EQUALS(true, false, parser->parseFromArgs(3, argv)); "path/sub\n"
TODO_ASSERT_EQUALS("", "cppcheck: error: unable to open includes file at 'fileThatDoesNotExist.txt'\n", GET_REDIRECT_OUTPUT); "path2/sub1\n");
const char * const argv[] = {"cppcheck", "--includes-file=includes.txt", "file.cpp"};
ASSERT_EQUALS(true, parser->parseFromArgs(3, argv));
ASSERT_EQUALS(2, settings->includePaths.size());
auto it = settings->includePaths.cbegin();
ASSERT_EQUALS("path/sub/", *it++);
ASSERT_EQUALS("path2/sub1/", *it);
ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
} }
void includesFileNoFile() { void includesFileNoFile() {
@ -623,14 +630,19 @@ private:
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", GET_REDIRECT_OUTPUT);
} }
// TODO: fails since the file is not found
void configExcludesFile() { void configExcludesFile() {
REDIRECT; REDIRECT;
const char * const argv[] = {"cppcheck", "--config-excludes-file=fileThatDoesNotExist.txt", "file.cpp"}; ScopedFile file("excludes.txt",
settings->includePaths.clear(); "path/sub\n"
TODO_ASSERT_EQUALS(true, false, parser->parseFromArgs(3, argv)); "path2/sub1\n");
// TODO: add checks const char * const argv[] = {"cppcheck", "--config-excludes-file=excludes.txt", "file.cpp"};
TODO_ASSERT_EQUALS("", "cppcheck: error: unable to open config excludes file at 'fileThatDoesNotExist.txt'\n", GET_REDIRECT_OUTPUT); settings->configExcludePaths.clear();
ASSERT_EQUALS(true, parser->parseFromArgs(3, argv));
ASSERT_EQUALS(2, settings->configExcludePaths.size());
auto it = settings->configExcludePaths.cbegin();
ASSERT_EQUALS("path/sub/", *it++);
ASSERT_EQUALS("path2/sub1/", *it);
ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
} }
void configExcludesFileNoFile() { void configExcludesFileNoFile() {
@ -897,11 +909,17 @@ private:
} }
void exitcodeSuppressions() { void exitcodeSuppressions() {
// TODO: Fails since cannot open the file
REDIRECT; REDIRECT;
ScopedFile file("suppr.txt",
"uninitvar\n"
"unusedFunction\n");
const char * const argv[] = {"cppcheck", "--exitcode-suppressions=suppr.txt", "file.cpp"}; const char * const argv[] = {"cppcheck", "--exitcode-suppressions=suppr.txt", "file.cpp"};
TODO_ASSERT_EQUALS(true, false, parser->parseFromArgs(3, argv)); ASSERT_EQUALS(true, parser->parseFromArgs(3, argv));
TODO_ASSERT_EQUALS("", "cppcheck: error: couldn't open the file: \"suppr.txt\".\n", GET_REDIRECT_OUTPUT); ASSERT_EQUALS(2, settings->nofail.getSuppressions().size());
auto it = settings->nofail.getSuppressions().cbegin();
ASSERT_EQUALS("uninitvar", (*it++).errorId);
ASSERT_EQUALS("unusedFunction", (*it).errorId);
ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
} }
void exitcodeSuppressionsNoFile() { void exitcodeSuppressionsNoFile() {
@ -911,14 +929,19 @@ private:
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", GET_REDIRECT_OUTPUT);
} }
// TODO: file does not exist
void fileList() { void fileList() {
REDIRECT; REDIRECT;
ScopedFile file("files.txt",
"file1.c\n"
"file2.cpp\n");
const char * const argv[] = {"cppcheck", "--file-list=files.txt", "file.cpp"}; const char * const argv[] = {"cppcheck", "--file-list=files.txt", "file.cpp"};
TODO_ASSERT_EQUALS(true, false, parser->parseFromArgs(3, argv)); ASSERT_EQUALS(true, parser->parseFromArgs(3, argv));
// TODO: settings are not being reset after each test ASSERT_EQUALS(3, parser->getPathNames().size());
//TODO_ASSERT_EQUALS(4, 1, defparser->getPathNames().size()); auto it = parser->getPathNames().cbegin();
TODO_ASSERT_EQUALS("", "cppcheck: error: couldn't open the file: \"files.txt\".\n", GET_REDIRECT_OUTPUT); ASSERT_EQUALS("file1.c", *it++);
ASSERT_EQUALS("file2.cpp", *it++);
ASSERT_EQUALS("file.cpp", *it);
ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
} }
void fileListNoFile() { void fileListNoFile() {
@ -1226,11 +1249,17 @@ private:
} }
void suppressions() { void suppressions() {
// TODO: Fails because there is no suppr.txt file!
REDIRECT; REDIRECT;
ScopedFile file("suppr.txt",
"uninitvar\n"
"unusedFunction\n");
const char * const argv[] = {"cppcheck", "--suppressions-list=suppr.txt", "file.cpp"}; const char * const argv[] = {"cppcheck", "--suppressions-list=suppr.txt", "file.cpp"};
TODO_ASSERT_EQUALS(true, false, parser->parseFromArgs(3, argv)); ASSERT_EQUALS(true, parser->parseFromArgs(3, argv));
TODO_ASSERT_EQUALS("", "cppcheck: error: couldn't open the file: \"suppr.txt\".\n", GET_REDIRECT_OUTPUT); ASSERT_EQUALS(2, settings->nomsg.getSuppressions().size());
auto it = settings->nomsg.getSuppressions().cbegin();
ASSERT_EQUALS("uninitvar", (*it++).errorId);
ASSERT_EQUALS("unusedFunction", (*it).errorId);
ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
} }
void suppressionsNoFile1() { void suppressionsNoFile1() {