Apply clang-format and cmake-format

Author: Martchus

cmake/modules/TestTarget.cmake

@@ -17,10 +17,10 @@ if (NOT META_NO_CPP_UNIT)
     # allow disabling CppUnit-based tests completely
     option(ENABLE_CPP_UNIT "whether CppUnit-based tests should be enabled" ON)
     option(ENABLE_CPPUNIT2GTEST "whether to allow CppUnit2Gtest to be used instead of cppunit" ON)
-    
+
     # if user has Ray's adapter layer use it instead
     find_package(CppUnit2Gtest QUIET)
-    if(ENABLE_CPPUNIT2GTEST AND CppUnit2Gtest_FOUND)
+    if (ENABLE_CPPUNIT2GTEST AND CppUnit2Gtest_FOUND)
         find_package(GTest REQUIRED)
         set(DETECTED_CPP_UNIT_LIB CppUnit2Gtest::CppUnit2Gtest)
         message(STATUS "Using CppUnit2Gtest instead of cppunit")

tests/outputcheck.h

@@ -72,12 +72,17 @@ 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)
+#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());

tests/testutils.h

@@ -325,11 +325,10 @@ 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_ASSERT_MESSAGE(                                                                                                                             \
-        CppUtilities::argsToString('\"', actualString, "\"\n    not like\n\"", expectedRegex, '\"', "\n\nExpression: " #actualString, message),     \
-        (std::regex_match(actualString, std::regex(expectedRegex, regexFlags)) )                                                                    \
-    )
+#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.