[Mockpp-commits] mockpp/mockpp gen_visitablemethod_N.pl,1.11,1.12 VisitableMockMethod0.h,1.9,1.10 Vi
Brought to you by:
ewald-arnold
Menu
▾
▴
[Mockpp-commits] mockpp/mockpp gen_visitablemethod_N.pl,1.11,1.12 VisitableMockMethod0.h,1.9,1.10 VisitableMockMethod1.h,1.9,1.10 VisitableMockMethod2.h,1.9,1.10 VisitableMockMethod3.h,1.9,1.10 VisitableMockMethod4.h,1.9,1.10 VisitableMockMethod5.h,1.9,1.10 VisitableMockMethod6.h,1.7,1.8
|
From: Ewald A. <ewa...@us...> - 2005-11-14 17:25:23
|
Update of /cvsroot/mockpp/mockpp/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11563/mockpp Modified Files: gen_visitablemethod_N.pl VisitableMockMethod0.h VisitableMockMethod1.h VisitableMockMethod2.h VisitableMockMethod3.h VisitableMockMethod4.h VisitableMockMethod5.h VisitableMockMethod6.h Log Message: more tests and fixes Index: VisitableMockMethod6.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/VisitableMockMethod6.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- VisitableMockMethod6.h 13 Nov 2005 14:07:12 -0000 1.7 +++ VisitableMockMethod6.h 14 Nov 2005 17:25:14 -0000 1.8 @@ -222,6 +222,7 @@ R forward(const P1 &p1, const P2 &p2, const P3 &p3, const P4 &p4, const P5 &p5, const P6 &p6) const { this->forward_param(p1, p2, p3, p4, p5, p6); + if (this->getVisitableMockObject()->isActivated() ) { R ret_val; @@ -231,9 +232,11 @@ return this->determineReturnValue(); } else - return R(); + return R(); // only dummy value } + using VisitableMockMethod6Common<R, P1, P2, P3, P4, P5, P6>::forward; + /** Adds another response value. * Response values are determined on the parameters you pass. This way the * object returns a value that is totally based on the input. @@ -307,6 +310,8 @@ { this->forward_param(p1, p2, p3, p4, p5, p6); } + + using VisitableMockMethod6Common<void, P1, P2, P3, P4, P5, P6>::forward; }; Index: VisitableMockMethod2.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/VisitableMockMethod2.h,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- VisitableMockMethod2.h 13 Nov 2005 14:07:12 -0000 1.9 +++ VisitableMockMethod2.h 14 Nov 2005 17:25:14 -0000 1.10 @@ -178,6 +178,7 @@ R forward(const P1 &p1, const P2 &p2) const { this->forward_param(p1, p2); + if (this->getVisitableMockObject()->isActivated() ) { R ret_val; @@ -187,9 +188,11 @@ return this->determineReturnValue(); } else - return R(); + return R(); // only dummy value } + using VisitableMockMethod2Common<R, P1, P2>::forward; + /** Adds another response value. * Response values are determined on the parameters you pass. This way the * object returns a value that is totally based on the input. @@ -251,6 +254,8 @@ { this->forward_param(p1, p2); } + + using VisitableMockMethod2Common<void, P1, P2>::forward; }; Index: gen_visitablemethod_N.pl =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/gen_visitablemethod_N.pl,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- gen_visitablemethod_N.pl 13 Nov 2005 14:07:12 -0000 1.11 +++ gen_visitablemethod_N.pl 14 Nov 2005 17:25:14 -0000 1.12 @@ -410,6 +410,8 @@ else return R(); // only dummy value } + + using VisitableMockMethod" . $numArgs . "Common<R" . $templateArgs_colon . ">::forward; "; if ($numArgs > 0) @@ -493,6 +495,8 @@ { this->forward_param(" . $args . "); } + + using VisitableMockMethod" . $numArgs . "Common<void" . $templateArgs_colon . ">::forward; }; Index: VisitableMockMethod3.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/VisitableMockMethod3.h,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- VisitableMockMethod3.h 13 Nov 2005 14:07:12 -0000 1.9 +++ VisitableMockMethod3.h 14 Nov 2005 17:25:14 -0000 1.10 @@ -189,6 +189,7 @@ R forward(const P1 &p1, const P2 &p2, const P3 &p3) const { this->forward_param(p1, p2, p3); + if (this->getVisitableMockObject()->isActivated() ) { R ret_val; @@ -198,9 +199,11 @@ return this->determineReturnValue(); } else - return R(); + return R(); // only dummy value } + using VisitableMockMethod3Common<R, P1, P2, P3>::forward; + /** Adds another response value. * Response values are determined on the parameters you pass. This way the * object returns a value that is totally based on the input. @@ -265,6 +268,8 @@ { this->forward_param(p1, p2, p3); } + + using VisitableMockMethod3Common<void, P1, P2, P3>::forward; }; Index: VisitableMockMethod4.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/VisitableMockMethod4.h,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- VisitableMockMethod4.h 13 Nov 2005 14:07:12 -0000 1.9 +++ VisitableMockMethod4.h 14 Nov 2005 17:25:14 -0000 1.10 @@ -200,6 +200,7 @@ R forward(const P1 &p1, const P2 &p2, const P3 &p3, const P4 &p4) const { this->forward_param(p1, p2, p3, p4); + if (this->getVisitableMockObject()->isActivated() ) { R ret_val; @@ -209,9 +210,11 @@ return this->determineReturnValue(); } else - return R(); + return R(); // only dummy value } + using VisitableMockMethod4Common<R, P1, P2, P3, P4>::forward; + /** Adds another response value. * Response values are determined on the parameters you pass. This way the * object returns a value that is totally based on the input. @@ -279,6 +282,8 @@ { this->forward_param(p1, p2, p3, p4); } + + using VisitableMockMethod4Common<void, P1, P2, P3, P4>::forward; }; Index: VisitableMockMethod0.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/VisitableMockMethod0.h,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- VisitableMockMethod0.h 13 Nov 2005 14:07:12 -0000 1.9 +++ VisitableMockMethod0.h 14 Nov 2005 17:25:14 -0000 1.10 @@ -109,14 +109,17 @@ R forward() const { this->forward_param(); + if (this->getVisitableMockObject()->isActivated() ) { return this->determineReturnValue(); } else - return R(); + return R(); // only dummy value } + using VisitableMockMethod0Common<R>::forward; + }; @@ -145,6 +148,8 @@ { this->forward_param(); } + + using VisitableMockMethod0Common<void>::forward; }; Index: VisitableMockMethod5.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/VisitableMockMethod5.h,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- VisitableMockMethod5.h 13 Nov 2005 14:07:12 -0000 1.9 +++ VisitableMockMethod5.h 14 Nov 2005 17:25:14 -0000 1.10 @@ -211,6 +211,7 @@ R forward(const P1 &p1, const P2 &p2, const P3 &p3, const P4 &p4, const P5 &p5) const { this->forward_param(p1, p2, p3, p4, p5); + if (this->getVisitableMockObject()->isActivated() ) { R ret_val; @@ -220,9 +221,11 @@ return this->determineReturnValue(); } else - return R(); + return R(); // only dummy value } + using VisitableMockMethod5Common<R, P1, P2, P3, P4, P5>::forward; + /** Adds another response value. * Response values are determined on the parameters you pass. This way the * object returns a value that is totally based on the input. @@ -293,6 +296,8 @@ { this->forward_param(p1, p2, p3, p4, p5); } + + using VisitableMockMethod5Common<void, P1, P2, P3, P4, P5>::forward; }; Index: VisitableMockMethod1.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/VisitableMockMethod1.h,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- VisitableMockMethod1.h 13 Nov 2005 14:07:12 -0000 1.9 +++ VisitableMockMethod1.h 14 Nov 2005 17:25:14 -0000 1.10 @@ -167,6 +167,7 @@ R forward(const P1 &p1) const { this->forward_param(p1); + if (this->getVisitableMockObject()->isActivated() ) { R ret_val; @@ -176,9 +177,11 @@ return this->determineReturnValue(); } else - return R(); + return R(); // only dummy value } + using VisitableMockMethod1Common<R, P1>::forward; + /** Adds another response value. * Response values are determined on the parameters you pass. This way the * object returns a value that is totally based on the input. @@ -237,6 +240,8 @@ { this->forward_param(p1); } + + using VisitableMockMethod1Common<void, P1>::forward; }; |
