[Mockpp-commits] mockpp/mockpp/chaining AbstractDynamicChainingMock.h,1.42,1.43 ChainableMockMethod0
Brought to you by:
ewald-arnold
Menu
▾
▴
[Mockpp-commits] mockpp/mockpp/chaining AbstractDynamicChainingMock.h,1.42,1.43 ChainableMockMethod0.h,1.16,1.17 ChainableMockMethod1.h,1.16,1.17 ChainableMockMethod2.h,1.16,1.17 ChainableMockMethod3.h,1.16,1.17 ChainableMockMethod4.h,1.16,1.17 ChainableMockMethod5.h,1.16,1.17 ChainableMockMethod6.h,1.14,1.15 CoreMock.h,1.18,1.19 CountedChainableMethod.h,1.11,1.12 Invocation.cpp,1.7,1.8 InvocationN.h,1.10,1.11 OnConsecutiveCalls.h,1.2,1.3 gen_invocation_N.pl,1.4,1.5
Update of /cvsroot/mockpp/mockpp/mockpp/chaining In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9920/mockpp/chaining Modified Files: AbstractDynamicChainingMock.h ChainableMockMethod0.h ChainableMockMethod1.h ChainableMockMethod2.h ChainableMockMethod3.h ChainableMockMethod4.h ChainableMockMethod5.h ChainableMockMethod6.h CoreMock.h CountedChainableMethod.h Invocation.cpp InvocationN.h OnConsecutiveCalls.h gen_invocation_N.pl Log Message: renamed a number of internal variables to avoid warning messages Index: gen_invocation_N.pl =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/gen_invocation_N.pl,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- gen_invocation_N.pl 15 Mar 2006 21:56:33 -0000 1.4 +++ gen_invocation_N.pl 26 Apr 2006 20:43:06 -0000 1.5 @@ -187,20 +187,20 @@ print OUT " /** Constructs the object - * \@param name name of he object"; + * \@param objname name of the object"; for($p = 1; $p <= $numArgs; ++$p) { print OUT " * \@param in_param" . $p . " parameter " . $p ; } print OUT " */ - Invocation" . $numArgs . "( const String &name"; + Invocation" . $numArgs . "( const String &objname"; for($p = 1; $p <= $numArgs; ++$p) { print OUT " , const P" . $p . " &in_param" . $p; } print OUT ") - : Invocation( name )"; + : Invocation( objname )"; for($p = 1; $p <= $numArgs; ++$p) { print OUT " , param" . $p . "( in_param" . $p . " )"; } Index: InvocationN.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/InvocationN.h,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- InvocationN.h 15 Mar 2006 21:56:33 -0000 1.10 +++ InvocationN.h 26 Apr 2006 20:43:06 -0000 1.11 @@ -53,12 +53,12 @@ typedef P1 T1Type; /** Constructs the object - * @param name name of he object + * @param objname name of the object * @param in_param1 parameter 1 */ - Invocation1( const String &name + Invocation1( const String &objname , const P1 &in_param1) - : Invocation( name ) + : Invocation( objname ) , param1( in_param1 ) { } @@ -126,14 +126,14 @@ typedef P2 T2Type; /** Constructs the object - * @param name name of he object + * @param objname name of the object * @param in_param1 parameter 1 * @param in_param2 parameter 2 */ - Invocation2( const String &name + Invocation2( const String &objname , const P1 &in_param1 , const P2 &in_param2) - : Invocation( name ) + : Invocation( objname ) , param1( in_param1 ) , param2( in_param2 ) { @@ -214,16 +214,16 @@ typedef P3 T3Type; /** Constructs the object - * @param name name of he object + * @param objname name of the object * @param in_param1 parameter 1 * @param in_param2 parameter 2 * @param in_param3 parameter 3 */ - Invocation3( const String &name + Invocation3( const String &objname , const P1 &in_param1 , const P2 &in_param2 , const P3 &in_param3) - : Invocation( name ) + : Invocation( objname ) , param1( in_param1 ) , param2( in_param2 ) , param3( in_param3 ) @@ -317,18 +317,18 @@ typedef P4 T4Type; /** Constructs the object - * @param name name of he object + * @param objname name of the object * @param in_param1 parameter 1 * @param in_param2 parameter 2 * @param in_param3 parameter 3 * @param in_param4 parameter 4 */ - Invocation4( const String &name + Invocation4( const String &objname , const P1 &in_param1 , const P2 &in_param2 , const P3 &in_param3 , const P4 &in_param4) - : Invocation( name ) + : Invocation( objname ) , param1( in_param1 ) , param2( in_param2 ) , param3( in_param3 ) @@ -435,20 +435,20 @@ typedef P5 T5Type; /** Constructs the object - * @param name name of he object + * @param objname name of the object * @param in_param1 parameter 1 * @param in_param2 parameter 2 * @param in_param3 parameter 3 * @param in_param4 parameter 4 * @param in_param5 parameter 5 */ - Invocation5( const String &name + Invocation5( const String &objname , const P1 &in_param1 , const P2 &in_param2 , const P3 &in_param3 , const P4 &in_param4 , const P5 &in_param5) - : Invocation( name ) + : Invocation( objname ) , param1( in_param1 ) , param2( in_param2 ) , param3( in_param3 ) @@ -568,7 +568,7 @@ typedef P6 T6Type; /** Constructs the object - * @param name name of he object + * @param objname name of the object * @param in_param1 parameter 1 * @param in_param2 parameter 2 * @param in_param3 parameter 3 @@ -576,14 +576,14 @@ * @param in_param5 parameter 5 * @param in_param6 parameter 6 */ - Invocation6( const String &name + Invocation6( const String &objname , const P1 &in_param1 , const P2 &in_param2 , const P3 &in_param3 , const P4 &in_param4 , const P5 &in_param5 , const P6 &in_param6) - : Invocation( name ) + : Invocation( objname ) , param1( in_param1 ) , param2( in_param2 ) , param3( in_param3 ) Index: Invocation.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/Invocation.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- Invocation.cpp 15 Mar 2006 21:34:02 -0000 1.7 +++ Invocation.cpp 26 Apr 2006 20:43:06 -0000 1.8 @@ -68,8 +68,8 @@ ///////////////////////////////////////////////////////////// -MOCKPP_EXPORT Invocation0::Invocation0( const String &name) - : Invocation( name) +MOCKPP_EXPORT Invocation0::Invocation0( const String &in_name) + : Invocation( in_name) { } Index: AbstractDynamicChainingMock.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/AbstractDynamicChainingMock.h,v retrieving revision 1.42 retrieving revision 1.43 diff -u -d -r1.42 -r1.43 --- AbstractDynamicChainingMock.h 19 Mar 2006 11:09:37 -0000 1.42 +++ AbstractDynamicChainingMock.h 26 Apr 2006 20:43:06 -0000 1.43 @@ -228,14 +228,14 @@ public: /** Constructs the chaining mock - * @param invocationDispatcher pointer to invocation dispatcher - * @param name pointer to invocation dispatcher - * @param parent pointer to parent verifiable + * @param in_invocationDispatcher pointer to invocation dispatcher + * @param name pointer to invocation dispatcher + * @param parent pointer to parent verifiable */ - AbstractDynamicChainingMock( typename InvocationDispatcher<R, I>::AP invocationDispatcher, + AbstractDynamicChainingMock( typename InvocationDispatcher<R, I>::AP in_invocationDispatcher, const String &name, VerifiableList *parent) - : AbstractDynamicChainingMockImpl<R,I>(invocationDispatcher, name, parent) + : AbstractDynamicChainingMockImpl<R,I>(in_invocationDispatcher, name, parent) {} /** Constructs the chaining mock @@ -299,10 +299,10 @@ * @param name pointer to invocation dispatcher * @param parent pointer to parent verifiable */ - AbstractDynamicChainingMock( typename InvocationDispatcher<void, I>::AP invocationDispatcher, + AbstractDynamicChainingMock( typename InvocationDispatcher<void, I>::AP in_invocationDispatcher, const String &name, VerifiableList *parent) - : AbstractDynamicChainingMockImpl<void, I>(invocationDispatcher, name, parent) + : AbstractDynamicChainingMockImpl<void, I>(in_invocationDispatcher, name, parent) {} /** Constructs the chaining mock @@ -370,10 +370,10 @@ class AbstractDynamicChainingMock<void, I> : public AbstractDynamicChainingMockImpl<void, I> \ { \ public: \ - AbstractDynamicChainingMock( InvocationDispatcher<void, I>::AP invocationDispatcher, \ + AbstractDynamicChainingMock( InvocationDispatcher<void, I>::AP in_invocationDispatcher, \ const String &name, \ VerifiableList *parent) \ - : AbstractDynamicChainingMockImpl<void, I>(invocationDispatcher, name, parent) \ + : AbstractDynamicChainingMockImpl<void, I>(in_invocationDispatcher, name, parent) \ {} \ \ AbstractDynamicChainingMock( const String &name, \ Index: CoreMock.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/CoreMock.h,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- CoreMock.h 15 Mar 2006 21:34:02 -0000 1.18 +++ CoreMock.h 26 Apr 2006 20:43:06 -0000 1.19 @@ -58,10 +58,10 @@ * @param parent pointer to parent verifiable * @return return value from mocked invocation */ - CoreMock( typename InvocationDispatcher<R, I>::AP invocationDispatcher, + CoreMock( typename InvocationDispatcher<R, I>::AP in_invocationDispatcher, const String &name, VerifiableList *parent) - : AbstractDynamicChainingMock<R, I>( invocationDispatcher, name, parent ) + : AbstractDynamicChainingMock<R, I>( in_invocationDispatcher, name, parent ) {} /** Construct the object. @@ -101,10 +101,10 @@ * @param parent pointer to parent verifiable * @return return value from mocked invocation */ - CoreMock( typename InvocationDispatcher<void, I>::AP invocationDispatcher, + CoreMock( typename InvocationDispatcher<void, I>::AP in_invocationDispatcher, const String &name, VerifiableList *parent) - : AbstractDynamicChainingMock<void, I>( invocationDispatcher, name, parent ) + : AbstractDynamicChainingMock<void, I>( in_invocationDispatcher, name, parent ) {} /** Construct the object. @@ -150,10 +150,10 @@ class CoreMock<void, I> : public AbstractDynamicChainingMock<void, I> \ { \ public: \ - CoreMock<void, I>( InvocationDispatcher<void, I>::AP invocationDispatcher, \ + CoreMock<void, I>( InvocationDispatcher<void, I>::AP in_invocationDispatcher, \ const String &name, \ VerifiableList *parent) \ - : AbstractDynamicChainingMock<void, I>( invocationDispatcher, name, parent ) \ + : AbstractDynamicChainingMock<void, I>( in_invocationDispatcher, name, parent ) \ {} \ \ CoreMock<void, I>( const String &name, VerifiableList *parent) \ |
