[Mockpp-commits] mockpp/mockpp/chaining AbstractDynamicChainingMock.h,1.32,1.33 ChainableMockObject_
Brought to you by:
ewald-arnold
Menu
▾
▴
[Mockpp-commits] mockpp/mockpp/chaining AbstractDynamicChainingMock.h,1.32,1.33 ChainableMockObject_macro.h,1.11,1.12 Invocation.h,1.13,1.14
|
From: Ewald A. <ewa...@us...> - 2005-07-24 12:54:08
|
Update of /cvsroot/mockpp/mockpp/mockpp/chaining In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16110/mockpp/chaining Modified Files: AbstractDynamicChainingMock.h ChainableMockObject_macro.h Invocation.h Log Message: OutBound capability for chainables Index: ChainableMockObject_macro.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/ChainableMockObject_macro.h,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- ChainableMockObject_macro.h 9 Apr 2005 16:43:55 -0000 1.11 +++ ChainableMockObject_macro.h 24 Jul 2005 12:54:00 -0000 1.12 @@ -121,7 +121,7 @@ a_name, v_type1) \ { \ std::string func_name (#m_name); \ - mockpp::Invocation1<v_type1> inv(getVerifiableName() + MOCKPP_PCHAR(".") MOCKPP_PCHAR(#m_name), (v_type1)param1); \ + mockpp::Invocation1<v_type1> inv(getVerifiableName() + MOCKPP_PCHAR(".") MOCKPP_PCHAR(#m_name), (v_type1&)param1); \ m_name ## CoreMock.invoke(inv); \ } \ MOCKPP_MEMBER_RESTRICTOR_PRIVATE: \ @@ -141,7 +141,7 @@ a_name, v_type1, v_type2) \ { \ std::string func_name (#m_name); \ - mockpp::Invocation2<v_type1, v_type2> inv(getVerifiableName() + MOCKPP_PCHAR(".") MOCKPP_PCHAR(#m_name), (v_type1)param1, (v_type2)param2); \ + mockpp::Invocation2<v_type1, v_type2> inv(getVerifiableName() + MOCKPP_PCHAR(".") MOCKPP_PCHAR(#m_name), (v_type1&)param1, (v_type2&)param2); \ m_name ## CoreMock.invoke(inv); \ } \ MOCKPP_MEMBER_RESTRICTOR_PRIVATE: \ @@ -165,7 +165,7 @@ a_name, v_type1, v_type2, v_type3) \ { \ std::string func_name (#m_name); \ - mockpp::Invocation3<v_type1, v_type2, v_type3> inv(getVerifiableName() + MOCKPP_PCHAR(".") MOCKPP_PCHAR(#m_name), (v_type1)param1, (v_type2)param2, (v_type3)param3); \ + mockpp::Invocation3<v_type1, v_type2, v_type3> inv(getVerifiableName() + MOCKPP_PCHAR(".") MOCKPP_PCHAR(#m_name), (v_type1&)param1, (v_type2&)param2, (v_type3&)param3); \ m_name ## CoreMock.invoke(inv); \ } \ MOCKPP_MEMBER_RESTRICTOR_PRIVATE: \ @@ -191,7 +191,7 @@ a_name, v_type1, v_type2, v_type3, v_type4) \ { \ std::string func_name (#m_name); \ - mockpp::Invocation4<v_type1, v_type2, v_type3, v_type4> inv(getVerifiableName() + MOCKPP_PCHAR(".") MOCKPP_PCHAR(#m_name), (v_type1)param1, (v_type2)param2, (v_type3)param3, (v_type4)param4); \ + mockpp::Invocation4<v_type1, v_type2, v_type3, v_type4> inv(getVerifiableName() + MOCKPP_PCHAR(".") MOCKPP_PCHAR(#m_name), (v_type1&)param1, (v_type2&)param2, (v_type3&)param3, (v_type4&)param4); \ m_name ## CoreMock.invoke(inv); \ } \ MOCKPP_MEMBER_RESTRICTOR_PRIVATE: \ @@ -219,7 +219,7 @@ a_name, v_type1, v_type2, v_type3, v_type4, v_type5) \ { \ std::string func_name (#m_name); \ - mockpp::Invocation5<v_type1, v_type2, v_type3, v_type4, v_type5> inv(getVerifiableName() + MOCKPP_PCHAR(".") MOCKPP_PCHAR(#m_name), (v_type1)param1, (v_type2)param2, (v_type3)param3, (v_type4)param4, (v_type5)param5); \ + mockpp::Invocation5<v_type1, v_type2, v_type3, v_type4, v_type5> inv(getVerifiableName() + MOCKPP_PCHAR(".") MOCKPP_PCHAR(#m_name), (v_type1&)param1, (v_type2&)param2, (v_type3&)param3, (v_type4&)param4, (v_type5&)param5); \ m_name ## CoreMock.invoke(inv); \ } \ MOCKPP_MEMBER_RESTRICTOR_PRIVATE: \ @@ -262,7 +262,7 @@ v_ret_type, a_name, v_type1) \ { \ std::string func_name (#m_name); \ - mockpp::Invocation1<v_type1> inv(getVerifiableName() + MOCKPP_PCHAR(".") MOCKPP_PCHAR(#m_name), (v_type1)param1); \ + mockpp::Invocation1<v_type1> inv(getVerifiableName() + MOCKPP_PCHAR(".") MOCKPP_PCHAR(#m_name), (v_type1&)param1); \ return m_name ## CoreMock.invoke(inv); \ } \ MOCKPP_MEMBER_RESTRICTOR_PRIVATE: \ @@ -284,7 +284,7 @@ v_ret_type, a_name, v_type1, v_type2) \ { \ std::string func_name (#m_name); \ - mockpp::Invocation2<v_type1, v_type2> inv(getVerifiableName() + MOCKPP_PCHAR(".") MOCKPP_PCHAR(#m_name), (v_type1)param1, (v_type2)param2); \ + mockpp::Invocation2<v_type1, v_type2> inv(getVerifiableName() + MOCKPP_PCHAR(".") MOCKPP_PCHAR(#m_name), (v_type1&)param1, (v_type2&)param2); \ return m_name ## CoreMock.invoke(inv); \ } \ MOCKPP_MEMBER_RESTRICTOR_PRIVATE: \ @@ -310,7 +310,7 @@ v_ret_type, a_name, v_type1, v_type2, v_type3) \ { \ std::string func_name (#m_name); \ - mockpp::Invocation3<v_type1, v_type2, v_type3> inv(getVerifiableName() + MOCKPP_PCHAR(".") MOCKPP_PCHAR(#m_name), (v_type1)param1, (v_type2)param2, (v_type3)param3); \ + mockpp::Invocation3<v_type1, v_type2, v_type3> inv(getVerifiableName() + MOCKPP_PCHAR(".") MOCKPP_PCHAR(#m_name), (v_type1&)param1, (v_type2&)param2, (v_type3&)param3); \ return m_name ## CoreMock.invoke(inv); \ } \ MOCKPP_MEMBER_RESTRICTOR_PRIVATE: \ @@ -338,7 +338,7 @@ v_ret_type, a_name, v_type1, v_type2, v_type3, v_type4) \ { \ std::string func_name (#m_name); \ - mockpp::Invocation4<v_type1, v_type2, v_type3, v_type4> inv(getVerifiableName() + MOCKPP_PCHAR(".") MOCKPP_PCHAR(#m_name), (v_type1)param1, (v_type2)param2, (v_type3)param3, (v_type4)param4); \ + mockpp::Invocation4<v_type1, v_type2, v_type3, v_type4> inv(getVerifiableName() + MOCKPP_PCHAR(".") MOCKPP_PCHAR(#m_name), (v_type1&)param1, (v_type2&)param2, (v_type3&)param3, (v_type4&)param4); \ return m_name ## CoreMock.invoke(inv); \ } \ MOCKPP_MEMBER_RESTRICTOR_PRIVATE: \ @@ -368,7 +368,7 @@ v_ret_type, a_name, v_type1, v_type2, v_type3, v_type4, v_type5) \ { \ std::string func_name (#m_name); \ - mockpp::Invocation5<v_type1, v_type2, v_type3, v_type4, v_type5> inv(getVerifiableName() + MOCKPP_PCHAR(".") MOCKPP_PCHAR(#m_name), (v_type1)param1, (v_type2)param2, (v_type3)param3, (v_type4)param4, (v_type5)param5); \ + mockpp::Invocation5<v_type1, v_type2, v_type3, v_type4, v_type5> inv(getVerifiableName() + MOCKPP_PCHAR(".") MOCKPP_PCHAR(#m_name), (v_type1&)param1, (v_type2&)param2, (v_type3&)param3, (v_type4&)param4, (v_type5&)param5); \ return m_name ## CoreMock.invoke(inv); \ } \ MOCKPP_MEMBER_RESTRICTOR_PRIVATE: \ Index: Invocation.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/Invocation.h,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- Invocation.h 24 Mar 2005 20:51:28 -0000 1.13 +++ Invocation.h 24 Jul 2005 12:54:00 -0000 1.14 @@ -154,7 +154,7 @@ * @param in_param1 parameter 1 */ Invocation1( const String &name, - const T1 &in_param1 ) + T1 &in_param1 ) : Invocation( name) , param1( in_param1 ) { @@ -199,7 +199,7 @@ private: - T1 param1; + const T1 & param1; }; @@ -226,8 +226,8 @@ * @param in_param2 parameter 2 */ Invocation2( const String &name, - const T1 &in_param1, - const T2 &in_param2 ) + T1 &in_param1, + T2 &in_param2 ) : Invocation( name ) , param1( in_param1 ) , param2( in_param2 ) @@ -282,8 +282,8 @@ private: - T1 param1; - T2 param2; + const T1 & param1; + const T2 & param2; }; @@ -312,9 +312,9 @@ * @param in_param3 parameter 3 */ Invocation3( const String &name, - const T1 &in_param1, - const T2 &in_param2, - const T3 &in_param3) + T1 &in_param1, + T2 &in_param2, + T3 &in_param3) : Invocation( name ) , param1( in_param1 ) , param2( in_param2 ) @@ -379,9 +379,9 @@ private: - T1 param1; - T2 param2; - T3 param3; + const T1 & param1; + const T2 & param2; + const T3 & param3; }; @@ -412,10 +412,10 @@ * @param in_param4 parameter 4 */ Invocation4( const String &name, - const T1 &in_param1, - const T2 &in_param2, - const T3 &in_param3, - const T4 &in_param4) + T1 &in_param1, + T2 &in_param2, + T3 &in_param3, + T4 &in_param4) : Invocation( name ) , param1( in_param1 ) , param2( in_param2 ) @@ -490,10 +490,10 @@ private: - T1 param1; - T2 param2; - T3 param3; - T4 param4; + const T1 & param1; + const T2 & param2; + const T3 & param3; + const T4 & param4; }; @@ -526,11 +526,11 @@ * @param in_param5 parameter 5 */ Invocation5( const String &name, - const T1 &in_param1, - const T2 &in_param2, - const T3 &in_param3, - const T4 &in_param4, - const T5 &in_param5) + T1 &in_param1, + T2 &in_param2, + T3 &in_param3, + T4 &in_param4, + T5 &in_param5) : Invocation( name ) , param1( in_param1 ) , param2( in_param2 ) @@ -615,11 +615,11 @@ private: - T1 param1; - T2 param2; - T3 param3; - T4 param4; - T5 param5; + const T1 & param1; + const T2 & param2; + const T3 & param3; + const T4 & param4; + const T5 & param5; }; Index: AbstractDynamicChainingMock.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/AbstractDynamicChainingMock.h,v retrieving revision 1.32 retrieving revision 1.33 diff -u -d -r1.32 -r1.33 --- AbstractDynamicChainingMock.h 21 Apr 2005 20:35:05 -0000 1.32 +++ AbstractDynamicChainingMock.h 24 Jul 2005 12:54:00 -0000 1.33 @@ -59,7 +59,7 @@ /** Constructs the chaining mock * @param in_invocationDispatcher pointer to invocation dispatcher - * @param name pointer to invocation dispatcher + * @param name objects name * @param parent pointer to parent verifiable */ AbstractDynamicChainingMockImpl( typename InvocationDispatcher<R, I>::AP in_invocationDispatcher, |
