Refactorized testrunner: Create std::string only where necessary

PKEuS · PKEuS · commit 42673255edb2 · 2015-03-15T12:36:40.000+01:00
diff --git a/test/testassert.cpp b/test/testassert.cpp
@@ -26,9 +26,7 @@ class TestAssert : public TestFixture {
     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 @@ class TestAssert : public TestFixture {
         // 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);
diff --git a/test/testautovariables.cpp b/test/testautovariables.cpp
@@ -29,8 +29,7 @@ class TestAutoVariables : public TestFixture {
 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 @@ class TestAutoVariables : public TestFixture {
         // 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();
diff --git a/test/testsimplifytemplate.cpp b/test/testsimplifytemplate.cpp
diff --git a/test/testsimplifytokens.cpp b/test/testsimplifytokens.cpp
@@ -1448,7 +1448,7 @@ class TestSimplifyTokens : public TestFixture {
                                 "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 @@ class TestSimplifyTokens : public TestFixture {
                                 "    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 @@ class TestSimplifyTokens : public TestFixture {
                                 "{\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,23 +1534,23 @@ class TestSimplifyTokens : public TestFixture {
         {
             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));
         }
 
         {
             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));
         }
 
         {
             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));
         }
diff --git a/test/testsimplifytypedef.cpp b/test/testsimplifytypedef.cpp
@@ -1655,7 +1655,7 @@ class TestSimplifyTypedef : public TestFixture {
                              "}";
 
         // 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 @@ class TestSimplifyTypedef : public TestFixture {
                              "}";
 
         // 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 @@ class TestSimplifyTypedef : public TestFixture {
                              "}";
 
         // 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 @@ class TestSimplifyTypedef : public TestFixture {
                              "}";
 
         // 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());
     }
diff --git a/test/testtokenize.cpp b/test/testtokenize.cpp
@@ -8657,8 +8657,8 @@ class TestTokenizer : public TestFixture {
         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...
     }
diff --git a/test/testvarid.cpp b/test/testvarid.cpp

Original file line number	Diff line number	Diff line change
`@@ -1448,7 +1448,7 @@ class TestSimplifyTokens : public TestFixture {`
`1448`	`1448`	`"for (int i = 0; i < static_cast<int>(3); ++i) {}\n"`
`1449`	`1449`	`"}\n";`
`1450`	`1450`
`1451`		`- const std::string expected("void f ( ) { for ( int i = 0 ; i < 3 ; ++ i ) { } }");`
	`1451`	`+ const char expected[] = "void f ( ) { for ( int i = 0 ; i < 3 ; ++ i ) { } }";`
`1452`	`1452`
`1453`	`1453`	`ASSERT_EQUALS(expected, tok(code));`
`1454`	`1454`	`}`
`@@ -1459,7 +1459,7 @@ class TestSimplifyTokens : public TestFixture {`
`1459`	`1459`	`" p = const_cast<char *> qtu ();\n"`
`1460`	`1460`	`"}\n";`
`1461`	`1461`
`1462`		`- const std::string expected("void f ( ) { p = const_cast < char * > qtu ( ) ; }");`
	`1462`	`+ const char expected[] = "void f ( ) { p = const_cast < char * > qtu ( ) ; }";`
`1463`	`1463`
`1464`	`1464`	`ASSERT_EQUALS(expected, tok(code));`
`1465`	`1465`	`}`
`@@ -1470,7 +1470,7 @@ class TestSimplifyTokens : public TestFixture {`
`1470`	`1470`	`"{\n"`
`1471`	`1471`	`" return dynamic_cast<Foo *>((bar()));\n"`
`1472`	`1472`	`"}\n";`
`1473`		`- const std::string expected("void f ( ) { return bar ( ) ; }");`
	`1473`	`+ const char expected[] = "void f ( ) { return bar ( ) ; }";`
`1474`	`1474`
`1475`	`1475`	`ASSERT_EQUALS(expected, tok(code));`
`1476`	`1476`	`}`
`@@ -1534,23 +1534,23 @@ class TestSimplifyTokens : public TestFixture {`
`1534`	`1534`	`{`
`1535`	`1535`	`const char code[] = "using namespace std; namespace a{ namespace b{ void f(){} } }";`
`1536`	`1536`
`1537`		`- const std::string expected("namespace a { namespace b { void f ( ) { } } }");`
	`1537`	`+ const char expected[] = "namespace a { namespace b { void f ( ) { } } }";`
`1538`	`1538`
`1539`	`1539`	`ASSERT_EQUALS(expected, tok(code));`
`1540`	`1540`	`}`
`1541`	`1541`
`1542`	`1542`	`{`
`1543`	`1543`	`const char code[] = "namespace b{ void f(){} }";`
`1544`	`1544`
`1545`		`- const std::string expected("namespace b { void f ( ) { } }");`
	`1545`	`+ const char expected[] = "namespace b { void f ( ) { } }";`
`1546`	`1546`
`1547`	`1547`	`ASSERT_EQUALS(expected, tok(code));`
`1548`	`1548`	`}`
`1549`	`1549`
`1550`	`1550`	`{`
`1551`	`1551`	`const char code[] = "void f(int namespace) { }";`
`1552`	`1552`
`1553`		`- const std::string expected("void f ( int namespace ) { }");`
	`1553`	`+ const char expected[] = "void f ( int namespace ) { }";`
`1554`	`1554`
`1555`	`1555`	`ASSERT_EQUALS(expected, tok(code));`
`1556`	`1556`	`}`