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

Fixed unit test failures caused by previous commit

This commit is contained in:
PKEuS 2012-11-11 15:16:08 +01:00
parent 4ea2df8671
commit b15ff0c0e3
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/testsimplifytokens.cpp
View File

@ -3712,7 +3712,7 @@ private:
"a . foo ( ) ; " "a . foo ( ) ; "
"wchar_t c ; c = 0 ; " "wchar_t c ; c = 0 ; "
"}"; "}";
ASSERT_EQUALS(expected, tok(code)); ASSERT_EQUALS(expected, tok(code, false));
} }
void simplifyTypedef2() { void simplifyTypedef2() {

14
test/testtokenize.cpp
View File

@ -7236,7 +7236,7 @@ private:
" _stscanf(dst, _T(\"%s\"), dst);" " _stscanf(dst, _T(\"%s\"), dst);"
"}" "}"
"TBYTE tbyte;"; "TBYTE tbyte;";
const char expected[] = "unsigned short wc ; " const char expected[] = "wchar_t wc ; "
"char c ; " "char c ; "
"char * ptstr ; " "char * ptstr ; "
"char * lptstr ; " "char * lptstr ; "
@ -7282,24 +7282,24 @@ private:
" _tscanf(_T(\"%s\"), dst);" " _tscanf(_T(\"%s\"), dst);"
" _stscanf(dst, _T(\"%s\"), dst);" " _stscanf(dst, _T(\"%s\"), dst);"
"}"; "}";
const char expected[] = "unsigned short wc ; " const char expected[] = "wchar_t wc ; "
"unsigned short c ; " "wchar_t c ; "
"unsigned short * ptstr ; " "unsigned short * ptstr ; "
"unsigned short * lptstr ; " "unsigned short * lptstr ; "
"const unsigned short * pctstr ; " "const unsigned short * pctstr ; "
"const unsigned short * lpctstr ; " "const unsigned short * lpctstr ; "
"unsigned char tbyte ; " "unsigned char tbyte ; "
"void foo ( ) { " "void foo ( ) { "
"unsigned short tc ; tc = \'c\' ; " "wchar_t tc ; tc = \'c\' ; "
"unsigned short src [ 10 ] = \"123456789\" ; " "wchar_t src [ 10 ] = \"123456789\" ; "
"unsigned short dst [ 10 ] ; " "wchar_t dst [ 10 ] ; "
"wcscpy ( dst , src ) ; " "wcscpy ( dst , src ) ; "
"dst [ 0 ] = 0 ; " "dst [ 0 ] = 0 ; "
"wcscat ( dst , src ) ; " "wcscat ( dst , src ) ; "
"unsigned short * d ; d = wcsdup ( str ) ; " "unsigned short * d ; d = wcsdup ( str ) ; "
"wprintf ( \"Hello world!\n\" ) ; " "wprintf ( \"Hello world!\n\" ) ; "
"swprintf ( dst , \"Hello!\n\" ) ; " "swprintf ( dst , \"Hello!\n\" ) ; "
"snwprintf ( dst , sizeof ( dst ) / sizeof ( unsigned short ) , \"Hello world!\n\" ) ; " "snwprintf ( dst , sizeof ( dst ) / sizeof ( wchar_t ) , \"Hello world!\n\" ) ; "
"wscanf ( \"%s\" , dst ) ; " "wscanf ( \"%s\" , dst ) ; "
"swscanf ( dst , \"%s\" , dst ) ; " "swscanf ( dst , \"%s\" , dst ) ; "
"}"; "}";