Make LogAndAbort tests a little more robust

Author: heinwessels-philips

infra/util/test/TestLogAndAbort.cpp

@@ -1,43 +1,46 @@
 #include "infra/util/LogAndAbort.hpp"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
+#include <array>
+#include <cstdio>
 
 namespace
 {
-    class Listener
+    void PrintLogAndAbortToStdout(const char* format, va_list* args)
     {
-    public:
-        MOCK_METHOD(void, LogAndAbortHook, (const char* message, va_list args), ());
-    };
-
-    class LogAndAbortTest
-        : public testing::Test
-    {
-    public:
-        Listener listener;
-    };
+        std::array<char, 256> buffer;
+        vsnprintf(buffer.data(), buffer.size(), format, *args);
+        std::cout << buffer.data();
+    }
 }
 
-TEST_F(LogAndAbortTest, log_and_abort_aborts)
+TEST(LogAndAbortTest, log_and_abort_aborts)
 {
     EXPECT_DEATH(LOG_AND_ABORT("Fly you fools!"), "");
 }
 
-TEST_F(LogAndAbortTest, log_and_abort_no_handler_does_nothing)
+TEST(LogAndAbortTest, log_and_abort_no_handler_does_nothing)
 {
+    testing::internal::CaptureStdout();
     // Manually calling hook to avoid aborting the test
     infra::ExecuteLogAndAbortHook("fool of a took");
     infra::ExecuteLogAndAbortHook("speak %s and enter", "friend");
+    std::string output = testing::internal::GetCapturedStdout();
+
+    EXPECT_THAT(output.empty(), true);
 }
 
-TEST_F(LogAndAbortTest, log_and_abort_with_handler_calls_handler)
+TEST(LogAndAbortTest, log_and_abort_with_handler_calls_handler)
 {
     infra::RegisterLogAndAbortHook([&](auto format, auto args)
         {
-            listener.LogAndAbortHook(format, *args);
+            PrintLogAndAbortToStdout(format, args);
         });
-    EXPECT_CALL(listener, LogAndAbortHook(testing::_, testing::_)).Times(1);
 
+    testing::internal::CaptureStdout();
     // Manually calling hook to avoid aborting the test
     infra::ExecuteLogAndAbortHook("speak %s and enter", "friend");
+    std::string output = testing::internal::GetCapturedStdout();
+
+    EXPECT_THAT(output, testing::HasSubstr("speak friend and enter"));
 }

services/tracer/test/TestLogAndAbortTracer.cpp

@@ -29,7 +29,7 @@ TEST_F(LogAndAbortTracerTest, log_and_abort_without_registered_tracer_doesnt_cal
     infra::ExecuteLogAndAbortHook("speak %s and enter", "elf");
     std::string output = testing::internal::GetCapturedStdout();
 
-    EXPECT_THAT(output, testing::HasSubstr(""));
+    EXPECT_THAT(output.empty(), true);
 }
 
 TEST_F(LogAndAbortTracerTest, log_and_abort_with_registered_tracer_calls_tracer)
@@ -41,8 +41,8 @@ TEST_F(LogAndAbortTracerTest, log_and_abort_with_registered_tracer_calls_tracer)
 
     testing::internal::CaptureStdout();
     // Calling hook directly to avoid aborting the test process.
-    infra::ExecuteLogAndAbortHook("speak %s and enter", "mellon");
+    infra::ExecuteLogAndAbortHook("speak %s and enter", "friend");
     std::string output = testing::internal::GetCapturedStdout();
 
-    EXPECT_THAT(output, testing::HasSubstr("speak mellon and enter"));
+    EXPECT_THAT(output, testing::HasSubstr("speak friend and enter"));
 }