Refactorizations in testrunner:

PKEuS · PKEuS · commit 7d33181fba56 · 2012-07-16T04:17:14.000-07:00
- Avoid creation of std::string instances of static strings where possible in testrunner.
- Removed unnecessary include of tinyxml.h in testcppcheck.cpp
diff --git a/test/testboost.cpp b/test/testboost.cpp
@@ -35,7 +35,7 @@ class TestBoost : public TestFixture {
         TEST_CASE(BoostForeachContainerModification)
     }
 
-    void check(const std::string &code) {
+    void check(const char code[]) {
         // Clear the error buffer..
         errout.str("");
 
@@ -45,7 +45,7 @@ class TestBoost : public TestFixture {
 
         // Tokenize..
         Tokenizer tokenizer(&settings, this);
-        std::istringstream istr(code.c_str());
+        std::istringstream istr(code);
         tokenizer.tokenize(istr, "test.cpp");
         tokenizer.simplifyTokenList();
 
diff --git a/test/testcppcheck.cpp b/test/testcppcheck.cpp
@@ -30,9 +30,6 @@
 #include <list>
 #include <string>
 
-// use tinyxml with STL
-#include <tinyxml.h>
-
 extern std::ostringstream errout;
 extern std::ostringstream output;
 
diff --git a/test/testexceptionsafety.cpp b/test/testexceptionsafety.cpp
@@ -44,7 +44,7 @@ class TestExceptionSafety : public TestFixture {
         TEST_CASE(catchExceptionByValue);
     }
 
-    void check(const std::string &code, bool inconclusive = false) {
+    void check(const char code[], bool inconclusive = false) {
         // Clear the error buffer..
         errout.str("");
 
diff --git a/test/testinternal.cpp b/test/testinternal.cpp
@@ -41,7 +41,7 @@ class TestInternal : public TestFixture {
         TEST_CASE(internalError)
     }
 
-    void check(const std::string &code) {
+    void check(const char code[]) {
         // Clear the error buffer..
         errout.str("");
 
@@ -50,7 +50,7 @@ class TestInternal : public TestFixture {
 
         // Tokenize..
         Tokenizer tokenizer(&settings, this);
-        std::istringstream istr(code.c_str());
+        std::istringstream istr(code);
         tokenizer.tokenize(istr, "test.cpp");
         tokenizer.simplifyTokenList();
 
diff --git a/test/teststl.cpp b/test/teststl.cpp
@@ -118,7 +118,7 @@ class TestStl : public TestFixture {
 
     }
 
-    void check(const std::string &code, const bool inconclusive=false) {
+    void check(const char code[], const bool inconclusive=false) {
         // Clear the error buffer..
         errout.str("");
 
@@ -137,6 +137,9 @@ class TestStl : public TestFixture {
         CheckStl checkStl;
         checkStl.runSimplifiedChecks(&tokenizer, &settings, this);
     }
+    void check(const std::string &code, const bool inconclusive=false) {
+        check(code.c_str(), inconclusive);
+    }
 
 
     void iterator1() {

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ class TestExceptionSafety : public TestFixture {`
`44`	`44`	`TEST_CASE(catchExceptionByValue);`
`45`	`45`	`}`
`46`	`46`
`47`		`- void check(const std::string &code, bool inconclusive = false) {`
	`47`	`+ void check(const char code[], bool inconclusive = false) {`
`48`	`48`	`// Clear the error buffer..`
`49`	`49`	`errout.str("");`
`50`	`50`
Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ class TestStl : public TestFixture {`
`118`	`118`
`119`	`119`	`}`
`120`	`120`
`121`		`- void check(const std::string &code, const bool inconclusive=false) {`
	`121`	`+ void check(const char code[], const bool inconclusive=false) {`
`122`	`122`	`// Clear the error buffer..`
`123`	`123`	`errout.str("");`
`124`	`124`
`@@ -137,6 +137,9 @@ class TestStl : public TestFixture {`
`137`	`137`	`CheckStl checkStl;`
`138`	`138`	`checkStl.runSimplifiedChecks(&tokenizer, &settings, this);`
`139`	`139`	`}`
	`140`	`+ void check(const std::string &code, const bool inconclusive=false) {`
	`141`	`+ check(code.c_str(), inconclusive);`
	`142`	`+ }`
`140`	`143`
`141`	`144`
`142`	`145`	`void iterator1() {`