[Mockpp-commits] mockpp/mockpp ChainableMockObject.cpp,1.16,1.17 VerifyingTestCase.cpp,1.23,1.24

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

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

Modified Files:
	ChainableMockObject.cpp VerifyingTestCase.cpp 
Log Message:
only assertionFailed() will throw exceptions

Index: VerifyingTestCase.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/VerifyingTestCase.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- VerifyingTestCase.cpp	24 Mar 2005 21:43:06 -0000	1.23
+++ VerifyingTestCase.cpp	28 Aug 2005 20:40:23 -0000	1.24
@@ -77,7 +77,7 @@
     String s = MOCKPP_PCHAR("VerifyingTestCase \"%1\" has no sub-objects to verify.\n")
                MOCKPP_PCHAR("Did you forget to register?");
     s << getVerifiableName();
-    throw AssertionFailedError (__LINE__, __FILE__, s);
+    assertionFailed (__LINE__, __FILE__, s);
   }
 
   MockObject::verify();

Index: ChainableMockObject.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/ChainableMockObject.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- ChainableMockObject.cpp	6 Mar 2005 21:45:51 -0000	1.16
+++ ChainableMockObject.cpp	28 Aug 2005 20:40:23 -0000	1.17
@@ -70,7 +70,7 @@
   }
 
   if (penders.length() != 0)
-    throw AssertionFailedError( __LINE__, __FILE__,
+    assertionFailed( __LINE__, __FILE__,
                                 MOCKPP_PCHAR("Chaining mock object \"") + getIdent()
                                 + MOCKPP_PCHAR( "\": there are unassigned idenfiers:\n  " )
                                 + penders);
@@ -91,7 +91,7 @@
 {
   MatchBuilderAdapterBase *tmb = lookupID(id);
   if ( tmb != 0 )
-    throw AssertionFailedError( __LINE__, __FILE__,
+    assertionFailed( __LINE__, __FILE__,
                                 MOCKPP_PCHAR( "duplicate invocation named \"" )
                                 + id
                                 + MOCKPP_PCHAR( "\"" ) );