mockpp-commits Mailing List for Mock Objects for C++
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...> - 2006-04-26 20:43:14
|
Update of /cvsroot/mockpp/mockpp/mockpp/builder In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9920/mockpp/builder Modified Files: ArgumentsMatchBuilderN.h Log Message: renamed a number of internal variables to avoid warning messages |
|
From: Ewald A. <ewa...@us...> - 2006-04-26 20:43:13
|
Update of /cvsroot/mockpp/mockpp/mockpp/stub In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9920/mockpp/stub Modified Files: ThrowStub.h Log Message: renamed a number of internal variables to avoid warning messages Index: ThrowStub.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/stub/ThrowStub.h,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- ThrowStub.h 8 Apr 2006 12:00:37 -0000 1.35 +++ ThrowStub.h 26 Apr 2006 20:43:06 -0000 1.36 @@ -98,15 +98,15 @@ /** Creates the object * @param throwable pointer to the object to throw */ - ThrowStub( Throwable *throwable ) - : ThrowStubBase<R>(throwable) + ThrowStub( Throwable *in_throwable ) + : ThrowStubBase<R>(in_throwable) {} /** Creates the object * @param throwable the object to throw */ - ThrowStub( ThrowableItem &throwable ) - : ThrowStubBase<R>(throwable) + ThrowStub( ThrowableItem &in_throwable ) + : ThrowStubBase<R>(in_throwable) {} /** Mock the invocation without passing parameters. @@ -130,17 +130,17 @@ public: /** Creates the object - * @param throwable pointer to the object to throw + * @param in_throwable pointer to the object to throw */ - ThrowStub( Throwable *throwable ) - : ThrowStubBase<void>(throwable) + ThrowStub( Throwable *in_throwable ) + : ThrowStubBase<void>(in_throwable) {} /** Creates the object - * @param throwable the object to throw + * @param in_throwable the object to throw */ - ThrowStub( ThrowableItem &throwable ) - : ThrowStubBase<void>(throwable) + ThrowStub( ThrowableItem &in_throwable ) + : ThrowStubBase<void>(in_throwable) {} /** Mock the invocation without passing parameters. |
|
From: Ewald A. <ewa...@us...> - 2006-04-26 20:43:12
|
Update of /cvsroot/mockpp/mockpp/mockpp/visiting In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9920/mockpp/visiting Modified Files: CountedVisitableMethod.h ResponseVector1.h ResponseVector2.h ResponseVector3.h ResponseVector4.h ResponseVector5.h ResponseVector6.h VisitableMockMethod0.h VisitableMockMethod1.h VisitableMockMethod2.h VisitableMockMethod3.h VisitableMockMethod4.h VisitableMockMethod5.h VisitableMockMethod6.h Log Message: renamed a number of internal variables to avoid warning messages |
|
From: Ewald A. <ewa...@us...> - 2006-04-26 20:43:12
|
Update of /cvsroot/mockpp/mockpp/mockpp/util In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9920/mockpp/util Modified Files: NotImplementedException.cpp Log Message: renamed a number of internal variables to avoid warning messages Index: NotImplementedException.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/util/NotImplementedException.cpp,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- NotImplementedException.cpp 15 Mar 2006 21:34:09 -0000 1.22 +++ NotImplementedException.cpp 26 Apr 2006 20:43:07 -0000 1.23 @@ -34,12 +34,12 @@ MOCKPP_NS_START - + MOCKPP_EXPORT -NotImplementedException::NotImplementedException(unsigned srcline, const char* srcfile, - const String &message) - : AssertionFailedError(srcline, srcfile, message) +NotImplementedException::NotImplementedException(unsigned in_srcline, const char* in_srcfile, + const String &in_message) + : AssertionFailedError(in_srcline, in_srcfile, in_message) { } |
|
From: Ewald A. <ewa...@us...> - 2006-04-26 20:43:12
|
Update of /cvsroot/mockpp/mockpp/mockpp/constraint In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9920/mockpp/constraint Modified Files: ConstraintSetN.h Log Message: renamed a number of internal variables to avoid warning messages |
|
From: Ewald A. <ewa...@us...> - 2006-04-26 20:43:12
|
Update of /cvsroot/mockpp/mockpp/mockpp/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9920/mockpp/tests Modified Files: AbstractDynamicChainingMock_test.cpp InvocationMockerBuilder_test.cpp mockpp_pti_test.cpp Log Message: renamed a number of internal variables to avoid warning messages Index: InvocationMockerBuilder_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/InvocationMockerBuilder_test.cpp,v retrieving revision 1.38 retrieving revision 1.39 diff -u -d -r1.38 -r1.39 --- InvocationMockerBuilder_test.cpp 15 Mar 2006 21:34:08 -0000 1.38 +++ InvocationMockerBuilder_test.cpp 26 Apr 2006 20:43:07 -0000 1.39 @@ -125,9 +125,9 @@ typedef typename AMB::InvocationType I; typedef typename AMB::ConstraintSetType CS; - InvocationMockerBuilderDummy( MOCKPP_NS::StubMatchersCollection<R, I> *mocker, - MOCKPP_NS::BuilderNamespace *builderNamespace ) - : MOCKPP_NS::InvocationMockerBuilder<AMB>( mocker, builderNamespace ) + InvocationMockerBuilderDummy( MOCKPP_NS::StubMatchersCollection<R, I> *in_mocker, + MOCKPP_NS::BuilderNamespace *in_builderNamespace ) + : MOCKPP_NS::InvocationMockerBuilder<AMB>( in_mocker, in_builderNamespace ) {} #if defined( __BORLANDC__) || (defined(_MSC_VER) && (_MSC_VER < 1300)) Index: AbstractDynamicChainingMock_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/AbstractDynamicChainingMock_test.cpp,v retrieving revision 1.42 retrieving revision 1.43 diff -u -d -r1.42 -r1.43 --- AbstractDynamicChainingMock_test.cpp 15 Mar 2006 21:34:08 -0000 1.42 +++ AbstractDynamicChainingMock_test.cpp 26 Apr 2006 20:43:07 -0000 1.43 @@ -122,10 +122,10 @@ { public: - ChainingMockDummy( typename MOCKPP_NS::InvocationDispatcher<R, I>::AP invocationDispatcher, + ChainingMockDummy( typename MOCKPP_NS::InvocationDispatcher<R, I>::AP in_invocationDispatcher, const MOCKPP_NS::String &name, MOCKPP_NS::VerifiableList *parent ) - : MOCKPP_NS::AbstractDynamicChainingMock<R,I>(invocationDispatcher, name, parent) + : MOCKPP_NS::AbstractDynamicChainingMock<R,I>(in_invocationDispatcher, name, parent) {} R invoke(const I &invocation) Index: mockpp_pti_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/mockpp_pti_test.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- mockpp_pti_test.cpp 15 Mar 2006 21:34:08 -0000 1.18 +++ mockpp_pti_test.cpp 26 Apr 2006 20:43:07 -0000 1.19 @@ -343,10 +343,10 @@ { public: - ChainingMockDummy( MOCKPP_NS::InvocationDispatcher<void, Setter1Invocation>::AP invocationDispatcher, + ChainingMockDummy( MOCKPP_NS::InvocationDispatcher<void, Setter1Invocation>::AP in_invocationDispatcher, const MOCKPP_NS::String &name, MOCKPP_NS::VerifiableList *parent ) - : MOCKPP_NS::AbstractDynamicChainingMock<void, Setter1Invocation>(invocationDispatcher, name, parent) + : MOCKPP_NS::AbstractDynamicChainingMock<void, Setter1Invocation>(in_invocationDispatcher, name, parent) {} void invoke(const Setter1Invocation &invocation) |
Update of /cvsroot/mockpp/mockpp/mockpp/chaining In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9920/mockpp/chaining Modified Files: AbstractDynamicChainingMock.h ChainableMockMethod0.h ChainableMockMethod1.h ChainableMockMethod2.h ChainableMockMethod3.h ChainableMockMethod4.h ChainableMockMethod5.h ChainableMockMethod6.h CoreMock.h CountedChainableMethod.h Invocation.cpp InvocationN.h OnConsecutiveCalls.h gen_invocation_N.pl Log Message: renamed a number of internal variables to avoid warning messages Index: gen_invocation_N.pl =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/gen_invocation_N.pl,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- gen_invocation_N.pl 15 Mar 2006 21:56:33 -0000 1.4 +++ gen_invocation_N.pl 26 Apr 2006 20:43:06 -0000 1.5 @@ -187,20 +187,20 @@ print OUT " /** Constructs the object - * \@param name name of he object"; + * \@param objname name of the object"; for($p = 1; $p <= $numArgs; ++$p) { print OUT " * \@param in_param" . $p . " parameter " . $p ; } print OUT " */ - Invocation" . $numArgs . "( const String &name"; + Invocation" . $numArgs . "( const String &objname"; for($p = 1; $p <= $numArgs; ++$p) { print OUT " , const P" . $p . " &in_param" . $p; } print OUT ") - : Invocation( name )"; + : Invocation( objname )"; for($p = 1; $p <= $numArgs; ++$p) { print OUT " , param" . $p . "( in_param" . $p . " )"; } Index: InvocationN.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/InvocationN.h,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- InvocationN.h 15 Mar 2006 21:56:33 -0000 1.10 +++ InvocationN.h 26 Apr 2006 20:43:06 -0000 1.11 @@ -53,12 +53,12 @@ typedef P1 T1Type; /** Constructs the object - * @param name name of he object + * @param objname name of the object * @param in_param1 parameter 1 */ - Invocation1( const String &name + Invocation1( const String &objname , const P1 &in_param1) - : Invocation( name ) + : Invocation( objname ) , param1( in_param1 ) { } @@ -126,14 +126,14 @@ typedef P2 T2Type; /** Constructs the object - * @param name name of he object + * @param objname name of the object * @param in_param1 parameter 1 * @param in_param2 parameter 2 */ - Invocation2( const String &name + Invocation2( const String &objname , const P1 &in_param1 , const P2 &in_param2) - : Invocation( name ) + : Invocation( objname ) , param1( in_param1 ) , param2( in_param2 ) { @@ -214,16 +214,16 @@ typedef P3 T3Type; /** Constructs the object - * @param name name of he object + * @param objname name of the object * @param in_param1 parameter 1 * @param in_param2 parameter 2 * @param in_param3 parameter 3 */ - Invocation3( const String &name + Invocation3( const String &objname , const P1 &in_param1 , const P2 &in_param2 , const P3 &in_param3) - : Invocation( name ) + : Invocation( objname ) , param1( in_param1 ) , param2( in_param2 ) , param3( in_param3 ) @@ -317,18 +317,18 @@ typedef P4 T4Type; /** Constructs the object - * @param name name of he object + * @param objname name of the object * @param in_param1 parameter 1 * @param in_param2 parameter 2 * @param in_param3 parameter 3 * @param in_param4 parameter 4 */ - Invocation4( const String &name + Invocation4( const String &objname , const P1 &in_param1 , const P2 &in_param2 , const P3 &in_param3 , const P4 &in_param4) - : Invocation( name ) + : Invocation( objname ) , param1( in_param1 ) , param2( in_param2 ) , param3( in_param3 ) @@ -435,20 +435,20 @@ typedef P5 T5Type; /** Constructs the object - * @param name name of he object + * @param objname name of the object * @param in_param1 parameter 1 * @param in_param2 parameter 2 * @param in_param3 parameter 3 * @param in_param4 parameter 4 * @param in_param5 parameter 5 */ - Invocation5( const String &name + Invocation5( const String &objname , const P1 &in_param1 , const P2 &in_param2 , const P3 &in_param3 , const P4 &in_param4 , const P5 &in_param5) - : Invocation( name ) + : Invocation( objname ) , param1( in_param1 ) , param2( in_param2 ) , param3( in_param3 ) @@ -568,7 +568,7 @@ typedef P6 T6Type; /** Constructs the object - * @param name name of he object + * @param objname name of the object * @param in_param1 parameter 1 * @param in_param2 parameter 2 * @param in_param3 parameter 3 @@ -576,14 +576,14 @@ * @param in_param5 parameter 5 * @param in_param6 parameter 6 */ - Invocation6( const String &name + Invocation6( const String &objname , const P1 &in_param1 , const P2 &in_param2 , const P3 &in_param3 , const P4 &in_param4 , const P5 &in_param5 , const P6 &in_param6) - : Invocation( name ) + : Invocation( objname ) , param1( in_param1 ) , param2( in_param2 ) , param3( in_param3 ) Index: Invocation.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/Invocation.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- Invocation.cpp 15 Mar 2006 21:34:02 -0000 1.7 +++ Invocation.cpp 26 Apr 2006 20:43:06 -0000 1.8 @@ -68,8 +68,8 @@ ///////////////////////////////////////////////////////////// -MOCKPP_EXPORT Invocation0::Invocation0( const String &name) - : Invocation( name) +MOCKPP_EXPORT Invocation0::Invocation0( const String &in_name) + : Invocation( in_name) { } Index: AbstractDynamicChainingMock.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/AbstractDynamicChainingMock.h,v retrieving revision 1.42 retrieving revision 1.43 diff -u -d -r1.42 -r1.43 --- AbstractDynamicChainingMock.h 19 Mar 2006 11:09:37 -0000 1.42 +++ AbstractDynamicChainingMock.h 26 Apr 2006 20:43:06 -0000 1.43 @@ -228,14 +228,14 @@ public: /** Constructs the chaining mock - * @param invocationDispatcher pointer to invocation dispatcher - * @param name pointer to invocation dispatcher - * @param parent pointer to parent verifiable + * @param in_invocationDispatcher pointer to invocation dispatcher + * @param name pointer to invocation dispatcher + * @param parent pointer to parent verifiable */ - AbstractDynamicChainingMock( typename InvocationDispatcher<R, I>::AP invocationDispatcher, + AbstractDynamicChainingMock( typename InvocationDispatcher<R, I>::AP in_invocationDispatcher, const String &name, VerifiableList *parent) - : AbstractDynamicChainingMockImpl<R,I>(invocationDispatcher, name, parent) + : AbstractDynamicChainingMockImpl<R,I>(in_invocationDispatcher, name, parent) {} /** Constructs the chaining mock @@ -299,10 +299,10 @@ * @param name pointer to invocation dispatcher * @param parent pointer to parent verifiable */ - AbstractDynamicChainingMock( typename InvocationDispatcher<void, I>::AP invocationDispatcher, + AbstractDynamicChainingMock( typename InvocationDispatcher<void, I>::AP in_invocationDispatcher, const String &name, VerifiableList *parent) - : AbstractDynamicChainingMockImpl<void, I>(invocationDispatcher, name, parent) + : AbstractDynamicChainingMockImpl<void, I>(in_invocationDispatcher, name, parent) {} /** Constructs the chaining mock @@ -370,10 +370,10 @@ class AbstractDynamicChainingMock<void, I> : public AbstractDynamicChainingMockImpl<void, I> \ { \ public: \ - AbstractDynamicChainingMock( InvocationDispatcher<void, I>::AP invocationDispatcher, \ + AbstractDynamicChainingMock( InvocationDispatcher<void, I>::AP in_invocationDispatcher, \ const String &name, \ VerifiableList *parent) \ - : AbstractDynamicChainingMockImpl<void, I>(invocationDispatcher, name, parent) \ + : AbstractDynamicChainingMockImpl<void, I>(in_invocationDispatcher, name, parent) \ {} \ \ AbstractDynamicChainingMock( const String &name, \ Index: CoreMock.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/CoreMock.h,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- CoreMock.h 15 Mar 2006 21:34:02 -0000 1.18 +++ CoreMock.h 26 Apr 2006 20:43:06 -0000 1.19 @@ -58,10 +58,10 @@ * @param parent pointer to parent verifiable * @return return value from mocked invocation */ - CoreMock( typename InvocationDispatcher<R, I>::AP invocationDispatcher, + CoreMock( typename InvocationDispatcher<R, I>::AP in_invocationDispatcher, const String &name, VerifiableList *parent) - : AbstractDynamicChainingMock<R, I>( invocationDispatcher, name, parent ) + : AbstractDynamicChainingMock<R, I>( in_invocationDispatcher, name, parent ) {} /** Construct the object. @@ -101,10 +101,10 @@ * @param parent pointer to parent verifiable * @return return value from mocked invocation */ - CoreMock( typename InvocationDispatcher<void, I>::AP invocationDispatcher, + CoreMock( typename InvocationDispatcher<void, I>::AP in_invocationDispatcher, const String &name, VerifiableList *parent) - : AbstractDynamicChainingMock<void, I>( invocationDispatcher, name, parent ) + : AbstractDynamicChainingMock<void, I>( in_invocationDispatcher, name, parent ) {} /** Construct the object. @@ -150,10 +150,10 @@ class CoreMock<void, I> : public AbstractDynamicChainingMock<void, I> \ { \ public: \ - CoreMock<void, I>( InvocationDispatcher<void, I>::AP invocationDispatcher, \ + CoreMock<void, I>( InvocationDispatcher<void, I>::AP in_invocationDispatcher, \ const String &name, \ VerifiableList *parent) \ - : AbstractDynamicChainingMock<void, I>( invocationDispatcher, name, parent ) \ + : AbstractDynamicChainingMock<void, I>( in_invocationDispatcher, name, parent ) \ {} \ \ CoreMock<void, I>( const String &name, VerifiableList *parent) \ |
|
From: Ewald A. <ewa...@us...> - 2006-04-26 20:43:11
|
Update of /cvsroot/mockpp/mockpp/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9920/mockpp Modified Files: CountParameters.h ExpectationList.h mockpp.cpp mockpp_config-bcb5.h mockpp_config-msvc_71.h Log Message: renamed a number of internal variables to avoid warning messages Index: mockpp_config-bcb5.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/mockpp_config-bcb5.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- mockpp_config-bcb5.h 17 Mar 2006 08:42:46 -0000 1.5 +++ mockpp_config-bcb5.h 26 Apr 2006 20:43:06 -0000 1.6 @@ -1,6 +1,6 @@ // #define's for Borland BCB5 // derived from automatically generated config.h. See Makefile.am. -/* Generated: 2006-03-16 */ +/* Generated: 2006-04-26 */ #pragma warn -8030 // temporary variables @@ -11,7 +11,7 @@ #undef DEBUG /* Version number of package */ -#define MOCKPP_VERSION "1.11.4" +#define MOCKPP_VERSION "1.11.5" /* Name of package */ #define MOCKPP_PACKAGE "mockpp" Index: mockpp.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/mockpp.cpp,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- mockpp.cpp 5 Apr 2006 17:03:37 -0000 1.27 +++ mockpp.cpp 26 Apr 2006 20:43:06 -0000 1.28 @@ -54,7 +54,7 @@ major = MOCKPP_STD_NS::atoi(num.c_str()); #endif s.erase(0, pos+1); - MOCKPP_STD_NS::size_t pos = s.find('.'); + pos = s.find('.'); if (pos != MOCKPP_STL::string::npos) { Index: mockpp_config-msvc_71.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/mockpp_config-msvc_71.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- mockpp_config-msvc_71.h 17 Mar 2006 08:42:46 -0000 1.5 +++ mockpp_config-msvc_71.h 26 Apr 2006 20:43:06 -0000 1.6 @@ -1,6 +1,6 @@ // #define's for MS Visual C++ 7.1 and later (NOT 6.0/7.0) // derived from automatically generated config.h. See Makefile.am. -/* Generated: 2006-03-16 */ +/* Generated: 2006-04-26 */ /* Define to use sprintf_s instead of sprintf. */ #if _MSC_VER >= 1400 @@ -11,7 +11,7 @@ #undef DEBUG /* Version number of package */ -#define MOCKPP_VERSION "1.11.4" +#define MOCKPP_VERSION "1.11.5" /* Name of package */ #define MOCKPP_PACKAGE "mockpp" Index: ExpectationList.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/ExpectationList.h,v retrieving revision 1.43 retrieving revision 1.44 diff -u -d -r1.43 -r1.44 --- ExpectationList.h 5 Apr 2006 17:03:37 -0000 1.43 +++ ExpectationList.h 26 Apr 2006 20:43:06 -0000 1.44 @@ -226,17 +226,17 @@ */ void checkImmediateValue(const T &actualItem) const { - unsigned size = actualItems.size(); + unsigned itemsize = actualItems.size(); String fmt = mockpp_i18n(MOCKPP_PCHAR("%1 had different item sizes.\n") MOCKPP_PCHAR("Expected %2 items but received %3 when adding %4.")); - fmt << this->getVerifiableName() << expectedItems.size() << size << actualItem; + fmt << this->getVerifiableName() << expectedItems.size() << itemsize << actualItem; - MOCKPP_ASSERT_TRUE_MESSAGE(fmt, expectedItems.size() >= size); + MOCKPP_ASSERT_TRUE_MESSAGE(fmt, expectedItems.size() >= itemsize); fmt = mockpp_i18n(MOCKPP_PCHAR("%1 added item[%2] does not match. %3 != %4.")); - fmt << this->getVerifiableName() << size << expectedItems[(size - 1)] << actualItem; + fmt << this->getVerifiableName() << itemsize << expectedItems[(itemsize - 1)] << actualItem; - this->assertEquals(fmt, actualItem, expectedItems[(size - 1)]); + this->assertEquals(fmt, actualItem, expectedItems[(itemsize - 1)]); } private: |
|
From: Ewald A. <ewa...@us...> - 2006-04-26 20:43:11
|
Update of /cvsroot/mockpp/mockpp/mockpp/compat In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9920/mockpp/compat Modified Files: AssertionFailedError.cpp Log Message: renamed a number of internal variables to avoid warning messages Index: AssertionFailedError.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/compat/AssertionFailedError.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- AssertionFailedError.cpp 15 Mar 2006 21:34:02 -0000 1.19 +++ AssertionFailedError.cpp 26 Apr 2006 20:43:06 -0000 1.20 @@ -36,9 +36,9 @@ MOCKPP_EXPORT -AssertionFailedError::AssertionFailedError (unsigned srcline, const char* srcfile, - const String &msg) - : Exception(srcline, srcfile, msg) +AssertionFailedError::AssertionFailedError (unsigned in_srcline, const char* in_srcfile, + const String &in_msg) + : Exception(in_srcline, in_srcfile, in_msg) { } @@ -50,10 +50,10 @@ MOCKPP_EXPORT -void assertionFailed(unsigned srcline, const String& srcfile, - const String &message) +void assertionFailed(unsigned in_srcline, const String& in_srcfile, + const String &in_message) { - assertionFailed(srcline, getLatin1(srcfile).c_str(), message); + assertionFailed(in_srcline, getLatin1(in_srcfile).c_str(), in_message); } |
|
From: Ewald A. <ewa...@us...> - 2006-04-26 20:43:11
|
Update of /cvsroot/mockpp/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9920 Modified Files: ChangeLog configure.in run-configure-unicode.sh Log Message: renamed a number of internal variables to avoid warning messages Index: run-configure-unicode.sh =================================================================== RCS file: /cvsroot/mockpp/mockpp/run-configure-unicode.sh,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- run-configure-unicode.sh 8 Apr 2006 12:00:32 -0000 1.22 +++ run-configure-unicode.sh 26 Apr 2006 20:43:05 -0000 1.23 @@ -1,5 +1,5 @@ #!/bin/sh -MYFLAGS="-O0 -g3 -Wall -Werror" +MYFLAGS="-O0 -g3 -Wall -Werror -Wshadow" #-pedantic MYCC="g++"; @@ -17,6 +17,7 @@ fi echo MYCC: $MYCC +echo MYFLAGS: $MYFLAGS #OPTS="--enable-doxygen --enable-docbook" #OPTS="$OPTS --enable-builtin-stl" # --disable-rtti" # --disable-exceptions" Index: ChangeLog =================================================================== RCS file: /cvsroot/mockpp/mockpp/ChangeLog,v retrieving revision 1.106 retrieving revision 1.107 diff -u -d -r1.106 -r1.107 --- ChangeLog 8 Apr 2006 12:00:32 -0000 1.106 +++ ChangeLog 26 Apr 2006 20:43:05 -0000 1.107 @@ -4,6 +4,11 @@ -------------- 2006-04-07 1.11.4 + - renamed a number of internal variables to avoid warnings due to + shadowed members. + +2006-04-07 1.11.4 + - added script to retrieve data from configure for use in other libraries - added compiler switches to disable namespaces Index: configure.in =================================================================== RCS file: /cvsroot/mockpp/mockpp/configure.in,v retrieving revision 1.118 retrieving revision 1.119 diff -u -d -r1.118 -r1.119 --- configure.in 11 Apr 2006 10:00:35 -0000 1.118 +++ configure.in 26 Apr 2006 20:43:05 -0000 1.119 @@ -17,7 +17,7 @@ # MOCKPP_MAJOR_VERSION=1 MOCKPP_MINOR_VERSION=11 -MOCKPP_PATCH_VERSION=4 +MOCKPP_PATCH_VERSION=5 MOCKPP_MICRO_VERSION=38 MOCKPP_INTERFACE_AGE=0 |
|
From: Ewald A. <ewa...@us...> - 2006-04-11 10:03:32
|
Update of /cvsroot/mockpp/mockpp/bcb10 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27365/bcb10 Modified Files: missing-options.txt mockpp.bdsgroup Log Message: update Index: missing-options.txt =================================================================== RCS file: /cvsroot/mockpp/mockpp/bcb10/missing-options.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- missing-options.txt 10 Apr 2006 16:05:31 -0000 1.1 +++ missing-options.txt 11 Apr 2006 10:03:22 -0000 1.2 @@ -1,10 +1,10 @@ DLL - <property category="win32.*.win32b.ilink32" name="param.libfiles.2" value="import32.lib"/> - <property category="win32.*.win32b.ilink32" name="param.libfiles.3" value="cw32mti.lib"/> + <property category="win32.*.win32b.ilink32" name="param.libfiles.2" value="import32.lib"/> + <property category="win32.*.win32b.ilink32" name="param.libfiles.3" value="cw32mti.lib"/> - <property category="win32.*.win32b.ilink32" name="param.objfiles.1" value="c0d32.obj"/> - <property category="win32.*.win32b.ilink32" name="param.objfiles.2" value="$(PACKAGES)"/> + <property category="win32.*.win32b.ilink32" name="param.objfiles.1" value="c0d32.obj"/> + <property category="win32.*.win32b.ilink32" name="param.objfiles.2" value="$(PACKAGES)"/> <property category="win32.*.win32b.ilink32" name="option.Tpd.enabled" value="1"/> Index: mockpp.bdsgroup =================================================================== RCS file: /cvsroot/mockpp/mockpp/bcb10/mockpp.bdsgroup,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- mockpp.bdsgroup 20 Mar 2006 17:28:15 -0000 1.1 +++ mockpp.bdsgroup 11 Apr 2006 10:03:22 -0000 1.2 @@ -8,24 +8,26 @@ <Option Name="GUID">{8A1A2B31-ACDB-43B3-9F29-5E1774C202DF}</Option> </Option> </PersonalityInfo> - <Default.Personality> <Projects> - <Projects Name="mockpp_production.dll">mockpp_production.bdsproj</Projects> - <Projects Name="mockpp_cxxtest.dll">mockpp_cxxtest.bdsproj</Projects> - <Projects Name="mockpp.dll">mockpp.bdsproj</Projects> - <Projects Name="mock_test.exe">mock_test.bdsproj</Projects> - <Projects Name="mock_test_win32.exe">mock_test_win32.bdsproj</Projects> - <Projects Name="basicmock.exe">basicmock.bdsproj</Projects> - <Projects Name="visitmock.exe">visitmock.bdsproj</Projects> - <Projects Name="chainmock.exe">chainmock.bdsproj</Projects> - <Projects Name="poormock.exe">poormock.bdsproj</Projects> - <Projects Name="visitmock2.exe">visitmock2.bdsproj</Projects> - <Projects Name="chainmock2.exe">chainmock2.bdsproj</Projects> - <Projects Name="poormock-se.exe">poormock-se.bdsproj</Projects> - <Projects Name="readability.exe">readability.bdsproj</Projects> - <Projects Name="mock_greeter.exe">mock_greeter.bdsproj</Projects> - <Projects Name="verifying.exe">verifying.bdsproj</Projects> - <Projects Name="cppunit.exe">cppunit.bdsproj</Projects> - <Projects Name="Targets">mockpp_production.dll mockpp_cxxtest.dll mockpp.dll mock_test.exe mock_test_win32.exe basicmock.exe visitmock.exe chainmock.exe poormock.exe visitmock2.exe chainmock2.exe poormock-se.exe readability.exe mock_greeter.exe verifying.exe cppunit.exe</Projects> + <Default.Personality> + + <Projects> + <Projects Name="mockpp_production_34.dll">mockpp_production_34.bdsproj</Projects> + <Projects Name="mockpp_cxxtest_34.dll">mockpp_cxxtest_34.bdsproj</Projects> + <Projects Name="mockpp_34.dll">mockpp_34.bdsproj</Projects> + <Projects Name="mock_test_34.exe">mock_test_34.bdsproj</Projects> + <Projects Name="mock_test_win32_34.exe">mock_test_win32_34.bdsproj</Projects> + <Projects Name="basicmock_34.exe">basicmock_34.bdsproj</Projects> + <Projects Name="visitmock_34.exe">visitmock_34.bdsproj</Projects> + <Projects Name="chainmock_34.exe">chainmock_34.bdsproj</Projects> + <Projects Name="poormock_34.exe">poormock_34.bdsproj</Projects> + <Projects Name="visitmock2_34.exe">visitmock2_34.bdsproj</Projects> + <Projects Name="chainmock2_34.exe">chainmock2_34.bdsproj</Projects> + <Projects Name="poormock_se_34.exe">poormock_se_34.bdsproj</Projects> + <Projects Name="readability_34.exe">readability_34.bdsproj</Projects> + <Projects Name="mock_greeter_34.exe">mock_greeter_34.bdsproj</Projects> + <Projects Name="verifying_34.exe">verifying_34.bdsproj</Projects> + <Projects Name="cppunit_34.exe">cppunit_34.bdsproj</Projects> + <Projects Name="Targets">mockpp_production_34.dll mockpp_cxxtest_34.dll mockpp_34.dll mock_test_34.exe mock_test_win32_34.exe basicmock_34.exe visitmock_34.exe chainmock_34.exe poormock_34.exe visitmock2_34.exe chainmock2_34.exe poormock_se_34.exe readability_34.exe mock_greeter_34.exe verifying_34.exe cppunit_34.exe</Projects> </Projects> <Dependencies> <Dependency GUID="{EC889460-A6C3-4F61-94F9-760FD719CDCB}"> @@ -36,5 +38,6 @@ <Dependency GUID="{EC889460-A6C3-4F61-94F9-760FD719CDCB}"/> </Dependency> </Dependencies> - </Default.Personality> + </Default.Personality> <StarTeamAssociation></StarTeamAssociation> + <StarTeamNonRelativeFiles></StarTeamNonRelativeFiles> </BorlandProject> |
Update of /cvsroot/mockpp/mockpp/bcb10 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26672/bcb10 Added Files: basicmock_34.bdsproj basicmock_34.bpf chainmock2_34.bdsproj chainmock2_34.bpf chainmock_34.bdsproj chainmock_34.bpf cppunit_34.bdsproj cppunit_34.bpf mock_greeter_34.bdsproj mock_greeter_34.bpf mockpp_34.bdsproj mockpp_34.bpf mockpp_cxxtest_34.bdsproj mockpp_cxxtest_34.bpf mockpp_production_34.bdsproj mockpp_production_34.bpf mock_test_34.bdsproj mock_test_34.bpf mock_test_win32_34.bdsproj mock_test_win32_34.bpf poormock_34.bdsproj poormock_34.bpf poormock_se_34.bdsproj poormock_se_34.bpf readability_34.bdsproj readability_34.bpf verifying_34.bdsproj verifying_34.bpf visitmock2_34.bdsproj visitmock2_34.bpf visitmock_34.bdsproj visitmock_34.bpf Log Message: add recent bcb10 project files --- NEW FILE: visitmock_34.bdsproj --- (This appears to be a binary file; contents omitted.) --- NEW FILE: chainmock2_34.bpf --- This file is used by the project manager only and should be treated like the project file main --- NEW FILE: mockpp_cxxtest_34.bpf --- This file is used by the project manager only and should be treated like the project file DllEntryPoint --- NEW FILE: visitmock_34.bpf --- This file is used by the project manager only and should be treated like the project file main --- NEW FILE: chainmock_34.bdsproj --- (This appears to be a binary file; contents omitted.) --- NEW FILE: visitmock2_34.bdsproj --- (This appears to be a binary file; contents omitted.) --- NEW FILE: chainmock2_34.bdsproj --- (This appears to be a binary file; contents omitted.) --- NEW FILE: chainmock_34.bpf --- This file is used by the project manager only and should be treated like the project file main --- NEW FILE: mockpp_production_34.bdsproj --- (This appears to be a binary file; contents omitted.) --- NEW FILE: cppunit_34.bpf --- This file is used by the project manager only and should be treated like the project file main --- NEW FILE: visitmock2_34.bpf --- This file is used by the project manager only and should be treated like the project file main --- NEW FILE: readability_34.bdsproj --- (This appears to be a binary file; contents omitted.) --- NEW FILE: mock_test_34.bpf --- //--------------------------------------------------------------------------- This file is used by the project manager only and should be treated like the project file main //--------------------------------------------------------------------------- --- NEW FILE: mock_greeter_34.bdsproj --- (This appears to be a binary file; contents omitted.) --- NEW FILE: poormock_se_34.bdsproj --- (This appears to be a binary file; contents omitted.) --- NEW FILE: mockpp_production_34.bpf --- This file is used by the project manager only and should be treated like the project file DllEntryPoint --- NEW FILE: basicmock_34.bpf --- This file is used by the project manager only and should be treated like the project file main --- NEW FILE: mock_test_win32_34.bpf --- //--------------------------------------------------------------------------- This file is used by the project manager only and should be treated like the project file main //--------------------------------------------------------------------------- --- NEW FILE: verifying_34.bpf --- T//--------------------------------------------------------------------------- his file is used by the project manager only and should be treated like the project file main --- NEW FILE: poormock_34.bdsproj --- (This appears to be a binary file; contents omitted.) --- NEW FILE: mock_test_34.bdsproj --- (This appears to be a binary file; contents omitted.) --- NEW FILE: mock_greeter_34.bpf --- This file is used by the project manager only and should be treated like the project file main --- NEW FILE: poormock_se_34.bpf --- T//--------------------------------------------------------------------------- his file is used by the project manager only and should be treated like the project file main --- NEW FILE: basicmock_34.bdsproj --- (This appears to be a binary file; contents omitted.) --- NEW FILE: mockpp_34.bpf --- This file is used by the project manager only and should be treated like the project file DllEntryPoint --- NEW FILE: poormock_34.bpf --- T//--------------------------------------------------------------------------- his file is used by the project manager only and should be treated like the project file main --- NEW FILE: mock_test_win32_34.bdsproj --- (This appears to be a binary file; contents omitted.) --- NEW FILE: cppunit_34.bdsproj --- (This appears to be a binary file; contents omitted.) --- NEW FILE: verifying_34.bdsproj --- (This appears to be a binary file; contents omitted.) --- NEW FILE: readability_34.bpf --- This file is used by the project manager only and should be treated like the project file main --- NEW FILE: mockpp_cxxtest_34.bdsproj --- (This appears to be a binary file; contents omitted.) --- NEW FILE: mockpp_34.bdsproj --- (This appears to be a binary file; contents omitted.) |
|
From: Ewald A. <ewa...@us...> - 2006-04-11 10:00:38
|
Update of /cvsroot/mockpp/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24950 Modified Files: configure.in Makefile.am Log Message: add bcb10 project files Index: Makefile.am =================================================================== RCS file: /cvsroot/mockpp/mockpp/Makefile.am,v retrieving revision 1.39 retrieving revision 1.40 diff -u -d -r1.39 -r1.40 --- Makefile.am 4 Feb 2006 14:50:38 -0000 1.39 +++ Makefile.am 11 Apr 2006 10:00:35 -0000 1.40 @@ -1,4 +1,4 @@ -SUBDIRS = tool config 3party mockpp bcb5 msvc71 msvc2005 +SUBDIRS = tool config 3party mockpp bcb5 bcb10 msvc71 msvc2005 LIBTOOL_DEPS = @LIBTOOL_DEPS@ Index: configure.in =================================================================== RCS file: /cvsroot/mockpp/mockpp/configure.in,v retrieving revision 1.117 retrieving revision 1.118 diff -u -d -r1.117 -r1.118 --- configure.in 5 Apr 2006 17:03:35 -0000 1.117 +++ configure.in 11 Apr 2006 10:00:35 -0000 1.118 @@ -562,6 +562,7 @@ Makefile \ \ bcb5/Makefile \ + bcb10/Makefile \ \ 3party/Makefile \ 3party/ministl/Makefile \ |
|
From: Ewald A. <ewa...@us...> - 2006-04-11 09:59:06
|
Update of /cvsroot/mockpp/mockpp/mockpp/stub In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23350/mockpp/stub Modified Files: VoidStub.h Log Message: typo Index: VoidStub.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/stub/VoidStub.h,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- VoidStub.h 8 Apr 2006 12:00:37 -0000 1.21 +++ VoidStub.h 11 Apr 2006 09:59:02 -0000 1.22 @@ -42,7 +42,7 @@ MOCKPP_NS_START -/** A stub for woid methods. Not really useful but needed for compatibility. +/** A stub for void methods. Not really useful but needed for compatibility. * May also be useful to express this property within an expectation. * @ingroup grp_stub * @see mockpp::onConsecutiveCalls |
|
From: Ewald A. <ewa...@us...> - 2006-04-10 16:06:56
|
Update of /cvsroot/mockpp/mockpp/bcb10 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28960/bcb10 Modified Files: Makefile.am Log Message: first porting efforts Index: Makefile.am =================================================================== RCS file: /cvsroot/mockpp/mockpp/bcb10/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Makefile.am 10 Apr 2006 16:05:31 -0000 1.2 +++ Makefile.am 10 Apr 2006 16:06:53 -0000 1.3 @@ -6,7 +6,7 @@ gen-mak.bat \ run.bat \ compile.bat \ - mockpp.bpg \ + mockpp.bdsgroup \ mockpp_production.bdsproj \ mockpp_production.bpf \ mockpp_cxxtest.bdsproj \ |
Update of /cvsroot/mockpp/mockpp/bcb10 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27621/bcb10 Modified Files: Makefile.am basicmock.bdsproj chainmock.bdsproj chainmock2.bdsproj cppunit.bdsproj mock_greeter.bdsproj mock_test.bdsproj mock_test_win32.bdsproj mockpp.bdsproj mockpp_cxxtest.bdsproj mockpp_cxxtest.bpf mockpp_production.bdsproj poormock-se.bdsproj poormock.bdsproj readability.bdsproj verifying.bdsproj visitmock.bdsproj visitmock2.bdsproj Added Files: missing-options.txt Log Message: first porting efforts Index: cppunit.bdsproj =================================================================== RCS file: /cvsroot/mockpp/mockpp/bcb10/cppunit.bdsproj,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- cppunit.bdsproj 20 Mar 2006 17:20:48 -0000 1.1 +++ cppunit.bdsproj 10 Apr 2006 16:05:31 -0000 1.2 @@ -1,15 +1,15 @@ <?xml version="1.0" encoding="utf-8"?> <BorlandProject> - <PersonalityInfo> - <Option> - <Option Name="Personality">CPlusPlusBuilder.Personality</Option> - <Option Name="ProjectType">CppConsoleApplication</Option> - <Option Name="Version">1.0</Option> - <Option Name="GUID">{DD9ED263-89AC-4669-B992-A63577FF0C67}</Option> - </Option> - </PersonalityInfo> - <CPlusPlusBuilder.Personality> - <BCBPROJECT> + <PersonalityInfo> + <Option> + <Option Name="Personality">CPlusPlusBuilder.Personality</Option> + <Option Name="ProjectType">CppConsoleApplication</Option> + <Option Name="Version">1.0</Option> + <Option Name="GUID">{DD9ED263-89AC-4669-B992-A63577FF0C67}</Option> + </Option> + </PersonalityInfo> + <CPlusPlusBuilder.Personality> + <BCBPROJECT> <project version="10.0"> <property category="build.config" name="active" value="0"/> <property category="build.config" name="count" value="1"/> @@ -25,7 +25,7 @@ <property category="build.config.1" name="settings.win32b" value="default"/> <property category="build.config.1" name="type" value="Toolset"/> <property category="build.config.1" name="win32.win32b.builddir" value="Release_Build"/> - <property category="build.node" name="name" value="cppunit_34.exe"/> + <property category="build.node" name="name" value="cppunit.exe"/> <property category="build.node" name="packages" value="rtl;vcl;vclx;bcbsmp;dbrtl;vcldb;bdertl;ibsmp;vcldbx;teeui;teedb;tee;ibxpress;bcbie;vclie;inetdb;inet;bcboffice2k"/> <property category="build.node" name="use_packages" value="1"/> <property category="build.platform" name="active" value="win32"/> @@ -34,6 +34,10 @@ <property category="build.platform" name="win32.default" value="win32b"/> <property category="build.platform" name="win32.enabled" value="1"/> <property category="build.platform" name="win32.win32b.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="param.filenames.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="param.listfile.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="param.objfile.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="param.xreffile.merge" value="1"/> <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.1" value="_DEBUG"/> <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/> <property category="win32.Debug_Build.win32b.bcc32" name="option.D.enabled" value="1"/> @@ -101,6 +105,7 @@ <property category="win32.*.win32b.bcc32" name="option.tWC.enabled" value="1"/> <property category="win32.*.win32b.bcc32" name="option.tWM.enabled" value="1"/> <property category="win32.*.win32b.bcc32" name="option.v.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.vG.enabled" value="1"/> <property category="win32.*.win32b.bcc32" name="option.vGc.enabled" value="1"/> <property category="win32.*.win32b.bcc32" name="option.vGd.enabled" value="1"/> <property category="win32.*.win32b.bcc32" name="option.vGt.enabled" value="1"/> @@ -158,6 +163,8 @@ <property category="win32.*.win32b.ilink32" name="option.j.arg.1" value="..\mockpp\examples\tutorial"/> <property category="win32.*.win32b.ilink32" name="option.j.arg.merge" value="1"/> <property category="win32.*.win32b.ilink32" name="option.j.enabled" value="0"/> + <property category="win32.*.win32b.ilink32" name="param.libfiles.1" value="cg32.lib"/> + <property category="win32.*.win32b.ilink32" name="param.libfiles.merge" value="1"/> <property category="win32.*.win32b.tasm32" name="option.d.arg.1" value="__DLL___"/> <property category="win32.*.win32b.tasm32" name="option.d.arg.merge" value="1"/> <property category="win32.*.win32b.tasm32" name="option.d.enabled" value="1"/> @@ -341,8 +348,8 @@ </Linker> </IDEOPTIONS> </BCBPROJECT> - <Source> - <Source Name="MainSource">cppunit.bpf</Source> - </Source> - </CPlusPlusBuilder.Personality> + <Source> + <Source Name="MainSource">cppunit.bpf</Source> + </Source> + </CPlusPlusBuilder.Personality> </BorlandProject> Index: mockpp.bdsproj =================================================================== RCS file: /cvsroot/mockpp/mockpp/bcb10/mockpp.bdsproj,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- mockpp.bdsproj 20 Mar 2006 17:20:48 -0000 1.1 +++ mockpp.bdsproj 10 Apr 2006 16:05:31 -0000 1.2 @@ -25,8 +25,9 @@ <property category="build.config.1" name="settings.win32b" value="default"/> <property category="build.config.1" name="type" value="Toolset"/> <property category="build.config.1" name="win32.win32b.builddir" value="Release_Build"/> + <property category="build.node" name="dontverifylibs" value="0"/> <property category="build.node" name="name" value="mockpp_34.dll"/> - <property category="build.node" name="packages" value="rtl;vcl;vclx;bcbsmp;dbrtl;vcldb;bdertl;ibsmp;vcldbx;teeui;teedb;tee;ibxpress;bcbie;vclie;inetdb;inet;bcboffice2k"/> + <property category="build.node" name="packages" value="rtl;vcl;vclx;bcbsmp;dbrtl;vcldb;bdertl;vcldbx;teeui;teedb;tee;ibxpress;bcbie;vclie;inetdb;inet;bcboffice2k"/> <property category="build.node" name="sparelibs" value="rtl.lib vcl.lib"/> <property category="build.node" name="use_packages" value="1"/> <property category="build.platform" name="active" value="win32"/> @@ -35,6 +36,10 @@ <property category="build.platform" name="win32.default" value="win32b"/> <property category="build.platform" name="win32.enabled" value="1"/> <property category="build.platform" name="win32.win32b.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="param.filenames.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="param.listfile.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="param.objfile.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="param.xreffile.merge" value="1"/> <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.1" value="_DEBUG"/> <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/> <property category="win32.Debug_Build.win32b.bcc32" name="option.D.enabled" value="1"/> @@ -109,6 +114,7 @@ <property category="win32.*.win32b.bcc32" name="option.tWD.enabled" value="1"/> <property category="win32.*.win32b.bcc32" name="option.tWM.enabled" value="1"/> <property category="win32.*.win32b.bcc32" name="option.v.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.vG.enabled" value="1"/> <property category="win32.*.win32b.bcc32" name="option.vGc.enabled" value="1"/> <property category="win32.*.win32b.bcc32" name="option.vGd.enabled" value="1"/> <property category="win32.*.win32b.bcc32" name="option.vGt.enabled" value="1"/> @@ -211,9 +217,6 @@ <property category="win32.*.win32b.dcc32" name="option.U.arg.9" value="..\mockpp\constraint"/> <property category="win32.*.win32b.dcc32" name="option.U.arg.merge" value="1"/> <property category="win32.*.win32b.dcc32" name="option.U.enabled" value="1"/> - <property category="win32.*.win32b.ilink32" name="param.libfiles.1" value="cg32.lib"/> - <property category="win32.*.win32b.ilink32" name="param.libfiles.2" value="import32.lib"/> - <property category="win32.*.win32b.ilink32" name="param.libfiles.3" value="cw32i.lib"/> <property category="win32.*.win32b.dcc32" name="param.filenames.merge" value="1"/> <property category="win32.*.win32b.idl2cpp" name="option.I.arg.1" value="..\mockpp\util"/> <property category="win32.*.win32b.idl2cpp" name="option.I.arg.10" value="..\mockpp\matcher"/> @@ -227,6 +230,9 @@ <property category="win32.*.win32b.idl2cpp" name="option.I.arg.9" value="..\mockpp\constraint"/> <property category="win32.*.win32b.idl2cpp" name="option.I.arg.merge" value="1"/> <property category="win32.*.win32b.idl2cpp" name="option.I.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.I.arg.1" value="c:\tmp\compile\mockpp_34\\"/> + <property category="win32.*.win32b.ilink32" name="option.I.arg.merge" value="0"/> + <property category="win32.*.win32b.ilink32" name="option.I.enabled" value="1"/> <property category="win32.*.win32b.ilink32" name="option.L.arg.1" value="..\mockpp\util"/> <property category="win32.*.win32b.ilink32" name="option.L.arg.10" value="..\mockpp\matcher"/> <property category="win32.*.win32b.ilink32" name="option.L.arg.11" value="$(BDS)\lib"/> @@ -242,6 +248,9 @@ <property category="win32.*.win32b.ilink32" name="option.L.arg.9" value="..\mockpp\constraint"/> <property category="win32.*.win32b.ilink32" name="option.L.arg.merge" value="1"/> <property category="win32.*.win32b.ilink32" name="option.L.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.Tpd.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.Tpe.enabled" value="0"/> + <property category="win32.*.win32b.ilink32" name="option.Tpp.enabled" value="0"/> <property category="win32.*.win32b.ilink32" name="option.dynamicrtl.enabled" value="1"/> <property category="win32.*.win32b.ilink32" name="option.j.arg.1" value="..\mockpp\util"/> <property category="win32.*.win32b.ilink32" name="option.j.arg.10" value="..\mockpp\matcher"/> @@ -255,6 +264,19 @@ <property category="win32.*.win32b.ilink32" name="option.j.arg.9" value="..\mockpp\constraint"/> <property category="win32.*.win32b.ilink32" name="option.j.arg.merge" value="1"/> <property category="win32.*.win32b.ilink32" name="option.j.enabled" value="0"/> + <property category="win32.*.win32b.ilink32" name="option.l.arg.1" value="c:\tmp\compile"/> + <property category="win32.*.win32b.ilink32" name="option.l.arg.merge" value="0"/> + <property category="win32.*.win32b.ilink32" name="option.l.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.1" value="c:\tmp\compile"/> + <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.merge" value="0"/> + <property category="win32.*.win32b.ilink32" name="option.outputdir.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="param.libfiles.1" value="cg32.lib"/> + <property category="win32.*.win32b.ilink32" name="param.libfiles.2" value="import32.lib"/> + <property category="win32.*.win32b.ilink32" name="param.libfiles.3" value="cw32mti.lib"/> + <property category="win32.*.win32b.ilink32" name="param.libfiles.merge" value="0"/> + <property category="win32.*.win32b.ilink32" name="param.objfiles.1" value="c0d32.obj"/> + <property category="win32.*.win32b.ilink32" name="param.objfiles.2" value="$(PACKAGES)"/> + <property category="win32.*.win32b.ilink32" name="param.objfiles.merge" value="0"/> <property category="win32.*.win32b.tasm32" name="option.d.arg.1" value="__DLL___"/> <property category="win32.*.win32b.tasm32" name="option.d.arg.2" value="_DEBUG"/> <property category="win32.*.win32b.tasm32" name="option.d.arg.merge" value="1"/> @@ -474,11 +496,6 @@ <Parameters Name="LoadAllSymbols">True</Parameters> <Parameters Name="LoadUnspecifiedSymbols">False</Parameters> </Parameters> - <Language> - <Language Name="ActiveLang"></Language> - <Language Name="ProjectLang">$00000000</Language> - <Language Name="RootDir"></Language> - </Language> <Linker> <Linker Name="LibPrefix"></Linker> <Linker Name="LibSuffix"></Linker> @@ -488,6 +505,6 @@ </BCBPROJECT> <Source> <Source Name="MainSource">mockpp.bpf</Source> - </Source> - </CPlusPlusBuilder.Personality> -</BorlandProject> \ No newline at end of file + </Source> <buildevents/> + </CPlusPlusBuilder.Personality> +</BorlandProject> Index: readability.bdsproj =================================================================== RCS file: /cvsroot/mockpp/mockpp/bcb10/readability.bdsproj,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- readability.bdsproj 20 Mar 2006 17:20:48 -0000 1.1 +++ readability.bdsproj 10 Apr 2006 16:05:31 -0000 1.2 @@ -1,15 +1,15 @@ <?xml version="1.0" encoding="utf-8"?> <BorlandProject> - <PersonalityInfo> - <Option> - <Option Name="Personality">CPlusPlusBuilder.Personality</Option> - <Option Name="ProjectType">CppConsoleApplication</Option> - <Option Name="Version">1.0</Option> - <Option Name="GUID">{90322B99-D258-4058-8A3D-7D5B08B7E4BD}</Option> - </Option> - </PersonalityInfo> - <CPlusPlusBuilder.Personality> - <BCBPROJECT> + <PersonalityInfo> + <Option> + <Option Name="Personality">CPlusPlusBuilder.Personality</Option> + <Option Name="ProjectType">CppConsoleApplication</Option> + <Option Name="Version">1.0</Option> + <Option Name="GUID">{90322B99-D258-4058-8A3D-7D5B08B7E4BD}</Option> + </Option> + </PersonalityInfo> + <CPlusPlusBuilder.Personality> + <BCBPROJECT> <project version="10.0"> <property category="build.config" name="active" value="0"/> <property category="build.config" name="count" value="1"/> @@ -25,7 +25,7 @@ <property category="build.config.1" name="settings.win32b" value="default"/> <property category="build.config.1" name="type" value="Toolset"/> <property category="build.config.1" name="win32.win32b.builddir" value="Release_Build"/> - <property category="build.node" name="name" value="readability_test_34.exe"/> + <property category="build.node" name="name" value="readability.exe"/> <property category="build.node" name="packages" value="rtl;vcl;vclx;bcbsmp;dbrtl;vcldb;bdertl;ibsmp;vcldbx;teeui;teedb;tee;ibxpress;bcbie;vclie;inetdb;inet;bcboffice2k"/> <property category="build.node" name="use_packages" value="1"/> <property category="build.platform" name="active" value="win32"/> @@ -34,6 +34,10 @@ <property category="build.platform" name="win32.default" value="win32b"/> <property category="build.platform" name="win32.enabled" value="1"/> <property category="build.platform" name="win32.win32b.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="param.filenames.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="param.listfile.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="param.objfile.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="param.xreffile.merge" value="1"/> <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.1" value="_DEBUG"/> <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/> <property category="win32.Debug_Build.win32b.bcc32" name="option.D.enabled" value="1"/> @@ -99,6 +103,7 @@ <property category="win32.*.win32b.bcc32" name="option.tWC.enabled" value="1"/> <property category="win32.*.win32b.bcc32" name="option.tWM.enabled" value="1"/> <property category="win32.*.win32b.bcc32" name="option.v.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.vG.enabled" value="1"/> <property category="win32.*.win32b.bcc32" name="option.vGc.enabled" value="1"/> <property category="win32.*.win32b.bcc32" name="option.vGd.enabled" value="1"/> <property category="win32.*.win32b.bcc32" name="option.vGt.enabled" value="1"/> @@ -154,6 +159,8 @@ <property category="win32.*.win32b.ilink32" name="option.j.arg.1" value="..\mockpp\tests"/> <property category="win32.*.win32b.ilink32" name="option.j.arg.merge" value="1"/> <property category="win32.*.win32b.ilink32" name="option.j.enabled" value="0"/> + <property category="win32.*.win32b.ilink32" name="param.libfiles.1" value="cg32.lib"/> + <property category="win32.*.win32b.ilink32" name="param.libfiles.merge" value="1"/> <property category="win32.*.win32b.tasm32" name="option.d.arg.1" value="__DLL___"/> <property category="win32.*.win32b.tasm32" name="option.d.arg.merge" value="1"/> <property category="win32.*.win32b.tasm32" name="option.d.enabled" value="1"/> @@ -335,8 +342,8 @@ </Linker> </IDEOPTIONS> </BCBPROJECT> - <Source> - <Source Name="MainSource">readability.bpf</Source> - </Source> - </CPlusPlusBuilder.Personality> + <Source> + <Source Name="MainSource">readability.bpf</Source> + </Source> + </CPlusPlusBuilder.Personality> </BorlandProject> Index: mock_test.bdsproj =================================================================== RCS file: /cvsroot/mockpp/mockpp/bcb10/mock_test.bdsproj,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- mock_test.bdsproj 20 Mar 2006 17:20:48 -0000 1.1 +++ mock_test.bdsproj 10 Apr 2006 16:05:31 -0000 1.2 @@ -1,15 +1,15 @@ <?xml version="1.0" encoding="utf-8"?> <BorlandProject> - <PersonalityInfo> - <Option> - <Option Name="Personality">CPlusPlusBuilder.Personality</Option> - <Option Name="ProjectType">CppConsoleApplication</Option> - <Option Name="Version">1.0</Option> - <Option Name="GUID">{C0ECD57C-7B61-47F2-8712-F9676DAB83C8}</Option> - </Option> - </PersonalityInfo> - <CPlusPlusBuilder.Personality> - <BCBPROJECT> + <PersonalityInfo> + <Option> + <Option Name="Personality">CPlusPlusBuilder.Personality</Option> + <Option Name="ProjectType">CppConsoleApplication</Option> + <Option Name="Version">1.0</Option> + <Option Name="GUID">{C0ECD57C-7B61-47F2-8712-F9676DAB83C8}</Option> + </Option> + </PersonalityInfo> + <CPlusPlusBuilder.Personality> + <BCBPROJECT> <project version="10.0"> <property category="build.config" name="active" value="0"/> <property category="build.config" name="count" value="1"/> @@ -25,7 +25,7 @@ <property category="build.config.1" name="settings.win32b" value="default"/> <property category="build.config.1" name="type" value="Toolset"/> <property category="build.config.1" name="win32.win32b.builddir" value="Release_Build"/> - <property category="build.node" name="name" value="mock_test_34.exe"/> + <property category="build.node" name="name" value="mock_test.exe"/> <property category="build.node" name="packages" value="rtl;vcl;vclx;bcbsmp;dbrtl;vcldb;bdertl;ibsmp;vcldbx;teeui;teedb;tee;ibxpress;bcbie;vclie;inetdb;inet;bcboffice2k"/> <property category="build.node" name="use_packages" value="1"/> <property category="build.platform" name="active" value="win32"/> @@ -34,6 +34,10 @@ <property category="build.platform" name="win32.default" value="win32b"/> <property category="build.platform" name="win32.enabled" value="1"/> <property category="build.platform" name="win32.win32b.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="param.filenames.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="param.listfile.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="param.objfile.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="param.xreffile.merge" value="1"/> <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.1" value="_DEBUG"/> <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/> <property category="win32.Debug_Build.win32b.bcc32" name="option.D.enabled" value="1"/> @@ -102,6 +106,7 @@ <property category="win32.*.win32b.bcc32" name="option.tWC.enabled" value="1"/> <property category="win32.*.win32b.bcc32" name="option.tWM.enabled" value="1"/> <property category="win32.*.win32b.bcc32" name="option.v.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.vG.enabled" value="1"/> <property category="win32.*.win32b.bcc32" name="option.vGc.enabled" value="1"/> <property category="win32.*.win32b.bcc32" name="option.vGd.enabled" value="1"/> <property category="win32.*.win32b.bcc32" name="option.vGt.enabled" value="1"/> @@ -175,6 +180,8 @@ <property category="win32.*.win32b.ilink32" name="option.j.arg.1" value="..\mockpp\tests"/> <property category="win32.*.win32b.ilink32" name="option.j.arg.merge" value="1"/> <property category="win32.*.win32b.ilink32" name="option.j.enabled" value="0"/> + <property category="win32.*.win32b.ilink32" name="param.libfiles.1" value="cg32.lib"/> + <property category="win32.*.win32b.ilink32" name="param.libfiles.merge" value="1"/> <property category="win32.*.win32b.tasm32" name="option.d.arg.1" value="__DLL___"/> <property category="win32.*.win32b.tasm32" name="option.d.arg.merge" value="1"/> <property category="win32.*.win32b.tasm32" name="option.d.enabled" value="1"/> @@ -473,8 +480,8 @@ </Linker> </IDEOPTIONS> </BCBPROJECT> - <Source> - <Source Name="MainSource">mock_test.bpf</Source> - </Source> - </CPlusPlusBuilder.Personality> + <Source> + <Source Name="MainSource">mock_test.bpf</Source> + </Source> + </CPlusPlusBuilder.Personality> </BorlandProject> Index: visitmock.bdsproj =================================================================== RCS file: /cvsroot/mockpp/mockpp/bcb10/visitmock.bdsproj,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- visitmock.bdsproj 20 Mar 2006 17:20:48 -0000 1.1 +++ visitmock.bdsproj 10 Apr 2006 16:05:31 -0000 1.2 @@ -1,15 +1,15 @@ <?xml version="1.0" encoding="utf-8"?> <BorlandProject> - <PersonalityInfo> - <Option> - <Option Name="Personality">CPlusPlusBuilder.Personality</Option> - <Option Name="ProjectType">CppConsoleApplication</Option> - <Option Name="Version">1.0</Option> - <Option Name="GUID">{D9D6AAA6-1666-43D2-8EB5-621CC6342091}</Option> - </Option> - </PersonalityInfo> - <CPlusPlusBuilder.Personality> - <BCBPROJECT> + <PersonalityInfo> + <Option> + <Option Name="Personality">CPlusPlusBuilder.Personality</Option> + <Option Name="ProjectType">CppConsoleApplication</Option> + <Option Name="Version">1.0</Option> + <Option Name="GUID">{D9D6AAA6-1666-43D2-8EB5-621CC6342091}</Option> + </Option> + </PersonalityInfo> + <CPlusPlusBuilder.Personality> + <BCBPROJECT> <project version="10.0"> <property category="build.config" name="active" value="0"/> <property category="build.config" name="count" value="1"/> @@ -25,7 +25,7 @@ <property category="build.config.1" name="settings.win32b" value="default"/> <property category="build.config.1" name="type" value="Toolset"/> <property category="build.config.1" name="win32.win32b.builddir" value="Release_Build"/> - <property category="build.node" name="name" value="visitmock_34.exe"/> + <property category="build.node" name="name" value="visitmock.exe"/> <property category="build.node" name="packages" value="rtl;vcl;vclx;bcbsmp;dbrtl;vcldb;bdertl;ibsmp;vcldbx;teeui;teedb;tee;ibxpress;bcbie;vclie;inetdb;inet;bcboffice2k"/> <property category="build.node" name="use_packages" value="1"/> <property category="build.platform" name="active" value="win32"/> @@ -34,6 +34,10 @@ <property category="build.platform" name="win32.default" value="win32b"/> <property category="build.platform" name="win32.enabled" value="1"/> <property category="build.platform" name="win32.win32b.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="param.filenames.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="param.listfile.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="param.objfile.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="param.xreffile.merge" value="1"/> <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.1" value="_DEBUG"/> <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/> <property category="win32.Debug_Build.win32b.bcc32" name="option.D.enabled" value="1"/> @@ -99,6 +103,7 @@ <property category="win32.*.win32b.bcc32" name="option.tWC.enabled" value="1"/> <property category="win32.*.win32b.bcc32" name="option.tWM.enabled" value="1"/> <property category="win32.*.win32b.bcc32" name="option.v.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.vG.enabled" value="1"/> <property category="win32.*.win32b.bcc32" name="option.vGc.enabled" value="1"/> <property category="win32.*.win32b.bcc32" name="option.vGd.enabled" value="1"/> <property category="win32.*.win32b.bcc32" name="option.vGt.enabled" value="1"/> @@ -154,6 +159,8 @@ <property category="win32.*.win32b.ilink32" name="option.j.arg.1" value="..\mockpp\examples\tutorial"/> <property category="win32.*.win32b.ilink32" name="option.j.arg.merge" value="1"/> <property category="win32.*.win32b.ilink32" name="option.j.enabled" value="0"/> + <property category="win32.*.win32b.ilink32" name="param.libfiles.1" value="cg32.lib"/> + <property category="win32.*.win32b.ilink32" name="param.libfiles.merge" value="1"/> <property category="win32.*.win32b.tasm32" name="option.d.arg.1" value="__DLL___"/> <property category="win32.*.win32b.tasm32" name="option.d.arg.merge" value="1"/> <property category="win32.*.win32b.tasm32" name="option.d.enabled" value="1"/> @@ -334,8 +341,8 @@ </Linker> </IDEOPTIONS> </BCBPROJECT> - <Source> - <Source Name="MainSource">visitmock.bpf</Source> - </Source> - </CPlusPlusBuilder.Personality> + <Source> + <Source Name="MainSource">visitmock.bpf</Source> + </Source> + </CPlusPlusBuilder.Personality> </BorlandProject> Index: poormock-se.bdsproj =================================================================== RCS file: /cvsroot/mockpp/mockpp/bcb10/poormock-se.bdsproj,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- poormock-se.bdsproj 20 Mar 2006 17:20:48 -0000 1.1 +++ poormock-se.bdsproj 10 Apr 2006 16:05:31 -0000 1.2 @@ -1,15 +1,15 @@ <?xml version="1.0" encoding="utf-8"?> <BorlandProject> - <PersonalityInfo> - <Option> - <Option Name="Personality">CPlusPlusBuilder.Personality</Option> - <Option Name="ProjectType">CppConsoleApplication</Option> - <Option Name="Version">1.0</Option> - <Option Name="GUID">{B928F2CF-5F31-4FB8-899B-CADEAB14F9F2}</Option> - </Option> - </PersonalityInfo> - <CPlusPlusBuilder.Personality> - <BCBPROJECT> + <PersonalityInfo> + <Option> + <Option Name="Personality">CPlusPlusBuilder.Personality</Option> + <Option Name="ProjectType">CppConsoleApplication</Option> + <Option Name="Version">1.0</Option> + <Option Name="GUID">{B928F2CF-5F31-4FB8-899B-CADEAB14F9F2}</Option> + </Option> + </PersonalityInfo> + <CPlusPlusBuilder.Personality> + <BCBPROJECT> <project version="10.0"> <property category="build.config" name="active" value="0"/> <property category="build.config" name="count" value="1"/> @@ -25,7 +25,7 @@ <property category="build.config.1" name="settings.win32b" value="default"/> <property category="build.config.1" name="type" value="Toolset"/> <property category="build.config.1" name="win32.win32b.builddir" value="Release_Build"/> - <property category="build.node" name="name" value="poormock_se_34.exe"/> + <property category="build.node" name="name" value="poormock-se.exe"/> <property category="build.node" name="packages" value="rtl;vcl;vclx;bcbsmp;dbrtl;vcldb;bdertl;ibsmp;vcldbx;teeui;teedb;tee;ibxpress;bcbie;vclie;inetdb;inet;bcboffice2k"/> <property category="build.node" name="use_packages" value="1"/> <property category="build.platform" name="active" value="win32"/> @@ -34,6 +34,10 @@ <property category="build.platform" name="win32.default" value="win32b"/> <property category="build.platform" name="win32.enabled" value="1"/> <property category="build.platform" name="win32.win32b.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="param.filenames.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="param.listfile.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="param.objfile.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="param.xreffile.merge" value="1"/> <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.1" value="_DEBUG"/> <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/> <property category="win32.Debug_Build.win32b.bcc32" name="option.D.enabled" value="1"/> @@ -99,6 +103,7 @@ <property category="win32.*.win32b.bcc32" name="option.tWC.enabled" value="1"/> <property category="win32.*.win32b.bcc32" name="option.tWM.enabled" value="1"/> <property category="win32.*.win32b.bcc32" name="option.v.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.vG.enabled" value="1"/> <property category="win32.*.win32b.bcc32" name="option.vGc.enabled" value="1"/> <property category="win32.*.win32b.bcc32" name="option.vGd.enabled" value="1"/> <property category="win32.*.win32b.bcc32" name="option.vGt.enabled" value="1"/> @@ -154,6 +159,8 @@ <property category="win32.*.win32b.ilink32" name="option.j.arg.1" value="..\mockpp\examples\tutorial"/> <property category="win32.*.win32b.ilink32" name="option.j.arg.merge" value="1"/> <property category="win32.*.win32b.ilink32" name="option.j.enabled" value="0"/> + <property category="win32.*.win32b.ilink32" name="param.libfiles.1" value="cg32.lib"/> + <property category="win32.*.win32b.ilink32" name="param.libfiles.merge" value="1"/> <property category="win32.*.win32b.tasm32" name="option.d.arg.1" value="__DLL___"/> <property category="win32.*.win32b.tasm32" name="option.d.arg.merge" value="1"/> <property category="win32.*.win32b.tasm32" name="option.d.enabled" value="1"/> @@ -334,8 +341,8 @@ </Linker> </IDEOPTIONS> </BCBPROJECT> - <Source> - <Source Name="MainSource">poormock-se.bpf</Source> - </Source> - </CPlusPlusBuilder.Personality> + <Source> + <Source Name="MainSource">poormock-se.bpf</Source> + </Source> + </CPlusPlusBuilder.Personality> </BorlandProject> Index: visitmock2.bdsproj =================================================================== RCS file: /cvsroot/mockpp/mockpp/bcb10/visitmock2.bdsproj,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- visitmock2.bdsproj 20 Mar 2006 17:20:48 -0000 1.1 +++ visitmock2.bdsproj 10 Apr 2006 16:05:31 -0000 1.2 @@ -1,15 +1,15 @@ <?xml version="1.0" encoding="utf-8"?> <BorlandProject> - <PersonalityInfo> - <Option> - <Option Name="Personality">CPlusPlusBuilder.Personality</Option> - <Option Name="ProjectType">CppConsoleApplication</Option> - <Option Name="Version">1.0</Option> - <Option Name="GUID">{2863FF3B-3FE2-476F-A62F-6C60D15F6B1B}</Option> - </Option> - </PersonalityInfo> - <CPlusPlusBuilder.Personality> - <BCBPROJECT> + <PersonalityInfo> + <Option> + <Option Name="Personality">CPlusPlusBuilder.Personality</Option> + <Option Name="ProjectType">CppConsoleApplication</Option> + <Option Name="Version">1.0</Option> + <Option Name="GUID">{2863FF3B-3FE2-476F-A62F-6C60D15F6B1B}</Option> + </Option> + </PersonalityInfo> + <CPlusPlusBuilder.Personality> + <BCBPROJECT> <project version="10.0"> <property category="build.config" name="active" value="0"/> <property category="build.config" name="count" value="1"/> @@ -25,7 +25,7 @@ <property category="build.config.1" name="settings.win32b" value="default"/> <property category="build.config.1" name="type" value="Toolset"/> <property category="build.config.1" name="win32.win32b.builddir" value="Release_Build"/> - <property category="build.node" name="name" value="visitmock2_34.exe"/> + <property category="build.node" name="name" value="visitmock2.exe"/> <property category="build.node" name="packages" value="rtl;vcl;vclx;bcbsmp;dbrtl;vcldb;bdertl;ibsmp;vcldbx;teeui;teedb;tee;ibxpress;bcbie;vclie;inetdb;inet;bcboffice2k"/> <property category="build.node" name="use_packages" value="1"/> <property category="build.platform" name="active" value="win32"/> @@ -34,6 +34,10 @@ <property category="build.platform" name="win32.default" value="win32b"/> <property category="build.platform" name="win32.enabled" value="1"/> <property category="build.platform" name="win32.win32b.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="param.filenames.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="param.listfile.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="param.objfile.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="param.xreffile.merge" value="1"/> <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.1" value="_DEBUG"/> <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/> <property category="win32.Debug_Build.win32b.bcc32" name="option.D.enabled" value="1"/> @@ -99,6 +103,7 @@ <property category="win32.*.win32b.bcc32" name="option.tWC.enabled" value="1"/> <property category="win32.*.win32b.bcc32" name="option.tWM.enabled" value="1"/> <property category="win32.*.win32b.bcc32" name="option.v.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.vG.enabled" value="1"/> <property category="win32.*.win32b.bcc32" name="option.vGc.enabled" value="1"/> <property category="win32.*.win32b.bcc32" name="option.vGd.enabled" value="1"/> <property category="win32.*.win32b.bcc32" name="option.vGt.enabled" value="1"/> @@ -154,6 +159,8 @@ <property category="win32.*.win32b.ilink32" name="option.j.arg.1" value="..\mockpp\examples\tutorial"/> <property category="win32.*.win32b.ilink32" name="option.j.arg.merge" value="1"/> <property category="win32.*.win32b.ilink32" name="option.j.enabled" value="0"/> + <property category="win32.*.win32b.ilink32" name="param.libfiles.1" value="cg32.lib"/> + <property category="win32.*.win32b.ilink32" name="param.libfiles.merge" value="1"/> <property category="win32.*.win32b.tasm32" name="option.d.arg.1" value="__DLL___"/> <property category="win32.*.win32b.tasm32" name="option.d.arg.merge" value="1"/> <property category="win32.*.win32b.tasm32" name="option.d.enabled" value="1"/> @@ -334,8 +341,8 @@ </Linker> </IDEOPTIONS> </BCBPROJECT> - <Source> - <Source Name="MainSource">visitmock2.bpf</Source> - </Source> - </CPlusPlusBuilder.Personality> + <Source> + <Source Name="MainSource">visitmock2.bpf</Source> + </Source> + </CPlusPlusBuilder.Personality> </BorlandProject> Index: mockpp_cxxtest.bdsproj =================================================================== RCS file: /cvsroot/mockpp/mockpp/bcb10/mockpp_cxxtest.bdsproj,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- mockpp_cxxtest.bdsproj 20 Mar 2006 17:20:48 -0000 1.1 +++ mockpp_cxxtest.bdsproj 10 Apr 2006 16:05:31 -0000 1.2 @@ -1,15 +1,15 @@ <?xml version="1.0" encoding="utf-8"?> <BorlandProject> - <PersonalityInfo> - <Option> - <Option Name="Personality">CPlusPlusBuilder.Personality</Option> - <Option Name="ProjectType">CppDynamicLibrary</Option> - <Option Name="Version">1.0</Option> - <Option Name="GUID">{E4878D4A-2123-40A4-9163-5BF44B19CBFC}</Option> - </Option> - </PersonalityInfo> - <CPlusPlusBuilder.Personality> - <BCBPROJECT> + <PersonalityInfo> + <Option> + <Option Name="Personality">CPlusPlusBuilder.Personality</Option> + <Option Name="ProjectType">CppDynamicLibrary</Option> + <Option Name="Version">1.0</Option> + <Option Name="GUID">{E4878D4A-2123-40A4-9163-5BF44B19CBFC}</Option> + </Option> + </PersonalityInfo> + <CPlusPlusBuilder.Personality> + <BCBPROJECT> <project version="10.0"> <property category="build.config" name="active" value="0"/> <property category="build.config" name="count" value="1"/> @@ -25,8 +25,9 @@ <property category="build.config.1" name="settings.win32b" value="default"/> <property category="build.config.1" name="type" value="Toolset"/> <property category="build.config.1" name="win32.win32b.builddir" value="Release_Build"/> + <property category="build.node" name="dontverifylibs" value="1"/> <property category="build.node" name="name" value="mockpp_cxxtest_34.dll"/> - <property category="build.node" name="packages" value="rtl;vcl;vclx;bcbsmp;dbrtl;vcldb;bdertl;ibsmp;vcldbx;teeui;teedb;tee;ibxpress;bcbie;vclie;inetdb;inet;bcboffice2k"/> + <property category="build.node" name="packages" value="rtl;vcl;vclx;bcbsmp;dbrtl;vcldb;bdertl;vcldbx;teeui;teedb;tee;ibxpress;bcbie;vclie;inetdb;inet;bcboffice2k"/> <property category="build.node" name="sparelibs" value="rtl.lib vcl.lib"/> <property category="build.node" name="use_packages" value="1"/> <property category="build.platform" name="active" value="win32"/> @@ -35,10 +36,16 @@ <property category="build.platform" name="win32.default" value="win32b"/> <property category="build.platform" name="win32.enabled" value="1"/> <property category="build.platform" name="win32.win32b.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="param.filenames.merge" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.Tpd.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.Tpe.enabled" value="0"/> + <property category="win32.*.win32b.ilink32" name="option.Tpp.enabled" value="0"/> + <property category="win32.*.win32b.tasm32" name="param.listfile.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="param.objfile.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="param.xreffile.merge" value="1"/> <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.1" value="_DEBUG"/> <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/> <property category="win32.Debug_Build.win32b.bcc32" name="option.D.enabled" value="1"/> - <property category="win32.Debug_Build.win32b.bcc32" name="option.r.enabled" value="0"/> <property category="win32.Debug_Build.win32b.dcc32" name="option.$D.enabled" value="1"/> <property category="win32.Debug_Build.win32b.dcc32" name="option.$O.enabled" value="0"/> <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.1" value="DEBUG"/> @@ -48,6 +55,9 @@ <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\debug"/> <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/> <property category="win32.Debug_Build.win32b.ilink32" name="option.L.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.ilink32" name="option.Tpd.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.ilink32" name="option.Tpe.enabled" value="0"/> + <property category="win32.Debug_Build.win32b.ilink32" name="option.Tpp.enabled" value="0"/> <property category="win32.Debug_Build.win32b.tasm32" name="option.z.enabled" value="1"/> <property category="win32.Debug_Build.win32b.tasm32" name="option.zd.enabled" value="0"/> <property category="win32.Debug_Build.win32b.tasm32" name="option.zi.enabled" value="1"/> @@ -70,6 +80,10 @@ <property category="win32.Release_Build.win32b.tasm32" name="option.zn.enabled" value="1"/> <optionset name="all_configurations"> <property category="node" name="displayname" value="Alle Konfigurationen"/> + <property category="win32.*.win32b.bcc32" name="container.SelectedWarnings.containerenabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.A.enabled" value="0"/> + <property category="win32.*.win32b.bcc32" name="option.AK.enabled" value="0"/> + <property category="win32.*.win32b.bcc32" name="option.AU.enabled" value="0"/> <property category="win32.*.win32b.bcc32" name="option.D.arg.1" value="__DLL___"/> <property category="win32.*.win32b.bcc32" name="option.D.arg.merge" value="1"/> <property category="win32.*.win32b.bcc32" name="option.D.enabled" value="1"/> @@ -84,16 +98,26 @@ <property category="win32.*.win32b.bcc32" name="option.I.arg.9" value="$(BDS)\include\dinkumware"/> <property category="win32.*.win32b.bcc32" name="option.I.arg.merge" value="1"/> <property category="win32.*.win32b.bcc32" name="option.I.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.Jgi.enabled" value="0"/> + <property category="win32.*.win32b.bcc32" name="option.Jgx.enabled" value="0"/> <property category="win32.*.win32b.bcc32" name="option.Od.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.V0.enabled" value="0"/> + <property category="win32.*.win32b.bcc32" name="option.V1.enabled" value="0"/> <property category="win32.*.win32b.bcc32" name="option.Ve.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.Vmd.enabled" value="0"/> + <property category="win32.*.win32b.bcc32" name="option.Vmm.enabled" value="0"/> + <property category="win32.*.win32b.bcc32" name="option.Vms.enabled" value="0"/> <property category="win32.*.win32b.bcc32" name="option.Vx.enabled" value="1"/> <property category="win32.*.win32b.bcc32" name="option.X.enabled" value="0"/> <property category="win32.*.win32b.bcc32" name="option.b.enabled" value="0"/> + <property category="win32.*.win32b.bcc32" name="option.disablewarns.enabled" value="0"/> <property category="win32.*.win32b.bcc32" name="option.k.enabled" value="1"/> <property category="win32.*.win32b.bcc32" name="option.n.arg.1" value="c:\tmp\compile\mockpp_34\\"/> <property category="win32.*.win32b.bcc32" name="option.n.arg.merge" value="1"/> <property category="win32.*.win32b.bcc32" name="option.n.enabled" value="1"/> <property category="win32.*.win32b.bcc32" name="option.noregistervars.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.r.enabled" value="0"/> + <property category="win32.*.win32b.bcc32" name="option.rd.enabled" value="0"/> <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.1" value="NO_STRICT"/> <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.2" value="_NO_VCL"/> <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.3" value="_RTLDLL"/> @@ -103,20 +127,27 @@ <property category="win32.*.win32b.bcc32" name="option.tWD.enabled" value="1"/> <property category="win32.*.win32b.bcc32" name="option.tWM.enabled" value="1"/> <property category="win32.*.win32b.bcc32" name="option.v.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.vG.enabled" value="1"/> <property category="win32.*.win32b.bcc32" name="option.vGc.enabled" value="1"/> <property category="win32.*.win32b.bcc32" name="option.vGd.enabled" value="1"/> <property category="win32.*.win32b.bcc32" name="option.vGt.enabled" value="1"/> <property category="win32.*.win32b.bcc32" name="option.vi.enabled" value="0"/> + <property category="win32.*.win32b.bcc32" name="option.w.enabled" value="0"/> <property category="win32.*.win32b.bcc32" name="option.wamb.enabled" value="1"/> <property category="win32.*.win32b.bcc32" name="option.wamp.enabled" value="1"/> <property category="win32.*.win32b.bcc32" name="option.wasm.enabled" value="1"/> <property category="win32.*.win32b.bcc32" name="option.wbbf.enabled" value="1"/> <property category="win32.*.win32b.bcc32" name="option.wcln.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.wcod.enabled" value="1"/> <property category="win32.*.win32b.bcc32" name="option.wdef.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.wdig.enabled" value="1"/> <property category="win32.*.win32b.bcc32" name="option.wnak.enabled" value="1"/> <property category="win32.*.win32b.bcc32" name="option.wnod.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.wpar.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.wpia.enabled" value="1"/> <property category="win32.*.win32b.bcc32" name="option.wpin.enabled" value="1"/> <property category="win32.*.win32b.bcc32" name="option.wprc.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.wsig.enabled" value="1"/> <property category="win32.*.win32b.bcc32" name="option.wstl.enabled" value="1"/> <property category="win32.*.win32b.bcc32" name="option.wstu.enabled" value="1"/> <property category="win32.*.win32b.bcc32" name="option.wstv.enabled" value="1"/> @@ -167,6 +198,9 @@ <property category="win32.*.win32b.idl2cpp" name="option.I.arg.1" value="..\3party\cxxtest\cxxtest"/> <property category="win32.*.win32b.idl2cpp" name="option.I.arg.merge" value="1"/> <property category="win32.*.win32b.idl2cpp" name="option.I.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.I.arg.1" value="c:\tmp\compile\mockpp_34\\"/> + <property category="win32.*.win32b.ilink32" name="option.I.arg.merge" value="0"/> + <property category="win32.*.win32b.ilink32" name="option.I.enabled" value="1"/> <property category="win32.*.win32b.ilink32" name="option.L.arg.1" value="..\3party\cxxtest\cxxtest"/> <property category="win32.*.win32b.ilink32" name="option.L.arg.2" value="$(BDS)\lib"/> <property category="win32.*.win32b.ilink32" name="option.L.arg.3" value="$(BDS)\lib\obj"/> @@ -177,6 +211,19 @@ <property category="win32.*.win32b.ilink32" name="option.j.arg.1" value="..\3party\cxxtest\cxxtest"/> <property category="win32.*.win32b.ilink32" name="option.j.arg.merge" value="1"/> <property category="win32.*.win32b.ilink32" name="option.j.enabled" value="0"/> + <property category="win32.*.win32b.ilink32" name="option.l.arg.1" value="c:\tmp\compile"/> + <property category="win32.*.win32b.ilink32" name="option.l.arg.merge" value="0"/> + <property category="win32.*.win32b.ilink32" name="option.l.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.1" value="c:\tmp\compile"/> + <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.merge" value="0"/> + <property category="win32.*.win32b.ilink32" name="option.outputdir.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="param.libfiles.1" value="cg32.lib"/> + <property category="win32.*.win32b.ilink32" name="param.libfiles.2" value="import32.lib"/> + <property category="win32.*.win32b.ilink32" name="param.libfiles.3" value="cw32mti.lib"/> + <property category="win32.*.win32b.ilink32" name="param.libfiles.merge" value="1"/> + <property category="win32.*.win32b.ilink32" name="param.objfiles.1" value="c0d32.obj"/> + <property category="win32.*.win32b.ilink32" name="param.objfiles.2" value="$(PACKAGES)"/> + <property category="win32.*.win32b.ilink32" name="param.objfiles.merge" value="0"/> <property category="win32.*.win32b.tasm32" name="option.d.arg.1" value="__DLL___"/> <property category="win32.*.win32b.tasm32" name="option.d.arg.2" value="_DEBUG"/> <property category="win32.*.win32b.tasm32" name="option.d.arg.merge" value="1"/> @@ -361,8 +408,10 @@ </Linker> </IDEOPTIONS> </BCBPROJECT> - <Source> - <Source Name="MainSource">mockpp_cxxtest.bpf</Source> - </Source> - </CPlusPlusBuilder.Personality> + <Source> + <Source Name="MainSource">mockpp_cxxtest.bpf</Source> + </Source> + <buildevents/> + </CPlusPlusBuilder.Personality> <StarTeamAssociation></StarTeamAssociation> + <StarTeamNonRelativeFiles></StarTeamNonRelativeFiles> </BorlandProject> Index: mockpp_cxxtest.bpf =================================================================== RCS file: /cvsroot/mockpp/mockpp/bcb10/mockpp_cxxtest.bpf,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- mockpp_cxxtest.bpf 20 Mar 2006 17:23:14 -0000 1.1 +++ mockpp_cxxtest.bpf 10 Apr 2006 16:05:31 -0000 1.2 @@ -1,12 +1,3 @@ -USEUNIT("..\3party\cxxtest\cxxtest\Descriptions.cpp"); -USEUNIT("..\3party\cxxtest\cxxtest\DummyDescriptions.cpp"); -USEUNIT("..\3party\cxxtest\cxxtest\GlobalFixture.cpp"); -USEUNIT("..\3party\cxxtest\cxxtest\LinkedList.cpp"); -USEUNIT("..\3party\cxxtest\cxxtest\RealDescriptions.cpp"); -USEUNIT("..\3party\cxxtest\cxxtest\TestSuite.cpp"); -USEUNIT("..\3party\cxxtest\cxxtest\TestTracker.cpp"); -USEUNIT("..\3party\cxxtest\cxxtest\ValueTraits.cpp"); -//--------------------------------------------------------------------------- This file is used by the project manager only and should be treated like the project file DllEntryPoint Index: chainmock.bdsproj =================================================================== RCS file: /cvsroot/mockpp/mockpp/bcb10/chainmock.bdsproj,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- chainmock.bdsproj 20 Mar 2006 17:20:48 -0000 1.1 +++ chainmock.bdsproj 10 Apr 2006 16:05:31 -0000 1.2 @@ -1,15 +1,15 @@ <?xml version="1.0" encoding="utf-8"?> <BorlandProject> - <PersonalityInfo> - <Option> - <Option Name="Personality">CPlusPlusBuilder.Personality</Option> - <Option Name="ProjectType">CppConsoleApplication</Option> - <Option Name="Version">1.0</Option> - <Option Name="GUID">{554E4B0D-BDF1-4965-B399-D99F6F39153D}</Option> - </Option> - </PersonalityInfo> - <CPlusPlusBuilder.Personality> - <BCBPROJECT> + <PersonalityInfo> + <Option> + <Option Name="Personality">CPlusPlusBuilder.Personality</Option> + <Option Name="ProjectType">CppConsoleApplication</Option> + <Option Name="Version">1.0</Option> + <Option Name="GUID">{554E4B0D-BDF1-4965-B399-D99F6F39153D}</Option> + </Option> + </PersonalityInfo> + <CPlusPlusBuilder.Personality> + <BCBPROJECT> <project version="10.0"> <property category="build.config" name="active" value="0"/> <property category="build.config" name="count" value="1"/> @@ -25,8 +25,9 @@ <property category="build.config.1" name="settings.win32b" value="default"/> <property category="build.config.1" name="type" value="Toolset"/> <property category="build.config.1" name="win32.win32b.builddir" value="Release_Build"/> - <property category="build.node" name="name" value="chainmock_34.exe"/> - <property category="build.node" name="packages" value="rtl;vcl;vclx;bcbsmp;dbrtl;vcldb;bdertl;ibsmp;vcldbx;teeui;teedb;tee;ibxpress;bcbie;vclie;inetdb;inet;bcboffice2k"/> + <property category="build.node" name="dontverifylibs" value="0"/> + <property category="build.node" name="name" value="chainmock.exe"/> + <property category="build.node" name="packages" value="rtl;vcl;vclx;bcbsmp;dbrtl;vcldb;bdertl;vcldbx;teeui;teedb;tee;ibxpress;bcbie;vclie;inetdb;inet;bcboffice2k"/> <property category="build.node" name="use_packages" value="1"/> <property category="build.platform" name="active" value="win32"/> <property category="build.platform" name="win32.Debug_Build.toolset" value="win32b"/> @@ -34,6 +35,10 @@ <property category="build.platform" name="win32.default" value="win32b"/> <property category="build.platform" name="win32.enabled" value="1"/> <property category="build.platform" name="win32.win32b.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="param.filenames.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="param.listfile.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="param.objfile.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="param.xreffile.merge" value="1"/> <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.1" value="_DEBUG"/> <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/> <property category="win32.Debug_Build.win32b.bcc32" name="option.D.enabled" value="1"/> @@ -100,6 +105,7 @@ <property category="win32.*.win32b.bcc32" name="option.tWC.enabled" value="1"/> <property category="win32.*.win32b.bcc32" name="option.tWM.enabled" value="1"/> <property category="win32.*.win32b.bcc32" name="option.v.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.vG.enabled" value="1"/> <property category="win32.*.win32b.bcc32" name="option.vGc.enabled" value="1"/> <property category="win32.*.win32b.bcc32" name="option.vGd.enabled" value="1"/> <property category="win32.*.win32b.bcc32" name="option.vGt.enabled" value="1"/> @@ -156,6 +162,8 @@ <property category="win32.*.win32b.ilink32" name="option.j.arg.1" value="..\mockpp\examples\tutorial"/> <property category="win32.*.win32b.ilink32" name="option.j.arg.merge" value="1"/> <property category="win32.*.win32b.ilink32" name="option.j.enabled" value="0"/> + <property category="win32.*.win32b.ilink32" name="param.libfiles.1" value="cg32.lib"/> + <property category="win32.*.win32b.ilink32" name="param.libfiles.merge" value="1"/> <property category="win32.*.win32b.tasm32" name="option.d.arg.1" value="__DLL___"/> <property category="win32.*.win32b.tasm32" name="option.d.arg.merge" value="1"/> <property category="win32.*.win32b.tasm32" name="option.d.enabled" value="1"/> @@ -337,8 +345,8 @@ </Linker> </IDEOPTIONS> </BCBPROJECT> - <Source> - <Source Name="MainSource">chainmock.bpf</Source> - </Source> + <Source> + <Source Name="MainSource">chainmock.bpf</Source> + </Source> <buildevents/> </CPlusPlusBuilder.Personality> </BorlandProject> Index: mock_greeter.bdsproj =================================================================== RCS file: /cvsroot/mockpp/mockpp/bcb10/mock_greeter.bdsproj,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- mock_greeter.bdsproj 20 Mar 2006 17:20:48 -0000 1.1 +++ mock_greeter.bdsproj 10 Apr 2006 16:05:31 -0000 1.2 @@ -1,15 +1,15 @@ <?xml version="1.0" encoding="utf-8"?> <BorlandProject> - <PersonalityInfo> - <Option> - <Option Name="Personality">CPlusPlusBuilder.Personality</Option> - <Option Name="ProjectType">CppConsoleApplication</Option> - <Option Name="Version">1.0</Option> - <Option Name="GUID">{8290CA8A-8703-4F28-BEDB-4894D9DC453E}</Option> - </Option> - </PersonalityInfo> - <CPlusPlusBuilder.Personality> - <BCBPROJECT> + <PersonalityInfo> + <Option> + <Option Name="Personality">CPlusPlusBuilder.Personality</Option> + <Option Name="ProjectType">CppConsoleApplication</Option> + <Option Name="Version">1.0</Option> + <Option Name="GUID">{8290CA8A-8703-4F28-BEDB-4894D9DC453E}</Option> + </Option> + </PersonalityInfo> + <CPlusPlusBuilder.Personality> + <BCBPROJECT> <project version="10.0"> <property category="build.config" name="active" value="0"/> <property category="build.config" name="count" value="1"/> @@ -25,7 +25,7 @@ <property category="build.config.1" name="settings.win32b" value="default"/> <property category="build.config.1" name="type" value="Toolset"/> <property category="build.config.1" name="win32.win32b.builddir" value="Release_Build"/> - <property category="build.node" name="name" value="mock_greeter_34.exe"/> + <property category="build.node" name="name" value="mock_greeter.exe"/> <property category="build.node" name="packages" value="rtl;vcl;vclx;bcbsmp;dbrtl;vcldb;bdertl;ibsmp;vcldbx;teeui;teedb;tee;ibxpress;bcbie;vclie;inetdb;inet;bcboffice2k"/> <property category="build.node" name="use_packages" value="1"/> <property category="build.platform" name="active" value="win32"/> @@ -34,6 +34,10 @@ <property category="build.platform" name="win32.default" value="win32b"/> <property category="build.platform" name="win32.enabled" value="1"/> <property category="build.platform" name="win32.win32b.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="param.filenames.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="param.listfile.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="param.objfile.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="param.xreffile.merge" value="1"/> <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.1" value="_DEBUG"/> <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/> <property category="win32.Debug_Build.win32b.bcc32" name="option.D.enabled" value="1"/> @@ -101,6 +105,7 @@ <property category="win32.*.win32b.bcc32" name="option.... [truncated message content] |
|
From: Ewald A. <ewa...@us...> - 2006-04-08 17:57:03
|
Update of /cvsroot/mockpp/mockpp/mockpp/docs/en In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29032/mockpp/docs/en Modified Files: Makefile.am appendix.docbook Log Message: cleanup for release Index: appendix.docbook =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/docs/en/appendix.docbook,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- appendix.docbook 19 Mar 2006 11:09:37 -0000 1.25 +++ appendix.docbook 8 Apr 2006 17:56:51 -0000 1.26 @@ -93,7 +93,13 @@ <varlistentry> <term>--disable-namespace</term> - <listitem><para>Disables the use of namespaces. For that reason &mockpp; + <listitem><para>Older compilers may not support namespaces properly. + If you need such a compiler for a given environment you might try to disable + namespaces for all built-in parts and maybe get enough of the files compile + to build a basic test library. A lot of the files probably won't compile on such + compilers due to the lack of template support.</para> + + <para>In this case &mockpp; resides in the global namespace. Additionally the built-in components &ministl; and &cxxtest; are in the global namespace as well. This may lead to problems when using other libraries which contain classes like <classname>Exception</classname> @@ -328,6 +334,16 @@ <variablelist> <varlistentry> + <term><filename>mockpp/gen_files_N.sh</filename></term> + <listitem><para>Several headers contain classes which depend on the maximal + number of parameters you want to pass. This is the master script file which + triggers all the actual generator files. Extend the numbers in this file + for example if you need more stubs in <function>onConsecutiveCalls()</function> + or higher numbered <classname>ChainableMockMethod</classname> classes. + </para></listitem> + </varlistentry> + + <varlistentry> <term><filename>mockpp/build4sun</filename></term> <listitem><para>This bash script runs <application>configure</application> with the parameters needed for <application>SUN Studio 10</application>. Index: Makefile.am =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/docs/en/Makefile.am,v retrieving revision 1.43 retrieving revision 1.44 diff -u -d -r1.43 -r1.44 --- Makefile.am 2 Jan 2006 21:19:41 -0000 1.43 +++ Makefile.am 8 Apr 2006 17:56:51 -0000 1.44 @@ -108,7 +108,7 @@ EXTRA_DIST=appendix.docbook bookinfo.docbook credits.docbook customize.xsl customize-flat.xsl \ - dev_advanced.docbook dev_advanced_easymock.docbook customize-chunked.xsl \ + dev_advanced.docbook dev_advanced_easymock.docbook customize-chunked.xsl customize-pdf.xsl \ dev_advanced_intro.docbook dev_poor_mans_mock.docbook dev_advanced_jmock.docbook dev_basic.docbook \ dev_helper.docbook dev_intro.docbook faq.docbook index.docbook dev_production.docbook \ dev_embedded.docbook dev_test_framework.docbook |
|
From: Ewald A. <ewa...@us...> - 2006-04-08 12:01:24
|
Update of /cvsroot/mockpp/mockpp/mockpp/constraint In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26244/mockpp/constraint Modified Files: IsAnything.h IsCloseTo.h IsEqual.h IsGreaterOrEqual.h IsGreaterThan.h IsInstanceOf.h IsLessOrEqual.h IsLessThan.h IsNot.h IsNothing.h IsSame.h Or.h StringContains.h StringEndsWith.h StringStartsWith.h Log Message: improve onConsecutiveCalls family Index: IsAnything.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/constraint/IsAnything.h,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- IsAnything.h 15 Mar 2006 21:34:03 -0000 1.21 +++ IsAnything.h 8 Apr 2006 12:00:34 -0000 1.22 @@ -44,7 +44,7 @@ /** A constraint that always returns <code>true</code>. * @ingroup grp_constraint - * @see MOCKPP_NS::any + * @see mockpp::any */ class IsAnything : public TypelessConstraint { Index: IsCloseTo.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/constraint/IsCloseTo.h,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- IsCloseTo.h 15 Mar 2006 21:34:03 -0000 1.20 +++ IsCloseTo.h 8 Apr 2006 12:00:34 -0000 1.21 @@ -46,7 +46,7 @@ /** Is the value of a number equal to a value within some range of * acceptable deviation? * @ingroup grp_constraint - * @see MOCKPP_NS::eq( const T &operand, const T &deviation ) + * @see mockpp::eq( const T &operand, const T &deviation ) */ template <typename NumberType> class IsCloseTo : public Constraint<NumberType> Index: IsEqual.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/constraint/IsEqual.h,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- IsEqual.h 15 Mar 2006 21:34:03 -0000 1.23 +++ IsEqual.h 8 Apr 2006 12:00:34 -0000 1.24 @@ -47,7 +47,7 @@ * The default implementation compares the values of the two * objects. * @ingroup grp_constraint - * @see MOCKPP_NS::IsEqual + * @see mockpp::IsEqual * @param left left operand * @param right right operand * @return true if both values are equal @@ -63,8 +63,8 @@ * invoked method? Basically the same as \c IsSame which compares * by reference and a specializable comparison template. * @ingroup grp_constraint - * @see MOCKPP_NS::eq( const T& op ) - * @see MOCKPP_NS::IsSame + * @see mockpp::eq( const T& op ) + * @see mockpp::IsSame */ template <typename T> class IsEqual : public Constraint<T> Index: IsGreaterThan.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/constraint/IsGreaterThan.h,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- IsGreaterThan.h 15 Mar 2006 21:34:03 -0000 1.17 +++ IsGreaterThan.h 8 Apr 2006 12:00:34 -0000 1.18 @@ -45,7 +45,7 @@ /** Is the value greater than another value? * @ingroup grp_constraint - * @see MOCKPP_NS::gt + * @see mockpp::gt */ template <typename T> class IsGreaterThan : public Constraint<T> Index: IsNot.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/constraint/IsNot.h,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- IsNot.h 15 Mar 2006 21:34:03 -0000 1.21 +++ IsNot.h 8 Apr 2006 12:00:34 -0000 1.22 @@ -44,7 +44,7 @@ /** Calculates the logical negation of a constraint. * @ingroup grp_constraint - * @see MOCKPP_NS::ne + * @see mockpp::ne */ template <typename T> class IsNot : public Constraint<T> Index: IsLessThan.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/constraint/IsLessThan.h,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- IsLessThan.h 15 Mar 2006 21:34:03 -0000 1.17 +++ IsLessThan.h 8 Apr 2006 12:00:34 -0000 1.18 @@ -44,7 +44,7 @@ /** Is the value less than another value? * @ingroup grp_constraint - * @see MOCKPP_NS::lt + * @see mockpp::lt */ template <typename T> class IsLessThan : public Constraint<T> Index: IsInstanceOf.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/constraint/IsInstanceOf.h,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- IsInstanceOf.h 15 Mar 2006 21:34:03 -0000 1.20 +++ IsInstanceOf.h 8 Apr 2006 12:00:34 -0000 1.21 @@ -48,7 +48,7 @@ * A base class is needed since dynamic_cast checks for an existing traversal * from \c derived to \c base. * @ingroup grp_constraint - * @see MOCKPP_NS::isA + * @see mockpp::isA */ template <typename BASE, typename DERIVED> Index: IsGreaterOrEqual.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/constraint/IsGreaterOrEqual.h,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- IsGreaterOrEqual.h 15 Mar 2006 21:34:03 -0000 1.13 +++ IsGreaterOrEqual.h 8 Apr 2006 12:00:34 -0000 1.14 @@ -41,7 +41,7 @@ /** Is the value greater or equal than another value? * @ingroup grp_constraint - * @see MOCKPP_NS::ge + * @see mockpp::ge */ template <typename T> class IsGreaterOrEqual : public Constraint<T> Index: StringStartsWith.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/constraint/StringStartsWith.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- StringStartsWith.h 15 Mar 2006 21:34:03 -0000 1.3 +++ StringStartsWith.h 8 Apr 2006 12:00:34 -0000 1.4 @@ -41,7 +41,7 @@ /** Tests if the argument is a string that contains a substring. * @ingroup grp_constraint - * @see MOCKPP_NS::startsWith + * @see mockpp::startsWith */ template <typename StringType = MOCKPP_NS::String> class StringStartsWith : public Constraint<StringType> Index: IsNothing.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/constraint/IsNothing.h,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- IsNothing.h 15 Mar 2006 21:34:03 -0000 1.19 +++ IsNothing.h 8 Apr 2006 12:00:34 -0000 1.20 @@ -44,7 +44,7 @@ /** A constraint which is never true. * @ingroup grp_constraint - * @see MOCKPP_NS::nothing + * @see mockpp::nothing */ class IsNothing : public TypelessConstraint { Index: Or.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/constraint/Or.h,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- Or.h 15 Mar 2006 21:34:03 -0000 1.20 +++ Or.h 8 Apr 2006 12:00:34 -0000 1.21 @@ -46,7 +46,7 @@ * shortcut, so that the second constraint is not called if the first * constraint returns <code>true</code>. * @ingroup grp_constraint - * @see MOCKPP_NS::logic_or + * @see mockpp::logic_or */ template <typename T> class Or : public Constraint<T> Index: IsSame.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/constraint/IsSame.h,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- IsSame.h 15 Mar 2006 21:34:03 -0000 1.22 +++ IsSame.h 8 Apr 2006 12:00:34 -0000 1.23 @@ -47,7 +47,7 @@ * The default implementation compares the adresses of the two * objects. * @ingroup grp_constraint - * @see MOCKPP_NS::IsSame + * @see mockpp::IsSame * @param left left operand * @param right right operand * @return true if both operands are equal @@ -64,9 +64,9 @@ * \c IsSame compares by reference and a comparison template which can be * specialized. * @ingroup grp_constraint - * @see MOCKPP_NS::same - * @see MOCKPP_NS::IsEqual - * @see MOCKPP_NS::isSameComparison + * @see mockpp::same + * @see mockpp::IsEqual + * @see mockpp::isSameComparison */ template <typename T> class IsSame : public Constraint<T> Index: StringEndsWith.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/constraint/StringEndsWith.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- StringEndsWith.h 15 Mar 2006 21:34:03 -0000 1.4 +++ StringEndsWith.h 8 Apr 2006 12:00:34 -0000 1.5 @@ -41,7 +41,7 @@ /** Tests if the argument is a string that contains a substring. * @ingroup grp_constraint - * @see MOCKPP_NS::endsWith + * @see mockpp::endsWith */ template <typename StringType = MOCKPP_NS::String> class StringEndsWith : public Constraint<StringType> Index: IsLessOrEqual.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/constraint/IsLessOrEqual.h,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- IsLessOrEqual.h 15 Mar 2006 21:34:03 -0000 1.14 +++ IsLessOrEqual.h 8 Apr 2006 12:00:34 -0000 1.15 @@ -41,7 +41,7 @@ /** Is the value less or equal than another value? * @ingroup grp_constraint - * @see MOCKPP_NS::le + * @see mockpp::le */ template <typename T> class IsLessOrEqual : public Constraint<T> Index: StringContains.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/constraint/StringContains.h,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- StringContains.h 15 Mar 2006 21:34:03 -0000 1.18 +++ StringContains.h 8 Apr 2006 12:00:34 -0000 1.19 @@ -45,7 +45,7 @@ /** Tests if the argument is a string that contains a substring. * @ingroup grp_constraint - * @see MOCKPP_NS::stringContains + * @see mockpp::stringContains */ template <typename StringType = MOCKPP_NS::String> class StringContains : public Constraint<StringType> |
|
From: Ewald A. <ewa...@us...> - 2006-04-08 12:01:22
|
Update of /cvsroot/mockpp/mockpp/mockpp/chaining In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26244/mockpp/chaining Modified Files: ChainingMockObjectSupport.h Invocation.h OnConsecutiveCalls.h gen_consecutive_N.pl Log Message: improve onConsecutiveCalls family Index: OnConsecutiveCalls.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/OnConsecutiveCalls.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- OnConsecutiveCalls.h 7 Apr 2006 19:54:14 -0000 1.1 +++ OnConsecutiveCalls.h 8 Apr 2006 12:00:33 -0000 1.2 @@ -33,23 +33,27 @@ #include <mockpp/mockpp.h> // always first +#include <mockpp/stub/StubSequence.h> +#include <mockpp/stub/TypelessStubSequence.h> + MOCKPP_NS_START -/** Creates a sequence of 1 typeless stubs. [...1139 lines suppressed...] + MOCKPP_STL::vector<TypelessStub<R>*> vec; + vec.push_back( stub1); + vec.push_back( stub2); + vec.push_back( stub3); + vec.push_back( stub4); + vec.push_back( stub5); + vec.push_back( stub6); + vec.push_back( stub7); + vec.push_back( stub8); + vec.push_back( stub9); + vec.push_back( stub10); + return new TypelessStubSequence<R>( vec.begin(), vec.end() ); +} + MOCKPP_NS_END + #endif // MOCKPP_ONCONSECUTIVECALLS_H Index: ChainingMockObjectSupport.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/ChainingMockObjectSupport.h,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- ChainingMockObjectSupport.h 7 Apr 2006 19:54:10 -0000 1.26 +++ ChainingMockObjectSupport.h 8 Apr 2006 12:00:33 -0000 1.27 @@ -62,8 +62,6 @@ #include <mockpp/stub/ThrowStub.h> #include <mockpp/stub/ReturnStub.h> -#include <mockpp/stub/StubSequence.h> -#include <mockpp/stub/TypelessStubSequence.h> #include <mockpp/matcher/TypelessMatcher.h> @@ -72,7 +70,7 @@ /** * @defgroup grp_constraint_abbrev Abbreviated Parameter Constraints - * @see MOCKPP_NS::Constraint + * @see mockpp::Constraint * Provides convenience functions that create contraint objects. * Use of these functions should also help to increase readability * if you import them via some appriopriate \c using directive. @@ -80,7 +78,7 @@ /** * @defgroup grp_stub_abbrev Abbreviated Stubs - * @see MOCKPP_NS::Stub + * @see mockpp::Stub * Provides convenience functions that create stub objects. * Use of these functions should also help to increase readability * if you import them via some appriopriate \c using directive. @@ -88,7 +86,7 @@ /** * @defgroup grp_matcher_abbrev Abbreviated Matchers - * @see MOCKPP_NS::InvocationMatcher + * @see mockpp::InvocationMatcher * Provides convenience functions that create matcher objects. * Use of these functions should also help to increase readability * if you import them via some appriopriate \c using directive. @@ -96,7 +94,7 @@ /** Creates a constraint that matches any invocation * @ingroup grp_constraint_abbrev - * @see MOCKPP_NS::IsAnything + * @see mockpp::IsAnything * @return the new constraint */ TypelessConstraint::AP any(); @@ -104,7 +102,7 @@ /** Creates a constraint that never matches an invocation * @ingroup grp_constraint_abbrev - * @see MOCKPP_NS::IsNothing + * @see mockpp::IsNothing * @return the new constraint */ TypelessConstraint::AP nothing(); @@ -112,7 +110,7 @@ /** Passes a value back via a reference (outbound value). * @ingroup grp_constraint_abbrev - * @see MOCKPP_NS::OutBound + * @see mockpp::OutBound * @param op object to return at invoationwith * @return the new constraint */ @@ -126,7 +124,7 @@ /** Creates a constraint that tests for equality * @ingroup grp_constraint_abbrev - * @see MOCKPP_NS::IsEqual + * @see mockpp::IsEqual * @param op object to compare with * @return the new constraint */ @@ -140,7 +138,7 @@ /** Creates a constraint that tests for non-equality * @ingroup grp_constraint_abbrev - * @see MOCKPP_NS::IsNot + * @see mockpp::IsNot * @param op object to compare with * @return the new constraint */ @@ -154,7 +152,7 @@ /** Creates a constraint that tests for near-equality * @ingroup grp_constraint_abbrev - * @see MOCKPP_NS::IsCloseTo + * @see mockpp::IsCloseTo * @param operand object to compare with * @param deviation amount of allowed deviation * @return the new constraint @@ -169,7 +167,7 @@ /** Creates a less-or-equal constraint * @ingroup grp_constraint_abbrev - * @see MOCKPP_NS::IsLessOrEqual + * @see mockpp::IsLessOrEqual * @param value object to compare with * @return the new constraint */ @@ -183,7 +181,7 @@ /** Creates a less-than constraint * @ingroup grp_constraint_abbrev - * @see MOCKPP_NS::IsLessThan + * @see mockpp::IsLessThan * @param value object to compare with * @return the new constraint */ @@ -197,7 +195,7 @@ /** Creates a greater-than constraint * @ingroup grp_constraint_abbrev - * @see MOCKPP_NS::IsGreaterThan + * @see mockpp::IsGreaterThan * @param value object to compare with * @return the new constraint */ @@ -211,7 +209,7 @@ /** Creates a greater-or-equal constraint * @ingroup grp_constraint_abbrev - * @see MOCKPP_NS::IsGreaterOrEqual + * @see mockpp::IsGreaterOrEqual * @param value object to compare with * @return the new constraint */ @@ -225,7 +223,7 @@ /** Creates a constraint that checks if an object is the same * @ingroup grp_constraint_abbrev - * @see MOCKPP_NS::IsSame + * @see mockpp::IsSame * @param operand object to compare with * @return the new constraint */ @@ -243,7 +241,7 @@ * The base class is needed since dynamic_cast checks for an existing traversal * from \c derived to \c base. * @ingroup grp_constraint_abbrev - * @see MOCKPP_NS::IsInstanceOf + * @see mockpp::IsInstanceOf * @return the new constraint */ template <typename ROOT, @@ -259,7 +257,7 @@ /** Creates a constraint that checks for the occurence of a substring * @ingroup grp_constraint_abbrev - * @see MOCKPP_NS::StringContains + * @see mockpp::StringContains * @param substring the substring * @return the new constraint */ @@ -273,7 +271,7 @@ /** Creates a constraint that checks for the occurence of a starting substring * @ingroup grp_constraint_abbrev - * @see MOCKPP_NS::StringStartsWith + * @see mockpp::StringStartsWith * @param substring the substring * @return the new constraint */ @@ -287,7 +285,7 @@ /** Creates a constraint that checks for the occurence of a trailing substring * @ingroup grp_constraint_abbrev - * @see MOCKPP_NS::StringEndsWith + * @see mockpp::StringEndsWith * @param substring the substring * @return the new constraint */ @@ -301,7 +299,7 @@ /** Creates a constraint that checks for the occurence of a substring * @ingroup grp_constraint_abbrev - * @see MOCKPP_NS::StringContains + * @see mockpp::StringContains * @param substring the substring * @return the new constraint */ @@ -315,7 +313,7 @@ /** Creates a constraint that negates another * @ingroup grp_constraint_abbrev - * @see MOCKPP_NS::IsNot + * @see mockpp::IsNot * @param c the other constraint * @return the new constraint */ @@ -329,7 +327,7 @@ /** Creates a constraint to logically-and two other constraints * @ingroup grp_constraint_abbrev - * @see MOCKPP_NS::And + * @see mockpp::And * @param left the first constraint * @param right the second constraint * @return the new constraint @@ -345,7 +343,7 @@ /** Creates a constraint to logically-or two other constraints * @ingroup grp_constraint_abbrev - * @see MOCKPP_NS::Or + * @see mockpp::Or * @param left the first constraint * @param right the second constraint * @return the new constraint @@ -361,7 +359,7 @@ /** Creates a stub returning a value * @ingroup grp_stub_abbrev - * @see MOCKPP_NS::ReturnStub + * @see mockpp::ReturnStub * @param o the value to return * @return the new stub */ @@ -374,7 +372,7 @@ /** Creates a stub returning a void stub * @ingroup grp_stub_abbrev - * @see MOCKPP_NS::VoidStub + * @see mockpp::VoidStub * @return the new stub */ TypelessStub<void>::AP isVoid( ); @@ -382,7 +380,7 @@ /** Creates a stub throwing a value * @ingroup grp_stub_abbrev - * @see MOCKPP_NS::ThrowStub + * @see mockpp::ThrowStub * @param val the value to throw * @return the new stub */ @@ -396,7 +394,7 @@ /** Creates a matcher to verify a single invocation * @ingroup grp_matcher_abbrev - * @see MOCKPP_NS::InvokeOnceMatcher + * @see mockpp::InvokeOnceMatcher * @return the new matcher */ AutoPointer<TypelessMatcher> once(); @@ -404,7 +402,7 @@ /** Creates a matcher to verify a minimum invocation count of one. * @ingroup grp_matcher_abbrev - * @see MOCKPP_NS::InvokeAtLeastOnceMatcher + * @see mockpp::InvokeAtLeastOnceMatcher * @return the new matcher */ AutoPointer<TypelessMatcher> atLeastOnce(); @@ -412,7 +410,7 @@ /** Creates a matcher to verify an arbitrary invocation count. * @ingroup grp_matcher_abbrev - * @see MOCKPP_NS::UnlimitedMatcher + * @see mockpp::UnlimitedMatcher * @return the new matcher */ AutoPointer<TypelessMatcher> unlimited(); @@ -420,7 +418,7 @@ /** Creates a matcher to verify a maximal invocation count. * @ingroup grp_matcher_abbrev - * @see MOCKPP_NS::InvokeAtMostMatcher + * @see mockpp::InvokeAtMostMatcher * @return the new matcher */ AutoPointer<TypelessMatcher> atMost( int expectedCount ); @@ -428,7 +426,7 @@ /** Creates a matcher to verify a minimal invocation count. * @ingroup grp_matcher_abbrev - * @see MOCKPP_NS::InvokeAtLeastMatcher + * @see mockpp::InvokeAtLeastMatcher * @return the new matcher */ AutoPointer<TypelessMatcher> atLeast(int expectedCount); @@ -436,7 +434,7 @@ /** Creates a matcher to verify an exact invocation count. * @ingroup grp_matcher_abbrev - * @see MOCKPP_NS::InvokeCountMatcher + * @see mockpp::InvokeCountMatcher * @return the new matcher */ AutoPointer<TypelessMatcher> exactly( int expectedCount ); @@ -444,7 +442,7 @@ /** Creates a matcher to verify that the invactation never occured. * @ingroup grp_matcher_abbrev - * @see MOCKPP_NS::TestFailureMatcher + * @see mockpp::TestFailureMatcher * @return the new matcher */ AutoPointer<TypelessMatcher> never(); @@ -452,7 +450,7 @@ /** Creates a matcher to verify that the invactation never occured. * @ingroup grp_matcher_abbrev - * @see MOCKPP_NS::TestFailureMatcher + * @see mockpp::TestFailureMatcher * @param errorMessage additional info for error message * @return the new matcher */ Index: gen_consecutive_N.pl =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/gen_consecutive_N.pl,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- gen_consecutive_N.pl 7 Apr 2006 19:54:14 -0000 1.1 +++ gen_consecutive_N.pl 8 Apr 2006 12:00:33 -0000 1.2 @@ -22,7 +22,7 @@ \@internal NOT INTENDED FOR PUBLIC INCLUSION \@brief Generated with gen_consecutive_N.pl. - \$I" . "d: CountedChainableMethod.h,v 1.7 2005/10/19 20:53:09 ewald-arnold Exp \$ + \$I" . "d: OnConsecutiveCalls.h,v 1.7 2006/04/07 20:53:09 ewald-arnold Exp \$ ***************************************************************************/ @@ -53,6 +53,9 @@ #include <mockpp/mockpp.h> // always first +#include <mockpp/stub/StubSequence.h> +#include <mockpp/stub/TypelessStubSequence.h> + MOCKPP_NS_START @@ -83,38 +86,45 @@ print "Creating onConsectiveCalls " . $numArgs ."\n"; +################################################################### + print OUT " -/** Creates a sequence of " . $numArgs . " typeless stubs. +/** Creates a sequence of " . $numArgs . " stubs. * \@ingroup grp_stub_abbrev - * \@see mockpp::TypelessStubSequence + * \@see mockpp::StubSequence * \@param stub1 first stub"; for($p = 2; $p <= $numArgs; ++$p) { print OUT " - * \@param stub" . $p . " the next stub"; } + * \@param stub" . $p . " the next stub"; } print OUT " * \@return the new stub */ -template <typename R> -typename TypelessStub<R>::AP onConsecutiveCalls( TypelessStub<R> *stub1"; +template <typename R, // ReturnType + typename I> // Invocation +typename Stub<R, I>::AP onConsecutiveCalls( AutoPointer<Stub<R, I> > stub1"; for($p = 2; $p <= $numArgs; ++$p) { print OUT " - , TypelessStub<R> *stub" . $p; } + , AutoPointer<Stub<R, I> > stub" . $p; } print OUT " - ) + ) { - MOCKPP_STL::vector<TypelessStub<R>*> vec;"; + MOCKPP_STL::vector<Stub<R, I>*> vec;"; for($p = 1; $p <= $numArgs; ++$p) { print OUT " - vec.push_back( stub" . $p . ");" }; + vec.push_back( stub" . $p . ".release());" }; print OUT " - return new TypelessStubSequence<R>( vec.begin(), vec.end() ); + return new StubSequence<R, I>( vec.begin(), vec.end() ); } +"; + +################################################################### +print OUT " /** Creates a sequence of " . $numArgs . " stubs. * \@ingroup grp_stub_abbrev * \@see mockpp::StubSequence @@ -123,6 +133,7 @@ for($p = 2; $p <= $numArgs; ++$p) { print OUT " * \@param stub" . $p . " the next stub"; } + print OUT " * \@return the new stub */ @@ -136,22 +147,95 @@ print OUT " ) { - MOCKPP_STL::vector<Stub<R, I>*> vec;"; + MOCKPP_STL::vector<Stub<I, R>*> vec;"; for($p = 1; $p <= $numArgs; ++$p) { print OUT " - vec.push_back( stub" . $p . ");" }; + vec.push_back( stub" . $p . ");" }; print OUT " return new StubSequence<R, I>( vec.begin(), vec.end() ); } -" +"; + +################################################################### + +print OUT " +/** Creates a sequence of " . $numArgs . " typeless stubs. + * \@ingroup grp_stub_abbrev + * \@see mockpp::TypelessStubSequence + * \@param stub1 first stub"; + +for($p = 2; $p <= $numArgs; ++$p) { print OUT " + * \@param stub" . $p . " the next stub"; } + + +print OUT " + * \@return the new stub + */ +template <typename R> // ReturnType +typename TypelessStub<R>::AP onConsecutiveCalls( AutoPointer<TypelessStub<R> > stub1"; + +for($p = 2; $p <= $numArgs; ++$p) { print OUT " + , AutoPointer<TypelessStub<R> > stub" . $p; } + +print OUT " + ) +{ + MOCKPP_STL::vector<TypelessStub<R>*> vec;"; + +for($p = 1; $p <= $numArgs; ++$p) { print OUT " + vec.push_back( stub" . $p . ".release());" }; + +print OUT " + return new TypelessStubSequence<R>( vec.begin(), vec.end() ); } +"; + +################################################################### + +print OUT " +/** Creates a sequence of " . $numArgs . " typeless stubs. + * \@ingroup grp_stub_abbrev + * \@see mockpp::TypelessStubSequence + * \@param stub1 first stub"; + +for($p = 2; $p <= $numArgs; ++$p) { print OUT " + * \@param stub" . $p . " the next stub"; } + + +print OUT " + * \@return the new stub + */ +template <typename R> // ReturnType +typename TypelessStub<R>::AP onConsecutiveCalls( TypelessStub<R> *stub1"; + +for($p = 2; $p <= $numArgs; ++$p) { print OUT " + , TypelessStub<R> *stub" . $p; } + +print OUT " + ) +{ + MOCKPP_STL::vector<TypelessStub<R>*> vec;"; + +for($p = 1; $p <= $numArgs; ++$p) { print OUT " + vec.push_back( stub" . $p . ");" }; + print OUT " + return new TypelessStubSequence<R>( vec.begin(), vec.end() ); +} + +"; + +################################################################### +} + +print OUT " MOCKPP_NS_END + #endif // MOCKPP_ONCONSECUTIVECALLS_H "; Index: Invocation.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/Invocation.h,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- Invocation.h 15 Mar 2006 21:34:02 -0000 1.20 +++ Invocation.h 8 Apr 2006 12:00:33 -0000 1.21 @@ -52,7 +52,7 @@ /** Default comparison function for the various \c Invocation classes. * The default implementation compares the values of the two * objects. - * @see MOCKPP_NS::Invocation + * @see mockpp::Invocation * @param left left operand * @param right right operand * @return true if both values are equal |
|
From: Ewald A. <ewa...@us...> - 2006-04-08 12:01:15
|
Update of /cvsroot/mockpp/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26244 Modified Files: ChangeLog gen_files_N.sh run-configure-unicode.sh Log Message: improve onConsecutiveCalls family Index: run-configure-unicode.sh =================================================================== RCS file: /cvsroot/mockpp/mockpp/run-configure-unicode.sh,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- run-configure-unicode.sh 5 Apr 2006 17:03:35 -0000 1.21 +++ run-configure-unicode.sh 8 Apr 2006 12:00:32 -0000 1.22 @@ -19,9 +19,9 @@ echo MYCC: $MYCC #OPTS="--enable-doxygen --enable-docbook" -OPTS="$OPTS --enable-builtin-stl" # --disable-rtti" # --disable-exceptions" +#OPTS="$OPTS --enable-builtin-stl" # --disable-rtti" # --disable-exceptions" OPTS="$OPTS --enable-debug=full" -OPTS="$OPTS --disable-namespace" +#OPTS="$OPTS --disable-namespace" #OPTS="$OPTS --disable-builtin-cxxtest --enable-cppunit" #OPTS="$OPTS --disable-builtin-cxxtest --enable-boosttest" Index: gen_files_N.sh =================================================================== RCS file: /cvsroot/mockpp/mockpp/gen_files_N.sh,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- gen_files_N.sh 10 Dec 2005 20:07:20 -0000 1.4 +++ gen_files_N.sh 8 Apr 2006 12:00:32 -0000 1.5 @@ -12,6 +12,8 @@ echo parameter: $p +( cd mockpp/chaining ; ./gen_consecutive_N.pl 10 ) + ( cd mockpp/chaining ; ./gen_invocation_N.pl $p ) ( cd mockpp/chaining ; ./gen_chainablemethod_N.pl $p ) ( cd mockpp/chaining ; ./gen_countchainable_N.pl $p ) Index: ChangeLog =================================================================== RCS file: /cvsroot/mockpp/mockpp/ChangeLog,v retrieving revision 1.105 retrieving revision 1.106 diff -u -d -r1.105 -r1.106 --- ChangeLog 7 Apr 2006 19:54:50 -0000 1.105 +++ ChangeLog 8 Apr 2006 12:00:32 -0000 1.106 @@ -2,7 +2,7 @@ mockpp history -------------- -2006-03-23 1.11.4 +2006-04-07 1.11.4 - added script to retrieve data from configure for use in other libraries @@ -13,7 +13,8 @@ from the library - fixes for g++ 4.1 - fix install-win.bat - - script to generate oConsecutiveCalls() + - script to generate onConsecutiveCalls() family + and make it take AutoPointer types as well 2006-03-05 1.11.3 |
Update of /cvsroot/mockpp/mockpp/mockpp/stub In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26244/mockpp/stub Modified Files: DefaultResultStub.h ReturnStub.h StubHolder.h StubSequence.h TestFailureStub.h ThrowStub.h TypelessStubSequence.h VoidStub.h Log Message: improve onConsecutiveCalls family Index: VoidStub.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/stub/VoidStub.h,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- VoidStub.h 15 Mar 2006 21:34:07 -0000 1.20 +++ VoidStub.h 8 Apr 2006 12:00:37 -0000 1.21 @@ -45,7 +45,7 @@ /** A stub for woid methods. Not really useful but needed for compatibility. * May also be useful to express this property within an expectation. * @ingroup grp_stub - * @see MOCKPP_NS::onConsecutiveCalls + * @see mockpp::onConsecutiveCalls */ class VoidStub : public TypelessStub<void> { Index: StubHolder.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/stub/StubHolder.h,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- StubHolder.h 15 Mar 2006 21:34:07 -0000 1.13 +++ StubHolder.h 8 Apr 2006 12:00:37 -0000 1.14 @@ -55,7 +55,7 @@ /** Creates the object. * @param in_stub pointer to the stub */ - StubHolder(const typename TypelessStub<R>::AP &in_stub) + StubHolder(const AutoPointer<TypelessStub<R> > &in_stub) : stub(new TypelessStubAdapter<R, I>(in_stub)) {} @@ -88,6 +88,15 @@ * @attention After this method is called this object becomes invalid. * @return the stub object */ + Stub<R, I>* release() const // we we actually lie a bit + { + return stub.release(); + } + + /** Returns the stub object. + * @attention After this method is called this object becomes invalid. + * @return the stub object + */ operator AutoPointer<Stub<R, I> > () const // we we actually lie a bit { return stub; Index: DefaultResultStub.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/stub/DefaultResultStub.h,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- DefaultResultStub.h 15 Mar 2006 21:34:07 -0000 1.22 +++ DefaultResultStub.h 8 Apr 2006 12:00:37 -0000 1.23 @@ -44,7 +44,7 @@ /** A stub returning the default value of the return type. * @ingroup grp_stub - * @see MOCKPP_NS::returnValue + * @see mockpp::returnValue */ template <typename R> // Returntype class DefaultResultStub : public TypelessStub<R> Index: TestFailureStub.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/stub/TestFailureStub.h,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- TestFailureStub.h 15 Mar 2006 21:34:07 -0000 1.23 +++ TestFailureStub.h 8 Apr 2006 12:00:37 -0000 1.24 @@ -45,7 +45,7 @@ /** Stub that always fails upon invocation. * @ingroup grp_stub - * @see MOCKPP_NS::never + * @see mockpp::never */ template <typename R, // Returntype typename I> // Invocation Index: ReturnStub.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/stub/ReturnStub.h,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- ReturnStub.h 15 Mar 2006 21:34:07 -0000 1.22 +++ ReturnStub.h 8 Apr 2006 12:00:37 -0000 1.23 @@ -45,7 +45,7 @@ /** Always return the same specified value. * @ingroup grp_stub - * @see MOCKPP_NS::returnValue + * @see mockpp::returnValue */ template <typename R> // Returntype class ReturnStub : public TypelessStub<R> Index: TypelessStubSequence.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/stub/TypelessStubSequence.h,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- TypelessStubSequence.h 5 Apr 2006 17:03:40 -0000 1.13 +++ TypelessStubSequence.h 8 Apr 2006 12:00:37 -0000 1.14 @@ -43,7 +43,7 @@ /** Use one stub after the other from a sequence. * @ingroup grp_stub - * @see MOCKPP_NS::throwException + * @see mockpp::throwException */ template <typename R> // Invocation class TypelessStubSequence : public TypelessStub<R> Index: StubSequence.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/stub/StubSequence.h,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- StubSequence.h 5 Apr 2006 17:03:40 -0000 1.31 +++ StubSequence.h 8 Apr 2006 12:00:37 -0000 1.32 @@ -47,7 +47,7 @@ /** Use one stub after the other from a sequence. * @ingroup grp_stub - * @see MOCKPP_NS::onConsecutiveCalls + * @see mockpp::onConsecutiveCalls */ template <typename R, // Returntype typename I> // Invocation Index: ThrowStub.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/stub/ThrowStub.h,v retrieving revision 1.34 retrieving revision 1.35 diff -u -d -r1.34 -r1.35 --- ThrowStub.h 15 Mar 2006 21:34:07 -0000 1.34 +++ ThrowStub.h 8 Apr 2006 12:00:37 -0000 1.35 @@ -45,7 +45,7 @@ /** Base for stubs throwing exceptions. * @ingroup grp_stub - * @see MOCKPP_NS::throwException + * @see mockpp::throwException */ template <typename R> // Returntype class ThrowStubBase : public TypelessStub<R> |
|
From: Ewald A. <ewa...@us...> - 2006-04-08 12:00:54
|
Update of /cvsroot/mockpp/mockpp/mockpp/matcher In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26244/mockpp/matcher Modified Files: AnyArgumentsMatcher.h InvokeAtLeastMatcher.h InvokeAtLeastOnceMatcher.h InvokeAtMostMatcher.h InvokeCountMatcher.h InvokeOnceMatcher.h InvokedAfterMatcher.h InvokedBeforeMatcher.h TestFailureMatcher.h UnlimitedMatcher.h Log Message: improve onConsecutiveCalls family Index: InvokeAtLeastMatcher.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/matcher/InvokeAtLeastMatcher.h,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- InvokeAtLeastMatcher.h 15 Mar 2006 21:34:06 -0000 1.14 +++ InvokeAtLeastMatcher.h 8 Apr 2006 12:00:37 -0000 1.15 @@ -40,7 +40,7 @@ /** Has the method been invoked at least a count? * @ingroup grp_matcher - * @see MOCKPP_NS::atLeast + * @see mockpp::atLeast */ class InvokeAtLeastMatcher : public InvokedRecorder { Index: InvokeOnceMatcher.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/matcher/InvokeOnceMatcher.h,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- InvokeOnceMatcher.h 15 Mar 2006 21:34:06 -0000 1.22 +++ InvokeOnceMatcher.h 8 Apr 2006 12:00:37 -0000 1.23 @@ -44,7 +44,7 @@ /** Has the method been invoked exactly once? * @ingroup grp_matcher - * @see MOCKPP_NS::once + * @see mockpp::once */ class InvokeOnceMatcher : public InvokedRecorder { Index: InvokedAfterMatcher.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/matcher/InvokedAfterMatcher.h,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- InvokedAfterMatcher.h 15 Mar 2006 21:34:06 -0000 1.23 +++ InvokedAfterMatcher.h 8 Apr 2006 12:00:37 -0000 1.24 @@ -45,7 +45,7 @@ /** Has the method been invoked after another? * @ingroup grp_matcher - * @see MOCKPP_NS::MatchBuilder::after + * @see mockpp::MatchBuilder::after */ template <typename I> // Invocation class InvokedAfterMatcher : public StatelessInvocationMatcher<I> Index: InvokeAtLeastOnceMatcher.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/matcher/InvokeAtLeastOnceMatcher.h,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- InvokeAtLeastOnceMatcher.h 15 Mar 2006 21:34:06 -0000 1.24 +++ InvokeAtLeastOnceMatcher.h 8 Apr 2006 12:00:37 -0000 1.25 @@ -43,7 +43,7 @@ /** Has the method been invoked at least once? * @ingroup grp_matcher - * @see MOCKPP_NS::atLeastOnce + * @see mockpp::atLeastOnce */ class InvokeAtLeastOnceMatcher : public InvokedRecorder { Index: InvokeAtMostMatcher.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/matcher/InvokeAtMostMatcher.h,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- InvokeAtMostMatcher.h 15 Mar 2006 21:34:06 -0000 1.17 +++ InvokeAtMostMatcher.h 8 Apr 2006 12:00:37 -0000 1.18 @@ -39,7 +39,7 @@ /** Has the method been invoked a maximal number of times? * @ingroup grp_matcher - * @see MOCKPP_NS::atMost + * @see mockpp::atMost */ class InvokeAtMostMatcher : public InvokedRecorder { Index: InvokedBeforeMatcher.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/matcher/InvokedBeforeMatcher.h,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- InvokedBeforeMatcher.h 15 Mar 2006 21:34:06 -0000 1.13 +++ InvokedBeforeMatcher.h 8 Apr 2006 12:00:37 -0000 1.14 @@ -41,7 +41,7 @@ /** Has the method been invoked before another? * @ingroup grp_matcher - * @see MOCKPP_NS::MatchBuilder::before + * @see mockpp::MatchBuilder::before */ template <typename I> // Invocation class InvokedBeforeMatcher : public StatelessInvocationMatcher<I> Index: AnyArgumentsMatcher.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/matcher/AnyArgumentsMatcher.h,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- AnyArgumentsMatcher.h 15 Mar 2006 21:34:06 -0000 1.17 +++ AnyArgumentsMatcher.h 8 Apr 2006 12:00:36 -0000 1.18 @@ -43,7 +43,7 @@ /** Matches any arguments. * @ingroup grp_matcher - * @see MOCKPP_NS::any + * @see mockpp::any */ template <typename I> // Invocation class AnyArgumentsMatcher : public StatelessInvocationMatcher<I> Index: UnlimitedMatcher.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/matcher/UnlimitedMatcher.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- UnlimitedMatcher.h 15 Mar 2006 21:34:06 -0000 1.4 +++ UnlimitedMatcher.h 8 Apr 2006 12:00:37 -0000 1.5 @@ -43,7 +43,7 @@ /** Matches any invcotion * @ingroup grp_matcher - * @see MOCKPP_NS::unlimited + * @see mockpp::unlimited */ class UnlimitedMatcher : public InvokedRecorder { Index: TestFailureMatcher.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/matcher/TestFailureMatcher.h,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- TestFailureMatcher.h 15 Mar 2006 21:34:06 -0000 1.24 +++ TestFailureMatcher.h 8 Apr 2006 12:00:37 -0000 1.25 @@ -45,7 +45,7 @@ /** An invocation count matcher that always fails upon invocation * @ingroup grp_matcher - * @see MOCKPP_NS::never + * @see mockpp::never */ class TestFailureMatcher : public TypelessMatcher { Index: InvokeCountMatcher.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/matcher/InvokeCountMatcher.h,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- InvokeCountMatcher.h 15 Mar 2006 21:34:06 -0000 1.21 +++ InvokeCountMatcher.h 8 Apr 2006 12:00:37 -0000 1.22 @@ -44,7 +44,7 @@ /** Has the object been invoked a given number? * @ingroup grp_matcher - * @see MOCKPP_NS::exactly + * @see mockpp::exactly */ class InvokeCountMatcher : public InvokedRecorder { |
|
From: Ewald A. <ewa...@us...> - 2006-04-08 12:00:46
|
Update of /cvsroot/mockpp/mockpp/mockpp/visiting In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26244/mockpp/visiting Modified Files: VisitableMockObject.h Log Message: improve onConsecutiveCalls family Index: VisitableMockObject.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/visiting/VisitableMockObject.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- VisitableMockObject.h 5 Apr 2006 17:03:41 -0000 1.6 +++ VisitableMockObject.h 8 Apr 2006 12:00:38 -0000 1.7 @@ -551,7 +551,7 @@ /** Implements a controller for a method. * Serves also as a backwards compatibility macro. * @ingroup grp_controller - * @see MOCKPP_NS::VisitableMockObject::Controller + * @see mockpp::VisitableMockObject::Controller * @param clsname the visitable mock object class name * @param methname the method for which you create the controller */ @@ -560,7 +560,7 @@ /** Implements a controller for a method. * @ingroup grp_controller - * @see MOCKPP_NS::VisitableMockObject::Controller + * @see mockpp::VisitableMockObject::Controller * @param clsname the visitable mock object class name * @param m_methname the method for which you create the controller * @param x_methname optional extension for the internal names based on the method name |
|
From: Ewald A. <ewa...@us...> - 2006-04-08 12:00:46
|
Update of /cvsroot/mockpp/mockpp/mockpp/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26244/mockpp/tests Modified Files: ChainingMockObjectSupport_test.cpp Log Message: improve onConsecutiveCalls family Index: ChainingMockObjectSupport_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainingMockObjectSupport_test.cpp,v retrieving revision 1.42 retrieving revision 1.43 diff -u -d -r1.42 -r1.43 --- ChainingMockObjectSupport_test.cpp 15 Mar 2006 21:34:08 -0000 1.42 +++ ChainingMockObjectSupport_test.cpp 8 Apr 2006 12:00:37 -0000 1.43 @@ -505,13 +505,17 @@ { MOCKPP_NS::Stub<int, int>::AP stub; + stub = MOCKPP_NS::onConsecutiveCalls<int, int>( MOCKPP_NS::Stub<int, int>::AP( new MyStub(1u)), + MOCKPP_NS::Stub<int, int>::AP( new MyStub(2u))); + MOCKPP_ASSERT_TRUE( stub->toString() == MOCKPP_PCHAR( "custom1, and then custom2" ) ); + stub = MOCKPP_NS::onConsecutiveCalls( new MyStub( (long)1 ), - new MyStub( (long)2 )); - MOCKPP_ASSERT_TRUE( stub->toString() == MOCKPP_PCHAR( "custom1, and then custom2" ) ); + new MyStub( (long)2 )); + MOCKPP_ASSERT_TRUE( stub->toString() == MOCKPP_PCHAR( "custom1, and then custom2" ) ); stub = MOCKPP_NS::onConsecutiveCalls( new MyStub( (long)1 ), - new MyStub( (long)2 ), - new MyStub( (long)3 ) ); + new MyStub( (long)2 ), + new MyStub( (long)3 ) ); MOCKPP_ASSERT_TRUE( stub->toString() == MOCKPP_PCHAR( "custom1, and then custom2, and then custom3" ) ); stub = MOCKPP_NS::onConsecutiveCalls( new MyStub( (long)1 ), @@ -533,8 +537,12 @@ { MOCKPP_NS::TypelessStub<long>::AP stub; - stub = MOCKPP_NS::onConsecutiveCalls( new MOCKPP_NS::ReturnStub<long>( 1 ), // @todo MOCKPP_NS::returnValue - new MOCKPP_NS::ReturnStub<long>( 2 )); + stub = MOCKPP_NS::onConsecutiveCalls<long>( MOCKPP_NS::returnValue<long>( 2l ), + MOCKPP_NS::returnValue<long>( 3l )); + MOCKPP_ASSERT_TRUE( stub->toString() == MOCKPP_PCHAR( "returns <2>, and then returns <3>" ) ); + + stub = MOCKPP_NS::onConsecutiveCalls( new MOCKPP_NS::ReturnStub<long>( 1 ), + new MOCKPP_NS::ReturnStub<long>( 2 )); MOCKPP_ASSERT_TRUE( stub->toString() == MOCKPP_PCHAR( "returns <1>, and then returns <2>" ) ); stub = MOCKPP_NS::onConsecutiveCalls( new MOCKPP_NS::ReturnStub<long>( 1 ), |
|
From: Ewald A. <ewa...@us...> - 2006-04-07 19:54:55
|
Update of /cvsroot/mockpp/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17060 Modified Files: ChangeLog Log Message: new generator script Index: ChangeLog =================================================================== RCS file: /cvsroot/mockpp/mockpp/ChangeLog,v retrieving revision 1.104 retrieving revision 1.105 diff -u -d -r1.104 -r1.105 --- ChangeLog 5 Apr 2006 17:03:35 -0000 1.104 +++ ChangeLog 7 Apr 2006 19:54:50 -0000 1.105 @@ -12,6 +12,8 @@ - inline TimeServer class methods to make it independent from the library - fixes for g++ 4.1 + - fix install-win.bat + - script to generate oConsecutiveCalls() 2006-03-05 1.11.3 |
