Allow compiling tests with CppUnit2Gtest

* Turn check for avoiding copy/move into compile-time check
* Adapt TESTUTILS_ASSERT_LIKE_FLAGS
* Adapt OutputCheck

Author: OlekRaymond

tests/conversiontests.cpp

@@ -418,16 +418,8 @@ struct StringThatDoesNotLikeToBeCopiedOrMoved : public std::string {
         : std::string(value)
     {
     }
-    [[noreturn]] StringThatDoesNotLikeToBeCopiedOrMoved(const StringThatDoesNotLikeToBeCopiedOrMoved &other)
-        : std::string(other)
-    {
-        CPPUNIT_FAIL("attempt to copy string: " + other);
-    }
-    [[noreturn]] StringThatDoesNotLikeToBeCopiedOrMoved(StringThatDoesNotLikeToBeCopiedOrMoved &&other)
-        : std::string(std::move(other))
-    {
-        CPPUNIT_FAIL("attempt to move string: " + other);
-    }
+    [[noreturn]] StringThatDoesNotLikeToBeCopiedOrMoved(const StringThatDoesNotLikeToBeCopiedOrMoved &other) = delete;
+    [[noreturn]] StringThatDoesNotLikeToBeCopiedOrMoved(StringThatDoesNotLikeToBeCopiedOrMoved &&other) = delete;
 };
 
 /// \endcond
@@ -478,6 +470,7 @@ void ConversionTests::testStringBuilder()
     // check that for the internal tuple construction no copies are made
     StringThatDoesNotLikeToBeCopiedOrMoved str(" happen ");
     const StringThatDoesNotLikeToBeCopiedOrMoved str2("for this");
+    // Both deleted so becomes a compilation test rather than a runtime one
     CPPUNIT_ASSERT_EQUAL("no copy/move should happen for this!"s,
         argsToString(StringThatDoesNotLikeToBeCopiedOrMoved("no copy/move should"), str, str2, StringThatDoesNotLikeToBeCopiedOrMoved("!")));
 }

tests/outputcheck.h

@@ -72,20 +72,29 @@ inline OutputCheck::OutputCheck(std::function<void(const std::string &)> &&custo
  */
 inline OutputCheck::~OutputCheck() noexcept(false)
 {
+#   ifdef CppUnit2Gtest
+#       define ExpectEqual(a, b) EXPECT_EQ(a,b); if (!(a == b) ) throw std::logic_error("bad assert")
+#       define Fail(msg)         ADD_FAILURE() << msg; throw std::logic_error("bad assert")
+#   else
+#       define ExpectEqual(a, b) CPPUNIT_ASSERT_EQUAL(a,b)
+#       define Fail(msg)         CPPUNIT_FAIL(msg)
+#endif
     m_os.rdbuf(m_regularOutputBuffer);
     const std::string actualOutput(m_buffer.str());
     if (m_customCheck) {
         m_customCheck(actualOutput);
         return;
     }
     if (m_alternativeOutput.empty()) {
-        CPPUNIT_ASSERT_EQUAL(m_expectedOutput, actualOutput);
+        ExpectEqual(m_expectedOutput, actualOutput);
         return;
     }
     if (m_expectedOutput != actualOutput && m_alternativeOutput != actualOutput) {
         using namespace CppUtilities;
-        CPPUNIT_FAIL("Output is not either \"" % m_expectedOutput % "\" or \"" % m_alternativeOutput % "\". Got instead:\n" + actualOutput);
+        Fail("Output is not either \"" % m_expectedOutput % "\" or \"" % m_alternativeOutput % "\". Got instead:\n" + actualOutput);
     }
+#undef Fail
+#undef ExpectEqual
 }
 
 } // namespace CppUtilities

tests/testutils.h

@@ -325,12 +325,11 @@ template <typename T, Traits::DisableIf<std::is_integral<T>> * = nullptr> const
  * \brief Asserts whether the specified \a string matches the specified \a regex.
  * \remarks Requires cppunit.
  */
-#define TESTUTILS_ASSERT_LIKE_FLAGS(message, expectedRegex, regexFlags, actualString)                                                                \
-    (CPPUNIT_NS::Asserter::failIf(!(std::regex_match(actualString, std::regex(expectedRegex, regexFlags))),                                          \
-        CPPUNIT_NS::Message(                                                                                                                         \
-            CppUtilities::argsToString('\"', actualString, "\"\n    not like\n\"", expectedRegex, '\"'), "Expression: " #actualString, message),     \
-        CPPUNIT_SOURCELINE()))
-
+#define TESTUTILS_ASSERT_LIKE_FLAGS(message, expectedRegex, regexFlags, actualString)                                                               \
+CPPUNIT_ASSERT_MESSAGE(                                                                                                                             \
+        CppUtilities::argsToString('\"', actualString, "\"\n    not like\n\"", expectedRegex, '\"', "\n\nExpression: " #actualString, message),     \
+        (std::regex_match(actualString, std::regex(expectedRegex, regexFlags)) )                                                                    \
+    )
 /*!
  * \brief Asserts whether the specified \a string matches the specified \a regex.
  * \remarks Requires cppunit.