Skip to content

Commit db3fd4e

Browse files
firewavefirewave
committed
testrunner: use C input files in Executor-related tests
1 parent b9da78f commit db3fd4e

4 files changed

Lines changed: 49 additions & 49 deletions

File tree

‎test/testcppcheck.cpp‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -239,15 +239,15 @@ class TestCppcheck : public TestFixture {
239239
}
240240

241241
void checkWithFile() const {
242-
checkWithFileInternal("file.cpp", false);
242+
checkWithFileInternal("file.c", false);
243243
}
244244

245245
void checkWithFileWithTools() const {
246-
checkWithFileInternal("file_tools.cpp", true);
246+
checkWithFileInternal("file_tools.c", true);
247247
}
248248

249249
void checkWithFileWithToolsNoCommand() const {
250-
checkWithFileInternal("file_tools_nocmd.cpp", true, true);
250+
checkWithFileInternal("file_tools_nocmd.c", true, true);
251251
}
252252

253253
void checkWithFSInternal(const std::string& fname, bool tools, bool nocmd = false) const
@@ -323,26 +323,26 @@ class TestCppcheck : public TestFixture {
323323
}
324324

325325
void checkWithFS() const {
326-
checkWithFSInternal("fs.cpp", false);
326+
checkWithFSInternal("fs.c", false);
327327
}
328328

329329
void checkWithFSWithTools() const {
330-
checkWithFSInternal("fs_tools.cpp", true);
330+
checkWithFSInternal("fs_tools.c", true);
331331
}
332332

333333
void checkWithFSWithToolsNoCommand() const {
334-
checkWithFSInternal("fs_tools_nocmd.cpp", true, true);
334+
checkWithFSInternal("fs_tools_nocmd.c", true, true);
335335
}
336336

337337
void suppress_error_library() const
338338
{
339-
ScopedFile file("suppr_err_lib.cpp",
339+
ScopedFile file("suppr_err_lib.c",
340340
"void f()\n"
341341
"{\n"
342342
" (void)(*((int*)0));\n"
343343
"}");
344344

345-
const char xmldata[] = R"(<def format="2"><markup ext=".cpp" reporterrors="false"/></def>)";
345+
const char xmldata[] = R"(<def format="2"><markup ext=".c" reporterrors="false"/></def>)";
346346
const Settings s = settingsBuilder().libraryxml(xmldata).build();
347347
Suppressions supprs;
348348
ErrorLogger2 errorLogger;
@@ -363,9 +363,9 @@ class TestCppcheck : public TestFixture {
363363
"{\n"
364364
" (void)(*((int*)0));\n"
365365
"}");
366-
ScopedFile test_file_a("a.cpp",
366+
ScopedFile test_file_a("a.c",
367367
"#include \"inc.h\"");
368-
ScopedFile test_file_b("b.cpp",
368+
ScopedFile test_file_b("b.c",
369369
"#include \"inc.h\"");
370370

371371
// this is the "simple" format
@@ -382,16 +382,16 @@ class TestCppcheck : public TestFixture {
382382
// the internal errorlist is cleared after each check() call
383383
ASSERT_EQUALS(2, errorLogger.errmsgs.size());
384384
auto it = errorLogger.errmsgs.cbegin();
385-
ASSERT_EQUALS("a.cpp", it->file0);
385+
ASSERT_EQUALS("a.c", it->file0);
386386
ASSERT_EQUALS("nullPointer", it->id);
387387
++it;
388-
ASSERT_EQUALS("b.cpp", it->file0);
388+
ASSERT_EQUALS("b.c", it->file0);
389389
ASSERT_EQUALS("nullPointer", it->id);
390390
}
391391

392392
void unique_errors_2() const
393393
{
394-
ScopedFile test_file("c.cpp",
394+
ScopedFile test_file("c.c",
395395
"void f()\n"
396396
"{\n"
397397
"const long m[9] = {};\n"
@@ -413,7 +413,7 @@ class TestCppcheck : public TestFixture {
413413
// the internal errorlist is cleared after each check() call
414414
ASSERT_EQUALS(2, errorLogger.errmsgs.size());
415415
auto it = errorLogger.errmsgs.cbegin();
416-
ASSERT_EQUALS("c.cpp", it->file0);
416+
ASSERT_EQUALS("c.c", it->file0);
417417
ASSERT_EQUALS(1, it->callStack.size());
418418
{
419419
auto stack = it->callStack.cbegin();
@@ -422,7 +422,7 @@ class TestCppcheck : public TestFixture {
422422
}
423423
ASSERT_EQUALS("arrayIndexOutOfBounds", it->id);
424424
++it;
425-
ASSERT_EQUALS("c.cpp", it->file0);
425+
ASSERT_EQUALS("c.c", it->file0);
426426
ASSERT_EQUALS(1, it->callStack.size());
427427
{
428428
auto stack = it->callStack.cbegin();
@@ -476,10 +476,10 @@ class TestCppcheck : public TestFixture {
476476
Suppressions supprs;
477477
ErrorLogger2 errorLogger;
478478
CppCheck cppcheck(s, supprs, errorLogger, false, {});
479-
std::vector<std::string> files{"/some/path/test.cpp"};
479+
std::vector<std::string> files{"/some/path/test.c"};
480480
simplecpp::TokenList tokens1(files);
481481
const std::string expected = " <rawtokens>\n"
482-
" <file index=\"0\" name=\"test.cpp\"/>\n"
482+
" <file index=\"0\" name=\"test.c\"/>\n"
483483
" </rawtokens>\n";
484484
ASSERT_EQUALS(expected, cppcheck.getDumpFileContentsRawTokens(files, tokens1));
485485

@@ -491,7 +491,7 @@ class TestCppcheck : public TestFixture {
491491
simplecpp::OutputList outputList;
492492
const simplecpp::TokenList tokens2(fin, files, "", &outputList);
493493
const std::string expected2 = " <rawtokens>\n"
494-
" <file index=\"0\" name=\"test.cpp\"/>\n"
494+
" <file index=\"0\" name=\"test.c\"/>\n"
495495
" <file index=\"1\" name=\"\"/>\n"
496496
" <tok fileIndex=\"1\" linenr=\"1\" column=\"1\" str=\"//x &#10;y\"/>\n"
497497
" <tok fileIndex=\"1\" linenr=\"3\" column=\"1\" str=\";\"/>\n"
@@ -508,7 +508,7 @@ class TestCppcheck : public TestFixture {
508508
Settings s;
509509
s.libraries.emplace_back("std.cfg");
510510
CppCheck cppcheck(s, supprs, errorLogger, false, {});
511-
//std::vector<std::string> files{ "/some/path/test.cpp" };
511+
//std::vector<std::string> files{ "/some/path/test.c" };
512512
const std::string expected = " <library lib=\"std.cfg\"/>\n";
513513
ASSERT_EQUALS(expected, cppcheck.getLibraryDumpData());
514514
}

‎test/testprocessexecutor.cpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -68,19 +68,19 @@ class TestProcessExecutorBase : public TestFixture {
6868
std::list<FileWithDetails> filelist;
6969
if (opt.filesList.empty()) {
7070
for (int i = 1; i <= files; ++i) {
71-
std::string f_s = fprefix() + "_" + std::to_string(i) + ".cpp";
72-
filelist.emplace_back(f_s, Standards::Language::CPP, data.size());
71+
std::string f_s = fprefix() + "_" + std::to_string(i) + ".c";
72+
filelist.emplace_back(f_s, Standards::Language::C, data.size());
7373
if (useFS) {
74-
fileSettings.emplace_back(std::move(f_s), Standards::Language::CPP, data.size());
74+
fileSettings.emplace_back(std::move(f_s), Standards::Language::C, data.size());
7575
}
7676
}
7777
}
7878
else {
7979
for (const auto& f : opt.filesList)
8080
{
81-
filelist.emplace_back(f, Standards::Language::CPP, data.size());
81+
filelist.emplace_back(f, Standards::Language::C, data.size());
8282
if (useFS) {
83-
fileSettings.emplace_back(f, Standards::Language::CPP, data.size());
83+
fileSettings.emplace_back(f, Standards::Language::C, data.size());
8484
}
8585
}
8686
}
@@ -213,7 +213,7 @@ class TestProcessExecutorBase : public TestFixture {
213213
"{\n"
214214
" (void)(*((int*)0));\n"
215215
"}");
216-
ASSERT_EQUALS("[" + fprefix() + "_1.cpp:3:12]: (error) Null pointer dereference: (int*)0 [nullPointer]\n", errout_str());
216+
ASSERT_EQUALS("[" + fprefix() + "_1.c:3:12]: (error) Null pointer dereference: (int*)0 [nullPointer]\n", errout_str());
217217
}
218218

219219
void one_error_several_files() {
@@ -284,14 +284,14 @@ class TestProcessExecutorBase : public TestFixture {
284284
dinit(CheckOptions,
285285
$.showtime = SHOWTIME_MODES::SHOWTIME_FILE_TOTAL));
286286
const std::string output_s = GET_REDIRECT_OUTPUT;
287-
TODO_ASSERT(output_s.find("Check time: " + fprefix() + "_1.cpp: ") != std::string::npos);
288-
TODO_ASSERT(output_s.find("Check time: " + fprefix() + "_2.cpp: ") != std::string::npos);
287+
TODO_ASSERT(output_s.find("Check time: " + fprefix() + "_1.c: ") != std::string::npos);
288+
TODO_ASSERT(output_s.find("Check time: " + fprefix() + "_2.c: ") != std::string::npos);
289289
}
290290

291291
void suppress_error_library() {
292292
SUPPRESS;
293293
const Settings settingsOld = settings; // TODO: get rid of this
294-
const char xmldata[] = R"(<def format="2"><markup ext=".cpp" reporterrors="false"/></def>)";
294+
const char xmldata[] = R"(<def format="2"><markup ext=".c" reporterrors="false"/></def>)";
295295
settings = settingsBuilder().libraryxml(xmldata).build();
296296
check(2, 1, 0,
297297
"void f()\n"

‎test/testsingleexecutor.cpp‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -73,19 +73,19 @@ class TestSingleExecutorBase : public TestFixture {
7373
std::list<FileWithDetails> filelist;
7474
if (opt.filesList.empty()) {
7575
for (int i = 1; i <= files; ++i) {
76-
std::string f_s = fprefix() + "_" + zpad3(i) + ".cpp";
77-
filelist.emplace_back(f_s, Standards::Language::CPP, data.size());
76+
std::string f_s = fprefix() + "_" + zpad3(i) + ".c";
77+
filelist.emplace_back(f_s, Standards::Language::C, data.size());
7878
if (useFS) {
79-
fileSettings.emplace_back(std::move(f_s), Standards::Language::CPP, data.size());
79+
fileSettings.emplace_back(std::move(f_s), Standards::Language::C, data.size());
8080
}
8181
}
8282
}
8383
else {
8484
for (const auto& f : opt.filesList)
8585
{
86-
filelist.emplace_back(f, Standards::Language::CPP, data.size());
86+
filelist.emplace_back(f, Standards::Language::C, data.size());
8787
if (useFS) {
88-
fileSettings.emplace_back(f, Standards::Language::CPP, data.size());
88+
fileSettings.emplace_back(f, Standards::Language::C, data.size());
8989
}
9090
}
9191
}
@@ -147,15 +147,15 @@ class TestSingleExecutorBase : public TestFixture {
147147
{
148148
std::string expected;
149149
for (int i = 1; i <= num_files; ++i) {
150-
expected += "Checking " + fprefix() + "_" + zpad3(i) + ".cpp ...\n";
150+
expected += "Checking " + fprefix() + "_" + zpad3(i) + ".c ...\n";
151151
expected += std::to_string(i) + "/100 files checked " + std::to_string(i) + "% done\n";
152152
}
153153
ASSERT_EQUALS(expected, output_str());
154154
}
155155
{
156156
std::string expected;
157157
for (int i = 1; i <= num_files; ++i) {
158-
expected += "[" + fprefix() + "_" + zpad3(i) + ".cpp:3:12]: (error) Null pointer dereference: (int*)0 [nullPointer]\n";
158+
expected += "[" + fprefix() + "_" + zpad3(i) + ".c:3:12]: (error) Null pointer dereference: (int*)0 [nullPointer]\n";
159159
}
160160
ASSERT_EQUALS(expected, errout_str());
161161
}
@@ -215,7 +215,7 @@ class TestSingleExecutorBase : public TestFixture {
215215
"{\n"
216216
" (void)(*((int*)0));\n"
217217
"}");
218-
ASSERT_EQUALS("[" + fprefix() + "_" + zpad3(1) + ".cpp:3:12]: (error) Null pointer dereference: (int*)0 [nullPointer]\n", errout_str());
218+
ASSERT_EQUALS("[" + fprefix() + "_" + zpad3(1) + ".c:3:12]: (error) Null pointer dereference: (int*)0 [nullPointer]\n", errout_str());
219219
}
220220

221221
void one_error_several_files() {
@@ -228,7 +228,7 @@ class TestSingleExecutorBase : public TestFixture {
228228
{
229229
std::string expected;
230230
for (int i = 1; i <= num_files; ++i) {
231-
expected += "[" + fprefix() + "_" + zpad3(i) + ".cpp:3:12]: (error) Null pointer dereference: (int*)0 [nullPointer]\n";
231+
expected += "[" + fprefix() + "_" + zpad3(i) + ".c:3:12]: (error) Null pointer dereference: (int*)0 [nullPointer]\n";
232232
}
233233
ASSERT_EQUALS(expected, errout_str());
234234
}
@@ -290,14 +290,14 @@ class TestSingleExecutorBase : public TestFixture {
290290
dinit(CheckOptions,
291291
$.showtime = SHOWTIME_MODES::SHOWTIME_FILE_TOTAL));
292292
const std::string output_s = GET_REDIRECT_OUTPUT;
293-
ASSERT(output_s.find("Check time: " + fprefix() + "_" + zpad3(1) + ".cpp: ") != std::string::npos);
294-
ASSERT(output_s.find("Check time: " + fprefix() + "_" + zpad3(2) + ".cpp: ") != std::string::npos);
293+
ASSERT(output_s.find("Check time: " + fprefix() + "_" + zpad3(1) + ".c: ") != std::string::npos);
294+
ASSERT(output_s.find("Check time: " + fprefix() + "_" + zpad3(2) + ".c: ") != std::string::npos);
295295
}
296296

297297
void suppress_error_library() {
298298
SUPPRESS;
299299
const Settings settingsOld = settings; // TODO: get rid of this
300-
const char xmldata[] = R"(<def format="2"><markup ext=".cpp" reporterrors="false"/></def>)";
300+
const char xmldata[] = R"(<def format="2"><markup ext=".c" reporterrors="false"/></def>)";
301301
settings = settingsBuilder().libraryxml(xmldata).build();
302302
check(1, 0,
303303
"void f()\n"

‎test/testthreadexecutor.cpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -68,19 +68,19 @@ class TestThreadExecutorBase : public TestFixture {
6868
std::list<FileWithDetails> filelist;
6969
if (opt.filesList.empty()) {
7070
for (int i = 1; i <= files; ++i) {
71-
std::string f_s = fprefix() + "_" + std::to_string(i) + ".cpp";
72-
filelist.emplace_back(f_s, Standards::Language::CPP, data.size());
71+
std::string f_s = fprefix() + "_" + std::to_string(i) + ".c";
72+
filelist.emplace_back(f_s, Standards::Language::C, data.size());
7373
if (useFS) {
74-
fileSettings.emplace_back(std::move(f_s), Standards::Language::CPP, data.size());
74+
fileSettings.emplace_back(std::move(f_s), Standards::Language::C, data.size());
7575
}
7676
}
7777
}
7878
else {
7979
for (const auto& f : opt.filesList)
8080
{
81-
filelist.emplace_back(f, Standards::Language::CPP, data.size());
81+
filelist.emplace_back(f, Standards::Language::C, data.size());
8282
if (useFS) {
83-
fileSettings.emplace_back(f, Standards::Language::CPP, data.size());
83+
fileSettings.emplace_back(f, Standards::Language::C, data.size());
8484
}
8585
}
8686
}
@@ -212,7 +212,7 @@ class TestThreadExecutorBase : public TestFixture {
212212
"{\n"
213213
" (void)(*((int*)0));\n"
214214
"}");
215-
ASSERT_EQUALS("[" + fprefix() + "_1.cpp:3:12]: (error) Null pointer dereference: (int*)0 [nullPointer]\n", errout_str());
215+
ASSERT_EQUALS("[" + fprefix() + "_1.c:3:12]: (error) Null pointer dereference: (int*)0 [nullPointer]\n", errout_str());
216216
}
217217

218218
void one_error_several_files() {
@@ -283,14 +283,14 @@ class TestThreadExecutorBase : public TestFixture {
283283
dinit(CheckOptions,
284284
$.showtime = SHOWTIME_MODES::SHOWTIME_FILE_TOTAL));
285285
const std::string output_s = GET_REDIRECT_OUTPUT;
286-
ASSERT(output_s.find("Check time: " + fprefix() + "_1.cpp: ") != std::string::npos);
287-
ASSERT(output_s.find("Check time: " + fprefix() + "_2.cpp: ") != std::string::npos);
286+
ASSERT(output_s.find("Check time: " + fprefix() + "_1.c: ") != std::string::npos);
287+
ASSERT(output_s.find("Check time: " + fprefix() + "_2.c: ") != std::string::npos);
288288
}
289289

290290
void suppress_error_library() {
291291
SUPPRESS;
292292
const Settings settingsOld = settings; // TODO: get rid of this
293-
const char xmldata[] = R"(<def format="2"><markup ext=".cpp" reporterrors="false"/></def>)";
293+
const char xmldata[] = R"(<def format="2"><markup ext=".c" reporterrors="false"/></def>)";
294294
settings = settingsBuilder().libraryxml(xmldata).build();
295295
check(2, 1, 0,
296296
"void f()\n"

0 commit comments

Comments
 (0)