mockpp-commits Mailing List for Mock Objects for C++ (Page 21)
Brought to you by:
ewald-arnold
Menu
▾
▴
mockpp-commits
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
(17) |
Mar
(178) |
Apr
(119) |
May
(60) |
Jun
(3) |
Jul
(60) |
Aug
(16) |
Sep
(55) |
Oct
(156) |
Nov
(136) |
Dec
(255) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(98) |
Feb
(8) |
Mar
(57) |
Apr
(43) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Ewald A. <ewa...@us...> - 2005-11-26 20:17:06
|
Update of /cvsroot/mockpp/mockpp/mockpp/stub In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15736/mockpp/stub Modified Files: StubSequence.h TypelessStubSequence.h Log Message: prepare use of alternative stl Index: TypelessStubSequence.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/stub/TypelessStubSequence.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- TypelessStubSequence.h 26 Nov 2005 18:27:30 -0000 1.8 +++ TypelessStubSequence.h 26 Nov 2005 20:16:55 -0000 1.9 @@ -108,7 +108,7 @@ TypelessStubSequence(const TypelessStubSequence &); TypelessStubSequence &operator =(const TypelessStubSequence &); - std::vector<TypelessStub<R>* > stubs; + MOCKPP_STL::vector<TypelessStub<R>* > stubs; }; Index: StubSequence.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/stub/StubSequence.h,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- StubSequence.h 26 Nov 2005 18:27:30 -0000 1.26 +++ StubSequence.h 26 Nov 2005 20:16:55 -0000 1.27 @@ -116,7 +116,7 @@ StubSequence(const StubSequence &); StubSequence &operator =(const StubSequence &); - std::vector<Stub<R, I>* > stubs; + MOCKPP_STL::vector<Stub<R, I>* > stubs; }; |
|
From: Ewald A. <ewa...@us...> - 2005-11-26 20:17:06
|
Update of /cvsroot/mockpp/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15736 Modified Files: ChangeLog Log Message: prepare use of alternative stl Index: ChangeLog =================================================================== RCS file: /cvsroot/mockpp/mockpp/ChangeLog,v retrieving revision 1.79 retrieving revision 1.80 diff -u -d -r1.79 -r1.80 --- ChangeLog 26 Nov 2005 18:27:30 -0000 1.79 +++ ChangeLog 26 Nov 2005 20:16:55 -0000 1.80 @@ -4,7 +4,8 @@ -------------- 2005-11-24 1.10.1: - - removed superfluous template parameter, prevents also compilation error + - removed superfluous template parameter + - fix compilation error due to bad namespace resolution - provide ways for alternative STL 2005-11-19 1.10.0: |
|
From: Ewald A. <ewa...@us...> - 2005-11-26 20:17:06
|
Update of /cvsroot/mockpp/mockpp/mockpp/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15736/mockpp/tests Modified Files: AbstractInvocationDispatcher_test.cpp Log Message: prepare use of alternative stl Index: AbstractInvocationDispatcher_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/AbstractInvocationDispatcher_test.cpp,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- AbstractInvocationDispatcher_test.cpp 13 Nov 2005 11:53:18 -0000 1.21 +++ AbstractInvocationDispatcher_test.cpp 26 Nov 2005 20:16:55 -0000 1.22 @@ -35,7 +35,7 @@ #else -#include <iostream> +// #include <iostream> #include <mockpp/chaining/AbstractInvocationDispatcher.h> |
|
From: Ewald A. <ewa...@us...> - 2005-11-26 18:34:33
|
Update of /cvsroot/mockpp/mockpp/mockpp/chaining In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30951/mockpp/chaining Modified Files: CountedChainableMethod.h gen_countchainable_N.pl Log Message: Index: CountedChainableMethod.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/CountedChainableMethod.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- CountedChainableMethod.h 13 Nov 2005 11:53:18 -0000 1.4 +++ CountedChainableMethod.h 26 Nov 2005 18:34:16 -0000 1.5 @@ -1,7 +1,7 @@ /** @file @internal NOT INTENDED FOR PUBLIC INCLUSION @brief Generated with gen_countparameters_N.pl. - + $Id$ ***************************************************************************/ @@ -44,7 +44,7 @@ namespace mockpp { - + #ifndef MOCKPP_COUNTED_WEAKNESS @@ -69,7 +69,7 @@ /** Helper class with an embeded type to the the method mock with 0 parameters. */ - template< typename R + template< typename RT , typename P1 , typename P2 , typename P3 @@ -80,7 +80,7 @@ { public: - typedef ChainableMockMethod0<R> ChainableMockMethodType; + typedef ChainableMockMethod0<RT> ChainableMockMethodType; }; }; @@ -96,7 +96,7 @@ /** Helper class with an embeded type to the the method mock with 1 parameters. */ - template< typename R + template< typename RT , typename P1 , typename P2 , typename P3 @@ -107,7 +107,7 @@ { public: - typedef ChainableMockMethod1<R, P1> ChainableMockMethodType; + typedef ChainableMockMethod1<RT, P1> ChainableMockMethodType; }; }; @@ -123,7 +123,7 @@ /** Helper class with an embeded type to the the method mock with 2 parameters. */ - template< typename R + template< typename RT , typename P1 , typename P2 , typename P3 @@ -134,7 +134,7 @@ { public: - typedef ChainableMockMethod2<R, P1, P2> ChainableMockMethodType; + typedef ChainableMockMethod2<RT, P1, P2> ChainableMockMethodType; }; }; @@ -150,7 +150,7 @@ /** Helper class with an embeded type to the the method mock with 3 parameters. */ - template< typename R + template< typename RT , typename P1 , typename P2 , typename P3 @@ -161,7 +161,7 @@ { public: - typedef ChainableMockMethod3<R, P1, P2, P3> ChainableMockMethodType; + typedef ChainableMockMethod3<RT, P1, P2, P3> ChainableMockMethodType; }; }; @@ -177,7 +177,7 @@ /** Helper class with an embeded type to the the method mock with 4 parameters. */ - template< typename R + template< typename RT , typename P1 , typename P2 , typename P3 @@ -188,7 +188,7 @@ { public: - typedef ChainableMockMethod4<R, P1, P2, P3, P4> ChainableMockMethodType; + typedef ChainableMockMethod4<RT, P1, P2, P3, P4> ChainableMockMethodType; }; }; @@ -204,7 +204,7 @@ /** Helper class with an embeded type to the the method mock with 5 parameters. */ - template< typename R + template< typename RT , typename P1 , typename P2 , typename P3 @@ -215,7 +215,7 @@ { public: - typedef ChainableMockMethod5<R, P1, P2, P3, P4, P5> ChainableMockMethodType; + typedef ChainableMockMethod5<RT, P1, P2, P3, P4, P5> ChainableMockMethodType; }; }; @@ -231,7 +231,7 @@ /** Helper class with an embeded type to the the method mock with 6 parameters. */ - template< typename R + template< typename RT , typename P1 , typename P2 , typename P3 @@ -242,7 +242,7 @@ { public: - typedef ChainableMockMethod6<R, P1, P2, P3, P4, P5, P6> ChainableMockMethodType; + typedef ChainableMockMethod6<RT, P1, P2, P3, P4, P5, P6> ChainableMockMethodType; }; }; @@ -250,7 +250,7 @@ /** Method mock class to select the actual class with the desired number of parameters. * Works with meta programming. */ -template< typename R +template< typename RT , typename P1 = NoParameter , typename P2 = NoParameter , typename P3 = NoParameter @@ -258,8 +258,8 @@ , typename P5 = NoParameter , typename P6 = NoParameter> class ChainableMockMethod - : public SwitchChainable<CountParameters<R, P1, P2, P3, P4, P5, P6>::value > - ::template Method<R, P1, P2, P3, P4, P5, P6> + : public SwitchChainable<CountParameters<RT, P1, P2, P3, P4, P5, P6>::value > + ::template Method<RT, P1, P2, P3, P4, P5, P6> ::ChainableMockMethodType { public: @@ -269,8 +269,8 @@ * @param parent parent chainable mock object */ ChainableMockMethod(const String &name, ChainableMockObject *parent ) - : SwitchChainable<CountParameters<R, P1, P2, P3, P4, P5, P6>::value > - ::template Method<R, P1, P2, P3, P4, P5, P6> + : SwitchChainable<CountParameters<RT, P1, P2, P3, P4, P5, P6>::value > + ::template Method<RT, P1, P2, P3, P4, P5, P6> ::ChainableMockMethodType(name, parent) { } @@ -284,7 +284,7 @@ * Works with partial specialisation. * @internal */ -template< typename R +template< typename RT , typename P1 = NoParameter , typename P2 = NoParameter , typename P3 = NoParameter @@ -300,9 +300,9 @@ /** Method mock class to select the actual class with 0 parameters. * Works with partial specialisation. */ -template<typename R> -class ChainableMockMethod<R, NoParameter, NoParameter, NoParameter, NoParameter, NoParameter, NoParameter> - : public ChainableMockMethod0<R> +template<typename RT> +class ChainableMockMethod<RT, NoParameter, NoParameter, NoParameter, NoParameter, NoParameter, NoParameter> + : public ChainableMockMethod0<RT> { public: @@ -310,9 +310,9 @@ * @param name human readable description about the expectation * @param parent parent chainable mock object */ - ChainableMockMethod<R, NoParameter, NoParameter, NoParameter, NoParameter, NoParameter, NoParameter> + ChainableMockMethod<RT, NoParameter, NoParameter, NoParameter, NoParameter, NoParameter, NoParameter> (const String &name, ChainableMockObject *parent ) - : ChainableMockMethod0<R>(name, parent) + : ChainableMockMethod0<RT>(name, parent) { } }; @@ -321,9 +321,9 @@ /** Method mock class to select the actual class with 1 parameters. * Works with partial specialisation. */ -template<typename R, typename P1> -class ChainableMockMethod<R, P1, NoParameter, NoParameter, NoParameter, NoParameter, NoParameter> - : public ChainableMockMethod1<R, P1> +template<typename RT, typename P1> +class ChainableMockMethod<RT, P1, NoParameter, NoParameter, NoParameter, NoParameter, NoParameter> + : public ChainableMockMethod1<RT, P1> { public: @@ -331,9 +331,9 @@ * @param name human readable description about the expectation * @param parent parent chainable mock object */ - ChainableMockMethod<R, P1, NoParameter, NoParameter, NoParameter, NoParameter, NoParameter> + ChainableMockMethod<RT, P1, NoParameter, NoParameter, NoParameter, NoParameter, NoParameter> (const String &name, ChainableMockObject *parent ) - : ChainableMockMethod1<R, P1>(name, parent) + : ChainableMockMethod1<RT, P1>(name, parent) { } }; @@ -342,9 +342,9 @@ /** Method mock class to select the actual class with 2 parameters. * Works with partial specialisation. */ -template<typename R, typename P1, typename P2> -class ChainableMockMethod<R, P1, P2, NoParameter, NoParameter, NoParameter, NoParameter> - : public ChainableMockMethod2<R, P1, P2> +template<typename RT, typename P1, typename P2> +class ChainableMockMethod<RT, P1, P2, NoParameter, NoParameter, NoParameter, NoParameter> + : public ChainableMockMethod2<RT, P1, P2> { public: @@ -352,9 +352,9 @@ * @param name human readable description about the expectation * @param parent parent chainable mock object */ - ChainableMockMethod<R, P1, P2, NoParameter, NoParameter, NoParameter, NoParameter> + ChainableMockMethod<RT, P1, P2, NoParameter, NoParameter, NoParameter, NoParameter> (const String &name, ChainableMockObject *parent ) - : ChainableMockMethod2<R, P1, P2>(name, parent) + : ChainableMockMethod2<RT, P1, P2>(name, parent) { } }; @@ -363,9 +363,9 @@ /** Method mock class to select the actual class with 3 parameters. * Works with partial specialisation. */ -template<typename R, typename P1, typename P2, typename P3> -class ChainableMockMethod<R, P1, P2, P3, NoParameter, NoParameter, NoParameter> - : public ChainableMockMethod3<R, P1, P2, P3> +template<typename RT, typename P1, typename P2, typename P3> +class ChainableMockMethod<RT, P1, P2, P3, NoParameter, NoParameter, NoParameter> + : public ChainableMockMethod3<RT, P1, P2, P3> { public: @@ -373,9 +373,9 @@ * @param name human readable description about the expectation * @param parent parent chainable mock object */ - ChainableMockMethod<R, P1, P2, P3, NoParameter, NoParameter, NoParameter> + ChainableMockMethod<RT, P1, P2, P3, NoParameter, NoParameter, NoParameter> (const String &name, ChainableMockObject *parent ) - : ChainableMockMethod3<R, P1, P2, P3>(name, parent) + : ChainableMockMethod3<RT, P1, P2, P3>(name, parent) { } }; @@ -384,9 +384,9 @@ /** Method mock class to select the actual class with 4 parameters. * Works with partial specialisation. */ -template<typename R, typename P1, typename P2, typename P3, typename P4> -class ChainableMockMethod<R, P1, P2, P3, P4, NoParameter, NoParameter> - : public ChainableMockMethod4<R, P1, P2, P3, P4> +template<typename RT, typename P1, typename P2, typename P3, typename P4> +class ChainableMockMethod<RT, P1, P2, P3, P4, NoParameter, NoParameter> + : public ChainableMockMethod4<RT, P1, P2, P3, P4> { public: @@ -394,9 +394,9 @@ * @param name human readable description about the expectation * @param parent parent chainable mock object */ - ChainableMockMethod<R, P1, P2, P3, P4, NoParameter, NoParameter> + ChainableMockMethod<RT, P1, P2, P3, P4, NoParameter, NoParameter> (const String &name, ChainableMockObject *parent ) - : ChainableMockMethod4<R, P1, P2, P3, P4>(name, parent) + : ChainableMockMethod4<RT, P1, P2, P3, P4>(name, parent) { } }; @@ -405,9 +405,9 @@ /** Method mock class to select the actual class with 5 parameters. * Works with partial specialisation. */ -template<typename R, typename P1, typename P2, typename P3, typename P4, typename P5> -class ChainableMockMethod<R, P1, P2, P3, P4, P5, NoParameter> - : public ChainableMockMethod5<R, P1, P2, P3, P4, P5> +template<typename RT, typename P1, typename P2, typename P3, typename P4, typename P5> +class ChainableMockMethod<RT, P1, P2, P3, P4, P5, NoParameter> + : public ChainableMockMethod5<RT, P1, P2, P3, P4, P5> { public: @@ -415,9 +415,9 @@ * @param name human readable description about the expectation * @param parent parent chainable mock object */ - ChainableMockMethod<R, P1, P2, P3, P4, P5, NoParameter> + ChainableMockMethod<RT, P1, P2, P3, P4, P5, NoParameter> (const String &name, ChainableMockObject *parent ) - : ChainableMockMethod5<R, P1, P2, P3, P4, P5>(name, parent) + : ChainableMockMethod5<RT, P1, P2, P3, P4, P5>(name, parent) { } }; @@ -426,9 +426,9 @@ /** Method mock class to select the actual class with 6 parameters. * Works with partial specialisation. */ -template<typename R, typename P1, typename P2, typename P3, typename P4, typename P5, typename P6> -class ChainableMockMethod<R, P1, P2, P3, P4, P5, P6> - : public ChainableMockMethod6<R, P1, P2, P3, P4, P5, P6> +template<typename RT, typename P1, typename P2, typename P3, typename P4, typename P5, typename P6> +class ChainableMockMethod<RT, P1, P2, P3, P4, P5, P6> + : public ChainableMockMethod6<RT, P1, P2, P3, P4, P5, P6> { public: @@ -436,9 +436,9 @@ * @param name human readable description about the expectation * @param parent parent chainable mock object */ - ChainableMockMethod<R, P1, P2, P3, P4, P5, P6> + ChainableMockMethod<RT, P1, P2, P3, P4, P5, P6> (const String &name, ChainableMockObject *parent ) - : ChainableMockMethod6<R, P1, P2, P3, P4, P5, P6>(name, parent) + : ChainableMockMethod6<RT, P1, P2, P3, P4, P5, P6>(name, parent) { } }; Index: gen_countchainable_N.pl =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/gen_countchainable_N.pl,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- gen_countchainable_N.pl 31 Oct 2005 20:50:37 -0000 1.3 +++ gen_countchainable_N.pl 26 Nov 2005 18:34:16 -0000 1.4 @@ -17,11 +17,11 @@ open OUT, ">CountedChainableMethod.h"; -print OUT +print OUT "/** \@file \@internal NOT INTENDED FOR PUBLIC INCLUSION \@brief Generated with gen_countparameters_N.pl. - + \$I" . "d: CountedChainableMethod.h,v 1.7 2005/10/19 20:53:09 ewald-arnold Exp \$ ***************************************************************************/ @@ -62,7 +62,7 @@ namespace mockpp { - + #ifndef MOCKPP_COUNTED_WEAKNESS @@ -89,19 +89,19 @@ } $templateParms .= "typename P$i"; } - if ($numArgs > 0) { + if ($numArgs > 0) { $templateParms_colon = ", " . $templateParms; } - + $templateArgs_colon = ""; $_ = $templateParms; s/typename //g; $templateArgs = $_; - if ($numArgs > 0) { + if ($numArgs > 0) { $templateArgs_colon = ", ". $templateArgs; } print "Creating CountedChainableMethod" . $numArgs ."\n"; - + print OUT " /** Helper class to select the method mock with " . $numArgs ." parameters. * Works with meta programming. @@ -112,11 +112,11 @@ { public: "; - + print OUT " /** Helper class with an embeded type to the the method mock with " . $numArgs ." parameters. */ - template< typename R"; + template< typename RT"; for($p = 1; $p <= $totalNumArgs; ++$p) { print OUT " , typename P" . $p; } @@ -126,7 +126,7 @@ { public: - typedef ChainableMockMethod" . $numArgs ."<R" . $templateArgs_colon . "> ChainableMockMethodType; + typedef ChainableMockMethod" . $numArgs ."<RT" . $templateArgs_colon . "> ChainableMockMethodType; }; }; @@ -139,7 +139,7 @@ /** Method mock class to select the actual class with the desired number of parameters. * Works with meta programming. */ -template< typename R +template< typename RT , typename P1 = NoParameter"; for($p = 2; $p <= $totalNumArgs; ++$p) { print OUT " @@ -147,8 +147,8 @@ print OUT "> class ChainableMockMethod - : public SwitchChainable<CountParameters<R, " . $templateArgs . ">::value > - ::template Method<R, " . $templateArgs . "> + : public SwitchChainable<CountParameters<RT, " . $templateArgs . ">::value > + ::template Method<RT, " . $templateArgs . "> ::ChainableMockMethodType { public: @@ -158,8 +158,8 @@ * \@param parent parent chainable mock object */ ChainableMockMethod(const String &name, ChainableMockObject *parent ) - : SwitchChainable<CountParameters<R, " . $templateArgs . ">::value > - ::template Method<R, " . $templateArgs . "> + : SwitchChainable<CountParameters<RT, " . $templateArgs . ">::value > + ::template Method<RT, " . $templateArgs . "> ::ChainableMockMethodType(name, parent) { } @@ -173,7 +173,7 @@ * Works with partial specialisation. * \@internal */ -template< typename R +template< typename RT , typename P1 = NoParameter"; for($p = 2; $p <= $totalNumArgs+1; ++$p) { print OUT " @@ -196,33 +196,33 @@ } $templateParms .= "typename P$i"; } - if ($numArgs > 0) { + if ($numArgs > 0) { $templateParms_colon = ", " . $templateParms; } - + $templateArgs_colon = ""; $_ = $templateParms; s/typename //g; $templateArgs = $_; - if ($numArgs > 0) { + if ($numArgs > 0) { $templateArgs_colon = ", ". $templateArgs; } $noParamArgs = $templateArgs; for ($i = $numArgs+1; $i <= $totalNumArgs; ++$i) { if ($i > 1) { $noParamArgs .= ", "; - } + } $noParamArgs .= "NoParameter"; } - + print OUT " /** Method mock class to select the actual class with " . $numArgs . " parameters. * Works with partial specialisation. */ -template<typename R" . $templateParms_colon . "> -class ChainableMockMethod<R, " . $noParamArgs . "> - : public ChainableMockMethod" . $numArgs . "<R" . $templateArgs_colon . "> +template<typename RT" . $templateParms_colon . "> +class ChainableMockMethod<RT, " . $noParamArgs . "> + : public ChainableMockMethod" . $numArgs . "<RT" . $templateArgs_colon . "> { public: @@ -230,9 +230,9 @@ * \@param name human readable description about the expectation * \@param parent parent chainable mock object */ - ChainableMockMethod<R, " . $noParamArgs . "> + ChainableMockMethod<RT, " . $noParamArgs . "> (const String &name, ChainableMockObject *parent ) - : ChainableMockMethod" . $numArgs . "<R" . $templateArgs_colon . ">(name, parent) + : ChainableMockMethod" . $numArgs . "<RT" . $templateArgs_colon . ">(name, parent) { } }; |
|
From: Ewald A. <ewa...@us...> - 2005-11-26 18:27:38
|
Update of /cvsroot/mockpp/mockpp/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29052/mockpp Modified Files: ReturnObjectList.h ThrowableList.cpp ThrowableList.h gen_responsevector_N.pl mockpp.h Log Message: prepare use of alternative stl Index: mockpp.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/mockpp.h,v retrieving revision 1.58 retrieving revision 1.59 diff -u -d -r1.58 -r1.59 --- mockpp.h 26 Nov 2005 18:00:17 -0000 1.58 +++ mockpp.h 26 Nov 2005 18:27:30 -0000 1.59 @@ -152,28 +152,32 @@ //# define _GLIBCPP_HAVE_WCHAR_H #endif -#ifdef MOCKPP_MINI_STL +#ifdef MOCKPP_USE_MINI_STL #include <ministl/string> -#define MOCKPP_VECTOR_H <ministl/vector> -#define MOCKPP_MAP_H <ministl/map> -#define MOCKPP_SET_H <ministl/set> +#define MOCKPP_VECTOR_H <ministl/vector> +#define MOCKPP_MAP_H <ministl/map> +#define MOCKPP_SET_H <ministl/set> #define MOCKPP_ALGORITHM_H <ministl/algorithm> -#define MOCKPP_FUNCTION_H <ministl/function> -#define MOCKPP_DEQUE_H <ministl/deque> -#define MOCKPP_STL ministl +#define MOCKPP_FUNCTION_H <ministl/function> +#define MOCKPP_DEQUE_H <ministl/deque> + +// no namespace ministl +#define MOCKPP_STL #else #include <string> -#define MOCKPP_STL std -#define MOCKPP_VECTOR_H <vector> -#define MOCKPP_MAP_H <map> -#define MOCKPP_DEQUE_H <deque> -#define MOCKPP_SET_H <set> -#define MOCKPP_FUNCTION_H <function> +#define MOCKPP_VECTOR_H <vector> +#define MOCKPP_MAP_H <map> +#define MOCKPP_DEQUE_H <deque> +#define MOCKPP_SET_H <set> +#define MOCKPP_FUNCTION_H <function> #define MOCKPP_ALGORITHM_H <algorithm> +// namespace std +#define MOCKPP_STL std + #endif #ifdef HAVE_LIMITS @@ -191,7 +195,7 @@ */ #ifdef HAVE_LIMITS -# define MOCKPP_UNLIMITED (MOCKPP_STL::numeric_limits<unsigned>::max()) +# define MOCKPP_UNLIMITED (std::numeric_limits<unsigned>::max()) #else # define MOCKPP_UNLIMITED (UINT_MAX) #endif Index: ThrowableList.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/ThrowableList.cpp,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- ThrowableList.cpp 13 Nov 2005 11:53:18 -0000 1.22 +++ ThrowableList.cpp 26 Nov 2005 18:27:30 -0000 1.23 @@ -91,8 +91,8 @@ fmt << getVerifiableName(); MOCKPP_ASSERT_TRUE_MESSAGE(fmt, list.size() > 0); - Throwable *temp = list.front(); - list.pop_front(); + Throwable *temp = list[0]; + list.erase(list.begin()); already_used.push_back(temp); return temp; Index: gen_responsevector_N.pl =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/gen_responsevector_N.pl,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- gen_responsevector_N.pl 13 Nov 2005 11:53:18 -0000 1.3 +++ gen_responsevector_N.pl 26 Nov 2005 18:27:30 -0000 1.4 @@ -283,7 +283,7 @@ "; for($p = 1; $p <= $numArgs; ++$p) { print OUT " - std::vector<Constraint<P" . $p . ">*> t" . $p . "vec;"; } + MOCKPP_STL::vector<Constraint<P" . $p . ">*> t" . $p . "vec;"; } print OUT " }; @@ -432,7 +432,7 @@ private: - std::vector<R> rvec; + MOCKPP_STL::vector<R> rvec; }; } // ns mockpp Index: ThrowableList.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/ThrowableList.h,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- ThrowableList.h 26 Nov 2005 18:00:17 -0000 1.21 +++ ThrowableList.h 26 Nov 2005 18:27:30 -0000 1.22 @@ -32,7 +32,7 @@ #include <mockpp/mockpp.h> // always first -#include MOCKPP_DEQUE_H +#include MOCKPP_VECTOR_H #include <mockpp/Verifiable.h> #include <mockpp/Throwable.h> @@ -138,8 +138,8 @@ ThrowableList (const ThrowableList &); // forbid ThrowableList& operator=(ThrowableList&); - std::deque<Throwable *> list; - std::deque<Throwable *> already_used; + std::vector<Throwable *> list; + std::vector<Throwable *> already_used; }; Index: ReturnObjectList.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/ReturnObjectList.h,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- ReturnObjectList.h 26 Nov 2005 18:00:17 -0000 1.31 +++ ReturnObjectList.h 26 Nov 2005 18:27:30 -0000 1.32 @@ -32,7 +32,7 @@ #include <mockpp/mockpp.h> // always first -#include MOCKPP_DEQUE_H +#include MOCKPP_VECTOR_H #include <mockpp/Verifiable.h> @@ -136,8 +136,8 @@ MOCKPP_ASSERT_TRUE_MESSAGE(fmt, myObjects.size() > 0); - T temp = myObjects.front(); - myObjects.pop_front(); + T temp = myObjects[0]; + myObjects.erase(myObjects.begin()); return temp; } @@ -203,9 +203,9 @@ private: - std::deque<T> myObjects; - bool haveDefault; - T defaultObject; + std::vector<T> myObjects; + bool haveDefault; + T defaultObject; }; |
|
From: Ewald A. <ewa...@us...> - 2005-11-26 18:27:38
|
Update of /cvsroot/mockpp/mockpp/mockpp/stub In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29052/mockpp/stub Modified Files: StubSequence.h TypelessStubSequence.h Log Message: prepare use of alternative stl Index: TypelessStubSequence.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/stub/TypelessStubSequence.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- TypelessStubSequence.h 26 Nov 2005 17:57:17 -0000 1.7 +++ TypelessStubSequence.h 26 Nov 2005 18:27:30 -0000 1.8 @@ -32,7 +32,7 @@ #include <mockpp/mockpp.h> // always first -#include MOCKPP_DEQUE_H +#include MOCKPP_VECTOR_H #include <mockpp/stub/TypelessStub.h> #include <mockpp/compat/Assert.h> @@ -65,8 +65,8 @@ { while (!stubs.empty() ) { - delete stubs.front(); - stubs.pop_front(); + delete stubs[0]; + stubs.erase(stubs.begin()); } } @@ -77,8 +77,8 @@ { if (!stubs.empty()) { - std::auto_ptr< TypelessStub<R> > curr (stubs.front()); - stubs.pop_front(); + std::auto_ptr< TypelessStub<R> > curr (stubs[0]); + stubs.erase(stubs.begin()); return curr->typelessInvoke(); } assertionFailed(__LINE__, __FILE__, MOCKPP_PCHAR("no more stubs available")); @@ -108,7 +108,7 @@ TypelessStubSequence(const TypelessStubSequence &); TypelessStubSequence &operator =(const TypelessStubSequence &); - std::deque<TypelessStub<R>* > stubs; + std::vector<TypelessStub<R>* > stubs; }; Index: StubSequence.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/stub/StubSequence.h,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- StubSequence.h 26 Nov 2005 17:57:17 -0000 1.25 +++ StubSequence.h 26 Nov 2005 18:27:30 -0000 1.26 @@ -36,7 +36,7 @@ #include <mockpp/mockpp.h> // always first -#include MOCKPP_DEQUE_H +#include MOCKPP_VECTOR_H #include <mockpp/stub/Stub.h> #include <mockpp/compat/Assert.h> @@ -72,8 +72,8 @@ { while (!stubs.empty() ) { - delete stubs.front(); - stubs.pop_front(); + delete stubs[0]; + stubs.erase(stubs.begin()); } } @@ -85,8 +85,8 @@ { if (!stubs.empty()) { - std::auto_ptr< Stub<R, I> > curr (stubs.front()); - stubs.pop_front(); + std::auto_ptr< Stub<R, I> > curr (stubs[0]); + stubs.erase(stubs.begin()); return curr->invoke(invocation); } assertionFailed(__LINE__, __FILE__, MOCKPP_PCHAR("no more stubs available")); @@ -116,7 +116,7 @@ StubSequence(const StubSequence &); StubSequence &operator =(const StubSequence &); - std::deque<Stub<R, I>* > stubs; + std::vector<Stub<R, I>* > stubs; }; |
|
From: Ewald A. <ewa...@us...> - 2005-11-26 18:27:37
|
Update of /cvsroot/mockpp/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29052 Modified Files: ChangeLog mockpp.kdevelop Log Message: prepare use of alternative stl Index: mockpp.kdevelop =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp.kdevelop,v retrieving revision 1.80 retrieving revision 1.81 diff -u -d -r1.80 -r1.81 --- mockpp.kdevelop 19 Nov 2005 14:16:38 -0000 1.80 +++ mockpp.kdevelop 26 Nov 2005 18:27:30 -0000 1.81 @@ -212,7 +212,7 @@ <hidenonlocation>true</hidenonlocation> </groups> <tree> - <hidepatterns>*.o,*.lo,CVS,*~*,*.bak,*.BAK</hidepatterns> + <hidepatterns></hidepatterns> <hidenonprojectfiles>false</hidenonprojectfiles> <showvcsfields>false</showvcsfields> </tree> Index: ChangeLog =================================================================== RCS file: /cvsroot/mockpp/mockpp/ChangeLog,v retrieving revision 1.78 retrieving revision 1.79 diff -u -d -r1.78 -r1.79 --- ChangeLog 24 Nov 2005 19:45:43 -0000 1.78 +++ ChangeLog 26 Nov 2005 18:27:30 -0000 1.79 @@ -4,7 +4,8 @@ -------------- 2005-11-24 1.10.1: - - remove superfluous template parameter + - removed superfluous template parameter, prevents also compilation error + - provide ways for alternative STL 2005-11-19 1.10.0: |
Update of /cvsroot/mockpp/mockpp/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21172/mockpp Modified Files: ChainableMockObject.cpp ChainableMockObject.h ExpectationConglomeration.h ExpectationList.h ExpectationMap.h ExpectationSet.h MockObject.cpp MockObject.h mockpp.cpp mockpp.h ResponseVector1.h ResponseVector2.h ResponseVector3.h ResponseVector4.h ResponseVector5.h ResponseVector6.h ReturnObjectList.h ThrowableList.h TrackingCounter.cpp TrackingCounter.h VerifiableList.cpp VerifiableList.h VerifyingTestCaller.h VerifyingTestCase.cpp VerifyingTestCase.h VisitableMockMethod.cpp VisitableMockMethod.h VisitableMockObject.cpp VisitableMockObject.h VisitableMockObject_macro.h VisitableMockObject_template.h Log Message: prepare use of alternative stl Index: ResponseVector3.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/ResponseVector3.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- ResponseVector3.h 13 Nov 2005 11:53:18 -0000 1.7 +++ ResponseVector3.h 26 Nov 2005 18:00:17 -0000 1.8 @@ -150,9 +150,9 @@ protected: - std::vector<Constraint<P1>*> t1vec; - std::vector<Constraint<P2>*> t2vec; - std::vector<Constraint<P3>*> t3vec; + MOCKPP_STL::vector<Constraint<P1>*> t1vec; + MOCKPP_STL::vector<Constraint<P2>*> t2vec; + MOCKPP_STL::vector<Constraint<P3>*> t3vec; }; @@ -283,7 +283,7 @@ private: - std::vector<R> rvec; + MOCKPP_STL::vector<R> rvec; }; } // ns mockpp Index: TrackingCounter.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/TrackingCounter.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- TrackingCounter.cpp 13 Nov 2005 11:53:18 -0000 1.10 +++ TrackingCounter.cpp 26 Nov 2005 18:00:17 -0000 1.11 @@ -29,7 +29,7 @@ #include <mockpp/mockpp.h> // always first -#include <algorithm> +#include MOCKPP_ALGORITHM_H #include <mockpp/TrackingCounter.h> #include <mockpp/VerifiableList.h> @@ -162,8 +162,8 @@ void MOCKPP_EXPORT TrackingCounterMaster::removeClient(TrackingCounterClient* vf) { - std::vector<TrackingCounterClient*>::iterator it = - std::find (clients.begin(), clients.end(), vf); + MOCKPP_STL::vector<TrackingCounterClient*>::iterator it = + MOCKPP_STL::find (clients.begin(), clients.end(), vf); if(it != clients.end()) clients.erase(it); Index: ResponseVector2.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/ResponseVector2.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- ResponseVector2.h 13 Nov 2005 11:53:18 -0000 1.7 +++ ResponseVector2.h 26 Nov 2005 18:00:17 -0000 1.8 @@ -138,8 +138,8 @@ protected: - std::vector<Constraint<P1>*> t1vec; - std::vector<Constraint<P2>*> t2vec; + MOCKPP_STL::vector<Constraint<P1>*> t1vec; + MOCKPP_STL::vector<Constraint<P2>*> t2vec; }; @@ -262,7 +262,7 @@ private: - std::vector<R> rvec; + MOCKPP_STL::vector<R> rvec; }; } // ns mockpp Index: VisitableMockObject_macro.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/VisitableMockObject_macro.h,v retrieving revision 1.34 retrieving revision 1.35 diff -u -d -r1.34 -r1.35 --- VisitableMockObject_macro.h 13 Nov 2005 11:53:18 -0000 1.34 +++ VisitableMockObject_macro.h 26 Nov 2005 18:00:17 -0000 1.35 @@ -588,7 +588,7 @@ mockpp::ThrowableItem name ## DefaultThrowable; \ mutable mockpp::ThrowableList name ## Throwables; \ bool name ## ThrowablesInline; \ - mutable std::vector<bool> name ## ThrowableInsteadReturn + mutable MOCKPP_STL::vector<bool> name ## ThrowableInsteadReturn #define MOCKPP_DECLARE_RETURN_VARS(ret_type, name) \ mutable mockpp::ReturnObjectList< ret_type > name ## ReturnValues; \ @@ -688,7 +688,7 @@ */ #define MOCKPP_VOID_VISITABLE0_IMPL(classname, m_name) \ { \ - std::string func_name (#m_name); \ + MOCKPP_STL::string func_name (#m_name); \ if (!isActivated() ) \ { \ addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + func_name); \ @@ -718,7 +718,7 @@ #define MOCKPP_VOID_VISITABLE1_IMPL(classname, m_name, m_type1, \ a_name, v_type1) \ { \ - std::string func_name (#m_name); \ + MOCKPP_STL::string func_name (#m_name); \ if (!isActivated() ) \ { \ addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + func_name); \ @@ -768,7 +768,7 @@ #define MOCKPP_VOID_VISITABLE2_IMPL(classname, m_name, m_type1, m_type2, \ a_name, v_type1, v_type2) \ { \ - std::string func_name (#m_name); \ + MOCKPP_STL::string func_name (#m_name); \ if (!isActivated() ) \ { \ addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + func_name); \ @@ -825,7 +825,7 @@ #define MOCKPP_VOID_VISITABLE3_IMPL(classname, m_name, m_type1, m_type2, m_type3, \ a_name, v_type1, v_type2, v_type3) \ { \ - std::string func_name (#m_name); \ + MOCKPP_STL::string func_name (#m_name); \ if (!isActivated() ) \ { \ addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + func_name); \ @@ -889,7 +889,7 @@ #define MOCKPP_VOID_VISITABLE4_IMPL(classname, m_name, m_type1, m_type2, m_type3, m_type4, \ a_name, v_type1, v_type2, v_type3, v_type4) \ { \ - std::string func_name (#m_name); \ + MOCKPP_STL::string func_name (#m_name); \ if (!isActivated() ) \ { \ addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + func_name); \ @@ -960,7 +960,7 @@ #define MOCKPP_VOID_VISITABLE5_IMPL(classname, m_name, m_type1, m_type2, m_type3, m_type4, m_type5, \ a_name, v_type1, v_type2, v_type3, v_type4, v_type5) \ { \ - std::string func_name (#m_name); \ + MOCKPP_STL::string func_name (#m_name); \ if (!isActivated() ) \ { \ addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + func_name); \ @@ -1027,7 +1027,7 @@ #define MOCKPP_VISITABLE0_IMPL(classname, m_ret_type, m_name, \ v_ret_type) \ { \ - std::string func_name = #m_name; \ + MOCKPP_STL::string func_name = #m_name; \ if (!isActivated() ) \ { \ addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + func_name); \ @@ -1067,7 +1067,7 @@ #define MOCKPP_VISITABLE1_IMPL(classname, m_ret_type, m_name, m_type1, \ v_ret_type, a_name, v_type1) \ { \ - std::string func_name = #m_name; \ + MOCKPP_STL::string func_name = #m_name; \ if (!isActivated() ) \ { \ addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + func_name); \ @@ -1130,7 +1130,7 @@ #define MOCKPP_VISITABLE2_IMPL(classname, m_ret_type, m_name, m_type1, m_type2, \ v_ret_type, a_name, v_type1, v_type2) \ { \ - std::string func_name = #m_name; \ + MOCKPP_STL::string func_name = #m_name; \ if (!isActivated() ) \ { \ addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + func_name); \ @@ -1200,7 +1200,7 @@ #define MOCKPP_VISITABLE3_IMPL(classname, m_ret_type, m_name, m_type1, m_type2, m_type3, \ v_ret_type, a_name, v_type1, v_type2, v_type3) \ { \ - std::string func_name = #m_name; \ + MOCKPP_STL::string func_name = #m_name; \ if (!isActivated() ) \ { \ addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + func_name); \ @@ -1276,7 +1276,7 @@ #define MOCKPP_VISITABLE4_IMPL(classname, m_ret_type, m_name, m_type1, m_type2, m_type3, m_type4, \ v_ret_type, a_name, v_type1, v_type2, v_type3, v_type4) \ { \ - std::string func_name = #m_name; \ + MOCKPP_STL::string func_name = #m_name; \ if (!isActivated() ) \ { \ addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + func_name); \ @@ -1359,7 +1359,7 @@ #define MOCKPP_VISITABLE5_IMPL(classname, m_ret_type, m_name, m_type1, m_type2, m_type3, m_type4, m_type5, \ v_ret_type, a_name, v_type1, v_type2, v_type3, v_type4, v_type5) \ { \ - std::string func_name = #m_name; \ + MOCKPP_STL::string func_name = #m_name; \ if (!isActivated() ) \ { \ addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + func_name); \ Index: ExpectationSet.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/ExpectationSet.h,v retrieving revision 1.33 retrieving revision 1.34 diff -u -d -r1.33 -r1.34 --- ExpectationSet.h 13 Nov 2005 11:53:18 -0000 1.33 +++ ExpectationSet.h 26 Nov 2005 18:00:16 -0000 1.34 @@ -32,8 +32,8 @@ #include <mockpp/mockpp.h> // always first -#include <algorithm> -#include <set> +#include MOCKPP_ALGORITHM_H +#include MOCKPP_SET_H #include <mockpp/AbstractExpectationCollection.h> #include <mockpp/util/AssertMo.h> @@ -216,13 +216,13 @@ fmt << getVerifiableName() << actualItem; MOCKPP_ASSERT_TRUE_MESSAGE(fmt, - std::find(expectedItems.begin(), expectedItems.end(), actualItem) != expectedItems.end()); + MOCKPP_STL::find(expectedItems.begin(), expectedItems.end(), actualItem) != expectedItems.end()); } private: - std::set<T> actualItems; - std::set<T> expectedItems; + MOCKPP_STL::set<T> actualItems; + MOCKPP_STL::set<T> expectedItems; bool expectNothing; bool haveActualValue; }; Index: ResponseVector4.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/ResponseVector4.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- ResponseVector4.h 13 Nov 2005 11:53:18 -0000 1.7 +++ ResponseVector4.h 26 Nov 2005 18:00:17 -0000 1.8 @@ -162,10 +162,10 @@ protected: - std::vector<Constraint<P1>*> t1vec; - std::vector<Constraint<P2>*> t2vec; - std::vector<Constraint<P3>*> t3vec; - std::vector<Constraint<P4>*> t4vec; + MOCKPP_STL::vector<Constraint<P1>*> t1vec; + MOCKPP_STL::vector<Constraint<P2>*> t2vec; + MOCKPP_STL::vector<Constraint<P3>*> t3vec; + MOCKPP_STL::vector<Constraint<P4>*> t4vec; }; @@ -304,7 +304,7 @@ private: - std::vector<R> rvec; + MOCKPP_STL::vector<R> rvec; }; } // ns mockpp Index: VerifyingTestCase.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/VerifyingTestCase.h,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- VerifyingTestCase.h 6 Apr 2005 20:15:19 -0000 1.20 +++ VerifyingTestCase.h 26 Nov 2005 18:00:17 -0000 1.21 @@ -66,7 +66,7 @@ /** Constructs the test case. * @param name test case name */ - VerifyingTestCase( const std::string &name ); + VerifyingTestCase( const MOCKPP_STL::string &name ); /** Constructs the test case. */ @@ -96,7 +96,7 @@ VerifyingTestCase (const VerifyingTestCase &); // forbid VerifyingTestCase& operator=(VerifyingTestCase&); - std::vector<Verifiable*> registeredVerifiables; + MOCKPP_STL::vector<Verifiable*> registeredVerifiables; }; Index: VerifyingTestCase.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/VerifyingTestCase.cpp,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- VerifyingTestCase.cpp 28 Aug 2005 20:40:23 -0000 1.24 +++ VerifyingTestCase.cpp 26 Nov 2005 18:00:17 -0000 1.25 @@ -57,7 +57,7 @@ MOCKPP_EXPORT -VerifyingTestCase::VerifyingTestCase( const std::string &name) +VerifyingTestCase::VerifyingTestCase( const MOCKPP_STL::string &name) : CppUnit::TestCase(name) , MockObject(MOCKPP_PCHAR("VerifyingTestCase/")+MOCKPP_GET_STRING(name), 0) { Index: ChainableMockObject.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/ChainableMockObject.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- ChainableMockObject.cpp 13 Nov 2005 11:53:18 -0000 1.18 +++ ChainableMockObject.cpp 26 Nov 2005 18:00:16 -0000 1.19 @@ -30,7 +30,7 @@ #include <mockpp/mockpp.h> // always first -#include <algorithm> +#include MOCKPP_ALGORITHM_H #include <mockpp/ChainableMockObject.h> @@ -107,13 +107,13 @@ void MOCKPP_EXPORT ChainableMockObjectBase::addPendingRecorder(const String &id, InvokedRecorder::AP recorder) { - pendingRecorders.insert( std::make_pair(id, recorder.release()) ); + pendingRecorders.insert( MOCKPP_STL::make_pair(id, recorder.release()) ); } void MOCKPP_EXPORT ChainableMockObjectBase::storeID( const String &id, MatchBuilderAdapterBase *builder ) { - idTable.insert( std::make_pair(id, builder) ); + idTable.insert( MOCKPP_STL::make_pair(id, builder) ); PendingType::iterator it; while ( (it = pendingRecorders.find( id )) != pendingRecorders.end() ) Index: ChainableMockObject.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/ChainableMockObject.h,v retrieving revision 1.29 retrieving revision 1.30 diff -u -d -r1.29 -r1.30 --- ChainableMockObject.h 13 Nov 2005 11:53:18 -0000 1.29 +++ ChainableMockObject.h 26 Nov 2005 18:00:16 -0000 1.30 @@ -55,7 +55,7 @@ */ class ChainableMockObjectBase : public BuilderNamespace { - typedef std::map<String, MatchBuilderAdapterBase*> TableType; + typedef MOCKPP_STL::map<String, MatchBuilderAdapterBase*> TableType; typedef std::multimap<String, InvokedRecorder*> PendingType; public: @@ -133,7 +133,7 @@ ChainableMockObjectBase (const ChainableMockObjectBase &); // forbid ChainableMockObjectBase& operator=(ChainableMockObjectBase&); - std::vector<MatchBuilderAdapterBase*> allBuilders; + MOCKPP_STL::vector<MatchBuilderAdapterBase*> allBuilders; TableType idTable; mutable PendingType pendingRecorders; }; Index: MockObject.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/MockObject.h,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- MockObject.h 29 Oct 2005 21:00:26 -0000 1.22 +++ MockObject.h 26 Nov 2005 18:00:16 -0000 1.23 @@ -77,7 +77,7 @@ MockObject (const MockObject &); // forbid MockObject& operator=(MockObject&); - typedef std::vector<const Verifiable*> VerifierVec; + typedef MOCKPP_STL::vector<const Verifiable*> VerifierVec; /** * Verifies all the fields of type Verifiable in the given object, including Index: VisitableMockMethod.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/VisitableMockMethod.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- VisitableMockMethod.cpp 18 Nov 2005 10:20:00 -0000 1.6 +++ VisitableMockMethod.cpp 26 Nov 2005 18:00:17 -0000 1.7 @@ -56,7 +56,7 @@ } -std::string MOCKPP_EXPORT VisitableMockMethodBase::getMethodIdentifier() const +MOCKPP_STL::string MOCKPP_EXPORT VisitableMockMethodBase::getMethodIdentifier() const { return getLatin1(getMethodName()); } Index: VerifiableList.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/VerifiableList.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- VerifiableList.cpp 27 Feb 2005 11:48:14 -0000 1.18 +++ VerifiableList.cpp 26 Nov 2005 18:00:17 -0000 1.19 @@ -31,7 +31,7 @@ #include <mockpp/mockpp.h> // always first -#include <algorithm> +#include MOCKPP_ALGORITHM_H #include <mockpp/VerifiableList.h> #include <mockpp/compat/Assert.h> @@ -55,8 +55,8 @@ void MOCKPP_EXPORT VerifiableList::removeVerifiable (Verifiable* vf) { - std::vector<Verifiable*>::iterator it = - std::find (verifiables.begin(), verifiables.end(), vf); + MOCKPP_STL::vector<Verifiable*>::iterator it = + MOCKPP_STL::find (verifiables.begin(), verifiables.end(), vf); if(it != verifiables.end()) verifiables.erase(it); @@ -65,8 +65,8 @@ bool MOCKPP_EXPORT VerifiableList::hasVerifiable (Verifiable* vf) const { - std::vector<Verifiable*>::const_iterator it = - std::find(verifiables.begin(), verifiables.end(), vf); + MOCKPP_STL::vector<Verifiable*>::const_iterator it = + MOCKPP_STL::find(verifiables.begin(), verifiables.end(), vf); return it != verifiables.end(); } Index: VerifyingTestCaller.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/VerifyingTestCaller.h,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- VerifyingTestCaller.h 3 Apr 2005 18:32:45 -0000 1.9 +++ VerifyingTestCaller.h 26 Nov 2005 18:00:17 -0000 1.10 @@ -64,7 +64,7 @@ * \param test the method this VerifyingTestCaller calls in runTest() * \param fixture the Fixture to invoke the test method on. */ - VerifyingTestCaller(const std::string &name, + VerifyingTestCaller(const MOCKPP_STL::string &name, TestCaseMethod test, VerifyingFixtureType& fixture) : ::CppUnit::TestCaller<VerifyingFixtureType>(name, test, fixture) @@ -80,7 +80,7 @@ * \param test the method this VerifyingTestCaller calls in runTest() * \param fixture the Fixture to invoke the test method on. */ - VerifyingTestCaller(const std::string &name, + VerifyingTestCaller(const MOCKPP_STL::string &name, TestCaseMethod test, VerifyingFixtureType* fixture) : ::CppUnit::TestCaller<VerifyingFixtureType>(name, test, fixture) @@ -110,7 +110,7 @@ /** Returns the the callers string representation. */ - std::string toString() const + MOCKPP_STL::string toString() const { return "VerifyingTestCaller " + this->getName(); } Index: ThrowableList.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/ThrowableList.h,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- ThrowableList.h 13 Nov 2005 11:53:18 -0000 1.20 +++ ThrowableList.h 26 Nov 2005 18:00:17 -0000 1.21 @@ -32,7 +32,7 @@ #include <mockpp/mockpp.h> // always first -#include <deque> +#include MOCKPP_DEQUE_H #include <mockpp/Verifiable.h> #include <mockpp/Throwable.h> Index: ResponseVector5.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/ResponseVector5.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- ResponseVector5.h 13 Nov 2005 11:53:18 -0000 1.7 +++ ResponseVector5.h 26 Nov 2005 18:00:17 -0000 1.8 @@ -174,11 +174,11 @@ protected: - std::vector<Constraint<P1>*> t1vec; - std::vector<Constraint<P2>*> t2vec; - std::vector<Constraint<P3>*> t3vec; - std::vector<Constraint<P4>*> t4vec; - std::vector<Constraint<P5>*> t5vec; + MOCKPP_STL::vector<Constraint<P1>*> t1vec; + MOCKPP_STL::vector<Constraint<P2>*> t2vec; + MOCKPP_STL::vector<Constraint<P3>*> t3vec; + MOCKPP_STL::vector<Constraint<P4>*> t4vec; + MOCKPP_STL::vector<Constraint<P5>*> t5vec; }; @@ -325,7 +325,7 @@ private: - std::vector<R> rvec; + MOCKPP_STL::vector<R> rvec; }; } // ns mockpp Index: ExpectationList.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/ExpectationList.h,v retrieving revision 1.39 retrieving revision 1.40 diff -u -d -r1.39 -r1.40 --- ExpectationList.h 13 Nov 2005 11:53:18 -0000 1.39 +++ ExpectationList.h 26 Nov 2005 18:00:16 -0000 1.40 @@ -32,8 +32,8 @@ #include <mockpp/mockpp.h> // always first -#include <algorithm> -#include <vector> +#include MOCKPP_ALGORITHM_H +#include MOCKPP_VECTOR_H #include <mockpp/AbstractExpectationCollection.h> #include <mockpp/util/AssertMo.h> @@ -241,8 +241,8 @@ private: - std::vector<T> actualItems; - std::vector<T> expectedItems; + MOCKPP_STL::vector<T> actualItems; + MOCKPP_STL::vector<T> expectedItems; bool expectNothing; bool haveActualValue; }; Index: ResponseVector6.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/ResponseVector6.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- ResponseVector6.h 13 Nov 2005 11:53:18 -0000 1.5 +++ ResponseVector6.h 26 Nov 2005 18:00:17 -0000 1.6 @@ -186,12 +186,12 @@ protected: - std::vector<Constraint<P1>*> t1vec; - std::vector<Constraint<P2>*> t2vec; - std::vector<Constraint<P3>*> t3vec; - std::vector<Constraint<P4>*> t4vec; - std::vector<Constraint<P5>*> t5vec; - std::vector<Constraint<P6>*> t6vec; + MOCKPP_STL::vector<Constraint<P1>*> t1vec; + MOCKPP_STL::vector<Constraint<P2>*> t2vec; + MOCKPP_STL::vector<Constraint<P3>*> t3vec; + MOCKPP_STL::vector<Constraint<P4>*> t4vec; + MOCKPP_STL::vector<Constraint<P5>*> t5vec; + MOCKPP_STL::vector<Constraint<P6>*> t6vec; }; @@ -346,7 +346,7 @@ private: - std::vector<R> rvec; + MOCKPP_STL::vector<R> rvec; }; } // ns mockpp Index: ExpectationMap.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/ExpectationMap.h,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- ExpectationMap.h 13 Nov 2005 11:53:18 -0000 1.25 +++ ExpectationMap.h 26 Nov 2005 18:00:16 -0000 1.26 @@ -32,8 +32,8 @@ #include <mockpp/mockpp.h> // always first -#include <algorithm> -#include <map> +#include MOCKPP_ALGORITHM_H +#include MOCKPP_MAP_H #include <mockpp/ExpectationSet.h> @@ -64,7 +64,7 @@ * @param pair key/value pair * @return reference to itself for chaining */ - ExpectationMap& addExpected(const std::pair<const Key, const Value> &pair) + ExpectationMap& addExpected(const MOCKPP_STL::pair<const Key, const Value> &pair) { ExpectationSet<Key>::addExpected(pair.first); myEntries.insert(pair); @@ -94,7 +94,7 @@ ExpectationMap& addExpected(const Key &key, const Value &value) { ExpectationSet<Key>::addExpected(key); - myEntries.insert(std::make_pair(key, value)); + myEntries.insert(MOCKPP_STL::make_pair(key, value)); return *this; } @@ -134,7 +134,7 @@ private: - std::map<Key, Value> myEntries; + MOCKPP_STL::map<Key, Value> myEntries; }; Index: MockObject.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/MockObject.cpp,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- MockObject.cpp 27 Feb 2005 11:48:14 -0000 1.23 +++ MockObject.cpp 26 Nov 2005 18:00:16 -0000 1.24 @@ -30,7 +30,7 @@ #include <mockpp/mockpp.h> // always first -#include <algorithm> +#include MOCKPP_ALGORITHM_H #include <mockpp/MockObject.h> @@ -96,7 +96,7 @@ VerifierVec &alreadyProcessed) { if ( isVerifiable(anObject) - && std::find(alreadyProcessed.begin(), alreadyProcessed.end(), anObject) == alreadyProcessed.end()) + && MOCKPP_STL::find(alreadyProcessed.begin(), alreadyProcessed.end(), anObject) == alreadyProcessed.end()) { alreadyProcessed.push_back(anObject); anObject->verify(); Index: mockpp.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/mockpp.h,v retrieving revision 1.57 retrieving revision 1.58 diff -u -d -r1.57 -r1.58 --- mockpp.h 18 Nov 2005 08:49:34 -0000 1.57 +++ mockpp.h 26 Nov 2005 18:00:17 -0000 1.58 @@ -35,7 +35,7 @@ \section abstract Abstract mockpp is a platform independent generic unit testing framework for C++. It's goal is to facilitate - developing unit tests and integraton tests in the spirit of + developing unit tests and integraton tests in the spirit of <a href="http://www.mockobjects.com/">Mock Objects for Java</a>, <a href="http://www.easymock.org/">EasyMock</a> and <a href="http://www.jmock.org/">jMock</a>. @@ -152,7 +152,29 @@ //# define _GLIBCPP_HAVE_WCHAR_H #endif +#ifdef MOCKPP_MINI_STL + +#include <ministl/string> +#define MOCKPP_VECTOR_H <ministl/vector> +#define MOCKPP_MAP_H <ministl/map> +#define MOCKPP_SET_H <ministl/set> +#define MOCKPP_ALGORITHM_H <ministl/algorithm> +#define MOCKPP_FUNCTION_H <ministl/function> +#define MOCKPP_DEQUE_H <ministl/deque> +#define MOCKPP_STL ministl + +#else + #include <string> +#define MOCKPP_STL std +#define MOCKPP_VECTOR_H <vector> +#define MOCKPP_MAP_H <map> +#define MOCKPP_DEQUE_H <deque> +#define MOCKPP_SET_H <set> +#define MOCKPP_FUNCTION_H <function> +#define MOCKPP_ALGORITHM_H <algorithm> + +#endif #ifdef HAVE_LIMITS # include <limits> // current @@ -169,7 +191,7 @@ */ #ifdef HAVE_LIMITS -# define MOCKPP_UNLIMITED (std::numeric_limits<unsigned>::max()) +# define MOCKPP_UNLIMITED (MOCKPP_STL::numeric_limits<unsigned>::max()) #else # define MOCKPP_UNLIMITED (UINT_MAX) #endif @@ -178,7 +200,7 @@ # define MOCKPP_FUNC_MACRO __FUNC__ #elif defined(_MSC_VER) # if _MSC_VER <= 1200 -# define MOCKPP_FUNC_MACRO (std::string(__FILE__) + "_" + mockpp::getLatin1(mockpp::number((long unsigned)__LINE__))) // needs #include <mockpp/compat/Formatter.h> +# define MOCKPP_FUNC_MACRO (MOCKPP_STL::string(__FILE__) + "_" + mockpp::getLatin1(mockpp::number((long unsigned)__LINE__))) // needs #include <mockpp/compat/Formatter.h> # else # define MOCKPP_FUNC_MACRO __FUNCSIG__ # endif @@ -205,7 +227,7 @@ //! Output char values more readable (e.g. non-alphanumeric as number) #define MOCKPP_MAKE_CHAR_READABLE 1 -//! mockpp::Exception is derived from std::exception +//! mockpp::Exception is derived from MOCKPP_STL::exception #define MOCKPP_USE_STD_EXCEPTION 1 #undef HAVE_MULTITHREAD // obsolete and error prone @@ -295,7 +317,7 @@ #ifdef MOCKPP_UNICODE - typedef std::basic_string<wchar_t> String; + typedef MOCKPP_STL::basic_string<wchar_t> String; typedef wchar_t Char; //! make the charactor constant of type wchar_t # define MOCKPP_CHAR(x) L##x @@ -304,7 +326,7 @@ #else - typedef std::string String; + typedef MOCKPP_STL::string String; typedef char Char; //! make the charactor constant of type char # define MOCKPP_CHAR(x) x @@ -342,7 +364,7 @@ * @param info some human readable information */ void getVersion (int &major, int &minor, int &patch, - bool &debug, std::string &info); + bool &debug, MOCKPP_STL::string &info); #ifdef MOCKPP_UNICODE @@ -352,7 +374,7 @@ * @param latin1 string in ISO8859-1 encoding * @return the string in unicode */ - std::basic_string<wchar_t> getUnicode(const std::string &latin1); + MOCKPP_STL::basic_string<wchar_t> getUnicode(const MOCKPP_STL::string &latin1); /** Converts a string from unicode to unicode. @@ -360,7 +382,7 @@ * @param uni string in unicode * @return the same string */ - inline std::basic_string<wchar_t> getUnicode(const std::basic_string<wchar_t> &uni) + inline MOCKPP_STL::basic_string<wchar_t> getUnicode(const MOCKPP_STL::basic_string<wchar_t> &uni) { return uni; } @@ -371,7 +393,7 @@ * @param uni string in unicode * @return the string in IOS8859-1 encoding */ - std::string getLatin1(const std::basic_string<wchar_t> &uni); + MOCKPP_STL::string getLatin1(const MOCKPP_STL::basic_string<wchar_t> &uni); #endif @@ -380,7 +402,7 @@ * @param latin1 string in ISO8859-1 encoding * @return the same string */ - inline std::string getLatin1(const std::string &latin1) + inline MOCKPP_STL::string getLatin1(const MOCKPP_STL::string &latin1) { return latin1; } Index: VisitableMockMethod.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/VisitableMockMethod.h,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- VisitableMockMethod.h 18 Nov 2005 10:20:00 -0000 1.21 +++ VisitableMockMethod.h 26 Nov 2005 18:00:17 -0000 1.22 @@ -61,7 +61,7 @@ /** Gets the method identifier. * @return method identifier */ - std::string getMethodIdentifier() const; + MOCKPP_STL::string getMethodIdentifier() const; /** Gets the parent mock object. * @return pointer to mock object @@ -180,7 +180,7 @@ mutable ThrowableItem defaultThrowable; mutable ThrowableList throwables; mutable bool throwablesInline; - mutable std::vector<bool> throwableInsteadReturn; + mutable MOCKPP_STL::vector<bool> throwableInsteadReturn; }; Index: mockpp.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/mockpp.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- mockpp.cpp 2 Apr 2005 20:45:29 -0000 1.20 +++ mockpp.cpp 26 Nov 2005 18:00:16 -0000 1.21 @@ -35,15 +35,15 @@ void MOCKPP_EXPORT getVersion (int &major, int &minor, int &patch, - bool &debug, std::string &info) + bool &debug, MOCKPP_STL::string &info) { - std::string s = MOCKPP_VERSION; - std::string num; + MOCKPP_STL::string s = MOCKPP_VERSION; + MOCKPP_STL::string num; info = ""; unsigned pos = s.find('.'); bool good = true; - if (pos != std::string::npos) + if (pos != MOCKPP_STL::string::npos) { num = s.substr(0, pos); if (num.length() == 0) @@ -56,7 +56,7 @@ s.erase(0, pos+1); unsigned pos = s.find('.'); - if (pos != std::string::npos) + if (pos != MOCKPP_STL::string::npos) { num = s.substr(0, pos); if (num.length() == 0) @@ -100,9 +100,9 @@ #ifdef MOCKPP_UNICODE -std::basic_string<wchar_t> MOCKPP_EXPORT getUnicode(const std::string &latin1) +MOCKPP_STL::basic_string<wchar_t> MOCKPP_EXPORT getUnicode(const MOCKPP_STL::string &latin1) { - std::basic_string<wchar_t> ret; + MOCKPP_STL::basic_string<wchar_t> ret; for (unsigned i = 0; i < latin1.length(); ++i) ret += (wchar_t) latin1[i]; @@ -110,9 +110,9 @@ } -std::string MOCKPP_EXPORT getLatin1(const std::basic_string<wchar_t> &uni) +MOCKPP_STL::string MOCKPP_EXPORT getLatin1(const MOCKPP_STL::basic_string<wchar_t> &uni) { - std::string ret; + MOCKPP_STL::string ret; for (unsigned i = 0; i < uni.length(); ++i) ret += (mockpp::Char) uni[i]; Index: TrackingCounter.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/TrackingCounter.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- TrackingCounter.h 13 Nov 2005 11:53:18 -0000 1.6 +++ TrackingCounter.h 26 Nov 2005 18:00:17 -0000 1.7 @@ -35,7 +35,7 @@ #include <mockpp/AbstractExpectation.h> -#include <vector> +#include MOCKPP_VECTOR_H namespace mockpp { @@ -176,7 +176,7 @@ TrackingCounterMaster (const TrackingCounterMaster &); // forbid TrackingCounterMaster& operator=(TrackingCounterMaster&); - std::vector<TrackingCounterClient*> clients; + MOCKPP_STL::vector<TrackingCounterClient*> clients; unsigned myActualValue; }; @@ -247,7 +247,7 @@ TrackingCounterClient (const TrackingCounterClient &); // forbid TrackingCounterClient& operator=(TrackingCounterClient&); - std::vector<unsigned> countervalues; + MOCKPP_STL::vector<unsigned> countervalues; TrackingCounterMaster *master; unsigned myActualValue; }; Index: VisitableMockObject_template.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/VisitableMockObject_template.h,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- VisitableMockObject_template.h 27 Oct 2005 18:56:07 -0000 1.28 +++ VisitableMockObject_template.h 26 Nov 2005 18:00:17 -0000 1.29 @@ -65,8 +65,8 @@ // tvec.verify(); Not this one because it NEVER runs empty, use counter[] instead unsigned unused = 0; - std::vector<unsigned>::const_iterator start = counter.begin(); - std::vector<unsigned>::const_iterator end = counter.end(); + MOCKPP_STL::vector<unsigned>::const_iterator start = counter.begin(); + MOCKPP_STL::vector<unsigned>::const_iterator end = counter.end(); for ( ; start != end; ++start) if (*start != MOCKPP_UNLIMITED) // @todo ouput signatures of unused objects unused += *start; @@ -90,7 +90,7 @@ protected: ThrowableList tvec; - std::vector<unsigned> counter; + MOCKPP_STL::vector<unsigned> counter; }; Index: VisitableMockObject.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/VisitableMockObject.cpp,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- VisitableMockObject.cpp 13 Nov 2005 11:53:18 -0000 1.25 +++ VisitableMockObject.cpp 26 Nov 2005 18:00:17 -0000 1.26 @@ -48,14 +48,14 @@ } -void MOCKPP_EXPORT VisitableMockObjectBase::addExpectedMethod(const std::string &name) const +void MOCKPP_EXPORT VisitableMockObjectBase::addExpectedMethod(const MOCKPP_STL::string &name) const { MOCKPP_ASSERT_EQUALS(isActivated(), false); methodList.addExpected(name); } -void MOCKPP_EXPORT VisitableMockObjectBase::addActualMethod(const std::string &name) const +void MOCKPP_EXPORT VisitableMockObjectBase::addActualMethod(const MOCKPP_STL::string &name) const { MOCKPP_ASSERT_EQUALS(isActivated(), true); methodList.addActual(name); @@ -105,8 +105,8 @@ void MOCKPP_EXPORT VisitableMockObjectBase::removeController (Controller *ctr) { - std::vector<Controller*>::iterator it = - std::find (controllers.begin(), controllers.end(), ctr); + MOCKPP_STL::vector<Controller*>::iterator it = + MOCKPP_STL::find (controllers.begin(), controllers.end(), ctr); if (it != controllers.end()) controllers.erase(it); } Index: VisitableMockObject.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/VisitableMockObject.h,v retrieving revision 1.42 retrieving revision 1.43 diff -u -d -r1.42 -r1.43 --- VisitableMockObject.h 13 Nov 2005 11:53:18 -0000 1.42 +++ VisitableMockObject.h 26 Nov 2005 18:00:17 -0000 1.43 @@ -32,7 +32,7 @@ #include <mockpp/mockpp.h> // always first -#include <vector> +#include MOCKPP_VECTOR_H #include <mockpp/MockObject.h> #include <mockpp/Throwable.h> @@ -82,12 +82,12 @@ /** Adds another expected call to a mock method. * @param name unique identifier for method */ - void addExpectedMethod(const std::string &name) const; + void addExpectedMethod(const MOCKPP_STL::string &name) const; /** Adds another actual call to a mock method. * @param name unique identifier for method */ - void addActualMethod(const std::string &name) const; + void addActualMethod(const MOCKPP_STL::string &name) const; /** Get information about working mode. * @return false: object is in record mode @@ -126,9 +126,9 @@ VisitableMockObjectBase (const VisitableMockObjectBase &); // forbid VisitableMockObjectBase& operator=(VisitableMockObjectBase&); - mutable ExpectationList<std::string> methodList; + mutable ExpectationList<MOCKPP_STL::string> methodList; mutable bool activated; - std::vector<Controller*> controllers; + MOCKPP_STL::vector<Controller*> controllers; }; Index: ResponseVector1.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/ResponseVector1.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- ResponseVector1.h 13 Nov 2005 11:53:18 -0000 1.7 +++ ResponseVector1.h 26 Nov 2005 18:00:17 -0000 1.8 @@ -126,7 +126,7 @@ protected: - std::vector<Constraint<P1>*> t1vec; + MOCKPP_STL::vector<Constraint<P1>*> t1vec; }; @@ -241,7 +241,7 @@ private: - std::vector<R> rvec; + MOCKPP_STL::vector<R> rvec; }; } // ns mockpp Index: ReturnObjectList.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/ReturnObjectList.h,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- ReturnObjectList.h 13 Nov 2005 11:53:18 -0000 1.30 +++ ReturnObjectList.h 26 Nov 2005 18:00:17 -0000 1.31 @@ -32,7 +32,7 @@ #include <mockpp/mockpp.h> // always first -#include <deque> +#include MOCKPP_DEQUE_H #include <mockpp/Verifiable.h> Index: ExpectationConglomeration.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/ExpectationConglomeration.h,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- ExpectationConglomeration.h 13 Nov 2005 11:53:18 -0000 1.19 +++ ExpectationConglomeration.h 26 Nov 2005 18:00:16 -0000 1.20 @@ -32,9 +32,9 @@ #include <mockpp/mockpp.h> // always first -#include <algorithm> -#include <set> -#include <vector> +#include MOCKPP_ALGORITHM_H +#include MOCKPP_SET_H +#include MOCKPP_VECTOR_H #include <mockpp/AbstractExpectationCollection.h> #include <mockpp/util/AssertMo.h> @@ -178,7 +178,7 @@ fmt = mockpp_i18n(MOCKPP_PCHAR("%1 did not receive the expected item set.")); fmt << this->getVerifiableName(); - typename std::set<T>::const_iterator it; + typename MOCKPP_STL::set<T>::const_iterator it; for (it = actualItems.begin(); it != actualItems.end(); ++it) MOCKPP_ASSERT_TRUE_MESSAGE(fmt, contains(*it)); } @@ -207,10 +207,10 @@ */ bool contains(const T &val) const { - if (std::find(expectedSingleItems.begin(), expectedSingleItems.end(), val) != expectedSingleItems.end()) + if (MOCKPP_STL::find(expectedSingleItems.begin(), expectedSingleItems.end(), val) != expectedSingleItems.end()) return true; - typename std::vector<Boundary>::const_iterator it; + typename MOCKPP_STL::vector<Boundary>::const_iterator it; for (it = expectedBoundaryItems.begin(); it != expectedBoundaryItems.end(); ++it) if ( (*it).contains(val)) return true; @@ -272,9 +272,9 @@ T upper; }; - std::set<T> actualItems; - std::vector<T> expectedSingleItems; - std::vector<Boundary> expectedBoundaryItems; + MOCKPP_STL::set<T> actualItems; + MOCKPP_STL::vector<T> expectedSingleItems; + MOCKPP_STL::vector<Boundary> expectedBoundaryItems; bool expectNothing; bool haveActualValue; }; Index: VerifiableList.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/VerifiableList.h,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- VerifiableList.h 6 Apr 2005 20:15:19 -0000 1.17 +++ VerifiableList.h 26 Nov 2005 18:00:17 -0000 1.18 @@ -35,7 +35,7 @@ #include <mockpp/Verifiable.h> -#include <vector> +#include MOCKPP_VECTOR_H namespace mockpp { @@ -99,7 +99,7 @@ VerifiableList (const VerifiableList &); // forbid VerifiableList& operator=(VerifiableList&); - std::vector<Verifiable*> verifiables; + MOCKPP_STL::vector<Verifiable*> verifiables; }; |
|
From: Ewald A. <ewa...@us...> - 2005-11-26 18:00:27
|
Update of /cvsroot/mockpp/mockpp/mockpp/util In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21172/mockpp/util Modified Files: AssertMo.cpp AssertMo.h Log Message: prepare use of alternative stl Index: AssertMo.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/util/AssertMo.h,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- AssertMo.h 11 Oct 2005 18:40:40 -0000 1.23 +++ AssertMo.h 26 Nov 2005 18:00:17 -0000 1.24 @@ -52,8 +52,8 @@ */ void assertExcludes(unsigned srcline, const char* srcfile, const String &description, - const std::string &excludeString, - const std::string &targetString); + const MOCKPP_STL::string &excludeString, + const MOCKPP_STL::string &targetString); #ifdef MOCKPP_UNICODE @@ -68,8 +68,8 @@ */ void assertExcludes(unsigned srcline, const char* srcfile, const String &description, - const std::basic_string<wchar_t> &excludeString, - const std::basic_string<wchar_t> &targetString); + const MOCKPP_STL::basic_string<wchar_t> &excludeString, + const MOCKPP_STL::basic_string<wchar_t> &targetString); #endif @@ -84,8 +84,8 @@ */ void assertIncludes(unsigned srcline, const char* srcfile, const String &description, - const std::string &includeString, - const std::string &targetString); + const MOCKPP_STL::string &includeString, + const MOCKPP_STL::string &targetString); #ifdef MOCKPP_UNICODE @@ -100,8 +100,8 @@ */ void assertIncludes(unsigned srcline, const char* srcfile, const String &description, - const std::basic_string<wchar_t> &includeString, - const std::basic_string<wchar_t> &targetString); + const MOCKPP_STL::basic_string<wchar_t> &includeString, + const MOCKPP_STL::basic_string<wchar_t> &targetString); #endif @@ -116,8 +116,8 @@ */ void assertStartsWith(unsigned srcline, const char* srcfile, const String &description, - const std::string &startString, - const std::string &targetString); + const MOCKPP_STL::string &startString, + const MOCKPP_STL::string &targetString); #ifdef MOCKPP_UNICODE @@ -132,8 +132,8 @@ */ void assertStartsWith(unsigned srcline, const char* srcfile, const String &description, - const std::basic_string<wchar_t> &startString, - const std::basic_string<wchar_t> &targetString); + const MOCKPP_STL::basic_string<wchar_t> &startString, + const MOCKPP_STL::basic_string<wchar_t> &targetString); #endif @@ -241,8 +241,8 @@ * \code * MOCKPP_ASSERT_THROWING(object.call(), * "default response", - * std::string, - * std::string("throw default")); + * MOCKPP_STL::string, + * MOCKPP_STL::string("throw default")); * \endcode * @ingroup grp_helper * @param action C++-statement to execute and which is expected to throw @@ -274,8 +274,8 @@ * \code * MOCKPP_ASSERT_THROWING_COND(object.call(), * "default response", - * std::string, - * exception_object.find("throw default") != std::string::npos); + * MOCKPP_STL::string, + * exception_object.find("throw default") != MOCKPP_STL::string::npos); * \endcode * @ingroup grp_helper * @param action C++-statement to execute and throw Index: AssertMo.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/util/AssertMo.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- AssertMo.cpp 7 May 2005 12:45:09 -0000 1.19 +++ AssertMo.cpp 26 Nov 2005 18:00:17 -0000 1.20 @@ -43,8 +43,8 @@ void MOCKPP_EXPORT assertExcludes(unsigned srcline, const char* srcfile, const String &description, - const std::string &excludeString, - const std::string &targetString) + const MOCKPP_STL::string &excludeString, + const MOCKPP_STL::string &targetString) { assertTrue(srcline, srcfile, description, targetString.find(excludeString) == String::npos); } @@ -53,8 +53,8 @@ void MOCKPP_EXPORT assertExcludes(unsigned srcline, const char* srcfile, const String &description, - const std::basic_string<wchar_t> &excludeString, - const std::basic_string<wchar_t> &targetString) + const MOCKPP_STL::basic_string<wchar_t> &excludeString, + const MOCKPP_STL::basic_string<wchar_t> &targetString) { assertTrue(srcline, srcfile, description, targetString.find(excludeString) == String::npos); } @@ -63,8 +63,8 @@ void MOCKPP_EXPORT assertIncludes(unsigned srcline, const char* srcfile, const String &description, - const std::string &includeString, - const std::string &targetString) + const MOCKPP_STL::string &includeString, + const MOCKPP_STL::string &targetString) { assertTrue(srcline, srcfile, description, targetString.find(includeString) != String::npos); } @@ -73,8 +73,8 @@ void MOCKPP_EXPORT assertIncludes(unsigned srcline, const char* srcfile, const String &description, - const std::basic_string<wchar_t> &includeString, - const std::basic_string<wchar_t> &targetString) + const MOCKPP_STL::basic_string<wchar_t> &includeString, + const MOCKPP_STL::basic_string<wchar_t> &targetString) { assertTrue(srcline, srcfile, description, targetString.find(includeString) != String::npos); } @@ -83,8 +83,8 @@ void MOCKPP_EXPORT assertStartsWith(unsigned srcline, const char* srcfile, const String &description, - const std::string &startString, - const std::string &targetString) + const MOCKPP_STL::string &startString, + const MOCKPP_STL::string &targetString) { assertTrue(srcline, srcfile, description, targetString.find(startString) == 0); @@ -94,8 +94,8 @@ void MOCKPP_EXPORT assertStartsWith(unsigned srcline, const char* srcfile, const String &description, - const std::basic_string<wchar_t> &startString, - const std::basic_string<wchar_t> &targetString) + const MOCKPP_STL::basic_string<wchar_t> &startString, + const MOCKPP_STL::basic_string<wchar_t> &targetString) { assertTrue(srcline, srcfile, description, targetString.find(startString) == 0); } |
|
From: Ewald A. <ewa...@us...> - 2005-11-26 17:58:48
|
Update of /cvsroot/mockpp/mockpp/mockpp/examples/tutorial In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20828/mockpp/examples/tutorial Modified Files: basicmock.cpp chainmock.cpp chainmock2.cpp consumer.h interface.h poormock-se.cpp poormock.cpp visitmock.cpp visitmock2.cpp Log Message: prepare use of alternative stl Index: visitmock2.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/examples/tutorial/visitmock2.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- visitmock2.cpp 18 Nov 2005 10:23:27 -0000 1.1 +++ visitmock2.cpp 26 Nov 2005 17:58:40 -0000 1.2 @@ -39,17 +39,17 @@ , calculate_mocker(MOCKPP_PCHAR("calculate"), this) {} - void open(const std::string &filename) + void open(const MOCKPP_STL::string &filename) { open_mocker.forward(filename); } - std::string read() + MOCKPP_STL::string read() { return read_mocker.forward(); } - void write(const std::string &data) + void write(const MOCKPP_STL::string &data) { write_mocker.forward(data); } @@ -59,7 +59,7 @@ return calculate_mocker.forward(input); } - void write(const mockpp::ConstraintHolder<std::string> &ch) + void write(const mockpp::ConstraintHolder<MOCKPP_STL::string> &ch) { write_mocker.forward(ch); } @@ -74,9 +74,9 @@ close_mocker.forward(); } - mockpp::VisitableMockMethod<void, std::string> open_mocker; - mockpp::VisitableMockMethod<std::string> read_mocker; - mockpp::VisitableMockMethod<void, std::string> write_mocker; + mockpp::VisitableMockMethod<void, MOCKPP_STL::string> open_mocker; + mockpp::VisitableMockMethod<MOCKPP_STL::string> read_mocker; + mockpp::VisitableMockMethod<void, MOCKPP_STL::string> write_mocker; mockpp::VisitableMockMethod<void> close_mocker; mockpp::VisitableMockMethod<unsigned, unsigned> calculate_mocker; }; @@ -87,7 +87,7 @@ try { VisitMock mock; - mockpp::VisitableMockMethod<std::string> &read_controller (mock.read_mocker); + mockpp::VisitableMockMethod<MOCKPP_STL::string> &read_controller (mock.read_mocker); mockpp::VisitableMockMethod<unsigned, unsigned> &calculate_controller (mock.calculate_mocker); // record program flow while reading data @@ -122,8 +122,8 @@ // record program flow while writing data mock.open("file1.lst"); mock.write("record-1/processed"); - mock.write(stringContains(std::string("processed"))); - mock.write(stringContains(std::string("processed"))); + mock.write(stringContains(MOCKPP_STL::string("processed"))); + mock.write(stringContains(MOCKPP_STL::string("processed"))); mock.close(); // activate mock object Index: poormock-se.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/examples/tutorial/poormock-se.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- poormock-se.cpp 5 Apr 2005 18:44:05 -0000 1.5 +++ poormock-se.cpp 26 Nov 2005 17:58:40 -0000 1.6 @@ -40,18 +40,18 @@ { } - virtual void open(const std::string & /* name */) + virtual void open(const MOCKPP_STL::string & /* name */) { open_counter++; } - virtual std::string read() + virtual MOCKPP_STL::string read() { read_counter++; return "dummy"; } - virtual void write(const std::string & /* s */) + virtual void write(const MOCKPP_STL::string & /* s */) { write_counter++; } Index: visitmock.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/examples/tutorial/visitmock.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- visitmock.cpp 9 Oct 2005 13:51:54 -0000 1.14 +++ visitmock.cpp 26 Nov 2005 17:58:40 -0000 1.15 @@ -38,13 +38,13 @@ , MOCKPP_CONSTRUCT_MEMBERS_FOR_VOID_VISITABLE0(close) {} - MOCKPP_VOID_VISITABLE_EXT1(VisitMock, open, const std::string &, - ext, std::string); + MOCKPP_VOID_VISITABLE_EXT1(VisitMock, open, const MOCKPP_STL::string &, + ext, MOCKPP_STL::string); - MOCKPP_VISITABLE0(VisitMock, std::string, read); + MOCKPP_VISITABLE0(VisitMock, MOCKPP_STL::string, read); - MOCKPP_VOID_VISITABLE_EXT1(VisitMock, write, const std::string &, - ext, std::string); + MOCKPP_VOID_VISITABLE_EXT1(VisitMock, write, const MOCKPP_STL::string &, + ext, MOCKPP_STL::string); MOCKPP_VISITABLE_EXT1(VisitMock, unsigned, calculate, unsigned, unsigned, ext, unsigned); @@ -73,28 +73,28 @@ read_controller.addReturnValue("record-2"); read_controller.addReturnValue("record-3"); - // processing is not exactly defined + // processing is not exactly defined #if defined(_MSC_VER) && _MSC_VER <= 1300 - mock.calculate(new mockpp::IsCloseTo<unsigned>(5, 5)); - mock.calculate(new mockpp::IsCloseTo<unsigned>(5, 5)); - mock.calculate(new mockpp::IsCloseTo<unsigned>(5, 5)); - calculate_controller.addResponseValue(10, new mockpp::IsCloseTo<unsigned>(2, 2)); - calculate_controller.addResponseValue(20, new mockpp::IsCloseTo<unsigned>(4, 2)); - calculate_controller.addResponseValue(30, new mockpp::IsCloseTo<unsigned>(6, 2)); -#else - mock.calculate(eq<unsigned>(5, 5)); - mock.calculate(eq<unsigned>(5, 5)); + mock.calculate(new mockpp::IsCloseTo<unsigned>(5, 5)); + mock.calculate(new mockpp::IsCloseTo<unsigned>(5, 5)); + mock.calculate(new mockpp::IsCloseTo<unsigned>(5, 5)); + calculate_controller.addResponseValue(10, new mockpp::IsCloseTo<unsigned>(2, 2)); + calculate_controller.addResponseValue(20, new mockpp::IsCloseTo<unsigned>(4, 2)); + calculate_controller.addResponseValue(30, new mockpp::IsCloseTo<unsigned>(6, 2)); +#else mock.calculate(eq<unsigned>(5, 5)); - calculate_controller.addResponseValue(10, eq<unsigned>(2, 2)); - calculate_controller.addResponseValue(20, eq<unsigned>(4, 2)); - calculate_controller.addResponseValue(30, eq<unsigned>(6, 2)); -#endif + mock.calculate(eq<unsigned>(5, 5)); + mock.calculate(eq<unsigned>(5, 5)); + calculate_controller.addResponseValue(10, eq<unsigned>(2, 2)); + calculate_controller.addResponseValue(20, eq<unsigned>(4, 2)); + calculate_controller.addResponseValue(30, eq<unsigned>(6, 2)); +#endif // record program flow while writing data mock.open("file1.lst"); mock.write("record-1/processed"); - mock.write(stringContains(std::string("processed"))); - mock.write(stringContains(std::string("processed"))); + mock.write(stringContains(MOCKPP_STL::string("processed"))); + mock.write(stringContains(MOCKPP_STL::string("processed"))); mock.close(); // activate mock object Index: consumer.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/examples/tutorial/consumer.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- consumer.h 30 Apr 2005 15:06:05 -0000 1.4 +++ consumer.h 26 Nov 2005 17:58:40 -0000 1.5 @@ -40,8 +40,8 @@ private: Interface *configfile; - std::string config1; - std::string config2; - std::string config3; + MOCKPP_STL::string config1; + MOCKPP_STL::string config2; + MOCKPP_STL::string config3; }; Index: chainmock2.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/examples/tutorial/chainmock2.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- chainmock2.cpp 18 Nov 2005 10:31:30 -0000 1.1 +++ chainmock2.cpp 26 Nov 2005 17:58:40 -0000 1.2 @@ -39,17 +39,17 @@ , calculate_mocker(MOCKPP_PCHAR("calculate"), this) {} - void open(const std::string &filename) + void open(const MOCKPP_STL::string &filename) { open_mocker.forward(filename); } - std::string read() + MOCKPP_STL::string read() { return read_mocker.forward(); } - void write(const std::string &data) + void write(const MOCKPP_STL::string &data) { write_mocker.forward(data); } @@ -64,9 +64,9 @@ close_mocker.forward(); } - mockpp::ChainableMockMethod<void, std::string> open_mocker; - mockpp::ChainableMockMethod<std::string> read_mocker; - mockpp::ChainableMockMethod<void, std::string> write_mocker; + mockpp::ChainableMockMethod<void, MOCKPP_STL::string> open_mocker; + mockpp::ChainableMockMethod<MOCKPP_STL::string> read_mocker; + mockpp::ChainableMockMethod<void, MOCKPP_STL::string> write_mocker; mockpp::ChainableMockMethod<void> close_mocker; mockpp::ChainableMockMethod<unsigned, unsigned> calculate_mocker; }; @@ -78,21 +78,21 @@ { ChainMock mock; - mockpp::ChainableMockMethod<void, std::string> &open_chainer (mock.open_mocker); - mockpp::ChainableMockMethod<std::string> &read_chainer (mock.read_mocker); - mockpp::ChainableMockMethod<void, std::string> &write_chainer (mock.write_mocker); + mockpp::ChainableMockMethod<void, MOCKPP_STL::string> &open_chainer (mock.open_mocker); + mockpp::ChainableMockMethod<MOCKPP_STL::string> &read_chainer (mock.read_mocker); + mockpp::ChainableMockMethod<void, MOCKPP_STL::string> &write_chainer (mock.write_mocker); mockpp::ChainableMockMethod<void> &close_chainer (mock.close_mocker); mockpp::ChainableMockMethod<unsigned, unsigned> &calculate_chainer (mock.calculate_mocker); // Expectations for reading the file open_chainer.expects(once()) - .with(eq(std::string("file1.lst"))) + .with(eq(MOCKPP_STL::string("file1.lst"))) .before(MOCKPP_PCHAR("reader")); read_chainer.stubs() - .will(onConsecutiveCalls(new ReturnStub<std::string>("record-1"), - new ReturnStub<std::string>("record-2"), - new ReturnStub<std::string>("record-3"))) + .will(onConsecutiveCalls(new ReturnStub<MOCKPP_STL::string>("record-1"), + new ReturnStub<MOCKPP_STL::string>("record-2"), + new ReturnStub<MOCKPP_STL::string>("record-3"))) .id(MOCKPP_PCHAR("reader")); close_chainer.expects(once()) @@ -107,15 +107,15 @@ // Expectations for writing the file back open_chainer.expects(once()) - .with(eq(std::string("file1.lst"))) + .with(eq(MOCKPP_STL::string("file1.lst"))) .before(MOCKPP_PCHAR("writer")); write_chainer.expects(once()) - .with(eq(std::string("record-1/processed"))); + .with(eq(MOCKPP_STL::string("record-1/processed"))); write_chainer.expects(once()) - .with(eq(std::string("record-2/processed"))); + .with(eq(MOCKPP_STL::string("record-2/processed"))); write_chainer.expects(once()) - .with(stringContains(std::string("processed"))) + .with(stringContains(MOCKPP_STL::string("processed"))) .id(MOCKPP_PCHAR("writer")); close_chainer.expects(once()) Index: interface.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/examples/tutorial/interface.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- interface.h 5 Apr 2005 18:44:05 -0000 1.6 +++ interface.h 26 Nov 2005 17:58:40 -0000 1.7 @@ -50,17 +50,17 @@ /** Opens the file * @param name name of file to open */ - virtual void open(const std::string &name) = 0; + virtual void open(const MOCKPP_STL::string &name) = 0; /** Reads one record from the file * @return the record (one complete line) */ - virtual std::string read() = 0; + virtual MOCKPP_STL::string read() = 0; /** Writes a record to the file * @param s the record (one complete line) */ - virtual void write(const std::string &s) = 0; + virtual void write(const MOCKPP_STL::string &s) = 0; /** Does some calculating * @param input ingoing data Index: poormock.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/examples/tutorial/poormock.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- poormock.cpp 3 Apr 2005 18:32:53 -0000 1.8 +++ poormock.cpp 26 Nov 2005 17:58:40 -0000 1.9 @@ -14,10 +14,10 @@ #include "consumer.h" #include <iostream> - -#ifndef _MSC_VER -using std::exit; -#endif + +#ifndef _MSC_VER +using std::exit; +#endif /** Quick-n-dirty asserter. * If the condition fails the condition is printed @@ -46,18 +46,18 @@ close_counter = 0; } - virtual void open(const std::string & /* name */) + virtual void open(const MOCKPP_STL::string & /* name */) { open_counter = ++counter; } - virtual std::string read() + virtual MOCKPP_STL::string read() { read_counter = ++counter; return "dummy"; } - virtual void write(const std::string & /* s */) + virtual void write(const MOCKPP_STL::string & /* s */) { write_counter = ++counter; } Index: basicmock.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/examples/tutorial/basicmock.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- basicmock.cpp 5 Apr 2005 18:44:04 -0000 1.7 +++ basicmock.cpp 26 Nov 2005 17:58:40 -0000 1.8 @@ -46,17 +46,17 @@ { } - virtual void open(const std::string &name) + virtual void open(const MOCKPP_STL::string &name) { open_name.addActual(name); } - virtual std::string read() + virtual MOCKPP_STL::string read() { return read_data.nextReturnObject(); } - virtual void write(const std::string &s) + virtual void write(const MOCKPP_STL::string &s) { write_data.addActual(s); } @@ -72,10 +72,10 @@ close_counter.inc(); } - mockpp::ExpectationList<std::string> open_name; + mockpp::ExpectationList<MOCKPP_STL::string> open_name; mockpp::ExpectationCounter close_counter; - mockpp::ExpectationList<std::string> write_data; - mockpp::ReturnObjectList<std::string> read_data; + mockpp::ExpectationList<MOCKPP_STL::string> write_data; + mockpp::ReturnObjectList<MOCKPP_STL::string> read_data; mockpp::ReturnObjectList<unsigned> calculate_output; mockpp::ConstraintList<unsigned > calculate_input; }; Index: chainmock.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/examples/tutorial/chainmock.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- chainmock.cpp 6 Apr 2005 19:25:56 -0000 1.10 +++ chainmock.cpp 26 Nov 2005 17:58:40 -0000 1.11 @@ -23,10 +23,10 @@ #include <iostream> using namespace mockpp; - - -typedef mockpp::Invocation1<std::string> InvocationString; -typedef mockpp::Invocation1<unsigned> InvocationUInt; + + +typedef mockpp::Invocation1<MOCKPP_STL::string> InvocationString; +typedef mockpp::Invocation1<unsigned> InvocationUInt; MOCKPP_PTI_IMPLEMENT(mockpp::Invocation0); MOCKPP_PTI_IMPLEMENT(InvocationString); @@ -47,13 +47,13 @@ , MOCKPP_CONSTRUCT_MEMBERS_FOR_VOID_CHAINABLE0(close) {} - MOCKPP_VOID_CHAINABLE_EXT1(ChainMock, open, const std::string &, - ext, std::string); + MOCKPP_VOID_CHAINABLE_EXT1(ChainMock, open, const MOCKPP_STL::string &, + ext, MOCKPP_STL::string); - MOCKPP_CHAINABLE0(ChainMock, std::string, read); + MOCKPP_CHAINABLE0(ChainMock, MOCKPP_STL::string, read); - MOCKPP_VOID_CHAINABLE_EXT1(ChainMock, write, const std::string &, - ext, std::string); + MOCKPP_VOID_CHAINABLE_EXT1(ChainMock, write, const MOCKPP_STL::string &, + ext, MOCKPP_STL::string); MOCKPP_CHAINABLE_EXT1(ChainMock, unsigned, calculate, unsigned, unsigned, ext, unsigned); @@ -75,13 +75,13 @@ // Expectations for reading the file open_chainer.expects(once()) - .with(eq(std::string("file1.lst"))) + .with(eq(MOCKPP_STL::string("file1.lst"))) .before(MOCKPP_PCHAR("reader")); read_chainer.stubs() - .will(onConsecutiveCalls(new ReturnStub<std::string>("record-1"), - new ReturnStub<std::string>("record-2"), - new ReturnStub<std::string>("record-3"))) + .will(onConsecutiveCalls(new ReturnStub<MOCKPP_STL::string>("record-1"), + new ReturnStub<MOCKPP_STL::string>("record-2"), + new ReturnStub<MOCKPP_STL::string>("record-3"))) .id(MOCKPP_PCHAR("reader")); close_chainer.expects(once()) @@ -96,15 +96,15 @@ // Expectations for writing the file back open_chainer.expects(once()) - .with(eq(std::string("file1.lst"))) + .with(eq(MOCKPP_STL::string("file1.lst"))) .before(MOCKPP_PCHAR("writer")); write_chainer.expects(once()) - .with(eq(std::string("record-1/processed"))); + .with(eq(MOCKPP_STL::string("record-1/processed"))); write_chainer.expects(once()) - .with(eq(std::string("record-2/processed"))); + .with(eq(MOCKPP_STL::string("record-2/processed"))); write_chainer.expects(once()) - .with(stringContains(std::string("processed"))) + .with(stringContains(MOCKPP_STL::string("processed"))) .id(MOCKPP_PCHAR("writer")); close_chainer.expects(once()) |
Update of /cvsroot/mockpp/mockpp/mockpp/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20655/mockpp/tests Modified Files: AssertMo_test.cpp Assert_test.cpp ChainableMockObject_1_test.cpp ChainableMockObject_1_void_test.cpp ChainableMockObject_2_test.cpp ChainableMockObject_2_void_test.cpp ChainableMockObject_3_test.cpp ChainableMockObject_3_void_test.cpp ChainableMockObject_4_test.cpp ChainableMockObject_4_void_test.cpp ChainingMockBuilder_test.cpp ChainingMockObjectSupport_test.cpp Exception_test.cpp ExpectationMap_test.cpp Invocation_test.cpp IsEqual_test.cpp IsInstanceOf_test.cpp IsSame_test.cpp MatchBuilder_test.cpp MixedMockObject_5_test.cpp MyBuilderNamespace.h StringContains_test.cpp StringEndsWith_test.cpp StringStartsWith_test.cpp StubSequence_test.cpp ThrowStub_test.cpp ThrowableList_test.cpp Throwable_test.cpp TrackingCounter_test.cpp TypelessStubSequence_test.cpp VerifyingTestCaller_test.cpp VisitableMockObject_1_test.cpp VisitableMockObject_1_void_test.cpp VisitableMockObject_2_test.cpp VisitableMockObject_2_void_test.cpp VisitableMockObject_3_test.cpp VisitableMockObject_3_void_test.cpp VisitableMockObject_4_test.cpp VisitableMockObject_4_void_test.cpp VisitableMockObject_5_test.cpp VisitableMockObject_5_void_test.cpp VisitableMockObject_test.cpp VisitableMockObject_void_test.cpp mockpp_test.cpp readability_test.cpp Log Message: prepare use of alternative stl Index: readability_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/readability_test.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- readability_test.cpp 19 Oct 2005 19:42:19 -0000 1.3 +++ readability_test.cpp 26 Nov 2005 17:57:49 -0000 1.4 @@ -57,10 +57,10 @@ , void_visiter(this) {} - MOCKPP_CHAINABLE5(MyMixedMockObject, int, chain, CA, CB, std::string, char, bool); - MOCKPP_VISITABLE5(MyMixedMockObject, int, visit, CA, CB, std::string, char, bool); - MOCKPP_VOID_CHAINABLE5(MyMixedMockObject, void_chain, CA, CB, std::string, char, bool); - MOCKPP_VOID_VISITABLE5(MyMixedMockObject, void_visit, CA, CB, std::string, char, bool); + MOCKPP_CHAINABLE5(MyMixedMockObject, int, chain, CA, CB, MOCKPP_STL::string, char, bool); + MOCKPP_VISITABLE5(MyMixedMockObject, int, visit, CA, CB, MOCKPP_STL::string, char, bool); + MOCKPP_VOID_CHAINABLE5(MyMixedMockObject, void_chain, CA, CB, MOCKPP_STL::string, char, bool); + MOCKPP_VOID_VISITABLE5(MyMixedMockObject, void_visit, CA, CB, MOCKPP_STL::string, char, bool); MOCKPP_CHAINER_FOR(MyMixedMockObject, chain) chainer; MOCKPP_CHAINER_FOR(MyMixedMockObject, void_chain) void_chainer; @@ -75,7 +75,7 @@ mmo.chainer.expects(exactly(3)) .with(eq(CA()), eq(CB(3)), - stringContains(std::string("string")), + stringContains(MOCKPP_STL::string("string")), eq<char>(123, 45), eq(true)) .will(returnValue(321)); @@ -83,7 +83,7 @@ mmo.chainer.expects(atLeast(3)) .with(eq(CA(5)), eq(CB()), - stringContains(std::string("no-string")), + stringContains(MOCKPP_STL::string("no-string")), eq<char>(0x23), eq(false)) .will(returnValue(123)); @@ -135,11 +135,11 @@ void constraintlist_1() { - mockpp::ConstraintList<std::string> list(MOCKPP_PCHAR("ConstraintListInstance")); - list.addExpected(eq(std::string("string"))); + mockpp::ConstraintList<MOCKPP_STL::string> list(MOCKPP_PCHAR("ConstraintListInstance")); + list.addExpected(eq(MOCKPP_STL::string("string"))); try { - list.addActual(std::string("no-string")); + list.addActual(MOCKPP_STL::string("no-string")); } catch(std::exception &ex) { @@ -150,11 +150,11 @@ void expectationlist_1() { - mockpp::ExpectationList<std::string> list(MOCKPP_PCHAR("ExpectationListInstance")); - list.addExpected(std::string("string")); + mockpp::ExpectationList<MOCKPP_STL::string> list(MOCKPP_PCHAR("ExpectationListInstance")); + list.addExpected(MOCKPP_STL::string("string")); try { - list.addActual(std::string("no-string")); + list.addActual(MOCKPP_STL::string("no-string")); } catch(std::exception &ex) { @@ -165,12 +165,12 @@ void expectationlist_2() { - mockpp::ExpectationList<std::string> list(MOCKPP_PCHAR("ExpectationListInstance") ); - list.addExpected(std::string("string")); - list.addActual(std::string("string")); + mockpp::ExpectationList<MOCKPP_STL::string> list(MOCKPP_PCHAR("ExpectationListInstance") ); + list.addExpected(MOCKPP_STL::string("string")); + list.addActual(MOCKPP_STL::string("string")); try { - list.addActual(std::string("no-string")); + list.addActual(MOCKPP_STL::string("no-string")); } catch(std::exception &ex) { Index: ChainableMockObject_4_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_4_test.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- ChainableMockObject_4_test.cpp 18 Oct 2005 20:03:54 -0000 1.9 +++ ChainableMockObject_4_test.cpp 26 Nov 2005 17:57:48 -0000 1.10 @@ -92,8 +92,8 @@ , MOCKPP_CONSTRUCT_MEMBERS_FOR_CHAINABLE_EXT4(outbound, Ext) {} - MOCKPP_CHAINABLE_EXT4(MyChainableMockObject_4ex, std::string, chainable4, const std::string &, const std::string &, const std::string &, const std::string &, - std::string, Ext, std::string, std::string, std::string, std::string); + MOCKPP_CHAINABLE_EXT4(MyChainableMockObject_4ex, MOCKPP_STL::string, chainable4, const MOCKPP_STL::string &, const MOCKPP_STL::string &, const MOCKPP_STL::string &, const MOCKPP_STL::string &, + MOCKPP_STL::string, Ext, MOCKPP_STL::string, MOCKPP_STL::string, MOCKPP_STL::string, MOCKPP_STL::string); MOCKPP_CHAINABLE_EXT4(MyChainableMockObject_4ex, int, outbound, unsigned &, unsigned &, unsigned &, unsigned &, int, Ext, unsigned, unsigned, unsigned, unsigned); Index: IsInstanceOf_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/IsInstanceOf_test.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- IsInstanceOf_test.cpp 15 Oct 2005 15:40:59 -0000 1.12 +++ IsInstanceOf_test.cpp 26 Nov 2005 17:57:48 -0000 1.13 @@ -89,7 +89,7 @@ virtual ~C() {} - std::string b; + MOCKPP_STL::string b; }; Index: TrackingCounter_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/TrackingCounter_test.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- TrackingCounter_test.cpp 13 Nov 2005 11:53:18 -0000 1.7 +++ TrackingCounter_test.cpp 26 Nov 2005 17:57:48 -0000 1.8 @@ -340,13 +340,13 @@ MOCKPP_ASSERT_THROWING_COND(ec.verify(), MOCKPP_PCHAR("test_client_verify()"), mockpp::AssertionFailedError, - exception_object.getMessage().find(MOCKPP_PCHAR("tagged with 1 which is less ")) != std::string::npos); + exception_object.getMessage().find(MOCKPP_PCHAR("tagged with 1 which is less ")) != MOCKPP_STL::string::npos); ec.inc(); ec.inc(); MOCKPP_ASSERT_THROWING_COND(ec.verify(), MOCKPP_PCHAR("test_client_verify()"), mockpp::AssertionFailedError, - exception_object.getMessage().find(MOCKPP_PCHAR("tagged with 3 which is more")) != std::string::npos); + exception_object.getMessage().find(MOCKPP_PCHAR("tagged with 3 which is more")) != MOCKPP_STL::string::npos); } @@ -371,13 +371,13 @@ MOCKPP_ASSERT_THROWING_COND(master.verify(), MOCKPP_PCHAR("test_master_verify()"), mockpp::AssertionFailedError, - exception_object.getMessage().find(MOCKPP_PCHAR("tagged 1 times which is less ")) != std::string::npos); + exception_object.getMessage().find(MOCKPP_PCHAR("tagged 1 times which is less ")) != MOCKPP_STL::string::npos); ec.inc(); ec.inc(); MOCKPP_ASSERT_THROWING_COND(master.verify(), MOCKPP_PCHAR("test_master_verify()"), mockpp::AssertionFailedError, - exception_object.getMessage().find(MOCKPP_PCHAR("tagged 3 times which is more")) != std::string::npos); + exception_object.getMessage().find(MOCKPP_PCHAR("tagged 3 times which is more")) != MOCKPP_STL::string::npos); } Index: IsEqual_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/IsEqual_test.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- IsEqual_test.cpp 15 Oct 2005 15:40:59 -0000 1.7 +++ IsEqual_test.cpp 26 Nov 2005 17:57:48 -0000 1.8 @@ -73,7 +73,7 @@ void IsEqual_test::test_invoke() { - mockpp::IsEqual<std::string> myequal ("string"); + mockpp::IsEqual<MOCKPP_STL::string> myequal ("string"); MOCKPP_ASSERT_TRUE(myequal.eval("string") == true); MOCKPP_ASSERT_TRUE(myequal.eval("not-string") == false); } Index: ThrowableList_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ThrowableList_test.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- ThrowableList_test.cpp 13 Nov 2005 11:53:18 -0000 1.14 +++ ThrowableList_test.cpp 26 Nov 2005 17:57:48 -0000 1.15 @@ -71,15 +71,15 @@ void ThrowableList_test::test_throw() { mockpp::ThrowableList tl(MOCKPP_PCHAR("tl"), 0); - tl.push_back(mockpp::make_throwable(std::string("my-item 1"))); - tl.addObjectToThrow(std::string("my-item 2")); + tl.push_back(mockpp::make_throwable(MOCKPP_STL::string("my-item 1"))); + tl.addObjectToThrow(MOCKPP_STL::string("my-item 2")); try { tl.nextThrowableObject()->throw_me(); MOCKPP_FAIL(MOCKPP_PCHAR("Did not throw the exception")); } - catch(std::string &s) + catch(MOCKPP_STL::string &s) { MOCKPP_ASSERT_TRUE(s == "my-item 1"); } @@ -93,7 +93,7 @@ tl.nextThrowableObject()->throw_me(); MOCKPP_FAIL(MOCKPP_PCHAR("Did not throw the exception")); } - catch(std::string &s) + catch(MOCKPP_STL::string &s) { MOCKPP_ASSERT_TRUE(s == "my-item 2"); } @@ -110,10 +110,10 @@ { mockpp::ThrowableList tl(MOCKPP_PCHAR("tl"), 0); - mockpp::Throwable *tt1 = mockpp::make_throwable(std::string("my-item 1")); - mockpp::Throwable *tt2 = mockpp::make_throwable(std::string("my-item 2")); - mockpp::Throwable *tt3 = mockpp::make_throwable(std::string("my-item 3")); - mockpp::Throwable *tt4 = mockpp::make_throwable(std::string("my-item 4")); + mockpp::Throwable *tt1 = mockpp::make_throwable(MOCKPP_STL::string("my-item 1")); + mockpp::Throwable *tt2 = mockpp::make_throwable(MOCKPP_STL::string("my-item 2")); + mockpp::Throwable *tt3 = mockpp::make_throwable(MOCKPP_STL::string("my-item 3")); + mockpp::Throwable *tt4 = mockpp::make_throwable(MOCKPP_STL::string("my-item 4")); tl.push_back(tt1); tl.push_back(tt2); tl.addObjectToThrow(tt3); @@ -129,10 +129,10 @@ { mockpp::ThrowableList tl(MOCKPP_PCHAR("tl"), 0); - mockpp::Throwable *tt1 = mockpp::make_throwable(std::string("my-item 1")); - mockpp::Throwable *tt2 = mockpp::make_throwable(std::string("my-item 2")); - mockpp::Throwable *tt3 = mockpp::make_throwable(std::string("my-item 3")); - mockpp::Throwable *tt4 = mockpp::make_throwable(std::string("my-item 4")); + mockpp::Throwable *tt1 = mockpp::make_throwable(MOCKPP_STL::string("my-item 1")); + mockpp::Throwable *tt2 = mockpp::make_throwable(MOCKPP_STL::string("my-item 2")); + mockpp::Throwable *tt3 = mockpp::make_throwable(MOCKPP_STL::string("my-item 3")); + mockpp::Throwable *tt4 = mockpp::make_throwable(MOCKPP_STL::string("my-item 4")); tl.push_back(tt1); tl.push_back(tt2); @@ -168,12 +168,12 @@ { mockpp::ThrowableList tl(MOCKPP_PCHAR("tl"), 0); - mockpp::Throwable *tt1 = mockpp::make_throwable(std::string("my-item 1")); + mockpp::Throwable *tt1 = mockpp::make_throwable(MOCKPP_STL::string("my-item 1")); tl.push_back(tt1); MOCKPP_ASSERT_TRUE(tl.hasMoreObjects() == true); - tl.push_back(mockpp::make_throwable(std::string("my-item 2"))); - tl.addObjectToThrow(std::string("my-item 3")); - tl.addObjectToThrow(std::string("my-item 4")); + tl.push_back(mockpp::make_throwable(MOCKPP_STL::string("my-item 2"))); + tl.addObjectToThrow(MOCKPP_STL::string("my-item 3")); + tl.addObjectToThrow(MOCKPP_STL::string("my-item 4")); MOCKPP_ASSERT_TRUE(tl.hasMoreObjects() == true); Index: VisitableMockObject_5_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_5_void_test.cpp,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- VisitableMockObject_5_void_test.cpp 15 Oct 2005 15:40:59 -0000 1.23 +++ VisitableMockObject_5_void_test.cpp 26 Nov 2005 17:57:49 -0000 1.24 @@ -221,20 +221,20 @@ virtual ~MyVisitableMockObject_5_void_ex_Interface() {} - virtual void visitable5 (const std::string &, const std::string &, const std::string &, const std::string &, long) = 0; - virtual void visitable5 (const std::string &, const std::string &, const std::string &, const std::string &, const std::string &) = 0; - virtual void visitable4 (const std::string &, const std::string &, const std::string &, const std::string &) = 0; - virtual void visitable3 (const std::string &, const std::string &, const std::string &) = 0; - virtual void visitable2 (const std::string &, const std::string &) = 0; - virtual void visitable1 (const std::string &) = 0; + virtual void visitable5 (const MOCKPP_STL::string &, const MOCKPP_STL::string &, const MOCKPP_STL::string &, const MOCKPP_STL::string &, long) = 0; + virtual void visitable5 (const MOCKPP_STL::string &, const MOCKPP_STL::string &, const MOCKPP_STL::string &, const MOCKPP_STL::string &, const MOCKPP_STL::string &) = 0; + virtual void visitable4 (const MOCKPP_STL::string &, const MOCKPP_STL::string &, const MOCKPP_STL::string &, const MOCKPP_STL::string &) = 0; + virtual void visitable3 (const MOCKPP_STL::string &, const MOCKPP_STL::string &, const MOCKPP_STL::string &) = 0; + virtual void visitable2 (const MOCKPP_STL::string &, const MOCKPP_STL::string &) = 0; + virtual void visitable1 (const MOCKPP_STL::string &) = 0; virtual void visitable0 () = 0; - virtual void const_visitable5 (const std::string &, const std::string &, const std::string &, const std::string &, long) const = 0; - virtual void const_visitable5 (const std::string &, const std::string &, const std::string &, const std::string &, const std::string &) const = 0; - virtual void const_visitable4 (const std::string &, const std::string &, const std::string &, const std::string &) const = 0; - virtual void const_visitable3 (const std::string &, const std::string &, const std::string &) const = 0; - virtual void const_visitable2 (const std::string &, const std::string &) const = 0; - virtual void const_visitable1 (const std::string &) const = 0; + virtual void const_visitable5 (const MOCKPP_STL::string &, const MOCKPP_STL::string &, const MOCKPP_STL::string &, const MOCKPP_STL::string &, long) const = 0; + virtual void const_visitable5 (const MOCKPP_STL::string &, const MOCKPP_STL::string &, const MOCKPP_STL::string &, const MOCKPP_STL::string &, const MOCKPP_STL::string &) const = 0; + virtual void const_visitable4 (const MOCKPP_STL::string &, const MOCKPP_STL::string &, const MOCKPP_STL::string &, const MOCKPP_STL::string &) const = 0; + virtual void const_visitable3 (const MOCKPP_STL::string &, const MOCKPP_STL::string &, const MOCKPP_STL::string &) const = 0; + virtual void const_visitable2 (const MOCKPP_STL::string &, const MOCKPP_STL::string &) const = 0; + virtual void const_visitable1 (const MOCKPP_STL::string &) const = 0; virtual void const_visitable0 () const = 0; virtual void abc_visitable5 (const CA&, const CB&, const CC&, const CD&, CE) = 0; @@ -329,45 +329,45 @@ , MOCKPP_CONSTRUCT_MEMBERS_FOR_VOID_VISITABLE_EXT5(outbound, Ext) {} - MOCKPP_VOID_VISITABLE_EXT5(MyVisitableMockObject_5_void_ex, visitable5, const std::string &, const std::string &, const std::string &, const std::string &, const std::string &, - Ext1, std::string, std::string, std::string, std::string, std::string); + MOCKPP_VOID_VISITABLE_EXT5(MyVisitableMockObject_5_void_ex, visitable5, const MOCKPP_STL::string &, const MOCKPP_STL::string &, const MOCKPP_STL::string &, const MOCKPP_STL::string &, const MOCKPP_STL::string &, + Ext1, MOCKPP_STL::string, MOCKPP_STL::string, MOCKPP_STL::string, MOCKPP_STL::string, MOCKPP_STL::string); - MOCKPP_VOID_VISITABLE_EXT5(MyVisitableMockObject_5_void_ex, visitable5, const std::string &, const std::string &, const std::string &, const std::string &, long, - Ext2, std::string, std::string, std::string, std::string, long); + MOCKPP_VOID_VISITABLE_EXT5(MyVisitableMockObject_5_void_ex, visitable5, const MOCKPP_STL::string &, const MOCKPP_STL::string &, const MOCKPP_STL::string &, const MOCKPP_STL::string &, long, + Ext2, MOCKPP_STL::string, MOCKPP_STL::string, MOCKPP_STL::string, MOCKPP_STL::string, long); - MOCKPP_VOID_VISITABLE_EXT4(MyVisitableMockObject_5_void_ex, visitable4, const std::string &, const std::string &, const std::string &, const std::string &, - Ext, std::string, std::string, std::string, std::string); + MOCKPP_VOID_VISITABLE_EXT4(MyVisitableMockObject_5_void_ex, visitable4, const MOCKPP_STL::string &, const MOCKPP_STL::string &, const MOCKPP_STL::string &, const MOCKPP_STL::string &, + Ext, MOCKPP_STL::string, MOCKPP_STL::string, MOCKPP_STL::string, MOCKPP_STL::string); - MOCKPP_VOID_VISITABLE_EXT3(MyVisitableMockObject_5_void_ex, visitable3, const std::string &, const std::string &, const std::string &, - Ext, std::string, std::string, std::string); + MOCKPP_VOID_VISITABLE_EXT3(MyVisitableMockObject_5_void_ex, visitable3, const MOCKPP_STL::string &, const MOCKPP_STL::string &, const MOCKPP_STL::string &, + Ext, MOCKPP_STL::string, MOCKPP_STL::string, MOCKPP_STL::string); - MOCKPP_VOID_VISITABLE_EXT2(MyVisitableMockObject_5_void_ex, visitable2, const std::string &, const std::string &, - Ext, std::string, std::string); + MOCKPP_VOID_VISITABLE_EXT2(MyVisitableMockObject_5_void_ex, visitable2, const MOCKPP_STL::string &, const MOCKPP_STL::string &, + Ext, MOCKPP_STL::string, MOCKPP_STL::string); - MOCKPP_VOID_VISITABLE_EXT1(MyVisitableMockObject_5_void_ex, visitable1, const std::string &, - Ext, std::string); + MOCKPP_VOID_VISITABLE_EXT1(MyVisitableMockObject_5_void_ex, visitable1, const MOCKPP_STL::string &, + Ext, MOCKPP_STL::string); MOCKPP_VOID_VISITABLE_EXT0(MyVisitableMockObject_5_void_ex, visitable0, Ext); - MOCKPP_VOID_CONST_VISITABLE_EXT5(MyVisitableMockObject_5_void_ex, const_visitable5, const std::string &, const std::string &, const std::string &, const std::string &, const std::string &, - Ext1, std::string, std::string, std::string, std::string, std::string); + MOCKPP_VOID_CONST_VISITABLE_EXT5(MyVisitableMockObject_5_void_ex, const_visitable5, const MOCKPP_STL::string &, const MOCKPP_STL::string &, const MOCKPP_STL::string &, const MOCKPP_STL::string &, const MOCKPP_STL::string &, + Ext1, MOCKPP_STL::string, MOCKPP_STL::string, MOCKPP_STL::string, MOCKPP_STL::string, MOCKPP_STL::string); - MOCKPP_VOID_CONST_VISITABLE_EXT5(MyVisitableMockObject_5_void_ex, const_visitable5, const std::string &, const std::string &, const std::string &, const std::string &, long, - Ext2, std::string, std::string, std::string, std::string, long); + MOCKPP_VOID_CONST_VISITABLE_EXT5(MyVisitableMockObject_5_void_ex, const_visitable5, const MOCKPP_STL::string &, const MOCKPP_STL::string &, const MOCKPP_STL::string &, const MOCKPP_STL::string &, long, + Ext2, MOCKPP_STL::string, MOCKPP_STL::string, MOCKPP_STL::string, MOCKPP_STL::string, long); - MOCKPP_VOID_CONST_VISITABLE_EXT4(MyVisitableMockObject_5_void_ex, const_visitable4, const std::string &, const std::string &, const std::string &, const std::string &, - Ext, std::string, std::string, std::string, std::string); + MOCKPP_VOID_CONST_VISITABLE_EXT4(MyVisitableMockObject_5_void_ex, const_visitable4, const MOCKPP_STL::string &, const MOCKPP_STL::string &, const MOCKPP_STL::string &, const MOCKPP_STL::string &, + Ext, MOCKPP_STL::string, MOCKPP_STL::string, MOCKPP_STL::string, MOCKPP_STL::string); - MOCKPP_VOID_CONST_VISITABLE_EXT3(MyVisitableMockObject_5_void_ex, const_visitable3, const std::string &, const std::string &, const std::string &, - Ext, std::string, std::string, std::string); + MOCKPP_VOID_CONST_VISITABLE_EXT3(MyVisitableMockObject_5_void_ex, const_visitable3, const MOCKPP_STL::string &, const MOCKPP_STL::string &, const MOCKPP_STL::string &, + Ext, MOCKPP_STL::string, MOCKPP_STL::string, MOCKPP_STL::string); - MOCKPP_VOID_CONST_VISITABLE_EXT2(MyVisitableMockObject_5_void_ex, const_visitable2, const std::string &, const std::string &, - Ext, std::string, std::string); + MOCKPP_VOID_CONST_VISITABLE_EXT2(MyVisitableMockObject_5_void_ex, const_visitable2, const MOCKPP_STL::string &, const MOCKPP_STL::string &, + Ext, MOCKPP_STL::string, MOCKPP_STL::string); - MOCKPP_VOID_CONST_VISITABLE_EXT1(MyVisitableMockObject_5_void_ex, const_visitable1, const std::string &, - Ext, std::string); + MOCKPP_VOID_CONST_VISITABLE_EXT1(MyVisitableMockObject_5_void_ex, const_visitable1, const MOCKPP_STL::string &, + Ext, MOCKPP_STL::string); MOCKPP_VOID_CONST_VISITABLE_EXT0(MyVisitableMockObject_5_void_ex, const_visitable0, Ext); @@ -509,8 +509,8 @@ { MyVisitableMockObject_5_void_test mvo(MOCKPP_PCHAR("mvo")); MOCKPP_CONTROLLER_FOR(MyVisitableMockObject_5_void_test, visitable5) ctr (&mvo); - ctr.addThrowable(mockpp::make_throwable(std::string("exceptional string"))); - ctr.addThrowable(std::string("exceptional string"), 3); + ctr.addThrowable(mockpp::make_throwable(MOCKPP_STL::string("exceptional string"))); + ctr.addThrowable(MOCKPP_STL::string("exceptional string"), 3); ctr.setDefaultThrowable(mockpp::make_throwable(int(123))); ctr.addResponseThrowable(mockpp::make_throwable(int(1)), 1, 2, 3, 4, 5); ctr.addResponseThrowable(mockpp::make_throwable(int(0)), 0, 2, 3, 4, 5); @@ -521,8 +521,8 @@ { MyVisitableMockObject_5_void_test mvo(MOCKPP_PCHAR("mvo")); MOCKPP_CONTROLLER_FOR(MyVisitableMockObject_5_void_test, visitable5) ctr (&mvo); - ctr.addThrowable(mockpp::make_throwable(std::string("exceptional string 1"))); - ctr.addThrowable(std::string("exceptional string 2"), 2); + ctr.addThrowable(mockpp::make_throwable(MOCKPP_STL::string("exceptional string 1"))); + ctr.addThrowable(MOCKPP_STL::string("exceptional string 2"), 2); mvo.visitable5(2, 2, 3, 4, 5); mvo.visitable5(22, 2, 3, 4, 5); @@ -534,13 +534,13 @@ mvo.activate(); MOCKPP_ASSERT_THROWING(mvo.visitable5(2, 2, 3, 4, 5), MOCKPP_PCSTRING("1"), - std::string, "exceptional string 1"); + MOCKPP_STL::string, "exceptional string 1"); MOCKPP_ASSERT_THROWING(mvo.visitable5(22, 2, 3, 4, 5), MOCKPP_PCSTRING("2"), - std::string, "exceptional string 2"); + MOCKPP_STL::string, "exceptional string 2"); MOCKPP_ASSERT_THROWING(mvo.visitable5(222, 2, 3, 4, 5), MOCKPP_PCSTRING("3"), - std::string, "exceptional string 2"); + MOCKPP_STL::string, "exceptional string 2"); mvo.visitable5(2222, 2, 3, 4, 5); mvo.visitable5(22222, 2, 3, 4, 5); @@ -565,7 +565,7 @@ MyVisitableMockObject_5_void_test mvo(MOCKPP_PCHAR("mvo")); MOCKPP_CONTROLLER_FOR(MyVisitableMockObject_5_void_test, visitable5) ctr (&mvo); mvo.activate(); - ctr.addThrowable(mockpp::make_throwable(std::string("exceptional string"))); + ctr.addThrowable(mockpp::make_throwable(MOCKPP_STL::string("exceptional string"))); } @@ -574,7 +574,7 @@ MyVisitableMockObject_5_void_test mvo(MOCKPP_PCHAR("mvo")); MOCKPP_CONTROLLER_FOR(MyVisitableMockObject_5_void_test, visitable5) ctr (&mvo); mvo.activate(); - ctr.addThrowable(std::string("exceptional string"), 1); + ctr.addThrowable(MOCKPP_STL::string("exceptional string"), 1); } @@ -583,7 +583,7 @@ MyVisitableMockObject_5_void_test mvo(MOCKPP_PCHAR("mvo")); MOCKPP_CONTROLLER_FOR(MyVisitableMockObject_5_void_test, visitable5) ctr (&mvo); mvo.activate(); - ctr.setDefaultThrowable(mockpp::make_throwable(std::string("exceptional string"))); + ctr.setDefaultThrowable(mockpp::make_throwable(MOCKPP_STL::string("exceptional string"))); } @@ -677,9 +677,9 @@ { MyVisitableMockObject_5_void_test mvo(MOCKPP_PCHAR("mvo")); MOCKPP_CONTROLLER_FOR(MyVisitableMockObject_5_void_test, visitable5) ctr (&mvo); - ctr.addResponseThrowable(mockpp::make_throwable(std::string("throw me 2")), 922, 2, 3, 4, 5); - ctr.addResponseThrowable(mockpp::make_throwable(std::string("throw me 1")), 911, 2, 3, 4, 5); - ctr.setDefaultThrowable(mockpp::make_throwable(std::string("throw default"))); + ctr.addResponseThrowable(mockpp::make_throwable(MOCKPP_STL::string("throw me 2")), 922, 2, 3, 4, 5); + ctr.addResponseThrowable(mockpp::make_throwable(MOCKPP_STL::string("throw me 1")), 911, 2, 3, 4, 5); + ctr.setDefaultThrowable(mockpp::make_throwable(MOCKPP_STL::string("throw default"))); mvo.visitable5(922, 2, 3, 4, 5); mvo.visitable5(911, 2, 3, 4, 5); @@ -689,16 +689,16 @@ mvo.activate(); MOCKPP_ASSERT_THROWING(mvo.visitable5(922, 2, 3, 4, 5), MOCKPP_PCHAR("response 1"), - std::string, std::string("throw me 2")); + MOCKPP_STL::string, MOCKPP_STL::string("throw me 2")); MOCKPP_ASSERT_THROWING(mvo.visitable5(911, 2, 3, 4, 5), MOCKPP_PCHAR("response 2"), - std::string, std::string("throw me 1")); + MOCKPP_STL::string, MOCKPP_STL::string("throw me 1")); MOCKPP_ASSERT_THROWING(mvo.visitable5(1, 2, 3, 4, 5), MOCKPP_PCHAR("default response"), - std::string, std::string("throw default")); + MOCKPP_STL::string, MOCKPP_STL::string("throw default")); MOCKPP_ASSERT_THROWING(mvo.visitable5(2, 2, 3, 4, 5), MOCKPP_PCHAR("default response"), - std::string, std::string("throw default")); + MOCKPP_STL::string, MOCKPP_STL::string("throw default")); mvo.verify(); } @@ -711,7 +711,7 @@ MOCKPP_CONTROLLER_FOR(MyVisitableMockObject_5_void_test, visitable5) ctr (&mvo); - ctr.addThrowable(std::string("exceptional string"), 3); + ctr.addThrowable(MOCKPP_STL::string("exceptional string"), 3); ctr.setDefaultThrowable(mockpp::make_throwable(int(123))); ctr.addResponseThrowable(mockpp::make_throwable(int(1)), 0, 2, 3, 4, 5); @@ -727,7 +727,7 @@ { MyVisitableMockObject_5_void_test mvo(MOCKPP_PCHAR("mvo")); MOCKPP_CONTROLLER_FOR(MyVisitableMockObject_5_void_test, visitable5) ctr (&mvo); - ctr.setDefaultThrowable(mockpp::make_throwable(std::string("throw default"))); + ctr.setDefaultThrowable(mockpp::make_throwable(MOCKPP_STL::string("throw default"))); mvo.activate(); mvo.verify(); } Index: VisitableMockObject_4_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_4_test.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- VisitableMockObject_4_test.cpp 15 Oct 2005 15:50:36 -0000 1.18 +++ VisitableMockObject_4_test.cpp 26 Nov 2005 17:57:48 -0000 1.19 @@ -154,20 +154,20 @@ MOCKPP_CONSTRUCT_MEMBERS_FOR_VISITABLE_EXT0(visitable0, Ext) {} - MOCKPP_VISITABLE_EXT4(MyVisitableMockObject_4ex, const std::string, visitable4, const std::string &, const std::string &, const std::string &, const std::string &, - std::string, Ext, std::string, std::string, std::string, std::string); + MOCKPP_VISITABLE_EXT4(MyVisitableMockObject_4ex, const MOCKPP_STL::string, visitable4, const MOCKPP_STL::string &, const MOCKPP_STL::string &, const MOCKPP_STL::string &, const MOCKPP_STL::string &, + MOCKPP_STL::string, Ext, MOCKPP_STL::string, MOCKPP_STL::string, MOCKPP_STL::string, MOCKPP_STL::string); - MOCKPP_VISITABLE_EXT3(MyVisitableMockObject_4ex, const std::string, visitable3, const std::string &, const std::string &, const std::string &, - std::string, Ext, std::string, std::string, std::string); + MOCKPP_VISITABLE_EXT3(MyVisitableMockObject_4ex, const MOCKPP_STL::string, visitable3, const MOCKPP_STL::string &, const MOCKPP_STL::string &, const MOCKPP_STL::string &, + MOCKPP_STL::string, Ext, MOCKPP_STL::string, MOCKPP_STL::string, MOCKPP_STL::string); - MOCKPP_VISITABLE_EXT2(MyVisitableMockObject_4ex, const std::string, visitable2, const std::string &, const std::string &, - std::string, Ext, std::string, std::string); + MOCKPP_VISITABLE_EXT2(MyVisitableMockObject_4ex, const MOCKPP_STL::string, visitable2, const MOCKPP_STL::string &, const MOCKPP_STL::string &, + MOCKPP_STL::string, Ext, MOCKPP_STL::string, MOCKPP_STL::string); - MOCKPP_VISITABLE_EXT1(MyVisitableMockObject_4ex, const std::string, visitable1, const std::string &, - std::string, Ext, std::string); + MOCKPP_VISITABLE_EXT1(MyVisitableMockObject_4ex, const MOCKPP_STL::string, visitable1, const MOCKPP_STL::string &, + MOCKPP_STL::string, Ext, MOCKPP_STL::string); - MOCKPP_VISITABLE_EXT0(MyVisitableMockObject_4ex, const std::string, visitable0, - std::string, Ext); + MOCKPP_VISITABLE_EXT0(MyVisitableMockObject_4ex, const MOCKPP_STL::string, visitable0, + MOCKPP_STL::string, Ext); bool isClear() { @@ -191,8 +191,8 @@ { MyVisitableMockObject_4 mvo(MOCKPP_PCHAR("mvo")); MOCKPP_CONTROLLER_FOR(MyVisitableMockObject_4, visitable) ctr (&mvo); - ctr.addThrowable(mockpp::make_throwable(std::string("exceptional string"))); - ctr.addThrowable(std::string("exceptional string"), 3); + ctr.addThrowable(mockpp::make_throwable(MOCKPP_STL::string("exceptional string"))); + ctr.addThrowable(MOCKPP_STL::string("exceptional string"), 3); ctr.setDefaultThrowable(mockpp::make_throwable(int(123))); ctr.addReturnValue(1); ctr.addReturnValue(11); @@ -208,9 +208,9 @@ { MyVisitableMockObject_4 mvo(MOCKPP_PCHAR("mvo")); MOCKPP_CONTROLLER_FOR(MyVisitableMockObject_4, visitable) ctr (&mvo); - ctr.addThrowable(mockpp::make_throwable(std::string("exceptional string 1"))); - ctr.addThrowable(std::string("exceptional string 2"), 2); - ctr.setDefaultThrowable(mockpp::make_throwable(std::string("exceptional string 3"))); + ctr.addThrowable(mockpp::make_throwable(MOCKPP_STL::string("exceptional string 1"))); + ctr.addThrowable(MOCKPP_STL::string("exceptional string 2"), 2); + ctr.setDefaultThrowable(mockpp::make_throwable(MOCKPP_STL::string("exceptional string 3"))); mvo.visitable(1, 2, 3, 4); mvo.visitable(1, 2, 3, 4); @@ -220,16 +220,16 @@ mvo.activate(); MOCKPP_ASSERT_THROWING(mvo.visitable(1, 2, 3, 4), MOCKPP_PCSTRING("1"), - std::string, "exceptional string 1"); + MOCKPP_STL::string, "exceptional string 1"); MOCKPP_ASSERT_THROWING(mvo.visitable(1, 2, 3, 4), MOCKPP_PCSTRING("2"), - std::string, "exceptional string 2"); + MOCKPP_STL::string, "exceptional string 2"); MOCKPP_ASSERT_THROWING(mvo.visitable(1, 2, 3, 4), MOCKPP_PCSTRING("3"), - std::string, "exceptional string 2"); + MOCKPP_STL::string, "exceptional string 2"); MOCKPP_ASSERT_THROWING(mvo.visitable(1, 2, 3, 4), MOCKPP_PCSTRING("4"), - std::string, "exceptional string 3"); + MOCKPP_STL::string, "exceptional string 3"); } @@ -249,7 +249,7 @@ MyVisitableMockObject_4 mvo(MOCKPP_PCHAR("mvo")); MOCKPP_CONTROLLER_FOR(MyVisitableMockObject_4, visitable) ctr (&mvo); mvo.activate(); - ctr.addThrowable(mockpp::make_throwable(std::string("exceptional string"))); + ctr.addThrowable(mockpp::make_throwable(MOCKPP_STL::string("exceptional string"))); } @@ -258,7 +258,7 @@ MyVisitableMockObject_4 mvo(MOCKPP_PCHAR("mvo")); MOCKPP_CONTROLLER_FOR(MyVisitableMockObject_4, visitable) ctr (&mvo); mvo.activate(); - ctr.addThrowable(std::string("exceptional string"), 1); + ctr.addThrowable(MOCKPP_STL::string("exceptional string"), 1); } @@ -267,7 +267,7 @@ MyVisitableMockObject_4 mvo(MOCKPP_PCHAR("mvo")); MOCKPP_CONTROLLER_FOR(MyVisitableMockObject_4, visitable) ctr (&mvo); mvo.activate(); - ctr.setDefaultThrowable(mockpp::make_throwable(std::string("exceptional string"))); + ctr.setDefaultThrowable(mockpp::make_throwable(MOCKPP_STL::string("exceptional string"))); } @@ -380,11 +380,11 @@ mvo.activate(); - MOCKPP_ASSERT_TRUE(std::string("4") == mvo.visitable4("1", "2", "3", "4")); - MOCKPP_ASSERT_TRUE(std::string("3") == mvo.visitable3("2", "3", "4")); - MOCKPP_ASSERT_TRUE(std::string("2") == mvo.visitable2("3", "4")); - MOCKPP_ASSERT_TRUE(std::string("1") == mvo.visitable1("4")); - MOCKPP_ASSERT_TRUE(std::string("0") == mvo.visitable0()); + MOCKPP_ASSERT_TRUE(MOCKPP_STL::string("4") == mvo.visitable4("1", "2", "3", "4")); + MOCKPP_ASSERT_TRUE(MOCKPP_STL::string("3") == mvo.visitable3("2", "3", "4")); + MOCKPP_ASSERT_TRUE(MOCKPP_STL::string("2") == mvo.visitable2("3", "4")); + MOCKPP_ASSERT_TRUE(MOCKPP_STL::string("1") == mvo.visitable1("4")); + MOCKPP_ASSERT_TRUE(MOCKPP_STL::string("0") == mvo.visitable0()); mvo.verify(); } @@ -410,9 +410,9 @@ { MyVisitableMockObject_4 mvo(MOCKPP_PCHAR("mvo")); MOCKPP_CONTROLLER_FOR(MyVisitableMockObject_4, visitable) ctr (&mvo); - ctr.addResponseThrowable(mockpp::make_throwable(std::string("throw me 2")), 922, 2, 3, 4); - ctr.addResponseThrowable(mockpp::make_throwable(std::string("throw me 1")), 911, 2, 3, 4); - ctr.setDefaultThrowable(mockpp::make_throwable(std::string("throw default"))); + ctr.addResponseThrowable(mockpp::make_throwable(MOCKPP_STL::string("throw me 2")), 922, 2, 3, 4); + ctr.addResponseThrowable(mockpp::make_throwable(MOCKPP_STL::string("throw me 1")), 911, 2, 3, 4); + ctr.setDefaultThrowable(mockpp::make_throwable(MOCKPP_STL::string("throw default"))); mvo.visitable(922, 2, 3, 4); mvo.visitable(911, 2, 3, 4); @@ -423,16 +423,16 @@ mvo.activate(); MOCKPP_ASSERT_THROWING(mvo.visitable(922, 2, 3, 4), MOCKPP_PCHAR("response 1"), - std::string, std::string("throw me 2")); + MOCKPP_STL::string, MOCKPP_STL::string("throw me 2")); MOCKPP_ASSERT_THROWING(mvo.visitable(911, 2, 3, 4), MOCKPP_PCHAR("response 2"), - std::string, std::string("throw me 1")); + MOCKPP_STL::string, MOCKPP_STL::string("throw me 1")); MOCKPP_ASSERT_THROWING(mvo.visitable(1, 2, 3, 4), MOCKPP_PCHAR("default response"), - std::string, std::string("throw default")); + MOCKPP_STL::string, MOCKPP_STL::string("throw default")); MOCKPP_ASSERT_THROWING(mvo.visitable(2, 2, 3, 4), MOCKPP_PCHAR("default response"), - std::string, std::string("throw default")); + MOCKPP_STL::string, MOCKPP_STL::string("throw default")); } @@ -445,8 +445,8 @@ ctr.addResponseValue(123, 456, 2, 3, 4); ctr.addResponseValue(321, 654, 2, 3, 4); - ctr.addResponseThrowable(mockpp::make_throwable(std::string("throw me 2")), 922, 2, 3, 4); - ctr.addResponseThrowable(mockpp::make_throwable(std::string("throw me 1")), 911, 2, 3, 4); + ctr.addResponseThrowable(mockpp::make_throwable(MOCKPP_STL::string("throw me 2")), 922, 2, 3, 4); + ctr.addResponseThrowable(mockpp::make_throwable(MOCKPP_STL::string("throw me 1")), 911, 2, 3, 4); mvo.visitable(456, 2, 3, 4); mvo.visitable(654, 2, 3, 4); @@ -463,10 +463,10 @@ MOCKPP_ASSERT_TRUE(111 == mvo.visitable(1, 2, 3, 4)); MOCKPP_ASSERT_THROWING(mvo.visitable(922, 2, 3, 4), MOCKPP_PCHAR("response 1"), - std::string, std::string("throw me 2")); + MOCKPP_STL::string, MOCKPP_STL::string("throw me 2")); MOCKPP_ASSERT_THROWING(mvo.visitable(911, 2, 3, 4), MOCKPP_PCHAR("response 2"), - std::string, std::string("throw me 1")); + MOCKPP_STL::string, MOCKPP_STL::string("throw me 1")); MOCKPP_ASSERT_TRUE(111 == mvo.visitable(2, 2, 3, 4)); MOCKPP_ASSERT_TRUE(111 == mvo.visitable(3, 2, 3, 4)); @@ -482,7 +482,7 @@ MOCKPP_ASSERT_TRUE(mvo.isClear() == true); MOCKPP_CONTROLLER_FOR(MyVisitableMockObject_4, visitable) ctr (&mvo); - ctr.addThrowable(std::string("exceptional string"), 3); + ctr.addThrowable(MOCKPP_STL::string("exceptional string"), 3); ctr.setDefaultThrowable(mockpp::make_throwable(int(123))); ctr.addReturnValue(1); @@ -502,7 +502,7 @@ { MyVisitableMockObject_4 mvo(MOCKPP_PCHAR("mvo")); MOCKPP_CONTROLLER_FOR(MyVisitableMockObject_4, visitable) ctr (&mvo); - ctr.setDefaultThrowable(mockpp::make_throwable(std::string("throw default"))); + ctr.setDefaultThrowable(mockpp::make_throwable(MOCKPP_STL::string("throw default"))); mvo.activate(); mvo.verify(); } @@ -523,9 +523,9 @@ MyVisitableMockObject_4 mvo(MOCKPP_PCHAR("mvo")); MOCKPP_CONTROLLER_FOR(MyVisitableMockObject_4, visitable) ctr (&mvo); ctr.addReturnValue(111); - ctr.addThrowable(mockpp::make_throwable(std::string("throw 1"))); + ctr.addThrowable(mockpp::make_throwable(MOCKPP_STL::string("throw 1"))); ctr.addReturnValue(222); - ctr.addThrowable(mockpp::make_throwable(std::string("throw 2"))); + ctr.addThrowable(mockpp::make_throwable(MOCKPP_STL::string("throw 2"))); mvo.unsetThrowablesInline(); // old pre-1.2 mode mvo.activate(); @@ -535,9 +535,9 @@ mvo.visitable(1, 2, 3, 4); MOCKPP_FAIL(MOCKPP_PCHAR("should have thrown here")); } - catch(std::string &ex) + catch(MOCKPP_STL::string &ex) { - MOCKPP_ASSERT_EQUALS(ex, std::string("throw 1")); + MOCKPP_ASSERT_EQUALS(ex, MOCKPP_STL::string("throw 1")); } try @@ -545,9 +545,9 @@ mvo.visitable(1, 2, 3, 4); MOCKPP_FAIL(MOCKPP_PCHAR("should have thrown here")); } - catch(std::string &ex) + catch(MOCKPP_STL::string &ex) { - MOCKPP_ASSERT_EQUALS(ex, std::string("throw 2")); + MOCKPP_ASSERT_EQUALS(ex, MOCKPP_STL::string("throw 2")); } MOCKPP_ASSERT_TRUE(111 == mvo.visitable(1, 2, 3, 4)); @@ -562,9 +562,9 @@ MyVisitableMockObject_4 mvo(MOCKPP_PCHAR("mvo")); MOCKPP_CONTROLLER_FOR(MyVisitableMockObject_4, visitable) ctr (&mvo); ctr.addReturnValue(111); - ctr.addThrowable(mockpp::make_throwable(std::string("throw 1"))); + ctr.addThrowable(mockpp::make_throwable(MOCKPP_STL::string("throw 1"))); ctr.addReturnValue(222); - ctr.addThrowable(mockpp::make_throwable(std::string("throw 2"))); + ctr.addThrowable(mockpp::make_throwable(MOCKPP_STL::string("throw 2"))); mvo.activate(); MOCKPP_ASSERT_TRUE(111 == mvo.visitable(1, 2, 3, 4)); @@ -574,9 +574,9 @@ mvo.visitable(1, 2, 3, 4); MOCKPP_FAIL(MOCKPP_PCHAR("should have thrown here")); } - catch(std::string &ex) + catch(MOCKPP_STL::string &ex) { - MOCKPP_ASSERT_EQUALS(ex, std::string("throw 1")); + MOCKPP_ASSERT_EQUALS(ex, MOCKPP_STL::string("throw 1")); } MOCKPP_ASSERT_TRUE(222 == mvo.visitable(1, 2, 3, 4)); @@ -586,9 +586,9 @@ mvo.visitable(1, 2, 3, 4); MOCKPP_FAIL(MOCKPP_PCHAR("should have thrown here")); } - catch(std::string &ex) + catch(MOCKPP_STL::string &ex) { - MOCKPP_ASSERT_EQUALS(ex, std::string("throw 2")); + MOCKPP_ASSERT_EQUALS(ex, MOCKPP_STL::string("throw 2")); } mvo.verify(); Index: VisitableMockObject_1_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_1_test.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- VisitableMockObject_1_test.cpp 15 Oct 2005 15:50:36 -0000 1.20 +++ VisitableMockObject_1_test.cpp 26 Nov 2005 17:57:48 -0000 1.21 @@ -147,11 +147,11 @@ MOCKPP_CONSTRUCT_MEMBERS_FOR_VISITABLE_EXT0(visitable0, Ext) {} - MOCKPP_VISITABLE_EXT1(MyVisitableMockObject_1ex, const std::string, visitable1, const std::string &, - std::string, Ext, std::string); + MOCKPP_VISITABLE_EXT1(MyVisitableMockObject_1ex, const MOCKPP_STL::string, visitable1, const MOCKPP_STL::string &, + MOCKPP_STL::string, Ext, MOCKPP_STL::string); - MOCKPP_VISITABLE_EXT0(MyVisitableMockObject_1ex, const std::string, visitable0, - std::string, Ext); + MOCKPP_VISITABLE_EXT0(MyVisitableMockObject_1ex, const MOCKPP_STL::string, visitable0, + MOCKPP_STL::string, Ext); bool isClear() { @@ -172,8 +172,8 @@ { MyVisitableMockObject_1 mvo(MOCKPP_PCHAR("mvo")); MOCKPP_CONTROLLER_FOR(MyVisitableMockObject_1, visitable) ctr (&mvo); - ctr.addThrowable(mockpp::make_throwable(std::string("exceptional string"))); - ctr.addThrowable(std::string("exceptional string"), 3); + ctr.addThrowable(mockpp::make_throwable(MOCKPP_STL::string("exceptional string"))); + ctr.addThrowable(MOCKPP_STL::string("exceptional string"), 3); ctr.setDefaultThrowable(mockpp::make_throwable(int(123))); ctr.addReturnValue(1); ctr.addReturnValue(11); @@ -189,9 +189,9 @@ { MyVisitableMockObject_1 mvo(MOCKPP_PCHAR("mvo")); MOCKPP_CONTROLLER_FOR(MyVisitableMockObject_1, visitable) ctr (&mvo); - ctr.addThrowable(mockpp::make_throwable(std::string("exceptional string 1"))); - ctr.addThrowable(std::string("exceptional string 2"), 2); - ctr.setDefaultThrowable(mockpp::make_throwable(std::string("exceptional string 3"))); + ctr.addThrowable(mockpp::make_throwable(MOCKPP_STL::string("exceptional string 1"))); + ctr.addThrowable(MOCKPP_STL::string("exceptional string 2"), 2); + ctr.setDefaultThrowable(mockpp::make_throwable(MOCKPP_STL::string("exceptional string 3"))); mvo.visitable(1); mvo.visitable(1); @@ -201,16 +201,16 @@ mvo.activate(); MOCKPP_ASSERT_THROWING(mvo.visitable(1), MOCKPP_PCSTRING("1"), - std::string, "exceptional string 1"); + MOCKPP_STL::string, "exceptional string 1"); MOCKPP_ASSERT_THROWING(mvo.visitable(1), MOCKPP_PCSTRING("2"), - std::string, "exceptional string 2"); + MOCKPP_STL::string, "exceptional string 2"); MOCKPP_ASSERT_THROWING(mvo.visitable(1), MOCKPP_PCSTRING("3"), - std::string, "exceptional string 2"); + MOCKPP_STL::string, "exceptional string 2"); MOCKPP_ASSERT_THROWING(mvo.visitable(1), MOCKPP_PCSTRING("4"), - std::string, "exceptional string 3"); + MOCKPP_STL::string, "exceptional string 3"); } @@ -230,7 +230,7 @@ MyVisitableMockObject_1 mvo(MOCKPP_PCHAR("mvo")); MOCKPP_CONTROLLER_FOR(MyVisitableMockObject_1, visitable) ctr (&mvo); mvo.activate(); - ctr.addThrowable(mockpp::make_throwable(std::string("exceptional string"))); + ctr.addThrowable(mockpp::make_throwable(MOCKPP_STL::string("exceptional string"))); } @@ -239,7 +239,7 @@ MyVisitableMockObject_1 mvo(MOCKPP_PCHAR("mvo")); MOCKPP_CONTROLLER_FOR(MyVisitableMockObject_1, visitable) ctr (&mvo); mvo.activate(); - ctr.addThrowable(std::string("exceptional string"), 1); + ctr.addThrowable(MOCKPP_STL::string("exceptional string"), 1); } @@ -248,7 +248,7 @@ MyVisitableMockObject_1 mvo(MOCKPP_PCHAR("mvo")); MOCKPP_CONTROLLER_FOR(MyVisitableMockObject_1, visitable) ctr (&mvo); mvo.activate(); - ctr.setDefaultThrowable(mockpp::make_throwable(std::string("exceptional string"))); + ctr.setDefaultThrowable(mockpp::make_throwable(MOCKPP_STL::string("exceptional string"))); } @@ -349,8 +349,8 @@ mvo.activate(); - MOCKPP_ASSERT_TRUE(std::string("1") == mvo.visitable1("4")); - MOCKPP_ASSERT_TRUE(std::string("0") == mvo.visitable0()); + MOCKPP_ASSERT_TRUE(MOCKPP_STL::string("1") == mvo.visitable1("4")); + MOCKPP_ASSERT_TRUE(MOCKPP_STL::string("0") == mvo.visitable0()); mvo.verify(); } @@ -376,9 +376,9 @@ { MyVisitableMockObject_1 mvo(MOCKPP_PCHAR("mvo")); MOCKPP_CONTROLLER_FOR(MyVisitableMockObject_1, visitable) ctr (&mvo); - ctr.addResponseThrowable(mockpp::make_throwable(std::string("throw me 1")), 922); - ctr.addResponseThrowable(mockpp::make_throwable(std::string("throw me 2")), 911); - ctr.setDefaultThrowable(mockpp::make_throwable(std::string("throw default"))); + ctr.addResponseThrowable(mockpp::make_throwable(MOCKPP_STL::string("throw me 1")), 922); + ctr.addResponseThrowable(mockpp::make_throwable(MOCKPP_STL::string("throw me 2")), 911); + ctr.setDefaultThrowable(mockpp::make_throwable(MOCKPP_STL::string("throw default"))); mvo.visitable(922); mvo.visitable(911); @@ -389,16 +389,16 @@ mvo.activate(); MOCKPP_ASSERT_THROWING(mvo.visitable(922), MOCKPP_PCHAR("response 1"), - std::string, std::string("throw me 1")); + MOCKPP_STL::string, MOCKPP_STL::string("throw me 1")); MOCKPP_ASSERT_THROWING(mvo.visitable(911), MOCKPP_PCHAR("response 2"), - std::string, std::string("throw me 2")); + MOCKPP_STL::string, MOCKPP_STL::string("throw me 2")); MOCKPP_ASSERT_THROWING(mvo.visitable(1), MOCKPP_PCHAR("default response"), - std::string, std::string("throw default")); + MOCKPP_STL::string, MOCKPP_STL::string("throw default")); MOCKPP_ASSERT_THROWING(mvo.visitable(2), MOCKPP_PCHAR("default response"), - std::string, std::string("throw default")); + MOCKPP_STL::string, MOCKPP_STL::string("throw default")); } @@ -411,8 +411,8 @@ ctr.addResponseValue(123, 456); ctr.addResponseValue(321, 654); - ctr.addResponseThrowable(mockpp::make_throwable(std::string("throw me 1")), 922); - ctr.addResponseThrowable(mockpp::make_throwable(std::string("throw me 2")), 911); + ctr.addResponseThrowable(mockpp::make_throwable(MOCKPP_STL::string("throw me 1")), 922); + ctr.addResponseThrowable(mockpp::make_throwable(MOCKPP_STL::string("throw me 2")), 911); mvo.visitable(456); mvo.visitable(654); @@ -429,10 +429,10 @@ MOCKPP_ASSERT_TRUE(111 == mvo.visitable(1)); MOCKPP_ASSERT_THROWING(mvo.visitable(922), MOCKPP_PCHAR("response 1"), - std::string, std::string("throw me 1")); + MOCKPP_STL::string, MOCKPP_STL::string("throw me 1")); MOCKPP_ASSERT_THROWING(mvo.visitable(911), MOCKPP_PCHAR("response 2"), - std::string, std::string("throw me 2")); + MOCKPP_STL::string, MOCKPP_STL::string("throw me 2")); MOCKPP_ASSERT_TRUE(111 == mvo.visitable(2)); MOCKPP_ASSERT_TRUE(111 == mvo.visitable(3)); @@ -448,7 +448,7 @@ MOCKPP_ASSERT_TRUE(mvo.isClear() == true); MOCKPP_CONTROLLER_FOR(MyVisitableMockObject_1, visitable) ctr (&mvo); - ctr.addThrowable(std::string("exceptional string"), 3); + ctr.addThrowable(MOCKPP_STL::string("exceptional string"), 3); ctr.setDefaultThrowable(mockpp::make_throwable(int(123))); ctr.addReturnValue(1); @@ -468,7 +468,7 @@ { MyVisitableMockObject_1 mvo(MOCKPP_PCHAR("mvo")); MOCKPP_CONTROLLER_FOR(MyVisitableMockObject_1, visitable) ctr (&mvo); - ctr.setDefaultThrowable(mockpp::make_throwable(std::string("throw default"))); + ctr.setDefaultThrowable(mockpp::make_throwable(MOCKPP_STL::string("throw default"))); mvo.activate(); mvo.verify(); } @@ -489,9 +489,9 @@ MyVisitableMockObject_1 mvo(MOCKPP_PCHAR("mvo")); MOCKPP_CONTROLLER_FOR(MyVisitableMockObject_1, visitable) ctr (&mvo); ctr.addReturnValue(111); - ctr.addThrowable(mockpp::make_throwable(std::string("throw 1"))); + ctr.addThrowable(mockpp::make_throwable(MOCKPP_STL::string("throw 1"))); ctr.addReturnValue(222); - ctr.addThrowable(mockpp::make_throwable(std::string("throw 2"))); + ctr.addThrowable(mockpp::make_throwable(MOCKPP_STL::string("throw 2"))); mvo.unsetThrowablesInline(); // old pre-1.2 mode mvo.activate(); @@ -501,9 +501,9 @@ mvo.visitable(1); MOCKPP_FAIL(MOCKPP_PCHAR("should have thrown here")); } - catch(std::string &ex) + catch(MOCKPP_STL::string &ex) { - MOCKPP_ASSERT_EQUALS(ex, std::string("throw 1")); + MOCKPP_ASSERT_EQUALS(ex, MOCKPP_STL::string("throw 1")); } try @@ -511,9 +511,9 @@ mvo.visitable(1); MOCKPP_FAIL(MOCKPP_PCHAR("should have thrown here")); } - catch(std::string &ex) + catch(MOCKPP_STL::string &ex) { - MOCKPP_ASSERT_EQUALS(ex, std::string("throw 2")); + MOCKPP_ASSERT_EQUALS(ex, MOCKPP_STL::string("throw 2")); } MOCKPP_ASSERT_TRUE(111 == mvo.visitable(3)); @@ -528,9 +528,9 @@ MyVisitableMockObject_1 mvo(MOCKPP_PCHAR("mvo")); MOCKPP_CONTROLLER_FOR(MyVisitableMockObject_1, visitable) ctr (&mvo); ctr.addReturnValue(111); - ctr.addThrowable(mockpp::make_throwable(std::string("throw 1"))); + ctr.addThrowable(mockpp::make_throwable(MOCKPP_STL::string("throw 1"))); ctr.addReturnValue(222); - ctr.addThrowable(mockpp::make_throwable(std::string("throw 2"))); + ctr.addThrowable(mockpp::make_throwable(MOCKPP_STL::string("throw 2"))); mvo.activate(); MOCKPP_ASSERT_TRUE(111 == mvo.visitable(3)); @@ -540,9 +540,9 @@ mvo.visitable(1); MOCKPP_FAIL(MOCKPP_PCHAR("should have thrown here")); } - catch(std::string &ex) + catch(MOCKPP_STL::string &ex) { - MOCKPP_ASSERT_EQUALS(ex, std::string("throw 1")); + MOCKPP_ASSERT_EQUALS(ex, MOCKPP_STL::string("throw 1")); } MOCKPP_ASSERT_TRUE(222 == mvo.visitable(3)); @@ -552,9 +552,9 @@ mvo.visitable(1); MOCKPP_FAIL(MOCKPP_PCHAR("should have thrown here")); } - catch(std::string &ex) + catch(MOCKPP_STL::string &ex) { - MOCKPP_ASSERT_EQUALS(ex, std::string("throw 2")); + MOCKPP_ASSERT_EQUALS(ex, MOCKPP_STL::string("throw 2")); } mvo.verify(); Index: VisitableMockObject_1_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_1_void_test.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- VisitableMockObject_1_void_test.cpp 15 Oct 2005 15:40:59 -0000 1.20 +++ VisitableMockObject_1_void_test.cpp 26 Nov 2005 17:57:48 -0000 1.21 @@ -129,8 +129,8 @@ MOCKPP_CONSTRUCT_MEMBERS_FOR_VOID_VISITABLE_EXT0(visitable0, Ext) {} - MOCKPP_VOID_VISITABLE_EXT1(MyVisitableMockObject_1_void_ex, visitable1, const std::string &, - Ext, std::string); + MOCKPP_VOID_VISITABLE_EXT1(MyVisitableMockObject_1_void_ex, visitable1, const MOCKPP_STL::string &, + Ext, MOCKPP_STL::string); MOCKPP_VOID_VISITABLE_EXT1(MyVisitableMockObject_1_void_ex, outbound, unsigned &, Ext, unsigned ); @@ -153,8 +153,8 @@ { MyVisitableMockObject_1_void mvo(MOCKPP_PCHAR("mvo")); MOCKPP_CONTROLLER_FOR(MyVisitableMockObject_1_void, visitable) ctr (&mvo); - ctr.addThrowable(mockpp::make_throwable(std::string("exceptional string"))); - ctr.addThrowable(std::string("exceptional string"), 3); + ctr.addThrowable(mockpp::make_throwable(MOCKPP_STL::string("exceptional string"))); + ctr.addThrowable(MOCKPP_STL::string("exceptional string"), 3); ctr.setDefaultThrowable(mockpp::make_throwable(int(123))); ctr.addResponseThrowable(mockpp::make_throwable(int(1)), 1); ctr.addResponseThrowable(mockpp::make_throwable(int(0)), 0); @@ -165,8 +165,8 @@ { MyVisitableMockObject_1_void mvo(MOCKPP_PCHAR("mvo")); MOCKPP_CONTROLLER_FOR(MyVisitableMockObject_1_void, visitable) ctr (&mvo); - ctr.addThrowable(mockpp::make_throwable(std::string("exceptional string 1"))); - ctr.addThrowable(std::string("exceptional string 2"), 2); + ctr.addThrowable(mockpp::make_throwable(MOCKPP_STL::string("exceptional string 1"))); + ctr.addThrowable(MOCKPP_STL::string("exceptional string 2"), 2); mvo.visitable(2); mvo.visitable(22); @@ -178,13 +178,13 @@ mvo.activate(); MOCKPP_ASSERT_THROWING(mvo.visitable(2), MOCKPP_PCSTRING("1"), - std::string, "exceptional string 1"); + MOCKPP_STL::string, "exceptional string 1"); MOCKPP_ASSERT_THROWING(mvo.visitable(22), MOCKPP_PCSTRING("2"), - std::string, "exceptional string 2"); + MOCKPP_STL::string, "exceptional string 2"); MOCKPP_ASSERT_THROWING(mvo.visitable(222), MOCKPP_PCSTRING("3"), - std::string, "exceptional string 2"); + MOCKPP_STL::string, "exceptional string 2"); mvo.visitable(2222); mvo.visitable(22222); @@ -209,7 +209,7 @@ MyVisitableMockObject_1_void mvo(MOCKPP_PCHAR("mvo")); MOCKPP_CONTROLLER_FOR(MyVisitableMockObject_1_void, visitable) ctr (&mvo); mvo.activate(); - ctr.addThrowable(mockpp::make_throwable(std::string("exceptional string"))); + ctr.addThrowable(mockpp::make_throwable(MOCKPP_STL::string("exceptional string"))); } @@ -218,7 +218,7 @@ MyVisitableMockObject_1_void mvo(MOCKPP_PCHAR("mvo")); MOCKPP_CONTROLLER_FOR(MyVisitableMockObject_1_void, visitable) ctr (&mvo); mvo.activate(); - ctr.addThrowable(std::string("exceptional string"), 1); + ctr.addThrowable(MOCKPP_STL::string("exceptional string"), 1); } @@ -227,7 +227,7 @@ MyVisitableMockObject_1_void mvo(MOCKPP_PCHAR("mvo")); MOCKPP_CONTROLLER_FOR(MyVisitableMockObject_1_void, visitable) ctr (&mvo); mvo.activate(); - ctr.setDefaultThrowable(mockpp::make_throwable(std::string("exceptional string"))); + ctr.setDefaultThrowable(mockpp::make_throwable(MOCKPP_STL::string("exceptional string"))); } @@ -284,9 +284,9 @@ { MyVisitableMockObject_1_void mvo(MOCKPP_PCHAR("mvo")); MOCKPP_CONTROLLER_FOR(MyVisitableMockObject_1_void, visitable) ctr (&mvo); - ctr.addResponseThrowable(mockpp::make_throwable(std::string("throw me 1")), 922); - ctr.addResponseThrowable(mockpp::make_throwable(std::string("throw me 2")), 911); - ctr.setDefaultThrowable(mockpp::make_throwable(std::string("throw default"))); + ctr.addResponseThrowable(mockpp::make_throwable(MOCKPP_STL::string("throw me 1")), 922); + ctr.addResponseThrowable(mockpp::make_throwable(MOCKPP_STL::string("throw me 2")), 911); + ctr.setDefaultThrowable(mockpp::make_throwable(MOCKPP_STL::string("throw default"))); mvo.visitable(922); mvo.visitable(911); @@ -296,16 +296,16 @@ mvo.activate(); MOCKPP_ASSERT_THROWING(mvo.visitable(922), MOCKPP_PCHAR("response 1"), - std::string, std::string("throw me 1")); + MOCKPP_STL::string, MOCKPP_STL::string("throw me 1")); MOCKPP_ASSERT_THROWING(mvo.visitable(911), MOCKPP_PCHAR("response 2"), - std::string, std::string("throw me 2")); + MOCKPP_STL::string, MOCKPP_STL::string("throw me 2")); MOCKPP_ASSERT_THROWING(mvo.visitable(1), MOCKPP_PCHAR("default response"), - std::string, std::string("throw default")); + MOCKPP_STL::string, MOCKPP_STL::string("throw default")); MOCKPP_ASSERT_THROWING(mvo.visitable(2), MOCKPP_PCHAR("default response"), - std::string, std::string("throw default")); + MOCKPP_STL::string, MOCKPP_STL::string("throw default")); mvo.verify(); } @@ -318,7 +318,7 @@ MOCKPP_CONTROLLER_FOR(MyVisitableMockObject_1_void, visitable) ctr (&mvo); - ctr.addThrowable(std::string("exceptional string"), 3); + ctr.addThrowable(MOCKPP_STL::string("exceptional string"), 3); ctr.setDefaultThrowable(mockpp::make_throwable(int(123))); ctr.addResponseThrowable(mockpp::make_throwable(int(1)), 0); @@ -334,7 +334,7 @@ { MyVisitableMockObject_1_void mvo(MOCKPP_PCHAR("mvo")); MOCKP... [truncated message content] |
|
From: Ewald A. <ewa...@us...> - 2005-11-26 17:57:27
|
Update of /cvsroot/mockpp/mockpp/mockpp/stub In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20554/mockpp/stub Modified Files: StubSequence.h TypelessStubSequence.h Log Message: prepare use of alternative stl Index: TypelessStubSequence.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/stub/TypelessStubSequence.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- TypelessStubSequence.h 28 Aug 2005 20:40:24 -0000 1.6 +++ TypelessStubSequence.h 26 Nov 2005 17:57:17 -0000 1.7 @@ -32,7 +32,7 @@ #include <mockpp/mockpp.h> // always first -#include <deque> +#include MOCKPP_DEQUE_H #include <mockpp/stub/TypelessStub.h> #include <mockpp/compat/Assert.h> Index: StubSequence.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/stub/StubSequence.h,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- StubSequence.h 28 Aug 2005 20:40:24 -0000 1.24 +++ StubSequence.h 26 Nov 2005 17:57:17 -0000 1.25 @@ -36,7 +36,7 @@ #include <mockpp/mockpp.h> // always first -#include <deque> +#include MOCKPP_DEQUE_H #include <mockpp/stub/Stub.h> #include <mockpp/compat/Assert.h> |
|
From: Ewald A. <ewa...@us...> - 2005-11-26 17:57:08
|
Update of /cvsroot/mockpp/mockpp/mockpp/constraint In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20521/mockpp/constraint Modified Files: ConstraintList.h Log Message: prepare use of alternative stl Index: ConstraintList.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/constraint/ConstraintList.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- ConstraintList.h 13 Nov 2005 11:53:18 -0000 1.6 +++ ConstraintList.h 26 Nov 2005 17:57:00 -0000 1.7 @@ -32,8 +32,8 @@ #include <mockpp/mockpp.h> // always first -#include <algorithm> -#include <vector> +#include MOCKPP_ALGORITHM_H +#include MOCKPP_VECTOR_H #include <mockpp/AbstractExpectationCollection.h> @@ -283,8 +283,8 @@ ConstraintList<T> (const ConstraintList<T> &); // forbid due to internal pointers ConstraintList<T>& operator=(ConstraintList<T>&); - std::vector<T> actualItems; - std::vector<Constraint<T>*> constraints; + MOCKPP_STL::vector<T> actualItems; + MOCKPP_STL::vector<Constraint<T>*> constraints; bool expectNothing; bool haveActualValue; }; |
|
From: Ewald A. <ewa...@us...> - 2005-11-26 17:56:51
|
Update of /cvsroot/mockpp/mockpp/mockpp/compat In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20492/mockpp/compat Modified Files: Exception.h Formatter.cpp Formatter.h Log Message: Index: Formatter.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/compat/Formatter.h,v retrieving revision 1.33 retrieving revision 1.34 diff -u -d -r1.33 -r1.34 --- Formatter.h 31 Jul 2005 14:14:08 -0000 1.33 +++ Formatter.h 26 Nov 2005 17:56:44 -0000 1.34 @@ -234,7 +234,7 @@ * @param repdata value to replace * @return the resulting string */ -mockpp::String & operator << (mockpp::String &formatter, const std::string &repdata); +mockpp::String & operator << (mockpp::String &formatter, const MOCKPP_STL::string &repdata); #else // MOCKPP_UNICODE @@ -246,7 +246,7 @@ * @param repdata value to replace * @return the resulting string */ -// mockpp::String & operator << (mockpp::String &formatter, const std::basic_string<wchar_t> &repdata); +// mockpp::String & operator << (mockpp::String &formatter, const MOCKPP_STL::basic_string<wchar_t> &repdata); #endif // MOCKPP_UNICODE @@ -279,7 +279,6 @@ + MOCKPP_GET_STRING(typeid(o).name()) + MOCKPP_PCHAR("&]"); formatter << s; - MOCKPP_UNUSED(o); return formatter; } @@ -299,7 +298,6 @@ + MOCKPP_GET_STRING(typeid(*po).name()) + MOCKPP_PCHAR("*]"); formatter << s; - MOCKPP_UNUSED(o); return formatter; } Index: Exception.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/compat/Exception.h,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- Exception.h 30 Dec 2004 20:54:04 -0000 1.15 +++ Exception.h 26 Nov 2005 17:56:44 -0000 1.16 @@ -91,7 +91,7 @@ unsigned srcline; String srcfile; #ifdef MOCKPP_USE_STD_EXCEPTION - mutable std::string what_helper; + mutable MOCKPP_STL::string what_helper; #endif }; Index: Formatter.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/compat/Formatter.cpp,v retrieving revision 1.44 retrieving revision 1.45 diff -u -d -r1.44 -r1.45 --- Formatter.cpp 19 Oct 2005 19:41:57 -0000 1.44 +++ Formatter.cpp 26 Nov 2005 17:56:44 -0000 1.45 @@ -290,7 +290,7 @@ mockpp::String & MOCKPP_EXPORT operator << ( mockpp::String &formatter, const char *repdata ) { - formatter << std::string(repdata); + formatter << MOCKPP_STL::string(repdata); return formatter; } @@ -336,7 +336,7 @@ #ifdef MOCKPP_UNICODE -mockpp::String & MOCKPP_EXPORT operator << ( mockpp::String &formatter, const std::string &str ) +mockpp::String & MOCKPP_EXPORT operator << ( mockpp::String &formatter, const MOCKPP_STL::string &str ) { formatter << mockpp::getUnicode( str ); return formatter; @@ -344,7 +344,7 @@ #else -// mockpp::String & MOCKPP_EXPORT operator << (mockpp::String &formatter, const std::basic_string<wchar_t> &str) +// mockpp::String & MOCKPP_EXPORT operator << (mockpp::String &formatter, const MOCKPP_STL::basic_string<wchar_t> &str) // { // formatter << mockpp::getLatin1(str); // return formatter; |
|
From: Ewald A. <ewa...@us...> - 2005-11-26 17:56:38
|
Update of /cvsroot/mockpp/mockpp/mockpp/chaining In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20427/mockpp/chaining Modified Files: AbstractDynamicChainingMock.h AbstractInvocationDispatcher.h ChainableMockObject_macro.h ChainingMockBuilder.h ChainingMockObjectSupport.h DynamicChainingMock.h InvocationMocker.h Log Message: prepare use of alternative stl Index: ChainingMockBuilder.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/ChainingMockBuilder.h,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- ChainingMockBuilder.h 13 Nov 2005 11:53:18 -0000 1.25 +++ ChainingMockBuilder.h 26 Nov 2005 17:56:30 -0000 1.26 @@ -36,7 +36,7 @@ #include <mockpp/mockpp.h> // always first -#include <map> +#include MOCKPP_MAP_H #include <mockpp/chaining/DynamicChainingMock.h> #include <mockpp/chaining/InvocationMocker.h> Index: AbstractInvocationDispatcher.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/AbstractInvocationDispatcher.h,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- AbstractInvocationDispatcher.h 13 Nov 2005 11:53:18 -0000 1.16 +++ AbstractInvocationDispatcher.h 26 Nov 2005 17:56:30 -0000 1.17 @@ -36,7 +36,7 @@ #include <mockpp/mockpp.h> // always first -#include <vector> +#include MOCKPP_VECTOR_H #include <mockpp/chaining/InvocationDispatcher.h> #include <mockpp/chaining/Invokable.h> @@ -58,7 +58,7 @@ protected: typedef Invokable<R, I> Item; - typedef std::vector<Item*> List; + typedef MOCKPP_STL::vector<Item*> List; typedef typename List::iterator Iterator; typedef typename List::reverse_iterator ReverseIterator; Index: ChainableMockObject_macro.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/ChainableMockObject_macro.h,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- ChainableMockObject_macro.h 19 Sep 2005 18:33:40 -0000 1.13 +++ ChainableMockObject_macro.h 26 Nov 2005 17:56:30 -0000 1.14 @@ -100,7 +100,7 @@ #define MOCKPP_VOID_CHAINABLE0_IMPL(classname, m_name, \ a_name) \ { \ - std::string func_name (#m_name); \ + MOCKPP_STL::string func_name (#m_name); \ mockpp::Invocation0 inv(getVerifiableName() + MOCKPP_PCHAR(".") MOCKPP_PCHAR(#m_name)); \ m_name ## CoreMock.invoke(inv); \ } \ @@ -120,7 +120,7 @@ #define MOCKPP_VOID_CHAINABLE1_IMPL(classname, m_name, m_type1, \ a_name, v_type1) \ { \ - std::string func_name (#m_name); \ + MOCKPP_STL::string func_name (#m_name); \ mockpp::Invocation1< v_type1 > inv(getVerifiableName() + MOCKPP_PCHAR(".") MOCKPP_PCHAR(#m_name), (v_type1&)param1); \ m_name ## CoreMock.invoke(inv); \ } \ @@ -140,7 +140,7 @@ #define MOCKPP_VOID_CHAINABLE2_IMPL(classname, m_name, m_type1, m_type2, \ a_name, v_type1, v_type2) \ { \ - std::string func_name (#m_name); \ + MOCKPP_STL::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); \ m_name ## CoreMock.invoke(inv); \ } \ @@ -164,7 +164,7 @@ #define MOCKPP_VOID_CHAINABLE3_IMPL(classname, m_name, m_type1, m_type2, m_type3, \ a_name, v_type1, v_type2, v_type3) \ { \ - std::string func_name (#m_name); \ + MOCKPP_STL::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); \ m_name ## CoreMock.invoke(inv); \ } \ @@ -190,7 +190,7 @@ #define MOCKPP_VOID_CHAINABLE4_IMPL(classname, m_name, m_type1, m_type2, m_type3, m_type4, \ a_name, v_type1, v_type2, v_type3, v_type4) \ { \ - std::string func_name (#m_name); \ + MOCKPP_STL::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); \ m_name ## CoreMock.invoke(inv); \ } \ @@ -218,7 +218,7 @@ #define MOCKPP_VOID_CHAINABLE5_IMPL(classname, m_name, m_type1, m_type2, m_type3, m_type4, m_type5, \ a_name, v_type1, v_type2, v_type3, v_type4, v_type5) \ { \ - std::string func_name (#m_name); \ + MOCKPP_STL::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); \ m_name ## CoreMock.invoke(inv); \ } \ @@ -239,7 +239,7 @@ #define MOCKPP_CHAINABLE0_IMPL(classname, m_ret_type, m_name, \ v_ret_type, a_name) \ { \ - std::string func_name (#m_name); \ + MOCKPP_STL::string func_name (#m_name); \ mockpp::Invocation0 inv(getVerifiableName() + MOCKPP_PCHAR(".") MOCKPP_PCHAR(#m_name)); \ return m_name ## CoreMock.invoke(inv); \ } \ @@ -261,7 +261,7 @@ #define MOCKPP_CHAINABLE1_IMPL(classname, m_ret_type, m_name, m_type1, \ v_ret_type, a_name, v_type1) \ { \ - std::string func_name (#m_name); \ + MOCKPP_STL::string func_name (#m_name); \ mockpp::Invocation1< v_type1 > inv(getVerifiableName() + MOCKPP_PCHAR(".") MOCKPP_PCHAR(#m_name), (v_type1&)param1); \ return m_name ## CoreMock.invoke(inv); \ } \ @@ -283,7 +283,7 @@ #define MOCKPP_CHAINABLE2_IMPL(classname, m_ret_type, m_name, m_type1, m_type2, \ v_ret_type, a_name, v_type1, v_type2) \ { \ - std::string func_name (#m_name); \ + MOCKPP_STL::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); \ return m_name ## CoreMock.invoke(inv); \ } \ @@ -309,7 +309,7 @@ #define MOCKPP_CHAINABLE3_IMPL(classname, m_ret_type, m_name, m_type1, m_type2, m_type3, \ v_ret_type, a_name, v_type1, v_type2, v_type3) \ { \ - std::string func_name (#m_name); \ + MOCKPP_STL::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); \ return m_name ## CoreMock.invoke(inv); \ } \ @@ -337,7 +337,7 @@ #define MOCKPP_CHAINABLE4_IMPL(classname, m_ret_type, m_name, m_type1, m_type2, m_type3, m_type4, \ v_ret_type, a_name, v_type1, v_type2, v_type3, v_type4) \ { \ - std::string func_name (#m_name); \ + MOCKPP_STL::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); \ return m_name ## CoreMock.invoke(inv); \ } \ @@ -367,7 +367,7 @@ #define MOCKPP_CHAINABLE5_IMPL(classname, m_ret_type, m_name, m_type1, m_type2, m_type3, m_type4, m_type5, \ v_ret_type, a_name, v_type1, v_type2, v_type3, v_type4, v_type5) \ { \ - std::string func_name (#m_name); \ + MOCKPP_STL::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); \ return m_name ## CoreMock.invoke(inv); \ } \ Index: InvocationMocker.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/InvocationMocker.h,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- InvocationMocker.h 19 Oct 2005 20:14:27 -0000 1.35 +++ InvocationMocker.h 26 Nov 2005 17:56:30 -0000 1.36 @@ -38,7 +38,7 @@ #include <mockpp/mockpp.h> // always first -#include <vector> +#include MOCKPP_VECTOR_H #include <mockpp/chaining/StubMatchersCollection.h> #include <mockpp/chaining/Invokable.h> @@ -82,7 +82,7 @@ public: - typedef typename std::vector<InvocationMatcher<I>*> List; + typedef typename MOCKPP_STL::vector<InvocationMatcher<I>*> List; typedef typename List::iterator Iterator; typedef typename List::const_iterator ConstIterator; @@ -206,7 +206,7 @@ * @return The current content of the buffer data */ virtual String describeTo( String &result, - const typename std::vector<InvocationMatcher<I>*> &matchers, + const typename MOCKPP_STL::vector<InvocationMatcher<I>*> &matchers, Stub<R, I> *stub, const String &name ) const = 0; @@ -218,7 +218,7 @@ * @return The current content of the buffer data */ String describeTo( String &result, - const typename std::vector<InvocationMatcher<I>*> &matchers, + const typename MOCKPP_STL::vector<InvocationMatcher<I>*> &matchers, TypelessStub<R>* stub, const String &name ) const { @@ -254,7 +254,7 @@ * @return The current content of the buffer data */ virtual String describeTo( String &result, - const typename std::vector<InvocationMatcher<I>*> &matchers, + const typename MOCKPP_STL::vector<InvocationMatcher<I>*> &matchers, Stub<R, I> *stub, const String &name ) const { @@ -309,7 +309,7 @@ * @return The current content of the buffer data */ String describeTo( String &result, - const typename std::vector<InvocationMatcher<I>*> &matchers, + const typename MOCKPP_STL::vector<InvocationMatcher<I>*> &matchers, Stub<R, I> *stub, const String &name ) const { Index: AbstractDynamicChainingMock.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/AbstractDynamicChainingMock.h,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- AbstractDynamicChainingMock.h 13 Nov 2005 11:53:18 -0000 1.35 +++ AbstractDynamicChainingMock.h 26 Nov 2005 17:56:30 -0000 1.36 @@ -94,7 +94,7 @@ * @return The current content of the buffer data */ virtual String describeTo( String &result, - const typename std::vector<InvocationMatcher<I>*> &matchers, + const typename MOCKPP_STL::vector<InvocationMatcher<I>*> &matchers, Stub<R, I> *stub, const String &name ) const { @@ -113,7 +113,7 @@ * @return The current content of the buffer data */ String describeTo( String &result, - const typename std::vector<InvocationMatcher<I>*> &matchers, + const typename MOCKPP_STL::vector<InvocationMatcher<I>*> &matchers, TypelessStub<R>* stub, const String &name ) const { Index: ChainingMockObjectSupport.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/ChainingMockObjectSupport.h,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- ChainingMockObjectSupport.h 23 Jul 2005 13:55:47 -0000 1.21 +++ ChainingMockObjectSupport.h 26 Nov 2005 17:56:30 -0000 1.22 @@ -259,7 +259,7 @@ * @param substring the substring * @return the new constraint */ -template <typename S> // std::basic_string<char_type> +template <typename S> // MOCKPP_STL::basic_string<char_type> typename Constraint<S>::AP stringContains( const S &substring ) { @@ -273,7 +273,7 @@ * @param substring the substring * @return the new constraint */ -template <typename S> // std::basic_string<char_type> +template <typename S> // MOCKPP_STL::basic_string<char_type> typename Constraint<S>::AP startsWith( const S &substring ) { @@ -287,7 +287,7 @@ * @param substring the substring * @return the new constraint */ -template <typename S> // std::basic_string<char_type> +template <typename S> // MOCKPP_STL::basic_string<char_type> typename Constraint<S>::AP endsWith( const S &substring ) { @@ -302,10 +302,10 @@ * @return the new constraint */ template <typename PCS> // pointer to const char_type -typename Constraint<std::basic_string<PCS> >::AP +typename Constraint<MOCKPP_STL::basic_string<PCS> >::AP stringContains( const PCS *substring ) { - return new StringContains<std::basic_string<PCS> >( substring ); + return new StringContains<MOCKPP_STL::basic_string<PCS> >( substring ); } @@ -401,7 +401,7 @@ typename TypelessStub<R>::AP onConsecutiveCalls( TypelessStub<R> *stub1, TypelessStub<R> *stub2 ) { - std::vector<TypelessStub<R>*> vec; + MOCKPP_STL::vector<TypelessStub<R>*> vec; vec.push_back( stub1); vec.push_back( stub2); return new TypelessStubSequence<R>( vec.begin(), vec.end() ); @@ -420,7 +420,7 @@ typename Stub<R, I>::AP onConsecutiveCalls( Stub<R, I> *stub1, Stub<R, I> *stub2 ) { - std::vector<Stub<R, I>*> vec; + MOCKPP_STL::vector<Stub<R, I>*> vec; vec.push_back( stub1); vec.push_back( stub2); return new StubSequence<R, I>( vec.begin(), vec.end() ); @@ -440,7 +440,7 @@ TypelessStub<R> *stub2, TypelessStub<R> *stub3 ) { - std::vector<TypelessStub<R>*> vec; + MOCKPP_STL::vector<TypelessStub<R>*> vec; vec.push_back( stub1 ); vec.push_back( stub2 ); vec.push_back( stub3 ); @@ -462,7 +462,7 @@ Stub<R, I> *stub2, Stub<R, I> *stub3 ) { - std::vector<Stub<R, I>*> vec; + MOCKPP_STL::vector<Stub<R, I>*> vec; vec.push_back( stub1 ); vec.push_back( stub2 ); vec.push_back( stub3 ); @@ -485,7 +485,7 @@ TypelessStub<R> *stub3, TypelessStub<R> *stub4 ) { - std::vector<TypelessStub<R>*> vec; + MOCKPP_STL::vector<TypelessStub<R>*> vec; vec.push_back( stub1 ); vec.push_back( stub2 ); vec.push_back( stub3 ); @@ -510,7 +510,7 @@ Stub<R, I> *stub3, Stub<R, I> *stub4 ) { - std::vector<Stub<R, I>*> vec; + MOCKPP_STL::vector<Stub<R, I>*> vec; vec.push_back( stub1 ); vec.push_back( stub2 ); vec.push_back( stub3 ); @@ -536,7 +536,7 @@ TypelessStub<R> *stub4, TypelessStub<R> *stub5 ) { - std::vector<TypelessStub<R>*> vec; + MOCKPP_STL::vector<TypelessStub<R>*> vec; vec.push_back( stub1 ); vec.push_back( stub2 ); vec.push_back( stub3 ); @@ -564,7 +564,7 @@ Stub<R, I> *stub4, Stub<R, I> *stub5 ) { - std::vector<Stub<R, I>*> vec; + MOCKPP_STL::vector<Stub<R, I>*> vec; vec.push_back( stub1 ); vec.push_back( stub2 ); vec.push_back( stub3 ); Index: DynamicChainingMock.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/DynamicChainingMock.h,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- DynamicChainingMock.h 30 Dec 2004 20:54:04 -0000 1.11 +++ DynamicChainingMock.h 26 Nov 2005 17:56:30 -0000 1.12 @@ -38,7 +38,7 @@ #include <mockpp/mockpp.h> // always first -#include <vector> +#include MOCKPP_VECTOR_H #include <mockpp/Verifiable.h> |
|
From: Ewald A. <ewa...@us...> - 2005-11-24 19:46:17
|
Update of /cvsroot/mockpp/mockpp/mockpp/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8092/mockpp/tests Modified Files: VisitableMockMethod_test.cpp Log Message: test Index: VisitableMockMethod_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockMethod_test.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- VisitableMockMethod_test.cpp 19 Nov 2005 14:16:38 -0000 1.15 +++ VisitableMockMethod_test.cpp 24 Nov 2005 19:46:10 -0000 1.16 @@ -148,6 +148,8 @@ mockpp::VisitableMockMethod<int, int, int, int, int> mmid4(MOCKPP_PCHAR("mm4"), 0); mockpp::VisitableMockMethod<int, int, int, int, int, int> mmid5(MOCKPP_PCHAR("mm5"), 0); mockpp::VisitableMockMethod<int, int, int, int, int, int, int> mmid6(MOCKPP_PCHAR("mm6"), 0); + +// mockpp::VisitableMockMethod<int(int, int, int, int, int, int)> mmidp6(MOCKPP_PCHAR("mm6"), 0); } @@ -166,7 +168,7 @@ } #else using mockpp::VisitableMockMethodBase::throwAvailableException; -#endif +#endif }; @@ -383,7 +385,7 @@ vmo.visitable(); vmo.visitable(); vmo.visitable(); - + vmo.activate(); MOCKPP_ASSERT_THROWING(vmo.visitable(), @@ -412,7 +414,7 @@ vmo.visitable(); vmo.visitable(); vmo.visitable(); - + vmo.activate(); MOCKPP_ASSERT_THROWING(vmo.visitable(), @@ -492,7 +494,7 @@ vmo.visitablev(); vmo.visitablev(); vmo.visitablev(); - + vmo.activate(); MOCKPP_ASSERT_THROWING(vmo.visitablev(), |
|
From: Ewald A. <ewa...@us...> - 2005-11-24 19:45:53
|
Update of /cvsroot/mockpp/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8022 Modified Files: ChangeLog Log Message: remove superfluous template parameter Index: ChangeLog =================================================================== RCS file: /cvsroot/mockpp/mockpp/ChangeLog,v retrieving revision 1.77 retrieving revision 1.78 diff -u -d -r1.77 -r1.78 --- ChangeLog 19 Nov 2005 19:41:22 -0000 1.77 +++ ChangeLog 24 Nov 2005 19:45:43 -0000 1.78 @@ -2,6 +2,9 @@ mockpp history -------------- +2005-11-24 1.10.1: + + - remove superfluous template parameter 2005-11-19 1.10.0: @@ -12,7 +15,7 @@ - added template based classes to mock methods (chainable and visitable) - compatibilty break: cleanup and removed all methods clear() as they were mostly duplicates of reset() - - IsCloseTo compared wrong when passed scalar values exctly on the bounds + - IsCloseTo compared wrong when passed scalar values exactly on the bounds 2005-10-11 1.9.5: |
|
From: Ewald A. <ewa...@us...> - 2005-11-24 19:17:44
|
Update of /cvsroot/mockpp/mockpp/mockpp/docs/en In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2878/mockpp/docs/en Modified Files: dev_basic.docbook Log Message: typo Index: dev_basic.docbook =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/docs/en/dev_basic.docbook,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- dev_basic.docbook 5 Mar 2005 20:45:09 -0000 1.11 +++ dev_basic.docbook 24 Nov 2005 19:17:37 -0000 1.12 @@ -247,7 +247,7 @@ <programlisting> - ExpectationCounter <int> ec ("verifyCounter", 0); + ExpectationCounter ec ("verifyCounter", 0); ec.setExpected(5); ec.inc(); |
|
From: Ewald A. <ewa...@us...> - 2005-11-24 19:17:17
|
Update of /cvsroot/mockpp/mockpp/mockpp/chaining In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2806/mockpp/chaining Modified Files: ChainableMockMethod0.h ChainableMockMethod1.h ChainableMockMethod2.h ChainableMockMethod3.h ChainableMockMethod4.h ChainableMockMethod5.h ChainableMockMethod6.h ChainableMockMethod.h gen_chainablemethod_N.pl Log Message: remove superfluous template parameter Index: ChainableMockMethod6.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/ChainableMockMethod6.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- ChainableMockMethod6.h 19 Nov 2005 09:18:40 -0000 1.8 +++ ChainableMockMethod6.h 24 Nov 2005 19:17:09 -0000 1.9 @@ -46,7 +46,7 @@ */ template <typename RT, typename P1, typename P2, typename P3, typename P4, typename P5, typename P6> class ChainableMockMethod6Common - : public ChainableMockMethodCommon<RT> + : public ChainableMockMethodCommon , public ChainingMockBuilder <ArgumentsMatchBuilder6<RT, Invocation6<P1, P2, P3, P4, P5, P6> > > { public: @@ -63,7 +63,7 @@ * @param parent parent chainable mock object */ ChainableMockMethod6Common(const String &name, ChainableMockObject *parent ) - : ChainableMockMethodCommon<RT>(name, parent) + : ChainableMockMethodCommon(name, parent) , Builder(&coremock, this->getChainableMockObject(), this->getMethodName()) , coremock(name + MOCKPP_PCHAR("/coreMock"), this) { Index: ChainableMockMethod.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/ChainableMockMethod.h,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- ChainableMockMethod.h 18 Nov 2005 10:19:35 -0000 1.11 +++ ChainableMockMethod.h 24 Nov 2005 19:17:09 -0000 1.12 @@ -45,7 +45,6 @@ * @ingroup grp_controller * @internal */ -template <typename R> class ChainableMockMethodCommon : public MockObject { public: Index: ChainableMockMethod2.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/ChainableMockMethod2.h,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- ChainableMockMethod2.h 19 Nov 2005 09:18:40 -0000 1.10 +++ ChainableMockMethod2.h 24 Nov 2005 19:17:09 -0000 1.11 @@ -46,7 +46,7 @@ */ template <typename RT, typename P1, typename P2> class ChainableMockMethod2Common - : public ChainableMockMethodCommon<RT> + : public ChainableMockMethodCommon , public ChainingMockBuilder <ArgumentsMatchBuilder2<RT, Invocation2<P1, P2> > > { public: @@ -63,7 +63,7 @@ * @param parent parent chainable mock object */ ChainableMockMethod2Common(const String &name, ChainableMockObject *parent ) - : ChainableMockMethodCommon<RT>(name, parent) + : ChainableMockMethodCommon(name, parent) , Builder(&coremock, this->getChainableMockObject(), this->getMethodName()) , coremock(name + MOCKPP_PCHAR("/coreMock"), this) { Index: ChainableMockMethod3.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/ChainableMockMethod3.h,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- ChainableMockMethod3.h 19 Nov 2005 09:18:40 -0000 1.10 +++ ChainableMockMethod3.h 24 Nov 2005 19:17:09 -0000 1.11 @@ -46,7 +46,7 @@ */ template <typename RT, typename P1, typename P2, typename P3> class ChainableMockMethod3Common - : public ChainableMockMethodCommon<RT> + : public ChainableMockMethodCommon , public ChainingMockBuilder <ArgumentsMatchBuilder3<RT, Invocation3<P1, P2, P3> > > { public: @@ -63,7 +63,7 @@ * @param parent parent chainable mock object */ ChainableMockMethod3Common(const String &name, ChainableMockObject *parent ) - : ChainableMockMethodCommon<RT>(name, parent) + : ChainableMockMethodCommon(name, parent) , Builder(&coremock, this->getChainableMockObject(), this->getMethodName()) , coremock(name + MOCKPP_PCHAR("/coreMock"), this) { Index: ChainableMockMethod4.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/ChainableMockMethod4.h,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- ChainableMockMethod4.h 19 Nov 2005 09:18:40 -0000 1.10 +++ ChainableMockMethod4.h 24 Nov 2005 19:17:09 -0000 1.11 @@ -46,7 +46,7 @@ */ template <typename RT, typename P1, typename P2, typename P3, typename P4> class ChainableMockMethod4Common - : public ChainableMockMethodCommon<RT> + : public ChainableMockMethodCommon , public ChainingMockBuilder <ArgumentsMatchBuilder4<RT, Invocation4<P1, P2, P3, P4> > > { public: @@ -63,7 +63,7 @@ * @param parent parent chainable mock object */ ChainableMockMethod4Common(const String &name, ChainableMockObject *parent ) - : ChainableMockMethodCommon<RT>(name, parent) + : ChainableMockMethodCommon(name, parent) , Builder(&coremock, this->getChainableMockObject(), this->getMethodName()) , coremock(name + MOCKPP_PCHAR("/coreMock"), this) { Index: gen_chainablemethod_N.pl =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/gen_chainablemethod_N.pl,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- gen_chainablemethod_N.pl 19 Nov 2005 09:18:39 -0000 1.7 +++ gen_chainablemethod_N.pl 24 Nov 2005 19:17:09 -0000 1.8 @@ -172,7 +172,7 @@ */ template <typename RT" . $templateParms_colon . "> class ChainableMockMethod" . $numArgs . "Common - : public ChainableMockMethodCommon<RT>"; + : public ChainableMockMethodCommon"; if ($numArgs > 0) { @@ -213,7 +213,7 @@ * \@param parent parent chainable mock object */ ChainableMockMethod" . $numArgs . "Common(const String &name, ChainableMockObject *parent ) - : ChainableMockMethodCommon<RT>(name, parent) + : ChainableMockMethodCommon(name, parent) , Builder(&coremock, this->getChainableMockObject(), this->getMethodName()) , coremock(name + MOCKPP_PCHAR(\"/coreMock\"), this) { Index: ChainableMockMethod5.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/ChainableMockMethod5.h,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- ChainableMockMethod5.h 19 Nov 2005 09:18:40 -0000 1.10 +++ ChainableMockMethod5.h 24 Nov 2005 19:17:09 -0000 1.11 @@ -46,7 +46,7 @@ */ template <typename RT, typename P1, typename P2, typename P3, typename P4, typename P5> class ChainableMockMethod5Common - : public ChainableMockMethodCommon<RT> + : public ChainableMockMethodCommon , public ChainingMockBuilder <ArgumentsMatchBuilder5<RT, Invocation5<P1, P2, P3, P4, P5> > > { public: @@ -63,7 +63,7 @@ * @param parent parent chainable mock object */ ChainableMockMethod5Common(const String &name, ChainableMockObject *parent ) - : ChainableMockMethodCommon<RT>(name, parent) + : ChainableMockMethodCommon(name, parent) , Builder(&coremock, this->getChainableMockObject(), this->getMethodName()) , coremock(name + MOCKPP_PCHAR("/coreMock"), this) { Index: ChainableMockMethod0.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/ChainableMockMethod0.h,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- ChainableMockMethod0.h 19 Nov 2005 09:18:40 -0000 1.10 +++ ChainableMockMethod0.h 24 Nov 2005 19:17:09 -0000 1.11 @@ -46,7 +46,7 @@ */ template <typename RT> class ChainableMockMethod0Common - : public ChainableMockMethodCommon<RT> + : public ChainableMockMethodCommon , public ChainingMockBuilder <ArgumentsMatchBuilder0<RT, Invocation0> > { public: @@ -63,7 +63,7 @@ * @param parent parent chainable mock object */ ChainableMockMethod0Common(const String &name, ChainableMockObject *parent ) - : ChainableMockMethodCommon<RT>(name, parent) + : ChainableMockMethodCommon(name, parent) , Builder(&coremock, this->getChainableMockObject(), this->getMethodName()) , coremock(name + MOCKPP_PCHAR("/coreMock"), this) { Index: ChainableMockMethod1.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/ChainableMockMethod1.h,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- ChainableMockMethod1.h 19 Nov 2005 09:18:40 -0000 1.10 +++ ChainableMockMethod1.h 24 Nov 2005 19:17:09 -0000 1.11 @@ -46,7 +46,7 @@ */ template <typename RT, typename P1> class ChainableMockMethod1Common - : public ChainableMockMethodCommon<RT> + : public ChainableMockMethodCommon , public ChainingMockBuilder <ArgumentsMatchBuilder1<RT, Invocation1<P1> > > { public: @@ -63,7 +63,7 @@ * @param parent parent chainable mock object */ ChainableMockMethod1Common(const String &name, ChainableMockObject *parent ) - : ChainableMockMethodCommon<RT>(name, parent) + : ChainableMockMethodCommon(name, parent) , Builder(&coremock, this->getChainableMockObject(), this->getMethodName()) , coremock(name + MOCKPP_PCHAR("/coreMock"), this) { |
|
From: Ewald A. <ewa...@us...> - 2005-11-20 10:03:38
|
Update of /cvsroot/mockpp/homepage In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16342 Modified Files: index-en.gtml Log Message: update Index: index-en.gtml =================================================================== RCS file: /cvsroot/mockpp/homepage/index-en.gtml,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- index-en.gtml 6 May 2005 12:43:56 -0000 1.10 +++ index-en.gtml 20 Nov 2005 10:03:27 -0000 1.11 @@ -77,10 +77,13 @@ </p> <p> - Originally I started with a port of MockObjects to C++ and wanted to keep the same interfaces. But + Originally I started with a port of <a href="http://www.mockobjects.com/">Mock Objects</a> + to C++ and wanted to keep the same interfaces. But in the meanwhile I found out more about Java and it's differencens to C++ (it's funny reflection api for example ) and so I had to change a bunch of details. Additionally I included the - working method of EasyMock. From my limited understanding of Java there seems to be something + working methods of + <a href="http://www.easymock.org/">EasyMock</a> and <a href="http://www.jmock.org/">jMock</a>. + From my limited understanding of Java there seems to be something similar in MockObjects but I guess EasyMock is easier to use and certainly was easier to port to C++. </p> @@ -95,7 +98,7 @@ </p> <p> - Mockpp contains a number of classes, templates and macros which I divide into + Mockpp contains a number of classes, templates (and macros) which I divide into <a href="#basic"><em>Basic Expectations</em></a> and <a href="#advanced"><em>Advanced Expectations</em></a>. @@ -205,7 +208,8 @@ </p> <p> - To easily feed the parameters into your calls you need a <em>controller</em> for your mock object. + To easily feed the expected parameters into your calls you need a mock method + for your mock object. </p> #compress OFF @@ -217,41 +221,48 @@ public: MyVisitableMockObject(const String &name) - : VisitableMockObject(name, 0), - - // creates internal objects for visitable() method below - MOCKPP_CONSTRUCT_MEMBERS_FOR_METHOD1(visitable) + : VisitableMockObject(name, 0) + // constructs an internal mock method + , visitable_mocker("visitable") this) {} - // creates: int visitable(unsigned); - MOCKPP_VISITABLE1(MyVisitableMockObject, int, visitable, unsigned); + // forwards the actual call to the mock method + int visitable(unsigned u) + { + return visitable_mocker.forward(u); + } + + // creates a mock method for: int visitable(unsigned); + VisitableMockMethod<int, unsigned> visitable_mocker; }; .... - MyVisitableMockObject mvo(MOCKPP_PCHAR("mvo")); - MOCKPP_CONTROLLER_FOR(MyVisitableMockObject, visitable) ctr (&mvo); + MyVisitableMockObject mvo("mvo"); + + // create a short hand reference to the mock method + VisitableMockMethod<int, unsigned> &visitor (mvo.visit_mocker); // we are in record mode now: - ctr.addReturnValue(1); // return "1" the first time - ctr.addReturnValue(11); // return "11" the second time - ctr.setDefaultReturnValue(123); // return "123" all the other calls + visitor.addReturnValue(1); // return "1" the first time + visitor.addReturnValue(11); // return "11" the second time + visitor.setDefaultReturnValue(123); // return "123" all the other calls - ctr.addResponseValue(0, 1); // return "0" when passed "1" - ctr.addResponseValue(1, 0); // return "1" when passed "0" + visitor.addResponseValue(0, 1); // return "0" when passed "1" + visitor.addResponseValue(1, 0); // return "1" when passed "0" - ctr.addResponseThrowable(make_throwable(int(1), 1); // throw when passed "1" - ctr.addResponseThrowable(make_throwable(int(0), 0); // throw when passed "0" + visitor.addResponseThrowable(make_throwable(int(1), 1); // throw when passed "1" + visitor.addResponseThrowable(make_throwable(int(0), 0); // throw when passed "0" // throw std::string("string 1") when called the first time - ctr.addThrowable(make_throwable(std::string("string 1"))); + visitor.addThrowable(make_throwable(std::string("string 1"))); // throw std::string("string 2") the next three times - ctr.addThrowable(std::string("string 2"), 3); + visitor.addThrowable(std::string("string 2"), 3); // throw int(123) the rest of the time - ctr.setDefaultThrowable(make_throwable(int(123))); + visitor.setDefaultThrowable(make_throwable(int(123))); mvo.visitable(1); // require "1" as parameter the first time mvo.visitable(2); // require "2" as parameter the second time @@ -298,7 +309,6 @@ <table border="1"><tr><td bgcolor="white"> <pre> - MOCKPP_CHAINER_FOR (MyClass, MyMethod) chainer (&myobject); chainer.expects(once()) .after("other-ident") .with(new IsEqual<int>(321)) |
|
From: Ewald A. <ewa...@us...> - 2005-11-20 10:02:33
|
Update of /cvsroot/mockpp/mockpp/mockpp/docs/en In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16145/mockpp/docs/en Modified Files: dev_advanced_jmock.docbook Log Message: typo Index: dev_advanced_jmock.docbook =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/docs/en/dev_advanced_jmock.docbook,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- dev_advanced_jmock.docbook 17 Nov 2005 21:08:52 -0000 1.15 +++ dev_advanced_jmock.docbook 20 Nov 2005 10:02:25 -0000 1.16 @@ -50,7 +50,7 @@ will be used.</para> <para>For void methods you may apply <methodname>isVoid()</methodname> instead of -<methodname>with()</methodname> to explicitly +<methodname>will()</methodname> to explicitly express this fact.</para> <para>The original java implementation contained an additional method called |
|
From: Ewald A. <ewa...@us...> - 2005-11-19 21:48:03
|
Update of /cvsroot/mockpp/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5173 Modified Files: Makefile.am release-check Log Message: cleanup Index: Makefile.am =================================================================== RCS file: /cvsroot/mockpp/mockpp/Makefile.am,v retrieving revision 1.32 retrieving revision 1.33 diff -u -d -r1.32 -r1.33 --- Makefile.am 30 Oct 2005 20:22:49 -0000 1.32 +++ Makefile.am 19 Nov 2005 21:47:26 -0000 1.33 @@ -89,7 +89,7 @@ ################################################################# -htmldir = $(pkgdatadir) +htmldir = $(pkgdatadir)/html install-data-hook: $(mkdir_p) $(htmldir) Index: release-check =================================================================== RCS file: /cvsroot/mockpp/mockpp/release-check,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- release-check 23 Jul 2005 17:41:49 -0000 1.1 +++ release-check 19 Nov 2005 21:47:26 -0000 1.2 @@ -9,7 +9,7 @@ rm -rf /tmp/$1 tar xzf $2/$1.tar.gz cd $1 -./configure --prefix=$BUILD/_inst1 --enable-unicode || exit 1 +./configure --prefix=$BUILD/_inst1 --enable-unicode --enable-doxygen --enable-docbook || exit 1 make install || exit 1 make check || exit 1 make dist || exit 1 @@ -17,7 +17,7 @@ make distclean cd $BUILD -../$1/configure --prefix=$BUILD/_inst2 || exit 1 +../$1/configure --prefix=$BUILD/_inst2 --enable-doxygen --enable-docbook || exit 1 make install || exit 1 make check || exit 1 make dist || exit 1 |
|
From: Ewald A. <ewa...@us...> - 2005-11-19 21:47:37
|
Update of /cvsroot/mockpp/mockpp/mockpp/docs/api In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5173/mockpp/docs/api Modified Files: Makefile.am Log Message: cleanup Index: Makefile.am =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/docs/api/Makefile.am,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- Makefile.am 18 Nov 2005 20:32:36 -0000 1.22 +++ Makefile.am 19 Nov 2005 21:47:26 -0000 1.23 @@ -27,7 +27,7 @@ -test -r $(PACKAGE)-$(VERSION)-apidoc.tar.zip && rm $(PACKAGE)-$(VERSION)-apidoc.tar.zip -test -d $(PACKAGE)-$(VERSION)-apidoc && rm -rf $(PACKAGE)-$(VERSION)-apidoc mkdir -p $(PACKAGE)-$(VERSION)-apidoc/api-doc - cp -R html/* $(PACKAGE)-$(VERSION)-apidoc/api-doc + -find html | xargs -n 1 cp -v -t $(PACKAGE)-$(VERSION)-apidoc/api-doc -rm $(PACKAGE)-$(VERSION)-apidoc/api-doc/*.md5 -rm $(PACKAGE)-$(VERSION)-apidoc/api-doc/*.map cp $(srcdir)/README $(PACKAGE)-$(VERSION)-apidoc/ |
|
From: Ewald A. <ewa...@us...> - 2005-11-19 19:41:33
|
Update of /cvsroot/mockpp/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14050 Modified Files: ChangeLog Log Message: update Index: ChangeLog =================================================================== RCS file: /cvsroot/mockpp/mockpp/ChangeLog,v retrieving revision 1.76 retrieving revision 1.77 diff -u -d -r1.76 -r1.77 --- ChangeLog 18 Nov 2005 20:32:36 -0000 1.76 +++ ChangeLog 19 Nov 2005 19:41:22 -0000 1.77 @@ -3,7 +3,7 @@ mockpp history -------------- -2005-11-13 1.10.0: +2005-11-19 1.10.0: - fixes for g++ 4.0 - format boolean as "true" instead "1" |
|
From: Ewald A. <ewa...@us...> - 2005-11-19 19:19:43
|
Update of /cvsroot/mockpp/mockpp/mockpp/examples/tutorial In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9769/mockpp/examples/tutorial Modified Files: Makefile.am Log Message: target missing Index: Makefile.am =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/examples/tutorial/Makefile.am,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- Makefile.am 18 Nov 2005 20:32:36 -0000 1.27 +++ Makefile.am 19 Nov 2005 19:19:35 -0000 1.28 @@ -87,7 +87,7 @@ if DOXYGEN_DOC -install-data-hook: +install-data-hook: tutorial $(mkdir_p) $(htmldir)/tutorial $(INSTALL) html/* $(htmldir)/tutorial |
