Skip to content

Commit 3539954

Browse files
firewavefirewave
committed
s [skip ci]
1 parent a2e9b30 commit 3539954

File tree

1 file changed

+52
-52
lines changed

1 file changed

+52
-52
lines changed

‎test/testcmdlineparser.cpp‎

Lines changed: 52 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1184,10 +1184,10 @@ class TestCmdlineParser : public TestFixture {
11841184

11851185
void exitcodeSuppressions() {
11861186
REDIRECT;
1187-
ScopedFile file("suppr.txt",
1187+
ScopedFile file("suppr_ec.txt",
11881188
"uninitvar\n"
11891189
"unusedFunction\n");
1190-
const char * const argv[] = {"cppcheck", "--exitcode-suppressions=suppr.txt", "file.cpp"};
1190+
const char * const argv[] = {"cppcheck", "--exitcode-suppressions=suppr_ec.txt", "file.cpp"};
11911191
ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
11921192
const auto supprsNofail = supprs->nofail.getSuppressions();
11931193
ASSERT_EQUALS(2, supprsNofail.size());
@@ -1850,10 +1850,10 @@ class TestCmdlineParser : public TestFixture {
18501850

18511851
void suppressions() {
18521852
REDIRECT;
1853-
ScopedFile file("suppr.txt",
1853+
ScopedFile file("supprs.txt",
18541854
"uninitvar\n"
18551855
"unusedFunction\n");
1856-
const char * const argv[] = {"cppcheck", "--suppressions-list=suppr.txt", "file.cpp"};
1856+
const char * const argv[] = {"cppcheck", "--suppressions-list=supprs.txt", "file.cpp"};
18571857
ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
18581858
const auto supprsNomsg = supprs->nomsg.getSuppressions();
18591859
ASSERT_EQUALS(2, supprsNomsg.size());
@@ -2481,16 +2481,16 @@ class TestCmdlineParser : public TestFixture {
24812481

24822482
void projectMultiple() {
24832483
REDIRECT;
2484-
ScopedFile file("project.cppcheck", "<project></project>");
2485-
const char * const argv[] = {"cppcheck", "--project=project.cppcheck", "--project=project.cppcheck", "file.cpp"};
2484+
ScopedFile file("project_multi.cppcheck", "<project></project>");
2485+
const char * const argv[] = {"cppcheck", "--project=project_multi.cppcheck", "--project=project.cppcheck", "file.cpp"};
24862486
ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
24872487
ASSERT_EQUALS("cppcheck: error: multiple --project options are not supported.\n", logger->str());
24882488
}
24892489

24902490
void projectAndSource() {
24912491
REDIRECT;
2492-
ScopedFile file("project.cppcheck", "<project></project>");
2493-
const char * const argv[] = {"cppcheck", "--project=project.cppcheck", "file.cpp"};
2492+
ScopedFile file("project_src.cppcheck", "<project></project>");
2493+
const char * const argv[] = {"cppcheck", "--project=project_src.cppcheck", "file.cpp"};
24942494
ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
24952495
ASSERT_EQUALS("cppcheck: error: --project cannot be used in conjunction with source files.\n", logger->str());
24962496
}
@@ -2510,8 +2510,8 @@ class TestCmdlineParser : public TestFixture {
25102510
}
25112511

25122512
void projectNoPaths() {
2513-
ScopedFile file("project.cppcheck", "<project></project>");
2514-
const char * const argv[] = {"cppcheck", "--project=project.cppcheck"};
2513+
ScopedFile file("project_nopaths.cppcheck", "<project></project>");
2514+
const char * const argv[] = {"cppcheck", "--project=project_nopaths.cppcheck"};
25152515
ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
25162516
ASSERT_EQUALS("cppcheck: error: no C or C++ source files found.\n", logger->str());
25172517
}
@@ -2596,7 +2596,7 @@ class TestCmdlineParser : public TestFixture {
25962596
#ifdef HAVE_RULES
25972597
void ruleFileMulti() {
25982598
REDIRECT;
2599-
ScopedFile file("rule.xml",
2599+
ScopedFile file("rule_multi.xml",
26002600
"<rules>\n"
26012601
"<rule>\n"
26022602
"<tokenlist>raw</tokenlist>\n"
@@ -2617,7 +2617,7 @@ class TestCmdlineParser : public TestFixture {
26172617
"</message>\n"
26182618
"</rule>\n"
26192619
"</rules>");
2620-
const char * const argv[] = {"cppcheck", "--rule-file=rule.xml", "file.cpp"};
2620+
const char * const argv[] = {"cppcheck", "--rule-file=rule_multi.xml", "file.cpp"};
26212621
ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
26222622
ASSERT_EQUALS(2, settings->rules.size());
26232623
auto it = settings->rules.cbegin();
@@ -2636,7 +2636,7 @@ class TestCmdlineParser : public TestFixture {
26362636

26372637
void ruleFileSingle() {
26382638
REDIRECT;
2639-
ScopedFile file("rule.xml",
2639+
ScopedFile file("rule_single.xml",
26402640
"<rule>\n"
26412641
"<tokenlist>define</tokenlist>\n"
26422642
"<pattern>.+</pattern>\n"
@@ -2646,7 +2646,7 @@ class TestCmdlineParser : public TestFixture {
26462646
"<summary>ruleSummary</summary>\n"
26472647
"</message>\n"
26482648
"</rule>\n");
2649-
const char * const argv[] = {"cppcheck", "--rule-file=rule.xml", "file.cpp"};
2649+
const char * const argv[] = {"cppcheck", "--rule-file=rule_single.xml", "file.cpp"};
26502650
ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
26512651
ASSERT_EQUALS(1, settings->rules.size());
26522652
auto it = settings->rules.cbegin();
@@ -2673,37 +2673,37 @@ class TestCmdlineParser : public TestFixture {
26732673

26742674
void ruleFileInvalid() {
26752675
REDIRECT;
2676-
ScopedFile file("rule.xml", "");
2677-
const char * const argv[] = {"cppcheck", "--rule-file=rule.xml", "file.cpp"};
2676+
ScopedFile file("rule_invalid.xml", "");
2677+
const char * const argv[] = {"cppcheck", "--rule-file=rule_invalid.xml", "file.cpp"};
26782678
ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
2679-
ASSERT_EQUALS("cppcheck: error: unable to load rule-file 'rule.xml' (XML_ERROR_EMPTY_DOCUMENT).\n", logger->str());
2679+
ASSERT_EQUALS("cppcheck: error: unable to load rule-file 'rule_invalid.xml' (XML_ERROR_EMPTY_DOCUMENT).\n", logger->str());
26802680
}
26812681

26822682
void ruleFileNoRoot() {
26832683
REDIRECT;
2684-
ScopedFile file("rule.xml", "<?xml version=\"1.0\"?>");
2685-
const char * const argv[] = {"cppcheck", "--rule-file=rule.xml", "file.cpp"};
2684+
ScopedFile file("rule_noroot.xml", "<?xml version=\"1.0\"?>");
2685+
const char * const argv[] = {"cppcheck", "--rule-file=rule_noroot.xml", "file.cpp"};
26862686
ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
26872687
ASSERT_EQUALS(0, settings->rules.size());
26882688
}
26892689

26902690
void ruleFileEmptyElements1() {
26912691
REDIRECT;
2692-
ScopedFile file("rule.xml",
2692+
ScopedFile file("rule_empty_elems_1.xml",
26932693
"<rule>"
26942694
"<tokenlist/>"
26952695
"<pattern/>"
26962696
"<message/>"
26972697
"</rule>"
26982698
);
2699-
const char * const argv[] = {"cppcheck", "--rule-file=rule.xml", "file.cpp"};
2699+
const char * const argv[] = {"cppcheck", "--rule-file=rule_empty_elems_1.xml", "file.cpp"};
27002700
ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv)); // do not crash
2701-
ASSERT_EQUALS("cppcheck: error: unable to load rule-file 'rule.xml' - a rule is lacking a pattern.\n", logger->str());
2701+
ASSERT_EQUALS("cppcheck: error: unable to load rule-file 'rule_empty_elems_1.xml' - a rule is lacking a pattern.\n", logger->str());
27022702
}
27032703

27042704
void ruleFileEmptyElements2() {
27052705
REDIRECT;
2706-
ScopedFile file("rule.xml",
2706+
ScopedFile file("rule_empty_elems_2.xml",
27072707
"<rule>"
27082708
"<message>"
27092709
"<severity/>"
@@ -2712,101 +2712,101 @@ class TestCmdlineParser : public TestFixture {
27122712
"</message>"
27132713
"</rule>"
27142714
);
2715-
const char * const argv[] = {"cppcheck", "--rule-file=rule.xml", "file.cpp"};
2715+
const char * const argv[] = {"cppcheck", "--rule-file=rule_empty_elems_2.xml", "file.cpp"};
27162716
ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv)); // do not crash
2717-
ASSERT_EQUALS("cppcheck: error: unable to load rule-file 'rule.xml' - a rule is lacking a pattern.\n", logger->str());
2717+
ASSERT_EQUALS("cppcheck: error: unable to load rule-file 'rule_empty_elems_2.xml' - a rule is lacking a pattern.\n", logger->str());
27182718
}
27192719

27202720
void ruleFileUnknownElement1() {
27212721
REDIRECT;
2722-
ScopedFile file("rule.xml",
2722+
ScopedFile file("rule_unk_elems_1.xml",
27232723
"<rule>"
27242724
"<messages/>"
27252725
"</rule>"
27262726
);
2727-
const char * const argv[] = {"cppcheck", "--rule-file=rule.xml", "file.cpp"};
2727+
const char * const argv[] = {"cppcheck", "--rule-file=rule_unk_elems_1.xml", "file.cpp"};
27282728
ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
2729-
ASSERT_EQUALS("cppcheck: error: unable to load rule-file 'rule.xml' - unknown element 'messages' encountered in 'rule'.\n", logger->str());
2729+
ASSERT_EQUALS("cppcheck: error: unable to load rule-file 'rule_unk_elems_1.xml' - unknown element 'messages' encountered in 'rule'.\n", logger->str());
27302730
}
27312731

27322732
void ruleFileUnknownElement2() {
27332733
REDIRECT;
2734-
ScopedFile file("rule.xml",
2734+
ScopedFile file("rule_unk_elems_2.xml",
27352735
"<rule>"
27362736
"<message>"
27372737
"<pattern/>"
27382738
"</message>"
27392739
"</rule>"
27402740
);
2741-
const char * const argv[] = {"cppcheck", "--rule-file=rule.xml", "file.cpp"};
2741+
const char * const argv[] = {"cppcheck", "--rule-file=rule_unk_elems_2.xml", "file.cpp"};
27422742
ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
2743-
ASSERT_EQUALS("cppcheck: error: unable to load rule-file 'rule.xml' - unknown element 'pattern' encountered in 'message'.\n", logger->str());
2743+
ASSERT_EQUALS("cppcheck: error: unable to load rule-file 'rule_unk_elems_2.xml' - unknown element 'pattern' encountered in 'message'.\n", logger->str());
27442744
}
27452745

27462746
void ruleFileMissingTokenList() {
27472747
REDIRECT;
2748-
ScopedFile file("rule.xml",
2748+
ScopedFile file("rule_missing_toklist.xml",
27492749
"<rule>\n"
27502750
"<tokenlist/>\n"
27512751
"<pattern>.+</pattern>\n"
27522752
"</rule>\n");
2753-
const char * const argv[] = {"cppcheck", "--rule-file=rule.xml", "file.cpp"};
2753+
const char * const argv[] = {"cppcheck", "--rule-file=rule_missing_toklist.xml", "file.cpp"};
27542754
ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
2755-
ASSERT_EQUALS("cppcheck: error: unable to load rule-file 'rule.xml' - a rule is lacking a tokenlist.\n", logger->str());
2755+
ASSERT_EQUALS("cppcheck: error: unable to load rule-file 'rule_missing_toklist.xml' - a rule is lacking a tokenlist.\n", logger->str());
27562756
}
27572757

27582758
void ruleFileUnknownTokenList() {
27592759
REDIRECT;
2760-
ScopedFile file("rule.xml",
2760+
ScopedFile file("rule_unk_toklist.xml",
27612761
"<rule>\n"
27622762
"<tokenlist>simple</tokenlist>\n"
27632763
"<pattern>.+</pattern>\n"
27642764
"</rule>\n");
2765-
const char * const argv[] = {"cppcheck", "--rule-file=rule.xml", "file.cpp"};
2765+
const char * const argv[] = {"cppcheck", "--rule-file=rule_unk_toklist.xml", "file.cpp"};
27662766
ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
2767-
ASSERT_EQUALS("cppcheck: error: unable to load rule-file 'rule.xml' - a rule is using the unsupported tokenlist 'simple'.\n", logger->str());
2767+
ASSERT_EQUALS("cppcheck: error: unable to load rule-file 'rule_unk_toklist.xml' - a rule is using the unsupported tokenlist 'simple'.\n", logger->str());
27682768
}
27692769

27702770
void ruleFileMissingId() {
27712771
REDIRECT;
2772-
ScopedFile file("rule.xml",
2772+
ScopedFile file("rule_missing_id.xml",
27732773
"<rule>\n"
27742774
"<pattern>.+</pattern>\n"
27752775
"<message>\n"
27762776
"<id/>"
27772777
"</message>\n"
27782778
"</rule>\n");
2779-
const char * const argv[] = {"cppcheck", "--rule-file=rule.xml", "file.cpp"};
2779+
const char * const argv[] = {"cppcheck", "--rule-file=rule_missing_id.xml", "file.cpp"};
27802780
ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
2781-
ASSERT_EQUALS("cppcheck: error: unable to load rule-file 'rule.xml' - a rule is lacking an id.\n", logger->str());
2781+
ASSERT_EQUALS("cppcheck: error: unable to load rule-file 'rule_missing_id.xml' - a rule is lacking an id.\n", logger->str());
27822782
}
27832783

27842784
void ruleFileInvalidSeverity1() {
27852785
REDIRECT;
2786-
ScopedFile file("rule.xml",
2786+
ScopedFile file("rule_invalid_sev_1.xml",
27872787
"<rule>\n"
27882788
"<pattern>.+</pattern>\n"
27892789
"<message>\n"
27902790
"<severity/>"
27912791
"</message>\n"
27922792
"</rule>\n");
2793-
const char * const argv[] = {"cppcheck", "--rule-file=rule.xml", "file.cpp"};
2793+
const char * const argv[] = {"cppcheck", "--rule-file=rule_invalid_sev_1.xml", "file.cpp"};
27942794
ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
2795-
ASSERT_EQUALS("cppcheck: error: unable to load rule-file 'rule.xml' - a rule has an invalid severity.\n", logger->str());
2795+
ASSERT_EQUALS("cppcheck: error: unable to load rule-file 'rule_invalid_sev_1.xml' - a rule has an invalid severity.\n", logger->str());
27962796
}
27972797

27982798
void ruleFileInvalidSeverity2() {
27992799
REDIRECT;
2800-
ScopedFile file("rule.xml",
2800+
ScopedFile file("rule_invalid_sev_2.xml",
28012801
"<rule>\n"
28022802
"<pattern>.+</pattern>\n"
28032803
"<message>\n"
28042804
"<severity>none</severity>"
28052805
"</message>\n"
28062806
"</rule>\n");
2807-
const char * const argv[] = {"cppcheck", "--rule-file=rule.xml", "file.cpp"};
2807+
const char * const argv[] = {"cppcheck", "--rule-file=rule_invalid_sev_2.xml", "file.cpp"};
28082808
ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
2809-
ASSERT_EQUALS("cppcheck: error: unable to load rule-file 'rule.xml' - a rule has an invalid severity.\n", logger->str());
2809+
ASSERT_EQUALS("cppcheck: error: unable to load rule-file 'rule_invalid_sev_2.xml' - a rule has an invalid severity.\n", logger->str());
28102810
}
28112811
#else
28122812
void ruleFileNotSupported() {
@@ -2890,18 +2890,18 @@ class TestCmdlineParser : public TestFixture {
28902890

28912891
void suppressXmlInvalid() {
28922892
REDIRECT;
2893-
ScopedFile file("suppress.xml", "");
2894-
const char * const argv[] = {"cppcheck", "--suppress-xml=suppress.xml", "file.cpp"};
2893+
ScopedFile file("suppress_invalid.xml", "");
2894+
const char * const argv[] = {"cppcheck", "--suppress-xml=suppress_invalid.xml", "file.cpp"};
28952895
ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
2896-
ASSERT_EQUALS("cppcheck: error: failed to load suppressions XML 'suppress.xml' (XML_ERROR_EMPTY_DOCUMENT).\n", logger->str());
2896+
ASSERT_EQUALS("cppcheck: error: failed to load suppressions XML 'suppress_invalid.xml' (XML_ERROR_EMPTY_DOCUMENT).\n", logger->str());
28972897
}
28982898

28992899
void suppressXmlNoRoot() {
29002900
REDIRECT;
2901-
ScopedFile file("suppress.xml", "<?xml version=\"1.0\"?>");
2902-
const char * const argv[] = {"cppcheck", "--suppress-xml=suppress.xml", "file.cpp"};
2901+
ScopedFile file("suppress_noroot.xml", "<?xml version=\"1.0\"?>");
2902+
const char * const argv[] = {"cppcheck", "--suppress-xml=suppress_noroot.xml", "file.cpp"};
29032903
ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
2904-
ASSERT_EQUALS("cppcheck: error: failed to load suppressions XML 'suppress.xml' (no root node found).\n", logger->str());
2904+
ASSERT_EQUALS("cppcheck: error: failed to load suppressions XML 'suppress_noroot.xml' (no root node found).\n", logger->str());
29052905
}
29062906

29072907
void executorDefault() {

0 commit comments

Comments
 (0)