[GMock] Support template classes

Author: kris-jusiak

include/GUnit/GMock.h

@@ -400,18 +400,20 @@ inline auto ByRef(NiceGMock<T> &x) {
 
 #undef EXPECT_CALL
 #define __GMOCK_EXPECT_CALL_0(obj, call) GMOCK_EXPECT_CALL_IMPL_(obj, call)
-#define __GMOCK_EXPECT_CALL_1(obj, call)                                                                                  \
-  if (::testing::detail::gmock_ready)                                                                                     \
-  ((obj).gmock_call<__GMOCK_QNAME call>(__GUNIT_CAT(__GMOCK_OVERLOAD_CAST_IMPL_, __GMOCK_OVERLOAD_CALL call)(obj, call) & \
-                                        std::decay_t<decltype(obj)>::type::__GMOCK_NAME call __GMOCK_CALL call))          \
+#define __GMOCK_EXPECT_CALL_1(obj, call)                                                 \
+  if (::testing::detail::gmock_ready)                                                    \
+  ((obj).template gmock_call<__GMOCK_QNAME call>(                                        \
+       __GUNIT_CAT(__GMOCK_OVERLOAD_CAST_IMPL_, __GMOCK_OVERLOAD_CALL call)(obj, call) & \
+       std::decay_t<decltype(obj)>::type::__GMOCK_NAME call __GMOCK_CALL call))          \
       .InternalExpectedAt(__FILE__, __LINE__, #obj, #call)
 #define EXPECT_CALL(obj, call) __GUNIT_CAT(__GMOCK_EXPECT_CALL_, __GUNIT_IBP(call))(obj, call)
 
 #undef ON_CALL
 #define __GMOCK_ON_CALL_0(obj, call) GMOCK_ON_CALL_IMPL_(obj, call)
-#define __GMOCK_ON_CALL_1(obj, call)                                                                                      \
-  if (::testing::detail::gmock_ready)                                                                                     \
-  ((obj).gmock_call<__GMOCK_QNAME call>(__GUNIT_CAT(__GMOCK_OVERLOAD_CAST_IMPL_, __GMOCK_OVERLOAD_CALL call)(obj, call) & \
-                                        std::decay_t<decltype(obj)>::type::__GMOCK_NAME call __GMOCK_CALL call))          \
+#define __GMOCK_ON_CALL_1(obj, call)                                                     \
+  if (::testing::detail::gmock_ready)                                                    \
+  ((obj).template gmock_call<__GMOCK_QNAME call>(                                        \
+       __GUNIT_CAT(__GMOCK_OVERLOAD_CAST_IMPL_, __GMOCK_OVERLOAD_CALL call)(obj, call) & \
+       std::decay_t<decltype(obj)>::type::__GMOCK_NAME call __GMOCK_CALL call))          \
       .InternalDefaultActionSetAt(__FILE__, __LINE__, #obj, #call)
 #define ON_CALL(obj, call) __GUNIT_CAT(__GMOCK_ON_CALL_, __GUNIT_IBP(call))(obj, call)

include/GUnit/GTest.h

@@ -68,8 +68,8 @@ class GTestAutoRegister {
  public:
   GTestAutoRegister() {
     ScopedVisibility _;
-    //static constexpr auto has_tests = std::is_same<decltype(T{}.test()), void>::value;
-    //static_assert(not has_tests, "At least one SHOULD/test is required!");
+    // static constexpr auto has_tests = std::is_same<decltype(T{}.test()), void>::value;
+    // static_assert(not has_tests, "At least one SHOULD/test is required!");
     T{}.test();
   }
 };

test/GMock.cpp

@@ -624,3 +624,28 @@ TEST(GMock, ShouldHandleON_CALLWithOverloadMethods) {
   ON_CALL(m, (f, int(int))(42)).WillByDefault(Return(87));
   EXPECT_EQ(87, static_cast<interface_overload_ret&>(m).f(42));
 }
+
+template <class I>
+class GMockT : public testing::Test {
+ protected:
+  testing::StrictGMock<I> m;
+
+  template <class T>
+  testing::StrictGMock<T>& mock() {
+    return m;
+  }
+
+  void SetUp() override {
+    using namespace testing;
+    EXPECT_CALL(mock<interface>(), (foo)(42)).Times(1);
+    EXPECT_CALL(mock<interface>(), (foo)(12)).Times(0);
+    EXPECT_CALL(mock<interface>(), (bar)(_, "str"));
+  }
+};
+
+using GMockTest = GMockT<interface>;
+
+TEST_F(GMockTest, ShouldHandleTemplatedClass) {
+  example sut{0, static_cast<interface&>(m)};
+  sut.update();
+}

test/GTest.cpp

@@ -414,7 +414,6 @@ TEST_F(Test, ShouldOverrideSutAndMocks) {
   using namespace testing;
   std::tie(sut, mocks) = make<SUT, NaggyGMock>(123);
   EXPECT_EQ(123, sut->get_data());
-
   EXPECT_CALL(mock<interface>(), (foo)(42)).Times(1);
   EXPECT_CALL(mock<interface>(), (bar)(_, "str"));