Fixes to be compatible with the new versions of FakeIt.

FranckRJ · FranckRJ · commit 9769ebb441b6 · 2024-05-26T22:55:05.000+02:00
diff --git a/include/fakeit/api_macros.hpp b/include/fakeit/api_macros.hpp
@@ -48,16 +48,16 @@
     (mock).template stub<STUB_ID(__COUNTER__)>(CONST_OVERLOADED_METHOD_PTR( mock , method, prototype )).setMethodDetails(#mock,#method)
 
 #define RefOverloadedMethod(mock, method, prototype) \
-    (mock).template stub<__COUNTER__>(REF_OVERLOADED_METHOD_PTR( mock , method, prototype )).setMethodDetails(#mock,#method)
+    (mock).template stub<STUB_ID(__COUNTER__)>(REF_OVERLOADED_METHOD_PTR( mock , method, prototype )).setMethodDetails(#mock,#method)
 
 #define ConstRefOverloadedMethod(mock, method, prototype) \
-    (mock).template stub<__COUNTER__>(CONST_REF_OVERLOADED_METHOD_PTR( mock , method, prototype )).setMethodDetails(#mock,#method)
+    (mock).template stub<STUB_ID(__COUNTER__)>(CONST_REF_OVERLOADED_METHOD_PTR( mock , method, prototype )).setMethodDetails(#mock,#method)
 
 #define RValRefOverloadedMethod(mock, method, prototype) \
-    (mock).template stub<__COUNTER__>(R_VAL_REF_OVERLOADED_METHOD_PTR( mock , method, prototype )).setMethodDetails(#mock,#method)
+    (mock).template stub<STUB_ID(__COUNTER__)>(R_VAL_REF_OVERLOADED_METHOD_PTR( mock , method, prototype )).setMethodDetails(#mock,#method)
 
 #define ConstRValRefOverloadedMethod(mock, method, prototype) \
-    (mock).template stub<__COUNTER__>(CONST_R_VAL_REF_OVERLOADED_METHOD_PTR( mock , method, prototype )).setMethodDetails(#mock,#method)
+    (mock).template stub<STUB_ID(__COUNTER__)>(CONST_R_VAL_REF_OVERLOADED_METHOD_PTR( mock , method, prototype )).setMethodDetails(#mock,#method)
 
 #define Verify(...) \
         Verify( __VA_ARGS__ ).setFileInfo(__FILE__, __LINE__, __func__)
diff --git a/include/mockutils/DynamicProxy.hpp b/include/mockutils/DynamicProxy.hpp
@@ -13,10 +13,8 @@
 #include <vector>
 #include <array>
 #include <new>
-#include <limits>
 
 #include "mockutils/VirtualTable.hpp"
-#include "mockutils/union_cast.hpp"
 #include "mockutils/MethodInvocationHandler.hpp"
 #include "mockutils/VTUtils.hpp"
 #include "mockutils/FakeObject.hpp"
@@ -34,7 +32,8 @@ namespace fakeit {
         {
             unsigned int offset = 0;
             for (; offset < _offsets.size(); offset++) {
-                if (_offsets[offset] == id) {
+                // Only check _offsets for methods that were mocked.
+                if (_methodMocks[offset] != nullptr && _offsets[offset] == id) {
                     break;
                 }
             }
@@ -61,8 +60,8 @@ namespace fakeit {
 
         DynamicProxy(C &inst) :
                 _instancePtr(&inst),
-                _methodMocks(VTUtils::getVTSize<C>()),
-                _offsets(VTUtils::getVTSize<C>(), std::numeric_limits<int>::max()),
+                _methodMocks(VTUtils::getVTSize<C>(), nullptr),
+                _offsets(VTUtils::getVTSize<C>(), 0),
                 _invocationHandlers(_methodMocks, _offsets) {
             _originalVt.copyFrom(VirtualTable<C, baseclasses...>::getVTable(*_instancePtr));
             _originalVt.setCookie(InvocationHandlerCollection::VtCookieIndex, &_invocationHandlers);
@@ -97,10 +96,10 @@ namespace fakeit {
 
         void Reset() {
 			_methodMocks = {};
-            _methodMocks.resize(VTUtils::getVTSize<C>());
+            _methodMocks.resize(VTUtils::getVTSize<C>(), nullptr);
             _members = {};
 			_offsets = {};
-            _offsets.resize(VTUtils::getVTSize<C>());
+            _offsets.resize(VTUtils::getVTSize<C>(), 0);
             VirtualTable<C, baseclasses...>::getVTable(*_instancePtr).copyFrom(_originalVt);
         }
 
diff --git a/include/mockutils/MethodProxyCreator.hpp b/include/mockutils/MethodProxyCreator.hpp
@@ -34,7 +34,7 @@ namespace fakeit {
             return MethodProxy(id, offset, union_cast<void *>(&MethodProxyCreator::methodProxyX < id > ));
         }
 
-        template<unsigned int id>
+        template<size_t id>
         MethodProxy createMethodProxyStatic(unsigned int offset) {
             return MethodProxy(id, offset, union_cast<void *>(&MethodProxyCreator::methodProxyXStatic < id > ));
         }
@@ -55,7 +55,7 @@ namespace fakeit {
             return methodProxy(id, std::forward<const typename fakeit::production_arg<arglist>::type>(args)...);
         }
 
-        static R methodProxyStatic(void* instance, unsigned int id, const typename fakeit::production_arg<arglist>::type... args) {
+        static R methodProxyStatic(void* instance, size_t id, const typename fakeit::production_arg<arglist>::type... args) {
             InvocationHandlerCollection *invocationHandlerCollection = InvocationHandlerCollection::getInvocationHandlerCollection(
                 instance);
             MethodInvocationHandler<R, arglist...> *invocationHandler =
@@ -64,7 +64,7 @@ namespace fakeit {
             return invocationHandler->handleMethodInvocation(std::forward<const typename fakeit::production_arg<arglist>::type>(args)...);
         }
 
-        template<int id>
+        template<size_t id>
         static R methodProxyXStatic(void* instance, arglist ... args) {
             return methodProxyStatic(instance, id, std::forward<const typename fakeit::production_arg<arglist>::type>(args)...);
         }
diff --git a/include/mockutils/VTUtils.hpp b/include/mockutils/VTUtils.hpp
@@ -65,7 +65,7 @@ namespace fakeit {
 		}
 
         template<typename C>
-        static size_t getVTSize() {
+        static unsigned int getVTSize() {
             struct Derrived : public C {
                 virtual void endOfVt() {
                 }
diff --git a/include/mockutils/gcc/VirtualTable.hpp b/include/mockutils/gcc/VirtualTable.hpp
@@ -131,7 +131,7 @@ namespace fakeit {
 
     private:
         static void **buildVTArray() {
-            int size = VTUtils::getVTSize<C>();
+            unsigned int size = VTUtils::getVTSize<C>();
             auto array = new void *[size + 2 + numOfCookies]{};
             array += numOfCookies; // skip cookies
             array++; // skip top_offset
diff --git a/include/mockutils/mscpp/VirtualTable.hpp b/include/mockutils/mscpp/VirtualTable.hpp
@@ -178,7 +178,7 @@ namespace fakeit {
         }
 
         void copyFrom(VirtualTable<C, baseclasses...> &from) {
-            auto size = VTUtils::getVTSize<C>();
+            unsigned int size = VTUtils::getVTSize<C>();
             for (unsigned int i = 0; i < size; i++) {
                 _firstMethod[i] = from.getMethod(i);
             }
@@ -234,12 +234,12 @@ namespace fakeit {
             setCookie(dtorCookieIndex, method);
         }
 
-        size_t getSize() {
+        unsigned int getSize() {
             return VTUtils::getVTSize<C>();
         }
 
         void initAll(void *value) {
-            auto size = getSize();
+            unsigned int size = getSize();
             for (unsigned int i = 0; i < size; i++) {
                 setMethod(i, value);
             }
@@ -256,7 +256,7 @@ namespace fakeit {
         static const unsigned int dtorCookieIndex = numOfCookies - 1; // use the last cookie
 
         static void **buildVTArray() {
-            auto vtSize = VTUtils::getVTSize<C>();
+            unsigned int vtSize = VTUtils::getVTSize<C>();
             auto array = new void *[vtSize + numOfCookies + 1]{};
             RTTICompleteObjectLocator<C, baseclasses...> *objectLocator = new RTTICompleteObjectLocator<C, baseclasses...>(
                     typeid(C));

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ namespace fakeit {`
`34`	`34`	`return MethodProxy(id, offset, union_cast<void *>(&MethodProxyCreator::methodProxyX < id > ));`
`35`	`35`	`}`
`36`	`36`
`37`		`- template<unsigned int id>`
	`37`	`+ template<size_t id>`
`38`	`38`	`MethodProxy createMethodProxyStatic(unsigned int offset) {`
`39`	`39`	`return MethodProxy(id, offset, union_cast<void *>(&MethodProxyCreator::methodProxyXStatic < id > ));`
`40`	`40`	`}`
`@@ -55,7 +55,7 @@ namespace fakeit {`
`55`	`55`	`return methodProxy(id, std::forward<const typename fakeit::production_arg<arglist>::type>(args)...);`
`56`	`56`	`}`
`57`	`57`
`58`		`- static R methodProxyStatic(void* instance, unsigned int id, const typename fakeit::production_arg<arglist>::type... args) {`
	`58`	`+ static R methodProxyStatic(void* instance, size_t id, const typename fakeit::production_arg<arglist>::type... args) {`
`59`	`59`	`InvocationHandlerCollection *invocationHandlerCollection = InvocationHandlerCollection::getInvocationHandlerCollection(`
`60`	`60`	`instance);`
`61`	`61`	`MethodInvocationHandler<R, arglist...> *invocationHandler =`
`@@ -64,7 +64,7 @@ namespace fakeit {`
`64`	`64`	`return invocationHandler->handleMethodInvocation(std::forward<const typename fakeit::production_arg<arglist>::type>(args)...);`
`65`	`65`	`}`
`66`	`66`
`67`		`- template<int id>`
	`67`	`+ template<size_t id>`
`68`	`68`	`static R methodProxyXStatic(void* instance, arglist ... args) {`
`69`	`69`	`return methodProxyStatic(instance, id, std::forward<const typename fakeit::production_arg<arglist>::type>(args)...);`
`70`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ namespace fakeit {`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`template<typename C>`
`68`		`- static size_t getVTSize() {`
	`68`	`+ static unsigned int getVTSize() {`
`69`	`69`	`struct Derrived : public C {`
`70`	`70`	`virtual void endOfVt() {`
`71`	`71`	`}`
Original file line number	Diff line number	Diff line change
`@@ -178,7 +178,7 @@ namespace fakeit {`
`178`	`178`	`}`
`179`	`179`
`180`	`180`	`void copyFrom(VirtualTable<C, baseclasses...> &from) {`
`181`		`- auto size = VTUtils::getVTSize<C>();`
	`181`	`+ unsigned int size = VTUtils::getVTSize<C>();`
`182`	`182`	`for (unsigned int i = 0; i < size; i++) {`
`183`	`183`	`_firstMethod[i] = from.getMethod(i);`
`184`	`184`	`}`
`@@ -234,12 +234,12 @@ namespace fakeit {`
`234`	`234`	`setCookie(dtorCookieIndex, method);`
`235`	`235`	`}`
`236`	`236`
`237`		`- size_t getSize() {`
	`237`	`+ unsigned int getSize() {`
`238`	`238`	`return VTUtils::getVTSize<C>();`
`239`	`239`	`}`
`240`	`240`
`241`	`241`	`void initAll(void *value) {`
`242`		`- auto size = getSize();`
	`242`	`+ unsigned int size = getSize();`
`243`	`243`	`for (unsigned int i = 0; i < size; i++) {`
`244`	`244`	`setMethod(i, value);`
`245`	`245`	`}`
`@@ -256,7 +256,7 @@ namespace fakeit {`
`256`	`256`	`static const unsigned int dtorCookieIndex = numOfCookies - 1; // use the last cookie`
`257`	`257`
`258`	`258`	`static void **buildVTArray() {`
`259`		`- auto vtSize = VTUtils::getVTSize<C>();`
	`259`	`+ unsigned int vtSize = VTUtils::getVTSize<C>();`
`260`	`260`	`auto array = new void *[vtSize + numOfCookies + 1]{};`
`261`	`261`	`RTTICompleteObjectLocator<C, baseclasses...> *objectLocator = new RTTICompleteObjectLocator<C, baseclasses...>(`
`262`	`262`	`typeid(C));`