[Mockpp-commits] mockpp/mockpp ExpectationBoundary.h,1.17,1.18 ExpectationConglomeration.h,1.16,1.17
Brought to you by:
ewald-arnold
Menu
▾
▴
[Mockpp-commits] mockpp/mockpp ExpectationBoundary.h,1.17,1.18 ExpectationConglomeration.h,1.16,1.17 ExpectationSegment.h,1.24,1.25 ExpectationSet.h,1.30,1.31 VerifyingTestCaller.h,1.7,1.8
|
From: Ewald A. <ewa...@us...> - 2005-03-11 00:25:40
|
Update of /cvsroot/mockpp/mockpp/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22866/mockpp Modified Files: ExpectationBoundary.h ExpectationConglomeration.h ExpectationSegment.h ExpectationSet.h VerifyingTestCaller.h Log Message: scope fixes for gcc-3.4.3 Index: ExpectationConglomeration.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/ExpectationConglomeration.h,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- ExpectationConglomeration.h 27 Feb 2005 11:48:14 -0000 1.16 +++ ExpectationConglomeration.h 11 Mar 2005 00:24:54 -0000 1.17 @@ -74,7 +74,7 @@ actualItems.insert(actualItem); haveActualValue = true; - if (shouldCheckImmediately()) + if (this->shouldCheckImmediately()) checkImmediateValue(actualItem); } @@ -99,7 +99,7 @@ { expectedSingleItems.push_back(expectedItem); expectNothing = false; - setHasExpectations(); + this->setHasExpectations(); return *this; } @@ -113,7 +113,7 @@ { expectedBoundaryItems.push_back(Boundary (lower, upper)); expectNothing = false; - setHasExpectations(); + this->setHasExpectations(); return *this; } @@ -178,15 +178,15 @@ } else { - if (!hasExpectations() ) + if (!this->hasExpectations() ) return; String fmt = i18n(MOCKPP_PCHAR("%1 expected a value.")); - fmt << getVerifiableName(); + fmt << this->getVerifiableName(); MOCKPP_ASSERT_TRUE_MESSAGE(fmt, haveActualValue ); fmt = i18n(MOCKPP_PCHAR("%1 did not receive the expected item set.")); - fmt << getVerifiableName(); + fmt << this->getVerifiableName(); typename std::set<T>::const_iterator it; for (it = actualItems.begin(); it != actualItems.end(); ++it) MOCKPP_ASSERT_TRUE_MESSAGE(fmt, contains(*it)); @@ -205,7 +205,7 @@ { expectNothing = true; clearExpectation(); - setHasExpectations(); + this->setHasExpectations(); } Index: VerifyingTestCaller.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/VerifyingTestCaller.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- VerifyingTestCaller.h 30 Jan 2005 18:02:29 -0000 1.7 +++ VerifyingTestCaller.h 11 Mar 2005 00:24:54 -0000 1.8 @@ -112,7 +112,7 @@ */ std::string toString() const { - return "VerifyingTestCaller " + getName(); + return "VerifyingTestCaller " + this->getName(); } private: Index: ExpectationSet.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/ExpectationSet.h,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- ExpectationSet.h 27 Feb 2005 11:48:14 -0000 1.30 +++ ExpectationSet.h 11 Mar 2005 00:24:54 -0000 1.31 @@ -72,7 +72,7 @@ actualItems.insert(actualItem); haveActualValue = true; - if (shouldCheckImmediately()) + if (this->shouldCheckImmediately()) checkImmediateValue(actualItem); } @@ -97,7 +97,7 @@ { expectNothing = false; expectedItems.insert(expectedItem); - setHasExpectations(); + this->setHasExpectations(); return *this; } @@ -132,7 +132,7 @@ } else { - if (!hasExpectations() ) + if (!this->hasExpectations() ) return; String fmt = i18n(MOCKPP_PCHAR("%1 expected a value.")); @@ -164,7 +164,7 @@ { expectNothing = true; clearExpectation(); - setHasExpectations(); + this->setHasExpectations(); } Index: ExpectationSegment.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/ExpectationSegment.h,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- ExpectationSegment.h 27 Feb 2005 11:48:14 -0000 1.24 +++ ExpectationSegment.h 11 Mar 2005 00:24:54 -0000 1.25 @@ -94,7 +94,7 @@ { haveActualValue = true; myActualString = aString; - if (shouldCheckImmediately()) + if (this->shouldCheckImmediately()) { verify(); } @@ -108,7 +108,7 @@ { myExpectedSegment = segment; expectNothing = false; - setHasExpectations(); + this->setHasExpectations(); } @@ -121,7 +121,7 @@ void setExpectNothing() { expectNothing = true; - setHasExpectations(); + this->setHasExpectations(); } @@ -133,17 +133,17 @@ if( expectNothing ) { String fmt = i18n(MOCKPP_PCHAR("%1 expected no value.")); - fmt << getVerifiableName(); + fmt << this->getVerifiableName(); MOCKPP_ASSERT_FALSE_MESSAGE(fmt, haveActualValue ); } else { - if (!hasExpectations() ) + if (!this->hasExpectations() ) return; String fmt = i18n(MOCKPP_PCHAR("%1 expected a value.")); - fmt << getVerifiableName(); + fmt << this->getVerifiableName(); MOCKPP_ASSERT_TRUE_MESSAGE(fmt, haveActualValue ); MOCKPP_ASSERT_INCLUDES_MESSAGE( Index: ExpectationBoundary.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/ExpectationBoundary.h,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- ExpectationBoundary.h 27 Feb 2005 11:48:14 -0000 1.17 +++ ExpectationBoundary.h 11 Mar 2005 00:24:53 -0000 1.18 @@ -77,7 +77,7 @@ { actualValue = value; haveActualValue = true; - if (shouldCheckImmediately()) + if (this->shouldCheckImmediately()) { verify(); } @@ -94,7 +94,7 @@ lower_bound = lower; upper_bound = upper; expectNothing = false; - setHasExpectations(); + this->setHasExpectations(); } @@ -168,7 +168,7 @@ { expectNothing = true; clearActual(); - setHasExpectations(); + this->setHasExpectations(); } @@ -180,25 +180,25 @@ if( expectNothing ) { String fmt = i18n(MOCKPP_PCHAR("%1 expected no value.")); - fmt << getVerifiableName(); + fmt << this->getVerifiableName(); MOCKPP_ASSERT_FALSE_MESSAGE(fmt, haveActualValue ); } else { - if (!hasExpectations() ) + if (!this->hasExpectations() ) return; String fmt = i18n(MOCKPP_PCHAR("%1 expected a value.")); - fmt << getVerifiableName(); + 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 << getVerifiableName() << actualValue << lower_bound; + 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 << getVerifiableName() << actualValue << upper_bound; + fmt << this->getVerifiableName() << actualValue << upper_bound; MOCKPP_ASSERT_TRUE_MESSAGE(fmt, actualValue <= upper_bound); } } @@ -212,9 +212,6 @@ { this->clearHasExpectations(); } - - - }; |
