From 3998836b037f7dda2de510f53b7565a1c8df3940 Mon Sep 17 00:00:00 2001
From: PKEuS <philipp@pkeus.de>
Date: Wed, 24 Feb 2021 22:05:23 +0100
Subject: [PATCH] Refactorization: Improved string handling in test suite

Merged from LCppC.
---
 test/testsuite.cpp | 13 ++++++++++---
 test/testsuite.h   |  2 ++
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/test/testsuite.cpp b/test/testsuite.cpp
index 9cd553d9d..4d3a1d396 100644
--- a/test/testsuite.cpp
+++ b/test/testsuite.cpp
@@ -105,9 +105,7 @@ bool TestFixture::prepareTest(const char testname[])
 
 std::string TestFixture::getLocationStr(const char * const filename, const unsigned int linenr) const
 {
-    std::ostringstream ret;
-    ret << filename << ':' << linenr << '(' << classname << "::" << mTestname << ')';
-    return ret.str();
+    return filename + ':' + std::to_string(linenr) + '(' + classname + "::" + mTestname + ')';
 }
 
 static std::string writestr(const std::string &str, bool gccStyle = false)
@@ -245,6 +243,15 @@ void TestFixture::todoAssertEquals(const char * const filename, const unsigned i
     }
 }
 
+void TestFixture::todoAssertEquals(const char* const filename, const unsigned int linenr,
+                                   const char wanted[],
+                                   const char current[],
+                                   const std::string& actual) const
+{
+    todoAssertEquals(filename, linenr, std::string(wanted), std::string(current), actual);
+}
+
+
 void TestFixture::todoAssertEquals(const char * const filename, const unsigned int linenr, const long long wanted, const long long current, const long long actual) const
 {
     std::ostringstream wantedStr, currentStr, actualStr;
diff --git a/test/testsuite.h b/test/testsuite.h
index b69176468..5663c2e79 100644
--- a/test/testsuite.h
+++ b/test/testsuite.h
@@ -80,6 +80,8 @@ protected:
 
     void todoAssertEquals(const char * const filename, const unsigned int linenr, const std::string &wanted,
                           const std::string &current, const std::string &actual) const;
+    void todoAssertEquals(const char * const filename, const unsigned int linenr, const char wanted[],
+                          const char current[], const std::string &actual) const;
     void todoAssertEquals(const char * const filename, const unsigned int linenr, const long long wanted,
                           const long long current, const long long actual) const;
     void assertThrow(const char * const filename, const unsigned int linenr) const;