Update of /cvsroot/mockpp/mockpp/mockpp/matcher
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6376/mockpp/matcher
Modified Files:
InvokedAfterMatcher.h InvokedBeforeMatcher.h
TestFailureMatcher.cpp
Log Message:
only assertionFailed() will throw exceptions
Index: InvokedAfterMatcher.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/matcher/InvokedAfterMatcher.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- InvokedAfterMatcher.h 24 Mar 2005 20:51:30 -0000 1.20
+++ InvokedAfterMatcher.h 28 Aug 2005 20:40:23 -0000 1.21
@@ -79,7 +79,7 @@
virtual void incInvoked( const I &invocation )
{
if (!matches(invocation))
- throw AssertionFailedError(__LINE__, __FILE__,
+ assertionFailed(__LINE__, __FILE__,
MOCKPP_PCHAR("called out of order; should be called after ")
+ priorCallDescription);
}
Index: TestFailureMatcher.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/matcher/TestFailureMatcher.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- TestFailureMatcher.cpp 27 Feb 2005 11:48:16 -0000 1.3
+++ TestFailureMatcher.cpp 28 Aug 2005 20:40:23 -0000 1.4
@@ -60,7 +60,7 @@
void MOCKPP_EXPORT TestFailureMatcher::incInvoked( )
{
- throw AssertionFailedError(__LINE__, __FILE__, errorMessage);
+ assertionFailed(__LINE__, __FILE__, errorMessage);
}
Index: InvokedBeforeMatcher.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/matcher/InvokedBeforeMatcher.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- InvokedBeforeMatcher.h 24 Mar 2005 20:51:30 -0000 1.10
+++ InvokedBeforeMatcher.h 28 Aug 2005 20:40:23 -0000 1.11
@@ -74,7 +74,7 @@
virtual void incInvoked( const I &invocation )
{
if (!matches(invocation))
- throw AssertionFailedError(__LINE__, __FILE__,
+ assertionFailed(__LINE__, __FILE__,
MOCKPP_PCHAR("called out of order; should be called before ")
+ subsequentCallDescription);
}
|
