[Mockpp-commits] mockpp/mockpp/tests AbstractDynamicChainingMock_test.cpp,1.29,1.30 AssertMo_test.cpp,1.22,1.23 mockpp_pti_test.cpp,1.5,1.6

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

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

Modified Files:
	AbstractDynamicChainingMock_test.cpp AssertMo_test.cpp 
	mockpp_pti_test.cpp 
Log Message:
only assertionFailed() will throw exceptions

Index: AssertMo_test.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/AssertMo_test.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- AssertMo_test.cpp	24 Mar 2005 21:43:07 -0000	1.22
+++ AssertMo_test.cpp	28 Aug 2005 20:40:24 -0000	1.23
@@ -317,7 +317,7 @@
 
     virtual void verify()
     {
-      throw mockpp::AssertionFailedError(__LINE__, __FILE__,
+      mockpp::assertionFailed(__LINE__, __FILE__,
                                           MOCKPP_PCHAR("verify with AssertionFailedError"));
     }
 };

Index: AbstractDynamicChainingMock_test.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/AbstractDynamicChainingMock_test.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- AbstractDynamicChainingMock_test.cpp	3 Apr 2005 21:49:58 -0000	1.29
+++ AbstractDynamicChainingMock_test.cpp	28 Aug 2005 20:40:24 -0000	1.30
@@ -138,7 +138,7 @@
       is_invoke = true;
 
       if (enable_except)
-         throw mockpp::AssertionFailedError(__LINE__, __FILE__, MOCKPP_PCHAR("invoke-fail"));
+         mockpp::assertionFailed(__LINE__, __FILE__, MOCKPP_PCHAR("invoke-fail"));
 
       return invocation_result;
     }
@@ -146,7 +146,7 @@
     virtual void verify()
     {
       if (enable_except)
-         throw mockpp::AssertionFailedError(__LINE__, __FILE__, MOCKPP_PCHAR("dummy-verify"));
+         mockpp::assertionFailed(__LINE__, __FILE__, MOCKPP_PCHAR("dummy-verify"));
     }
 
     virtual mockpp::String describeTo (mockpp::String &buffer) const
@@ -186,14 +186,14 @@
       is_invoke = true;
 
       if (enable_except)
-         throw mockpp::AssertionFailedError(__LINE__, __FILE__, MOCKPP_PCHAR("invoke-fail"));
+         mockpp::assertionFailed(__LINE__, __FILE__, MOCKPP_PCHAR("invoke-fail"));
 
     }
 
     virtual void verify()
     {
       if (enable_except)
-         throw mockpp::AssertionFailedError(__LINE__, __FILE__, MOCKPP_PCHAR("dummy-verify"));
+         mockpp::assertionFailed(__LINE__, __FILE__, MOCKPP_PCHAR("dummy-verify"));
     }
 
     virtual mockpp::String describeTo (mockpp::String &buffer) const

Index: mockpp_pti_test.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/mockpp_pti_test.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- mockpp_pti_test.cpp	24 Jul 2005 12:54:58 -0000	1.5
+++ mockpp_pti_test.cpp	28 Aug 2005 20:40:24 -0000	1.6
@@ -353,7 +353,7 @@
       invoked = true;
 
       if (enable_except)
-         throw mockpp::AssertionFailedError(__LINE__, __FILE__, MOCKPP_PCHAR("invoke-fail"));
+         mockpp::assertionFailed(__LINE__, __FILE__, MOCKPP_PCHAR("invoke-fail"));
     }
 
     virtual void verify()