diff --git a/test/testcmdlineparser.cpp b/test/testcmdlineparser.cpp index 4f36dbd72..63c83a621 100644 --- a/test/testcmdlineparser.cpp +++ b/test/testcmdlineparser.cpp @@ -602,13 +602,13 @@ private: TODO_ASSERT_EQUALS(true, false, defParser.ParseFromArgs(4, argv)); } -/* void fileListStdin() { - // TODO: Give it some stdin to read from, fails because the list of - // files in stdin (_pathnames) is empty - REDIRECT; - const char *argv[] = {"cppcheck", "--file-list=-", "file.cpp"}; - TODO_ASSERT_EQUALS(true, false, defParser.ParseFromArgs(3, argv)); - } */ + /* void fileListStdin() { + // TODO: Give it some stdin to read from, fails because the list of + // files in stdin (_pathnames) is empty + REDIRECT; + const char *argv[] = {"cppcheck", "--file-list=-", "file.cpp"}; + TODO_ASSERT_EQUALS(true, false, defParser.ParseFromArgs(3, argv)); + } */ void inlineSuppr() { REDIRECT; @@ -925,63 +925,63 @@ private: ASSERT_EQUALS(false, parser.ParseFromArgs(2, argv)); ASSERT_EQUALS(0, parser.GetIgnoredPaths().size()); } -/* - void ignorepaths1() { - REDIRECT; - const char *argv[] = {"cppcheck", "-isrc", "file.cpp"}; - CmdLineParser parser(&settings); - ASSERT(parser.ParseFromArgs(3, argv)); - ASSERT_EQUALS(1, parser.GetIgnoredPaths().size()); - ASSERT_EQUALS("src/", parser.GetIgnoredPaths()[0]); - } + /* + void ignorepaths1() { + REDIRECT; + const char *argv[] = {"cppcheck", "-isrc", "file.cpp"}; + CmdLineParser parser(&settings); + ASSERT(parser.ParseFromArgs(3, argv)); + ASSERT_EQUALS(1, parser.GetIgnoredPaths().size()); + ASSERT_EQUALS("src/", parser.GetIgnoredPaths()[0]); + } - void ignorepaths2() { - REDIRECT; - const char *argv[] = {"cppcheck", "-i", "src", "file.cpp"}; - CmdLineParser parser(&settings); - ASSERT(parser.ParseFromArgs(4, argv)); - ASSERT_EQUALS(1, parser.GetIgnoredPaths().size()); - ASSERT_EQUALS("src/", parser.GetIgnoredPaths()[0]); - } + void ignorepaths2() { + REDIRECT; + const char *argv[] = {"cppcheck", "-i", "src", "file.cpp"}; + CmdLineParser parser(&settings); + ASSERT(parser.ParseFromArgs(4, argv)); + ASSERT_EQUALS(1, parser.GetIgnoredPaths().size()); + ASSERT_EQUALS("src/", parser.GetIgnoredPaths()[0]); + } - void ignorepaths3() { - REDIRECT; - const char *argv[] = {"cppcheck", "-isrc", "-imodule", "file.cpp"}; - CmdLineParser parser(&settings); - ASSERT(parser.ParseFromArgs(4, argv)); - ASSERT_EQUALS(2, parser.GetIgnoredPaths().size()); - ASSERT_EQUALS("src/", parser.GetIgnoredPaths()[0]); - ASSERT_EQUALS("module/", parser.GetIgnoredPaths()[1]); - } + void ignorepaths3() { + REDIRECT; + const char *argv[] = {"cppcheck", "-isrc", "-imodule", "file.cpp"}; + CmdLineParser parser(&settings); + ASSERT(parser.ParseFromArgs(4, argv)); + ASSERT_EQUALS(2, parser.GetIgnoredPaths().size()); + ASSERT_EQUALS("src/", parser.GetIgnoredPaths()[0]); + ASSERT_EQUALS("module/", parser.GetIgnoredPaths()[1]); + } - void ignorepaths4() { - REDIRECT; - const char *argv[] = {"cppcheck", "-i", "src", "-i", "module", "file.cpp"}; - CmdLineParser parser(&settings); - ASSERT(parser.ParseFromArgs(6, argv)); - ASSERT_EQUALS(2, parser.GetIgnoredPaths().size()); - ASSERT_EQUALS("src/", parser.GetIgnoredPaths()[0]); - ASSERT_EQUALS("module/", parser.GetIgnoredPaths()[1]); - } + void ignorepaths4() { + REDIRECT; + const char *argv[] = {"cppcheck", "-i", "src", "-i", "module", "file.cpp"}; + CmdLineParser parser(&settings); + ASSERT(parser.ParseFromArgs(6, argv)); + ASSERT_EQUALS(2, parser.GetIgnoredPaths().size()); + ASSERT_EQUALS("src/", parser.GetIgnoredPaths()[0]); + ASSERT_EQUALS("module/", parser.GetIgnoredPaths()[1]); + } - void ignorefilepaths1() { - REDIRECT; - const char *argv[] = {"cppcheck", "-ifoo.cpp", "file.cpp"}; - CmdLineParser parser(&settings); - ASSERT(parser.ParseFromArgs(3, argv)); - ASSERT_EQUALS(1, parser.GetIgnoredPaths().size()); - ASSERT_EQUALS("foo.cpp", parser.GetIgnoredPaths()[0]); - } + void ignorefilepaths1() { + REDIRECT; + const char *argv[] = {"cppcheck", "-ifoo.cpp", "file.cpp"}; + CmdLineParser parser(&settings); + ASSERT(parser.ParseFromArgs(3, argv)); + ASSERT_EQUALS(1, parser.GetIgnoredPaths().size()); + ASSERT_EQUALS("foo.cpp", parser.GetIgnoredPaths()[0]); + } - void ignorefilepaths2() { - REDIRECT; - const char *argv[] = {"cppcheck", "-isrc/foo.cpp", "file.cpp"}; - CmdLineParser parser(&settings); - ASSERT(parser.ParseFromArgs(3, argv)); - ASSERT_EQUALS(1, parser.GetIgnoredPaths().size()); - ASSERT_EQUALS("src/foo.cpp", parser.GetIgnoredPaths()[0]); - } -*/ + void ignorefilepaths2() { + REDIRECT; + const char *argv[] = {"cppcheck", "-isrc/foo.cpp", "file.cpp"}; + CmdLineParser parser(&settings); + ASSERT(parser.ParseFromArgs(3, argv)); + ASSERT_EQUALS(1, parser.GetIgnoredPaths().size()); + ASSERT_EQUALS("src/foo.cpp", parser.GetIgnoredPaths()[0]); + } + */ void checkconfig() { REDIRECT; const char *argv[] = {"cppcheck", "--check-config", "file.cpp"};