Fix gtest printing

Signed-off-by: Konrad Breitsprecher <Konrad.Breitsprecher@vector.com>

Author: KonradBreitsprecherBkd

SilKit/IntegrationTests/ITest_DynStepSizes.cpp

@@ -8,50 +8,85 @@
 #include <chrono>
 #include <iostream>
 #include <sstream>
+#include "ITestFixture.hpp"
 
 using namespace std::chrono_literals;
 
+namespace testing {
+namespace internal {
 template <typename Rep, typename Period>
-void PrintTo(const std::chrono::duration<Rep, Period>& d, std::ostream* os)
+class UniversalPrinter<std::chrono::duration<Rep, Period>>
 {
-    *os << std::chrono::duration_cast<std::chrono::nanoseconds>(d).count() << "ns";
-}
+public:
+    static void Print(const std::chrono::duration<Rep, Period>& value, ::std::ostream* os)
+    {
+        *os << std::chrono::duration_cast<std::chrono::nanoseconds>(value).count() << "ns";
+    }
+};
+
 template <typename R1, typename P1, typename R2, typename P2>
-void PrintTo(const std::pair<std::chrono::duration<R1, P1>, std::chrono::duration<R2, P2>>& p, std::ostream* os)
+class UniversalPrinter<std::pair<std::chrono::duration<R1, P1>, std::chrono::duration<R2, P2>>>
 {
-    *os << "(";
-    PrintTo(p.first, os);
-    *os << ", ";
-    PrintTo(p.second, os);
-    *os << ")";
-}
+public:
+    static void Print(const std::pair<std::chrono::duration<R1, P1>, std::chrono::duration<R2, P2>>& p,
+                      ::std::ostream* os)
+    {
+        *os << "(";
+        UniversalPrinter<std::chrono::nanoseconds>::Print(p.first, os);
+        *os << ", ";
+        UniversalPrinter<std::chrono::nanoseconds>::Print(p.second, os);
+        *os << ")";
+    }
+};
+
+} // namespace internal
+} // namespace testing
 
 inline std::string ToString(const std::chrono::nanoseconds& ns)
 {
     std::ostringstream os;
-    PrintTo(ns, &os);
+    testing::internal::UniversalPrinter<std::chrono::nanoseconds>::Print(ns, &os);
     return os.str();
 }
 inline std::string ToString(const std::pair<std::chrono::nanoseconds, std::chrono::nanoseconds>& p)
 {
     std::ostringstream os;
-    os << "(";
-    PrintTo(p.first, &os);
-    os << ", ";
-    PrintTo(p.second, &os);
-    os << ")";
+    testing::internal::UniversalPrinter<std::pair<std::chrono::nanoseconds, std::chrono::nanoseconds>>::Print(p, &os);
     return os.str();
 }
 
-#include "ITestFixture.hpp"
-
 namespace {
 
 using namespace SilKit::Tests;
 using namespace SilKit::Config;
 using namespace SilKit::Services;
 using namespace SilKit::Services::Orchestration;
 
+template <typename Rep, typename Period>
+struct Dummy
+{
+    std::chrono::duration<Rep, Period> value;
+
+    explicit Dummy(const std::chrono::duration<Rep, Period>& v)
+        : value{v}
+    {
+    }
+
+    bool operator==(const Dummy<Rep, Period>& other) const
+    {
+        return value == other.value;
+    }
+
+    friend void PrintTo(const Dummy<Rep, Period>& d, std::ostream* os)
+    {
+        *os << std::chrono::duration_cast<std::chrono::nanoseconds>(d.value).count() << "ns";
+    }
+};
+
+#define SILKIT_ASSERT_CHRONO_EQ(expected, actual) ASSERT_EQ(Dummy{(expected)}, Dummy{(actual)})
+#define SILKIT_EXPECT_CHRONO_EQ(expected, actual) EXPECT_EQ(Dummy{(expected)}, Dummy{(actual)})
+
+
 struct ParticipantParams
 {
     std::string name{};
@@ -171,7 +206,7 @@ void ITest_DynStepSizes::AssertStepsEqual(const std::vector<std::chrono::nanosec
 
     for (size_t j = 0; j < s1.size(); ++j)
     {
-        EXPECT_EQ(s1[j], s2[j]) << "Differenz at index " << j << ": "
+        SILKIT_EXPECT_CHRONO_EQ(s1[j], s2[j]) << "Differenz at index " << j << ": "
                                 << "s1 now=" << ToString(s1[j]) << " vs s2 now=" << ToString(s2[j]);
     }
 }