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

Fixed string literals in several unit tests (one test failing - changed it to TODO)

This commit is contained in:
PKEuS 2012-11-29 21:07:52 +01:00
parent 0db2675912
commit 36aeb74b5a
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
test/testclass.cpp
View File

@ -2290,13 +2290,13 @@ private:
ASSERT_EQUALS("[test.cpp:3]: (style, inconclusive) Technically the member function 'Fred::getA' can be const.\n", errout.str()); ASSERT_EQUALS("[test.cpp:3]: (style, inconclusive) Technically the member function 'Fred::getA' can be const.\n", errout.str());
checkConst("class Fred {\n" checkConst("class Fred {\n"
" const std::string foo() { return ""; }\n" " const std::string foo() { return \"\"; }\n"
"};\n"); "};\n");
ASSERT_EQUALS("[test.cpp:2]: (performance, inconclusive) Technically the member function 'Fred::foo' can be static.\n", errout.str()); ASSERT_EQUALS("[test.cpp:2]: (performance, inconclusive) Technically the member function 'Fred::foo' can be static.\n", errout.str());
checkConst("class Fred {\n" checkConst("class Fred {\n"
" std::string s;\n" " std::string s;\n"
" const std::string & foo() { return ""; }\n" " const std::string & foo() { return \"\"; }\n"
"};\n"); "};\n");
ASSERT_EQUALS("[test.cpp:3]: (performance, inconclusive) Technically the member function 'Fred::foo' can be static.\n", errout.str()); ASSERT_EQUALS("[test.cpp:3]: (performance, inconclusive) Technically the member function 'Fred::foo' can be static.\n", errout.str());
@ -2349,7 +2349,7 @@ private:
ASSERT_EQUALS("", errout.str()); ASSERT_EQUALS("", errout.str());
checkConst("class Fred {\n" checkConst("class Fred {\n"
" const std::string foo() const throw() { return ""; }\n" " const std::string foo() const throw() { return \"\"; }\n"
"};\n"); "};\n");
ASSERT_EQUALS("[test.cpp:2]: (performance, inconclusive) Technically the member function 'Fred::foo' can be static.\n", errout.str()); ASSERT_EQUALS("[test.cpp:2]: (performance, inconclusive) Technically the member function 'Fred::foo' can be static.\n", errout.str());
} }
@ -2359,7 +2359,7 @@ private:
// assignment to variable can't be const // assignment to variable can't be const
checkConst("class Fred {\n" checkConst("class Fred {\n"
" std::string s;\n" " std::string s;\n"
" void foo() { s = ""; }\n" " void foo() { s = \"\"; }\n"
"};\n"); "};\n");
ASSERT_EQUALS("", errout.str()); ASSERT_EQUALS("", errout.str());
@ -2462,8 +2462,8 @@ private:
" std::string s;\n" " std::string s;\n"
" const std::string & foo();\n" " const std::string & foo();\n"
"};\n" "};\n"
"const std::string & Fred::foo() { return ""; }"); "const std::string & Fred::foo() { return \"\"; }");
ASSERT_EQUALS("[test.cpp:5] -> [test.cpp:3]: (performance, inconclusive) Technically the member function 'Fred::foo' can be static.\n", errout.str()); TODO_ASSERT_EQUALS("[test.cpp:5] -> [test.cpp:3]: (performance, inconclusive) Technically the member function 'Fred::foo' can be static.\n", "", errout.str());
// functions with a function call to a non-const member can't be const.. (#1305) // functions with a function call to a non-const member can't be const.. (#1305)
checkConst("class Fred\n" checkConst("class Fred\n"
@ -2490,7 +2490,7 @@ private:
" std::string s;\n" " std::string s;\n"
" void foo();\n" " void foo();\n"
"};\n" "};\n"
"void Fred::foo() { s = ""; }"); "void Fred::foo() { s = \"\"; }");
ASSERT_EQUALS("", errout.str()); ASSERT_EQUALS("", errout.str());
// assignment to function argument reference can be const // assignment to function argument reference can be const
@ -2860,7 +2860,7 @@ private:
// ticket #1517 // ticket #1517
checkConst("class A {\n" checkConst("class A {\n"
"public:\n" "public:\n"
" A():m_strValue(""){}\n" " A():m_strValue(\"\"){}\n"
" std::string strGetString() { return m_strValue; }\n" " std::string strGetString() { return m_strValue; }\n"
"private:\n" "private:\n"
" std::string m_strValue;\n" " std::string m_strValue;\n"
@ -3514,7 +3514,7 @@ private:
void const25() { // ticket #1724 void const25() { // ticket #1724
checkConst("class A{\n" checkConst("class A{\n"
"public:\n" "public:\n"
"A(){m_strVal="";}\n" "A(){m_strVal=\"\";}\n"
"std::string strGetString() const\n" "std::string strGetString() const\n"
"{return m_strVal.c_str();}\n" "{return m_strVal.c_str();}\n"
"const std::string strGetString1() const\n" "const std::string strGetString1() const\n"
@ -3527,7 +3527,7 @@ private:
checkConst("class A{\n" checkConst("class A{\n"
"public:\n" "public:\n"
"A(){m_strVal="";}\n" "A(){m_strVal=\"\";}\n"
"std::string strGetString()\n" "std::string strGetString()\n"
"{return m_strVal.c_str();}\n" "{return m_strVal.c_str();}\n"
"private:\n" "private:\n"
@ -3538,7 +3538,7 @@ private:
checkConst("class A{\n" checkConst("class A{\n"
"public:\n" "public:\n"
"A(){m_strVal="";}\n" "A(){m_strVal=\"\";}\n"
"const std::string strGetString1()\n" "const std::string strGetString1()\n"
"{return m_strVal.c_str();}\n" "{return m_strVal.c_str();}\n"
"private:\n" "private:\n"
@ -3549,7 +3549,7 @@ private:
checkConst("class A{\n" checkConst("class A{\n"
"public:\n" "public:\n"
"A(){m_strVec.push_back("");}\n" "A(){m_strVec.push_back(\"\");}\n"
"size_t strGetSize()\n" "size_t strGetSize()\n"
"{return m_strVec.size();}\n" "{return m_strVec.size();}\n"
"private:\n" "private:\n"
@ -3560,7 +3560,7 @@ private:
checkConst("class A{\n" checkConst("class A{\n"
"public:\n" "public:\n"
"A(){m_strVec.push_back("");}\n" "A(){m_strVec.push_back(\"\");}\n"
"bool strGetEmpty()\n" "bool strGetEmpty()\n"
"{return m_strVec.empty();}\n" "{return m_strVec.empty();}\n"
"private:\n" "private:\n"

2
test/testconstructors.cpp
View File

@ -1609,7 +1609,7 @@ private:
check("class John\n" check("class John\n"
"{\n" "{\n"
"public:\n" "public:\n"
" John() { strcpy(name, ""); }\n" " John() { strcpy(name, \"\"); }\n"
"\n" "\n"
"private:\n" "private:\n"
" char name[255];\n" " char name[255];\n"

2
test/testmemleak.cpp
View File

@ -1704,7 +1704,7 @@ private:
"\n" "\n"
"static char* foo()\n" "static char* foo()\n"
"{\n" "{\n"
" return strdup("");\n" " return strdup(\"\");\n"
"}\n" "}\n"
"\n" "\n"
"static void bar()\n" "static void bar()\n"