[Mockpp-commits] mockpp/mockpp/tests AbstractInvocationDispatcher_test.cpp,1.20,1.21 ChainableMockOb
Brought to you by:
ewald-arnold
Menu
▾
▴
[Mockpp-commits] mockpp/mockpp/tests AbstractInvocationDispatcher_test.cpp,1.20,1.21 ChainableMockObject_test.cpp,1.22,1.23 ChainableMockObject_void_test.cpp,1.10,1.11 ConstraintList_test.cpp,1.2,1.3 ExpectationBoundary_test.cpp,1.12,1.13 ExpectationConglomeration_test.cpp,1.12,1.13 ExpectationCounterRange_test.cpp,1.12,1.13 ExpectationCounter_test.cpp,1.13,1.14 ExpectationList_test.cpp,1.16,1.17 ExpectationMap_test.cpp,1.15,1.16 ExpectationSegment_test.cpp,1.13,1.14 ExpectationSet_test.cpp,1.14,1.15 ExpectationValue_test.cpp,1.13,1.14 MyBuilderNamespace.h,1.13,1.14 ReturnObjectList_test.cpp,1.15,1.16 ThrowableList_test.cpp,1.13,1.14 Throwable_test.cpp,1.12,1.13 TrackingCounter_test.cpp,1.6,1.7
Update of /cvsroot/mockpp/mockpp/mockpp/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27653/mockpp/tests Modified Files: AbstractInvocationDispatcher_test.cpp ChainableMockObject_test.cpp ChainableMockObject_void_test.cpp ConstraintList_test.cpp ExpectationBoundary_test.cpp ExpectationConglomeration_test.cpp ExpectationCounterRange_test.cpp ExpectationCounter_test.cpp ExpectationList_test.cpp ExpectationMap_test.cpp ExpectationSegment_test.cpp ExpectationSet_test.cpp ExpectationValue_test.cpp MyBuilderNamespace.h ReturnObjectList_test.cpp ThrowableList_test.cpp Throwable_test.cpp TrackingCounter_test.cpp Log Message: cleanup: migrate clear() to reset() Index: ExpectationValue_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ExpectationValue_test.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- ExpectationValue_test.cpp 15 Oct 2005 15:40:58 -0000 1.13 +++ ExpectationValue_test.cpp 13 Nov 2005 11:53:18 -0000 1.14 @@ -116,7 +116,7 @@ { mockpp::ExpectationValue<int> ec (MOCKPP_PCHAR("nothingValue"), 0); ec.setExpected(3); - ec.clear(); + ec.reset(); MOCKPP_ASSERT_TRUE(false == ec.hasExpectations()); ec.verify(); // no fail because no expectations } Index: ExpectationList_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ExpectationList_test.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- ExpectationList_test.cpp 15 Oct 2005 15:40:58 -0000 1.16 +++ ExpectationList_test.cpp 13 Nov 2005 11:53:18 -0000 1.17 @@ -140,7 +140,7 @@ { mockpp::ExpectationList<int> ec (MOCKPP_PCHAR("nothingValue"), 0); ec.addExpected(1234); - ec.clear(); + ec.reset(); MOCKPP_ASSERT_TRUE(false == ec.hasExpectations()); ec.verify(); // no fail because no expectations } Index: ConstraintList_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ConstraintList_test.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- ConstraintList_test.cpp 15 Oct 2005 15:40:58 -0000 1.2 +++ ConstraintList_test.cpp 13 Nov 2005 11:53:18 -0000 1.3 @@ -121,7 +121,7 @@ ab.addActual(18); ab.verify(); - ab.clear(); + ab.reset(); ab.addActual(22); ab.addActual(18); ab.addExpected(22); @@ -157,7 +157,7 @@ { mockpp::ConstraintList<int> ec (MOCKPP_PCHAR("nothingValue"), 0); ec.addExpected(1234); - ec.clear(); + ec.reset(); MOCKPP_ASSERT_TRUE(false == ec.hasExpectations()); ec.verify(); // no fail because no expectations } Index: ExpectationConglomeration_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ExpectationConglomeration_test.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- ExpectationConglomeration_test.cpp 15 Oct 2005 15:40:58 -0000 1.12 +++ ExpectationConglomeration_test.cpp 13 Nov 2005 11:53:18 -0000 1.13 @@ -151,7 +151,7 @@ { mockpp::ExpectationConglomeration<int> ec (MOCKPP_PCHAR("nothingValue"), 0); ec.addExpected(1234); - ec.clear(); + ec.reset(); MOCKPP_ASSERT_TRUE(false == ec.hasExpectations()); ec.verify(); // no fail because no expectations } Index: ExpectationCounterRange_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ExpectationCounterRange_test.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- ExpectationCounterRange_test.cpp 15 Oct 2005 15:40:58 -0000 1.12 +++ ExpectationCounterRange_test.cpp 13 Nov 2005 11:53:18 -0000 1.13 @@ -125,7 +125,7 @@ ec.inc(); ec.inc(); // no fail even now ec.verify(); - ec.clear(); + ec.reset(); MOCKPP_ASSERT_TRUE(false == ec.hasExpectations()); } Index: MyBuilderNamespace.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/MyBuilderNamespace.h,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- MyBuilderNamespace.h 22 Mar 2005 22:03:26 -0000 1.13 +++ MyBuilderNamespace.h 13 Nov 2005 11:53:18 -0000 1.14 @@ -63,10 +63,10 @@ virtual ~MyBuilderNamespace() { - clear(); + reset(); } - virtual void clear() + virtual void reset() { while(idTable.size() != 0) { Index: ChainableMockObject_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_void_test.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- ChainableMockObject_void_test.cpp 15 Oct 2005 15:40:58 -0000 1.10 +++ ChainableMockObject_void_test.cpp 13 Nov 2005 11:53:18 -0000 1.11 @@ -139,7 +139,7 @@ MOCKPP_ASSERT_TRUE(ae.getMessage().find(MOCKPP_PCHAR( "duplicate invocation named" )) != mockpp::String::npos); } - cm.clear(); + cm.reset(); MOCKPP_ASSERT_TRUE(0 == cm.lookupID(MOCKPP_PCHAR("second-name"))); } Index: ExpectationMap_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ExpectationMap_test.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- ExpectationMap_test.cpp 15 Oct 2005 15:40:58 -0000 1.15 +++ ExpectationMap_test.cpp 13 Nov 2005 11:53:18 -0000 1.16 @@ -155,7 +155,7 @@ { mockpp::ExpectationMap<int, std::string> ec (MOCKPP_PCHAR("testMap"), 0); ec.addExpected(3, "three"); - ec.clear(); + ec.reset(); MOCKPP_ASSERT_TRUE(false == ec.hasExpectations()); } Index: TrackingCounter_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/TrackingCounter_test.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- TrackingCounter_test.cpp 15 Oct 2005 15:40:59 -0000 1.6 +++ TrackingCounter_test.cpp 13 Nov 2005 11:53:18 -0000 1.7 @@ -162,7 +162,7 @@ mockpp::TrackingCounterClient ec (MOCKPP_PCHAR("client"), master); ec.setExpected(3); MOCKPP_ASSERT_TRUE(ec.inc() == 1); - ec.clear(); + ec.reset(); ec.verify(); // no fail because no expectations } @@ -183,7 +183,7 @@ ec.inc(); ec.inc(); // no fail even now ec.verify(); - ec.clear(); + ec.reset(); MOCKPP_ASSERT_TRUE(false == ec.hasExpectations()); } Index: ChainableMockObject_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_test.cpp,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- ChainableMockObject_test.cpp 18 Oct 2005 20:03:54 -0000 1.22 +++ ChainableMockObject_test.cpp 13 Nov 2005 11:53:18 -0000 1.23 @@ -235,7 +235,7 @@ MOCKPP_ASSERT_TRUE(ae.getMessage().find(MOCKPP_PCHAR( "duplicate invocation named" )) != mockpp::String::npos); } - cm.clear(); + cm.reset(); MOCKPP_ASSERT_TRUE(0 == cm.lookupID(MOCKPP_PCHAR("second-name"))); cm.verify(); Index: AbstractInvocationDispatcher_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/AbstractInvocationDispatcher_test.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- AbstractInvocationDispatcher_test.cpp 15 Oct 2005 15:40:58 -0000 1.20 +++ AbstractInvocationDispatcher_test.cpp 13 Nov 2005 11:53:18 -0000 1.21 @@ -209,7 +209,7 @@ MOCKPP_ASSERT_TRUE( aid.describeTo(s) == MOCKPP_PCHAR( "??\n - t1\n - t2\n" )); MOCKPP_ASSERT_TRUE( s == MOCKPP_PCHAR( "??\n - t1\n - t2\n" )); - aid.clear(); + aid.reset(); s = MOCKPP_PCHAR(""); MOCKPP_ASSERT_TRUE( aid.describeTo(s) == MOCKPP_PCHAR( "no expectations set" )); } Index: ExpectationSet_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ExpectationSet_test.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- ExpectationSet_test.cpp 15 Oct 2005 15:40:58 -0000 1.14 +++ ExpectationSet_test.cpp 13 Nov 2005 11:53:18 -0000 1.15 @@ -142,7 +142,7 @@ ec.addExpected(3); ec.addExpected(6); ec.addActual(3); - ec.clear(); + ec.reset(); MOCKPP_ASSERT_TRUE(false == ec.hasExpectations()); ec.verify(); // no fail because no expectations } Index: ThrowableList_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ThrowableList_test.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- ThrowableList_test.cpp 15 Oct 2005 15:40:59 -0000 1.13 +++ ThrowableList_test.cpp 13 Nov 2005 11:53:18 -0000 1.14 @@ -179,7 +179,7 @@ MOCKPP_ASSERT_TRUE(tl.nextThrowableObject() == tt1); - tl.clear(); + tl.reset(); MOCKPP_ASSERT_TRUE(tl.hasMoreObjects() == false); tl.verify(); } Index: ExpectationBoundary_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ExpectationBoundary_test.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- ExpectationBoundary_test.cpp 15 Oct 2005 15:40:58 -0000 1.12 +++ ExpectationBoundary_test.cpp 13 Nov 2005 11:53:18 -0000 1.13 @@ -134,7 +134,7 @@ { mockpp::ExpectationBoundary<int> ec (MOCKPP_PCHAR("nothingValue"), 0); ec.setExpected(3, 5); - ec.clear(); + ec.reset(); MOCKPP_ASSERT_TRUE(false == ec.hasExpectations()); } Index: Throwable_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/Throwable_test.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- Throwable_test.cpp 15 Oct 2005 15:40:59 -0000 1.12 +++ Throwable_test.cpp 13 Nov 2005 11:53:18 -0000 1.13 @@ -139,7 +139,7 @@ it.take(std::string("my-item")); MOCKPP_ASSERT_TRUE(it.get() != 0); - it.clear(); + it.reset(); MOCKPP_ASSERT_TRUE(it.get() == 0); } Index: ExpectationSegment_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ExpectationSegment_test.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- ExpectationSegment_test.cpp 15 Oct 2005 15:40:58 -0000 1.13 +++ ExpectationSegment_test.cpp 13 Nov 2005 11:53:18 -0000 1.14 @@ -115,7 +115,7 @@ { mockpp::ExpectationSegment<mockpp::String> ec (MOCKPP_PCHAR("nothingValue"), 0); ec.setExpected(MOCKPP_PCHAR("1234")); - ec.clear(); + ec.reset(); MOCKPP_ASSERT_TRUE(false == ec.hasExpectations()); ec.verify(); // no fail because no expectations } Index: ReturnObjectList_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ReturnObjectList_test.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- ReturnObjectList_test.cpp 15 Oct 2005 15:40:59 -0000 1.15 +++ ReturnObjectList_test.cpp 13 Nov 2005 11:53:18 -0000 1.16 @@ -140,7 +140,7 @@ rol.verify(); rol.addObjectToReturn(456); - rol.clear(); + rol.reset(); MOCKPP_ASSERT_TRUE(!rol.hasMoreObjects()); } Index: ExpectationCounter_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ExpectationCounter_test.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- ExpectationCounter_test.cpp 15 Oct 2005 15:40:58 -0000 1.13 +++ ExpectationCounter_test.cpp 13 Nov 2005 11:53:18 -0000 1.14 @@ -120,7 +120,7 @@ mockpp::ExpectationCounter ec (MOCKPP_PCHAR("nothingValue"), 0); ec.setExpected(3); ec.inc(); - ec.clear(); + ec.reset(); ec.verify(); // no fail because no expectations } @@ -137,7 +137,7 @@ ec.inc(); ec.inc(); // no fail even now ec.verify(); - ec.clear(); + ec.reset(); MOCKPP_ASSERT_TRUE(false == ec.hasExpectations()); } |
