[Mockpp-commits] mockpp/mockpp/chaining ChainableMockMethod0.h,1.7,1.8 ChainableMockMethod1.h,1.7,1.
Brought to you by:
ewald-arnold
Menu
▾
▴
[Mockpp-commits] mockpp/mockpp/chaining ChainableMockMethod0.h,1.7,1.8 ChainableMockMethod1.h,1.7,1.8 ChainableMockMethod2.h,1.7,1.8 ChainableMockMethod3.h,1.7,1.8 ChainableMockMethod4.h,1.7,1.8 ChainableMockMethod5.h,1.7,1.8 ChainableMockMethod6.h,1.5,1.6 gen_chainablemethod_N.pl,1.4,1.5
|
From: Ewald A. <ewa...@us...> - 2005-11-15 19:42:16
|
Update of /cvsroot/mockpp/mockpp/mockpp/chaining In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13274/mockpp/chaining Modified Files: ChainableMockMethod0.h ChainableMockMethod1.h ChainableMockMethod2.h ChainableMockMethod3.h ChainableMockMethod4.h ChainableMockMethod5.h ChainableMockMethod6.h gen_chainablemethod_N.pl Log Message: omit chainer Index: ChainableMockMethod6.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/ChainableMockMethod6.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- ChainableMockMethod6.h 13 Nov 2005 11:53:18 -0000 1.5 +++ ChainableMockMethod6.h 15 Nov 2005 19:42:04 -0000 1.6 @@ -44,7 +44,9 @@ * @ingroup grp_controller */ template <typename R, typename P1, typename P2, typename P3, typename P4, typename P5, typename P6> -class ChainableMockMethod6Common : public ChainableMockMethodCommon<R> +class ChainableMockMethod6Common + : public ChainableMockMethodCommon<R> + , public ChainingMockBuilder <ArgumentsMatchBuilder6<R, Invocation6<P1, P2, P3, P4, P5, P6> > > { public: @@ -53,12 +55,15 @@ typedef CoreMock<R, InvocationType> CoreMockType; typedef R ReturnType; + typedef ChainingMockBuilder <ArgumentsMatchBuilder6<ReturnType, InvocationType> > Builder; + /** Constructs the mock object. * @param name human readable description about the expectation * @param parent parent chainable mock object */ ChainableMockMethod6Common(const String &name, ChainableMockObject *parent ) : ChainableMockMethodCommon<R>(name, parent) + , Builder(&coremock, this->getChainableMockObject(), this->getMethodName()) , coremock(name + MOCKPP_PCHAR("/coreMock"), this) { } @@ -73,28 +78,6 @@ return coremock; } - public: - - typedef ChainingMockBuilder <ArgumentsMatchBuilder6<ReturnType, InvocationType> > Builder; - - /** Helper object to easily set up the chainable expectations. - * @ingroup grp_controller - */ - class ChainerFor : public Builder - { - public: - - /** Construct the chainer object. - * @param method pointer to according method mock. - */ - ChainerFor(ChainableMockMethod6Common &method) - : Builder(&method.getCoreMock(), method.getChainableMockObject(), method.getMethodName()) - { - } - }; - - friend class ChainerFor; - private: mutable CoreMockType coremock; Index: ChainableMockMethod2.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/ChainableMockMethod2.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- ChainableMockMethod2.h 13 Nov 2005 11:53:18 -0000 1.7 +++ ChainableMockMethod2.h 15 Nov 2005 19:42:04 -0000 1.8 @@ -44,7 +44,9 @@ * @ingroup grp_controller */ template <typename R, typename P1, typename P2> -class ChainableMockMethod2Common : public ChainableMockMethodCommon<R> +class ChainableMockMethod2Common + : public ChainableMockMethodCommon<R> + , public ChainingMockBuilder <ArgumentsMatchBuilder2<R, Invocation2<P1, P2> > > { public: @@ -53,12 +55,15 @@ typedef CoreMock<R, InvocationType> CoreMockType; typedef R ReturnType; + typedef ChainingMockBuilder <ArgumentsMatchBuilder2<ReturnType, InvocationType> > Builder; + /** Constructs the mock object. * @param name human readable description about the expectation * @param parent parent chainable mock object */ ChainableMockMethod2Common(const String &name, ChainableMockObject *parent ) : ChainableMockMethodCommon<R>(name, parent) + , Builder(&coremock, this->getChainableMockObject(), this->getMethodName()) , coremock(name + MOCKPP_PCHAR("/coreMock"), this) { } @@ -73,28 +78,6 @@ return coremock; } - public: - - typedef ChainingMockBuilder <ArgumentsMatchBuilder2<ReturnType, InvocationType> > Builder; - - /** Helper object to easily set up the chainable expectations. - * @ingroup grp_controller - */ - class ChainerFor : public Builder - { - public: - - /** Construct the chainer object. - * @param method pointer to according method mock. - */ - ChainerFor(ChainableMockMethod2Common &method) - : Builder(&method.getCoreMock(), method.getChainableMockObject(), method.getMethodName()) - { - } - }; - - friend class ChainerFor; - private: mutable CoreMockType coremock; Index: ChainableMockMethod3.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/ChainableMockMethod3.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- ChainableMockMethod3.h 13 Nov 2005 11:53:18 -0000 1.7 +++ ChainableMockMethod3.h 15 Nov 2005 19:42:04 -0000 1.8 @@ -44,7 +44,9 @@ * @ingroup grp_controller */ template <typename R, typename P1, typename P2, typename P3> -class ChainableMockMethod3Common : public ChainableMockMethodCommon<R> +class ChainableMockMethod3Common + : public ChainableMockMethodCommon<R> + , public ChainingMockBuilder <ArgumentsMatchBuilder3<R, Invocation3<P1, P2, P3> > > { public: @@ -53,12 +55,15 @@ typedef CoreMock<R, InvocationType> CoreMockType; typedef R ReturnType; + typedef ChainingMockBuilder <ArgumentsMatchBuilder3<ReturnType, InvocationType> > Builder; + /** Constructs the mock object. * @param name human readable description about the expectation * @param parent parent chainable mock object */ ChainableMockMethod3Common(const String &name, ChainableMockObject *parent ) : ChainableMockMethodCommon<R>(name, parent) + , Builder(&coremock, this->getChainableMockObject(), this->getMethodName()) , coremock(name + MOCKPP_PCHAR("/coreMock"), this) { } @@ -73,28 +78,6 @@ return coremock; } - public: - - typedef ChainingMockBuilder <ArgumentsMatchBuilder3<ReturnType, InvocationType> > Builder; - - /** Helper object to easily set up the chainable expectations. - * @ingroup grp_controller - */ - class ChainerFor : public Builder - { - public: - - /** Construct the chainer object. - * @param method pointer to according method mock. - */ - ChainerFor(ChainableMockMethod3Common &method) - : Builder(&method.getCoreMock(), method.getChainableMockObject(), method.getMethodName()) - { - } - }; - - friend class ChainerFor; - private: mutable CoreMockType coremock; Index: ChainableMockMethod4.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/ChainableMockMethod4.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- ChainableMockMethod4.h 13 Nov 2005 11:53:18 -0000 1.7 +++ ChainableMockMethod4.h 15 Nov 2005 19:42:04 -0000 1.8 @@ -44,7 +44,9 @@ * @ingroup grp_controller */ template <typename R, typename P1, typename P2, typename P3, typename P4> -class ChainableMockMethod4Common : public ChainableMockMethodCommon<R> +class ChainableMockMethod4Common + : public ChainableMockMethodCommon<R> + , public ChainingMockBuilder <ArgumentsMatchBuilder4<R, Invocation4<P1, P2, P3, P4> > > { public: @@ -53,12 +55,15 @@ typedef CoreMock<R, InvocationType> CoreMockType; typedef R ReturnType; + typedef ChainingMockBuilder <ArgumentsMatchBuilder4<ReturnType, InvocationType> > Builder; + /** Constructs the mock object. * @param name human readable description about the expectation * @param parent parent chainable mock object */ ChainableMockMethod4Common(const String &name, ChainableMockObject *parent ) : ChainableMockMethodCommon<R>(name, parent) + , Builder(&coremock, this->getChainableMockObject(), this->getMethodName()) , coremock(name + MOCKPP_PCHAR("/coreMock"), this) { } @@ -73,28 +78,6 @@ return coremock; } - public: - - typedef ChainingMockBuilder <ArgumentsMatchBuilder4<ReturnType, InvocationType> > Builder; - - /** Helper object to easily set up the chainable expectations. - * @ingroup grp_controller - */ - class ChainerFor : public Builder - { - public: - - /** Construct the chainer object. - * @param method pointer to according method mock. - */ - ChainerFor(ChainableMockMethod4Common &method) - : Builder(&method.getCoreMock(), method.getChainableMockObject(), method.getMethodName()) - { - } - }; - - friend class ChainerFor; - private: mutable CoreMockType coremock; Index: gen_chainablemethod_N.pl =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/gen_chainablemethod_N.pl,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- gen_chainablemethod_N.pl 31 Oct 2005 19:01:00 -0000 1.4 +++ gen_chainablemethod_N.pl 15 Nov 2005 19:42:04 -0000 1.5 @@ -170,7 +170,21 @@ * \@ingroup grp_controller */ template <typename R" . $templateParms_colon . "> -class ChainableMockMethod" . $numArgs . "Common : public ChainableMockMethodCommon<R> +class ChainableMockMethod" . $numArgs . "Common + : public ChainableMockMethodCommon<R>"; + +if ($numArgs > 0) +{ +print OUT " + , public ChainingMockBuilder <ArgumentsMatchBuilder" . $numArgs . "<R, Invocation" . $numArgs . "<" . $templateArgs . "> > >"; +} +else +{ +print OUT " + , public ChainingMockBuilder <ArgumentsMatchBuilder0<R, Invocation0> >"; +} + +print OUT " { public: "; @@ -191,12 +205,15 @@ typedef CoreMock<R, InvocationType> CoreMockType; typedef R ReturnType; + typedef ChainingMockBuilder <ArgumentsMatchBuilder" . $numArgs . "<ReturnType, InvocationType> > Builder; + /** Constructs the mock object. * \@param name human readable description about the expectation * \@param parent parent chainable mock object */ ChainableMockMethod" . $numArgs . "Common(const String &name, ChainableMockObject *parent ) : ChainableMockMethodCommon<R>(name, parent) + , Builder(&coremock, this->getChainableMockObject(), this->getMethodName()) , coremock(name + MOCKPP_PCHAR(\"/coreMock\"), this) { } @@ -211,28 +228,6 @@ return coremock; } - public: - - typedef ChainingMockBuilder <ArgumentsMatchBuilder" . $numArgs . "<ReturnType, InvocationType> > Builder; - - /** Helper object to easily set up the chainable expectations. - * \@ingroup grp_controller - */ - class ChainerFor : public Builder - { - public: - - /** Construct the chainer object. - * \@param method pointer to according method mock. - */ - ChainerFor(ChainableMockMethod" . $numArgs . "Common &method) - : Builder(&method.getCoreMock(), method.getChainableMockObject(), method.getMethodName()) - { - } - }; - - friend class ChainerFor; - private: mutable CoreMockType coremock; Index: ChainableMockMethod5.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/ChainableMockMethod5.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- ChainableMockMethod5.h 13 Nov 2005 11:53:18 -0000 1.7 +++ ChainableMockMethod5.h 15 Nov 2005 19:42:04 -0000 1.8 @@ -44,7 +44,9 @@ * @ingroup grp_controller */ template <typename R, typename P1, typename P2, typename P3, typename P4, typename P5> -class ChainableMockMethod5Common : public ChainableMockMethodCommon<R> +class ChainableMockMethod5Common + : public ChainableMockMethodCommon<R> + , public ChainingMockBuilder <ArgumentsMatchBuilder5<R, Invocation5<P1, P2, P3, P4, P5> > > { public: @@ -53,12 +55,15 @@ typedef CoreMock<R, InvocationType> CoreMockType; typedef R ReturnType; + typedef ChainingMockBuilder <ArgumentsMatchBuilder5<ReturnType, InvocationType> > Builder; + /** Constructs the mock object. * @param name human readable description about the expectation * @param parent parent chainable mock object */ ChainableMockMethod5Common(const String &name, ChainableMockObject *parent ) : ChainableMockMethodCommon<R>(name, parent) + , Builder(&coremock, this->getChainableMockObject(), this->getMethodName()) , coremock(name + MOCKPP_PCHAR("/coreMock"), this) { } @@ -73,28 +78,6 @@ return coremock; } - public: - - typedef ChainingMockBuilder <ArgumentsMatchBuilder5<ReturnType, InvocationType> > Builder; - - /** Helper object to easily set up the chainable expectations. - * @ingroup grp_controller - */ - class ChainerFor : public Builder - { - public: - - /** Construct the chainer object. - * @param method pointer to according method mock. - */ - ChainerFor(ChainableMockMethod5Common &method) - : Builder(&method.getCoreMock(), method.getChainableMockObject(), method.getMethodName()) - { - } - }; - - friend class ChainerFor; - private: mutable CoreMockType coremock; Index: ChainableMockMethod0.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/ChainableMockMethod0.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- ChainableMockMethod0.h 13 Nov 2005 11:53:18 -0000 1.7 +++ ChainableMockMethod0.h 15 Nov 2005 19:42:04 -0000 1.8 @@ -44,7 +44,9 @@ * @ingroup grp_controller */ template <typename R> -class ChainableMockMethod0Common : public ChainableMockMethodCommon<R> +class ChainableMockMethod0Common + : public ChainableMockMethodCommon<R> + , public ChainingMockBuilder <ArgumentsMatchBuilder0<R, Invocation0> > { public: @@ -53,12 +55,15 @@ typedef CoreMock<R, InvocationType> CoreMockType; typedef R ReturnType; + typedef ChainingMockBuilder <ArgumentsMatchBuilder0<ReturnType, InvocationType> > Builder; + /** Constructs the mock object. * @param name human readable description about the expectation * @param parent parent chainable mock object */ ChainableMockMethod0Common(const String &name, ChainableMockObject *parent ) : ChainableMockMethodCommon<R>(name, parent) + , Builder(&coremock, this->getChainableMockObject(), this->getMethodName()) , coremock(name + MOCKPP_PCHAR("/coreMock"), this) { } @@ -73,28 +78,6 @@ return coremock; } - public: - - typedef ChainingMockBuilder <ArgumentsMatchBuilder0<ReturnType, InvocationType> > Builder; - - /** Helper object to easily set up the chainable expectations. - * @ingroup grp_controller - */ - class ChainerFor : public Builder - { - public: - - /** Construct the chainer object. - * @param method pointer to according method mock. - */ - ChainerFor(ChainableMockMethod0Common &method) - : Builder(&method.getCoreMock(), method.getChainableMockObject(), method.getMethodName()) - { - } - }; - - friend class ChainerFor; - private: mutable CoreMockType coremock; Index: ChainableMockMethod1.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/ChainableMockMethod1.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- ChainableMockMethod1.h 13 Nov 2005 11:53:18 -0000 1.7 +++ ChainableMockMethod1.h 15 Nov 2005 19:42:04 -0000 1.8 @@ -44,7 +44,9 @@ * @ingroup grp_controller */ template <typename R, typename P1> -class ChainableMockMethod1Common : public ChainableMockMethodCommon<R> +class ChainableMockMethod1Common + : public ChainableMockMethodCommon<R> + , public ChainingMockBuilder <ArgumentsMatchBuilder1<R, Invocation1<P1> > > { public: @@ -53,12 +55,15 @@ typedef CoreMock<R, InvocationType> CoreMockType; typedef R ReturnType; + typedef ChainingMockBuilder <ArgumentsMatchBuilder1<ReturnType, InvocationType> > Builder; + /** Constructs the mock object. * @param name human readable description about the expectation * @param parent parent chainable mock object */ ChainableMockMethod1Common(const String &name, ChainableMockObject *parent ) : ChainableMockMethodCommon<R>(name, parent) + , Builder(&coremock, this->getChainableMockObject(), this->getMethodName()) , coremock(name + MOCKPP_PCHAR("/coreMock"), this) { } @@ -73,28 +78,6 @@ return coremock; } - public: - - typedef ChainingMockBuilder <ArgumentsMatchBuilder1<ReturnType, InvocationType> > Builder; - - /** Helper object to easily set up the chainable expectations. - * @ingroup grp_controller - */ - class ChainerFor : public Builder - { - public: - - /** Construct the chainer object. - * @param method pointer to according method mock. - */ - ChainerFor(ChainableMockMethod1Common &method) - : Builder(&method.getCoreMock(), method.getChainableMockObject(), method.getMethodName()) - { - } - }; - - friend class ChainerFor; - private: mutable CoreMockType coremock; |
