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

Simplify TestAssignIf test cases (else if)

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

14
test/testassignif.cpp
View File

@ -50,7 +50,15 @@ private:
Tokenizer tokenizer(&settings, this); Tokenizer tokenizer(&settings, this);
std::istringstream istr(code); std::istringstream istr(code);
tokenizer.tokenize(istr, "test.cpp"); tokenizer.tokenize(istr, "test.cpp");
const std::string str1(tokenizer.tokens()->stringifyList(0,true));
tokenizer.simplifyTokenList(); tokenizer.simplifyTokenList();
const std::string str2(tokenizer.tokens()->stringifyList(0,true));
// Ensure that the test case is not bad.
if (str1 != str2) {
warn(("Unsimplified code in test case\nstr1="+str1+"\nstr2="+str2).c_str());
}
// Check char variable usage.. // Check char variable usage..
CheckAssignIf checkAssignIf(&tokenizer, &settings, this); CheckAssignIf checkAssignIf(&tokenizer, &settings, this);
@ -124,7 +132,7 @@ private:
check("void f(int x) {\n" check("void f(int x) {\n"
" int y = x & 7;\n" " int y = x & 7;\n"
" if (z) y=0;\n" " if (z) y=0;\n"
" else if (y==8);\n" // always false " else { if (y==8); }\n" // always false
"}"); "}");
ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:4]: (style) Mismatching assignment and comparison, comparison 'y==8' is always false.\n", errout.str()); ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:4]: (style) Mismatching assignment and comparison, comparison 'y==8' is always false.\n", errout.str());
@ -245,14 +253,14 @@ private:
check("void foo(int x)\n" check("void foo(int x)\n"
"{\n" "{\n"
" if (x & 7);\n" " if (x & 7);\n"
" else if (x == 1);\n" " else { if (x == 1); }\n"
"}"); "}");
ASSERT_EQUALS("[test.cpp:4]: (style) Expression is always false because 'else if' condition matches previous condition at line 3.\n", errout.str()); ASSERT_EQUALS("[test.cpp:4]: (style) Expression is always false because 'else if' condition matches previous condition at line 3.\n", errout.str());
check("void foo(int x)\n" check("void foo(int x)\n"
"{\n" "{\n"
" if (x & 7);\n" " if (x & 7);\n"
" else if (x & 1);\n" " else { if (x & 1); }\n"
"}"); "}");
ASSERT_EQUALS("[test.cpp:4]: (style) Expression is always false because 'else if' condition matches previous condition at line 3.\n", errout.str()); ASSERT_EQUALS("[test.cpp:4]: (style) Expression is always false because 'else if' condition matches previous condition at line 3.\n", errout.str());
} }