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

Refactoring

This commit is contained in:
Daniel Marjamäki 2009-11-02 21:17:33 +01:00
parent bc3b12db72
commit 89d94895a4
1 changed files with 28 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
test/teststl.cpp
View File

@ -73,11 +73,11 @@ private:
TEST_CASE(find1); TEST_CASE(find1);
} }
void check(const char code[]) void check(const std::string &code)
{ {
// Tokenize.. // Tokenize..
Tokenizer tokenizer; Tokenizer tokenizer;
std::istringstream istr(code); std::istringstream istr(code.c_str());
tokenizer.tokenize(istr, "test.cpp"); tokenizer.tokenize(istr, "test.cpp");
tokenizer.setVarId(); tokenizer.setVarId();
@ -160,26 +160,26 @@ private:
{ {
check("void f()\n" check("void f()\n"
"{\n" "{\n"
" std::vector<int> ints;" " std::vector<int> ints;\n"
" std::vector<int>::iterator iter;\n" " std::vector<int>::iterator iter;\n"
" iter = ints.begin() + 2;\n" " iter = ints.begin() + 2;\n"
" ints.erase(iter);\n" " ints.erase(iter);\n"
" std::cout << (*iter) << std::endl;\n" " std::cout << (*iter) << std::endl;\n"
"}\n"); "}\n");
ASSERT_EQUALS("[test.cpp:6]: (error) Dereferenced iterator 'iter' has been erased\n", errout.str()); ASSERT_EQUALS("[test.cpp:7]: (error) Dereferenced iterator 'iter' has been erased\n", errout.str());
} }
void dereference_member() void dereference_member()
{ {
check("void f()\n" check("void f()\n"
"{\n" "{\n"
" std::map<int, int> ints;" " std::map<int, int> ints;\n"
" std::map<int, int>::iterator iter;\n" " std::map<int, int>::iterator iter;\n"
" iter = ints.begin();\n" " iter = ints.begin();\n"
" ints.erase(iter);\n" " ints.erase(iter);\n"
" std::cout << iter->first << std::endl;\n" " std::cout << iter->first << std::endl;\n"
"}\n"); "}\n");
ASSERT_EQUALS("[test.cpp:6]: (error) Dereferenced iterator 'iter' has been erased\n", errout.str()); ASSERT_EQUALS("[test.cpp:7]: (error) Dereferenced iterator 'iter' has been erased\n", errout.str());
} }
@ -529,22 +529,20 @@ private:
for (int i = 0; i < STL_CONTAINER_LIST; ++i) for (int i = 0; i < STL_CONTAINER_LIST; ++i)
{ {
const std::string checkStr("void f()\n" check("void f()\n"
"{\n" "{\n"
" std::" + stlCont[i] + "<int>::iterator it;\n" " std::" + stlCont[i] + "<int>::iterator it;\n"
" for (it = ab.begin(); it < ab.end(); ++it)\n" " for (it = ab.begin(); it < ab.end(); ++it)\n"
" ;\n" " ;\n"
"}\n"); "}\n");
check(checkStr.c_str());
ASSERT_EQUALS("[test.cpp:4]: (error) " + stlCont[i] + " range check should use != and not < since the order of the pointers isn't guaranteed\n", errout.str()); ASSERT_EQUALS("[test.cpp:4]: (error) " + stlCont[i] + " range check should use != and not < since the order of the pointers isn't guaranteed\n", errout.str());
} }
} }
void stlBoundries2() void stlBoundries2()
{ {
const std::string checkStr("void f()\n" check("void f()\n"
"{\n" "{\n"
" std::vector<std::string> files;\n" " std::vector<std::string> files;\n"
" std::vector<std::string>::const_iterator it;\n" " std::vector<std::string>::const_iterator it;\n"
@ -552,14 +550,12 @@ private:
" for (it = files.begin(); it < files.end(); it++) { };\n" " for (it = files.begin(); it < files.end(); it++) { };\n"
"}\n"); "}\n");
check(checkStr.c_str());
ASSERT_EQUALS("", errout.str()); ASSERT_EQUALS("", errout.str());
} }
void stlBoundries3() void stlBoundries3()
{ {
const std::string checkStr("void f()\n" check("void f()\n"
"{\n" "{\n"
" set<int> files;\n" " set<int> files;\n"
" set<int>::const_iterator current;\n" " set<int>::const_iterator current;\n"
@ -569,8 +565,6 @@ private:
" }\n" " }\n"
"}\n"); "}\n");
check(checkStr.c_str());
ASSERT_EQUALS("", errout.str()); ASSERT_EQUALS("", errout.str());
} }