Fixed spying on MSVC.

eranpeer · Apr 2, 2023 · 7994353 · 7994353
1 parent 0cb7a75
commit 7994353
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 14 deletions.
diff --git a/include/fakeit/MockImpl.hpp b/include/fakeit/MockImpl.hpp
@@ -22,7 +22,7 @@
 
 namespace fakeit {
 
-    
+
     template<typename C, typename ... baseclasses>
     class MockImpl : private MockObject<C>, public virtual ActualInvocationsSource {
     public:
@@ -107,7 +107,7 @@ namespace fakeit {
 
     private:
 		// Keep members in this order! _proxy should be deleted before _inatanceOwner.
-		// Not that the dtor of MockImpl calls _proxy.detach(), hence the detach happens 
+		// Not that the dtor of MockImpl calls _proxy.detach(), hence the detach happens
 		// before the destructor of the _proxy is invoked. As a result the dtor method in the virtual
 		// table of the fakedObject is reverted to unmockedDtor() before the proxy is deleted.
 		// This way, any recorded arguments in the proxy that capture the fakeObject itself will
@@ -172,7 +172,7 @@ namespace fakeit {
         protected:
 
             R (C::*_vMethod)(arglist...);
-            
+
         public:
             virtual ~MethodMockingContextImpl() = default;
 
@@ -182,11 +182,14 @@ namespace fakeit {
 
             template<typename ... T, typename std::enable_if<all_true<smart_is_copy_constructible<T>::value...>::value, int>::type = 0>
             std::function<R(arglist&...)> getOriginalMethodCopyArgsInternal(int) {
-                void *mPtr = MethodMockingContextBase<R, arglist...>::_mock.getOriginalMethod(_vMethod);
+                auto mPtr = _vMethod;
+                auto& mock = MethodMockingContextBase<R, arglist...>::_mock;
                 C * instance = &(MethodMockingContextBase<R, arglist...>::_mock.get());
-                return [=](arglist&... args) -> R {
-                    auto m = union_cast<typename VTableMethodType<R,arglist...>::type>(mPtr);
-                    return m(instance, args...);
+                return [=, &mock](arglist&... args) -> R {
+                  // TODO: try to only swap function called and not whole vtable
+                  // TODO: test what happen when spying an object through base class instead of real class
+                    auto vTableSwapper = mock.createRaiiVTableSwapper();
+                    return (instance->*mPtr)(args...);
                 };
             }
 
@@ -202,11 +205,12 @@ namespace fakeit {
             }
 
             std::function<R(arglist&...)> getOriginalMethodForwardArgs() override {
-                void *mPtr = MethodMockingContextBase<R, arglist...>::_mock.getOriginalMethod(_vMethod);
+                auto mPtr = _vMethod;
+                auto& mock = MethodMockingContextBase<R, arglist...>::_mock;
                 C * instance = &(MethodMockingContextBase<R, arglist...>::_mock.get());
-                return [=](arglist&... args) -> R {
-                    auto m = union_cast<typename VTableMethodType<R,arglist...>::type>(mPtr);
-                    return m(instance, std::forward<arglist>(args)...);
+                return [=, &mock](arglist&... args) -> R {
+                    auto vTableSwapper = mock.createRaiiVTableSwapper();
+                    return (instance->*mPtr)(std::forward<arglist>(args)...);
                 };
             }
         };
@@ -289,6 +293,11 @@ namespace fakeit {
 			return reinterpret_cast<C *>(fake);
         }
 
+        Finally createRaiiVTableSwapper() {
+            _proxy.detach();
+            return Finally{[&](){_proxy.attach();}};
+        }
+
         template<typename R, typename ... arglist>
         void *getOriginalMethod(R (C::*vMethod)(arglist...)) {
             auto vt = _proxy.getOriginalVT();

diff --git a/include/mockutils/DynamicProxy.hpp b/include/mockutils/DynamicProxy.hpp
@@ -72,6 +72,10 @@ namespace fakeit {
                 _invocationHandlers(_methodMocks, _offsets) {
             _cloneVt.copyFrom(originalVtHandle.restore());
             _cloneVt.setCookie(InvocationHandlerCollection::VtCookieIndex, &_invocationHandlers);
+            attach();
+        }
+
+        void attach() {
             getFake().setVirtualTable(_cloneVt);
         }
 

diff --git a/include/mockutils/Finally.hpp b/include/mockutils/Finally.hpp
@@ -3,7 +3,7 @@
  * Copyright (c) 2014 Eran Pe'er.
  *
  * This program is made available under the terms of the MIT License.
- * 
+ *
  * Created on Aug 30, 2014
  */
 #pragma once
@@ -16,15 +16,19 @@ namespace fakeit {
     private:
         std::function<void()> _finallyClause;
 
-        Finally(const Finally &);
+        Finally(const Finally &) = delete;
 
-        Finally &operator=(const Finally &);
+        Finally &operator=(const Finally &) = delete;
 
     public:
         explicit Finally(std::function<void()> f) :
                 _finallyClause(f) {
         }
 
+        Finally(Finally&& other) {
+             _finallyClause.swap(other._finallyClause);
+        }
+
         ~Finally() {
             _finallyClause();
         }