Merge topic 'improve-CMakeLibTests'

cc20644c71 testCommon.h: Introduce `ASSERT_EQUAL(actual, expected)` macro

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9752

Tests/CMakeLib/CMakeLists.txt

@@ -9,6 +9,7 @@ include_directories(
   )
 
 set(CMakeLib_TESTS
+  testAssert.cxx
   testArgumentParser.cxx
   testCTestBinPacker.cxx
   testCTestResourceAllocator.cxx

Tests/CMakeLib/testArgumentParser.cxx

@@ -1,9 +1,6 @@
 /* Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
    file Copyright.txt or https://cmake.org/licensing for details.  */
 
-#include <functional>
-#include <initializer_list>
-#include <iostream>
 #include <map>
 #include <string>
 #include <utility>

Tests/CMakeLib/testAssert.cxx

@@ -0,0 +1,56 @@
+/* Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
+   file Copyright.txt or https://cmake.org/licensing for details.  */
+
+#include <string>
+
+#include "testCommon.h"
+
+namespace {
+
+class WrapFailureInBlockFixture
+{
+public:
+  WrapFailureInBlockFixture()
+  {
+    std::cout << "---[ BEGIN Expected Failure Output]---\n";
+  }
+  ~WrapFailureInBlockFixture()
+  {
+    std::cout << "---[ END Expected Failure Output]---\n";
+  }
+};
+
+bool testASSERT_EQUAL()
+{
+  ASSERT_EQUAL(7 == 7, 42 == 42);
+  {
+    std::string actual = "Hello Africa!";
+    ASSERT_EQUAL(actual, "Hello Africa!");
+  }
+  return true;
+}
+
+bool testASSERT_EQUALFail()
+{
+  WrapFailureInBlockFixture fx;
+  static_cast<void>(fx);
+
+  auto fail_int = [](const int unexpected) -> bool {
+    ASSERT_EQUAL(unexpected, 42);
+    return true;
+  };
+
+  auto fail_string = [](const std::string& unexpected) -> bool {
+    ASSERT_EQUAL(unexpected, "Hello Africa!");
+    return true;
+  };
+
+  return !(fail_int(7) || fail_string("Habari Afrika!"));
+}
+
+} // anonymous namespace
+
+int testAssert(int /*unused*/, char* /*unused*/[])
+{
+  return runTests({ testASSERT_EQUAL, testASSERT_EQUALFail });
+}

Tests/CMakeLib/testCMFilesystemPath.cxx

@@ -2,7 +2,6 @@
    file Copyright.txt or https://cmake.org/licensing for details.  */
 
 #include <algorithm>
-#include <iostream>
 #include <sstream>
 #include <string>
 #include <vector>

Tests/CMakeLib/testCMakePath.cxx

@@ -3,7 +3,6 @@
 
 #include "cmConfigure.h" // IWYU pragma: keep
 
-#include <iostream>
 #include <string>
 #include <utility>
 

Tests/CMakeLib/testCommon.h

@@ -2,9 +2,9 @@
    file Copyright.txt or https://cmake.org/licensing for details.  */
 #pragma once
 
-#include <functional>
-#include <initializer_list>
-#include <iostream>
+#include <functional>       // IWYU pragma: export
+#include <initializer_list> // IWYU pragma: export
+#include <iostream>         // IWYU pragma: export
 
 #define ASSERT_TRUE(x)                                                        \
   do {                                                                        \
@@ -14,6 +14,17 @@
     }                                                                         \
   } while (false)
 
+#define ASSERT_EQUAL(actual, expected)                                        \
+  do {                                                                        \
+    if (!((actual) == (expected))) {                                          \
+      std::cout << "ASSERT_EQUAL(" #actual ", " #expected ") failed on line " \
+                << __LINE__ << '\n';                                          \
+      std::cout << "  Actual: '" << (actual) << "'\n";                        \
+      std::cout << "Expected: '" << (expected) << "'\n";                      \
+      return false;                                                           \
+    }                                                                         \
+  } while (false)
+
 #define BOOL_STRING(b) ((b) ? "TRUE" : "FALSE")
 
 namespace {

Tests/CMakeLib/testDebuggerAdapter.cxx

@@ -3,7 +3,6 @@
 
 #include <chrono>
 #include <cstdio>
-#include <functional>
 #include <future>
 #include <memory>
 #include <string>

Tests/CMakeLib/testDebuggerAdapterPipe.cxx

@@ -4,7 +4,6 @@
 #include <chrono>
 #include <cstdio>
 #include <future>
-#include <iostream>
 #include <memory>
 #include <stdexcept>
 #include <string>

Tests/CMakeLib/testDebuggerVariables.cxx

@@ -2,7 +2,6 @@
    file Copyright.txt or https://cmake.org/licensing for details.  */
 
 #include <cstdint>
-#include <functional>
 #include <memory>
 #include <string>
 #include <unordered_set>

Tests/CMakeLib/testJSONHelpers.cxx

@@ -1,4 +1,3 @@
-#include <functional>
 #include <map>
 #include <string>
 #include <vector>

Tests/CMakeLib/testList.cxx

@@ -1,7 +1,6 @@
 /* Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
    file Copyright.txt or https://cmake.org/licensing for details.  */
 
-#include <iostream>
 #include <stdexcept>
 #include <string>
 #include <utility>

Tests/CMakeLib/testOptional.cxx

@@ -1,4 +1,3 @@
-#include <iostream>
 #include <vector>
 
 #include <cm/optional>

Tests/CMakeLib/testString.cxx

@@ -2,7 +2,6 @@
    file Copyright.txt or https://cmake.org/licensing for details.  */
 
 #include <cstring>
-#include <iostream>
 #include <iterator>
 #include <sstream>
 #include <stdexcept>