mockpp-commits Mailing List for Mock Objects for C++ (Page 50)
Brought to you by:
ewald-arnold
Menu
▾
▴
mockpp-commits
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
(17) |
Mar
(178) |
Apr
(119) |
May
(60) |
Jun
(3) |
Jul
(60) |
Aug
(16) |
Sep
(55) |
Oct
(156) |
Nov
(136) |
Dec
(255) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(98) |
Feb
(8) |
Mar
(57) |
Apr
(43) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Ewald A. <ewa...@us...> - 2005-03-03 23:31:27
|
Update of /cvsroot/mockpp/mockpp/bcb5 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23302/bcb5 Modified Files: mockpp.bpf Log Message: added new sources Index: mockpp.bpf =================================================================== RCS file: /cvsroot/mockpp/mockpp/bcb5/mockpp.bpf,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** mockpp.bpf 18 Feb 2005 21:07:53 -0000 1.15 --- mockpp.bpf 3 Mar 2005 23:31:05 -0000 1.16 *************** *** 20,23 **** --- 20,24 ---- USEUNIT("..\mockpp\ChainableMockObject.cpp"); USEUNIT("..\mockpp\builder\BuilderNamespace.cpp"); + USEUNIT("..\mockpp\stub\VoidStub.cpp"); USEUNIT("..\mockpp\chaining\Invocation.cpp"); USEUNIT("..\mockpp\constraint\IsNothing.cpp"); *************** *** 25,28 **** --- 26,31 ---- USEUNIT("..\mockpp\matcher\TypelessMatcher.cpp"); USEUNIT("..\mockpp\matcher\InvokeAtMostMatcher.cpp"); + USEUNIT("..\mockpp\matcher\InvokeAtLeastOnceMatcher.cpp"); + USEUNIT("..\mockpp\matcher\UnlimitedMatcher.cpp"); USEUNIT("..\mockpp\matcher\InvokeCountMatcher.cpp"); USEUNIT("..\mockpp\matcher\InvokedRecorder.cpp"); |
|
From: Ewald A. <ewa...@us...> - 2005-03-03 16:11:51
|
Update of /cvsroot/mockpp/mockpp/mockpp/stub In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25475/mockpp/stub Modified Files: Makefile.am VoidStub.h Added Files: VoidStub.cpp Removed Files: dummy.cpp Log Message: separated header from source Index: VoidStub.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/stub/VoidStub.h,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** VoidStub.h 6 Jan 2005 13:09:23 -0000 1.17 --- VoidStub.h 3 Mar 2005 16:11:42 -0000 1.18 *************** *** 55,60 **** * @return return value from mocked invocation */ ! virtual void typelessInvoke( ) ! {} /** Appends the description of this object to the buffer. --- 55,59 ---- * @return return value from mocked invocation */ ! virtual void typelessInvoke( ); /** Appends the description of this object to the buffer. *************** *** 62,70 **** * @return The current content of the buffer data */ ! virtual String describeTo( String &buffer ) const ! { ! buffer += MOCKPP_PCHAR("is void"); ! return buffer; ! } }; --- 61,65 ---- * @return The current content of the buffer data */ ! virtual String describeTo( String &buffer ) const; }; Index: Makefile.am =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/stub/Makefile.am,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Makefile.am 11 Dec 2004 18:24:07 -0000 1.6 --- Makefile.am 3 Mar 2005 16:11:42 -0000 1.7 *************** *** 10,12 **** CLEANFILES = *.~* *.~~* *~ *.old ! libstub_la_SOURCES = dummy.cpp --- 10,13 ---- CLEANFILES = *.~* *.~~* *~ *.old ! ! libstub_la_SOURCES = VoidStub.cpp --- dummy.cpp DELETED --- --- NEW FILE: VoidStub.cpp --- /** @file @brief Stub for void methods $Id: VoidStub.cpp,v 1.1 2005/03/03 16:11:42 ewald-arnold Exp $ ***************************************************************************/ /************************************************************************** begin : Thu Aug 24 2004 copyright : (C) 2002-2005 by Ewald Arnold email : mockpp at ewald-arnold dot de This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * * Original Java Sources: Copyright (c) 2000-2004, jMock.org * **/ #include <mockpp/mockpp.h> // always first #include <mockpp/stub/VoidStub.h> namespace mockpp { void MOCKPP_EXPORT VoidStub::typelessInvoke( ) { } String MOCKPP_EXPORT VoidStub::describeTo( String &buffer ) const { buffer += MOCKPP_PCHAR("is void"); return buffer; } } // namespace mockpp |
|
From: Ewald A. <ewa...@us...> - 2005-03-03 15:57:44
|
Update of /cvsroot/mockpp/mockpp/mockpp/builder In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21117/mockpp/builder Modified Files: ArgumentsMatchBuilder.h Log Message: better support for typeless constraints Index: ArgumentsMatchBuilder.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/builder/ArgumentsMatchBuilder.h,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** ArgumentsMatchBuilder.h 30 Jan 2005 12:09:17 -0000 1.27 --- ArgumentsMatchBuilder.h 3 Mar 2005 15:57:18 -0000 1.28 *************** *** 42,45 **** --- 42,46 ---- #include <mockpp/constraint/ConstraintSet.h> + #include <mockpp/constraint/ConstraintHolder.h> #include <mockpp/matcher/NoArgumentsMatcher.h> *************** *** 154,158 **** * @return the builder object */ ! MatchBuilder<R, I>& with( typename Constraint<T1>::AP cons1 ) { return with_cs( ConstraintSetType( cons1 ) ); --- 155,159 ---- * @return the builder object */ ! MatchBuilder<R, I>& with( const ConstraintHolder<T1> &cons1 ) { return with_cs( ConstraintSetType( cons1 ) ); *************** *** 197,202 **** * @return the builder object */ ! MatchBuilder<R, I>& with( typename Constraint<T1>::AP cons1, ! typename Constraint<T2>::AP cons2 ) { return with_cs( ConstraintSetType( cons1, cons2 ) ); --- 198,203 ---- * @return the builder object */ ! MatchBuilder<R, I>& with( const ConstraintHolder<T1> &cons1, ! const ConstraintHolder<T2> &cons2 ) { return with_cs( ConstraintSetType( cons1, cons2 ) ); *************** *** 243,249 **** * @return the builder object */ ! MatchBuilder<R, I>& with( typename Constraint<T1>::AP cons1, ! typename Constraint<T2>::AP cons2, ! typename Constraint<T3>::AP cons3 ) { return with_cs( ConstraintSetType( cons1, cons2, cons3 ) ); --- 244,250 ---- * @return the builder object */ ! MatchBuilder<R, I>& with( const ConstraintHolder<T1> &cons1, ! const ConstraintHolder<T2> &cons2, ! const ConstraintHolder<T3> &cons3 ) { return with_cs( ConstraintSetType( cons1, cons2, cons3 ) ); *************** *** 292,299 **** * @return the builder object */ ! MatchBuilder<R, I>& with( typename Constraint<T1>::AP cons1, ! typename Constraint<T2>::AP cons2, ! typename Constraint<T3>::AP cons3, ! typename Constraint<T4>::AP cons4 ) { return with_cs( ConstraintSetType( cons1, cons2, cons3, cons4 ) ); --- 293,300 ---- * @return the builder object */ ! MatchBuilder<R, I>& with( const ConstraintHolder<T1> &cons1, ! const ConstraintHolder<T2> &cons2, ! const ConstraintHolder<T3> &cons3, ! const ConstraintHolder<T4> &cons4 ) { return with_cs( ConstraintSetType( cons1, cons2, cons3, cons4 ) ); *************** *** 344,352 **** * @return the builder object */ ! MatchBuilder<R, I>& with( typename Constraint<T1>::AP cons1, ! typename Constraint<T2>::AP cons2, ! typename Constraint<T3>::AP cons3, ! typename Constraint<T4>::AP cons4, ! typename Constraint<T5>::AP cons5 ) { return with_cs( ConstraintSetType( cons1, cons2, cons3, cons4, cons5 ) ); --- 345,353 ---- * @return the builder object */ ! MatchBuilder<R, I>& with( const ConstraintHolder<T1> &cons1, ! const ConstraintHolder<T2> &cons2, ! const ConstraintHolder<T3> &cons3, ! const ConstraintHolder<T4> &cons4, ! const ConstraintHolder<T5> &cons5 ) { return with_cs( ConstraintSetType( cons1, cons2, cons3, cons4, cons5 ) ); |
|
From: Ewald A. <ewa...@us...> - 2005-03-03 15:56:22
|
Update of /cvsroot/mockpp/mockpp/mockpp/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20749/mockpp/tests Modified Files: ArgumentsMatchBuilder_test.cpp Log Message: better support for typeless constraints Index: ArgumentsMatchBuilder_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ArgumentsMatchBuilder_test.cpp,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** ArgumentsMatchBuilder_test.cpp 30 Dec 2004 20:54:04 -0000 1.22 --- ArgumentsMatchBuilder_test.cpp 3 Mar 2005 15:55:56 -0000 1.23 *************** *** 47,50 **** --- 47,52 ---- #include <mockpp/constraint/IsEqual.h> + #include <mockpp/chaining/ChainingMockObjectSupport.h> + #include <cppunit/extensions/HelperMacros.h> *************** *** 258,261 **** --- 260,270 ---- new mockpp::IsEqual<CE>(CE())); CPPUNIT_ASSERT( c5.last_matcher->toString() == MOCKPP_PCHAR("(equalTo CA&, equalTo CB&, equalTo CC&, equalTo CD&, equalTo CE&)") ); + + c1.with(mockpp::any()); + c2.with(mockpp::any(), mockpp::any()); + c3.with(mockpp::any(), mockpp::any(), mockpp::any()); + c4.with(mockpp::any(), mockpp::any(), mockpp::any(), mockpp::any()); + c5.with(mockpp::any(), mockpp::any(), mockpp::any(), mockpp::any(), mockpp::any()); + } } |
|
From: Ewald A. <ewa...@us...> - 2005-03-03 15:51:27
|
Update of /cvsroot/mockpp/mockpp/mockpp/matcher In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19683/mockpp/matcher Modified Files: InvokeAtLeastOnceMatcher.h Makefile.am Added Files: InvokeAtLeastOnceMatcher.cpp Log Message: separated header from source --- NEW FILE: InvokeAtLeastOnceMatcher.cpp --- /** @file @brief Matches an invocation count of at least 1 $Id: InvokeAtLeastOnceMatcher.cpp,v 1.1 2005/03/03 15:51:00 ewald-arnold Exp $ ***************************************************************************/ /************************************************************************** begin : Thu Aug 26 2004 copyright : (C) 2002-2005 by Ewald Arnold email : mockpp at ewald-arnold dot de This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * * Original Java Sources: Copyright (c) 2000-2004, jMock.org * **/ #include <mockpp/mockpp.h> // always first #include <mockpp/matcher/InvokeAtLeastOnceMatcher.h> namespace mockpp { void MOCKPP_EXPORT InvokeAtLeastOnceMatcher::verify() { verifyHasBeenInvoked(); } bool MOCKPP_EXPORT InvokeAtLeastOnceMatcher::hasDescription() { return true; } bool MOCKPP_EXPORT InvokeAtLeastOnceMatcher::matches( ) { return true; } String MOCKPP_EXPORT InvokeAtLeastOnceMatcher::describeTo( String &buffer ) const { buffer += MOCKPP_PCHAR("expected at least once"); if (hasBeenInvoked()) { buffer += MOCKPP_PCHAR(" and has been invoked"); } return buffer; } } // namespace mockpp Index: Makefile.am =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/matcher/Makefile.am,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Makefile.am 24 Oct 2004 16:43:22 -0000 1.10 --- Makefile.am 3 Mar 2005 15:51:00 -0000 1.11 *************** *** 13,17 **** libmatcher_la_SOURCES = InvokeAtLeastMatcher.cpp InvokeAtMostMatcher.cpp \ InvokeCountMatcher.cpp InvokedRecorder.cpp InvokeOnceMatcher.cpp TestFailureMatcher.cpp \ ! TypelessMatcher.cpp CLEANFILES = *.~* *.~~* *~ *.old --- 13,17 ---- libmatcher_la_SOURCES = InvokeAtLeastMatcher.cpp InvokeAtMostMatcher.cpp \ InvokeCountMatcher.cpp InvokedRecorder.cpp InvokeOnceMatcher.cpp TestFailureMatcher.cpp \ ! TypelessMatcher.cpp InvokeAtLeastOnceMatcher.cpp CLEANFILES = *.~* *.~~* *~ *.old Index: InvokeAtLeastOnceMatcher.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/matcher/InvokeAtLeastOnceMatcher.h,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** InvokeAtLeastOnceMatcher.h 27 Feb 2005 11:48:16 -0000 1.21 --- InvokeAtLeastOnceMatcher.h 3 Mar 2005 15:51:00 -0000 1.22 *************** *** 32,37 **** **/ ! #ifndef MOCKPP_INVOKEATLEATONCEMATCHER_H ! #define MOCKPP_INVOKEATLEATONCEMATCHER_H #include <mockpp/mockpp.h> // always first --- 32,37 ---- **/ ! #ifndef MOCKPP_INVOKEATLEASTONCEMATCHER_H ! #define MOCKPP_INVOKEATLEASTONCEMATCHER_H #include <mockpp/mockpp.h> // always first *************** *** 53,76 **** * If it fails, an AssertionFailedError is thrown */ ! virtual void verify() ! { ! verifyHasBeenInvoked(); ! } /** Does the object provide meaningful description via describeTo() ?. * @return true: description is available */ ! virtual bool hasDescription() ! { ! return true; ! } /** Checks if an invocation matches the expectaton * @return true: the invocation matches */ ! virtual bool matches( ) ! { ! return true; ! } /** Appends the description of this object to the buffer. --- 53,67 ---- * If it fails, an AssertionFailedError is thrown */ ! virtual void verify(); /** Does the object provide meaningful description via describeTo() ?. * @return true: description is available */ ! virtual bool hasDescription(); /** Checks if an invocation matches the expectaton * @return true: the invocation matches */ ! virtual bool matches( ); /** Appends the description of this object to the buffer. *************** *** 78,91 **** * @return The current content of the buffer data */ ! virtual String describeTo( String &buffer ) const ! { ! buffer += MOCKPP_PCHAR("expected at least once"); ! if (hasBeenInvoked()) ! { ! buffer += MOCKPP_PCHAR(" and has been invoked"); ! } ! ! return buffer; ! } }; --- 69,73 ---- * @return The current content of the buffer data */ ! virtual String describeTo( String &buffer ) const; }; *************** *** 94,97 **** ! #endif // MOCKPP_INVOKEATLEATONCEMATCHER_H --- 76,79 ---- ! #endif // MOCKPP_INVOKEATLEASTONCEMATCHER_H |
|
From: Ewald A. <ewa...@us...> - 2005-03-03 15:50:44
|
Update of /cvsroot/mockpp/mockpp/mockpp/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19498/mockpp/tests Modified Files: TrackingCounter_test.cpp Log Message: changed error description Index: TrackingCounter_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/TrackingCounter_test.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** TrackingCounter_test.cpp 27 Feb 2005 11:48:16 -0000 1.4 --- TrackingCounter_test.cpp 3 Mar 2005 15:50:14 -0000 1.5 *************** *** 372,376 **** MOCKPP_PCHAR("test_master_verify()"), mockpp::AssertionFailedError, ! exception_object.getMessage().find(MOCKPP_PCHAR("called 1 times which is less ")) != std::string::npos); ec.inc(); ec.inc(); --- 372,376 ---- MOCKPP_PCHAR("test_master_verify()"), mockpp::AssertionFailedError, ! exception_object.getMessage().find(MOCKPP_PCHAR("tagged 1 times which is less ")) != std::string::npos); ec.inc(); ec.inc(); *************** *** 378,382 **** MOCKPP_PCHAR("test_master_verify()"), mockpp::AssertionFailedError, ! exception_object.getMessage().find(MOCKPP_PCHAR("called 3 times which is more")) != std::string::npos); } --- 378,382 ---- MOCKPP_PCHAR("test_master_verify()"), mockpp::AssertionFailedError, ! exception_object.getMessage().find(MOCKPP_PCHAR("tagged 3 times which is more")) != std::string::npos); } |
|
From: Ewald A. <ewa...@us...> - 2005-03-03 15:50:07
|
Update of /cvsroot/mockpp/mockpp/mockpp/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19250/mockpp/tests Modified Files: Formatter_test.cpp Log Message: additional type Index: Formatter_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/Formatter_test.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** Formatter_test.cpp 26 Jan 2005 21:59:12 -0000 1.20 --- Formatter_test.cpp 3 Mar 2005 15:49:36 -0000 1.21 *************** *** 402,405 **** --- 402,433 ---- MOCKPP_ASSERT_EQUALS(fmt, MOCKPP_PCSTRING("9876543210")); + + fmt = MOCKPP_PCHAR("%9%8%7%6%5%4%3%2%1%0"); + fmt << (signed char) ('0') + << (signed char)('1') + << (signed char)('2') + << (signed char)('3') + << (signed char)('4') + << (signed char)('5') + << (signed char)('6') + << (signed char)('7') + << (signed char)('8') + << (signed char)('9'); + + MOCKPP_ASSERT_EQUALS(fmt, MOCKPP_PCSTRING("9876543210")); + + fmt = MOCKPP_PCHAR("%9%8%7%6%5%4%3%2%1%0"); + fmt << (unsigned char)('0') + << (unsigned char)('1') + << (unsigned char)('2') + << (unsigned char)('3') + << (unsigned char)('4') + << (unsigned char)('5') + << (unsigned char)('6') + << (unsigned char)('7') + << (unsigned char)('8') + << (unsigned char)('9'); + + MOCKPP_ASSERT_EQUALS(fmt, MOCKPP_PCSTRING("9876543210")); } |
|
From: Ewald A. <ewa...@us...> - 2005-03-03 15:50:06
|
Update of /cvsroot/mockpp/mockpp/mockpp/compat In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19250/mockpp/compat Modified Files: Formatter.cpp Log Message: additional type Index: Formatter.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/compat/Formatter.cpp,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** Formatter.cpp 30 Dec 2004 20:54:04 -0000 1.34 --- Formatter.cpp 3 Mar 2005 15:49:36 -0000 1.35 *************** *** 237,241 **** ! mockpp::String & MOCKPP_EXPORT operator << ( mockpp::String &formatter, char repdata ) { mockpp::String s; --- 237,250 ---- ! mockpp::String & MOCKPP_EXPORT operator << ( mockpp::String &formatter, signed char repdata ) ! { ! mockpp::String s; ! s += repdata; ! formatter << s; ! return formatter; ! } ! ! ! mockpp::String & MOCKPP_EXPORT operator << ( mockpp::String &formatter, unsigned char repdata ) { mockpp::String s; |
|
From: Ewald A. <ewa...@us...> - 2005-03-03 15:49:26
|
Update of /cvsroot/mockpp/mockpp/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19079/mockpp Modified Files: TrackingCounter.cpp Log Message: changed error description Index: TrackingCounter.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/TrackingCounter.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** TrackingCounter.cpp 2 Mar 2005 13:37:41 -0000 1.7 --- TrackingCounter.cpp 3 Mar 2005 15:49:01 -0000 1.8 *************** *** 90,94 **** void MOCKPP_EXPORT TrackingCounterBase::setExpected(unsigned expectedValue) - { setExpected(expectedValue, expectedValue); --- 90,93 ---- *************** *** 138,146 **** else { ! String fmt = i18n(MOCKPP_PCHAR("%1 was called %2 times which is less than the expected count of %3.")); fmt << getVerifiableName() << myActualValue << getExpectedMinValue(); MOCKPP_ASSERT_TRUE_MESSAGE(fmt, getExpectedMinValue() <= myActualValue); ! fmt = i18n(MOCKPP_PCHAR("%1 was called %2 times which is more than the expected count of %3.")); fmt << getVerifiableName() << myActualValue << getExpectedMaxValue(); MOCKPP_ASSERT_TRUE_MESSAGE(fmt, getExpectedMaxValue() >= myActualValue); --- 137,145 ---- else { ! String fmt = i18n(MOCKPP_PCHAR("%1 was tagged %2 times which is less than the expected count of %3.")); fmt << getVerifiableName() << myActualValue << getExpectedMinValue(); MOCKPP_ASSERT_TRUE_MESSAGE(fmt, getExpectedMinValue() <= myActualValue); ! fmt = i18n(MOCKPP_PCHAR("%1 was tagged %2 times which is more than the expected count of %3.")); fmt << getVerifiableName() << myActualValue << getExpectedMaxValue(); MOCKPP_ASSERT_TRUE_MESSAGE(fmt, getExpectedMaxValue() >= myActualValue); *************** *** 196,200 **** if (shouldCheckImmediately()) { ! String fmt = i18n(MOCKPP_PCHAR("%1 was called %2 times but should not be called more than %3 times.")); fmt << getVerifiableName() << myActualValue << getExpectedMaxValue(); --- 195,199 ---- if (shouldCheckImmediately()) { ! String fmt = i18n(MOCKPP_PCHAR("%1 was tagged %2 times but should not be called more than %3 times.")); fmt << getVerifiableName() << myActualValue << getExpectedMaxValue(); *************** *** 287,291 **** if (shouldCheckImmediately()) { ! String fmt = i18n(MOCKPP_PCHAR("%1 was tagged with %2 but should not be tagged with more than %3 times.")); fmt << getVerifiableName() << myActualValue << getExpectedMaxValue(); --- 286,290 ---- if (shouldCheckImmediately()) { ! String fmt = i18n(MOCKPP_PCHAR("%1 was tagged with %2 but should not be tagged more than %3 times.")); fmt << getVerifiableName() << myActualValue << getExpectedMaxValue(); |
|
From: Ewald A. <ewa...@us...> - 2005-03-03 15:48:25
|
Update of /cvsroot/mockpp/mockpp/mockpp/compat In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18892/mockpp/compat Modified Files: Formatter.h Log Message: additional type Index: Formatter.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/compat/Formatter.h,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** Formatter.h 6 Jan 2005 13:09:22 -0000 1.24 --- Formatter.h 3 Mar 2005 15:48:16 -0000 1.25 *************** *** 131,135 **** * @return the resulting string */ ! mockpp::String & operator << (mockpp::String &formatter, char repdata); --- 131,146 ---- * @return the resulting string */ ! mockpp::String & operator << (mockpp::String &formatter, signed char repdata); ! ! ! /** Replace a positional %-parameter with a value. ! * Replaces the lowest %-parameter with the string representation of the data. ! * "hello %1" << 'A' gives "hello A" ! * @ingroup grp_helper ! * @param formatter target string with position parameter ! * @param repdata value to replace ! * @return the resulting string ! */ ! mockpp::String & operator << (mockpp::String &formatter, unsigned char repdata); |
|
From: Ewald A. <ewa...@us...> - 2005-03-03 14:54:19
|
Update of /cvsroot/mockpp/mockpp/mockpp/constraint In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1859/mockpp/constraint Modified Files: ConstraintSet.h Log Message: compiler warning Index: ConstraintSet.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/constraint/ConstraintSet.h,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** ConstraintSet.h 30 Dec 2004 20:54:04 -0000 1.10 --- ConstraintSet.h 3 Mar 2005 14:54:08 -0000 1.11 *************** *** 52,56 **** */ template <typename I> // Invocation ! bool matches( const I &invocation ) { return true; --- 52,56 ---- */ template <typename I> // Invocation ! bool matches( const I & /*invocatio*/n ) { return true; |
|
From: Ewald A. <ewa...@us...> - 2005-03-02 13:38:21
|
Update of /cvsroot/mockpp/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12178 Modified Files: ChangeLog Log Message: added last changes Index: ChangeLog =================================================================== RCS file: /cvsroot/mockpp/mockpp/ChangeLog,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** ChangeLog 27 Feb 2005 18:04:28 -0000 1.31 --- ChangeLog 2 Mar 2005 13:38:03 -0000 1.32 *************** *** 7,10 **** --- 7,12 ---- - VisitableMockObjects and the according controller also take Constraints as objects instead of actual values. + - fixed some compiler warnings + - added #include for gcc 2.95 2005-02-25 1.4.0: - changed "verify() const" to "verify()" |
|
From: Ewald A. <ewa...@us...> - 2005-03-02 13:37:52
|
Update of /cvsroot/mockpp/mockpp/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12017/mockpp Modified Files: TrackingCounter.cpp Log Message: added #include for gcc 2.95 Index: TrackingCounter.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/TrackingCounter.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** TrackingCounter.cpp 27 Feb 2005 11:48:14 -0000 1.6 --- TrackingCounter.cpp 2 Mar 2005 13:37:41 -0000 1.7 *************** *** 30,33 **** --- 30,35 ---- #include <mockpp/mockpp.h> // always first + #include <algorithm> + #include <mockpp/TrackingCounter.h> #include <mockpp/VerifiableList.h> |
|
From: Ewald A. <ewa...@us...> - 2005-03-02 12:48:46
|
Update of /cvsroot/mockpp/mockpp/mockpp/matcher In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28075/mockpp/matcher Modified Files: StatelessInvocationMatcher.h Log Message: compiler warning Index: StatelessInvocationMatcher.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/matcher/StatelessInvocationMatcher.h,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** StatelessInvocationMatcher.h 27 Feb 2005 11:48:16 -0000 1.18 --- StatelessInvocationMatcher.h 2 Mar 2005 12:48:37 -0000 1.19 *************** *** 56,60 **** * @param invocation the invocation data */ ! virtual void incInvoked( const I &invocation ) { // Do nothing because state cannot change --- 56,60 ---- * @param invocation the invocation data */ ! virtual void incInvoked( const I & /*invocation*/ ) { // Do nothing because state cannot change |
|
From: Ewald A. <ewa...@us...> - 2005-03-01 19:36:48
|
Update of /cvsroot/mockpp/mockpp/mockpp/stub In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28770/mockpp/stub Modified Files: TypelessStub.h Log Message: compiler warning Index: TypelessStub.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/stub/TypelessStub.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** TypelessStub.h 15 Jan 2005 12:22:26 -0000 1.9 --- TypelessStub.h 1 Mar 2005 19:36:19 -0000 1.10 *************** *** 138,142 **** * @return return value from mocked invocation */ ! virtual R invoke( const I &invocation ) { return stubber->typelessInvoke(); --- 138,142 ---- * @return return value from mocked invocation */ ! virtual R invoke( const I &/*invocation*/ ) { return stubber->typelessInvoke(); *************** *** 145,152 **** ! #ifndef MOCKPP_PTI_WEAKNESS // Partial Template Instatiation Weakness ! ! ! /** Partial specialisation for base of adapters for the "translation" to * typeless void stub objects. * @internal --- 145,152 ---- ! #ifndef MOCKPP_PTI_WEAKNESS // Partial Template Instatiation Weakness ! ! ! /** Partial specialisation for base of adapters for the "translation" to * typeless void stub objects. * @internal *************** *** 168,172 **** * @param invocation invocation data */ ! virtual void invoke( const I &invocation ) { stubber->typelessInvoke(); --- 168,172 ---- * @param invocation invocation data */ ! virtual void invoke( const I &/*invocation*/ ) { stubber->typelessInvoke(); *************** *** 174,199 **** }; ! ! #else // MOCKPP_PTI_WEAKNESS Partial Template Instatiation Weakness ! ! /** Declare specialized methods for mockpp::InvocationMocker. ! * Neccessary for compiler with weak template capabilities. ! */ ! #define MOCKPP_TYPELESSSTUBADAPTER_PTI_DECL(I) \ ! void mockpp::TypelessStubAdapter<void, I>::invoke( const I &); ! ! ! /** Implement specialized methods for mockpp::InvocationMocker. ! * Neccessary for compiler with weak template capabilities. ! */ ! #define MOCKPP_TYPELESSSTUBADAPTER_PTI_IMPL(I) \ ! void mockpp::TypelessStubAdapter<void, I>::invoke( const I &invocation) \ ! { \ ! stubber->typelessInvoke(); \ ! } ! ! ! #endif // MOCKPP_PTI_WEAKNESS ! } // namespace mockpp --- 174,199 ---- }; ! ! #else // MOCKPP_PTI_WEAKNESS Partial Template Instatiation Weakness ! ! /** Declare specialized methods for mockpp::InvocationMocker. ! * Neccessary for compiler with weak template capabilities. ! */ ! #define MOCKPP_TYPELESSSTUBADAPTER_PTI_DECL(I) \ ! void mockpp::TypelessStubAdapter<void, I>::invoke( const I &); ! ! ! /** Implement specialized methods for mockpp::InvocationMocker. ! * Neccessary for compiler with weak template capabilities. ! */ ! #define MOCKPP_TYPELESSSTUBADAPTER_PTI_IMPL(I) \ ! void mockpp::TypelessStubAdapter<void, I>::invoke( const I &invocation) \ ! { \ ! stubber->typelessInvoke(); \ ! } ! ! ! #endif // MOCKPP_PTI_WEAKNESS ! } // namespace mockpp |
|
From: Ewald A. <ewa...@us...> - 2005-03-01 19:36:48
|
Update of /cvsroot/mockpp/mockpp/mockpp/matcher In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28770/mockpp/matcher Modified Files: TypelessMatcher.h Log Message: compiler warning Index: TypelessMatcher.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/matcher/TypelessMatcher.h,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** TypelessMatcher.h 27 Feb 2005 11:48:16 -0000 1.11 --- TypelessMatcher.h 1 Mar 2005 19:36:19 -0000 1.12 *************** *** 105,109 **** * @return true: the invocation matches */ ! virtual bool matches( const I &invocation ) { return matcher->matches(); --- 105,109 ---- * @return true: the invocation matches */ ! virtual bool matches( const I &/*invocation*/ ) { return matcher->matches(); *************** *** 113,117 **** * @param invocation the invocation data */ ! virtual void incInvoked( const I &invocation ) { matcher->incInvoked(); --- 113,117 ---- * @param invocation the invocation data */ ! virtual void incInvoked( const I &/*invocation*/ ) { matcher->incInvoked(); |
|
From: Ewald A. <ewa...@us...> - 2005-03-01 19:36:07
|
Update of /cvsroot/mockpp/mockpp/mockpp/chaining In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28601/mockpp/chaining Modified Files: ChainingMockObjectSupport.h Log Message: added #define to import from mockpp namespace Index: ChainingMockObjectSupport.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/ChainingMockObjectSupport.h,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** ChainingMockObjectSupport.h 30 Jan 2005 12:09:17 -0000 1.16 --- ChainingMockObjectSupport.h 1 Mar 2005 19:35:58 -0000 1.17 *************** *** 609,611 **** --- 609,643 ---- + /** Imports the abbreviations into the global namespace to enhance redability + * by omitting namespace prefix. + */ + #ifdef MOCKPP_IMPORT_ABBREVIATED + using mockpp::any; + using mockpp::nothing; + using mockpp::eq; + using mockpp::ne; + using mockpp::le; + using mockpp::ge; + using mockpp::gt; + using mockpp::lt; + using mockpp::same; + using mockpp::isA; + using mockpp::stringContains; + using mockpp::startsWith; + using mockpp::endsWith; + using mockpp::logic_not; + using mockpp::logic_and; + using mockpp::logic_or; + using mockpp::returnValue; + using mockpp::onConsecutiveCalls; + using mockpp::throwException; + using mockpp::once; + using mockpp::atLeastOnce; + using mockpp::atMost; + using mockpp::atLeast; + using mockpp::exactly; + using mockpp::never; + #endif + + #endif // MOCKPP_CHAININGMOCKOBJECTSUPPORT_H |
|
From: Ewald A. <ewa...@us...> - 2005-03-01 19:35:24
|
Update of /cvsroot/mockpp/mockpp/bcbX In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28398/bcbX Modified Files: basicmock.cbx chainmock.cbx cppunit.cbx jmock_test.cbx mock_greeter.cbx mock_test.cbx mockpp.cbx poormock-se.cbx poormock.cbx verifying.cbx visitmock.cbx Log Message: update version number Index: cppunit.cbx =================================================================== RCS file: /cvsroot/mockpp/mockpp/bcbX/cppunit.cbx,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** cppunit.cbx 27 Feb 2005 11:48:14 -0000 1.5 --- cppunit.cbx 1 Mar 2005 19:35:08 -0000 1.6 *************** *** 102,106 **** <property category="win32.Debug_Build.win32b.ilink32" name="option.v.enabled" value="1"/> <property category="win32.Debug_Build.win32b.ilink32" name="option.x.enabled" value="1"/> ! <property category="win32.Debug_Build.win32b.ilink32" name="param.exefile.1" value="c:\tmp\compilex\cppunit_22.exe"/> <property category="win32.Debug_Build.win32b.ilink32" name="param.libfiles.1" value="cw32.lib"/> <property category="win32.Debug_Build.win32b.ilink32" name="param.libfiles.2" value="import32.lib"/> --- 102,106 ---- <property category="win32.Debug_Build.win32b.ilink32" name="option.v.enabled" value="1"/> <property category="win32.Debug_Build.win32b.ilink32" name="option.x.enabled" value="1"/> ! <property category="win32.Debug_Build.win32b.ilink32" name="param.exefile.1" value="c:\tmp\compilex\cppunit_23.exe"/> <property category="win32.Debug_Build.win32b.ilink32" name="param.libfiles.1" value="cw32.lib"/> <property category="win32.Debug_Build.win32b.ilink32" name="param.libfiles.2" value="import32.lib"/> *************** *** 118,122 **** <property category="unique" name="id" value="1"/> </file> ! <file path="C%|/tmp/compilex/mockpp_22.lib"> <property category="unique" name="id" value="3"/> </file> --- 118,122 ---- <property category="unique" name="id" value="1"/> </file> ! <file path="C%|/tmp/compilex/mockpp_23.lib"> <property category="unique" name="id" value="3"/> </file> Index: chainmock.cbx =================================================================== RCS file: /cvsroot/mockpp/mockpp/bcbX/chainmock.cbx,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** chainmock.cbx 27 Feb 2005 11:48:14 -0000 1.5 --- chainmock.cbx 1 Mar 2005 19:35:08 -0000 1.6 *************** *** 102,106 **** <property category="win32.Debug_Build.win32b.ilink32" name="option.v.enabled" value="1"/> <property category="win32.Debug_Build.win32b.ilink32" name="option.x.enabled" value="1"/> ! <property category="win32.Debug_Build.win32b.ilink32" name="param.exefile.1" value="c:\tmp\compilex\chainmock_22.exe"/> <property category="win32.Debug_Build.win32b.ilink32" name="param.libfiles.1" value="cw32.lib"/> <property category="win32.Debug_Build.win32b.ilink32" name="param.libfiles.2" value="import32.lib"/> --- 102,106 ---- <property category="win32.Debug_Build.win32b.ilink32" name="option.v.enabled" value="1"/> <property category="win32.Debug_Build.win32b.ilink32" name="option.x.enabled" value="1"/> ! <property category="win32.Debug_Build.win32b.ilink32" name="param.exefile.1" value="c:\tmp\compilex\chainmock_23.exe"/> <property category="win32.Debug_Build.win32b.ilink32" name="param.libfiles.1" value="cw32.lib"/> <property category="win32.Debug_Build.win32b.ilink32" name="param.libfiles.2" value="import32.lib"/> *************** *** 118,122 **** <property category="unique" name="id" value="5"/> </file> ! <file path="C%|/tmp/compilex/mockpp_22.lib"> <property category="unique" name="id" value="3"/> </file> --- 118,122 ---- <property category="unique" name="id" value="5"/> </file> ! <file path="C%|/tmp/compilex/mockpp_23.lib"> <property category="unique" name="id" value="3"/> </file> Index: poormock.cbx =================================================================== RCS file: /cvsroot/mockpp/mockpp/bcbX/poormock.cbx,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** poormock.cbx 27 Feb 2005 11:48:14 -0000 1.5 --- poormock.cbx 1 Mar 2005 19:35:08 -0000 1.6 *************** *** 102,106 **** <property category="win32.Debug_Build.win32b.ilink32" name="option.v.enabled" value="1"/> <property category="win32.Debug_Build.win32b.ilink32" name="option.x.enabled" value="1"/> ! <property category="win32.Debug_Build.win32b.ilink32" name="param.exefile.1" value="c:\tmp\compilex\poormock_22.exe"/> <property category="win32.Debug_Build.win32b.ilink32" name="param.libfiles.1" value="cw32.lib"/> <property category="win32.Debug_Build.win32b.ilink32" name="param.libfiles.2" value="import32.lib"/> --- 102,106 ---- <property category="win32.Debug_Build.win32b.ilink32" name="option.v.enabled" value="1"/> <property category="win32.Debug_Build.win32b.ilink32" name="option.x.enabled" value="1"/> ! <property category="win32.Debug_Build.win32b.ilink32" name="param.exefile.1" value="c:\tmp\compilex\poormock_23.exe"/> <property category="win32.Debug_Build.win32b.ilink32" name="param.libfiles.1" value="cw32.lib"/> <property category="win32.Debug_Build.win32b.ilink32" name="param.libfiles.2" value="import32.lib"/> Index: poormock-se.cbx =================================================================== RCS file: /cvsroot/mockpp/mockpp/bcbX/poormock-se.cbx,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** poormock-se.cbx 27 Feb 2005 11:48:14 -0000 1.3 --- poormock-se.cbx 1 Mar 2005 19:35:08 -0000 1.4 *************** *** 102,106 **** <property category="win32.Debug_Build.win32b.ilink32" name="option.v.enabled" value="1"/> <property category="win32.Debug_Build.win32b.ilink32" name="option.x.enabled" value="1"/> ! <property category="win32.Debug_Build.win32b.ilink32" name="param.exefile.1" value="c:\tmp\compilex\poormock-se_22.exe"/> <property category="win32.Debug_Build.win32b.ilink32" name="param.libfiles.1" value="cw32.lib"/> <property category="win32.Debug_Build.win32b.ilink32" name="param.libfiles.2" value="import32.lib"/> --- 102,106 ---- <property category="win32.Debug_Build.win32b.ilink32" name="option.v.enabled" value="1"/> <property category="win32.Debug_Build.win32b.ilink32" name="option.x.enabled" value="1"/> ! <property category="win32.Debug_Build.win32b.ilink32" name="param.exefile.1" value="c:\tmp\compilex\poormock-se_23.exe"/> <property category="win32.Debug_Build.win32b.ilink32" name="param.libfiles.1" value="cw32.lib"/> <property category="win32.Debug_Build.win32b.ilink32" name="param.libfiles.2" value="import32.lib"/> Index: mock_greeter.cbx =================================================================== RCS file: /cvsroot/mockpp/mockpp/bcbX/mock_greeter.cbx,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** mock_greeter.cbx 27 Feb 2005 11:48:14 -0000 1.5 --- mock_greeter.cbx 1 Mar 2005 19:35:08 -0000 1.6 *************** *** 99,103 **** <property category="win32.Debug_Build.win32b.ilink32" name="option.v.enabled" value="1"/> <property category="win32.Debug_Build.win32b.ilink32" name="option.x.enabled" value="1"/> ! <property category="win32.Debug_Build.win32b.ilink32" name="param.exefile.1" value="c:\tmp\compilex\mock_greeter_22.exe"/> <property category="win32.Debug_Build.win32b.ilink32" name="param.libfiles.1" value="cw32.lib"/> <property category="win32.Debug_Build.win32b.ilink32" name="param.libfiles.2" value="import32.lib"/> --- 99,103 ---- <property category="win32.Debug_Build.win32b.ilink32" name="option.v.enabled" value="1"/> <property category="win32.Debug_Build.win32b.ilink32" name="option.x.enabled" value="1"/> ! <property category="win32.Debug_Build.win32b.ilink32" name="param.exefile.1" value="c:\tmp\compilex\mock_greeter_23.exe"/> <property category="win32.Debug_Build.win32b.ilink32" name="param.libfiles.1" value="cw32.lib"/> <property category="win32.Debug_Build.win32b.ilink32" name="param.libfiles.2" value="import32.lib"/> *************** *** 115,119 **** <property category="unique" name="id" value="1"/> </file> ! <file path="C%|/tmp/compilex/mockpp_22.lib"> <property category="unique" name="id" value="3"/> </file> --- 115,119 ---- <property category="unique" name="id" value="1"/> </file> ! <file path="C%|/tmp/compilex/mockpp_23.lib"> <property category="unique" name="id" value="3"/> </file> Index: mockpp.cbx =================================================================== RCS file: /cvsroot/mockpp/mockpp/bcbX/mockpp.cbx,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** mockpp.cbx 27 Feb 2005 11:48:14 -0000 1.8 --- mockpp.cbx 1 Mar 2005 19:35:08 -0000 1.9 *************** *** 151,155 **** <property category="win32.Debug_Build.win32b.ilink32" name="option.v.enabled" value="1"/> <property category="win32.Debug_Build.win32b.ilink32" name="option.x.enabled" value="1"/> ! <property category="win32.Debug_Build.win32b.ilink32" name="param.exefile.1" value="c:\tmp\compilex\mockpp_22.dll"/> <property category="win32.Debug_Build.win32b.ilink32" name="param.libfiles.1" value="cw32.lib"/> <property category="win32.Debug_Build.win32b.ilink32" name="param.libfiles.2" value="import32.lib"/> --- 151,155 ---- <property category="win32.Debug_Build.win32b.ilink32" name="option.v.enabled" value="1"/> <property category="win32.Debug_Build.win32b.ilink32" name="option.x.enabled" value="1"/> ! <property category="win32.Debug_Build.win32b.ilink32" name="param.exefile.1" value="c:\tmp\compilex\mockpp_23.dll"/> <property category="win32.Debug_Build.win32b.ilink32" name="param.libfiles.1" value="cw32.lib"/> <property category="win32.Debug_Build.win32b.ilink32" name="param.libfiles.2" value="import32.lib"/> Index: visitmock.cbx =================================================================== RCS file: /cvsroot/mockpp/mockpp/bcbX/visitmock.cbx,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** visitmock.cbx 27 Feb 2005 11:48:14 -0000 1.5 --- visitmock.cbx 1 Mar 2005 19:35:08 -0000 1.6 *************** *** 121,125 **** <property category="win32.Debug_Build.win32b.ilink32" name="option.v.enabled" value="1"/> <property category="win32.Debug_Build.win32b.ilink32" name="option.x.enabled" value="1"/> ! <property category="win32.Debug_Build.win32b.ilink32" name="param.exefile.1" value="c:\tmp\compilex\visitmock_22.exe"/> <property category="win32.Debug_Build.win32b.ilink32" name="param.libfiles.1" value="cw32.lib"/> <property category="win32.Debug_Build.win32b.ilink32" name="param.libfiles.2" value="import32.lib"/> --- 121,125 ---- <property category="win32.Debug_Build.win32b.ilink32" name="option.v.enabled" value="1"/> <property category="win32.Debug_Build.win32b.ilink32" name="option.x.enabled" value="1"/> ! <property category="win32.Debug_Build.win32b.ilink32" name="param.exefile.1" value="c:\tmp\compilex\visitmock_23.exe"/> <property category="win32.Debug_Build.win32b.ilink32" name="param.libfiles.1" value="cw32.lib"/> <property category="win32.Debug_Build.win32b.ilink32" name="param.libfiles.2" value="import32.lib"/> *************** *** 135,139 **** <property category="unique" name="id" value="5"/> </file> ! <file path="C%|/tmp/compilex/mockpp_22.lib"> <property category="unique" name="id" value="3"/> </file> --- 135,139 ---- <property category="unique" name="id" value="5"/> </file> ! <file path="C%|/tmp/compilex/mockpp_23.lib"> <property category="unique" name="id" value="3"/> </file> Index: jmock_test.cbx =================================================================== RCS file: /cvsroot/mockpp/mockpp/bcbX/jmock_test.cbx,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** jmock_test.cbx 27 Feb 2005 11:48:14 -0000 1.8 --- jmock_test.cbx 1 Mar 2005 19:35:08 -0000 1.9 *************** *** 115,119 **** <property category="win32.Debug_Build.win32b.ilink32" name="option.v.enabled" value="1"/> <property category="win32.Debug_Build.win32b.ilink32" name="option.x.enabled" value="1"/> ! <property category="win32.Debug_Build.win32b.ilink32" name="param.exefile.1" value="c:\tmp\compilex\jmock_test_22.exe"/> <property category="win32.Debug_Build.win32b.ilink32" name="param.libfiles.1" value="cw32.lib"/> <property category="win32.Debug_Build.win32b.ilink32" name="param.libfiles.2" value="import32.lib"/> --- 115,119 ---- <property category="win32.Debug_Build.win32b.ilink32" name="option.v.enabled" value="1"/> <property category="win32.Debug_Build.win32b.ilink32" name="option.x.enabled" value="1"/> ! <property category="win32.Debug_Build.win32b.ilink32" name="param.exefile.1" value="c:\tmp\compilex\jmock_test_23.exe"/> <property category="win32.Debug_Build.win32b.ilink32" name="param.libfiles.1" value="cw32.lib"/> <property category="win32.Debug_Build.win32b.ilink32" name="param.libfiles.2" value="import32.lib"/> *************** *** 341,345 **** <property category="unique" name="id" value="53"/> </file> ! <file path="C%|/tmp/compilex/mockpp_22.lib"> <property category="unique" name="id" value="71"/> </file> --- 341,345 ---- <property category="unique" name="id" value="53"/> </file> ! <file path="C%|/tmp/compilex/mockpp_23.lib"> <property category="unique" name="id" value="71"/> </file> Index: mock_test.cbx =================================================================== RCS file: /cvsroot/mockpp/mockpp/bcbX/mock_test.cbx,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** mock_test.cbx 27 Feb 2005 11:48:14 -0000 1.6 --- mock_test.cbx 1 Mar 2005 19:35:08 -0000 1.7 *************** *** 109,113 **** <property category="win32.Debug_Build.win32b.ilink32" name="option.v.enabled" value="1"/> <property category="win32.Debug_Build.win32b.ilink32" name="option.x.enabled" value="1"/> ! <property category="win32.Debug_Build.win32b.ilink32" name="param.exefile.1" value="c:\tmp\compilex\mock_test_22.exe"/> <property category="win32.Debug_Build.win32b.ilink32" name="param.libfiles.1" value="cw32.lib"/> <property category="win32.Debug_Build.win32b.ilink32" name="param.libfiles.2" value="import32.lib"/> --- 109,113 ---- <property category="win32.Debug_Build.win32b.ilink32" name="option.v.enabled" value="1"/> <property category="win32.Debug_Build.win32b.ilink32" name="option.x.enabled" value="1"/> ! <property category="win32.Debug_Build.win32b.ilink32" name="param.exefile.1" value="c:\tmp\compilex\mock_test_23.exe"/> <property category="win32.Debug_Build.win32b.ilink32" name="param.libfiles.1" value="cw32.lib"/> <property category="win32.Debug_Build.win32b.ilink32" name="param.libfiles.2" value="import32.lib"/> *************** *** 171,175 **** <property category="unique" name="id" value="15"/> </file> ! <file path="C%|/tmp/compilex/mockpp_22.lib"> <property category="unique" name="id" value="37"/> </file> --- 171,175 ---- <property category="unique" name="id" value="15"/> </file> ! <file path="C%|/tmp/compilex/mockpp_23.lib"> <property category="unique" name="id" value="37"/> </file> Index: basicmock.cbx =================================================================== RCS file: /cvsroot/mockpp/mockpp/bcbX/basicmock.cbx,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** basicmock.cbx 27 Feb 2005 11:48:14 -0000 1.5 --- basicmock.cbx 1 Mar 2005 19:35:08 -0000 1.6 *************** *** 102,106 **** <property category="win32.Debug_Build.win32b.ilink32" name="option.v.enabled" value="1"/> <property category="win32.Debug_Build.win32b.ilink32" name="option.x.enabled" value="1"/> ! <property category="win32.Debug_Build.win32b.ilink32" name="param.exefile.1" value="c:\tmp\compilex\basicmock_22.exe"/> <property category="win32.Debug_Build.win32b.ilink32" name="param.libfiles.1" value="cw32.lib"/> <property category="win32.Debug_Build.win32b.ilink32" name="param.libfiles.2" value="import32.lib"/> --- 102,106 ---- <property category="win32.Debug_Build.win32b.ilink32" name="option.v.enabled" value="1"/> <property category="win32.Debug_Build.win32b.ilink32" name="option.x.enabled" value="1"/> ! <property category="win32.Debug_Build.win32b.ilink32" name="param.exefile.1" value="c:\tmp\compilex\basicmock_23.exe"/> <property category="win32.Debug_Build.win32b.ilink32" name="param.libfiles.1" value="cw32.lib"/> <property category="win32.Debug_Build.win32b.ilink32" name="param.libfiles.2" value="import32.lib"/> *************** *** 118,122 **** <property category="unique" name="id" value="5"/> </file> ! <file path="C%|/tmp/compilex/mockpp_22.lib"> <property category="unique" name="id" value="3"/> </file> --- 118,122 ---- <property category="unique" name="id" value="5"/> </file> ! <file path="C%|/tmp/compilex/mockpp_23.lib"> <property category="unique" name="id" value="3"/> </file> Index: verifying.cbx =================================================================== RCS file: /cvsroot/mockpp/mockpp/bcbX/verifying.cbx,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** verifying.cbx 27 Feb 2005 11:48:14 -0000 1.4 --- verifying.cbx 1 Mar 2005 19:35:08 -0000 1.5 *************** *** 101,105 **** <property category="win32.Debug_Build.win32b.ilink32" name="option.v.enabled" value="1"/> <property category="win32.Debug_Build.win32b.ilink32" name="option.x.enabled" value="1"/> ! <property category="win32.Debug_Build.win32b.ilink32" name="param.exefile.1" value="c:\tmp\compilex\verifying_22.exe"/> <property category="win32.Debug_Build.win32b.ilink32" name="param.libfiles.1" value="cw32.lib"/> <property category="win32.Debug_Build.win32b.ilink32" name="param.libfiles.2" value="import32.lib"/> --- 101,105 ---- <property category="win32.Debug_Build.win32b.ilink32" name="option.v.enabled" value="1"/> <property category="win32.Debug_Build.win32b.ilink32" name="option.x.enabled" value="1"/> ! <property category="win32.Debug_Build.win32b.ilink32" name="param.exefile.1" value="c:\tmp\compilex\verifying_23.exe"/> <property category="win32.Debug_Build.win32b.ilink32" name="param.libfiles.1" value="cw32.lib"/> <property category="win32.Debug_Build.win32b.ilink32" name="param.libfiles.2" value="import32.lib"/> *************** *** 114,118 **** <property category="unique" name="id" value="4"/> </file> ! <file path="C%|/tmp/compilex/mockpp_22.lib"> <property category="unique" name="id" value="3"/> </file> --- 114,118 ---- <property category="unique" name="id" value="4"/> </file> ! <file path="C%|/tmp/compilex/mockpp_23.lib"> <property category="unique" name="id" value="3"/> </file> |
Update of /cvsroot/mockpp/mockpp/bcb5 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28138/bcb5 Modified Files: basicmock.bpf basicmock.bpr chainmock.bpf chainmock.bpr cppunit.bpf cppunit.bpr gen-mak.bat jmock_test.bpf jmock_test.bpr mock_greeter.bpf mock_greeter.bpr mock_test.bpf mock_test.bpr mockpp.bpg mockpp.bpr poormock-se.bpf poormock-se.bpr poormock.bpf poormock.bpr verifying.bpf verifying.bpr visitmock.bpf visitmock.bpr Log Message: update version number Index: poormock.bpr =================================================================== RCS file: /cvsroot/mockpp/mockpp/bcb5/poormock.bpr,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** poormock.bpr 27 Feb 2005 11:48:14 -0000 1.10 --- poormock.bpr 1 Mar 2005 19:34:29 -0000 1.11 *************** *** 4,14 **** <MACROS> <VERSION value="BCB.05.03"/> ! <PROJECT value="c:\tmp\compile\poormock_22.exe"/> ! <OBJFILES value="c:\tmp\compile\mockpp_22\\poormock.obj ! c:\tmp\compile\mockpp_22\\consumer.obj"/> <RESFILES value=""/> <DEFFILE value=""/> <RESDEPEN value="$(RESFILES)"/> ! <LIBFILES value="c:\tmp\compile\mockpp_22.lib c:\tmp\compile\cppunit_1_10.lib"/> <LIBRARIES value=""/> <SPARELIBS value=""/> --- 4,14 ---- <MACROS> <VERSION value="BCB.05.03"/> ! <PROJECT value="c:\tmp\compile\poormock_23.exe"/> ! <OBJFILES value="c:\tmp\compile\mockpp_23\\poormock.obj ! c:\tmp\compile\mockpp_23\\consumer.obj"/> <RESFILES value=""/> <DEFFILE value=""/> <RESDEPEN value="$(RESFILES)"/> ! <LIBFILES value="c:\tmp\compile\mockpp_23.lib c:\tmp\compile\cppunit_1_10.lib"/> <LIBRARIES value=""/> <SPARELIBS value=""/> *************** *** 27,41 **** <SYSDEFINES value="NO_STRICT;_NO_VCL;_RTLDLL;USEPACKAGES"/> <MAINSOURCE value="poormock.bpf"/> ! <INCLUDEPATH value="..\mockpp\examples\tutorial;..\mockpp_22\examples\tutorial;..\mockpp_22\examples;..\mockpp_22\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include"/> ! <LIBPATH value="..\mockpp\examples\tutorial;..\mockpp_22\examples\tutorial;$(BCB)\lib\obj;$(BCB)\lib"/> <WARNINGS value="-w-par"/> </MACROS> <OPTIONS> <CFLAG1 value="-vGc -vGt -vGd -Od -Vx -Ve -X- -r- -a8 -b- -k -y -v -vi- -tWC -tWM -c"/> ! <PFLAGS value="-N2"c:\tmp\compile\mockpp_22\" -N0"c:\tmp\compile\mockpp_22\" -$YD -$W -$O- -v -JPHNE -M"/> <RFLAGS value=""/> <AFLAGS value="/mx /w2 /zd"/> ! <LFLAGS value="-l"c:\tmp\compile\" -I"c:\tmp\compile\mockpp_22\" -D"" -ap -Tpe -x -Gn -v"/> </OPTIONS> <LINKER> --- 27,41 ---- <SYSDEFINES value="NO_STRICT;_NO_VCL;_RTLDLL;USEPACKAGES"/> <MAINSOURCE value="poormock.bpf"/> ! <INCLUDEPATH value="..\mockpp\examples\tutorial;..\mockpp_23\examples\tutorial;..\mockpp_23\examples;..\mockpp_23\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include"/> ! <LIBPATH value="..\mockpp\examples\tutorial;..\mockpp_23\examples\tutorial;$(BCB)\lib\obj;$(BCB)\lib"/> <WARNINGS value="-w-par"/> </MACROS> <OPTIONS> <CFLAG1 value="-vGc -vGt -vGd -Od -Vx -Ve -X- -r- -a8 -b- -k -y -v -vi- -tWC -tWM -c"/> ! <PFLAGS value="-N2"c:\tmp\compile\mockpp_23\" -N0"c:\tmp\compile\mockpp_23\" -$YD -$W -$O- -v -JPHNE -M"/> <RFLAGS value=""/> <AFLAGS value="/mx /w2 /zd"/> ! <LFLAGS value="-l"c:\tmp\compile\" -I"c:\tmp\compile\mockpp_23\" -D"" -ap -Tpe -x -Gn -v"/> </OPTIONS> <LINKER> *************** *** 74,129 **** [HistoryLists\hlIncludePath] Count=30 ! Item0=..\mockpp\examples\tutorial;..\mockpp_22\examples\tutorial;..\mockpp_22\examples;..\mockpp_22\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include ! Item1=..\mockpp\examples\tutorial;..\mockpp_22\examples\tutorial;..\mockpp_22\examples;..\mockpp_22\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include ! Item2=..\mockpp_22\examples\tutorial;..\mockpp_22\examples;..\mockpp_22\tests;..;$(BCB)\include;..\..\..\cppunit.ups\include ! Item3=\\SONNE\HOMES\Documents\src\mockpp_22\mockpp\mockpp_22\examples\tutorial;..\mockpp_22\examples\tutorial;..\mockpp_22\examples;..\mockpp_22\tests;..;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include ! Item4=..\mockpp_22\examples;..\mockpp_22\tests;..\..\mockpp;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include ! Item5=..\mockpp_22\tests;..;$(BCB)\include;..\..\cppunit\include;X:\src\cppunit-1.8.0\include ! Item6=..\mockpp_22\tests;..;$(BCB)\include;..\..\cppunit\include ! Item7=..\mockpp_22\tests;..;$(BCB)\include;B:\cvs\ups\src\3party\cppunit\include ! Item8=..\mockpp_22\tests;..;$(BCB)\include;..\..\..\cppunit-1.8.0\include Item9=..;$(BCB)\include;..\..\..\cppunit-1.8.0\include ! Item10=..\mockpp_22\tests;\\SONNE\HOMES\src\mockpp_22\mockpp\mockpp_22\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.8.0\include Item11=..;$(BCB)\include;X:\src\cppunit-1.8.0\include ! Item12=\\SONNE\HOMES\src\mockpp_22\mockpp\mockpp_22\tests;..\..\mockpp;..\mockpp_22\tests;..\mockpp;..\expat;$(BCB)\include ! Item13=..;..\mockpp_22\tests;..\mockpp;..\expat;$(BCB)\include ! Item14=..\..\mockpp;..\mockpp_22\tests;..\mockpp;..\expat;$(BCB)\include ! Item15=..\..\mockpp;..\mockpp_22\tests;..\mockpp;..\expat;$(BCB)\include;$(BCB)\include\vcl;C:\wx2\include\ ! Item16=.. ;..\mockpp_22\tests;..\mockpp;..\expat;$(BCB)\include;$(BCB)\include\vcl;C:\wx2\include\ ! Item17=.. ;..\mockpp_22\tests;..\expat;..\mockpp;$(BCB)\include;$(BCB)\include\vcl;C:\wx2\include ! Item18=..\mockpp_22\tests;..\expat;..\mockpp;$(BCB)\include;$(BCB)\include\vcl ! Item19=..\mockpp_22\tests;..\mockpp;$(BCB)\include;$(BCB)\include\vcl;expat Item20=..\mockpp;$(BCB)\include;$(BCB)\include\vcl;expat ! Item21=..\mockpp_22\tests;..\mockpp;$(BCB)\include;$(BCB)\include\vcl ! Item22=..\mockpp_22\tests;..\mockpp;$(BCB)\include ! Item23=..\mockpp_22\tests;..\mockpp;$(BCB)/include ! Item24=..\mockpp_22\tests;..\mockpp Item25=..\mockpp ! Item26=..\mockpp_22\tests;..\mockpp_22\mockpp ! Item27=..\mockpp_22\mockpp ! Item28=..\mockpp_22\tests;..\mockpp_22\mockpp;$(BCB)\include;$(BCB)\include\vcl ! Item29=..\mockpp_22\tests;E:\Eigene Dateien\c++\mockpp_22\mockpp;$(BCB)\include;$(BCB)\include\vcl [HistoryLists\hlLibraryPath] Count=19 ! Item0=..\mockpp\examples\tutorial;..\mockpp_22\examples\tutorial;$(BCB)\lib\obj;$(BCB)\lib Item1=$(BCB)\lib\obj;$(BCB)\lib ! Item2=\\SONNE\HOMES\Documents\src\mockpp_22\mockpp\mockpp_22\examples\tutorial;..\mockpp_22\examples\tutorial;..\mockpp_22\examples;..\mockpp_22\tests;..\expat;$(BCB)\lib\obj;$(BCB)\lib ! Item3=..\mockpp_22\examples;..\mockpp_22\tests;..\expat;$(BCB)\lib\obj;$(BCB)\lib ! Item4=..\mockpp_22\examples;\\SONNE\HOMES\src\mockpp_22\mockpp\mockpp_22\tests;..\mockpp_22\tests;..\expat;$(BCB)\lib\obj;$(BCB)\lib ! Item5=\\SONNE\HOMES\src\mockpp_22\mockpp\mockpp_22\tests;..\mockpp_22\tests;..\expat;$(BCB)\lib\obj;$(BCB)\lib ! Item6=..\mockpp_22\tests;..\expat;$(BCB)\lib\obj;$(BCB)\lib ! Item7=..\mockpp_22\tests;$(BCB)\lib\obj;$(BCB)\lib;output;expat ! Item8=..\mockpp_22\tests;$(BCB)\lib\obj;$(BCB)\lib;output;bin ! Item9=..\mockpp_22\apps;$(BCB)\lib\obj;$(BCB)\lib;output;bin ! Item10=..\mockpp_22\apps;$(BCB)\lib\obj;$(BCB)\lib;output ! Item11=..\mockpp_22\apps;$(BCB)\lib\obj;$(BCB)\lib;E:\Eigene Dateien\c++\mockpp_22\bcb5\output ! Item12=..\mockpp_22\apps;$(BCB)\lib\obj;$(BCB)\lib;..\output ! Item13=..\mockpp_22\apps;$(BCB)\lib\obj;$(BCB)\lib ! Item14=..\mockpp_22\apps;D:\CBuilder5\mockpp_22\;$(BCB)\lib\obj;$(BCB)\lib ! Item15=e:\Eigene Dateien\c++\mockpp_22\mockpp\apps\;..\mockpp;$(BCB)\lib\obj;$(BCB)\lib ! Item16=e:\Eigene Dateien\c++\mockpp_22\mockpp\apps;..\mockpp;$(BCB)\lib\obj;$(BCB)\lib Item17=..\mockpp;$(BCB)\lib\obj;$(BCB)\lib ! Item18=e:\Eigene Dateien\c++\mockpp_22\mockpp\apps;$(BCB)\lib\obj;$(BCB)\lib [HistoryLists\hlDebugSourcePath] --- 74,129 ---- [HistoryLists\hlIncludePath] Count=30 ! Item0=..\mockpp\examples\tutorial;..\mockpp_23\examples\tutorial;..\mockpp_23\examples;..\mockpp_23\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include ! Item1=..\mockpp\examples\tutorial;..\mockpp_23\examples\tutorial;..\mockpp_23\examples;..\mockpp_23\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include ! Item2=..\mockpp_23\examples\tutorial;..\mockpp_23\examples;..\mockpp_23\tests;..;$(BCB)\include;..\..\..\cppunit.ups\include ! Item3=\\SONNE\HOMES\Documents\src\mockpp_23\mockpp\mockpp_23\examples\tutorial;..\mockpp_23\examples\tutorial;..\mockpp_23\examples;..\mockpp_23\tests;..;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include ! Item4=..\mockpp_23\examples;..\mockpp_23\tests;..\..\mockpp;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include ! Item5=..\mockpp_23\tests;..;$(BCB)\include;..\..\cppunit\include;X:\src\cppunit-1.8.0\include ! Item6=..\mockpp_23\tests;..;$(BCB)\include;..\..\cppunit\include ! Item7=..\mockpp_23\tests;..;$(BCB)\include;B:\cvs\ups\src\3party\cppunit\include ! Item8=..\mockpp_23\tests;..;$(BCB)\include;..\..\..\cppunit-1.8.0\include Item9=..;$(BCB)\include;..\..\..\cppunit-1.8.0\include ! Item10=..\mockpp_23\tests;\\SONNE\HOMES\src\mockpp_23\mockpp\mockpp_23\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.8.0\include Item11=..;$(BCB)\include;X:\src\cppunit-1.8.0\include ! Item12=\\SONNE\HOMES\src\mockpp_23\mockpp\mockpp_23\tests;..\..\mockpp;..\mockpp_23\tests;..\mockpp;..\expat;$(BCB)\include ! Item13=..;..\mockpp_23\tests;..\mockpp;..\expat;$(BCB)\include ! Item14=..\..\mockpp;..\mockpp_23\tests;..\mockpp;..\expat;$(BCB)\include ! Item15=..\..\mockpp;..\mockpp_23\tests;..\mockpp;..\expat;$(BCB)\include;$(BCB)\include\vcl;C:\wx2\include\ ! Item16=.. ;..\mockpp_23\tests;..\mockpp;..\expat;$(BCB)\include;$(BCB)\include\vcl;C:\wx2\include\ ! Item17=.. ;..\mockpp_23\tests;..\expat;..\mockpp;$(BCB)\include;$(BCB)\include\vcl;C:\wx2\include ! Item18=..\mockpp_23\tests;..\expat;..\mockpp;$(BCB)\include;$(BCB)\include\vcl ! Item19=..\mockpp_23\tests;..\mockpp;$(BCB)\include;$(BCB)\include\vcl;expat Item20=..\mockpp;$(BCB)\include;$(BCB)\include\vcl;expat ! Item21=..\mockpp_23\tests;..\mockpp;$(BCB)\include;$(BCB)\include\vcl ! Item22=..\mockpp_23\tests;..\mockpp;$(BCB)\include ! Item23=..\mockpp_23\tests;..\mockpp;$(BCB)/include ! Item24=..\mockpp_23\tests;..\mockpp Item25=..\mockpp ! Item26=..\mockpp_23\tests;..\mockpp_23\mockpp ! Item27=..\mockpp_23\mockpp ! Item28=..\mockpp_23\tests;..\mockpp_23\mockpp;$(BCB)\include;$(BCB)\include\vcl ! Item29=..\mockpp_23\tests;E:\Eigene Dateien\c++\mockpp_23\mockpp;$(BCB)\include;$(BCB)\include\vcl [HistoryLists\hlLibraryPath] Count=19 ! Item0=..\mockpp\examples\tutorial;..\mockpp_23\examples\tutorial;$(BCB)\lib\obj;$(BCB)\lib Item1=$(BCB)\lib\obj;$(BCB)\lib ! Item2=\\SONNE\HOMES\Documents\src\mockpp_23\mockpp\mockpp_23\examples\tutorial;..\mockpp_23\examples\tutorial;..\mockpp_23\examples;..\mockpp_23\tests;..\expat;$(BCB)\lib\obj;$(BCB)\lib ! Item3=..\mockpp_23\examples;..\mockpp_23\tests;..\expat;$(BCB)\lib\obj;$(BCB)\lib ! Item4=..\mockpp_23\examples;\\SONNE\HOMES\src\mockpp_23\mockpp\mockpp_23\tests;..\mockpp_23\tests;..\expat;$(BCB)\lib\obj;$(BCB)\lib ! Item5=\\SONNE\HOMES\src\mockpp_23\mockpp\mockpp_23\tests;..\mockpp_23\tests;..\expat;$(BCB)\lib\obj;$(BCB)\lib ! Item6=..\mockpp_23\tests;..\expat;$(BCB)\lib\obj;$(BCB)\lib ! Item7=..\mockpp_23\tests;$(BCB)\lib\obj;$(BCB)\lib;output;expat ! Item8=..\mockpp_23\tests;$(BCB)\lib\obj;$(BCB)\lib;output;bin ! Item9=..\mockpp_23\apps;$(BCB)\lib\obj;$(BCB)\lib;output;bin ! Item10=..\mockpp_23\apps;$(BCB)\lib\obj;$(BCB)\lib;output ! Item11=..\mockpp_23\apps;$(BCB)\lib\obj;$(BCB)\lib;E:\Eigene Dateien\c++\mockpp_23\bcb5\output ! Item12=..\mockpp_23\apps;$(BCB)\lib\obj;$(BCB)\lib;..\output ! Item13=..\mockpp_23\apps;$(BCB)\lib\obj;$(BCB)\lib ! Item14=..\mockpp_23\apps;D:\CBuilder5\mockpp_23\;$(BCB)\lib\obj;$(BCB)\lib ! Item15=e:\Eigene Dateien\c++\mockpp_23\mockpp\apps\;..\mockpp;$(BCB)\lib\obj;$(BCB)\lib ! Item16=e:\Eigene Dateien\c++\mockpp_23\mockpp\apps;..\mockpp;$(BCB)\lib\obj;$(BCB)\lib Item17=..\mockpp;$(BCB)\lib\obj;$(BCB)\lib ! Item18=e:\Eigene Dateien\c++\mockpp_23\mockpp\apps;$(BCB)\lib\obj;$(BCB)\lib [HistoryLists\hlDebugSourcePath] *************** *** 139,148 **** [HistoryLists\hlIntOutputDir] Count=7 ! Item0=c:\tmp\compile\mockpp_22\ ! Item1=c:\tmp\compile\mockpp_22\ulxr_bcb5\ Item2=c:\temp Item3=output ! Item4=E:\Eigene Dateien\c++\mockpp_22\bcb5\output\ ! Item5=E:\Eigene Dateien\c++\mockpp_22\bcb5\output Item6=D:\CBuilder5\Projects\output\ --- 139,148 ---- [HistoryLists\hlIntOutputDir] Count=7 ! Item0=c:\tmp\compile\mockpp_23\ ! Item1=c:\tmp\compile\mockpp_23\ulxr_bcb5\ Item2=c:\temp Item3=output ! Item4=E:\Eigene Dateien\c++\mockpp_23\bcb5\output\ ! Item5=E:\Eigene Dateien\c++\mockpp_23\bcb5\output Item6=D:\CBuilder5\Projects\output\ *************** *** 151,159 **** Item0=c:\tmp\compile\ Item1=c:\tmp\compile ! Item2=c:\tmp\compile\mockpp_22\ Item3=c:\temp Item4=output\ ! Item5=E:\Eigene Dateien\c++\mockpp_22\bcb5\output\ ! Item6=E:\Eigene Dateien\c++\mockpp_22\bcb5\output Item7=output --- 151,159 ---- Item0=c:\tmp\compile\ Item1=c:\tmp\compile ! Item2=c:\tmp\compile\mockpp_23\ Item3=c:\temp Item4=output\ ! Item5=E:\Eigene Dateien\c++\mockpp_23\bcb5\output\ ! Item6=E:\Eigene Dateien\c++\mockpp_23\bcb5\output Item7=output *************** *** 162,171 **** Item0=c:\tmp\compile\ Item1=c:\tmp\compile ! Item2=c:\tmp\compile\mockpp_22\ ! Item3=c:\tmp\compile\mockpp_22\ulxr_bcb5\ Item4=c:\temp ! Item5=e:\Eigene Dateien\c++\mockpp_22\bcb5\output\ Item6=output\ ! Item7=E:\Eigene Dateien\c++\mockpp_22\bcb5\output Item8=D:\CBuilder5\Projects\output\ Item9=output --- 162,171 ---- Item0=c:\tmp\compile\ Item1=c:\tmp\compile ! Item2=c:\tmp\compile\mockpp_23\ ! Item3=c:\tmp\compile\mockpp_23\ulxr_bcb5\ Item4=c:\temp ! Item5=e:\Eigene Dateien\c++\mockpp_23\bcb5\output\ Item6=output\ ! Item7=E:\Eigene Dateien\c++\mockpp_23\bcb5\output Item8=D:\CBuilder5\Projects\output\ Item9=output Index: verifying.bpr =================================================================== RCS file: /cvsroot/mockpp/mockpp/bcb5/verifying.bpr,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** verifying.bpr 27 Feb 2005 11:48:14 -0000 1.7 --- verifying.bpr 1 Mar 2005 19:34:29 -0000 1.8 *************** *** 4,13 **** <MACROS> <VERSION value="BCB.05.03"/> ! <PROJECT value="c:\tmp\compile\verifying_22.exe"/> ! <OBJFILES value="c:\tmp\compile\mockpp_22\\verifying.obj"/> <RESFILES value=""/> <DEFFILE value=""/> <RESDEPEN value="$(RESFILES)"/> ! <LIBFILES value="c:\tmp\compile\mockpp_22.lib c:\tmp\compile\cppunit_1_10.lib"/> <LIBRARIES value=""/> <SPARELIBS value=""/> --- 4,13 ---- <MACROS> <VERSION value="BCB.05.03"/> ! <PROJECT value="c:\tmp\compile\verifying_23.exe"/> ! <OBJFILES value="c:\tmp\compile\mockpp_23\\verifying.obj"/> <RESFILES value=""/> <DEFFILE value=""/> <RESDEPEN value="$(RESFILES)"/> ! <LIBFILES value="c:\tmp\compile\mockpp_23.lib c:\tmp\compile\cppunit_1_10.lib"/> <LIBRARIES value=""/> <SPARELIBS value=""/> *************** *** 26,40 **** <SYSDEFINES value="NO_STRICT;_NO_VCL;_RTLDLL;USEPACKAGES"/> <MAINSOURCE value="verifying.bpf"/> ! <INCLUDEPATH value="..\mockpp\examples\tutorial;..\mockpp_22\examples\tutorial;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include"/> ! <LIBPATH value="..\mockpp\examples\tutorial;..\mockpp_22\examples\tutorial;..\examples\tutorial;$(BCB)\lib\obj;$(BCB)\lib"/> <WARNINGS value="-w-par"/> </MACROS> <OPTIONS> <CFLAG1 value="-vGc -vGt -vGd -Od -Vx -Ve -X- -r- -a8 -b- -k -y -v -vi- -tWC -tWM -c"/> ! <PFLAGS value="-N2"c:\tmp\compile\mockpp_22\" -N0"c:\tmp\compile\mockpp_22\" -$YD -$W -$O- -v -JPHNE -M"/> <RFLAGS value=""/> <AFLAGS value="/mx /w2 /zi"/> ! <LFLAGS value="-l"c:\tmp\compile\" -I"c:\tmp\compile\mockpp_22\" -D"" -ap -Tpe -x -Gn -v"/> </OPTIONS> <LINKER> --- 26,40 ---- <SYSDEFINES value="NO_STRICT;_NO_VCL;_RTLDLL;USEPACKAGES"/> <MAINSOURCE value="verifying.bpf"/> ! <INCLUDEPATH value="..\mockpp\examples\tutorial;..\mockpp_23\examples\tutorial;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include"/> ! <LIBPATH value="..\mockpp\examples\tutorial;..\mockpp_23\examples\tutorial;..\examples\tutorial;$(BCB)\lib\obj;$(BCB)\lib"/> <WARNINGS value="-w-par"/> </MACROS> <OPTIONS> <CFLAG1 value="-vGc -vGt -vGd -Od -Vx -Ve -X- -r- -a8 -b- -k -y -v -vi- -tWC -tWM -c"/> ! <PFLAGS value="-N2"c:\tmp\compile\mockpp_23\" -N0"c:\tmp\compile\mockpp_23\" -$YD -$W -$O- -v -JPHNE -M"/> <RFLAGS value=""/> <AFLAGS value="/mx /w2 /zi"/> ! <LFLAGS value="-l"c:\tmp\compile\" -I"c:\tmp\compile\mockpp_23\" -D"" -ap -Tpe -x -Gn -v"/> </OPTIONS> <LINKER> *************** *** 73,129 **** [HistoryLists\hlIncludePath] Count=30 ! Item0=..\mockpp\examples\tutorial;..\mockpp_22\examples\tutorial;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include ! Item1=..\mockpp\examples\tutorial;..\mockpp_22\examples\tutorial;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include ! Item2=..\mockpp_22\examples\tutorial;..\..\mockpp;$(BCB)\include;..\..\..\cppunit.ups\include ! Item3=..\mockpp_22\examples\tutorial;..\..\..\..\src;$(BCB)\include;..\..\..\cppunit.ups\include ! Item4=..\mockpp_22\examples\tutorial;..\..\..;$(BCB)\include;..\..\..\cppunit.ups\include ! Item5=..\mockpp_22\examples\tutorial;..\..\..\mockpp;$(BCB)\include;..\..\..\cppunit.ups\include Item6=..\..;$(BCB)\include;..\..\..\cppunit.ups\include ! Item7=..\mockpp_22\examples\tutorial;..\..\mockpp;$(BCB)\include;..\..\..\..\cppunit.ups\include Item8=..;$(BCB)\include;..\..\..\..\cppunit.ups\include ! Item9=..\mockpp_22\examples\tutorial;..\examples\tutorial;..\examples;..\..\..\mockpp;$(BCB)\include;..\..\..\..\cppunit.ups\include ! Item10=..\mockpp_22\examples\tutorial;..\mockpp_22\examples;..\..\mockpp;$(BCB)\include;..\..\..\cppunit.ups\include ! Item11=..\mockpp_22\examples\tutorial;..\mockpp_22\examples;..\mockpp_22\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit.ups\include ! Item12=..\mockpp_22\examples\tutorial;..\mockpp_22\examples;..\mockpp_22\tests;..;$(BCB)\include;..\..\..\cppunit.ups\include ! Item13=..\mockpp_22\examples\tutorial;..\mockpp_22\examples;..\mockpp_22\tests;..;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include ! Item14=..\mockpp_22\examples;..\mockpp_22\tests;..\..\mockpp;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include ! Item15=..\mockpp_22\tests;..;$(BCB)\include;..\..\cppunit\include;X:\src\cppunit-1.8.0\include ! Item16=..\mockpp_22\tests;..;$(BCB)\include;..\..\cppunit\include ! Item17=..\mockpp_22\tests;..;$(BCB)\include;B:\cvs\ups\src\3party\cppunit\include ! Item18=..\mockpp_22\tests;..;$(BCB)\include;..\..\..\cppunit-1.8.0\include Item19=..;$(BCB)\include;..\..\..\cppunit-1.8.0\include ! Item20=..\mockpp_22\tests;\\SONNE\HOMES\src\mockpp_22\mockpp\mockpp_22\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.8.0\include Item21=..;$(BCB)\include;X:\src\cppunit-1.8.0\include ! Item22=\\SONNE\HOMES\src\mockpp_22\mockpp\mockpp_22\tests;..\..\mockpp;..\mockpp_22\tests;..\mockpp;..\expat;$(BCB)\include ! Item23=..;..\mockpp_22\tests;..\mockpp;..\expat;$(BCB)\include ! Item24=..\..\mockpp;..\mockpp_22\tests;..\mockpp;..\expat;$(BCB)\include ! Item25=..\..\mockpp;..\mockpp_22\tests;..\mockpp;..\expat;$(BCB)\include;$(BCB)\include\vcl;C:\wx2\include\ ! Item26=.. ;..\mockpp_22\tests;..\mockpp;..\expat;$(BCB)\include;$(BCB)\include\vcl;C:\wx2\include\ ! Item27=.. ;..\mockpp_22\tests;..\expat;..\mockpp;$(BCB)\include;$(BCB)\include\vcl;C:\wx2\include ! Item28=..\mockpp_22\tests;..\expat;..\mockpp;$(BCB)\include;$(BCB)\include\vcl ! Item29=..\mockpp_22\tests;..\mockpp;$(BCB)\include;$(BCB)\include\vcl;expat [HistoryLists\hlLibraryPath] Count=20 ! Item0=..\mockpp\examples\tutorial;..\mockpp_22\examples\tutorial;..\examples\tutorial;$(BCB)\lib\obj;$(BCB)\lib ! Item1=..\mockpp_22\examples\tutorial;..\examples\tutorial;$(BCB)\lib\obj;$(BCB)\lib Item2=$(BCB)\lib\obj;$(BCB)\lib ! Item3=..\mockpp_22\examples\tutorial;..\mockpp_22\examples;..\mockpp_22\tests;..\expat;$(BCB)\lib\obj;$(BCB)\lib ! Item4=..\mockpp_22\examples;..\mockpp_22\tests;..\expat;$(BCB)\lib\obj;$(BCB)\lib ! Item5=..\mockpp_22\examples;\\SONNE\HOMES\src\mockpp_22\mockpp\mockpp_22\tests;..\mockpp_22\tests;..\expat;$(BCB)\lib\obj;$(BCB)\lib ! Item6=\\SONNE\HOMES\src\mockpp_22\mockpp\mockpp_22\tests;..\mockpp_22\tests;..\expat;$(BCB)\lib\obj;$(BCB)\lib ! Item7=..\mockpp_22\tests;..\expat;$(BCB)\lib\obj;$(BCB)\lib ! Item8=..\mockpp_22\tests;$(BCB)\lib\obj;$(BCB)\lib;output;expat ! Item9=..\mockpp_22\tests;$(BCB)\lib\obj;$(BCB)\lib;output;bin ! Item10=..\mockpp_22\apps;$(BCB)\lib\obj;$(BCB)\lib;output;bin ! Item11=..\mockpp_22\apps;$(BCB)\lib\obj;$(BCB)\lib;output ! Item12=..\mockpp_22\apps;$(BCB)\lib\obj;$(BCB)\lib;E:\Eigene Dateien\c++\mockpp_22\bcb5\output ! Item13=..\mockpp_22\apps;$(BCB)\lib\obj;$(BCB)\lib;..\output ! Item14=..\mockpp_22\apps;$(BCB)\lib\obj;$(BCB)\lib ! Item15=..\mockpp_22\apps;D:\CBuilder5\mockpp_22\;$(BCB)\lib\obj;$(BCB)\lib ! Item16=e:\Eigene Dateien\c++\mockpp_22\mockpp\apps\;..\mockpp;$(BCB)\lib\obj;$(BCB)\lib ! Item17=e:\Eigene Dateien\c++\mockpp_22\mockpp\apps;..\mockpp;$(BCB)\lib\obj;$(BCB)\lib Item18=..\mockpp;$(BCB)\lib\obj;$(BCB)\lib ! Item19=e:\Eigene Dateien\c++\mockpp_22\mockpp\apps;$(BCB)\lib\obj;$(BCB)\lib [HistoryLists\hlDebugSourcePath] --- 73,129 ---- [HistoryLists\hlIncludePath] Count=30 ! Item0=..\mockpp\examples\tutorial;..\mockpp_23\examples\tutorial;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include ! Item1=..\mockpp\examples\tutorial;..\mockpp_23\examples\tutorial;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include ! Item2=..\mockpp_23\examples\tutorial;..\..\mockpp;$(BCB)\include;..\..\..\cppunit.ups\include ! Item3=..\mockpp_23\examples\tutorial;..\..\..\..\src;$(BCB)\include;..\..\..\cppunit.ups\include ! Item4=..\mockpp_23\examples\tutorial;..\..\..;$(BCB)\include;..\..\..\cppunit.ups\include ! Item5=..\mockpp_23\examples\tutorial;..\..\..\mockpp;$(BCB)\include;..\..\..\cppunit.ups\include Item6=..\..;$(BCB)\include;..\..\..\cppunit.ups\include ! Item7=..\mockpp_23\examples\tutorial;..\..\mockpp;$(BCB)\include;..\..\..\..\cppunit.ups\include Item8=..;$(BCB)\include;..\..\..\..\cppunit.ups\include ! Item9=..\mockpp_23\examples\tutorial;..\examples\tutorial;..\examples;..\..\..\mockpp;$(BCB)\include;..\..\..\..\cppunit.ups\include ! Item10=..\mockpp_23\examples\tutorial;..\mockpp_23\examples;..\..\mockpp;$(BCB)\include;..\..\..\cppunit.ups\include ! Item11=..\mockpp_23\examples\tutorial;..\mockpp_23\examples;..\mockpp_23\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit.ups\include ! Item12=..\mockpp_23\examples\tutorial;..\mockpp_23\examples;..\mockpp_23\tests;..;$(BCB)\include;..\..\..\cppunit.ups\include ! Item13=..\mockpp_23\examples\tutorial;..\mockpp_23\examples;..\mockpp_23\tests;..;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include ! Item14=..\mockpp_23\examples;..\mockpp_23\tests;..\..\mockpp;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include ! Item15=..\mockpp_23\tests;..;$(BCB)\include;..\..\cppunit\include;X:\src\cppunit-1.8.0\include ! Item16=..\mockpp_23\tests;..;$(BCB)\include;..\..\cppunit\include ! Item17=..\mockpp_23\tests;..;$(BCB)\include;B:\cvs\ups\src\3party\cppunit\include ! Item18=..\mockpp_23\tests;..;$(BCB)\include;..\..\..\cppunit-1.8.0\include Item19=..;$(BCB)\include;..\..\..\cppunit-1.8.0\include ! Item20=..\mockpp_23\tests;\\SONNE\HOMES\src\mockpp_23\mockpp\mockpp_23\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.8.0\include Item21=..;$(BCB)\include;X:\src\cppunit-1.8.0\include ! Item22=\\SONNE\HOMES\src\mockpp_23\mockpp\mockpp_23\tests;..\..\mockpp;..\mockpp_23\tests;..\mockpp;..\expat;$(BCB)\include ! Item23=..;..\mockpp_23\tests;..\mockpp;..\expat;$(BCB)\include ! Item24=..\..\mockpp;..\mockpp_23\tests;..\mockpp;..\expat;$(BCB)\include ! Item25=..\..\mockpp;..\mockpp_23\tests;..\mockpp;..\expat;$(BCB)\include;$(BCB)\include\vcl;C:\wx2\include\ ! Item26=.. ;..\mockpp_23\tests;..\mockpp;..\expat;$(BCB)\include;$(BCB)\include\vcl;C:\wx2\include\ ! Item27=.. ;..\mockpp_23\tests;..\expat;..\mockpp;$(BCB)\include;$(BCB)\include\vcl;C:\wx2\include ! Item28=..\mockpp_23\tests;..\expat;..\mockpp;$(BCB)\include;$(BCB)\include\vcl ! Item29=..\mockpp_23\tests;..\mockpp;$(BCB)\include;$(BCB)\include\vcl;expat [HistoryLists\hlLibraryPath] Count=20 ! Item0=..\mockpp\examples\tutorial;..\mockpp_23\examples\tutorial;..\examples\tutorial;$(BCB)\lib\obj;$(BCB)\lib ! Item1=..\mockpp_23\examples\tutorial;..\examples\tutorial;$(BCB)\lib\obj;$(BCB)\lib Item2=$(BCB)\lib\obj;$(BCB)\lib ! Item3=..\mockpp_23\examples\tutorial;..\mockpp_23\examples;..\mockpp_23\tests;..\expat;$(BCB)\lib\obj;$(BCB)\lib ! Item4=..\mockpp_23\examples;..\mockpp_23\tests;..\expat;$(BCB)\lib\obj;$(BCB)\lib ! Item5=..\mockpp_23\examples;\\SONNE\HOMES\src\mockpp_23\mockpp\mockpp_23\tests;..\mockpp_23\tests;..\expat;$(BCB)\lib\obj;$(BCB)\lib ! Item6=\\SONNE\HOMES\src\mockpp_23\mockpp\mockpp_23\tests;..\mockpp_23\tests;..\expat;$(BCB)\lib\obj;$(BCB)\lib ! Item7=..\mockpp_23\tests;..\expat;$(BCB)\lib\obj;$(BCB)\lib ! Item8=..\mockpp_23\tests;$(BCB)\lib\obj;$(BCB)\lib;output;expat ! Item9=..\mockpp_23\tests;$(BCB)\lib\obj;$(BCB)\lib;output;bin ! Item10=..\mockpp_23\apps;$(BCB)\lib\obj;$(BCB)\lib;output;bin ! Item11=..\mockpp_23\apps;$(BCB)\lib\obj;$(BCB)\lib;output ! Item12=..\mockpp_23\apps;$(BCB)\lib\obj;$(BCB)\lib;E:\Eigene Dateien\c++\mockpp_23\bcb5\output ! Item13=..\mockpp_23\apps;$(BCB)\lib\obj;$(BCB)\lib;..\output ! Item14=..\mockpp_23\apps;$(BCB)\lib\obj;$(BCB)\lib ! Item15=..\mockpp_23\apps;D:\CBuilder5\mockpp_23\;$(BCB)\lib\obj;$(BCB)\lib ! Item16=e:\Eigene Dateien\c++\mockpp_23\mockpp\apps\;..\mockpp;$(BCB)\lib\obj;$(BCB)\lib ! Item17=e:\Eigene Dateien\c++\mockpp_23\mockpp\apps;..\mockpp;$(BCB)\lib\obj;$(BCB)\lib Item18=..\mockpp;$(BCB)\lib\obj;$(BCB)\lib ! Item19=e:\Eigene Dateien\c++\mockpp_23\mockpp\apps;$(BCB)\lib\obj;$(BCB)\lib [HistoryLists\hlDebugSourcePath] *************** *** 140,149 **** [HistoryLists\hlIntOutputDir] Count=7 ! Item0=c:\tmp\compile\mockpp_22\ ! Item1=c:\tmp\compile\mockpp_22\ulxr_bcb5\ Item2=c:\temp Item3=output ! Item4=E:\Eigene Dateien\c++\mockpp_22\bcb5\output\ ! Item5=E:\Eigene Dateien\c++\mockpp_22\bcb5\output Item6=D:\CBuilder5\Projects\output\ --- 140,149 ---- [HistoryLists\hlIntOutputDir] Count=7 ! Item0=c:\tmp\compile\mockpp_23\ ! Item1=c:\tmp\compile\mockpp_23\ulxr_bcb5\ Item2=c:\temp Item3=output ! Item4=E:\Eigene Dateien\c++\mockpp_23\bcb5\output\ ! Item5=E:\Eigene Dateien\c++\mockpp_23\bcb5\output Item6=D:\CBuilder5\Projects\output\ *************** *** 152,160 **** Item0=c:\tmp\compile\ Item1=c:\tmp\compile ! Item2=c:\tmp\compile\mockpp_22\ Item3=c:\temp Item4=output\ ! Item5=E:\Eigene Dateien\c++\mockpp_22\bcb5\output\ ! Item6=E:\Eigene Dateien\c++\mockpp_22\bcb5\output Item7=output --- 152,160 ---- Item0=c:\tmp\compile\ Item1=c:\tmp\compile ! Item2=c:\tmp\compile\mockpp_23\ Item3=c:\temp Item4=output\ ! Item5=E:\Eigene Dateien\c++\mockpp_23\bcb5\output\ ! Item6=E:\Eigene Dateien\c++\mockpp_23\bcb5\output Item7=output *************** *** 163,172 **** Item0=c:\tmp\compile\ Item1=c:\tmp\compile ! Item2=c:\tmp\compile\mockpp_22\ ! Item3=c:\tmp\compile\mockpp_22\ulxr_bcb5\ Item4=c:\temp ! Item5=e:\Eigene Dateien\c++\mockpp_22\bcb5\output\ Item6=output\ ! Item7=E:\Eigene Dateien\c++\mockpp_22\bcb5\output Item8=D:\CBuilder5\Projects\output\ Item9=output --- 163,172 ---- Item0=c:\tmp\compile\ Item1=c:\tmp\compile ! Item2=c:\tmp\compile\mockpp_23\ ! Item3=c:\tmp\compile\mockpp_23\ulxr_bcb5\ Item4=c:\temp ! Item5=e:\Eigene Dateien\c++\mockpp_23\bcb5\output\ Item6=output\ ! Item7=E:\Eigene Dateien\c++\mockpp_23\bcb5\output Item8=D:\CBuilder5\Projects\output\ Item9=output Index: mock_test.bpf =================================================================== RCS file: /cvsroot/mockpp/mockpp/bcb5/mock_test.bpf,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** mock_test.bpf 27 Feb 2005 11:48:14 -0000 1.24 --- mock_test.bpf 1 Mar 2005 19:34:29 -0000 1.25 *************** *** 1,3 **** ! USELIB("c:\tmp\compile\mockpp_22.lib"); USELIB("c:\tmp\compile\cppunit_1_10.lib"); USEUNIT("..\mockpp\tests\AssertMo_test.cpp"); --- 1,3 ---- ! USELIB("c:\tmp\compile\mockpp_23.lib"); USELIB("c:\tmp\compile\cppunit_1_10.lib"); USEUNIT("..\mockpp\tests\AssertMo_test.cpp"); Index: mock_greeter.bpr =================================================================== RCS file: /cvsroot/mockpp/mockpp/bcb5/mock_greeter.bpr,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** mock_greeter.bpr 27 Feb 2005 11:48:14 -0000 1.15 --- mock_greeter.bpr 1 Mar 2005 19:34:29 -0000 1.16 *************** *** 4,13 **** <MACROS> <VERSION value="BCB.05.03"/> ! <PROJECT value="c:\tmp\compile\mock_greeter_22.exe"/> ! <OBJFILES value="c:\tmp\compile\mockpp_22\\mock_greeter.obj"/> <RESFILES value=""/> <DEFFILE value=""/> <RESDEPEN value="$(RESFILES)"/> ! <LIBFILES value="c:\tmp\compile\mockpp_22.lib c:\tmp\compile\cppunit_1_10.lib"/> <LIBRARIES value=""/> <SPARELIBS value=""/> --- 4,13 ---- <MACROS> <VERSION value="BCB.05.03"/> ! <PROJECT value="c:\tmp\compile\mock_greeter_23.exe"/> ! <OBJFILES value="c:\tmp\compile\mockpp_23\\mock_greeter.obj"/> <RESFILES value=""/> <DEFFILE value=""/> <RESDEPEN value="$(RESFILES)"/> ! <LIBFILES value="c:\tmp\compile\mockpp_23.lib c:\tmp\compile\cppunit_1_10.lib"/> <LIBRARIES value=""/> <SPARELIBS value=""/> *************** *** 26,40 **** <SYSDEFINES value="NO_STRICT;_NO_VCL;_RTLDLL;USEPACKAGES"/> <MAINSOURCE value="mock_greeter.bpf"/> ! <INCLUDEPATH value="..\mockpp\examples;..\mockpp_22\examples;..\mockpp_22\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include"/> ! <LIBPATH value="..\mockpp\examples;..\mockpp_22\examples;$(BCB)\lib\obj;$(BCB)\lib"/> <WARNINGS value="-w-par"/> </MACROS> <OPTIONS> <CFLAG1 value="-vGc -vGt -vGd -Od -Vx -Ve -X- -r- -a8 -b- -k -y -v -vi- -tWC -tWM -c"/> ! <PFLAGS value="-N2"c:\tmp\compile\mockpp_22\" -N0"c:\tmp\compile\mockpp_22\" -$YD -$W -$O- -v -JPHNE -M"/> <RFLAGS value=""/> <AFLAGS value="/mx /w2 /zd"/> ! <LFLAGS value="-l"c:\tmp\compile\" -I"c:\tmp\compile\mockpp_22\" -D"" -ap -Tpe -x -Gn -v"/> </OPTIONS> <LINKER> --- 26,40 ---- <SYSDEFINES value="NO_STRICT;_NO_VCL;_RTLDLL;USEPACKAGES"/> <MAINSOURCE value="mock_greeter.bpf"/> ! <INCLUDEPATH value="..\mockpp\examples;..\mockpp_23\examples;..\mockpp_23\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include"/> ! <LIBPATH value="..\mockpp\examples;..\mockpp_23\examples;$(BCB)\lib\obj;$(BCB)\lib"/> <WARNINGS value="-w-par"/> </MACROS> <OPTIONS> <CFLAG1 value="-vGc -vGt -vGd -Od -Vx -Ve -X- -r- -a8 -b- -k -y -v -vi- -tWC -tWM -c"/> ! <PFLAGS value="-N2"c:\tmp\compile\mockpp_23\" -N0"c:\tmp\compile\mockpp_23\" -$YD -$W -$O- -v -JPHNE -M"/> <RFLAGS value=""/> <AFLAGS value="/mx /w2 /zd"/> ! <LFLAGS value="-l"c:\tmp\compile\" -I"c:\tmp\compile\mockpp_23\" -D"" -ap -Tpe -x -Gn -v"/> </OPTIONS> <LINKER> *************** *** 73,127 **** [HistoryLists\hlIncludePath] Count=30 ! Item0=..\mockpp\examples;..\mockpp_22\examples;..\mockpp_22\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include ! Item1=..\mockpp\examples;..\mockpp_22\examples;..\mockpp_22\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include ! Item2=..\mockpp_22\examples;..\mockpp_22\tests;..;$(BCB)\include;..\..\..\cppunit.ups\include ! Item3=..\mockpp_22\examples;..\mockpp_22\tests;..;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include ! Item4=..\mockpp_22\examples;..\mockpp_22\tests;..\..\mockpp;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include ! Item5=..\mockpp_22\tests;..;$(BCB)\include;..\..\cppunit\include;X:\src\cppunit-1.8.0\include ! Item6=..\mockpp_22\tests;..;$(BCB)\include;..\..\cppunit\include ! Item7=..\mockpp_22\tests;..;$(BCB)\include;B:\cvs\ups\src\3party\cppunit\include ! Item8=..\mockpp_22\tests;..;$(BCB)\include;..\..\..\cppunit-1.8.0\include Item9=..;$(BCB)\include;..\..\..\cppunit-1.8.0\include ! Item10=..\mockpp_22\tests;\\SONNE\HOMES\src\mockpp_22\mockpp\mockpp_22\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.8.0\include Item11=..;$(BCB)\include;X:\src\cppunit-1.8.0\include ! Item12=\\SONNE\HOMES\src\mockpp_22\mockpp\mockpp_22\tests;..\..\mockpp;..\mockpp_22\tests;..\mockpp;..\expat;$(BCB)\include ! Item13=..;..\mockpp_22\tests;..\mockpp;..\expat;$(BCB)\include ! Item14=..\..\mockpp;..\mockpp_22\tests;..\mockpp;..\expat;$(BCB)\include ! Item15=..\..\mockpp;..\mockpp_22\tests;..\mockpp;..\expat;$(BCB)\include;$(BCB)\include\vcl;C:\wx2\include\ ! Item16=.. ;..\mockpp_22\tests;..\mockpp;..\expat;$(BCB)\include;$(BCB)\include\vcl;C:\wx2\include\ ! Item17=.. ;..\mockpp_22\tests;..\expat;..\mockpp;$(BCB)\include;$(BCB)\include\vcl;C:\wx2\include ! Item18=..\mockpp_22\tests;..\expat;..\mockpp;$(BCB)\include;$(BCB)\include\vcl ! Item19=..\mockpp_22\tests;..\mockpp;$(BCB)\include;$(BCB)\include\vcl;expat Item20=..\mockpp;$(BCB)\include;$(BCB)\include\vcl;expat ! Item21=..\mockpp_22\tests;..\mockpp;$(BCB)\include;$(BCB)\include\vcl ! Item22=..\mockpp_22\tests;..\mockpp;$(BCB)\include ! Item23=..\mockpp_22\tests;..\mockpp;$(BCB)/include ! Item24=..\mockpp_22\tests;..\mockpp Item25=..\mockpp ! Item26=..\mockpp_22\tests;..\mockpp_22\mockpp ! Item27=..\mockpp_22\mockpp ! Item28=..\mockpp_22\tests;..\mockpp_22\mockpp;$(BCB)\include;$(BCB)\include\vcl ! Item29=..\mockpp_22\tests;E:\Eigene Dateien\c++\mockpp_22\mockpp;$(BCB)\include;$(BCB)\include\vcl [HistoryLists\hlLibraryPath] Count=18 ! Item0=..\mockpp\examples;..\mockpp_22\examples;$(BCB)\lib\obj;$(BCB)\lib Item1=$(BCB)\lib\obj;$(BCB)\lib ! Item2=..\mockpp_22\examples;..\mockpp_22\tests;..\expat;$(BCB)\lib\obj;$(BCB)\lib ! Item3=..\mockpp_22\examples;\\SONNE\HOMES\src\mockpp_22\mockpp\mockpp_22\tests;..\mockpp_22\tests;..\expat;$(BCB)\lib\obj;$(BCB)\lib ! Item4=\\SONNE\HOMES\src\mockpp_22\mockpp\mockpp_22\tests;..\mockpp_22\tests;..\expat;$(BCB)\lib\obj;$(BCB)\lib ! Item5=..\mockpp_22\tests;..\expat;$(BCB)\lib\obj;$(BCB)\lib ! Item6=..\mockpp_22\tests;$(BCB)\lib\obj;$(BCB)\lib;output;expat ! Item7=..\mockpp_22\tests;$(BCB)\lib\obj;$(BCB)\lib;output;bin ! Item8=..\mockpp_22\apps;$(BCB)\lib\obj;$(BCB)\lib;output;bin ! Item9=..\mockpp_22\apps;$(BCB)\lib\obj;$(BCB)\lib;output ! Item10=..\mockpp_22\apps;$(BCB)\lib\obj;$(BCB)\lib;E:\Eigene Dateien\c++\mockpp_22\bcb5\output ! Item11=..\mockpp_22\apps;$(BCB)\lib\obj;$(BCB)\lib;..\output ! Item12=..\mockpp_22\apps;$(BCB)\lib\obj;$(BCB)\lib ! Item13=..\mockpp_22\apps;D:\CBuilder5\mockpp_22\;$(BCB)\lib\obj;$(BCB)\lib ! Item14=e:\Eigene Dateien\c++\mockpp_22\mockpp\apps\;..\mockpp;$(BCB)\lib\obj;$(BCB)\lib ! Item15=e:\Eigene Dateien\c++\mockpp_22\mockpp\apps;..\mockpp;$(BCB)\lib\obj;$(BCB)\lib Item16=..\mockpp;$(BCB)\lib\obj;$(BCB)\lib ! Item17=e:\Eigene Dateien\c++\mockpp_22\mockpp\apps;$(BCB)\lib\obj;$(BCB)\lib [HistoryLists\hlDebugSourcePath] --- 73,127 ---- [HistoryLists\hlIncludePath] Count=30 ! Item0=..\mockpp\examples;..\mockpp_23\examples;..\mockpp_23\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include ! Item1=..\mockpp\examples;..\mockpp_23\examples;..\mockpp_23\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include ! Item2=..\mockpp_23\examples;..\mockpp_23\tests;..;$(BCB)\include;..\..\..\cppunit.ups\include ! Item3=..\mockpp_23\examples;..\mockpp_23\tests;..;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include ! Item4=..\mockpp_23\examples;..\mockpp_23\tests;..\..\mockpp;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include ! Item5=..\mockpp_23\tests;..;$(BCB)\include;..\..\cppunit\include;X:\src\cppunit-1.8.0\include ! Item6=..\mockpp_23\tests;..;$(BCB)\include;..\..\cppunit\include ! Item7=..\mockpp_23\tests;..;$(BCB)\include;B:\cvs\ups\src\3party\cppunit\include ! Item8=..\mockpp_23\tests;..;$(BCB)\include;..\..\..\cppunit-1.8.0\include Item9=..;$(BCB)\include;..\..\..\cppunit-1.8.0\include ! Item10=..\mockpp_23\tests;\\SONNE\HOMES\src\mockpp_23\mockpp\mockpp_23\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.8.0\include Item11=..;$(BCB)\include;X:\src\cppunit-1.8.0\include ! Item12=\\SONNE\HOMES\src\mockpp_23\mockpp\mockpp_23\tests;..\..\mockpp;..\mockpp_23\tests;..\mockpp;..\expat;$(BCB)\include ! Item13=..;..\mockpp_23\tests;..\mockpp;..\expat;$(BCB)\include ! Item14=..\..\mockpp;..\mockpp_23\tests;..\mockpp;..\expat;$(BCB)\include ! Item15=..\..\mockpp;..\mockpp_23\tests;..\mockpp;..\expat;$(BCB)\include;$(BCB)\include\vcl;C:\wx2\include\ ! Item16=.. ;..\mockpp_23\tests;..\mockpp;..\expat;$(BCB)\include;$(BCB)\include\vcl;C:\wx2\include\ ! Item17=.. ;..\mockpp_23\tests;..\expat;..\mockpp;$(BCB)\include;$(BCB)\include\vcl;C:\wx2\include ! Item18=..\mockpp_23\tests;..\expat;..\mockpp;$(BCB)\include;$(BCB)\include\vcl ! Item19=..\mockpp_23\tests;..\mockpp;$(BCB)\include;$(BCB)\include\vcl;expat Item20=..\mockpp;$(BCB)\include;$(BCB)\include\vcl;expat ! Item21=..\mockpp_23\tests;..\mockpp;$(BCB)\include;$(BCB)\include\vcl ! Item22=..\mockpp_23\tests;..\mockpp;$(BCB)\include ! Item23=..\mockpp_23\tests;..\mockpp;$(BCB)/include ! Item24=..\mockpp_23\tests;..\mockpp Item25=..\mockpp ! Item26=..\mockpp_23\tests;..\mockpp_23\mockpp ! Item27=..\mockpp_23\mockpp ! Item28=..\mockpp_23\tests;..\mockpp_23\mockpp;$(BCB)\include;$(BCB)\include\vcl ! Item29=..\mockpp_23\tests;E:\Eigene Dateien\c++\mockpp_23\mockpp;$(BCB)\include;$(BCB)\include\vcl [HistoryLists\hlLibraryPath] Count=18 ! Item0=..\mockpp\examples;..\mockpp_23\examples;$(BCB)\lib\obj;$(BCB)\lib Item1=$(BCB)\lib\obj;$(BCB)\lib ! Item2=..\mockpp_23\examples;..\mockpp_23\tests;..\expat;$(BCB)\lib\obj;$(BCB)\lib ! Item3=..\mockpp_23\examples;\\SONNE\HOMES\src\mockpp_23\mockpp\mockpp_23\tests;..\mockpp_23\tests;..\expat;$(BCB)\lib\obj;$(BCB)\lib ! Item4=\\SONNE\HOMES\src\mockpp_23\mockpp\mockpp_23\tests;..\mockpp_23\tests;..\expat;$(BCB)\lib\obj;$(BCB)\lib ! Item5=..\mockpp_23\tests;..\expat;$(BCB)\lib\obj;$(BCB)\lib ! Item6=..\mockpp_23\tests;$(BCB)\lib\obj;$(BCB)\lib;output;expat ! Item7=..\mockpp_23\tests;$(BCB)\lib\obj;$(BCB)\lib;output;bin ! Item8=..\mockpp_23\apps;$(BCB)\lib\obj;$(BCB)\lib;output;bin ! Item9=..\mockpp_23\apps;$(BCB)\lib\obj;$(BCB)\lib;output ! Item10=..\mockpp_23\apps;$(BCB)\lib\obj;$(BCB)\lib;E:\Eigene Dateien\c++\mockpp_23\bcb5\output ! Item11=..\mockpp_23\apps;$(BCB)\lib\obj;$(BCB)\lib;..\output ! Item12=..\mockpp_23\apps;$(BCB)\lib\obj;$(BCB)\lib ! Item13=..\mockpp_23\apps;D:\CBuilder5\mockpp_23\;$(BCB)\lib\obj;$(BCB)\lib ! Item14=e:\Eigene Dateien\c++\mockpp_23\mockpp\apps\;..\mockpp;$(BCB)\lib\obj;$(BCB)\lib ! Item15=e:\Eigene Dateien\c++\mockpp_23\mockpp\apps;..\mockpp;$(BCB)\lib\obj;$(BCB)\lib Item16=..\mockpp;$(BCB)\lib\obj;$(BCB)\lib ! Item17=e:\Eigene Dateien\c++\mockpp_23\mockpp\apps;$(BCB)\lib\obj;$(BCB)\lib [HistoryLists\hlDebugSourcePath] *************** *** 137,146 **** [HistoryLists\hlIntOutputDir] Count=7 ! Item0=c:\tmp\compile\mockpp_22\ ! Item1=c:\tmp\compile\mockpp_22\ulxr_bcb5\ Item2=c:\temp Item3=output ! Item4=E:\Eigene Dateien\c++\mockpp_22\bcb5\output\ ! Item5=E:\Eigene Dateien\c++\mockpp_22\bcb5\output Item6=D:\CBuilder5\Projects\output\ --- 137,146 ---- [HistoryLists\hlIntOutputDir] Count=7 ! Item0=c:\tmp\compile\mockpp_23\ ! Item1=c:\tmp\compile\mockpp_23\ulxr_bcb5\ Item2=c:\temp Item3=output ! Item4=E:\Eigene Dateien\c++\mockpp_23\bcb5\output\ ! Item5=E:\Eigene Dateien\c++\mockpp_23\bcb5\output Item6=D:\CBuilder5\Projects\output\ *************** *** 149,157 **** Item0=c:\tmp\compile\ Item1=c:\tmp\compile ! Item2=c:\tmp\compile\mockpp_22\ Item3=c:\temp Item4=output\ ! Item5=E:\Eigene Dateien\c++\mockpp_22\bcb5\output\ ! Item6=E:\Eigene Dateien\c++\mockpp_22\bcb5\output Item7=output --- 149,157 ---- Item0=c:\tmp\compile\ Item1=c:\tmp\compile ! Item2=c:\tmp\compile\mockpp_23\ Item3=c:\temp Item4=output\ ! Item5=E:\Eigene Dateien\c++\mockpp_23\bcb5\output\ ! Item6=E:\Eigene Dateien\c++\mockpp_23\bcb5\output Item7=output *************** *** 160,169 **** Item0=c:\tmp\compile\ Item1=c:\tmp\compile ! Item2=c:\tmp\compile\mockpp_22\ ! Item3=c:\tmp\compile\mockpp_22\ulxr_bcb5\ Item4=c:\temp ! Item5=e:\Eigene Dateien\c++\mockpp_22\bcb5\output\ Item6=output\ ! Item7=E:\Eigene Dateien\c++\mockpp_22\bcb5\output Item8=D:\CBuilder5\Projects\output\ Item9=output --- 160,169 ---- Item0=c:\tmp\compile\ Item1=c:\tmp\compile ! Item2=c:\tmp\compile\mockpp_23\ ! Item3=c:\tmp\compile\mockpp_23\ulxr_bcb5\ Item4=c:\temp ! Item5=e:\Eigene Dateien\c++\mockpp_23\bcb5\output\ Item6=output\ ! Item7=E:\Eigene Dateien\c++\mockpp_23\bcb5\output Item8=D:\CBuilder5\Projects\output\ Item9=output Index: poormock.bpf =================================================================== RCS file: /cvsroot/mockpp/mockpp/bcb5/poormock.bpf,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** poormock.bpf 27 Feb 2005 11:48:14 -0000 1.9 --- poormock.bpf 1 Mar 2005 19:34:29 -0000 1.10 *************** *** 1,3 **** ! USELIB("c:\tmp\compile\mockpp_22.lib"); USELIB("c:\tmp\compile\cppunit_1_10.lib"); USEUNIT("..\mockpp\examples\tutorial\poormock.cpp"); --- 1,3 ---- ! USELIB("c:\tmp\compile\mockpp_23.lib"); USELIB("c:\tmp\compile\cppunit_1_10.lib"); USEUNIT("..\mockpp\examples\tutorial\poormock.cpp"); Index: verifying.bpf =================================================================== RCS file: /cvsroot/mockpp/mockpp/bcb5/verifying.bpf,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** verifying.bpf 27 Feb 2005 11:48:14 -0000 1.7 --- verifying.bpf 1 Mar 2005 19:34:29 -0000 1.8 *************** *** 1,3 **** ! USELIB("c:\tmp\compile\mockpp_22.lib"); USELIB("c:\tmp\compile\cppunit_1_10.lib"); USEUNIT("..\mockpp\examples\tutorial\verifying.cpp"); --- 1,3 ---- ! USELIB("c:\tmp\compile\mockpp_23.lib"); USELIB("c:\tmp\compile\cppunit_1_10.lib"); USEUNIT("..\mockpp\examples\tutorial\verifying.cpp"); Index: mock_greeter.bpf =================================================================== RCS file: /cvsroot/mockpp/mockpp/bcb5/mock_greeter.bpf,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** mock_greeter.bpf 27 Feb 2005 11:48:14 -0000 1.12 --- mock_greeter.bpf 1 Mar 2005 19:34:29 -0000 1.13 *************** *** 1,3 **** ! USELIB("c:\tmp\compile\mockpp_22.lib"); USELIB("c:\tmp\compile\cppunit_1_10.lib"); USEUNIT("..\mockpp\examples\mock_greeter.cpp"); --- 1,3 ---- ! USELIB("c:\tmp\compile\mockpp_23.lib"); USELIB("c:\tmp\compile\cppunit_1_10.lib"); USEUNIT("..\mockpp\examples\mock_greeter.cpp"); Index: mock_test.bpr =================================================================== RCS file: /cvsroot/mockpp/mockpp/bcb5/mock_test.bpr,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** mock_test.bpr 27 Feb 2005 11:48:14 -0000 1.27 --- mock_test.bpr 1 Mar 2005 19:34:29 -0000 1.28 *************** *** 4,48 **** <MACROS> <VERSION value="BCB.05.03"/> ! <PROJECT value="c:\tmp\compile\mock_test_22.exe"/> ! <OBJFILES value="c:\tmp\compile\mockpp_22\\AssertMo_test.obj ! c:\tmp\compile\mockpp_22\\ExpectationCounter_test.obj ! c:\tmp\compile\mockpp_22\\ExpectationCounterRange_test.obj ! c:\tmp\compile\mockpp_22\\ExpectationList_test.obj ! c:\tmp\compile\mockpp_22\\ExpectationMap_test.obj ! c:\tmp\compile\mockpp_22\\ExpectationSegment_test.obj ! c:\tmp\compile\mockpp_22\\ExpectationSet_test.obj ! c:\tmp\compile\mockpp_22\\ExpectationValue_test.obj ! c:\tmp\compile\mockpp_22\\Formatter_test.obj ! c:\tmp\compile\mockpp_22\\mock_test.obj ! c:\tmp\compile\mockpp_22\\VerifyingTestCase_test.obj ! c:\tmp\compile\mockpp_22\\Assert_test.obj ! c:\tmp\compile\mockpp_22\\MockObject_test.obj ! c:\tmp\compile\mockpp_22\\mockpp_test.obj ! c:\tmp\compile\mockpp_22\\ReturnObjectList_test.obj ! c:\tmp\compile\mockpp_22\\Verifiable_test.obj ! c:\tmp\compile\mockpp_22\\TrackingCounter_test.obj ! c:\tmp\compile\mockpp_22\\VisitableMockObject_void_test.obj ! c:\tmp\compile\mockpp_22\\Exception_test.obj ! c:\tmp\compile\mockpp_22\\ExpectationBoundary_test.obj ! c:\tmp\compile\mockpp_22\\Throwable_test.obj ! c:\tmp\compile\mockpp_22\\ThrowableList_test.obj ! c:\tmp\compile\mockpp_22\\VisitableMockObject_1_test.obj ! c:\tmp\compile\mockpp_22\\VisitableMockObject_1_void_test.obj ! c:\tmp\compile\mockpp_22\\VisitableMockObject_2_test.obj ! c:\tmp\compile\mockpp_22\\VisitableMockObject_2_void_test.obj ! c:\tmp\compile\mockpp_22\\VisitableMockObject_3_test.obj ! c:\tmp\compile\mockpp_22\\VisitableMockObject_3_void_test.obj ! c:\tmp\compile\mockpp_22\\VisitableMockObject_4_test.obj ! c:\tmp\compile\mockpp_22\\VisitableMockObject_4_void_test.obj ! c:\tmp\compile\mockpp_22\\VisitableMockObject_5_test.obj ! c:\tmp\compile\mockpp_22\\VisitableMockObject_5_void_test.obj ! c:\tmp\compile\mockpp_22\\VisitableMockObject_template_test.obj ! c:\tmp\compile\mockpp_22\\VisitableMockObject_test.obj ! c:\tmp\compile\mockpp_22\\ExpectationConglomeration_test.obj ! c:\tmp\compile\mockpp_22\\classes_ABCDE.obj"/> <RESFILES value=""/> <DEFFILE value=""/> <RESDEPEN value="$(RESFILES)"/> ! <LIBFILES value="c:\tmp\compile\mockpp_22.lib c:\tmp\compile\cppunit_1_10.lib"/> <LIBRARIES value=""/> <SPARELIBS value=""/> --- 4,48 ---- <MACROS> <VERSION value="BCB.05.03"/> ! <PROJECT value="c:\tmp\compile\mock_test_23.exe"/> ! <OBJFILES value="c:\tmp\compile\mockpp_23\\AssertMo_test.obj ! c:\tmp\compile\mockpp_23\\ExpectationCounter_test.obj ! c:\tmp\compile\mockpp_23\\ExpectationCounterRange_test.obj ! c:\tmp\compile\mockpp_23\\ExpectationList_test.obj ! c:\tmp\compile\mockpp_23\\ExpectationMap_test.obj ! c:\tmp\compile\mockpp_23\\ExpectationSegment_test.obj ! c:\tmp\compile\mockpp_23\\ExpectationSet_test.obj ! c:\tmp\compile\mockpp_23\\ExpectationValue_test.obj ! c:\tmp\compile\mockpp_23\\Formatter_test.obj ! c:\tmp\compile\mockpp_23\\mock_test.obj ! c:\tmp\compile\mockpp_23\\VerifyingTestCase_test.obj ! c:\tmp\compile\mockpp_23\\Assert_test.obj ! c:\tmp\compile\mockpp_23\\MockObject_test.obj ! c:\tmp\compile\mockpp_23\\mockpp_test.obj ! c:\tmp\compile\mockpp_23\\ReturnObjectList_test.obj ! c:\tmp\compile\mockpp_23\\Verifiable_test.obj ! c:\tmp\compile\mockpp_23\\TrackingCounter_test.obj ! c:\tmp\compile\mockpp_23\\VisitableMockObject_void_test.obj ! c:\tmp\compile\mockpp_23\\Exception_test.obj ! c:\tmp\compile\mockpp_23\\ExpectationBoundary_test.obj ! c:\tmp\compile\mockpp_23\\Throwable_test.obj ! c:\tmp\compile\mockpp_23\\ThrowableList_test.obj ! c:\tmp\compile\mockpp_23\\VisitableMockObject_1_test.obj ! c:\tmp\compile\mockpp_23\\VisitableMockObject_1_void_test.obj ! c:\tmp\compile\mockpp_23\\VisitableMockObject_2_test.obj ! c:\tmp\compile\mockpp_23\\VisitableMockObject_2_void_test.obj ! c:\tmp\compile\mockpp_23\\VisitableMockObject_3_test.obj ! c:\tmp\compile\mockpp_23\\VisitableMockObject_3_void_test.obj ! c:\tmp\compile\mockpp_23\\VisitableMockObject_4_test.obj ! c:\tmp\compile\mockpp_23\\VisitableMockObject_4_void_test.obj ! c:\tmp\compile\mockpp_23\\VisitableMockObject_5_test.obj ! c:\tmp\compile\mockpp_23\\VisitableMockObject_5_void_test.obj ! c:\tmp\compile\mockpp_23\\VisitableMockObject_template_test.obj ! c:\tmp\compile\mockpp_23\\VisitableMockObject_test.obj ! c:\tmp\compile\mockpp_23\\ExpectationConglomeration_test.obj ! c:\tmp\compile\mockpp_23\\classes_ABCDE.obj"/> <RESFILES value=""/> <DEFFILE value=""/> <RESDEPEN value="$(RESFILES)"/> ! <LIBFILES value="c:\tmp\compile\mockpp_23.lib c:\tmp\compile\cppunit_1_10.lib"/> <LIBRARIES value=""/> <SPARELIBS value=""/> *************** *** 61,75 **** <SYSDEFINES value="NO_STRICT;_NO_VCL;_RTLDLL;USEPACKAGES"/> <MAINSOURCE value="mock_test.bpf"/> ! <INCLUDEPATH value="..\mockpp\tests;..\mockpp_22\tests;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include"/> ! <LIBPATH value="..\mockpp\tests;..\mockpp_22\tests;$(BCB)\lib\obj;$(BCB)\lib"/> <WARNINGS value="-w-par"/> </MACROS> <OPTIONS> <CFLAG1 value="-vGc -vGt -vGd -Od -Vx -Ve -X- -r- -a8 -b- -k -y -v -vi- -tWC -tWM -c"/> ! <PFLAGS value="-N2"c:\tmp\compile\mockpp_22\" -N0"c:\tmp\compile\mockpp_22\" -$YD -$W -$O- -v -JPHNE -M"/> <RFLAGS value=""/> <AFLAGS value="/mx /w2 /zd"/> ! <LFLAGS value="-l"c:\tmp\compile\" -I"c:\tmp\compile\mockpp_22\" -D"" -ap -Tpe -x -Gn -v"/> </OPTIONS> <LINKER> --- 61,75 ---- <SYSDEFINES value="NO_STRICT;_NO_VCL;_RTLDLL;USEPACKAGES"/> <MAINSOURCE value="mock_test.bpf"/> ! <INCLUDEPATH value="..\mockpp\tests;..\mockpp_23\tests;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include"/> ! <LIBPATH value="..\mockpp\tests;..\mockpp_23\tests;$(BCB)\lib\obj;$(BCB)\lib"/> <WARNINGS value="-w-par"/> </MACROS> <OPTIONS> <CFLAG1 value="-vGc -vGt -vGd -Od -Vx -Ve -X- -r- -a8 -b- -k -y -v -vi- -tWC -tWM -c"/> ! <PFLAGS value="-N2"c:\tmp\compile\mockpp_23\" -N0"c:\tmp\compile\mockpp_23\" -$YD -$W -$O- -v -JPHNE -M"/> <RFLAGS value=""/> <AFLAGS value="/mx /w2 /zd"/> ! <LFLAGS value="-l"c:\tmp\compile\" -I"c:\tmp\compile\mockpp_23\" -D"" -ap -Tpe -x -Gn -v"/> </OPTIONS> <LINKER> *************** *** 108,161 **** [HistoryLists\hlIncludePath] Count=30 ! Item0=..\mockpp\tests;..\mockpp_22\tests;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include ! Item1=..\mockpp\tests;..\mockpp_22\tests;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include Item2=..\..\mockpp;$(BCB)\include;..\..\..\cppunit.ups\include ! Item3=..\tests;tests;\\SONNE\HOMES\Documents\src\mockpp_22\mockpp\mockpp_22\tests;\\SONNE\HOMES\src\mockpp_22\mockpp\mockpp_22\tests;..\mockpp_22\tests;..;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include Item4=..;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include ! Item5=..\mockpp_22\tests;..\..\mockpp;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include;.. ! Item6=..\mockpp_22\tests;..\..\mockpp;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include ! Item7=..\mockpp_22\tests;..;$(BCB)\include;..\..\cppunit\include;X:\src\cppunit-1.8.0\include ! Item8=..\mockpp_22\tests;..;$(BCB)\include;..\..\cppunit\include ! Item9=..\mockpp_22\tests;..;$(BCB)\include;B:\cvs\ups\src\3party\cppunit\include ! Item10=..\mockpp_22\tests;..;$(BCB)\include;..\..\..\cppunit-1.8.0\include Item11=..;$(BCB)\include;..\..\..\cppunit-1.8.0\include ! Item12=..\mockpp_22\tests;\\SONNE\HOMES\src\mockpp_22\mockpp\mockpp_22\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.8.0\include Item13=..;$(BCB)\include;X:\src\cppunit-1.8.0\include ! Item14=\\SONNE\HOMES\src\mockpp_22\mockpp\mockpp_22\tests;..\..\mockpp;..\mockpp_22\tests;..\mockpp;..\expat;$(BCB)\include ! Item15=..;..\mockpp_22\tests;..\mockpp;..\expat;$(BCB)\include ! Item16=..\..\mockpp;..\mockpp_22\tests;..\mockpp;..\expat;$(BCB)\include ! Item17=..\..\mockpp;..\mockpp_22\tests;..\mockpp;..\expat;$(BCB)\include;$(BCB)\include\vcl;C:\wx2\include\ ! Item18=.. ;..\mockpp_22\tests;..\mockpp;..\expat;$(BCB)\include;$(BCB)\include\vcl;C:\wx2\include\ ! Item19=.. ;..\mockpp_22\tests;..\expat;..\mockpp;$(BCB)\include;$(BCB)\include\vcl;C:\wx2\include ! Item20=..\mockpp_22\tests;..\expat;..\mockpp;$(BCB)\include;$(BCB)\include\vcl ! Item21=..\mockpp_22\tests;..\mockpp;$(BCB)\include;$(BCB)\include\vcl;expat Item22=..\mockpp;$(BCB)\include;$(BCB)\include\vcl;expat ! Item23=..\mockpp_22\tests;..\mockpp;$(BCB)\include;$(BCB)\include\vcl ! Item24=..\mockpp_22\tests;..\mockpp;$(BCB)\include ! Item25=..\mockpp_22\tests;..\mockpp;$(BCB)/include ! Item26=..\mockpp_22\tests;..\mockpp Item27=..\mockpp ! Item28=..\mockpp_22\tests;..\mockpp_22\mockpp ! Item29=..\mockpp_22\mockpp [HistoryLists\hlLibraryPath] Count=17 ! Item0=..\mockpp\tests;..\mockpp_22\tests;$(BCB)\lib\obj;$(BCB)\lib Item1=$(BCB)\lib\obj;$(BCB)\lib ! Item2=..\tests;tests;\\SONNE\HOMES\Documents\src\mockpp_22\mockpp\mockpp_22\tests;\\SONNE\HOMES\src\mockpp_22\mockpp\mockpp_22\tests;..\mockpp_22\tests;..\expat;$(BCB)\lib\obj;$(BCB)\lib ! Item3=\\SONNE\HOMES\src\mockpp_22\mockpp\mockpp_22\tests;..\mockpp_22\tests;..\expat;$(BCB)\lib\obj;$(BCB)\lib ! Item4=..\mockpp_22\tests;..\expat;$(BCB)\lib\obj;$(BCB)\lib ! Item5=..\mockpp_22\tests;$(BCB)\lib\obj;$(BCB)\lib;output;expat ! Item6=..\mockpp_22\tests;$(BCB)\lib\obj;$(BCB)\lib;output;bin ! Item7=..\mockpp_22\apps;$(BCB)\lib\obj;$(BCB)\lib;output;bin ! Item8=..\mockpp_22\apps;$(BCB)\lib\obj;$(BCB)\lib;output ! Item9=..\mockpp_22\apps;$(BCB)\lib\obj;$(BCB)\lib;E:\Eigene Dateien\c++\mockpp_22\bcb5\output ! Item10=..\mockpp_22\apps;$(BCB)\lib\obj;$(BCB)\lib;..\output ! Item11=..\mockpp_22\apps;$(BCB)\lib\obj;$(BCB)\lib ! Item12=..\mockpp_22\apps;D:\CBuilder5\mockpp_22\;$(BCB)\lib\obj;$(BCB)\lib ! Item13=e:\Eigene Dateien\c++\mockpp_22\mockpp\apps\;..\mockpp;$(BCB)\lib\obj;$(BCB)\lib ! Item14=e:\Eigene Dateien\c++\mockpp_22\mockpp\apps;..\mockpp;$(BCB)\lib\obj;$(BCB)\lib Item15=..\mockpp;$(BCB)\lib\obj;$(BCB)\lib ! Item16=e:\Eigene Dateien\c++\mockpp_22\mockpp\apps;$(BCB)\lib\obj;$(BCB)\lib [HistoryLists\hlDebugSourcePath] --- 108,161 ---- [HistoryLists\hlIncludePath] Count=30 ! Item0=..\mockpp\tests;..\mockpp_23\tests;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include ! Item1=..\mockpp\tests;..\mockpp_23\tests;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include Item2=..\..\mockpp;$(BCB)\include;..\..\..\cppunit.ups\include ! Item3=..\tests;tests;\\SONNE\HOMES\Documents\src\mockpp_23\mockpp\mockpp_23\tests;\\SONNE\HOMES\src\mockpp_23\mockpp\mockpp_23\tests;..\mockpp_23\tests;..;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include Item4=..;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include ! Item5=..\mockpp_23\tests;..\..\mockpp;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include;.. ! Item6=..\mockpp_23\tests;..\..\mockpp;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include ! Item7=..\mockpp_23\tests;..;$(BCB)\include;..\..\cppunit\include;X:\src\cppunit-1.8.0\include ! Item8=..\mockpp_23\tests;..;$(BCB)\include;..\..\cppunit\include ! Item9=..\mockpp_23\tests;..;$(BCB)\include;B:\cvs\ups\src\3party\cppunit\include ! Item10=..\mockpp_23\tests;..;$(BCB)\include;..\..\..\cppunit-1.8.0\include Item11=..;$(BCB)\include;..\..\..\cppunit-1.8.0\include ! Item12=..\mockpp_23\tests;\\SONNE\HOMES\src\mockpp_23\mockpp\mockpp_23\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.8.0\include Item13=..;$(BCB)\include;X:\src\cppunit-1.8.0\include ! Item14=\\SONNE\HOMES\src\mockpp_23\mockpp\mockpp_23\tests;..\..\mockpp;..\mockpp_23\tests;..\mockpp;..\expat;$(BCB)\include ! Item15=..;..\mockpp_23\tests;..\mockpp;..\expat;$(BCB)\include ! Item16=..\..\mockpp;..\mockpp_23\tests;..\mockpp;..\expat;$(BCB)\include ! Item17=..\..\mockpp;..\mockpp_23\tests;..\mockpp;..\expat;$(BCB)\include;$(BCB)\include\vcl;C:\wx2\include\ ! Item18=.. ;..\mockpp_23\tests;..\mockpp;..\expat;$(BCB)\include;$(BCB)\include\vcl;C:\wx2\include\ ! Item19=.. ;..\mockpp_23\tests;..\expat;..\mockpp;$(BCB)\include;$(BCB)\include\vcl;C:\wx2\include ! Item20=..\mockpp_23\tests;..\expat;..\mockpp;$(BCB)\include;$(BCB)\include\vcl ! Item21=..\mockpp_23\tests;..\mockpp;$(BCB)\include;$(BCB)\include\vcl;expat Item22=..\mockpp;$(BCB)\include;$(BCB)\include\vcl;expat ! Item23=..\mockpp_23\tests;..\mockpp;$(BCB)\include;$(BCB)\include\vcl ! Item24=..\mockpp_23\tests;..\mockpp;$(BCB)\include ! Item25=..\mockpp_23\tests;..\mockpp;$(BCB)/include ! Item26=..\mockpp_23\tests;..\mockpp Item27=..\mockpp ! Item28=..\mockpp_23\tests;..\mockpp_23\mockpp ! Item29=..\mockpp_23\mockpp [HistoryLists\hlLibraryPath] Count=17 ! Item0=..\mockpp\tests;..\mockpp_23\tests;$(BCB)\lib\obj;$(BCB)\lib Item1=$(BCB)\lib\obj;$(BCB)\lib ! Item2=..\tests;tests;\\SONNE\HOMES\Documents\src\mockpp_23\mockpp\mockpp_23\tests;\\SONNE\HOMES\src\mockpp_23\mockpp\mockpp_23\tests;..\mockpp_23\tests;..\expat;$(BCB)\lib\obj;$(BCB)\lib ! Item3=\\SONNE\HOMES\src\mockpp_23\mockpp\mockpp_23\tests;..\mockpp_23\tests;..\expat;$(BCB)\lib\obj;$(BCB)\lib ! Item4=..\mockpp_23\tests;..\expat;$(BCB)\lib\obj;$(BCB)\lib ! Item5=..\mockpp_23\tests;$(BCB)\lib\obj;$(BCB)\lib;output;expat ! Item6=..\mockpp_23\tests;$(BCB)\lib\obj;$(BCB)\lib;output;bin ! Item7=..\mockpp_23\apps;$(BCB)\lib\obj;$(BCB)\lib;output;bin ! Item8=..\mockpp_23\apps;$(BCB)\lib\obj;$(BCB)\lib;output ! Item9=..\mockpp_23\apps;$(BCB)\lib\obj;$(BCB)\lib;E:\Eigene Dateien\c++\mockpp_23\bcb5\output ! Item10=..\mockpp_23\apps;$(BCB)\lib\obj;$(BCB)\lib;..\output ! Item11=..\mockpp_23\apps;$(BCB)\lib\obj;$(BCB)\lib ! Item12=..\mockpp_23\apps;D:\CBuilder5\mockpp_23\;$(BCB)\lib\obj;$(BCB)\lib ! Item13=e:\Eigene Dateien\c++\mockpp_23\mockpp\apps\;..\mockpp;$(BCB)\lib\obj;$(BCB)\lib ! Item14=e:\Eigene Dateien\c++\mockpp_23\mockpp\apps;..\mockpp;$(BCB)\lib\obj;$(BCB)\lib Item15=..\mockpp;$(BCB)\lib\obj;$(BCB)\lib ! Item16=e:\Eigene Dateien\c++\mockpp_23\mockpp\apps;$(BCB)\lib\obj;$(BCB)\lib [HistoryLists\hlDebugSourcePath] *************** *** 171,180 **** [HistoryLists\hlIntOutputDir] Count=7 ! Item0=c:\tmp\compile\mockpp_22\ ! Item1=c:\tmp\compile\mockpp_22\ulxr_bcb5\ Item2=c:\temp Item3=output ! Item4=E:\Eigene Dateien\c++\mockpp_22\bcb5\output\ ! Item5=E:\Eigene Dateien\c++\mockpp_22\bcb5\output Item6=D:\CBuilder5\Projects\output\ --- 171,180 ---- [HistoryLists\hlIntOutputDir] Count=7 ! Item0=c:\tmp\compile\mockpp_23\ ! Item1=c:\tmp\compile\mockpp_23\ulxr_bcb5\ Item2=c:\temp Item3=output ! Item4=E:\Eigene Dateien\c++\mockpp_23\bcb5\output\ ! Item5=E:\Eigene Dateien\c++\mockpp_23\bcb5\output Item6=D:\CBuilder5\Projects\output\ *************** *** 183,191 **** Item0=c:\tmp\compile\ Item1=c:\tmp\compile ! Item2=c:\tmp\compile\mockpp_22\ Item3=c:\temp Item4=output\ ! Item5=E:\Eigene Dateien\c++\mockpp_22\bcb5\output\ ! Item6=E:\Eigene Dateien\c++\mockpp_22\bcb5\output Item7=output --- 183,191 ---- Item0=c:\tmp\compile\ Item1=c:\tmp\compile ! Item2=c:\tmp\compile\mockpp_23\ Item3=c:\temp Item4=output\ ! Item5=E:\Eigene Dateien\c++\mockpp_23\bcb5\output\ ! Item6=E:\Eigene Dateien\c++\mockpp_23\bcb5\output Item7=output *************** *** 194,203 **** Item0=c:\tmp\compile\ Item1=c:\tmp\compile ! Item2=c:\tmp\compile\mockpp_22\ ! Item3=c:\tmp\compile\mockpp_22\ulxr_bcb5\ Item4=c:\temp ! Item5=e:\Eigene Dateien\c++\mockpp_22\bcb5\output\ Item6=output\ ! Item7=E:\Eigene Dateien\c++\mockpp_22\bcb5\output Item8... [truncated message content] |
|
From: Ewald A. <ewa...@us...> - 2005-02-27 18:06:57
|
Update of /cvsroot/mockpp/mockpp/mockpp/constraint In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4989/mockpp/constraint Added Files: ConstraintList.h Log Message: VisitableMockObjects also take constraints as controlling elements --- NEW FILE: ConstraintList.h --- /** @file @brief Check list of constraints $Id: ConstraintList.h,v 1.1 2005/02/27 18:06:47 ewald-arnold Exp $ ***************************************************************************/ /************************************************************************** begin : Sat Feb 26 2005 copyright : (C) 2002-2005 by Ewald Arnold email : mockpp at ewald-arnold dot de This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ #ifndef MOCKPP_ConstraintList_H #define MOCKPP_ConstraintList_H #include <mockpp/mockpp.h> // always first #include <algorithm> #include <vector> #include <mockpp/AbstractExpectationCollection.h> #include <mockpp/util/AssertMo.h> #include <mockpp/constraint/Constraint.h> #include <mockpp/constraint/ConstraintHolder.h> #include <mockpp/constraint/IsEqual.h> #include <mockpp/constraint/IsAnything.h> namespace mockpp { /** A class to verify lists of constraints, one after the other as they occur. * This class is similar to ExpectationList but does not compare exactly but based on * one of the constraint classes. * \ingroup grp_basic_mo */ template <class T> class ConstraintList : public AbstractExpectationCollection<T> { public: /** Constructs the expectation. * @param name human readable description about the expectation * @param parent parent verifiable */ ConstraintList(const String &name, VerifiableList *parent = 0) : AbstractExpectationCollection<T>(name, parent), expectNothing(false), haveActualValue(false) { } /** Destroys the expectation. */ virtual ~ConstraintList() { clear(); } /** Sets all internal objects to the state after construction. */ virtual void reset() { clear(); } /** Verify that the expected values equal the expected ones. * Note: in a list there can be any number of elements of a given value and the order * of the elements must match exactly. * If it fails, an AssertionFailedError is thrown */ virtual void verify() { if( expectNothing) { String fmt = i18n(MOCKPP_PCHAR("%1 expected no value.")); fmt << this->getVerifiableName(); MOCKPP_ASSERT_FALSE_MESSAGE(fmt, haveActualValue ); } else { if (!this->hasExpectations() ) return; String fmt = i18n(MOCKPP_PCHAR("%1 expected a value.")); fmt << this->getVerifiableName(); MOCKPP_ASSERT_TRUE_MESSAGE(fmt, haveActualValue); fmt = i18n(MOCKPP_PCHAR("%1 did not receive the expected amount of values.")); fmt << this->getVerifiableName(); MOCKPP_ASSERT_TRUE_MESSAGE(fmt, actualItems.size() == constraints.size()); for (unsigned i = 0; i < actualItems.size(); ++i) checkImmediateValue(actualItems[i], i); } } /** Adds another actual value to the list. * @param actualItem new value */ void addActual(const T &actualItem) { actualItems.push_back(actualItem); haveActualValue = true; if (this->shouldCheckImmediately()) checkImmediateValue(actualItem); } /** Adds a sequence of actual values to the list. * @param items start iterator * @param end terminating iterator (note: one element "behind" as always with STL) */ template <class I> void addActual(I items, I end) { for ( /* -- */; items != end; ++items) addActual(*items); } /** Adds another constraint to the list. * @param constraint pointer to new constraint * @return reference to itself for chaining */ ConstraintList& addExpected(const ConstraintHolder<T> &constraint) { typename Constraint<T>::AP cons (constraint); constraints.push_back(cons.release()); expectNothing = false; this->setHasExpectations(); return *this; } /** Adds another exact expectation value to the list. * @param expectedItem new value * @return reference to itself for chaining */ ConstraintList& addExpected(const T &expectedItem) { return addExpected(new IsEqual<T>(expectedItem)); } /** Simulate one correct item regarding the expectation list. * Useful after recovering from an error at another place. */ void balanceActual() { if (actualItems.size() < constraints.size()) { haveActualValue = true; delete constraints[actualItems.size()]; constraints[actualItems.size()] = new TypelessConstraintAdapter<T>(new IsAnything); actualItems.push_back(T()); } } /** Adds a sequence of expectation values to the list. * @param items start iterator * @param end terminating iterator (note: one element "behind" as always with STL) * @return reference to itself for chaining */ template <class I> ConstraintList& addExpected(I items, I end) { for ( /* -- */; items != end; ++items) addExpected(T(*items)); return *this; } /** Resets the internal state to reflect that there is no actual value set. */ virtual void clearActual() { haveActualValue = false; actualItems.clear(); } /** * Resets the internal state completely. */ virtual void clear() { this->clearFailOnVerify(); clearActual(); clearExpectation(); expectNothing = false; } /** Returns the amount of expectation values. * @return number of expectation values */ unsigned size() const { return constraints.size(); } /** Tell the object to expect nothing to happen to it, perhaps because the test is exercising * the handling of an error. The Expectation will fail if any actual values are set. * * Note that this is not the same as not setting any expectations, in which case verify() * will do nothing. */ virtual void setExpectNothing() { expectNothing = true; clearExpectation(); this->setHasExpectations(); } protected: /** Clears the expectation list. */ virtual void clearExpectation() { this->clearHasExpectations(); for (unsigned i =0; i < constraints.size(); ++i) delete constraints[i]; constraints.clear(); } /** Checks if the actual value matches the expectation. * Note: in a list there can be any number of elements of a given value and the order * of the elements must match exactly. * If it fails, an AssertionFailedError is thrown * @param actualItem actual item to verify */ void checkImmediateValue(const T &actualItem) const { checkImmediateValue(actualItem, actualItems.size()-1); } /** Checks if the actual value matches the expectation. * Note: in a list there can be any number of elements of a given value and the order * of the elements must match exactly. * If it fails, an AssertionFailedError is thrown * @param actualItem actual item to verify * @param pos current index */ void checkImmediateValue(const T &actualItem, unsigned pos) const { String fmt = i18n(MOCKPP_PCHAR("%1 had different item sizes.\n") MOCKPP_PCHAR("Expected %2 items but received %3 when adding %4.")); fmt << this->getVerifiableName() << constraints.size() << pos+1 << actualItem; MOCKPP_ASSERT_TRUE_MESSAGE(fmt, constraints.size() > pos); String s; fmt = i18n(MOCKPP_PCHAR("%1 constraint[%2] does not match: %3.")); fmt << this->getVerifiableName() << pos << constraints[pos]->describeTo(s); MOCKPP_ASSERT_TRUE_MESSAGE(fmt, constraints[pos]->eval(actualItem)); } private: ConstraintList<T> (const ConstraintList<T> &); // forbid due to internal pointers ConstraintList<T>& operator=(ConstraintList<T>&); std::vector<T> actualItems; std::vector<Constraint<T>*> constraints; bool expectNothing; bool haveActualValue; }; } // namespace mockpp #endif // MOCKPP_ConstraintList_H |
|
From: Ewald A. <ewa...@us...> - 2005-02-27 18:06:57
|
Update of /cvsroot/mockpp/mockpp/mockpp/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4989/mockpp/tests Added Files: ConstraintList_test.cpp Log Message: VisitableMockObjects also take constraints as controlling elements --- NEW FILE: ConstraintList_test.cpp --- /*************************************************************************** ConstraintList_test.cpp - unit tests for ConstraintList class ------------------- begin : Sat Feb 26 2005 copyright : (C) 2002-2005 by Ewald Arnold email : mockpp at ewald-arnold dot de $Id: ConstraintList_test.cpp,v 1.1 2005/02/27 18:06:48 ewald-arnold Exp $ ***************************************************************************/ /************************************************************************** * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as * published by the Free Software Foundation; either version 2 of the License, * or (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU Lesser General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * ***************************************************************************/ #include <mockpp/mockpp.h> // always first #ifndef HAVE_CPPUNIT # warning CppUnit not available at compile time #else #include <mockpp/compat/Assert.h> #include <mockpp/constraint/ConstraintList.h> #include <mockpp/constraint/IsLessOrEqual.h> #include <mockpp/constraint/IsGreaterOrEqual.h> #include <cppunit/extensions/HelperMacros.h> class ConstraintList_test : public CppUnit::TestFixture { public: CPPUNIT_TEST_SUITE( ConstraintList_test ); CPPUNIT_TEST(test_chain); CPPUNIT_TEST(test_hasExpectations); CPPUNIT_TEST(test_name); CPPUNIT_TEST(test_many); CPPUNIT_TEST(test_balance); CPPUNIT_TEST(test_clear); CPPUNIT_TEST(test_expectNothing); CPPUNIT_TEST(test_expectNothing_revoked); CPPUNIT_TEST(test_expectActualImmediate); CPPUNIT_TEST(test_expectActualVerify); CPPUNIT_TEST(test_ifNoExpected); CPPUNIT_TEST_EXCEPTION(fail_clearActual, mockpp::AssertionFailedError); CPPUNIT_TEST_EXCEPTION(fail_expectActualImmediate, mockpp::AssertionFailedError); CPPUNIT_TEST_EXCEPTION(fail_expectActualVerify, mockpp::AssertionFailedError); CPPUNIT_TEST_EXCEPTION(fail_expectNothing, mockpp::AssertionFailedError); CPPUNIT_TEST_EXCEPTION(fail_many, mockpp::AssertionFailedError); CPPUNIT_TEST_EXCEPTION(fail_ifNoActual, mockpp::AssertionFailedError); CPPUNIT_TEST_SUITE_END(); public: void test_expectNothing(); void test_expectNothing_revoked(); void fail_expectNothing(); void test_expectActualImmediate(); void fail_expectActualImmediate(); void test_expectActualVerify(); void fail_expectActualVerify(); void test_clear(); void fail_many(); void test_name(); void fail_clearActual(); void test_hasExpectations(); void test_ifNoExpected(); void test_chain(); void test_balance(); void test_many(); void fail_ifNoActual(); }; CPPUNIT_TEST_SUITE_REGISTRATION(ConstraintList_test); void ConstraintList_test::test_chain() { int exp_prep[10] = { 0, 1 }; mockpp::ConstraintList<int> ab (MOCKPP_PCHAR("testConstraintList"), 0); ab.addExpected(200) .addExpected(exp_prep+0, exp_prep+2) .addExpected(700) .addExpected(800) .addExpected(new mockpp::IsGreaterOrEqual<int>(20)) .addExpected(new mockpp::IsLessOrEqual<int>(20)); ab.addActual(200); ab.addActual(0); ab.addActual(1); ab.addActual(700); ab.balanceActual(); ab.addActual(22); ab.addActual(18); ab.verify(); ab.clear(); ab.addActual(22); ab.addActual(18); ab.addExpected(22); ab.addExpected(18); ab.verify(); } void ConstraintList_test::test_name() { mockpp::ConstraintList<int> ec (MOCKPP_PCHAR("testList"), 0); CPPUNIT_ASSERT(ec.getVerifiableName() == (MOCKPP_PCHAR("testList"))); } void ConstraintList_test::test_hasExpectations() { { mockpp::ConstraintList<int> ec (MOCKPP_PCHAR("testList"), 0); CPPUNIT_ASSERT(false == ec.hasExpectations()); ec.addExpected(2); CPPUNIT_ASSERT(true == ec.hasExpectations()); } mockpp::ConstraintList<int> ec2 (MOCKPP_PCHAR("testList"), 0); CPPUNIT_ASSERT(false == ec2.hasExpectations()); ec2.setExpectNothing(); CPPUNIT_ASSERT(true == ec2.hasExpectations()); } void ConstraintList_test::test_clear() { mockpp::ConstraintList<int> ec (MOCKPP_PCHAR("nothingValue"), 0); ec.addExpected(1234); ec.clear(); CPPUNIT_ASSERT(false == ec.hasExpectations()); ec.verify(); // no fail because no expectations } void ConstraintList_test::fail_clearActual() { mockpp::ConstraintList<int> ec (MOCKPP_PCHAR("testList"), 0); ec.addExpected(3); ec.addActual(3); ec.clearActual(); ec.verify(); } void ConstraintList_test::test_ifNoExpected() { mockpp::ConstraintList<int> ec (MOCKPP_PCHAR("nothingList"), 0); ec.addActual(3); // fails because no expectation value } void ConstraintList_test::fail_ifNoActual() { mockpp::ConstraintList<int> ec (MOCKPP_PCHAR("nothingList"), 0); ec.addExpected(3); ec.verify(); // fails because no value } static void doNothing(mockpp::ConstraintList<int> &ec) { ec.addExpected(3); ec.setExpectNothing(); } void ConstraintList_test::test_expectNothing() { mockpp::ConstraintList<int> ec (MOCKPP_PCHAR("nothingList"), 0); doNothing(ec); ec.verify(); // no fail } void ConstraintList_test::test_expectNothing_revoked() { mockpp::ConstraintList<int> ec (MOCKPP_PCHAR("nothingList"), 0); ec.setExpectNothing(); ec.addExpected(3); ec.addActual(3); ec.verify(); // no fail } void ConstraintList_test::fail_expectNothing() { mockpp::ConstraintList<int> ec (MOCKPP_PCHAR("nothingList"), 0); doNothing(ec); ec.addActual(3); // fails even if equal } static void doActualImmediate(mockpp::ConstraintList<int> &ec) { ec.addExpected(1234); ec.addExpected(5678); ec.addExpected(8765); ec.addExpected(4321); ec.addActual(1234); ec.addActual(5678); ec.addActual(8765); ec.addActual(4321); } void ConstraintList_test::test_expectActualImmediate() { mockpp::ConstraintList<int> ec (MOCKPP_PCHAR("actualList"), 0); doActualImmediate(ec); ec.verify(); // no fail } void ConstraintList_test::test_many() { mockpp::ConstraintList<int> ec (MOCKPP_PCHAR("actualList"), 0); int prep[10] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 }; ec.addExpected(prep+0, prep+10); ec.addActual(prep+0, prep+10); } void ConstraintList_test::fail_many() { mockpp::ConstraintList<int> ec (MOCKPP_PCHAR("actualList"), 0); int prep[10] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 }; ec.addExpected(prep+0, prep+10); ec.addActual(prep+2, prep+10); } void ConstraintList_test::fail_expectActualImmediate() { mockpp::ConstraintList<int> ec (MOCKPP_PCHAR("actualList"), 0); doActualImmediate(ec); ec.addActual(4321); // fails } static void doActualVerify(mockpp::ConstraintList<int> &ec) { ec.addExpected(1234); ec.setFailOnVerify(); ec.addActual(4321); // should not fail } void ConstraintList_test::test_expectActualVerify() { mockpp::ConstraintList<int> ec (MOCKPP_PCHAR("verifyList"), 0); doActualVerify(ec); // no fail } void ConstraintList_test::fail_expectActualVerify() { mockpp::ConstraintList<int> ec (MOCKPP_PCHAR("verifyList"), 0); doActualVerify(ec); // no fail ec.verify(); // fails } void ConstraintList_test::test_balance() { mockpp::ConstraintList<int> ec (MOCKPP_PCHAR("verifyList"), 0); ec.addExpected(1); ec.addExpected(2); ec.addExpected(3); ec.addExpected(4); ec.addExpected(5); ec.addExpected(6); ec.balanceActual(); // copy last element ec.balanceActual(); // copy last element ec.balanceActual(); // copy last element ec.balanceActual(); // copy last element ec.balanceActual(); // copy last element ec.addActual(6); ec.verify(); } #endif // HAVE_CPPUNIT |
Update of /cvsroot/mockpp/mockpp/mockpp/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4304/mockpp/tests Modified Files: ExpectationList_test.cpp VisitableMockObject_1_test.cpp VisitableMockObject_1_void_test.cpp VisitableMockObject_2_test.cpp VisitableMockObject_2_void_test.cpp VisitableMockObject_3_test.cpp VisitableMockObject_3_void_test.cpp VisitableMockObject_4_test.cpp VisitableMockObject_4_void_test.cpp VisitableMockObject_5_test.cpp VisitableMockObject_5_void_test.cpp Log Message: VisitableMockObjects also take constraints as controlling elements Index: VisitableMockObject_1_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_1_void_test.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** VisitableMockObject_1_void_test.cpp 27 Feb 2005 11:48:16 -0000 1.16 --- VisitableMockObject_1_void_test.cpp 27 Feb 2005 18:04:29 -0000 1.17 *************** *** 41,44 **** --- 41,46 ---- #include <mockpp/VisitableMockObject.h> + #include <mockpp/chaining/ChainingMockObjectSupport.h> + #include <mockpp/constraint/IsEqual.h> #include <mockpp/constraint/IsNot.h> *************** *** 59,62 **** --- 61,65 ---- CPPUNIT_TEST(test_default_throw); CPPUNIT_TEST(test_constraint); + CPPUNIT_TEST(test_controller_constraint); CPPUNIT_TEST_EXCEPTION(fail_add_throw_after_active, mockpp::AssertionFailedError); *************** *** 78,81 **** --- 81,85 ---- void test_parameter_ex(); void test_constraint(); + void test_controller_constraint(); void fail_unused_throwable(); *************** *** 335,339 **** MOCKPP_CONTROLLER_FOR(MyVisitableMockObject_1_void, visitable) ctr (&mvo); ! mvo.visitable(new mockpp::IsEqual<int>(13)); mvo.visitable(new mockpp::IsNot<int>(new mockpp::IsEqual<int>(13))); --- 339,343 ---- MOCKPP_CONTROLLER_FOR(MyVisitableMockObject_1_void, visitable) ctr (&mvo); ! mvo.visitable(mockpp::eq<int>(13)); mvo.visitable(new mockpp::IsNot<int>(new mockpp::IsEqual<int>(13))); *************** *** 345,347 **** --- 349,385 ---- + void VisitableMockObject_1_void_test::test_controller_constraint() + { + MyVisitableMockObject_1_void mvo(MOCKPP_PCHAR("mvo")); + MOCKPP_CONTROLLER_FOR(MyVisitableMockObject_1_void, visitable) ctr (&mvo); + + mvo.visitable(mockpp::eq<int>(10, 5)); + + mvo.visitable(mockpp::eq<int>(10, 5)); + + mvo.visitable(1); + + ctr.addResponseThrowable(mockpp::make_throwable((int)2), + mockpp::eq<int>(8)); + + ctr.addResponseThrowable(mockpp::make_throwable((int)1), + mockpp::eq<int>(12)); + + mvo.activate(); + + MOCKPP_ASSERT_THROWING(mvo.visitable(8), + MOCKPP_PCHAR("mvo.visitable(8)"), + int, + 2); + + MOCKPP_ASSERT_THROWING(mvo.visitable(12), + MOCKPP_PCHAR("mvo.visitable(12)"), + int, + 1); + + mvo.visitable(1); + mvo.verify(); + } + + #endif // HAVE_CPPUNIT Index: ExpectationList_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ExpectationList_test.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** ExpectationList_test.cpp 8 Jan 2005 13:24:10 -0000 1.14 --- ExpectationList_test.cpp 27 Feb 2005 18:04:29 -0000 1.15 *************** *** 100,110 **** { int exp_prep[10] = { 0, 1 }; ! mockpp::ExpectationList<int> ab = ! mockpp::ExpectationList<int> ! (MOCKPP_PCHAR("testExpectationList"), 0) ! .addExpected(200) ! .addExpected(exp_prep+0, exp_prep+2) ! .addExpected(700); ab.addActual(200); --- 100,108 ---- { int exp_prep[10] = { 0, 1 }; + mockpp::ExpectationList<int> ab (MOCKPP_PCHAR("testExpectationList"), 0); ! ab.addExpected(200) ! .addExpected(exp_prep+0, exp_prep+2) ! .addExpected(700); ab.addActual(200); Index: VisitableMockObject_3_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_3_test.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** VisitableMockObject_3_test.cpp 27 Feb 2005 11:48:16 -0000 1.15 --- VisitableMockObject_3_test.cpp 27 Feb 2005 18:04:29 -0000 1.16 *************** *** 41,44 **** --- 41,46 ---- #include <mockpp/constraint/IsNot.h> + #include <mockpp/chaining/ChainingMockObjectSupport.h> + #include <mockpp/ExpectationValue.h> #include <mockpp/VisitableMockObject.h> *************** *** 64,67 **** --- 66,70 ---- CPPUNIT_TEST(test_inline_post_1_2); CPPUNIT_TEST(test_constraint); + CPPUNIT_TEST(test_controller_constraint); CPPUNIT_TEST_EXCEPTION(fail_add_throw_after_active, mockpp::AssertionFailedError); *************** *** 91,94 **** --- 94,98 ---- void test_inline_post_1_2(); void test_constraint(); + void test_controller_constraint(); void fail_unused_value(); *************** *** 596,598 **** --- 600,663 ---- + void VisitableMockObject_3_test::test_controller_constraint() + { + MyVisitableMockObject_3 mvo(MOCKPP_PCHAR("mvo")); + MOCKPP_CONTROLLER_FOR(MyVisitableMockObject_3, visitable) ctr (&mvo); + ctr.setDefaultReturnValue(123); + + mvo.visitable(mockpp::eq<unsigned>(10, 5), + mockpp::eq<unsigned>(20, 5), + mockpp::eq<unsigned>(50, 5)); + + mvo.visitable(mockpp::eq<unsigned>(10, 5), + mockpp::eq<unsigned>(20, 5), + mockpp::eq<unsigned>(50, 5)); + + mvo.visitable(mockpp::eq<unsigned>(10, 5), + mockpp::eq<unsigned>(20, 5), + mockpp::eq<unsigned>(50, 5)); + + mvo.visitable(mockpp::eq<unsigned>(10, 5), + mockpp::eq<unsigned>(20, 5), + mockpp::eq<unsigned>(50, 5)); + + mvo.visitable(1, 1, 1); + + ctr.addResponseThrowable(mockpp::make_throwable((int)2), + mockpp::eq<unsigned>(8), + mockpp::eq<unsigned>(18), + mockpp::eq<unsigned>(48)); + + ctr.addResponseThrowable(mockpp::make_throwable((int)1), + mockpp::eq<unsigned>(12), + mockpp::eq<unsigned>(22), + mockpp::eq<unsigned>(52)); + + ctr.addResponseValue(2, mockpp::eq<unsigned>(9), + mockpp::eq<unsigned>(19), + mockpp::eq<unsigned>(49)); + + ctr.addResponseValue(1, mockpp::eq<unsigned>(11), + mockpp::eq<unsigned>(21), + mockpp::eq<unsigned>(51)); + + mvo.activate(); + CPPUNIT_ASSERT(1 == mvo.visitable(11, 21, 51)); + CPPUNIT_ASSERT(2 == mvo.visitable(9, 19, 49)); + + MOCKPP_ASSERT_THROWING(mvo.visitable(8, 18, 48), + MOCKPP_PCHAR("mvo.visitable(8, 18, 48)"), + int, + 2); + + MOCKPP_ASSERT_THROWING(mvo.visitable(12, 22, 52), + MOCKPP_PCHAR("mvo.visitable(12, 22, 52)"), + int, + 1); + + CPPUNIT_ASSERT(123 == mvo.visitable(1, 1, 1)); + mvo.verify(); + } + + #endif // HAVE_CPPUNIT Index: VisitableMockObject_2_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_2_test.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** VisitableMockObject_2_test.cpp 27 Feb 2005 11:48:16 -0000 1.16 --- VisitableMockObject_2_test.cpp 27 Feb 2005 18:04:29 -0000 1.17 *************** *** 38,41 **** --- 38,43 ---- #else + #include <mockpp/chaining/ChainingMockObjectSupport.h> + #include <mockpp/constraint/IsEqual.h> #include <mockpp/constraint/IsNot.h> *************** *** 64,67 **** --- 66,70 ---- CPPUNIT_TEST(test_inline_post_1_2); CPPUNIT_TEST(test_constraint); + CPPUNIT_TEST(test_controller_constraint); CPPUNIT_TEST_EXCEPTION(fail_add_throw_after_active, mockpp::AssertionFailedError); *************** *** 91,94 **** --- 94,98 ---- void test_inline_post_1_2(); void test_constraint(); + void test_controller_constraint(); void fail_unused_value(); *************** *** 584,586 **** --- 588,643 ---- + void VisitableMockObject_2_test::test_controller_constraint() + { + MyVisitableMockObject_2 mvo(MOCKPP_PCHAR("mvo")); + MOCKPP_CONTROLLER_FOR(MyVisitableMockObject_2, visitable) ctr (&mvo); + ctr.setDefaultReturnValue(123); + + mvo.visitable(mockpp::eq<unsigned>(10, 5), + mockpp::eq<unsigned>(50, 5)); + + mvo.visitable(mockpp::eq<unsigned>(10, 5), + mockpp::eq<unsigned>(50, 5)); + + mvo.visitable(mockpp::eq<unsigned>(10, 5), + mockpp::eq<unsigned>(50, 5)); + + mvo.visitable(mockpp::eq<unsigned>(10, 5), + mockpp::eq<unsigned>(50, 5)); + + mvo.visitable(1, 1); + + ctr.addResponseThrowable(mockpp::make_throwable((int)2), + mockpp::eq<unsigned>(8), + mockpp::eq<unsigned>(48)); + + ctr.addResponseThrowable(mockpp::make_throwable((int)1), + mockpp::eq<unsigned>(12), + mockpp::eq<unsigned>(52)); + + ctr.addResponseValue(2, mockpp::eq<unsigned>(9), + mockpp::eq<unsigned>(49)); + + ctr.addResponseValue(1, mockpp::eq<unsigned>(11), + mockpp::eq<unsigned>(51)); + + mvo.activate(); + CPPUNIT_ASSERT(1 == mvo.visitable(11, 51)); + CPPUNIT_ASSERT(2 == mvo.visitable(9, 49)); + + MOCKPP_ASSERT_THROWING(mvo.visitable(8, 48), + MOCKPP_PCHAR("mvo.visitable(8, 48)"), + int, + 2); + + MOCKPP_ASSERT_THROWING(mvo.visitable(12, 52), + MOCKPP_PCHAR("mvo.visitable(12, 52)"), + int, + 1); + + CPPUNIT_ASSERT(123 == mvo.visitable(1, 1)); + mvo.verify(); + } + + #endif // HAVE_CPPUNIT Index: VisitableMockObject_2_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_2_void_test.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** VisitableMockObject_2_void_test.cpp 27 Feb 2005 11:48:16 -0000 1.15 --- VisitableMockObject_2_void_test.cpp 27 Feb 2005 18:04:29 -0000 1.16 *************** *** 41,44 **** --- 41,46 ---- #include <mockpp/constraint/IsNot.h> + #include <mockpp/chaining/ChainingMockObjectSupport.h> + #include <mockpp/ExpectationValue.h> #include <mockpp/VisitableMockObject.h> *************** *** 59,62 **** --- 61,65 ---- CPPUNIT_TEST(test_default_throw); CPPUNIT_TEST(test_constraint); + CPPUNIT_TEST(test_controller_constraint); CPPUNIT_TEST_EXCEPTION(fail_add_throw_after_active, mockpp::AssertionFailedError); *************** *** 78,81 **** --- 81,85 ---- void test_parameter(); void test_constraint(); + void test_controller_constraint(); void fail_unused_throwable(); *************** *** 353,355 **** --- 357,397 ---- + void VisitableMockObject_2_void_test::test_controller_constraint() + { + MyVisitableMockObject_2_void mvo(MOCKPP_PCHAR("mvo")); + MOCKPP_CONTROLLER_FOR(MyVisitableMockObject_2_void, visitable) ctr (&mvo); + + mvo.visitable(mockpp::eq<unsigned>(10, 5), + mockpp::eq<unsigned>(50, 5)); + + mvo.visitable(mockpp::eq<unsigned>(10, 5), + mockpp::eq<unsigned>(50, 5)); + + mvo.visitable(1, 1); + + ctr.addResponseThrowable(mockpp::make_throwable((int)2), + mockpp::eq<unsigned>(8), + mockpp::eq<unsigned>(48)); + + ctr.addResponseThrowable(mockpp::make_throwable((int)1), + mockpp::eq<unsigned>(12), + mockpp::eq<unsigned>(52)); + + mvo.activate(); + + MOCKPP_ASSERT_THROWING(mvo.visitable(8, 48), + MOCKPP_PCHAR("mvo.visitable(8, 48)"), + int, + 2); + + MOCKPP_ASSERT_THROWING(mvo.visitable(12, 52), + MOCKPP_PCHAR("mvo.visitable(12, 52)"), + int, + 1); + + mvo.visitable(1, 1); + mvo.verify(); + } + + #endif // HAVE_CPPUNIT Index: VisitableMockObject_3_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_3_void_test.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** VisitableMockObject_3_void_test.cpp 27 Feb 2005 11:48:16 -0000 1.14 --- VisitableMockObject_3_void_test.cpp 27 Feb 2005 18:04:29 -0000 1.15 *************** *** 41,44 **** --- 41,46 ---- #include <mockpp/constraint/IsNot.h> + #include <mockpp/chaining/ChainingMockObjectSupport.h> + #include <mockpp/ExpectationValue.h> #include <mockpp/VisitableMockObject.h> *************** *** 59,62 **** --- 61,65 ---- CPPUNIT_TEST(test_default_throw); CPPUNIT_TEST(test_constraint); + CPPUNIT_TEST(test_controller_constraint); CPPUNIT_TEST_EXCEPTION(fail_add_throw_after_active, mockpp::AssertionFailedError); *************** *** 78,81 **** --- 81,85 ---- void test_parameter(); void test_constraint(); + void test_controller_constraint(); void fail_unused_throwable(); *************** *** 363,365 **** --- 367,411 ---- + void VisitableMockObject_3_void_test::test_controller_constraint() + { + MyVisitableMockObject_3_void mvo(MOCKPP_PCHAR("mvo")); + MOCKPP_CONTROLLER_FOR(MyVisitableMockObject_3_void, visitable) ctr (&mvo); + + mvo.visitable(mockpp::eq<unsigned>(10, 5), + mockpp::eq<unsigned>(20, 5), + mockpp::eq<unsigned>(50, 5)); + + mvo.visitable(mockpp::eq<unsigned>(10, 5), + mockpp::eq<unsigned>(20, 5), + mockpp::eq<unsigned>(50, 5)); + + mvo.visitable(1, 1, 1); + + ctr.addResponseThrowable(mockpp::make_throwable((int)2), + mockpp::eq<unsigned>(8), + mockpp::eq<unsigned>(18), + mockpp::eq<unsigned>(48)); + + ctr.addResponseThrowable(mockpp::make_throwable((int)1), + mockpp::eq<unsigned>(12), + mockpp::eq<unsigned>(22), + mockpp::eq<unsigned>(52)); + + mvo.activate(); + + MOCKPP_ASSERT_THROWING(mvo.visitable(8, 18, 48), + MOCKPP_PCHAR("mvo.visitable(8, 18, 48)"), + int, + 2); + + MOCKPP_ASSERT_THROWING(mvo.visitable(12, 22, 52), + MOCKPP_PCHAR("mvo.visitable(12, 22, 52)"), + int, + 1); + + mvo.visitable(1, 1, 1); + mvo.verify(); + } + + #endif // HAVE_CPPUNIT Index: VisitableMockObject_4_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_4_void_test.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** VisitableMockObject_4_void_test.cpp 27 Feb 2005 11:48:16 -0000 1.14 --- VisitableMockObject_4_void_test.cpp 27 Feb 2005 18:04:29 -0000 1.15 *************** *** 41,44 **** --- 41,46 ---- #include <mockpp/VisitableMockObject.h> + #include <mockpp/chaining/ChainingMockObjectSupport.h> + #include <mockpp/constraint/IsEqual.h> #include <mockpp/constraint/IsNot.h> *************** *** 59,62 **** --- 61,65 ---- CPPUNIT_TEST(test_default_throw); CPPUNIT_TEST(test_constraint); + CPPUNIT_TEST(test_controller_constraint); CPPUNIT_TEST_EXCEPTION(fail_add_throw_after_active, mockpp::AssertionFailedError); *************** *** 78,81 **** --- 81,85 ---- void test_parameter(); void test_constraint(); + void test_controller_constraint(); void fail_unused_throwable(); *************** *** 373,375 **** --- 377,425 ---- + void VisitableMockObject_4_void_test::test_controller_constraint() + { + MyVisitableMockObject_4_void_test mvo(MOCKPP_PCHAR("mvo")); + MOCKPP_CONTROLLER_FOR(MyVisitableMockObject_4_void_test, visitable) ctr (&mvo); + + mvo.visitable(mockpp::eq<unsigned>(10, 5), + mockpp::eq<unsigned>(20, 5), + mockpp::eq<unsigned>(30, 5), + mockpp::eq<unsigned>(50, 5)); + + mvo.visitable(mockpp::eq<unsigned>(10, 5), + mockpp::eq<unsigned>(20, 5), + mockpp::eq<unsigned>(30, 5), + mockpp::eq<unsigned>(50, 5)); + + mvo.visitable(1, 1, 1, 1); + + ctr.addResponseThrowable(mockpp::make_throwable((int)2), + mockpp::eq<unsigned>(8), + mockpp::eq<unsigned>(18), + mockpp::eq<unsigned>(28), + mockpp::eq<unsigned>(48)); + + ctr.addResponseThrowable(mockpp::make_throwable((int)1), + mockpp::eq<unsigned>(12), + mockpp::eq<unsigned>(22), + mockpp::eq<unsigned>(32), + mockpp::eq<unsigned>(52)); + + mvo.activate(); + + MOCKPP_ASSERT_THROWING(mvo.visitable(8, 18, 28, 48), + MOCKPP_PCHAR("mvo.visitable(8, 18, 28, 48)"), + int, + 2); + + MOCKPP_ASSERT_THROWING(mvo.visitable(12, 22, 32, 52), + MOCKPP_PCHAR("mvo.visitable(12, 22, 32, 52)"), + int, + 1); + + mvo.visitable(1, 1, 1, 1); + mvo.verify(); + } + + #endif // HAVE_CPPUNIT Index: VisitableMockObject_5_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_5_test.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** VisitableMockObject_5_test.cpp 27 Feb 2005 11:48:16 -0000 1.20 --- VisitableMockObject_5_test.cpp 27 Feb 2005 18:04:29 -0000 1.21 *************** *** 42,45 **** --- 42,47 ---- #include <mockpp/util/AssertMo.h> + #include <mockpp/chaining/ChainingMockObjectSupport.h> + #include <mockpp/constraint/IsEqual.h> #include <mockpp/constraint/IsNot.h> *************** *** 66,69 **** --- 68,72 ---- CPPUNIT_TEST(test_inline_post_1_2); CPPUNIT_TEST(test_constraint); + CPPUNIT_TEST(test_controller_constraint); CPPUNIT_TEST_EXCEPTION(fail_add_throw_after_active, mockpp::AssertionFailedError); *************** *** 93,96 **** --- 96,100 ---- void test_inline_post_1_2(); void test_constraint(); + void test_controller_constraint(); void fail_unused_value(); *************** *** 927,929 **** --- 931,1010 ---- + void VisitableMockObject_5_test::test_controller_constraint() + { + MyVisitableMockObject_5 mvo(MOCKPP_PCHAR("mvo")); + MOCKPP_CONTROLLER_FOR(MyVisitableMockObject_5, visitable5) ctr (&mvo); + ctr.setDefaultReturnValue(123); + + mvo.visitable5(mockpp::eq<unsigned>(10, 5), + mockpp::eq<unsigned>(20, 5), + mockpp::eq<unsigned>(30, 5), + mockpp::eq<unsigned>(40, 5), + mockpp::eq<unsigned>(50, 5)); + + mvo.visitable5(mockpp::eq<unsigned>(10, 5), + mockpp::eq<unsigned>(20, 5), + mockpp::eq<unsigned>(30, 5), + mockpp::eq<unsigned>(40, 5), + mockpp::eq<unsigned>(50, 5)); + + mvo.visitable5(mockpp::eq<unsigned>(10, 5), + mockpp::eq<unsigned>(20, 5), + mockpp::eq<unsigned>(30, 5), + mockpp::eq<unsigned>(40, 5), + mockpp::eq<unsigned>(50, 5)); + + mvo.visitable5(mockpp::eq<unsigned>(10, 5), + mockpp::eq<unsigned>(20, 5), + mockpp::eq<unsigned>(30, 5), + mockpp::eq<unsigned>(40, 5), + mockpp::eq<unsigned>(50, 5)); + + mvo.visitable5(1, 1, 1, 1, 1); + + ctr.addResponseThrowable(mockpp::make_throwable((int)2), + mockpp::eq<unsigned>(8), + mockpp::eq<unsigned>(18), + mockpp::eq<unsigned>(28), + mockpp::eq<unsigned>(38), + mockpp::eq<unsigned>(48)); + + ctr.addResponseThrowable(mockpp::make_throwable((int)1), + mockpp::eq<unsigned>(12), + mockpp::eq<unsigned>(22), + mockpp::eq<unsigned>(32), + mockpp::eq<unsigned>(42), + mockpp::eq<unsigned>(52)); + + ctr.addResponseValue(2, mockpp::eq<unsigned>(9), + mockpp::eq<unsigned>(19), + mockpp::eq<unsigned>(29), + mockpp::eq<unsigned>(39), + mockpp::eq<unsigned>(49)); + + ctr.addResponseValue(1, mockpp::eq<unsigned>(11), + mockpp::eq<unsigned>(21), + mockpp::eq<unsigned>(31), + mockpp::eq<unsigned>(41), + mockpp::eq<unsigned>(51)); + + mvo.activate(); + CPPUNIT_ASSERT(1 == mvo.visitable5(11, 21, 31, 41, 51)); + CPPUNIT_ASSERT(2 == mvo.visitable5(9, 19, 29, 39, 49)); + + MOCKPP_ASSERT_THROWING(mvo.visitable5(8, 18, 28, 38, 48), + MOCKPP_PCHAR("mvo.visitable5(8, 18, 28, 38, 48)"), + int, + 2); + + MOCKPP_ASSERT_THROWING(mvo.visitable5(12, 22, 32, 42, 52), + MOCKPP_PCHAR("mvo.visitable5(12, 22, 32, 42, 52)"), + int, + 1); + + CPPUNIT_ASSERT(123 == mvo.visitable5(1, 1, 1, 1, 1)); + mvo.verify(); + } + + #endif // HAVE_CPPUNIT Index: VisitableMockObject_5_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_5_void_test.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** VisitableMockObject_5_void_test.cpp 27 Feb 2005 11:48:16 -0000 1.17 --- VisitableMockObject_5_void_test.cpp 27 Feb 2005 18:04:29 -0000 1.18 *************** *** 41,44 **** --- 41,46 ---- #include <mockpp/VisitableMockObject.h> + #include <mockpp/chaining/ChainingMockObjectSupport.h> + #include <mockpp/constraint/IsEqual.h> #include <mockpp/constraint/IsNot.h> *************** *** 61,64 **** --- 63,67 ---- CPPUNIT_TEST(test_default_throw); CPPUNIT_TEST(test_constraint); + CPPUNIT_TEST(test_controller_constraint); CPPUNIT_TEST_EXCEPTION(fail_add_throw_after_active, mockpp::AssertionFailedError); *************** *** 80,83 **** --- 83,87 ---- void test_parameter_ex(); void test_constraint(); + void test_controller_constraint(); void fail_unused_throwable(); *************** *** 692,694 **** --- 696,747 ---- + void VisitableMockObject_5_void_test::test_controller_constraint() + { + MyVisitableMockObject_5_void_test mvo(MOCKPP_PCHAR("mvo")); + MOCKPP_CONTROLLER_FOR(MyVisitableMockObject_5_void_test, visitable5) ctr (&mvo); + + mvo.visitable5(mockpp::eq<unsigned>(10, 5), + mockpp::eq<unsigned>(20, 5), + mockpp::eq<unsigned>(30, 5), + mockpp::eq<unsigned>(40, 5), + mockpp::eq<unsigned>(50, 5)); + + mvo.visitable5(mockpp::eq<unsigned>(10, 5), + mockpp::eq<unsigned>(20, 5), + mockpp::eq<unsigned>(30, 5), + mockpp::eq<unsigned>(40, 5), + mockpp::eq<unsigned>(50, 5)); + + mvo.visitable5(1, 1, 1, 1, 1); + + ctr.addResponseThrowable(mockpp::make_throwable((int)2), + mockpp::eq<unsigned>(8), + mockpp::eq<unsigned>(18), + mockpp::eq<unsigned>(28), + mockpp::eq<unsigned>(38), + mockpp::eq<unsigned>(48)); + + ctr.addResponseThrowable(mockpp::make_throwable((int)1), + mockpp::eq<unsigned>(12), + mockpp::eq<unsigned>(22), + mockpp::eq<unsigned>(32), + mockpp::eq<unsigned>(42), + mockpp::eq<unsigned>(52)); + mvo.activate(); + + MOCKPP_ASSERT_THROWING(mvo.visitable5(8, 18, 28, 38, 48), + MOCKPP_PCHAR("mvo.visitable5(8, 18, 28, 38, 48)"), + int, + 2); + + MOCKPP_ASSERT_THROWING(mvo.visitable5(12, 22, 32, 42, 52), + MOCKPP_PCHAR("mvo.visitable5(12, 22, 32, 42, 52)"), + int, + 1); + + mvo.visitable5(1, 1, 1, 1, 1); + mvo.verify(); + } + + #endif // HAVE_CPPUNIT Index: VisitableMockObject_4_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_4_test.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** VisitableMockObject_4_test.cpp 27 Feb 2005 11:48:16 -0000 1.15 --- VisitableMockObject_4_test.cpp 27 Feb 2005 18:04:29 -0000 1.16 *************** *** 38,41 **** --- 38,43 ---- #else + #include <mockpp/chaining/ChainingMockObjectSupport.h> + #include <mockpp/constraint/IsEqual.h> #include <mockpp/constraint/IsNot.h> *************** *** 64,67 **** --- 66,70 ---- CPPUNIT_TEST(test_inline_post_1_2); CPPUNIT_TEST(test_constraint); + CPPUNIT_TEST(test_controller_constraint); CPPUNIT_TEST_EXCEPTION(fail_add_throw_after_active, mockpp::AssertionFailedError); *************** *** 91,94 **** --- 94,98 ---- void test_inline_post_1_2(); void test_constraint(); + void test_controller_constraint(); void fail_unused_value(); *************** *** 609,611 **** --- 613,684 ---- + void VisitableMockObject_4_test::test_controller_constraint() + { + MyVisitableMockObject_4 mvo(MOCKPP_PCHAR("mvo")); + MOCKPP_CONTROLLER_FOR(MyVisitableMockObject_4, visitable) ctr (&mvo); + ctr.setDefaultReturnValue(123); + + mvo.visitable(mockpp::eq<unsigned>(10, 5), + mockpp::eq<unsigned>(20, 5), + mockpp::eq<unsigned>(30, 5), + mockpp::eq<unsigned>(50, 5)); + + mvo.visitable(mockpp::eq<unsigned>(10, 5), + mockpp::eq<unsigned>(20, 5), + mockpp::eq<unsigned>(30, 5), + mockpp::eq<unsigned>(50, 5)); + + mvo.visitable(mockpp::eq<unsigned>(10, 5), + mockpp::eq<unsigned>(20, 5), + mockpp::eq<unsigned>(30, 5), + mockpp::eq<unsigned>(50, 5)); + + mvo.visitable(mockpp::eq<unsigned>(10, 5), + mockpp::eq<unsigned>(20, 5), + mockpp::eq<unsigned>(30, 5), + mockpp::eq<unsigned>(50, 5)); + + mvo.visitable(1, 1, 1, 1); + + ctr.addResponseThrowable(mockpp::make_throwable((int)2), + mockpp::eq<unsigned>(8), + mockpp::eq<unsigned>(18), + mockpp::eq<unsigned>(28), + mockpp::eq<unsigned>(48)); + + ctr.addResponseThrowable(mockpp::make_throwable((int)1), + mockpp::eq<unsigned>(12), + mockpp::eq<unsigned>(22), + mockpp::eq<unsigned>(32), + mockpp::eq<unsigned>(52)); + + ctr.addResponseValue(2, mockpp::eq<unsigned>(9), + mockpp::eq<unsigned>(19), + mockpp::eq<unsigned>(29), + mockpp::eq<unsigned>(49)); + + ctr.addResponseValue(1, mockpp::eq<unsigned>(11), + mockpp::eq<unsigned>(21), + mockpp::eq<unsigned>(31), + mockpp::eq<unsigned>(51)); + + mvo.activate(); + CPPUNIT_ASSERT(1 == mvo.visitable(11, 21, 31, 51)); + CPPUNIT_ASSERT(2 == mvo.visitable(9, 19, 29, 49)); + + MOCKPP_ASSERT_THROWING(mvo.visitable(8, 18, 28, 48), + MOCKPP_PCHAR("mvo.visitable(8, 18, 28, 48)"), + int, + 2); + + MOCKPP_ASSERT_THROWING(mvo.visitable(12, 22, 32, 52), + MOCKPP_PCHAR("mvo.visitable(12, 22, 32, 52)"), + int, + 1); + + CPPUNIT_ASSERT(123 == mvo.visitable(1, 1, 1, 1)); + mvo.verify(); + } + + #endif // HAVE_CPPUNIT Index: VisitableMockObject_1_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_1_test.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** VisitableMockObject_1_test.cpp 27 Feb 2005 11:48:16 -0000 1.17 --- VisitableMockObject_1_test.cpp 27 Feb 2005 18:04:29 -0000 1.18 *************** *** 42,45 **** --- 42,47 ---- #include <mockpp/util/AssertMo.h> + #include <mockpp/chaining/ChainingMockObjectSupport.h> + #include <mockpp/constraint/IsEqual.h> #include <mockpp/constraint/IsNot.h> *************** *** 64,67 **** --- 66,70 ---- CPPUNIT_TEST(test_inline_post_1_2); CPPUNIT_TEST(test_constraint); + CPPUNIT_TEST(test_controller_constraint); CPPUNIT_TEST_EXCEPTION(fail_add_throw_after_active, mockpp::AssertionFailedError); *************** *** 91,94 **** --- 94,98 ---- void test_inline_post_1_2(); void test_constraint(); + void test_controller_constraint(); void fail_unused_value(); *************** *** 574,576 **** --- 578,625 ---- + void VisitableMockObject_1_test::test_controller_constraint() + { + MyVisitableMockObject_1 mvo(MOCKPP_PCHAR("mvo")); + MOCKPP_CONTROLLER_FOR(MyVisitableMockObject_1, visitable) ctr (&mvo); + ctr.setDefaultReturnValue(123); + + mvo.visitable(mockpp::eq<unsigned>(10, 5)); + + mvo.visitable(mockpp::eq<unsigned>(10, 5)); + + mvo.visitable(mockpp::eq<unsigned>(10, 5)); + + mvo.visitable(mockpp::eq<unsigned>(10, 5)); + + mvo.visitable(1); + + ctr.addResponseThrowable(mockpp::make_throwable((int)2), + mockpp::eq<unsigned>(8)); + + ctr.addResponseThrowable(mockpp::make_throwable((int)1), + mockpp::eq<unsigned>(12)); + + ctr.addResponseValue(2, mockpp::eq<unsigned>(9)); + + ctr.addResponseValue(1, mockpp::eq<unsigned>(11)); + + mvo.activate(); + CPPUNIT_ASSERT(1 == mvo.visitable(11)); + CPPUNIT_ASSERT(2 == mvo.visitable(9)); + + MOCKPP_ASSERT_THROWING(mvo.visitable(8), + MOCKPP_PCHAR("mvo.visitable(8)"), + int, + 2); + + MOCKPP_ASSERT_THROWING(mvo.visitable(12), + MOCKPP_PCHAR("mvo.visitable(12)"), + int, + 1); + + CPPUNIT_ASSERT(123 == mvo.visitable(1)); + mvo.verify(); + } + + #endif // HAVE_CPPUNIT |
|
From: Ewald A. <ewa...@us...> - 2005-02-27 18:04:38
|
Update of /cvsroot/mockpp/mockpp/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4304/mockpp Modified Files: VisitableMockObject.h VisitableMockObject_macro.h VisitableMockObject_template.h Log Message: VisitableMockObjects also take constraints as controlling elements Index: VisitableMockObject_template.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/VisitableMockObject_template.h,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** VisitableMockObject_template.h 27 Feb 2005 11:48:15 -0000 1.22 --- VisitableMockObject_template.h 27 Feb 2005 18:04:29 -0000 1.23 *************** *** 32,35 **** --- 32,37 ---- #define MOCKPP_VISITABLEMOCKOBJECT_TEMPLATE_H + #include <mockpp/constraint/ConstraintHolder.h> + #include <mockpp/constraint/IsEqual.h> namespace mockpp { *************** *** 66,70 **** std::vector<unsigned>::const_iterator end = counter.end(); [...973 lines suppressed...] *** 997,1005 **** for (unsigned i = 0; i < this->t1vec.size(); ++i) if ( this->counter[i] > 0 ! && t1 == this->t1vec[i] ! && t2 == this->t2vec[i] ! && t3 == this->t3vec[i] ! && t4 == this->t4vec[i] ! && t5 == this->t5vec[i]) { if (this->tvec.at(i) != 0) --- 1352,1360 ---- for (unsigned i = 0; i < this->t1vec.size(); ++i) if ( this->counter[i] > 0 ! && this->t1vec[i]->eval(t1) ! && this->t2vec[i]->eval(t2) ! && this->t3vec[i]->eval(t3) ! && this->t4vec[i]->eval(t4) ! && this->t5vec[i]->eval(t5)) { if (this->tvec.at(i) != 0) Index: VisitableMockObject.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/VisitableMockObject.h,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** VisitableMockObject.h 27 Feb 2005 11:48:14 -0000 1.34 --- VisitableMockObject.h 27 Feb 2005 18:04:28 -0000 1.35 *************** *** 346,350 **** const your_type4 &p4, const your_type5 &p5, unsigned count = std::numeric_limits < unsigned >::max ()); ! #endif // DOXYGEN_SHOULD_SKIP_THIS --- 346,350 ---- const your_type4 &p4, const your_type5 &p5, unsigned count = std::numeric_limits < unsigned >::max ()); ! // @todo update doc #endif // DOXYGEN_SHOULD_SKIP_THIS Index: VisitableMockObject_macro.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/VisitableMockObject_macro.h,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** VisitableMockObject_macro.h 27 Feb 2005 11:48:14 -0000 1.25 --- VisitableMockObject_macro.h 27 Feb 2005 18:04:28 -0000 1.26 *************** *** 285,288 **** --- 285,294 ---- MOCKPP_ASSERT_FALSE(objptr->isActivated()); \ objptr->methname ## ResponseValues.add(rv, (type1&)p1, count); \ + } \ + \ + void addResponseValue(const ret_type &rv, const mockpp::ConstraintHolder<type1> &p1, unsigned count = MOCKPP_UNLIMITED) \ + { \ + MOCKPP_ASSERT_FALSE(objptr->isActivated()); \ + objptr->methname ## ResponseValues.add(rv, p1, count); \ } *************** *** 292,295 **** --- 298,308 ---- MOCKPP_ASSERT_FALSE(objptr->isActivated()); \ objptr->methname ## ResponseValues.add(rv, (type1&)p1, (type2&)p2, count); \ + } \ + \ + void addResponseValue(const ret_type &rv, const mockpp::ConstraintHolder<type1> &p1, \ + const mockpp::ConstraintHolder<type2> &p2, unsigned count = MOCKPP_UNLIMITED) \ + { \ + MOCKPP_ASSERT_FALSE(objptr->isActivated()); \ + objptr->methname ## ResponseValues.add(rv, p1, p2, count); \ } *************** *** 299,302 **** --- 312,323 ---- MOCKPP_ASSERT_FALSE(objptr->isActivated()); \ objptr->methname ## ResponseValues.add(rv, (type1&)p1, (type2&)p2, (type3&)p3, count); \ + } \ + \ + void addResponseValue(const ret_type &rv, const mockpp::ConstraintHolder<type1> &p1, \ + const mockpp::ConstraintHolder<type2> &p2, \ + const mockpp::ConstraintHolder<type3> &p3, unsigned count = MOCKPP_UNLIMITED) \ + { \ + MOCKPP_ASSERT_FALSE(objptr->isActivated()); \ + objptr->methname ## ResponseValues.add(rv, p1, p2, p3, count); \ } *************** *** 306,309 **** --- 327,339 ---- MOCKPP_ASSERT_FALSE(objptr->isActivated()); \ objptr->methname ## ResponseValues.add(rv, (type1 &)p1, (type2 &)p2, (type3 &)p3, (type4 &)p4, count); \ + } \ + \ + void addResponseValue(const ret_type &rv, const mockpp::ConstraintHolder<type1> &p1, \ + const mockpp::ConstraintHolder<type2> &p2, \ + const mockpp::ConstraintHolder<type3> &p3, \ + const mockpp::ConstraintHolder<type4> &p4, unsigned count = MOCKPP_UNLIMITED) \ + { \ + MOCKPP_ASSERT_FALSE(objptr->isActivated()); \ + objptr->methname ## ResponseValues.add(rv, p1, p2, p3, p4, count); \ } *************** *** 313,316 **** --- 343,356 ---- MOCKPP_ASSERT_FALSE(objptr->isActivated()); \ objptr->methname ## ResponseValues.add(rv, (type1)p1, (type2)p2, (type3)p3, (type4)p4, (type5)p5, count); \ + } \ + \ + void addResponseValue(const ret_type &rv, const mockpp::ConstraintHolder<type1> &p1, \ + const mockpp::ConstraintHolder<type2> &p2, \ + const mockpp::ConstraintHolder<type3> &p3, \ + const mockpp::ConstraintHolder<type4> &p4, \ + const mockpp::ConstraintHolder<type5> &p5, unsigned count = MOCKPP_UNLIMITED) \ + { \ + MOCKPP_ASSERT_FALSE(objptr->isActivated()); \ + objptr->methname ## ResponseValues.add(rv, p1, p2, p3, p4, p5, count); \ } *************** *** 324,327 **** --- 364,373 ---- MOCKPP_ASSERT_FALSE(objptr->isActivated()); \ objptr->methname ## ResponseValues.add(t, (type1&)p1, count); \ + } \ + \ + void addResponseThrowable(mockpp::Throwable *t, const mockpp::ConstraintHolder<type1> &p1, unsigned count = MOCKPP_UNLIMITED) \ + { \ + MOCKPP_ASSERT_FALSE(objptr->isActivated()); \ + objptr->methname ## ResponseValues.add(t, p1, count); \ } *************** *** 331,334 **** --- 377,387 ---- MOCKPP_ASSERT_FALSE(objptr->isActivated()); \ objptr->methname ## ResponseValues.add(t, (type1&)p1, (type2&)p2, count); \ + } \ + \ + void addResponseThrowable(mockpp::Throwable *t, const mockpp::ConstraintHolder<type1> &p1, \ + const mockpp::ConstraintHolder<type2> &p2, unsigned count = MOCKPP_UNLIMITED) \ + { \ + MOCKPP_ASSERT_FALSE(objptr->isActivated()); \ + objptr->methname ## ResponseValues.add(t, p1, p2, count); \ } *************** *** 338,341 **** --- 391,402 ---- MOCKPP_ASSERT_FALSE(objptr->isActivated()); \ objptr->methname ## ResponseValues.add(t, (type1 &)p1, (type2&)p2, (type3&)p3, count); \ + } \ + \ + void addResponseThrowable(mockpp::Throwable *t, const mockpp::ConstraintHolder<type1> &p1, \ + const mockpp::ConstraintHolder<type2> &p2, \ + const mockpp::ConstraintHolder<type3> &p3, unsigned count = MOCKPP_UNLIMITED) \ + { \ + MOCKPP_ASSERT_FALSE(objptr->isActivated()); \ + objptr->methname ## ResponseValues.add(t, p1, p2, p3, count); \ } *************** *** 345,348 **** --- 406,418 ---- MOCKPP_ASSERT_FALSE(objptr->isActivated()); \ objptr->methname ## ResponseValues.add(t, (type1 &)p1, (type2 &)p2, (type3 &)p3, (type4 &)p4, count); \ + } \ + \ + void addResponseThrowable(mockpp::Throwable *t, const mockpp::ConstraintHolder<type1> &p1, \ + const mockpp::ConstraintHolder<type2> &p2, \ + const mockpp::ConstraintHolder<type3> &p3, \ + const mockpp::ConstraintHolder<type4> &p4, unsigned count = MOCKPP_UNLIMITED) \ + { \ + MOCKPP_ASSERT_FALSE(objptr->isActivated()); \ + objptr->methname ## ResponseValues.add(t, p1, p2, p3, p4, count); \ } *************** *** 352,355 **** --- 422,435 ---- MOCKPP_ASSERT_FALSE(objptr->isActivated()); \ objptr->methname ## ResponseValues.add(t, (type1)p1, (type2)p2, (type3)p3, (type4)p4, (type5)p5, count); \ + } \ + \ + void addResponseThrowable(mockpp::Throwable *t, const mockpp::ConstraintHolder<type1> &p1, \ + const mockpp::ConstraintHolder<type2> &p2, \ + const mockpp::ConstraintHolder<type3> &p3, \ + const mockpp::ConstraintHolder<type4> &p4, \ + const mockpp::ConstraintHolder<type5> &p5, unsigned count = MOCKPP_UNLIMITED) \ + { \ + MOCKPP_ASSERT_FALSE(objptr->isActivated()); \ + objptr->methname ## ResponseValues.add(t, p1, p2, p3, p4, p5, count); \ } *************** *** 664,667 **** --- 744,748 ---- void m_name (const mockpp::ConstraintHolder<v_type1> ¶m1) \ { \ + addExpectedMethod(std::string(#m_name)); \ mockpp::Constraint<v_type1>::AP cons1 (param1); \ m_name ## Parameter1.addExpected(cons1.release()); \ *************** *** 717,720 **** --- 798,802 ---- const mockpp::ConstraintHolder<v_type2> ¶m2) \ { \ + addExpectedMethod(std::string(#m_name)); \ mockpp::Constraint<v_type1>::AP cons1 (param1); \ mockpp::Constraint<v_type2>::AP cons2 (param2); \ *************** *** 778,781 **** --- 860,864 ---- const mockpp::ConstraintHolder<v_type3> ¶m3) \ { \ + addExpectedMethod(std::string(#m_name)); \ mockpp::Constraint<v_type1>::AP cons1 (param1); \ mockpp::Constraint<v_type2>::AP cons2 (param2); \ *************** *** 821,825 **** else \ { \ ! addActualMethod(func_name); \ try { \ mockpp::Throwable *t; \ --- 904,908 ---- else \ { \ ! addActualMethod(func_name); \ try { \ mockpp::Throwable *t; \ *************** *** 847,850 **** --- 930,934 ---- const mockpp::ConstraintHolder<v_type4> ¶m4) \ { \ + addExpectedMethod(std::string(#m_name)); \ mockpp::Constraint<v_type1>::AP cons1 (param1); \ mockpp::Constraint<v_type2>::AP cons2 (param2); \ *************** *** 924,927 **** --- 1008,1012 ---- const mockpp::ConstraintHolder<v_type5> ¶m5) \ { \ + addExpectedMethod(std::string(#m_name)); \ mockpp::Constraint<v_type1>::AP cons1 (param1); \ mockpp::Constraint<v_type2>::AP cons2 (param2); \ *************** *** 1027,1030 **** --- 1112,1116 ---- m_ret_type m_name(const mockpp::ConstraintHolder<v_type1> ¶m1) \ { \ + addExpectedMethod(std::string(#m_name)); \ mockpp::Constraint<v_type1>::AP cons1 (param1); \ m_name ## Parameter1.addExpected(cons1.release()); \ *************** *** 1093,1096 **** --- 1179,1183 ---- const mockpp::ConstraintHolder<v_type2> ¶m2) \ { \ + addExpectedMethod(std::string(#m_name)); \ mockpp::Constraint<v_type1>::AP cons1 (param1); \ mockpp::Constraint<v_type2>::AP cons2 (param2); \ *************** *** 1167,1170 **** --- 1254,1258 ---- const mockpp::ConstraintHolder<v_type3> ¶m3) \ { \ + addExpectedMethod(std::string(#m_name)); \ mockpp::Constraint<v_type1>::AP cons1 (param1); \ mockpp::Constraint<v_type2>::AP cons2 (param2); \ *************** *** 1248,1251 **** --- 1336,1340 ---- const mockpp::ConstraintHolder<v_type4> ¶m4) \ { \ + addExpectedMethod(std::string(#m_name)); \ mockpp::Constraint<v_type1>::AP cons1 (param1); \ mockpp::Constraint<v_type2>::AP cons2 (param2); \ *************** *** 1337,1340 **** --- 1426,1430 ---- const mockpp::ConstraintHolder<v_type5> ¶m5) \ { \ + addExpectedMethod(std::string(#m_name)); \ mockpp::Constraint<v_type1>::AP cons1 (param1); \ mockpp::Constraint<v_type2>::AP cons2 (param2); \ |
|
From: Ewald A. <ewa...@us...> - 2005-02-27 18:04:38
|
Update of /cvsroot/mockpp/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4304 Modified Files: ChangeLog TODO Log Message: VisitableMockObjects also take constraints as controlling elements Index: TODO =================================================================== RCS file: /cvsroot/mockpp/mockpp/TODO,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** TODO 24 Oct 2004 19:41:40 -0000 1.36 --- TODO 27 Feb 2005 18:04:28 -0000 1.37 *************** *** 1,10 **** - unittest responsevector ! regex assertions DOC: ---- ! simple mockpattern Problem Exception-Transformation?? --- 1,9 ---- ! chainable macros überarbeiten: _/**/ DOC: ---- ! visitable + constraints ==> doc + tutorial Problem Exception-Transformation?? *************** *** 14,21 **** VC partial templates: http://www.developer.com/net/csharp/article.php/2217451 - - added set of macros for mocks with const method - - to aviod name collisons some macros have been renamed - (mainly substituted METHOD with VISITABLE somehow) - Controller addController aufl�en, verify direkt + Tests: { ctr } --- 13,16 ---- Index: ChangeLog =================================================================== RCS file: /cvsroot/mockpp/mockpp/ChangeLog,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** ChangeLog 27 Feb 2005 11:58:02 -0000 1.30 --- ChangeLog 27 Feb 2005 18:04:28 -0000 1.31 *************** *** 5,10 **** 2005-02-26 1.5.0: - added class ConstraintList ! - VisitableMockObjects optionally take Constraints as reference objects ! instead of actual values. 2005-02-25 1.4.0: - changed "verify() const" to "verify()" --- 5,10 ---- 2005-02-26 1.5.0: - added class ConstraintList ! - VisitableMockObjects and the according controller also take ! Constraints as objects instead of actual values. 2005-02-25 1.4.0: - changed "verify() const" to "verify()" |
|
From: Ewald A. <ewa...@us...> - 2005-02-27 11:58:18
|
Update of /cvsroot/mockpp/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27136 Modified Files: ChangeLog Log Message: update Index: ChangeLog =================================================================== RCS file: /cvsroot/mockpp/mockpp/ChangeLog,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** ChangeLog 27 Feb 2005 11:48:13 -0000 1.29 --- ChangeLog 27 Feb 2005 11:58:02 -0000 1.30 *************** *** 4,41 **** -------------- ! 2003-03-08 1.1.3: Final release ! ! 2003-03-09 1.1.4: Fixed installation issue ! ! 2003-03-10 1.1.5: Closed memory leak ! ! 2003-03-12 1.1.6: - ExpectationBoundary.setExpectedDelta() added ! - pass parameters by reference to Visitabable methods ! ! 2003-03-10 1.1.7: Extended documentation via doxygen ! ! 2003-04-06 1.1.8: - Port to OpenBsd 3.1 and g++ 2.95 ! - fix for MSVC ! - simplified MockObject verify() ! - removed useless multithread stuff ! ! 2003-04-06 1.1.9: fixed references to removed Mutex.h ! ! 2003-04-28 1.1.10: - port to msvc 6+7, HP-UX 11 ! 2003-10-11 1.1.11: - moved bcb5/msvc config files to sources ! - patch for msvc unicode problem ! 2003-12-11 1.1.13: - bug fixes: - string formatting ! - ReturnObjectList message ! 2004-02-15 1.1.14: - better detection of cppunit files ! 2004-07-26 1.1.15: - extended macros for better handling of mock method ! parameter types - 2004-08-03 1.1.16: - fixes and workarounds for MS VC - - patches for g++ 3.4 2004-12-11 1.2.0-b1: - new expectation type ExpectationConglomeration - added chaining invocation for certain classes --- 4,34 ---- -------------- ! 2005-02-26 1.5.0: - added class ConstraintList ! - VisitableMockObjects optionally take Constraints as reference objects ! instead of actual values. ! 2005-02-25 1.4.0: - changed "verify() const" to "verify()" ! - mock objects reset all their sub objects ! - all mock objects get their own reset() method ! - ReturnObjectList has a default return value ! 2005-02-19 1.3.0: - new TrackingCounter classes ! 2005-01-26 1.2.0: - closed 2 memory leaks ! - fixed VerifyingTestCase ! - added another example file ! - changes in macros: ! changing MOCKPP_STRING to MOCKPP_PCSTRING may become necessary ! - prepared CBuilderX project files ! 2005-01-08 1.2.0-b4: - modified and fixed setExpected()/setExpectNothing() + 2005-01-07 1.2.0-b3: - compatibility break: addThrowable()/addReturnValue place exceptions + "in line" with return values, exceptions are no more thrown at the beginning. + To switch back to old behaviour call unsetThrowablesInline() + before calling activate(). See documentation for details. + - check for cppunit/Message.h + - manually disable verify() in VerifyingTextCase 2004-12-11 1.2.0-b1: - new expectation type ExpectationConglomeration - added chaining invocation for certain classes *************** *** 49,74 **** (mainly substituted METHOD with VISITABLE) ! 2005-01-07 1.2.0-b3: - compatibility break: addThrowable()/addReturnValue place exceptions ! "in line" with return values, exceptions are no more thrown at the beginning. ! To switch back to old behaviour call unsetThrowablesInline() ! before calling activate(). See documentation for details. ! - check for cppunit/Message.h ! - manually disable verify() in VerifyingTextCase ! 2005-01-08 1.2.0-b4: - modified and fixed setExpected()/setExpectNothing() ! 2005-01-26 1.2.0: - closed 2 memory leaks ! - fixed VerifyingTestCase ! - added another example file ! - changes in macros: ! changing MOCKPP_STRING to MOCKPP_PCSTRING may become necessary ! - prepared CBuilderX project files ! 2005-02-19 1.3.0: - new TrackingCounter classes ! 2005-02-25 1.4.0: - changed "verify() const" to "verify()" ! - mock objects reset all their sub objects ! - all mock objects get their own reset() method ! - ReturnObjectList has a default return value - 2005-02-26 1.5.0: - added class ConstraintList --- 42,77 ---- (mainly substituted METHOD with VISITABLE) ! 2004-08-03 1.1.16: - fixes and workarounds for MS VC ! - patches for g++ 3.4 ! 2004-07-26 1.1.15: - extended macros for better handling of mock method ! parameter types ! 2004-02-15 1.1.14: - better detection of cppunit files ! 2003-12-11 1.1.13: - bug fixes: - string formatting ! - ReturnObjectList message ! 2003-10-11 1.1.11: - moved bcb5/msvc config files to sources ! - patch for msvc unicode problem ! ! 2003-04-28 1.1.10: - port to msvc 6+7, HP-UX 11 ! ! 2003-04-06 1.1.9: fixed references to removed Mutex.h ! ! 2003-04-06 1.1.8: - Port to OpenBsd 3.1 and g++ 2.95 ! - fix for MSVC ! - simplified MockObject verify() ! - removed useless multithread stuff ! ! 2003-03-10 1.1.7: Extended documentation via doxygen ! ! 2003-03-12 1.1.6: - ExpectationBoundary.setExpectedDelta() added ! - pass parameters by reference to Visitabable methods ! ! 2003-03-10 1.1.5: Closed memory leak ! ! 2003-03-09 1.1.4: Fixed installation issue ! ! 2003-03-08 1.1.3: Final release |
