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

Unit testing visual studio import

This commit is contained in:
Daniel Marjamäki 2017-09-24 22:57:24 +02:00
parent 30e6a05aa0
commit 04c2be33a6
2 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/importproject.h
View File

@ -35,19 +35,19 @@
/// @{ /// @{
namespace cppcheck { namespace cppcheck {
struct stricmp { struct stricmp {
bool operator()(const std::string &lhs, const std::string &rhs) const { bool operator()(const std::string &lhs, const std::string &rhs) const {
if (lhs.size() != rhs.size()) if (lhs.size() != rhs.size())
return lhs.size() < rhs.size(); return lhs.size() < rhs.size();
for (unsigned int i = 0; i < lhs.size(); ++i) { for (unsigned int i = 0; i < lhs.size(); ++i) {
char c1 = std::toupper((unsigned char)lhs[i]); char c1 = std::toupper((unsigned char)lhs[i]);
char c2 = std::toupper((unsigned char)rhs[i]); char c2 = std::toupper((unsigned char)rhs[i]);
if (c1 != c2) if (c1 != c2)
return c1 < c2; return c1 < c2;
}
return false;
} }
return false; };
}
};
} }
/** /**

16
test/testimportproject.cpp
View File

@ -34,6 +34,7 @@ private:
TEST_CASE(setDefines); TEST_CASE(setDefines);
TEST_CASE(setIncludePaths1); TEST_CASE(setIncludePaths1);
TEST_CASE(setIncludePaths2); TEST_CASE(setIncludePaths2);
TEST_CASE(setIncludePaths3); // macro names are case insensitive
} }
void setDefines() const { void setDefines() const {
@ -56,7 +57,7 @@ private:
ImportProject::FileSettings fs; ImportProject::FileSettings fs;
std::list<std::string> in; std::list<std::string> in;
in.push_back("../include"); in.push_back("../include");
std::map<std::string, std::string> variables; std::map<std::string, std::string, cppcheck::stricmp> variables;
fs.setIncludePaths("abc/def/", in, variables); fs.setIncludePaths("abc/def/", in, variables);
ASSERT_EQUALS(1U, fs.includePaths.size()); ASSERT_EQUALS(1U, fs.includePaths.size());
ASSERT_EQUALS("abc/include/", fs.includePaths.front()); ASSERT_EQUALS("abc/include/", fs.includePaths.front());
@ -66,7 +67,18 @@ private:
ImportProject::FileSettings fs; ImportProject::FileSettings fs;
std::list<std::string> in; std::list<std::string> in;
in.push_back("$(SolutionDir)other"); in.push_back("$(SolutionDir)other");
std::map<std::string, std::string> variables; std::map<std::string, std::string, cppcheck::stricmp> variables;
variables["SolutionDir"] = "c:/abc/";
fs.setIncludePaths("/home/fred", in, variables);
ASSERT_EQUALS(1U, fs.includePaths.size());
ASSERT_EQUALS("c:/abc/other/", fs.includePaths.front());
}
void setIncludePaths3() const { // macro names are case insensitive
ImportProject::FileSettings fs;
std::list<std::string> in;
in.push_back("$(SOLUTIONDIR)other");
std::map<std::string, std::string, cppcheck::stricmp> variables;
variables["SolutionDir"] = "c:/abc/"; variables["SolutionDir"] = "c:/abc/";
fs.setIncludePaths("/home/fred", in, variables); fs.setIncludePaths("/home/fred", in, variables);
ASSERT_EQUALS(1U, fs.includePaths.size()); ASSERT_EQUALS(1U, fs.includePaths.size());