[Mockpp-commits] mockpp/mockpp AbstractExpectation.h,1.23,1.24 ExpectationBoundary.h,1.18,1.19 Expec
Brought to you by:
ewald-arnold
Menu
▾
▴
[Mockpp-commits] mockpp/mockpp AbstractExpectation.h,1.23,1.24 ExpectationBoundary.h,1.18,1.19 ExpectationConglomeration.h,1.17,1.18 ExpectationCounter.cpp,1.21,1.22 ExpectationList.h,1.37,1.38 ExpectationSegment.h,1.25,1.26 ExpectationSet.h,1.31,1.32 ExpectationValue.h,1.29,1.30 mockpp.h,1.55,1.56 ReturnObjectList.h,1.25,1.26 ThrowableList.cpp,1.20,1.21 TrackingCounter.cpp,1.8,1.9 VisitableMockObject_macro.h,1.28,1.29 VisitableMockObject_template.h,1.24,1.25
|
From: Ewald A. <ewa...@us...> - 2005-05-07 12:45:24
|
Update of /cvsroot/mockpp/mockpp/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7870/mockpp Modified Files: AbstractExpectation.h ExpectationBoundary.h ExpectationConglomeration.h ExpectationCounter.cpp ExpectationList.h ExpectationSegment.h ExpectationSet.h ExpectationValue.h mockpp.h ReturnObjectList.h ThrowableList.cpp TrackingCounter.cpp VisitableMockObject_macro.h VisitableMockObject_template.h Log Message: fix macro namespace Index: TrackingCounter.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/TrackingCounter.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- TrackingCounter.cpp 3 Mar 2005 15:49:01 -0000 1.8 +++ TrackingCounter.cpp 7 May 2005 12:45:10 -0000 1.9 @@ -129,18 +129,18 @@ if( isExpectNothing() ) { - String fmt = i18n(MOCKPP_PCHAR("%1 expected no value.")); + String fmt = mockpp_i18n(MOCKPP_PCHAR("%1 expected no value.")); fmt << this->getVerifiableName(); MOCKPP_ASSERT_TRUE_MESSAGE(fmt, myActualValue == 0 ); } else { - String fmt = i18n(MOCKPP_PCHAR("%1 was tagged %2 times which is less than the expected count of %3.")); + String fmt = mockpp_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 = mockpp_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); } @@ -194,7 +194,7 @@ myActualValue++; if (shouldCheckImmediately()) { - String fmt = i18n(MOCKPP_PCHAR("%1 was tagged %2 times but should not be called more than %3 times.")); + String fmt = mockpp_i18n(MOCKPP_PCHAR("%1 was tagged %2 times but should not be called more than %3 times.")); fmt << getVerifiableName() << myActualValue << getExpectedMaxValue(); MOCKPP_ASSERT_TRUE_MESSAGE(fmt, myActualValue <= getExpectedMaxValue()); @@ -261,18 +261,18 @@ if( isExpectNothing() ) { - String fmt = i18n(MOCKPP_PCHAR("%1 expected no value.")); + String fmt = mockpp_i18n(MOCKPP_PCHAR("%1 expected no value.")); fmt << this->getVerifiableName(); MOCKPP_ASSERT_TRUE_MESSAGE(fmt, myActualValue == 0 ); } else { - String fmt = i18n(MOCKPP_PCHAR("%1 was last tagged with %2 which is less than the expected count of %3.")); + String fmt = mockpp_i18n(MOCKPP_PCHAR("%1 was last tagged with %2 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 last tagged with %2 which is more than the expected count of %3.")); + fmt = mockpp_i18n(MOCKPP_PCHAR("%1 was last tagged with %2 which is more than the expected count of %3.")); fmt << getVerifiableName() << myActualValue << getExpectedMaxValue(); MOCKPP_ASSERT_TRUE_MESSAGE(fmt, getExpectedMaxValue() >= myActualValue); } @@ -285,7 +285,7 @@ countervalues.push_back(myActualValue); if (shouldCheckImmediately()) { - String fmt = i18n(MOCKPP_PCHAR("%1 was tagged with %2 but should not be tagged more than %3 times.")); + String fmt = mockpp_i18n(MOCKPP_PCHAR("%1 was tagged with %2 but should not be tagged more than %3 times.")); fmt << getVerifiableName() << myActualValue << getExpectedMaxValue(); MOCKPP_ASSERT_TRUE_MESSAGE(fmt, myActualValue <= getExpectedMaxValue()); Index: VisitableMockObject_macro.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/VisitableMockObject_macro.h,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- VisitableMockObject_macro.h 9 Apr 2005 16:43:55 -0000 1.28 +++ VisitableMockObject_macro.h 7 May 2005 12:45:11 -0000 1.29 @@ -223,7 +223,7 @@ { \ if (objptr->methname ## haveDefaultReturnValue) \ { \ - mockpp::String fmt = i18n(MOCKPP_PCHAR("%1 is unused.")); \ + mockpp::String fmt = mockpp_i18n(MOCKPP_PCHAR("%1 is unused.")); \ fmt << MOCKPP_PCHAR(#methname) MOCKPP_PCHAR("DefaultReturnValueUsed"); \ MOCKPP_ASSERT_TRUE_MESSAGE(fmt, objptr->methname ## DefaultReturnValueUsed); \ } \ @@ -231,7 +231,7 @@ mockpp::Throwable *dt = objptr->methname ## DefaultThrowable.get(); \ if (dt != 0) \ { \ - mockpp::String fmt = i18n(MOCKPP_PCHAR("%1 is unused.")); \ + mockpp::String fmt = mockpp_i18n(MOCKPP_PCHAR("%1 is unused.")); \ fmt << MOCKPP_PCHAR(#methname) MOCKPP_PCHAR("DefaultThrowable"); \ MOCKPP_ASSERT_TRUE_MESSAGE(fmt, dt->hasThrown()); \ } \ @@ -247,7 +247,7 @@ mockpp::Throwable *dt = objptr->methname ## DefaultThrowable.get(); \ if (dt != 0) \ { \ - mockpp::String fmt = i18n(MOCKPP_PCHAR("%1 is unused.")); \ + mockpp::String fmt = mockpp_i18n(MOCKPP_PCHAR("%1 is unused.")); \ fmt << MOCKPP_PCHAR(#methname) MOCKPP_PCHAR("DefaultThrowable"); \ MOCKPP_ASSERT_TRUE_MESSAGE(fmt, dt->hasThrown()); \ } \ Index: ThrowableList.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/ThrowableList.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- ThrowableList.cpp 21 Apr 2005 20:35:40 -0000 1.20 +++ ThrowableList.cpp 7 May 2005 12:45:10 -0000 1.21 @@ -87,7 +87,7 @@ Throwable *MOCKPP_EXPORT ThrowableList::nextThrowableObject() { - String fmt = i18n(MOCKPP_PCHAR("%1 has run out of objects.")); + String fmt = mockpp_i18n(MOCKPP_PCHAR("%1 has run out of objects.")); fmt << getVerifiableName(); MOCKPP_ASSERT_TRUE_MESSAGE(fmt, list.size() > 0); @@ -125,7 +125,7 @@ void MOCKPP_EXPORT ThrowableList::verify() { - String fmt = i18n(MOCKPP_PCHAR("%1 has %2 un-used objects.")); + String fmt = mockpp_i18n(MOCKPP_PCHAR("%1 has %2 un-used objects.")); fmt << getVerifiableName() << list.size(); MOCKPP_ASSERT_EQUALS_MESSAGE(fmt, (size_t)0, list.size()); Index: ExpectationList.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/ExpectationList.h,v retrieving revision 1.37 retrieving revision 1.38 diff -u -d -r1.37 -r1.38 --- ExpectationList.h 6 Apr 2005 20:11:28 -0000 1.37 +++ ExpectationList.h 7 May 2005 12:45:10 -0000 1.38 @@ -79,7 +79,7 @@ { if( expectNothing) { - String fmt = i18n(MOCKPP_PCHAR("%1 expected no value.")); + String fmt = mockpp_i18n(MOCKPP_PCHAR("%1 expected no value.")); fmt << this->getVerifiableName(); MOCKPP_ASSERT_FALSE_MESSAGE(fmt, haveActualValue ); } @@ -88,12 +88,12 @@ if (!this->hasExpectations() ) return; - String fmt = i18n(MOCKPP_PCHAR("%1 expected a value.")); + String fmt = mockpp_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 item list.")); + fmt = mockpp_i18n(MOCKPP_PCHAR("%1 did not receive the expected item list.")); fmt << this->getVerifiableName(); MOCKPP_ASSERT_TRUE_MESSAGE(fmt, actualItems == expectedItems); @@ -234,13 +234,13 @@ void checkImmediateValue(const T &actualItem) const { unsigned size = actualItems.size(); - String fmt = i18n(MOCKPP_PCHAR("%1 had different item sizes.\n") + String fmt = mockpp_i18n(MOCKPP_PCHAR("%1 had different item sizes.\n") MOCKPP_PCHAR("Expected %2 items but received %3 when adding %4.")); fmt << this->getVerifiableName() << expectedItems.size() << size << actualItem; MOCKPP_ASSERT_TRUE_MESSAGE(fmt, expectedItems.size() >= size); - fmt = i18n(MOCKPP_PCHAR("%1 added item[%2] does not match. %3 != %4.")); + fmt = mockpp_i18n(MOCKPP_PCHAR("%1 added item[%2] does not match. %3 != %4.")); fmt << this->getVerifiableName() << size << expectedItems[(size - 1)] << actualItem; assertEquals(fmt, actualItem, expectedItems[(size - 1)]); Index: ExpectationSegment.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/ExpectationSegment.h,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- ExpectationSegment.h 11 Mar 2005 00:24:54 -0000 1.25 +++ ExpectationSegment.h 7 May 2005 12:45:10 -0000 1.26 @@ -132,7 +132,7 @@ { if( expectNothing ) { - String fmt = i18n(MOCKPP_PCHAR("%1 expected no value.")); + String fmt = mockpp_i18n(MOCKPP_PCHAR("%1 expected no value.")); fmt << this->getVerifiableName(); MOCKPP_ASSERT_FALSE_MESSAGE(fmt, haveActualValue ); @@ -142,12 +142,12 @@ if (!this->hasExpectations() ) return; - String fmt = i18n(MOCKPP_PCHAR("%1 expected a value.")); + String fmt = mockpp_i18n(MOCKPP_PCHAR("%1 expected a value.")); fmt << this->getVerifiableName(); MOCKPP_ASSERT_TRUE_MESSAGE(fmt, haveActualValue ); MOCKPP_ASSERT_INCLUDES_MESSAGE( - i18n(MOCKPP_PCHAR("Should include string segment.")), + mockpp_i18n(MOCKPP_PCHAR("Should include string segment.")), myExpectedSegment, myActualString); } Index: ExpectationSet.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/ExpectationSet.h,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- ExpectationSet.h 11 Mar 2005 00:24:54 -0000 1.31 +++ ExpectationSet.h 7 May 2005 12:45:10 -0000 1.32 @@ -126,7 +126,7 @@ { if( expectNothing) { - String fmt = i18n(MOCKPP_PCHAR("%1 expected no value.")); + String fmt = mockpp_i18n(MOCKPP_PCHAR("%1 expected no value.")); fmt << getVerifiableName(); MOCKPP_ASSERT_FALSE_MESSAGE(fmt, haveActualValue ); } @@ -135,17 +135,17 @@ if (!this->hasExpectations() ) return; - String fmt = i18n(MOCKPP_PCHAR("%1 expected a value.")); + String fmt = mockpp_i18n(MOCKPP_PCHAR("%1 expected a value.")); fmt << getVerifiableName(); MOCKPP_ASSERT_TRUE_MESSAGE(fmt, haveActualValue ); - fmt = i18n(MOCKPP_PCHAR("%1 did not receive the expected number of collection items.")); + fmt = mockpp_i18n(MOCKPP_PCHAR("%1 did not receive the expected number of collection items.")); fmt << getVerifiableName(); MOCKPP_ASSERT_TRUE_MESSAGE(fmt,actualItems.size() == expectedItems.size()); - fmt = i18n(MOCKPP_PCHAR("%1 did not receive the expected item set.")); + fmt = mockpp_i18n(MOCKPP_PCHAR("%1 did not receive the expected item set.")); fmt << getVerifiableName(); MOCKPP_ASSERT_TRUE_MESSAGE(fmt, actualItems == expectedItems); @@ -220,7 +220,7 @@ */ virtual void checkImmediateValue(const T &actualItem) const { - String fmt = i18n(MOCKPP_PCHAR("%1 did not receive an expected item.\nUnexpected: %2")); + String fmt = mockpp_i18n(MOCKPP_PCHAR("%1 did not receive an expected item.\nUnexpected: %2")); fmt << getVerifiableName() << actualItem; MOCKPP_ASSERT_TRUE_MESSAGE(fmt, Index: ExpectationBoundary.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/ExpectationBoundary.h,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- ExpectationBoundary.h 11 Mar 2005 00:24:53 -0000 1.18 +++ ExpectationBoundary.h 7 May 2005 12:45:10 -0000 1.19 @@ -179,7 +179,7 @@ { if( expectNothing ) { - String fmt = i18n(MOCKPP_PCHAR("%1 expected no value.")); + String fmt = mockpp_i18n(MOCKPP_PCHAR("%1 expected no value.")); fmt << this->getVerifiableName(); MOCKPP_ASSERT_FALSE_MESSAGE(fmt, haveActualValue ); @@ -189,15 +189,15 @@ if (!this->hasExpectations() ) return; - String fmt = i18n(MOCKPP_PCHAR("%1 expected a value.")); + String fmt = mockpp_i18n(MOCKPP_PCHAR("%1 expected a value.")); fmt << this->getVerifiableName(); MOCKPP_ASSERT_TRUE_MESSAGE(fmt, haveActualValue ); - fmt = i18n(MOCKPP_PCHAR("%1 received a value of %2 which is less than the expected value of %3.")); + fmt = mockpp_i18n(MOCKPP_PCHAR("%1 received a value of %2 which is less than the expected value of %3.")); fmt << this->getVerifiableName() << actualValue << lower_bound; MOCKPP_ASSERT_TRUE_MESSAGE(fmt, lower_bound <= actualValue ); - fmt = i18n(MOCKPP_PCHAR("%1 received a value of %2 which is greater than the expected value of %3.")); + fmt = mockpp_i18n(MOCKPP_PCHAR("%1 received a value of %2 which is greater than the expected value of %3.")); fmt << this->getVerifiableName() << actualValue << upper_bound; MOCKPP_ASSERT_TRUE_MESSAGE(fmt, actualValue <= upper_bound); } Index: mockpp.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/mockpp.h,v retrieving revision 1.55 retrieving revision 1.56 diff -u -d -r1.55 -r1.56 --- mockpp.h 30 Apr 2005 21:15:45 -0000 1.55 +++ mockpp.h 7 May 2005 12:45:10 -0000 1.56 @@ -321,13 +321,13 @@ #define MOCKPP_STRING(x) mockpp::String(x) //! Dummy, tags a string for translation without doing anything -#ifndef I18N_NOOP -#define I18N_NOOP(x) x +#ifndef MOCKPP_I18N_NOOP +#define MOCKPP_I18N_NOOP(x) x #endif //! Dummy, prepare automatic translation within the code -#ifndef i18n -#define i18n(x) x +#ifndef mockpp_i18n +#define mockpp_i18n(x) x #endif //! add template specialisation to prevent float/double ExpectationValue's Index: VisitableMockObject_template.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/VisitableMockObject_template.h,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- VisitableMockObject_template.h 2 Apr 2005 20:45:29 -0000 1.24 +++ VisitableMockObject_template.h 7 May 2005 12:45:11 -0000 1.25 @@ -70,7 +70,7 @@ if (*start != MOCKPP_UNLIMITED) // @todo ouput signatures of unused objects unused += *start; - String fmt = i18n(MOCKPP_PCHAR("%1 has a total of %2 un-used response objects.")); + String fmt = mockpp_i18n(MOCKPP_PCHAR("%1 has a total of %2 un-used response objects.")); fmt << getVerifiableName() << unused; MOCKPP_ASSERT_EQUALS_MESSAGE(fmt, (unsigned)0, unused); Index: ExpectationConglomeration.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/ExpectationConglomeration.h,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- ExpectationConglomeration.h 11 Mar 2005 00:24:54 -0000 1.17 +++ ExpectationConglomeration.h 7 May 2005 12:45:10 -0000 1.18 @@ -172,7 +172,7 @@ { if( expectNothing) { - String fmt = i18n(MOCKPP_PCHAR("%1 expected no value.")); + String fmt = mockpp_i18n(MOCKPP_PCHAR("%1 expected no value.")); fmt << getVerifiableName(); MOCKPP_ASSERT_FALSE_MESSAGE(fmt, haveActualValue ); } @@ -181,11 +181,11 @@ if (!this->hasExpectations() ) return; - String fmt = i18n(MOCKPP_PCHAR("%1 expected a value.")); + String fmt = mockpp_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 item set.")); + fmt = mockpp_i18n(MOCKPP_PCHAR("%1 did not receive the expected item set.")); fmt << this->getVerifiableName(); typename std::set<T>::const_iterator it; for (it = actualItems.begin(); it != actualItems.end(); ++it) @@ -251,7 +251,7 @@ */ virtual void checkImmediateValue(const T &actualItem) const { - String fmt = i18n(MOCKPP_PCHAR("%1 did not receive an expected item.\nUnexpected: %2")); + String fmt = mockpp_i18n(MOCKPP_PCHAR("%1 did not receive an expected item.\nUnexpected: %2")); fmt << getVerifiableName() << actualItem; MOCKPP_ASSERT_TRUE_MESSAGE(fmt, contains(actualItem)); Index: ExpectationValue.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/ExpectationValue.h,v retrieving revision 1.29 retrieving revision 1.30 diff -u -d -r1.29 -r1.30 --- ExpectationValue.h 27 Feb 2005 11:48:14 -0000 1.29 +++ ExpectationValue.h 7 May 2005 12:45:10 -0000 1.30 @@ -135,7 +135,7 @@ { if( expectNothing ) { - String fmt = i18n(MOCKPP_PCHAR("%1 expected no value.")); + String fmt = mockpp_i18n(MOCKPP_PCHAR("%1 expected no value.")); fmt << this->getVerifiableName(); MOCKPP_ASSERT_FALSE_MESSAGE(fmt, haveActualValue ); @@ -145,12 +145,12 @@ if (!this->hasExpectations() ) return; - String fmt = i18n(MOCKPP_PCHAR("%1 expected a value.")); + String fmt = mockpp_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 value. %2 != %3.")); + fmt = mockpp_i18n(MOCKPP_PCHAR("%1 did not receive the expected value. %2 != %3.")); fmt << this->getVerifiableName() << myExpectedValue << myActualValue; assertEquals(fmt, myExpectedValue, myActualValue); Index: ReturnObjectList.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/ReturnObjectList.h,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- ReturnObjectList.h 28 Mar 2005 09:39:05 -0000 1.25 +++ ReturnObjectList.h 7 May 2005 12:45:10 -0000 1.26 @@ -136,7 +136,7 @@ */ T nextReturnObject() { - String fmt = i18n(MOCKPP_PCHAR("%1 has run out of objects.")); + String fmt = mockpp_i18n(MOCKPP_PCHAR("%1 has run out of objects.")); fmt << getVerifiableName(); if (myObjects.size() == 0 && haveDefault) @@ -172,7 +172,7 @@ */ virtual void verify() { - String fmt = i18n(MOCKPP_PCHAR("%1 has %2 un-used objects.")); + String fmt = mockpp_i18n(MOCKPP_PCHAR("%1 has %2 un-used objects.")); fmt << getVerifiableName() << myObjects.size(); MOCKPP_ASSERT_EQUALS_MESSAGE(fmt, (size_t)0, myObjects.size()); Index: ExpectationCounter.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/ExpectationCounter.cpp,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- ExpectationCounter.cpp 27 Feb 2005 11:48:14 -0000 1.21 +++ ExpectationCounter.cpp 7 May 2005 12:45:10 -0000 1.22 @@ -83,7 +83,7 @@ myActualCalls++; if (shouldCheckImmediately()) { - String fmt = i18n(MOCKPP_PCHAR("%1 was called %2 times but should not be called more than %3 times.")); + String fmt = mockpp_i18n(MOCKPP_PCHAR("%1 was called %2 times but should not be called more than %3 times.")); fmt << getVerifiableName() << myActualCalls << myExpectedMaxCalls; MOCKPP_ASSERT_TRUE_MESSAGE(fmt, myActualCalls <= myExpectedMaxCalls); @@ -125,18 +125,18 @@ if( expectNothing ) { - String fmt = i18n(MOCKPP_PCHAR("%1 expected no value.")); + String fmt = mockpp_i18n(MOCKPP_PCHAR("%1 expected no value.")); fmt << this->getVerifiableName(); MOCKPP_ASSERT_TRUE_MESSAGE(fmt, myActualCalls == 0 ); } else { - String fmt = i18n(MOCKPP_PCHAR("%1 was called %2 times which is less than the expected count of %3.")); + String fmt = mockpp_i18n(MOCKPP_PCHAR("%1 was called %2 times which is less than the expected count of %3.")); fmt << getVerifiableName() << myActualCalls << myExpectedMinCalls; MOCKPP_ASSERT_TRUE_MESSAGE(fmt, myExpectedMinCalls <= myActualCalls); - fmt = i18n(MOCKPP_PCHAR("%1 was called %2 times which is more than the expected count of %3.")); + fmt = mockpp_i18n(MOCKPP_PCHAR("%1 was called %2 times which is more than the expected count of %3.")); fmt << getVerifiableName() << myActualCalls << myExpectedMaxCalls; MOCKPP_ASSERT_TRUE_MESSAGE(fmt, myExpectedMaxCalls >= myActualCalls); } Index: AbstractExpectation.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/AbstractExpectation.h,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- AbstractExpectation.h 27 Feb 2005 11:48:14 -0000 1.23 +++ AbstractExpectation.h 7 May 2005 12:45:10 -0000 1.24 @@ -124,7 +124,7 @@ if (message.length() == 0) { - String fmt = i18n(MOCKPP_PCHAR("%1 assertion failed.\nExpected: %2\nReceived: %3")); + String fmt = mockpp_i18n(MOCKPP_PCHAR("%1 assertion failed.\nExpected: %2\nReceived: %3")); fmt << getVerifiableName() << expectedValue << actualValue; MOCKPP_FAIL(fmt); } |
