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

Refactorized testrunner: Create std::string only where necessary

This commit is contained in:
PKEuS 2015-03-15 12:36:40 +01:00
parent e978a681a3
commit 42673255ed
7 changed files with 595 additions and 600 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/testassert.cpp
View File

@ -26,9 +26,7 @@ public:
TestAssert() : TestFixture("TestAssert") {}
private:
void check(
const char code[],
const char *filename = NULL) {
void check(const char code[], const char *filename = "test.cpp") {
// Clear the error buffer..
errout.str("");
@ -38,7 +36,7 @@ private:
// Tokenize..
Tokenizer tokenizer(&settings, this);
std::istringstream istr(code);
tokenizer.tokenize(istr, filename ? filename : "test.cpp");
tokenizer.tokenize(istr, filename);
// Check..
CheckAssert checkAssert(&tokenizer, &settings, this);

5
test/testautovariables.cpp
View File

@ -29,8 +29,7 @@ public:
private:
void check(const char code[], bool inconclusive=false, bool runSimpleChecks=true, const char* filename=nullptr) {
void check(const char code[], bool inconclusive = false, bool runSimpleChecks = true, const char* filename = "test.cpp") {
// Clear the error buffer..
errout.str("");
@ -42,7 +41,7 @@ private:
// Tokenize..
Tokenizer tokenizer(&settings, this);
std::istringstream istr(code);
tokenizer.tokenize(istr, (filename)?filename:"test.cpp");
tokenizer.tokenize(istr, filename);
CheckAutoVariables checkAutoVariables(&tokenizer, &settings, this);
checkAutoVariables.returnReference();

289
test/testsimplifytemplate.cpp
View File

@ -132,8 +132,8 @@ private:
const char code[] = "template <classname T> void f(T val) { T a; }\n"
"f<int>(10);";
const std::string expected("f<int> ( 10 ) ; "
"void f<int> ( int val ) { }");
const char expected[] = "f<int> ( 10 ) ; "
"void f<int> ( int val ) { }";
ASSERT_EQUALS(expected, tok(code));
}
@ -142,8 +142,8 @@ private:
const char code[] = "template <classname T> class Fred { T a; };\n"
"Fred<int> fred;";
const std::string expected("Fred<int> fred ; "
"class Fred<int> { int a ; } ;");
const char expected[] = "Fred<int> fred ; "
"class Fred<int> { int a ; } ;";
ASSERT_EQUALS(expected, tok(code));
}
@ -152,8 +152,8 @@ private:
const char code[] = "template <classname T, int sz> class Fred { T data[sz]; };\n"
"Fred<float,4> fred;";
const std::string expected("Fred<float,4> fred ; "
"class Fred<float,4> { float data [ 4 ] ; } ;");
const char expected[] = "Fred<float,4> fred ; "
"class Fred<float,4> { float data [ 4 ] ; } ;";
ASSERT_EQUALS(expected, tok(code));
}
@ -162,8 +162,8 @@ private:
const char code[] = "template <classname T> class Fred { Fred(); };\n"
"Fred<float> fred;";
const std::string expected("Fred<float> fred ; "
"class Fred<float> { Fred<float> ( ) ; } ;");
const char expected[] = "Fred<float> fred ; "
"class Fred<float> { Fred<float> ( ) ; } ;";
ASSERT_EQUALS(expected, tok(code));
}
@ -173,10 +173,10 @@ private:
"template <classname T> Fred<T>::Fred() { }\n"
"Fred<float> fred;";
const std::string expected("template < classname T > Fred < T > :: Fred ( ) { } " // <- TODO: this should be removed
"Fred<float> fred ; "
"class Fred<float> { } ; "
"Fred<float> :: Fred<float> ( ) { }");
const char expected[] = "template < classname T > Fred < T > :: Fred ( ) { } " // <- TODO: this should be removed
"Fred<float> fred ; "
"class Fred<float> { } ; "
"Fred<float> :: Fred<float> ( ) { }";
ASSERT_EQUALS(expected, tok(code));
}
@ -186,9 +186,9 @@ private:
"Fred<float> fred1;\n"
"Fred<float> fred2;";
const std::string expected("Fred<float> fred1 ; "
"Fred<float> fred2 ; "
"class Fred<float> { } ;");
const char expected[] = "Fred<float> fred1 ; "
"Fred<float> fred2 ; "
"class Fred<float> { } ;";
ASSERT_EQUALS(expected, tok(code));
}
@ -203,7 +203,7 @@ private:
" typedef ABC<T> m;\n"
"};\n";
const std::string expected("template < class T > class ABC { public: } ;");
const char expected[] = "template < class T > class ABC { public: } ;";
ASSERT_EQUALS(expected, tok(code));
}
@ -219,19 +219,19 @@ private:
" return 0;\n"
"}\n";
const std::string wanted("template < typename T > class ABC { public: } ; "
"int main ( ) { "
"std :: vector < int > v ; "
"v . push_back ( 4 ) ; "
"return 0 ; "
"}");
const char wanted[] = "template < typename T > class ABC { public: } ; "
"int main ( ) { "
"std :: vector < int > v ; "
"v . push_back ( 4 ) ; "
"return 0 ; "
"}";
const std::string current("template < typename T > class ABC { public: } ; "
"int main ( ) { "
"ABC < int > :: type v ; "
"v . push_back ( 4 ) ; "
"return 0 ; "
"}");
const char current[] = "template < typename T > class ABC { public: } ; "
"int main ( ) { "
"ABC < int > :: type v ; "
"v . push_back ( 4 ) ; "
"return 0 ; "
"}";
TODO_ASSERT_EQUALS(wanted, current, tok(code));
}
@ -247,12 +247,12 @@ private:
" }\n"
"};\n";
const std::string expected("template < typename T > class ABC { "
"public: void f ( ) { "
"ABC < int > :: type v ; "
"v . push_back ( 4 ) ; "
"} "
"} ;");
const char expected[] = "template < typename T > class ABC { "
"public: void f ( ) { "
"ABC < int > :: type v ; "
"v . push_back ( 4 ) ; "
"} "
"} ;";
ASSERT_EQUALS(expected, tok(code));
}
@ -300,9 +300,9 @@ private:
"} ;\n";
// The expected result..
std::string expected("void f ( ) { A<int> a ; } "
"template < typename T > class B { void g ( ) { A<T> b ; b = A<T> :: h ( ) ; } } ; "
"class A<int> { } ; class A<T> { } ;");
const char expected[] = "void f ( ) { A<int> a ; } "
"template < typename T > class B { void g ( ) { A<T> b ; b = A<T> :: h ( ) ; } } ; "
"class A<int> { } ; class A<T> { } ;";
ASSERT_EQUALS(expected, tok(code));
}
@ -317,11 +317,11 @@ private:
"}\n";
// The expected result..
const std::string expected("void f ( ) "
"{"
" foo<3,int> ( ) ; "
"} "
"int * foo<3,int> ( ) { return new int [ 3 ] ; }");
const char expected[] = "void f ( ) "
"{"
" foo<3,int> ( ) ; "
"} "
"int * foo<3,int> ( ) { return new int [ 3 ] ; }";
ASSERT_EQUALS(expected, tok(code));
}
@ -335,11 +335,11 @@ private:
"}\n";
// The expected result..
const std::string expected("void f ( ) "
"{"
" char * p ; p = foo<3,char> ( ) ; "
"} "
"char * foo<3,char> ( ) { return new char [ 3 ] ; }");
const char expected[] = "void f ( ) "
"{"
" char * p ; p = foo<3,char> ( ) ; "
"} "
"char * foo<3,char> ( ) { return new char [ 3 ] ; }";
ASSERT_EQUALS(expected, tok(code));
}
@ -354,12 +354,12 @@ private:
"}\n";
// The expected result..
const std::string expected("void f ( ) "
"{"
" A<12,12,11> a ; "
"} "
"class A<12,12,11> : public B < 12 , 12 , 0 > "
"{ } ;");
const char expected[] = "void f ( ) "
"{"
" A<12,12,11> a ; "
"} "
"class A<12,12,11> : public B < 12 , 12 , 0 > "
"{ } ;";
ASSERT_EQUALS(expected, tok(code));
}
@ -402,10 +402,10 @@ private:
"}\n";
// The expected result..
const std::string expected("void foo<int*> ( ) "
"{ x ( ) ; } "
"int main ( ) "
"{ foo<int*> ( ) ; }");
const char expected[] = "void foo<int*> ( ) "
"{ x ( ) ; } "
"int main ( ) "
"{ foo<int*> ( ) ; }";
ASSERT_EQUALS(expected, tok(code));
}
@ -426,11 +426,11 @@ private:
"}\n";
// The expected result..
const std::string expected("void a<0> ( ) { } "
"int main ( ) "
"{ a<2> ( ) ; return 0 ; } "
"void a<2> ( ) { a<1> ( ) ; } "
"void a<1> ( ) { a<0> ( ) ; }");
const char expected[] = "void a<0> ( ) { } "
"int main ( ) "
"{ a<2> ( ) ; return 0 ; } "
"void a<2> ( ) { a<1> ( ) ; } "
"void a<1> ( ) { a<0> ( ) ; }";
ASSERT_EQUALS(expected, tok(code));
}
@ -448,10 +448,10 @@ private:
" return 0;\n"
"}\n";
const std::string expected("int main ( ) { b<2> ( ) ; return 0 ; } "
"void b<2> ( ) { a<2> ( ) ; } "
"void a<i> ( ) { } "
"void a<2> ( ) { }");
const char expected[] = "int main ( ) { b<2> ( ) ; return 0 ; } "
"void b<2> ( ) { a<2> ( ) ; } "
"void a<i> ( ) { } "
"void a<2> ( ) { }";
ASSERT_EQUALS(expected, tok(code));
}
@ -476,8 +476,8 @@ private:
const char code[] = "template <class T> class foo { T a; };\n"
"foo<int> *f;";
const std::string expected("foo<int> * f ; "
"class foo<int> { int a ; } ;");
const char expected[] = "foo<int> * f ; "
"class foo<int> { int a ; } ;";
ASSERT_EQUALS(expected, tok(code));
}
@ -492,11 +492,11 @@ private:
"}\n";
// The expected result..
const std::string expected("void f ( ) "
"{"
" char p ; p = foo<char> ( ) ; "
"} "
"char & foo<char> ( ) { static char temp ; return temp ; }");
const char expected[] = "void f ( ) "
"{"
" char p ; p = foo<char> ( ) ; "
"} "
"char & foo<char> ( ) { static char temp ; return temp ; }";
ASSERT_EQUALS(expected, tok(code));
}
@ -515,10 +515,10 @@ private:
"A<int> a;\n";
// The expected result..
const std::string expected("template < class T > A < T > :: ~ A ( ) { } " // <- TODO: this should be removed
"A<int> a ; "
"class A<int> { public: ~ A<int> ( ) ; } ; "
"A<int> :: ~ A<int> ( ) { }");
const char expected[] = "template < class T > A < T > :: ~ A ( ) { } " // <- TODO: this should be removed
"A<int> a ; "
"class A<int> { public: ~ A<int> ( ) ; } ; "
"A<int> :: ~ A<int> ( ) { }";
ASSERT_EQUALS(expected, tok(code));
}
@ -527,8 +527,8 @@ private:
const char code[] = "template <classname T> struct Fred { T a; };\n"
"Fred<int> fred;";
const std::string expected("Fred<int> fred ; "
"struct Fred<int> { int a ; } ;");
const char expected[] = "Fred<int> fred ; "
"struct Fred<int> { int a ; } ;";
ASSERT_EQUALS(expected, tok(code));
}
@ -537,8 +537,8 @@ private:
const char code[] = "template <classname T, int sz> struct Fred { T data[sz]; };\n"
"Fred<float,4> fred;";
const std::string expected("Fred<float,4> fred ; "
"struct Fred<float,4> { float data [ 4 ] ; } ;");
const char expected[] = "Fred<float,4> fred ; "
"struct Fred<float,4> { float data [ 4 ] ; } ;";
ASSERT_EQUALS(expected, tok(code));
}
@ -547,8 +547,8 @@ private:
const char code[] = "template <classname T> struct Fred { Fred(); };\n"
"Fred<float> fred;";
const std::string expected("Fred<float> fred ; "
"struct Fred<float> { Fred<float> ( ) ; } ;");
const char expected[] = "Fred<float> fred ; "
"struct Fred<float> { Fred<float> ( ) ; } ;";
ASSERT_EQUALS(expected, tok(code));
}
@ -558,9 +558,9 @@ private:
"Fred<float> fred1;\n"
"Fred<float> fred2;";
const std::string expected("Fred<float> fred1 ; "
"Fred<float> fred2 ; "
"struct Fred<float> { } ;");
const char expected[] = "Fred<float> fred1 ; "
"Fred<float> fred2 ; "
"struct Fred<float> { } ;";
ASSERT_EQUALS(expected, tok(code));
}
@ -570,8 +570,8 @@ private:
const char code[] = "template <classname T> struct Fred { T a; };\n"
"Fred<std::string> fred;";
const std::string expected("Fred<std::string> fred ; "
"struct Fred<std::string> { std :: string a ; } ;");
const char expected[] = "Fred<std::string> fred ; "
"struct Fred<std::string> { std :: string a ; } ;";
ASSERT_EQUALS(expected, tok(code));
}
@ -582,10 +582,10 @@ private:
" std::cout << (foo<double>());\n"
"}";
const std::string expected("void bar ( ) {"
" std :: cout << ( foo<double> ( ) ) ; "
"} "
"void foo<double> ( ) { }");
const char expected[] = "void bar ( ) {"
" std :: cout << ( foo<double> ( ) ) ; "
"} "
"void foo<double> ( ) { }";
ASSERT_EQUALS(expected, tok(code));
}
@ -889,15 +889,15 @@ private:
"template void Fred<float>::f();\n"
"template void Fred<int>::g();\n";
const std::string expected("template < classname T > void Fred<T> :: f ( ) { } "
"template < classname T > void Fred<T> :: g ( ) { } "
"template void Fred<float> :: f ( ) ; "
"template void Fred<int> :: g ( ) ; "
"class Fred<T> { void f ( ) ; void g ( ) ; } ; "
"Fred<T> :: f ( ) { } "
"Fred<T> :: g ( ) { } "
"class Fred<float> { void f ( ) ; void g ( ) ; } ; "
"class Fred<int> { void f ( ) ; void g ( ) ; } ;");
const char expected[] = "template < classname T > void Fred<T> :: f ( ) { } "
"template < classname T > void Fred<T> :: g ( ) { } "
"template void Fred<float> :: f ( ) ; "
"template void Fred<int> :: g ( ) ; "
"class Fred<T> { void f ( ) ; void g ( ) ; } ; "
"Fred<T> :: f ( ) { } "
"Fred<T> :: g ( ) { } "
"class Fred<float> { void f ( ) ; void g ( ) ; } ; "
"class Fred<int> { void f ( ) ; void g ( ) ; } ;";
ASSERT_EQUALS(expected, tok(code));
}
@ -908,13 +908,13 @@ private:
"template<> void Fred<float>::f() { }\n"
"template<> void Fred<int>::g() { }\n";
const std::string expected("template < classname T > void Fred<T> :: f ( ) { } "
"template < > void Fred<float> :: f ( ) { } "
"template < > void Fred<int> :: g ( ) { } "
"class Fred<T> { void f ( ) ; } ; "
"Fred<T> :: f ( ) { } "
"class Fred<float> { void f ( ) ; } ; "
"class Fred<int> { void f ( ) ; } ;");
const char expected[] = "template < classname T > void Fred<T> :: f ( ) { } "
"template < > void Fred<float> :: f ( ) { } "
"template < > void Fred<int> :: g ( ) { } "
"class Fred<T> { void f ( ) ; } ; "
"Fred<T> :: f ( ) { } "
"class Fred<float> { void f ( ) ; } ; "
"class Fred<int> { void f ( ) ; } ;";
ASSERT_EQUALS(expected, tok(code));
}
@ -964,15 +964,15 @@ private:
"}\n";
// The expected result..
const std::string expected("void f ( ) "
"{"
" A<int,2> a1 ;"
" A<int,3> a2 ; "
"} "
"class A<int,2> "
"{ int ar [ 2 ] ; } ; "
"class A<int,3> "
"{ int ar [ 3 ] ; } ;");
const char expected[] = "void f ( ) "
"{"
" A<int,2> a1 ;"
" A<int,3> a2 ; "
"} "
"class A<int,2> "
"{ int ar [ 2 ] ; } ; "
"class A<int,3> "
"{ int ar [ 3 ] ; } ;";
ASSERT_EQUALS(expected, tok(code));
}
{
@ -987,13 +987,13 @@ private:
"}\n";
// The expected result..
const std::string expected("void f ( ) "
"{"
" A<int,3,2> a1 ;"
" A<int,3,2> a2 ; "
"} "
"class A<int,3,2> "
"{ int ar [ 5 ] ; } ;");
const char expected[] = "void f ( ) "
"{"
" A<int,3,2> a1 ;"
" A<int,3,2> a2 ; "
"} "
"class A<int,3,2> "
"{ int ar [ 5 ] ; } ;";
ASSERT_EQUALS(expected, tok(code));
}
{
@ -1007,27 +1007,26 @@ private:
" A<int> a2;\n"
"}\n";
const std::string wanted("template < class T , int n >"
" class A"
" { T ar [ n ] ; } ;"
" void f ( )"
" {"
" A<int,(int)2> a1 ;"
" A<int,3> a2 ;"
" }"
" class A<int,2>"
" { int ar [ 2 ] ; }"
" class A<int,3>"
" { int ar [ 3 ] ; }");
const char wanted[] = "template < class T , int n >"
" class A"
" { T ar [ n ] ; } ;"
" void f ( )"
" {"
" A<int,(int)2> a1 ;"
" A<int,3> a2 ;"
" }"
" class A<int,2>"
" { int ar [ 2 ] ; }"
" class A<int,3>"
" { int ar [ 3 ] ; }";
const std::string current("void f ( ) "
"{ "
"A < int , ( int ) 2 > a1 ; "
"A<int,3> a2 ; "
"} "
"class A<int,3> "
"{ int ar [ 3 ] ; } ;"
);
const char current[] = "void f ( ) "
"{ "
"A < int , ( int ) 2 > a1 ; "
"A<int,3> a2 ; "
"} "
"class A<int,3> "
"{ int ar [ 3 ] ; } ;";
TODO_ASSERT_EQUALS(wanted, current, tok(code));
}
{
@ -1078,7 +1077,7 @@ private:
"{ }";
// The expected result..
const std::string expected("template < class T > void foo ( T :: t * ) { }");
const char expected[] = "template < class T > void foo ( T :: t * ) { }";
ASSERT_EQUALS(expected, tok(code));
}

12
test/testsimplifytokens.cpp
View File

@ -1448,7 +1448,7 @@ private:
"for (int i = 0; i < static_cast<int>(3); ++i) {}\n"
"}\n";
const std::string expected("void f ( ) { for ( int i = 0 ; i < 3 ; ++ i ) { } }");
const char expected[] = "void f ( ) { for ( int i = 0 ; i < 3 ; ++ i ) { } }";
ASSERT_EQUALS(expected, tok(code));
}
@ -1459,7 +1459,7 @@ private:
" p = const_cast<char *> qtu ();\n"
"}\n";
const std::string expected("void f ( ) { p = const_cast < char * > qtu ( ) ; }");
const char expected[] = "void f ( ) { p = const_cast < char * > qtu ( ) ; }";
ASSERT_EQUALS(expected, tok(code));
}
@ -1470,7 +1470,7 @@ private:
"{\n"
" return dynamic_cast<Foo *>((bar()));\n"
"}\n";
const std::string expected("void f ( ) { return bar ( ) ; }");
const char expected[] = "void f ( ) { return bar ( ) ; }";
ASSERT_EQUALS(expected, tok(code));
}
@ -1534,7 +1534,7 @@ private:
{
const char code[] = "using namespace std; namespace a{ namespace b{ void f(){} } }";
const std::string expected("namespace a { namespace b { void f ( ) { } } }");
const char expected[] = "namespace a { namespace b { void f ( ) { } } }";
ASSERT_EQUALS(expected, tok(code));
}
@ -1542,7 +1542,7 @@ private:
{
const char code[] = "namespace b{ void f(){} }";
const std::string expected("namespace b { void f ( ) { } }");
const char expected[] = "namespace b { void f ( ) { } }";
ASSERT_EQUALS(expected, tok(code));
}
@ -1550,7 +1550,7 @@ private:
{
const char code[] = "void f(int namespace) { }";
const std::string expected("void f ( int namespace ) { }");
const char expected[] = "void f ( int namespace ) { }";
ASSERT_EQUALS(expected, tok(code));
}

8
test/testsimplifytypedef.cpp
View File

@ -1655,7 +1655,7 @@ private:
"}";
// The expected tokens..
const std::string expected1("void f ( ) { char a [ 256 ] ; char b [ 256 ] ; }");
const char expected1[] = "void f ( ) { char a [ 256 ] ; char b [ 256 ] ; }";
ASSERT_EQUALS(expected1, tok(code1, false));
ASSERT_EQUALS("", errout.str());
@ -1666,7 +1666,7 @@ private:
"}";
// The expected tokens..
const std::string expected2("void f ( ) { char a [ 256 ] ; a = { 0 } ; char b [ 256 ] ; b = { 0 } ; }");
const char expected2[] = "void f ( ) { char a [ 256 ] ; a = { 0 } ; char b [ 256 ] ; b = { 0 } ; }";
ASSERT_EQUALS(expected2, tok(code2, false));
ASSERT_EQUALS("", errout.str());
@ -1677,7 +1677,7 @@ private:
"}";
// The expected tokens..
const std::string expected3("void f ( ) { char a [ 256 ] ; a = \"\" ; char b [ 256 ] ; b = \"\" ; }");
const char expected3[] = "void f ( ) { char a [ 256 ] ; a = \"\" ; char b [ 256 ] ; b = \"\" ; }";
ASSERT_EQUALS(expected3, tok(code3, false));
ASSERT_EQUALS("", errout.str());
@ -1688,7 +1688,7 @@ private:
"}";
// The expected tokens..
const std::string expected4("void f ( ) { char a [ 256 ] ; a = \"1234\" ; char b [ 256 ] ; b = \"5678\" ; }");
const char expected4[] = "void f ( ) { char a [ 256 ] ; a = \"1234\" ; char b [ 256 ] ; b = \"5678\" ; }";
ASSERT_EQUALS(expected4, tok(code4, false));
ASSERT_EQUALS("", errout.str());
}

4
test/testtokenize.cpp
View File

@ -8657,8 +8657,8 @@ private:
std::list<std::string> configurations;
std::string filedata = "";
std::istringstream fin(raw_code);
preprocessor.preprocess(fin, filedata, configurations, "", settings._includePaths);
const std::string code = preprocessor.getcode(filedata, "", "");
preprocessor.preprocess(fin, filedata, configurations, emptyString, settings._includePaths);
const std::string code = preprocessor.getcode(filedata, emptyString, emptyString);
tokenizeAndStringify(code.c_str()); // just survive...
}

871
test/testvarid.cpp
View File

File diff suppressed because it is too large Load Diff