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

filelocation-refactoring: Fixed unit tests in windows

This commit is contained in:
Daniel Marjamäki 2010-07-19 22:02:51 +02:00
parent ce5c05737d
commit 9debcb84cd
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
test/testcppcheck.cpp
View File

@ -23,6 +23,7 @@
#include "cppcheck.h" #include "cppcheck.h"
#include "testsuite.h" #include "testsuite.h"
#include "path.h"
#include <algorithm> #include <algorithm>
#include <map> #include <map>
@ -384,8 +385,9 @@ private:
ErrorLogger::ErrorMessage::FileLocation loc; ErrorLogger::ErrorMessage::FileLocation loc;
loc.setfile("ab/cd/../ef.h"); loc.setfile("ab/cd/../ef.h");
errorMessage._callStack.push_back(loc); errorMessage._callStack.push_back(loc);
ASSERT_EQUALS("<error file=\"ab/ef.h\" line=\"0\" id=\"\" severity=\"\" msg=\"\"/>", errorMessage.toXML()); const std::string fname(Path::toNativeSeparators("ab/ef.h"));
ASSERT_EQUALS("[ab/ef.h:0]: ", errorMessage.toString()); ASSERT_EQUALS("<error file=\"" + fname + "\" line=\"0\" id=\"\" severity=\"\" msg=\"\"/>", errorMessage.toXML());
ASSERT_EQUALS("[" + fname + ":0]: ", errorMessage.toString());
} }
void templateFormat() void templateFormat()
@ -398,9 +400,10 @@ private:
errorMessage._id = "testId"; errorMessage._id = "testId";
errorMessage._severity = Severity::fromString("error"); errorMessage._severity = Severity::fromString("error");
errorMessage._msg = "long testMessage"; errorMessage._msg = "long testMessage";
ASSERT_EQUALS("<error file=\"some/{file}file.cpp\" line=\"10\" id=\"testId\" severity=\"error\" msg=\"long testMessage\"/>", errorMessage.toXML()); const std::string fname(Path::toNativeSeparators("some/{file}file.cpp"));
ASSERT_EQUALS("[some/{file}file.cpp:10]: (error) long testMessage", errorMessage.toString()); ASSERT_EQUALS("<error file=\"" + fname + "\" line=\"10\" id=\"testId\" severity=\"error\" msg=\"long testMessage\"/>", errorMessage.toXML());
ASSERT_EQUALS("testId-some/{file}file.cpp,error.10?{long testMessage}", errorMessage.toString("{id}-{file},{severity}.{line}?{{message}}")); ASSERT_EQUALS("[" + fname + ":10]: (error) long testMessage", errorMessage.toString());
ASSERT_EQUALS("testId-" + fname + ",error.10?{long testMessage}", errorMessage.toString("{id}-{file},{severity}.{line}?{{message}}"));
} }
void getErrorMessages() void getErrorMessages()