Skip to content

Commit f843ad7

Browse files
firewavefirewave
committed
s [skip ci]
1 parent 957e5dc commit f843ad7

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
@@ -1183,10 +1183,10 @@ class TestCmdlineParser : public TestFixture {
11831183

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

18371837
void suppressions() {
18381838
REDIRECT;
1839-
ScopedFile file("suppr.txt",
1839+
ScopedFile file("supprs.txt",
18401840
"uninitvar\n"
18411841
"unusedFunction\n");
1842-
const char * const argv[] = {"cppcheck", "--suppressions-list=suppr.txt", "file.cpp"};
1842+
const char * const argv[] = {"cppcheck", "--suppressions-list=supprs.txt", "file.cpp"};
18431843
ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
18441844
const auto supprsNomsg = supprs->nomsg.getSuppressions();
18451845
ASSERT_EQUALS(2, supprsNomsg.size());
@@ -2467,16 +2467,16 @@ class TestCmdlineParser : public TestFixture {
24672467

24682468
void projectMultiple() {
24692469
REDIRECT;
2470-
ScopedFile file("project.cppcheck", "<project></project>");
2471-
const char * const argv[] = {"cppcheck", "--project=project.cppcheck", "--project=project.cppcheck", "file.cpp"};
2470+
ScopedFile file("project_multi.cppcheck", "<project></project>");
2471+
const char * const argv[] = {"cppcheck", "--project=project_multi.cppcheck", "--project=project.cppcheck", "file.cpp"};
24722472
ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
24732473
ASSERT_EQUALS("cppcheck: error: multiple --project options are not supported.\n", logger->str());
24742474
}
24752475

24762476
void projectAndSource() {
24772477
REDIRECT;
2478-
ScopedFile file("project.cppcheck", "<project></project>");
2479-
const char * const argv[] = {"cppcheck", "--project=project.cppcheck", "file.cpp"};
2478+
ScopedFile file("project_src.cppcheck", "<project></project>");
2479+
const char * const argv[] = {"cppcheck", "--project=project_src.cppcheck", "file.cpp"};
24802480
ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
24812481
ASSERT_EQUALS("cppcheck: error: --project cannot be used in conjunction with source files.\n", logger->str());
24822482
}
@@ -2496,8 +2496,8 @@ class TestCmdlineParser : public TestFixture {
24962496
}
24972497

24982498
void projectNoPaths() {
2499-
ScopedFile file("project.cppcheck", "<project></project>");
2500-
const char * const argv[] = {"cppcheck", "--project=project.cppcheck"};
2499+
ScopedFile file("project_nopaths.cppcheck", "<project></project>");
2500+
const char * const argv[] = {"cppcheck", "--project=project_nopaths.cppcheck"};
25012501
ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
25022502
ASSERT_EQUALS("cppcheck: error: no C or C++ source files found.\n", logger->str());
25032503
}
@@ -2582,7 +2582,7 @@ class TestCmdlineParser : public TestFixture {
25822582
#ifdef HAVE_RULES
25832583
void ruleFileMulti() {
25842584
REDIRECT;
2585-
ScopedFile file("rule.xml",
2585+
ScopedFile file("rule_multi.xml",
25862586
"<rules>\n"
25872587
"<rule>\n"
25882588
"<tokenlist>raw</tokenlist>\n"
@@ -2603,7 +2603,7 @@ class TestCmdlineParser : public TestFixture {
26032603
"</message>\n"
26042604
"</rule>\n"
26052605
"</rules>");
2606-
const char * const argv[] = {"cppcheck", "--rule-file=rule.xml", "file.cpp"};
2606+
const char * const argv[] = {"cppcheck", "--rule-file=rule_multi.xml", "file.cpp"};
26072607
ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
26082608
ASSERT_EQUALS(2, settings->rules.size());
26092609
auto it = settings->rules.cbegin();
@@ -2622,7 +2622,7 @@ class TestCmdlineParser : public TestFixture {
26222622

26232623
void ruleFileSingle() {
26242624
REDIRECT;
2625-
ScopedFile file("rule.xml",
2625+
ScopedFile file("rule_single.xml",
26262626
"<rule>\n"
26272627
"<tokenlist>define</tokenlist>\n"
26282628
"<pattern>.+</pattern>\n"
@@ -2632,7 +2632,7 @@ class TestCmdlineParser : public TestFixture {
26322632
"<summary>ruleSummary</summary>\n"
26332633
"</message>\n"
26342634
"</rule>\n");
2635-
const char * const argv[] = {"cppcheck", "--rule-file=rule.xml", "file.cpp"};
2635+
const char * const argv[] = {"cppcheck", "--rule-file=rule_single.xml", "file.cpp"};
26362636
ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
26372637
ASSERT_EQUALS(1, settings->rules.size());
26382638
auto it = settings->rules.cbegin();
@@ -2659,37 +2659,37 @@ class TestCmdlineParser : public TestFixture {
26592659

26602660
void ruleFileInvalid() {
26612661
REDIRECT;
2662-
ScopedFile file("rule.xml", "");
2663-
const char * const argv[] = {"cppcheck", "--rule-file=rule.xml", "file.cpp"};
2662+
ScopedFile file("rule_invalid.xml", "");
2663+
const char * const argv[] = {"cppcheck", "--rule-file=rule_invalid.xml", "file.cpp"};
26642664
ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
2665-
ASSERT_EQUALS("cppcheck: error: unable to load rule-file 'rule.xml' (XML_ERROR_EMPTY_DOCUMENT).\n", logger->str());
2665+
ASSERT_EQUALS("cppcheck: error: unable to load rule-file 'rule_invalid.xml' (XML_ERROR_EMPTY_DOCUMENT).\n", logger->str());
26662666
}
26672667

26682668
void ruleFileNoRoot() {
26692669
REDIRECT;
2670-
ScopedFile file("rule.xml", "<?xml version=\"1.0\"?>");
2671-
const char * const argv[] = {"cppcheck", "--rule-file=rule.xml", "file.cpp"};
2670+
ScopedFile file("rule_noroot.xml", "<?xml version=\"1.0\"?>");
2671+
const char * const argv[] = {"cppcheck", "--rule-file=rule_noroot.xml", "file.cpp"};
26722672
ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
26732673
ASSERT_EQUALS(0, settings->rules.size());
26742674
}
26752675

26762676
void ruleFileEmptyElements1() {
26772677
REDIRECT;
2678-
ScopedFile file("rule.xml",
2678+
ScopedFile file("rule_empty_elems_1.xml",
26792679
"<rule>"
26802680
"<tokenlist/>"
26812681
"<pattern/>"
26822682
"<message/>"
26832683
"</rule>"
26842684
);
2685-
const char * const argv[] = {"cppcheck", "--rule-file=rule.xml", "file.cpp"};
2685+
const char * const argv[] = {"cppcheck", "--rule-file=rule_empty_elems_1.xml", "file.cpp"};
26862686
ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv)); // do not crash
2687-
ASSERT_EQUALS("cppcheck: error: unable to load rule-file 'rule.xml' - a rule is lacking a pattern.\n", logger->str());
2687+
ASSERT_EQUALS("cppcheck: error: unable to load rule-file 'rule_empty_elems_1.xml' - a rule is lacking a pattern.\n", logger->str());
26882688
}
26892689

26902690
void ruleFileEmptyElements2() {
26912691
REDIRECT;
2692-
ScopedFile file("rule.xml",
2692+
ScopedFile file("rule_empty_elems_2.xml",
26932693
"<rule>"
26942694
"<message>"
26952695
"<severity/>"
@@ -2698,101 +2698,101 @@ class TestCmdlineParser : public TestFixture {
26982698
"</message>"
26992699
"</rule>"
27002700
);
2701-
const char * const argv[] = {"cppcheck", "--rule-file=rule.xml", "file.cpp"};
2701+
const char * const argv[] = {"cppcheck", "--rule-file=rule_empty_elems_2.xml", "file.cpp"};
27022702
ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv)); // do not crash
2703-
ASSERT_EQUALS("cppcheck: error: unable to load rule-file 'rule.xml' - a rule is lacking a pattern.\n", logger->str());
2703+
ASSERT_EQUALS("cppcheck: error: unable to load rule-file 'rule_empty_elems_2.xml' - a rule is lacking a pattern.\n", logger->str());
27042704
}
27052705

27062706
void ruleFileUnknownElement1() {
27072707
REDIRECT;
2708-
ScopedFile file("rule.xml",
2708+
ScopedFile file("rule_unk_elems_1.xml",
27092709
"<rule>"
27102710
"<messages/>"
27112711
"</rule>"
27122712
);
2713-
const char * const argv[] = {"cppcheck", "--rule-file=rule.xml", "file.cpp"};
2713+
const char * const argv[] = {"cppcheck", "--rule-file=rule_unk_elems_1.xml", "file.cpp"};
27142714
ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
2715-
ASSERT_EQUALS("cppcheck: error: unable to load rule-file 'rule.xml' - unknown element 'messages' encountered in 'rule'.\n", logger->str());
2715+
ASSERT_EQUALS("cppcheck: error: unable to load rule-file 'rule_unk_elems_1.xml' - unknown element 'messages' encountered in 'rule'.\n", logger->str());
27162716
}
27172717

27182718
void ruleFileUnknownElement2() {
27192719
REDIRECT;
2720-
ScopedFile file("rule.xml",
2720+
ScopedFile file("rule_unk_elems_2.xml",
27212721
"<rule>"
27222722
"<message>"
27232723
"<pattern/>"
27242724
"</message>"
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_2.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 'pattern' encountered in 'message'.\n", logger->str());
2729+
ASSERT_EQUALS("cppcheck: error: unable to load rule-file 'rule_unk_elems_2.xml' - unknown element 'pattern' encountered in 'message'.\n", logger->str());
27302730
}
27312731

27322732
void ruleFileMissingTokenList() {
27332733
REDIRECT;
2734-
ScopedFile file("rule.xml",
2734+
ScopedFile file("rule_missing_toklist.xml",
27352735
"<rule>\n"
27362736
"<tokenlist/>\n"
27372737
"<pattern>.+</pattern>\n"
27382738
"</rule>\n");
2739-
const char * const argv[] = {"cppcheck", "--rule-file=rule.xml", "file.cpp"};
2739+
const char * const argv[] = {"cppcheck", "--rule-file=rule_missing_toklist.xml", "file.cpp"};
27402740
ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
2741-
ASSERT_EQUALS("cppcheck: error: unable to load rule-file 'rule.xml' - a rule is lacking a tokenlist.\n", logger->str());
2741+
ASSERT_EQUALS("cppcheck: error: unable to load rule-file 'rule_missing_toklist.xml' - a rule is lacking a tokenlist.\n", logger->str());
27422742
}
27432743

27442744
void ruleFileUnknownTokenList() {
27452745
REDIRECT;
2746-
ScopedFile file("rule.xml",
2746+
ScopedFile file("rule_unk_toklist.xml",
27472747
"<rule>\n"
27482748
"<tokenlist>simple</tokenlist>\n"
27492749
"<pattern>.+</pattern>\n"
27502750
"</rule>\n");
2751-
const char * const argv[] = {"cppcheck", "--rule-file=rule.xml", "file.cpp"};
2751+
const char * const argv[] = {"cppcheck", "--rule-file=rule_unk_toklist.xml", "file.cpp"};
27522752
ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
2753-
ASSERT_EQUALS("cppcheck: error: unable to load rule-file 'rule.xml' - a rule is using the unsupported tokenlist 'simple'.\n", logger->str());
2753+
ASSERT_EQUALS("cppcheck: error: unable to load rule-file 'rule_unk_toklist.xml' - a rule is using the unsupported tokenlist 'simple'.\n", logger->str());
27542754
}
27552755

27562756
void ruleFileMissingId() {
27572757
REDIRECT;
2758-
ScopedFile file("rule.xml",
2758+
ScopedFile file("rule_missing_id.xml",
27592759
"<rule>\n"
27602760
"<pattern>.+</pattern>\n"
27612761
"<message>\n"
27622762
"<id/>"
27632763
"</message>\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_missing_id.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 lacking an id.\n", logger->str());
2767+
ASSERT_EQUALS("cppcheck: error: unable to load rule-file 'rule_missing_id.xml' - a rule is lacking an id.\n", logger->str());
27682768
}
27692769

27702770
void ruleFileInvalidSeverity1() {
27712771
REDIRECT;
2772-
ScopedFile file("rule.xml",
2772+
ScopedFile file("rule_invalid_sev_1.xml",
27732773
"<rule>\n"
27742774
"<pattern>.+</pattern>\n"
27752775
"<message>\n"
27762776
"<severity/>"
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_invalid_sev_1.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 has an invalid severity.\n", logger->str());
2781+
ASSERT_EQUALS("cppcheck: error: unable to load rule-file 'rule_invalid_sev_1.xml' - a rule has an invalid severity.\n", logger->str());
27822782
}
27832783

27842784
void ruleFileInvalidSeverity2() {
27852785
REDIRECT;
2786-
ScopedFile file("rule.xml",
2786+
ScopedFile file("rule_invalid_sev_2.xml",
27872787
"<rule>\n"
27882788
"<pattern>.+</pattern>\n"
27892789
"<message>\n"
27902790
"<severity>none</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_2.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_2.xml' - a rule has an invalid severity.\n", logger->str());
27962796
}
27972797
#else
27982798
void ruleFileNotSupported() {
@@ -2876,18 +2876,18 @@ class TestCmdlineParser : public TestFixture {
28762876

28772877
void suppressXmlInvalid() {
28782878
REDIRECT;
2879-
ScopedFile file("suppress.xml", "");
2880-
const char * const argv[] = {"cppcheck", "--suppress-xml=suppress.xml", "file.cpp"};
2879+
ScopedFile file("suppress_invalid.xml", "");
2880+
const char * const argv[] = {"cppcheck", "--suppress-xml=suppress_invalid.xml", "file.cpp"};
28812881
ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
2882-
ASSERT_EQUALS("cppcheck: error: failed to load suppressions XML 'suppress.xml' (XML_ERROR_EMPTY_DOCUMENT).\n", logger->str());
2882+
ASSERT_EQUALS("cppcheck: error: failed to load suppressions XML 'suppress_invalid.xml' (XML_ERROR_EMPTY_DOCUMENT).\n", logger->str());
28832883
}
28842884

28852885
void suppressXmlNoRoot() {
28862886
REDIRECT;
2887-
ScopedFile file("suppress.xml", "<?xml version=\"1.0\"?>");
2888-
const char * const argv[] = {"cppcheck", "--suppress-xml=suppress.xml", "file.cpp"};
2887+
ScopedFile file("suppress_noroot.xml", "<?xml version=\"1.0\"?>");
2888+
const char * const argv[] = {"cppcheck", "--suppress-xml=suppress_noroot.xml", "file.cpp"};
28892889
ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
2890-
ASSERT_EQUALS("cppcheck: error: failed to load suppressions XML 'suppress.xml' (no root node found).\n", logger->str());
2890+
ASSERT_EQUALS("cppcheck: error: failed to load suppressions XML 'suppress_noroot.xml' (no root node found).\n", logger->str());
28912891
}
28922892

28932893
void executorDefault() {

0 commit comments

Comments
 (0)