[Mockpp-commits] mockpp/mockpp/matcher AnyArgumentsMatcher.h,1.16,1.17 ArgumentsMatcher.h,1.20,1.21
Brought to you by:
ewald-arnold
Update of /cvsroot/mockpp/mockpp/mockpp/matcher In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv763/mockpp/matcher Modified Files: AnyArgumentsMatcher.h ArgumentsMatcher.h InvocationMatcher.h InvokeAtLeastMatcher.cpp InvokeAtLeastMatcher.h InvokeAtLeastOnceMatcher.cpp InvokeAtLeastOnceMatcher.h InvokeAtMostMatcher.cpp InvokeAtMostMatcher.h InvokeCountMatcher.cpp InvokeCountMatcher.h InvokeOnceMatcher.cpp InvokeOnceMatcher.h InvokedAfterMatcher.h InvokedBeforeMatcher.h InvokedRecorder.cpp InvokedRecorder.h MatcherHolder.h NoArgumentsMatcher.h StatelessInvocationMatcher.h TestFailureMatcher.cpp TestFailureMatcher.h TypelessMatcher.cpp TypelessMatcher.h UnlimitedMatcher.cpp UnlimitedMatcher.h Log Message: optionally disable mockpp namespace Index: InvokeOnceMatcher.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/matcher/InvokeOnceMatcher.h,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- InvokeOnceMatcher.h 29 Dec 2005 19:29:51 -0000 1.21 +++ InvokeOnceMatcher.h 15 Mar 2006 21:34:06 -0000 1.22 @@ -39,12 +39,12 @@ #include <mockpp/matcher/InvokedRecorder.h> -namespace mockpp { +MOCKPP_NS_START /** Has the method been invoked exactly once? * @ingroup grp_matcher - * @see mockpp::once + * @see MOCKPP_NS::once */ class InvokeOnceMatcher : public InvokedRecorder { @@ -73,7 +73,7 @@ }; -} // namespace mockpp +MOCKPP_NS_END #endif // MOCKPP_INVOKEONCEMATCHER_H Index: MatcherHolder.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/matcher/MatcherHolder.h,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- MatcherHolder.h 29 Dec 2005 19:29:51 -0000 1.10 +++ MatcherHolder.h 15 Mar 2006 21:34:06 -0000 1.11 @@ -39,7 +39,7 @@ #include <mockpp/matcher/TypelessMatcher.h> -namespace mockpp { +MOCKPP_NS_START /** Proxy class to conveniently move Matchers into matcher related methods. @@ -102,7 +102,7 @@ }; -} // namespace mockpp +MOCKPP_NS_END #endif // MOCKPP_MATCHERHOLDER_H Index: TypelessMatcher.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/matcher/TypelessMatcher.h,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- TypelessMatcher.h 29 Dec 2005 19:29:51 -0000 1.16 +++ TypelessMatcher.h 15 Mar 2006 21:34:06 -0000 1.17 @@ -42,7 +42,7 @@ #include <mockpp/matcher/InvocationMatcher.h> -namespace mockpp { +MOCKPP_NS_START /** Base for matchers regardless of method parameter values. @@ -150,7 +150,7 @@ }; -} // namespace mockpp +MOCKPP_NS_END #endif // MOCKPP_TYPELESSMATCHER_H Index: AnyArgumentsMatcher.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/matcher/AnyArgumentsMatcher.h,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- AnyArgumentsMatcher.h 29 Dec 2005 19:29:51 -0000 1.16 +++ AnyArgumentsMatcher.h 15 Mar 2006 21:34:06 -0000 1.17 @@ -39,11 +39,11 @@ #include <mockpp/matcher/StatelessInvocationMatcher.h> -namespace mockpp { +MOCKPP_NS_START /** Matches any arguments. * @ingroup grp_matcher - * @see mockpp::any + * @see MOCKPP_NS::any */ template <typename I> // Invocation class AnyArgumentsMatcher : public StatelessInvocationMatcher<I> @@ -72,7 +72,7 @@ }; -} // namespace mockpp +MOCKPP_NS_END #endif // MOCKPP_ANYARGUMENTSMATCHER_H Index: ArgumentsMatcher.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/matcher/ArgumentsMatcher.h,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- ArgumentsMatcher.h 29 Dec 2005 19:29:51 -0000 1.20 +++ ArgumentsMatcher.h 15 Mar 2006 21:34:06 -0000 1.21 @@ -42,7 +42,7 @@ #include <mockpp/matcher/StatelessInvocationMatcher.h> -namespace mockpp { +MOCKPP_NS_START /** Match the arguments passed to a mock method. @@ -90,7 +90,7 @@ }; -} // namespace mockpp +MOCKPP_NS_END #endif // MOCKPP_ARGUMENTSMATCHER_H Index: InvokedAfterMatcher.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/matcher/InvokedAfterMatcher.h,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- InvokedAfterMatcher.h 29 Dec 2005 19:29:51 -0000 1.22 +++ InvokedAfterMatcher.h 15 Mar 2006 21:34:06 -0000 1.23 @@ -40,12 +40,12 @@ #include <mockpp/matcher/InvokedRecorder.h> -namespace mockpp { +MOCKPP_NS_START /** Has the method been invoked after another? * @ingroup grp_matcher - * @see mockpp::MatchBuilder::after + * @see MOCKPP_NS::MatchBuilder::after */ template <typename I> // Invocation class InvokedAfterMatcher : public StatelessInvocationMatcher<I> @@ -107,7 +107,7 @@ }; -} // namespace mockpp +MOCKPP_NS_END #endif // MOCKPP_INVOKEDAFTERMATCHER_H Index: TypelessMatcher.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/matcher/TypelessMatcher.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- TypelessMatcher.cpp 29 Dec 2005 19:29:51 -0000 1.5 +++ TypelessMatcher.cpp 15 Mar 2006 21:34:06 -0000 1.6 @@ -32,7 +32,7 @@ #include <mockpp/matcher/TypelessMatcher.h> -namespace mockpp { +MOCKPP_NS_START MOCKPP_EXPORT TypelessMatcher::TypelessMatcher() @@ -51,5 +51,5 @@ } -} // namespace mockpp +MOCKPP_NS_END Index: InvokedRecorder.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/matcher/InvokedRecorder.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- InvokedRecorder.cpp 29 Dec 2005 19:29:51 -0000 1.5 +++ InvokedRecorder.cpp 15 Mar 2006 21:34:06 -0000 1.6 @@ -36,7 +36,7 @@ #include <mockpp/matcher/InvokedRecorder.h> -namespace mockpp { +MOCKPP_NS_START MOCKPP_EXPORT InvokedRecorder::InvokedRecorder() @@ -108,4 +108,4 @@ } -} // namespace mockpp +MOCKPP_NS_END Index: InvokeAtMostMatcher.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/matcher/InvokeAtMostMatcher.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- InvokeAtMostMatcher.cpp 29 Dec 2005 19:29:51 -0000 1.4 +++ InvokeAtMostMatcher.cpp 15 Mar 2006 21:34:06 -0000 1.5 @@ -33,7 +33,7 @@ #include <mockpp/matcher/InvokeAtMostMatcher.h> -namespace mockpp { +MOCKPP_NS_START MOCKPP_EXPORT InvokeAtMostMatcher::InvokeAtMostMatcher( int count ) @@ -79,6 +79,6 @@ } -} // namespace mockpp +MOCKPP_NS_END Index: UnlimitedMatcher.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/matcher/UnlimitedMatcher.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- UnlimitedMatcher.h 29 Dec 2005 19:29:51 -0000 1.3 +++ UnlimitedMatcher.h 15 Mar 2006 21:34:06 -0000 1.4 @@ -38,12 +38,12 @@ #include <mockpp/matcher/InvokedRecorder.h> -namespace mockpp { +MOCKPP_NS_START /** Matches any invcotion * @ingroup grp_matcher - * @see mockpp::unlimited + * @see MOCKPP_NS::unlimited */ class UnlimitedMatcher : public InvokedRecorder { @@ -71,7 +71,7 @@ }; -} // namespace mockpp +MOCKPP_NS_END #endif // MOCKPP_UnlimitedMATCHER_H Index: InvokeCountMatcher.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/matcher/InvokeCountMatcher.h,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- InvokeCountMatcher.h 29 Dec 2005 19:29:51 -0000 1.20 +++ InvokeCountMatcher.h 15 Mar 2006 21:34:06 -0000 1.21 @@ -39,12 +39,12 @@ #include <mockpp/matcher/InvokedRecorder.h> -namespace mockpp { +MOCKPP_NS_START /** Has the object been invoked a given number? * @ingroup grp_matcher - * @see mockpp::exactly + * @see MOCKPP_NS::exactly */ class InvokeCountMatcher : public InvokedRecorder { @@ -86,7 +86,7 @@ }; -} // namespace mockpp +MOCKPP_NS_END #endif // MOCKPP_INVOKECOUNTMATCHER_H Index: InvokeAtLeastMatcher.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/matcher/InvokeAtLeastMatcher.h,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- InvokeAtLeastMatcher.h 29 Dec 2005 19:29:51 -0000 1.13 +++ InvokeAtLeastMatcher.h 15 Mar 2006 21:34:06 -0000 1.14 @@ -35,12 +35,12 @@ #include <mockpp/matcher/InvokedRecorder.h> -namespace mockpp { +MOCKPP_NS_START /** Has the method been invoked at least a count? * @ingroup grp_matcher - * @see mockpp::atLeast + * @see MOCKPP_NS::atLeast */ class InvokeAtLeastMatcher : public InvokedRecorder { @@ -82,7 +82,7 @@ }; -} // namespace mockpp +MOCKPP_NS_END #endif // MOCKPP_INVOKEATLEASTMATCHER_H Index: InvocationMatcher.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/matcher/InvocationMatcher.h,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- InvocationMatcher.h 29 Dec 2005 19:29:51 -0000 1.10 +++ InvocationMatcher.h 15 Mar 2006 21:34:06 -0000 1.11 @@ -45,7 +45,7 @@ #include <mockpp/util/AutoPointer.h> -namespace mockpp { +MOCKPP_NS_START /** Base for invocation matchers. Matchers form a sub-expectation of a @@ -97,7 +97,7 @@ }; -} // namespace mockpp +MOCKPP_NS_END #endif // MOCKPP_INVOCATIONMATCHER_H Index: UnlimitedMatcher.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/matcher/UnlimitedMatcher.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- UnlimitedMatcher.cpp 29 Dec 2005 19:29:51 -0000 1.2 +++ UnlimitedMatcher.cpp 15 Mar 2006 21:34:06 -0000 1.3 @@ -36,7 +36,7 @@ #include <mockpp/matcher/UnlimitedMatcher.h> -namespace mockpp { +MOCKPP_NS_START void MOCKPP_EXPORT UnlimitedMatcher::verify() @@ -69,5 +69,5 @@ } -} // namespace mockpp +MOCKPP_NS_END Index: InvokeAtLeastOnceMatcher.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/matcher/InvokeAtLeastOnceMatcher.h,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- InvokeAtLeastOnceMatcher.h 29 Dec 2005 19:29:51 -0000 1.23 +++ InvokeAtLeastOnceMatcher.h 15 Mar 2006 21:34:06 -0000 1.24 @@ -38,12 +38,12 @@ #include <mockpp/matcher/InvokedRecorder.h> -namespace mockpp { +MOCKPP_NS_START /** Has the method been invoked at least once? * @ingroup grp_matcher - * @see mockpp::atLeastOnce + * @see MOCKPP_NS::atLeastOnce */ class InvokeAtLeastOnceMatcher : public InvokedRecorder { @@ -72,7 +72,7 @@ }; -} // namespace mockpp +MOCKPP_NS_END #endif // MOCKPP_INVOKEATLEASTONCEMATCHER_H Index: InvokeCountMatcher.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/matcher/InvokeCountMatcher.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- InvokeCountMatcher.cpp 29 Dec 2005 19:29:51 -0000 1.4 +++ InvokeCountMatcher.cpp 15 Mar 2006 21:34:06 -0000 1.5 @@ -36,7 +36,7 @@ #include <mockpp/matcher/InvokeCountMatcher.h> -namespace mockpp { +MOCKPP_NS_START MOCKPP_EXPORT InvokeCountMatcher::InvokeCountMatcher( int count ) @@ -77,6 +77,6 @@ } -} // namespace mockpp +MOCKPP_NS_END Index: InvokeAtLeastOnceMatcher.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/matcher/InvokeAtLeastOnceMatcher.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- InvokeAtLeastOnceMatcher.cpp 29 Dec 2005 19:29:51 -0000 1.2 +++ InvokeAtLeastOnceMatcher.cpp 15 Mar 2006 21:34:06 -0000 1.3 @@ -35,7 +35,7 @@ #include <mockpp/matcher/InvokeAtLeastOnceMatcher.h> -namespace mockpp { +MOCKPP_NS_START void MOCKPP_EXPORT InvokeAtLeastOnceMatcher::verify() { @@ -66,6 +66,6 @@ } -} // namespace mockpp +MOCKPP_NS_END Index: TestFailureMatcher.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/matcher/TestFailureMatcher.h,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- TestFailureMatcher.h 29 Dec 2005 19:29:51 -0000 1.23 +++ TestFailureMatcher.h 15 Mar 2006 21:34:06 -0000 1.24 @@ -40,12 +40,12 @@ #include <mockpp/matcher/TypelessMatcher.h> -namespace mockpp { +MOCKPP_NS_START /** An invocation count matcher that always fails upon invocation * @ingroup grp_matcher - * @see mockpp::never + * @see MOCKPP_NS::never */ class TestFailureMatcher : public TypelessMatcher { @@ -88,7 +88,7 @@ }; -} // namespace mockpp +MOCKPP_NS_END #endif // MOCKPP_TESTFAILUREMATCHER_H Index: TestFailureMatcher.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/matcher/TestFailureMatcher.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- TestFailureMatcher.cpp 29 Dec 2005 19:29:51 -0000 1.5 +++ TestFailureMatcher.cpp 15 Mar 2006 21:34:06 -0000 1.6 @@ -37,7 +37,7 @@ #include <mockpp/compat/AssertionFailedError.h> -namespace mockpp { +MOCKPP_NS_START MOCKPP_EXPORT TestFailureMatcher::TestFailureMatcher( const String &msg ) @@ -77,6 +77,6 @@ } -} // namespace mockpp +MOCKPP_NS_END Index: InvokeAtLeastMatcher.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/matcher/InvokeAtLeastMatcher.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- InvokeAtLeastMatcher.cpp 29 Dec 2005 19:29:51 -0000 1.4 +++ InvokeAtLeastMatcher.cpp 15 Mar 2006 21:34:06 -0000 1.5 @@ -32,7 +32,7 @@ #include <mockpp/matcher/InvokeAtLeastMatcher.h> -namespace mockpp { +MOCKPP_NS_START MOCKPP_EXPORT InvokeAtLeastMatcher::InvokeAtLeastMatcher( int count ) @@ -78,5 +78,5 @@ } -} // namespace mockpp +MOCKPP_NS_END Index: InvokeOnceMatcher.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/matcher/InvokeOnceMatcher.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- InvokeOnceMatcher.cpp 29 Dec 2005 19:29:51 -0000 1.4 +++ InvokeOnceMatcher.cpp 15 Mar 2006 21:34:06 -0000 1.5 @@ -36,7 +36,7 @@ #include <mockpp/matcher/InvokeOnceMatcher.h> -namespace mockpp { +MOCKPP_NS_START bool MOCKPP_EXPORT InvokeOnceMatcher::matches( ) @@ -66,5 +66,5 @@ } -} // namespace mockpp +MOCKPP_NS_END Index: InvokeAtMostMatcher.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/matcher/InvokeAtMostMatcher.h,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- InvokeAtMostMatcher.h 29 Dec 2005 19:29:51 -0000 1.16 +++ InvokeAtMostMatcher.h 15 Mar 2006 21:34:06 -0000 1.17 @@ -34,12 +34,12 @@ #include <mockpp/matcher/InvokedRecorder.h> -namespace mockpp { +MOCKPP_NS_START /** Has the method been invoked a maximal number of times? * @ingroup grp_matcher - * @see mockpp::atMost + * @see MOCKPP_NS::atMost */ class InvokeAtMostMatcher : public InvokedRecorder { @@ -81,7 +81,7 @@ }; -} // namespace mockpp +MOCKPP_NS_END #endif // MOCKPP_INVOKEATMOSTMATCHER_H Index: NoArgumentsMatcher.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/matcher/NoArgumentsMatcher.h,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- NoArgumentsMatcher.h 29 Dec 2005 19:29:51 -0000 1.16 +++ NoArgumentsMatcher.h 15 Mar 2006 21:34:06 -0000 1.17 @@ -41,7 +41,7 @@ #include "StatelessInvocationMatcher.h" -namespace mockpp { +MOCKPP_NS_START /** Matches no arguments at all. * Not too useful but may be nice to express the intent. @@ -74,7 +74,7 @@ }; -} // namespace mockpp +MOCKPP_NS_END #endif // MOCKPP_NOARGUMENTSMATCHER_H Index: StatelessInvocationMatcher.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/matcher/StatelessInvocationMatcher.h,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- StatelessInvocationMatcher.h 29 Dec 2005 19:29:51 -0000 1.22 +++ StatelessInvocationMatcher.h 15 Mar 2006 21:34:06 -0000 1.23 @@ -41,7 +41,7 @@ #include <mockpp/matcher/InvocationMatcher.h> -namespace mockpp { +MOCKPP_NS_START /** Base for invocation matcher with no-chaning state. @@ -79,7 +79,7 @@ }; -} // namespace mockpp +MOCKPP_NS_END #endif // MOCKPP_STATELESSINVOCATIONMATCHER_H Index: InvokedRecorder.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/matcher/InvokedRecorder.h,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- InvokedRecorder.h 29 Dec 2005 19:29:51 -0000 1.28 +++ InvokedRecorder.h 15 Mar 2006 21:34:06 -0000 1.29 @@ -43,7 +43,7 @@ #include <mockpp/compat/Formatter.h> -namespace mockpp { +MOCKPP_NS_START /** Base for objects that match invocation counts. @@ -114,7 +114,7 @@ }; -} // namespace mockpp +MOCKPP_NS_END #endif // MOCKPP_INVOKEDRECORDER_H Index: InvokedBeforeMatcher.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/matcher/InvokedBeforeMatcher.h,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- InvokedBeforeMatcher.h 29 Dec 2005 19:29:51 -0000 1.12 +++ InvokedBeforeMatcher.h 15 Mar 2006 21:34:06 -0000 1.13 @@ -36,12 +36,12 @@ #include <mockpp/matcher/InvokedRecorder.h> -namespace mockpp { +MOCKPP_NS_START /** Has the method been invoked before another? * @ingroup grp_matcher - * @see mockpp::MatchBuilder::before + * @see MOCKPP_NS::MatchBuilder::before */ template <typename I> // Invocation class InvokedBeforeMatcher : public StatelessInvocationMatcher<I> @@ -102,7 +102,7 @@ }; -} // namespace mockpp +MOCKPP_NS_END #endif // MOCKPP_INVOKEDBEFOREMATCHER_H |