Update of /cvsroot/mockpp/mockpp/mockpp/chaining
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27653/mockpp/chaining
Modified Files:
AbstractDynamicChainingMock.h AbstractInvocationDispatcher.h
ChainableMockMethod0.h ChainableMockMethod1.h
ChainableMockMethod2.h ChainableMockMethod3.h
ChainableMockMethod4.h ChainableMockMethod5.h
ChainableMockMethod6.h ChainingMockBuilder.h
CountedChainableMethod.h InvocationDispatcher.h InvocationN.h
Log Message:
cleanup: migrate clear() to reset()
Index: ChainingMockBuilder.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/ChainingMockBuilder.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- ChainingMockBuilder.h 28 Aug 2005 20:40:23 -0000 1.24
+++ ChainingMockBuilder.h 13 Nov 2005 11:53:18 -0000 1.25
@@ -139,7 +139,7 @@
*/
void reset()
{
- buildernamespace->clear();
+ buildernamespace->reset();
coreMock->reset();
}
Index: InvocationDispatcher.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/InvocationDispatcher.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- InvocationDispatcher.h 30 Dec 2004 20:54:04 -0000 1.9
+++ InvocationDispatcher.h 13 Nov 2005 11:53:18 -0000 1.10
@@ -86,7 +86,7 @@
/** Frees all internal data.
* @internal
*/
- virtual void clear() = 0;
+ virtual void reset() = 0;
};
Index: AbstractInvocationDispatcher.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/AbstractInvocationDispatcher.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- AbstractInvocationDispatcher.h 8 Apr 2005 21:43:51 -0000 1.15
+++ AbstractInvocationDispatcher.h 13 Nov 2005 11:53:18 -0000 1.16
@@ -106,16 +106,9 @@
invokables[ i ] ->verify();
}
- /** Removes all the objects from the list.
- */
- virtual void reset()
- {
- clear();
- }
-
/** Clears all internal states
*/
- virtual void clear()
+ virtual void reset()
{
for ( unsigned i = 0; i < invokables.size(); ++i )
delete invokables[ i ];
Index: CountedChainableMethod.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/CountedChainableMethod.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CountedChainableMethod.h 31 Oct 2005 20:50:37 -0000 1.3
+++ CountedChainableMethod.h 13 Nov 2005 11:53:18 -0000 1.4
@@ -47,6 +47,7 @@
#ifndef MOCKPP_COUNTED_WEAKNESS
+
/** Helper class to select the method mock with the correct number of parameters.
* Works with meta programming.
* @internal
Index: AbstractDynamicChainingMock.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/AbstractDynamicChainingMock.h,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- AbstractDynamicChainingMock.h 28 Aug 2005 20:40:23 -0000 1.34
+++ AbstractDynamicChainingMock.h 13 Nov 2005 11:53:18 -0000 1.35
@@ -184,7 +184,7 @@
*/
virtual void reset()
{
- invocationDispatcher->clear();
+ invocationDispatcher->reset();
forgetFailure();
}
|
