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

TestTokenizer: moved test to proper place.

This commit is contained in:
Edoardo Prezioso 2012-01-26 22:25:19 +01:00
parent b6763313c5
commit 7cf8e5dfff
1 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
test/testtokenize.cpp
View File

@ -90,8 +90,9 @@ private:
TEST_CASE(ifAddBraces13); TEST_CASE(ifAddBraces13);
TEST_CASE(ifAddBraces14); // #2610 - segfault: if()<{} TEST_CASE(ifAddBraces14); // #2610 - segfault: if()<{}
TEST_CASE(ifAddBraces15); // #2616 - unknown macro before if TEST_CASE(ifAddBraces15); // #2616 - unknown macro before if
TEST_CASE(ifAddBraces16); // '} else' should be in the same line TEST_CASE(ifAddBraces16); // ticket # 2739 (segmentation fault)
TEST_CASE(ifAddBraces17); // #3424 - if if { } else else TEST_CASE(ifAddBraces17); // '} else' should be in the same line
TEST_CASE(ifAddBraces18); // #3424 - if if { } else else
TEST_CASE(whileAddBraces); TEST_CASE(whileAddBraces);
TEST_CASE(doWhileAddBraces); TEST_CASE(doWhileAddBraces);
@ -385,8 +386,6 @@ private:
// a = b = 0; // a = b = 0;
TEST_CASE(multipleAssignment); TEST_CASE(multipleAssignment);
TEST_CASE(simplifyIfAddBraces); // ticket # 2739 (segmentation fault)
TEST_CASE(platformWin32); TEST_CASE(platformWin32);
TEST_CASE(platformWin32A); TEST_CASE(platformWin32A);
TEST_CASE(platformWin32W); TEST_CASE(platformWin32W);
@ -974,7 +973,21 @@ private:
ASSERT_EQUALS("{ A if ( x ) { y ( ) ; } }", tokenizeAndStringify("{A if(x)y();}", false)); ASSERT_EQUALS("{ A if ( x ) { y ( ) ; } }", tokenizeAndStringify("{A if(x)y();}", false));
} }
void ifAddBraces16() { void ifAddBraces16() { // ticket # 2739 (segmentation fault)
tokenizeAndStringify("if()x");
ASSERT_EQUALS("[test.cpp:1]: (error) syntax error\n", errout.str());
// ticket #2873 - the fix is not needed anymore.
{
const char code[] = "void f() { "
"(void) ( { if(*p) (*p) = x(); } ) "
"}";
ASSERT_EQUALS("void f ( ) { ( void ) ( { if ( * p ) ( * p ) = x ( ) ; } ) }",
tokenizeAndStringify(code));
}
}
void ifAddBraces17() {
const char code[] = "void f()\n" const char code[] = "void f()\n"
"{\n" "{\n"
" if (a)\n" " if (a)\n"
@ -992,7 +1005,7 @@ private:
"}", tokenizeAndStringify(code, true)); "}", tokenizeAndStringify(code, true));
} }
void ifAddBraces17() { void ifAddBraces18() {
// ticket #3424 - if if { } else else // ticket #3424 - if if { } else else
ASSERT_EQUALS("{ if ( x ) { if ( y ) { } else { ; } } else { ; } }", ASSERT_EQUALS("{ if ( x ) { if ( y ) { } else { ; } } else { ; } }",
tokenizeAndStringify("{ if(x) if(y){}else;else;}", false)); tokenizeAndStringify("{ if(x) if(y){}else;else;}", false));
@ -6114,20 +6127,6 @@ private:
ASSERT_EQUALS("a = b = 0 ;", tokenizeAndStringify("a=b=0;")); ASSERT_EQUALS("a = b = 0 ;", tokenizeAndStringify("a=b=0;"));
} }
void simplifyIfAddBraces() { // ticket # 2739 (segmentation fault)
tokenizeAndStringify("if()x");
ASSERT_EQUALS("[test.cpp:1]: (error) syntax error\n", errout.str());
// ticket #2873 - the fix is not needed anymore.
{
const char code[] = "void f() { "
"(void) ( { if(*p) (*p) = x(); } ) "
"}";
ASSERT_EQUALS("void f ( ) { ( void ) ( { if ( * p ) ( * p ) = x ( ) ; } ) }",
tokenizeAndStringify(code));
}
}
void platformWin32() { void platformWin32() {
// WIN32A // WIN32A
const char code[] = "unsigned int sizeof_short = sizeof(short);" const char code[] = "unsigned int sizeof_short = sizeof(short);"