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

Fixes for test suite, added a TODO unit test about bad typedef simplification

This commit is contained in:
PKEuS 2014-06-04 18:10:57 +02:00
parent 39b64ea5fb
commit 26e09ae4a4
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/testassignif.cpp
View File

@ -339,8 +339,8 @@ private:
ASSERT_EQUALS("", errout.str()); ASSERT_EQUALS("", errout.str());
check("void f(int a, int &b) {\n" check("void f(int a, int &b) {\n"
" if (!strtok(NULL," ")) { b = 1; }\n" " if (!strtok(NULL, \" \")) { b = 1; }\n"
" else { if (!strtok(NULL," ")) { b = 2; } }\n" " else { if (!strtok(NULL, \" \")) { b = 2; } }\n"
"}"); "}");
ASSERT_EQUALS("", errout.str()); ASSERT_EQUALS("", errout.str());

16
test/testsimplifytokens.cpp
View File

@ -838,13 +838,13 @@ private:
void parentheses1() { void parentheses1() {
ASSERT_EQUALS("<= 110 ;", tok("<= (10+100);")); ASSERT_EQUALS("a <= 110 ;", tok("a <= (10+100);"));
ASSERT_EQUALS("while ( x ( ) == -1 ) { }", tok("while((x()) == -1){ }")); ASSERT_EQUALS("while ( x ( ) == -1 ) { }", tok("while((x()) == -1){ }"));
} }
void parenthesesVar() { void parenthesesVar() {
// remove parentheses.. // remove parentheses..
ASSERT_EQUALS("= p ;", tok("= (p);")); ASSERT_EQUALS("a = p ;", tok("a = (p);"));
ASSERT_EQUALS("if ( a < p ) { }", tok("if(a<(p)){}")); ASSERT_EQUALS("if ( a < p ) { }", tok("if(a<(p)){}"));
ASSERT_EQUALS("void f ( ) { int p ; if ( p == -1 ) { } }", tok("void f(){int p; if((p)==-1){}}")); ASSERT_EQUALS("void f ( ) { int p ; if ( p == -1 ) { } }", tok("void f(){int p; if((p)==-1){}}"));
ASSERT_EQUALS("void f ( ) { int p ; if ( -1 == p ) { } }", tok("void f(){int p; if(-1==(p)){}}")); ASSERT_EQUALS("void f ( ) { int p ; if ( -1 == p ) { } }", tok("void f(){int p; if(-1==(p)){}}"));
@ -859,7 +859,7 @@ private:
ASSERT_EQUALS("void f ( ) { int p ; if ( p ) { } p = 1 ; }", tok("void f(){int p; if ( p ) { } (p) = 1;}")); ASSERT_EQUALS("void f ( ) { int p ; if ( p ) { } p = 1 ; }", tok("void f(){int p; if ( p ) { } (p) = 1;}"));
// keep parentheses.. // keep parentheses..
ASSERT_EQUALS("= a ;", tok("= (char)a;")); ASSERT_EQUALS("b = a ;", tok("b = (char)a;"));
ASSERT_EQUALS("cast < char * > ( p )", tok("cast<char *>(p)")); ASSERT_EQUALS("cast < char * > ( p )", tok("cast<char *>(p)"));
ASSERT_EQUALS("return ( a + b ) * c ;", tok("return (a+b)*c;")); ASSERT_EQUALS("return ( a + b ) * c ;", tok("return (a+b)*c;"));
ASSERT_EQUALS("void f ( ) { int p ; if ( 2 * p == 0 ) { } }", tok("void f(){int p; if (2*p == 0) {}}")); ASSERT_EQUALS("void f ( ) { int p ; if ( 2 * p == 0 ) { } }", tok("void f(){int p; if (2*p == 0) {}}"));
@ -3071,8 +3071,8 @@ private:
} }
{ {
const char code[] = "= 1 ? 0 : ({ 0; });"; const char code[] = "a = 1 ? 0 : ({ 0; });";
ASSERT_EQUALS("= 0 ;", tok(code)); ASSERT_EQUALS("a = 0 ;", tok(code));
} }
//GNU extension: "x ?: y" <-> "x ? x : y" //GNU extension: "x ?: y" <-> "x ? x : y"
@ -4611,9 +4611,11 @@ private:
"union A;"); "union A;");
ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:1]: (style) The union 'A' forward declaration is unnecessary. Type union is already declared earlier.\n", errout.str()); ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:1]: (style) The union 'A' forward declaration is unnecessary. Type union is already declared earlier.\n", errout.str());
checkSimplifyTypedef("typedef std::map<std::string, int> A;\n" const char code [] = "typedef std::map<std::string, int> A;\n"
"class A;"); "class A;";
checkSimplifyTypedef(code);
ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:1]: (style) The class 'A' forward declaration is unnecessary. Type class is already declared earlier.\n", errout.str()); ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:1]: (style) The class 'A' forward declaration is unnecessary. Type class is already declared earlier.\n", errout.str());
TODO_ASSERT_EQUALS("class A ;", "class std :: map < std :: string , int > ;", tok(code));
} }
void simplifyTypedef43() { void simplifyTypedef43() {