⬆️ Update gtest to v1.10.x version

Author: kris-jusiak

example/GAssert.cpp

@@ -5,9 +5,10 @@
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 //
+#include "GUnit/GTest.h"
 #include "GUnit/GAssert.h"
 
-int main() {
+GTEST("Assert") {
   const auto b = true;
   const auto i = 42;
 

include/GUnit/GMock.h

@@ -176,11 +176,39 @@ class vtable {
 
 using CallReactionType = internal::CallReaction (*)(const void *);
 template <CallReactionType Ptr>
-struct GetAccess {
+struct GetAccessCallReactionType {
   friend CallReactionType GetCallReaction() { return Ptr; }
 };
 CallReactionType GetCallReaction();
-template struct GetAccess<&Mock::GetReactionOnUninterestingCalls>;
+template struct GetAccessCallReactionType<
+    &Mock::GetReactionOnUninterestingCalls>;
+
+using UnregisterCallReactionType = internal::CallReaction (*)(const void *);
+template <UnregisterCallReactionType Ptr>
+struct GetAccessUnregisterCallReactionType {
+  friend UnregisterCallReactionType UnregisterCallReaction() { return Ptr; }
+};
+UnregisterCallReactionType UnregisterCallReaction();
+template struct GetAccessUnregisterCallReactionType<
+    &Mock::GetReactionOnUninterestingCalls>;
+
+using AllowUninterestingCallsType = void (*)(const void *);
+template <AllowUninterestingCallsType Ptr>
+struct GetAccessAllowUninterestingCallsType {
+  friend AllowUninterestingCallsType AllowUninterestingCalls() { return Ptr; }
+};
+AllowUninterestingCallsType AllowUninterestingCalls();
+template struct GetAccessAllowUninterestingCallsType<
+    &Mock::AllowUninterestingCalls>;
+
+using FailUninterestingCallsType = void (*)(const void *);
+template <FailUninterestingCallsType Ptr>
+struct GetAccessFailUninterestingCallsType {
+  friend FailUninterestingCallsType FailUninterestingCalls() { return Ptr; }
+};
+FailUninterestingCallsType FailUninterestingCalls();
+template struct GetAccessFailUninterestingCallsType<
+    &Mock::FailUninterestingCalls>;
 
 }  // namespace detail
 
@@ -331,16 +359,18 @@ class NiceMock<GMock<T>> final : public GMock<T> {
  public:
   template <class... Ts>
   NiceMock(Ts &&... ts) : GMock<T>{std::forward<Ts>(ts)...} {
-    Mock::AllowUninterestingCalls(internal::ImplicitCast_<GMock<T> *>(this));
+    detail::AllowUninterestingCalls()(
+        internal::ImplicitCast_<GMock<T> *>(this));
   }
 
   NiceMock(NiceMock &&) = default;
   NiceMock(const NiceMock &) = delete;
   NiceMock() {
-    Mock::AllowUninterestingCalls(internal::ImplicitCast_<GMock<T> *>(this));
+    detail::AllowUninterestingCalls()(
+        internal::ImplicitCast_<GMock<T> *>(this));
   }
   ~NiceMock() {
-    Mock::UnregisterCallReaction(internal::ImplicitCast_<GMock<T> *>(this));
+    detail::UnregisterCallReaction()(internal::ImplicitCast_<GMock<T> *>(this));
   }
 };
 
@@ -349,15 +379,15 @@ class StrictMock<GMock<T>> final : public GMock<T> {
  public:
   template <class... Ts>
   StrictMock(Ts &&... ts) : GMock<T>{std::forward<Ts>(ts)...} {
-    Mock::FailUninterestingCalls(internal::ImplicitCast_<GMock<T> *>(this));
+    detail::FailUninterestingCalls()(internal::ImplicitCast_<GMock<T> *>(this));
   }
   StrictMock(StrictMock &&) = default;
   StrictMock(const StrictMock &) = delete;
   StrictMock() {
-    Mock::FailUninterestingCalls(internal::ImplicitCast_<GMock<T> *>(this));
+    detail::FailUninterestingCalls()(internal::ImplicitCast_<GMock<T> *>(this));
   }
   ~StrictMock() {
-    Mock::UnregisterCallReaction(internal::ImplicitCast_<GMock<T> *>(this));
+    detail::UnregisterCallReaction()(internal::ImplicitCast_<GMock<T> *>(this));
   }
 };
 

include/GUnit/GSteps.h

@@ -388,7 +388,7 @@ class Steps : public ::testing::EmptyTestEventListener {
     return Step<-1, true>{*this, {"Then", File::c_str(), line}, pattern};
   }
 
-// clang-format off
+  // clang-format off
   #if defined(__clang__)
   #pragma clang diagnostic ignored "-Wdollar-in-identifier-extension"
   #endif

include/GUnit/GTest.h

@@ -154,9 +154,11 @@ class GTestAutoRegister {
              T::TEST_NAME::c_str())
                 .c_str(),
             {T::TEST_FILE, T::TEST_LINE})
-        ->AddTestPattern(GetTypeName(detail::type<typename T::TEST_TYPE>{}),
-                         GetTypeName(detail::type<typename T::TEST_TYPE>{}),
-                         new internal::TestMetaFactory<T>());
+        ->AddTestPattern(
+            GetTypeName(detail::type<typename T::TEST_TYPE>{}),
+            GetTypeName(detail::type<typename T::TEST_TYPE>{}),
+            new internal::TestMetaFactory<T>(),
+            internal::CodeLocation{T::TEST_NAME::c_str(), T::TEST_LINE});
 
     UnitTest::GetInstance()
         ->parameterized_test_registry()