[Mockpp-commits] mockpp/mockpp/stub StubSequence.h,1.23,1.24 TestFailureStub.h,1.20,1.21 TypelessStubSequence.h,1.5,1.6

[Ewald A. <ewa...@us...>]

Update of /cvsroot/mockpp/mockpp/mockpp/stub
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6376/mockpp/stub

Modified Files:
	StubSequence.h TestFailureStub.h TypelessStubSequence.h 
Log Message:
only assertionFailed() will throw exceptions

Index: TypelessStubSequence.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/stub/TypelessStubSequence.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- TypelessStubSequence.h	6 Jan 2005 13:09:23 -0000	1.5
+++ TypelessStubSequence.h	28 Aug 2005 20:40:24 -0000	1.6
@@ -81,7 +81,8 @@
             stubs.pop_front();
             return curr->typelessInvoke();
         }
-        throw  AssertionFailedError(__LINE__, __FILE__, MOCKPP_PCHAR("no more stubs available"));
+        assertionFailed(__LINE__, __FILE__, MOCKPP_PCHAR("no more stubs available"));
+        return R();
     }
 
   /** Appends the description of this object to the buffer.

Index: StubSequence.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/stub/StubSequence.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- StubSequence.h	6 Jan 2005 13:09:23 -0000	1.23
+++ StubSequence.h	28 Aug 2005 20:40:24 -0000	1.24
@@ -89,7 +89,8 @@
             stubs.pop_front();
             return curr->invoke(invocation);
         }
-        throw  AssertionFailedError(__LINE__, __FILE__, MOCKPP_PCHAR("no more stubs available"));
+        assertionFailed(__LINE__, __FILE__, MOCKPP_PCHAR("no more stubs available"));
+        return R();
     }
 
   /** Appends the description of this object to the buffer.

Index: TestFailureStub.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/stub/TestFailureStub.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- TestFailureStub.h	24 Mar 2005 20:51:30 -0000	1.20
+++ TestFailureStub.h	28 Aug 2005 20:40:24 -0000	1.21
@@ -67,7 +67,8 @@
     virtual R invoke( const I &invocation )
     {
         MOCKPP_UNUSED(invocation);
-        throw AssertionFailedError(__LINE__, __FILE__, errorMessage);
+        assertionFailed(__LINE__, __FILE__, errorMessage);
+        return R();
     }
 
   /** Appends the description of this object to the buffer.