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

Simplify TestAutoVariables test cases

This commit is contained in:
Daniel Marjamäki 2013-04-13 18:38:15 +02:00
parent b42ec0fe8b
commit 25582dbde7
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
test/testautovariables.cpp
View File

@ -34,7 +34,7 @@ private:
void check(const char code[], bool inconclusive=false) { void check(const char code[], bool inconclusive=false, bool runSimpleChecks=true) {
// Clear the error buffer.. // Clear the error buffer..
errout.str(""); errout.str("");
@ -50,11 +50,17 @@ private:
CheckAutoVariables checkAutoVariables(&tokenizer, &settings, this); CheckAutoVariables checkAutoVariables(&tokenizer, &settings, this);
checkAutoVariables.returnReference(); checkAutoVariables.returnReference();
tokenizer.simplifyTokenList(); if (runSimpleChecks) {
const std::string str1(tokenizer.tokens()->stringifyList(0,true));
tokenizer.simplifyTokenList();
const std::string str2(tokenizer.tokens()->stringifyList(0,true));
if (str1 != str2)
warn(("Unsimplified code in test case\nstr1="+str1+"\nstr2="+str2).c_str());
// Check auto variables // Check auto variables
checkAutoVariables.autoVariables(); checkAutoVariables.autoVariables();
checkAutoVariables.returnPointerToLocalArray(); checkAutoVariables.returnPointerToLocalArray();
}
} }
void run() { void run() {
@ -222,8 +228,7 @@ private:
ASSERT_EQUALS("[test.cpp:3]: (error) Address of local auto-variable assigned to a function parameter.\n", errout.str()); ASSERT_EQUALS("[test.cpp:3]: (error) Address of local auto-variable assigned to a function parameter.\n", errout.str());
check("void foo(std::string& s) {\n" check("void foo(std::string& s) {\n"
" char* p = foo;\n" " s = foo;\n"
" s = &p[0];\n"
"}", false); "}", false);
ASSERT_EQUALS("", errout.str()); ASSERT_EQUALS("", errout.str());
} }
@ -382,7 +387,7 @@ private:
" char tmp2[256];\n" " char tmp2[256];\n"
" delete tmp2;\n" " delete tmp2;\n"
" char tmp3[256];\n" " char tmp3[256];\n"
" delete (tmp3);\n" " delete tmp3;\n"
" char tmp4[256];\n" " char tmp4[256];\n"
" delete[] (tmp4);\n" " delete[] (tmp4);\n"
" char tmp5[256];\n" " char tmp5[256];\n"
@ -659,7 +664,7 @@ private:
" double ret = getValue();\n" " double ret = getValue();\n"
" rd = ret;\n" " rd = ret;\n"
" return rd;\n" " return rd;\n"
"}"); "}", false, false);
ASSERT_EQUALS("", errout.str()); ASSERT_EQUALS("", errout.str());
} }
@ -667,8 +672,7 @@ private:
void returnReference4() { void returnReference4() {
check("double a;\n" check("double a;\n"
"double & f() {\n" "double & f() {\n"
" double & ref = a;\n" " return a;\n"
" return ref;\n"
"}"); "}");
ASSERT_EQUALS("", errout.str()); ASSERT_EQUALS("", errout.str());
} }