mockpp-commits Mailing List for Mock Objects for C++ (Page 10)
Brought to you by:
ewald-arnold
Menu
▾
▴
mockpp-commits
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
(17) |
Mar
(178) |
Apr
(119) |
May
(60) |
Jun
(3) |
Jul
(60) |
Aug
(16) |
Sep
(55) |
Oct
(156) |
Nov
(136) |
Dec
(255) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(98) |
Feb
(8) |
Mar
(57) |
Apr
(43) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
Update of /cvsroot/mockpp/mockpp/mockpp/matcher In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12933/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: update copyright date Index: InvokeOnceMatcher.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/matcher/InvokeOnceMatcher.h,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- InvokeOnceMatcher.h 27 Feb 2005 11:48:16 -0000 1.20 +++ InvokeOnceMatcher.h 29 Dec 2005 19:29:51 -0000 1.21 @@ -8,7 +8,7 @@ /************************************************************************** begin : Thu Aug 26 2004 - copyright : (C) 2002-2005 by Ewald Arnold + copyright : (C) 2002-2006 by Ewald Arnold email : mockpp at ewald-arnold dot de This program is free software; you can redistribute it and/or modify Index: MatcherHolder.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/matcher/MatcherHolder.h,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- MatcherHolder.h 25 Mar 2005 18:43:04 -0000 1.9 +++ MatcherHolder.h 29 Dec 2005 19:29:51 -0000 1.10 @@ -1,108 +1,108 @@ -/** @file - @internal - @brief Container helper for Matcher objects. - - $Id$ - - ***************************************************************************/ - -/************************************************************************** - - begin : Sun Oct 24 2004 - copyright : (C) 2002-2005 by Ewald Arnold - email : mockpp at ewald-arnold dot de - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2 of the License, - or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - - **/ - -#ifndef MOCKPP_MATCHERHOLDER_H -#define MOCKPP_MATCHERHOLDER_H - -#include <mockpp/util/AutoPointer.h> - -#include <mockpp/mockpp.h> // always first - -#include <mockpp/matcher/InvocationMatcher.h> -#include <mockpp/matcher/TypelessMatcher.h> - - -namespace mockpp { - - -/** Proxy class to conveniently move Matchers into matcher related methods. - * @internal - * @attention Not intended for common use since this class is actually a liar. - */ -template <typename I> // Invocation -class MatcherHolder -{ - public: - - /** Constructs the object. - * @param in_matcher pointer to the matcher - */ - MatcherHolder(InvocationMatcher<I> *in_matcher) - : matcher(in_matcher) - { - } - - /** Constructs the object. - * @param in_matcher pointer to the typeless matcher - */ - MatcherHolder(const typename TypelessMatcher::AP &in_matcher) - : matcher(new TypelessMatcherAdapter<I>(in_matcher)) - { - } - - /** Constructs the object. - * @param in_matcher pointer to the typeless matcher - */ - MatcherHolder(TypelessMatcher*in_matcher) - : matcher(new TypelessMatcherAdapter<I>(in_matcher)) - { - } - - /** Constructs the object. - * @param in_matcher pointer to the matcher - */ - MatcherHolder(const typename InvocationMatcher<I>::AP &in_matcher) - : matcher(in_matcher) - { - } - - /** Returns the matcher object. - * @attention After this method is called this object becomes invalid. - * @return the matcher object - */ -#if defined(__BORLANDC__) && (__BORLANDC__ >= 560) - operator typename AutoPointer<InvocationMatcher<I> > () const // we actually lie a bit -#else - operator typename InvocationMatcher<I>::AP () const -#endif - { - return matcher; - } - - private: - - mutable typename InvocationMatcher<I>::AP matcher; // we actually lie a bit -}; - - -} // namespace mockpp - - -#endif // MOCKPP_MATCHERHOLDER_H +/** @file + @internal + @brief Container helper for Matcher objects. + + $Id$ + + ***************************************************************************/ + +/************************************************************************** + + begin : Sun Oct 24 2004 + copyright : (C) 2002-2006 by Ewald Arnold + email : mockpp at ewald-arnold dot de + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2 of the License, + or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + + **/ + +#ifndef MOCKPP_MATCHERHOLDER_H +#define MOCKPP_MATCHERHOLDER_H + +#include <mockpp/util/AutoPointer.h> + +#include <mockpp/mockpp.h> // always first + +#include <mockpp/matcher/InvocationMatcher.h> +#include <mockpp/matcher/TypelessMatcher.h> + + +namespace mockpp { + + +/** Proxy class to conveniently move Matchers into matcher related methods. + * @internal + * @attention Not intended for common use since this class is actually a liar. + */ +template <typename I> // Invocation +class MatcherHolder +{ + public: + + /** Constructs the object. + * @param in_matcher pointer to the matcher + */ + MatcherHolder(InvocationMatcher<I> *in_matcher) + : matcher(in_matcher) + { + } + + /** Constructs the object. + * @param in_matcher pointer to the typeless matcher + */ + MatcherHolder(const typename TypelessMatcher::AP &in_matcher) + : matcher(new TypelessMatcherAdapter<I>(in_matcher)) + { + } + + /** Constructs the object. + * @param in_matcher pointer to the typeless matcher + */ + MatcherHolder(TypelessMatcher*in_matcher) + : matcher(new TypelessMatcherAdapter<I>(in_matcher)) + { + } + + /** Constructs the object. + * @param in_matcher pointer to the matcher + */ + MatcherHolder(const typename InvocationMatcher<I>::AP &in_matcher) + : matcher(in_matcher) + { + } + + /** Returns the matcher object. + * @attention After this method is called this object becomes invalid. + * @return the matcher object + */ +#if defined(__BORLANDC__) && (__BORLANDC__ >= 560) + operator typename AutoPointer<InvocationMatcher<I> > () const // we actually lie a bit +#else + operator typename InvocationMatcher<I>::AP () const +#endif + { + return matcher; + } + + private: + + mutable typename InvocationMatcher<I>::AP matcher; // we actually lie a bit +}; + + +} // namespace mockpp + + +#endif // MOCKPP_MATCHERHOLDER_H Index: TypelessMatcher.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/matcher/TypelessMatcher.h,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- TypelessMatcher.h 24 Mar 2005 20:51:30 -0000 1.15 +++ TypelessMatcher.h 29 Dec 2005 19:29:51 -0000 1.16 @@ -9,7 +9,7 @@ /************************************************************************** begin : Sun Aug 22 2004 - copyright : (C) 2002-2005 by Ewald Arnold + copyright : (C) 2002-2006 by Ewald Arnold email : mockpp at ewald-arnold dot de This program is free software; you can redistribute it and/or modify Index: AnyArgumentsMatcher.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/matcher/AnyArgumentsMatcher.h,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- AnyArgumentsMatcher.h 24 Mar 2005 20:51:30 -0000 1.15 +++ AnyArgumentsMatcher.h 29 Dec 2005 19:29:51 -0000 1.16 @@ -8,7 +8,7 @@ /************************************************************************** begin : Thu Aug 26 2004 - copyright : (C) 2002-2005 by Ewald Arnold + copyright : (C) 2002-2006 by Ewald Arnold email : mockpp at ewald-arnold dot de This program is free software; you can redistribute it and/or modify Index: ArgumentsMatcher.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/matcher/ArgumentsMatcher.h,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- ArgumentsMatcher.h 6 Jan 2005 13:09:23 -0000 1.19 +++ ArgumentsMatcher.h 29 Dec 2005 19:29:51 -0000 1.20 @@ -9,7 +9,7 @@ /************************************************************************** begin : Thu Aug 26 2004 - copyright : (C) 2002-2005 by Ewald Arnold + copyright : (C) 2002-2006 by Ewald Arnold email : mockpp at ewald-arnold dot de This program is free software; you can redistribute it and/or modify Index: InvokedAfterMatcher.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/matcher/InvokedAfterMatcher.h,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- InvokedAfterMatcher.h 28 Aug 2005 20:40:23 -0000 1.21 +++ InvokedAfterMatcher.h 29 Dec 2005 19:29:51 -0000 1.22 @@ -8,7 +8,7 @@ /************************************************************************** begin : Thu Aug 26 2004 - copyright : (C) 2002-2005 by Ewald Arnold + copyright : (C) 2002-2006 by Ewald Arnold email : mockpp at ewald-arnold dot de This program is free software; you can redistribute it and/or modify Index: TypelessMatcher.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/matcher/TypelessMatcher.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- TypelessMatcher.cpp 27 Feb 2005 11:48:16 -0000 1.4 +++ TypelessMatcher.cpp 29 Dec 2005 19:29:51 -0000 1.5 @@ -8,7 +8,7 @@ /************************************************************************** begin : Sun Aug 22 2004 - copyright : (C) 2002-2005 by Ewald Arnold + copyright : (C) 2002-2006 by Ewald Arnold email : mockpp at ewald-arnold dot de This program is free software; you can redistribute it and/or modify Index: InvokedRecorder.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/matcher/InvokedRecorder.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- InvokedRecorder.cpp 27 Feb 2005 11:48:16 -0000 1.4 +++ InvokedRecorder.cpp 29 Dec 2005 19:29:51 -0000 1.5 @@ -8,7 +8,7 @@ /************************************************************************** begin : Thu Aug 26 2004 - copyright : (C) 2002-2005 by Ewald Arnold + copyright : (C) 2002-2006 by Ewald Arnold email : mockpp at ewald-arnold dot de This program is free software; you can redistribute it and/or modify Index: InvokeAtMostMatcher.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/matcher/InvokeAtMostMatcher.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- InvokeAtMostMatcher.cpp 27 Feb 2005 11:48:16 -0000 1.3 +++ InvokeAtMostMatcher.cpp 29 Dec 2005 19:29:51 -0000 1.4 @@ -8,7 +8,7 @@ /************************************************************************** begin : Thu Aug 26 2004 - copyright : (C) 2002-2005 by Ewald Arnold + copyright : (C) 2002-2006 by Ewald Arnold email : mockpp at ewald-arnold dot de This program is free software; you can redistribute it and/or modify Index: UnlimitedMatcher.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/matcher/UnlimitedMatcher.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- UnlimitedMatcher.h 4 Mar 2005 23:37:00 -0000 1.2 +++ UnlimitedMatcher.h 29 Dec 2005 19:29:51 -0000 1.3 @@ -8,7 +8,7 @@ /************************************************************************** begin : Thu Aug 26 2004 - copyright : (C) 2002-2005 by Ewald Arnold + copyright : (C) 2002-2006 by Ewald Arnold email : mockpp at ewald-arnold dot de This program is free software; you can redistribute it and/or modify Index: InvokeCountMatcher.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/matcher/InvokeCountMatcher.h,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- InvokeCountMatcher.h 27 Feb 2005 11:48:16 -0000 1.19 +++ InvokeCountMatcher.h 29 Dec 2005 19:29:51 -0000 1.20 @@ -8,7 +8,7 @@ /************************************************************************** begin : Thu Aug 26 2004 - copyright : (C) 2002-2005 by Ewald Arnold + copyright : (C) 2002-2006 by Ewald Arnold email : mockpp at ewald-arnold dot de This program is free software; you can redistribute it and/or modify Index: InvokeAtLeastMatcher.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/matcher/InvokeAtLeastMatcher.h,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- InvokeAtLeastMatcher.h 27 Feb 2005 11:48:16 -0000 1.12 +++ InvokeAtLeastMatcher.h 29 Dec 2005 19:29:51 -0000 1.13 @@ -8,7 +8,7 @@ /************************************************************************** begin : Thu Aug 26 2004 - copyright : (C) 2002-2005 by Ewald Arnold + copyright : (C) 2002-2006 by Ewald Arnold email : mockpp at ewald-arnold dot de This program is free software; you can redistribute it and/or modify Index: InvocationMatcher.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/matcher/InvocationMatcher.h,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- InvocationMatcher.h 27 Feb 2005 11:48:16 -0000 1.9 +++ InvocationMatcher.h 29 Dec 2005 19:29:51 -0000 1.10 @@ -9,7 +9,7 @@ /************************************************************************** begin : Sun Aug 22 2004 - copyright : (C) 2002-2005 by Ewald Arnold + copyright : (C) 2002-2006 by Ewald Arnold email : mockpp at ewald-arnold dot de This program is free software; you can redistribute it and/or modify Index: UnlimitedMatcher.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/matcher/UnlimitedMatcher.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- UnlimitedMatcher.cpp 3 Mar 2005 23:32:26 -0000 1.1 +++ UnlimitedMatcher.cpp 29 Dec 2005 19:29:51 -0000 1.2 @@ -8,7 +8,7 @@ /************************************************************************** begin : Thu Aug 26 2004 - copyright : (C) 2002-2005 by Ewald Arnold + copyright : (C) 2002-2006 by Ewald Arnold email : mockpp at ewald-arnold dot de This program is free software; you can redistribute it and/or modify Index: InvokeAtLeastOnceMatcher.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/matcher/InvokeAtLeastOnceMatcher.h,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- InvokeAtLeastOnceMatcher.h 3 Mar 2005 15:51:00 -0000 1.22 +++ InvokeAtLeastOnceMatcher.h 29 Dec 2005 19:29:51 -0000 1.23 @@ -8,7 +8,7 @@ /************************************************************************** begin : Thu Aug 26 2004 - copyright : (C) 2002-2005 by Ewald Arnold + copyright : (C) 2002-2006 by Ewald Arnold email : mockpp at ewald-arnold dot de This program is free software; you can redistribute it and/or modify Index: InvokeCountMatcher.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/matcher/InvokeCountMatcher.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- InvokeCountMatcher.cpp 27 Feb 2005 11:48:16 -0000 1.3 +++ InvokeCountMatcher.cpp 29 Dec 2005 19:29:51 -0000 1.4 @@ -8,7 +8,7 @@ /************************************************************************** begin : Thu Aug 26 2004 - copyright : (C) 2002-2005 by Ewald Arnold + copyright : (C) 2002-2006 by Ewald Arnold email : mockpp at ewald-arnold dot de This program is free software; you can redistribute it and/or modify Index: InvokeAtLeastOnceMatcher.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/matcher/InvokeAtLeastOnceMatcher.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- InvokeAtLeastOnceMatcher.cpp 3 Mar 2005 15:51:00 -0000 1.1 +++ InvokeAtLeastOnceMatcher.cpp 29 Dec 2005 19:29:51 -0000 1.2 @@ -8,7 +8,7 @@ /************************************************************************** begin : Thu Aug 26 2004 - copyright : (C) 2002-2005 by Ewald Arnold + copyright : (C) 2002-2006 by Ewald Arnold email : mockpp at ewald-arnold dot de This program is free software; you can redistribute it and/or modify Index: TestFailureMatcher.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/matcher/TestFailureMatcher.h,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- TestFailureMatcher.h 27 Feb 2005 11:48:16 -0000 1.22 +++ TestFailureMatcher.h 29 Dec 2005 19:29:51 -0000 1.23 @@ -8,7 +8,7 @@ /************************************************************************** begin : Thu Aug 26 2004 - copyright : (C) 2002-2005 by Ewald Arnold + copyright : (C) 2002-2006 by Ewald Arnold email : mockpp at ewald-arnold dot de This program is free software; you can redistribute it and/or modify Index: TestFailureMatcher.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/matcher/TestFailureMatcher.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- TestFailureMatcher.cpp 28 Aug 2005 20:40:23 -0000 1.4 +++ TestFailureMatcher.cpp 29 Dec 2005 19:29:51 -0000 1.5 @@ -8,7 +8,7 @@ /************************************************************************** begin : Thu Aug 26 2004 - copyright : (C) 2002-2005 by Ewald Arnold + copyright : (C) 2002-2006 by Ewald Arnold email : mockpp at ewald-arnold dot de This program is free software; you can redistribute it and/or modify Index: InvokeAtLeastMatcher.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/matcher/InvokeAtLeastMatcher.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- InvokeAtLeastMatcher.cpp 27 Feb 2005 11:48:16 -0000 1.3 +++ InvokeAtLeastMatcher.cpp 29 Dec 2005 19:29:51 -0000 1.4 @@ -8,7 +8,7 @@ /************************************************************************** begin : Thu Aug 26 2004 - copyright : (C) 2002-2005 by Ewald Arnold + copyright : (C) 2002-2006 by Ewald Arnold email : mockpp at ewald-arnold dot de This program is free software; you can redistribute it and/or modify Index: InvokeOnceMatcher.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/matcher/InvokeOnceMatcher.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- InvokeOnceMatcher.cpp 27 Feb 2005 11:48:16 -0000 1.3 +++ InvokeOnceMatcher.cpp 29 Dec 2005 19:29:51 -0000 1.4 @@ -8,7 +8,7 @@ /************************************************************************** begin : Thu Aug 26 2004 - copyright : (C) 2002-2005 by Ewald Arnold + copyright : (C) 2002-2006 by Ewald Arnold email : mockpp at ewald-arnold dot de This program is free software; you can redistribute it and/or modify Index: InvokeAtMostMatcher.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/matcher/InvokeAtMostMatcher.h,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- InvokeAtMostMatcher.h 27 Feb 2005 11:48:16 -0000 1.15 +++ InvokeAtMostMatcher.h 29 Dec 2005 19:29:51 -0000 1.16 @@ -8,7 +8,7 @@ /************************************************************************** begin : Thu Aug 26 2004 - copyright : (C) 2002-2005 by Ewald Arnold + copyright : (C) 2002-2006 by Ewald Arnold email : mockpp at ewald-arnold dot de This program is free software; you can redistribute it and/or modify Index: NoArgumentsMatcher.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/matcher/NoArgumentsMatcher.h,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- NoArgumentsMatcher.h 24 Mar 2005 20:51:30 -0000 1.15 +++ NoArgumentsMatcher.h 29 Dec 2005 19:29:51 -0000 1.16 @@ -8,7 +8,7 @@ /************************************************************************** begin : Thu Aug 26 2004 - copyright : (C) 2002-2005 by Ewald Arnold + copyright : (C) 2002-2006 by Ewald Arnold email : mockpp at ewald-arnold dot de This program is free software; you can redistribute it and/or modify Index: StatelessInvocationMatcher.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/matcher/StatelessInvocationMatcher.h,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- StatelessInvocationMatcher.h 24 Mar 2005 20:51:30 -0000 1.21 +++ StatelessInvocationMatcher.h 29 Dec 2005 19:29:51 -0000 1.22 @@ -9,7 +9,7 @@ /************************************************************************** begin : Thu Aug 26 2004 - copyright : (C) 2002-2005 by Ewald Arnold + copyright : (C) 2002-2006 by Ewald Arnold email : mockpp at ewald-arnold dot de This program is free software; you can redistribute it and/or modify Index: InvokedRecorder.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/matcher/InvokedRecorder.h,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- InvokedRecorder.h 28 Dec 2005 21:29:19 -0000 1.27 +++ InvokedRecorder.h 29 Dec 2005 19:29:51 -0000 1.28 @@ -9,7 +9,7 @@ /************************************************************************** begin : Thu Aug 26 2004 - copyright : (C) 2002-2005 by Ewald Arnold + copyright : (C) 2002-2006 by Ewald Arnold email : mockpp at ewald-arnold dot de This program is free software; you can redistribute it and/or modify Index: InvokedBeforeMatcher.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/matcher/InvokedBeforeMatcher.h,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- InvokedBeforeMatcher.h 28 Aug 2005 20:40:23 -0000 1.11 +++ InvokedBeforeMatcher.h 29 Dec 2005 19:29:51 -0000 1.12 @@ -8,7 +8,7 @@ /************************************************************************** begin : Thu Aug 26 2004 - copyright : (C) 2002-2005 by Ewald Arnold + copyright : (C) 2002-2006 by Ewald Arnold email : mockpp at ewald-arnold dot de This program is free software; you can redistribute it and/or modify |
Update of /cvsroot/mockpp/mockpp/mockpp/compat In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12933/mockpp/compat Modified Files: Asserter.cpp Asserter.h AssertionFailedError.cpp AssertionFailedError.h Exception.cpp Exception.h Formatter.cpp Formatter.h Log Message: update copyright date Index: Formatter.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/compat/Formatter.h,v retrieving revision 1.37 retrieving revision 1.38 diff -u -d -r1.37 -r1.38 --- Formatter.h 28 Dec 2005 19:43:08 -0000 1.37 +++ Formatter.h 29 Dec 2005 19:29:50 -0000 1.38 @@ -8,7 +8,7 @@ /************************************************************************** begin : Wed Dez 25 2002 - copyright : (C) 2002-2005 by Ewald Arnold + copyright : (C) 2002-2006 by Ewald Arnold email : mockpp at ewald-arnold dot de This program is free software; you can redistribute it and/or modify Index: Exception.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/compat/Exception.h,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- Exception.h 23 Dec 2005 22:03:30 -0000 1.18 +++ Exception.h 29 Dec 2005 19:29:50 -0000 1.19 @@ -8,7 +8,7 @@ /************************************************************************** begin : Tue Dec 31 2002 - copyright : (C) 2002-2005 by Ewald Arnold + copyright : (C) 2002-2006 by Ewald Arnold email : mockpp at ewald-arnold dot de This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as Index: AssertionFailedError.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/compat/AssertionFailedError.h,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- AssertionFailedError.h 28 Aug 2005 20:40:23 -0000 1.13 +++ AssertionFailedError.h 29 Dec 2005 19:29:50 -0000 1.14 @@ -8,7 +8,7 @@ /************************************************************************** begin : Mon Dec 23 2002 - copyright : (C) 2002-2005 by Ewald Arnold + copyright : (C) 2002-2006 by Ewald Arnold email : mockpp at ewald-arnold dot de This program is free software; you can redistribute it and/or modify Index: Asserter.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/compat/Asserter.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Asserter.cpp 28 Dec 2005 21:57:33 -0000 1.1 +++ Asserter.cpp 29 Dec 2005 19:29:50 -0000 1.2 @@ -8,7 +8,7 @@ /************************************************************************** begin : Sat Dec 21 2002 - copyright : (C) 2002-2005 by Ewald Arnold + copyright : (C) 2002-2006 by Ewald Arnold email : mockpp at ewald-arnold dot de This program is free software; you can redistribute it and/or modify Index: Exception.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/compat/Exception.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- Exception.cpp 30 Dec 2004 20:54:04 -0000 1.13 +++ Exception.cpp 29 Dec 2005 19:29:50 -0000 1.14 @@ -8,7 +8,7 @@ /************************************************************************** begin : Tue Dec 31 2002 - copyright : (C) 2002-2005 by Ewald Arnold + copyright : (C) 2002-2006 by Ewald Arnold email : mockpp at ewald-arnold dot de This program is free software; you can redistribute it and/or modify Index: Formatter.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/compat/Formatter.cpp,v retrieving revision 1.47 retrieving revision 1.48 diff -u -d -r1.47 -r1.48 --- Formatter.cpp 28 Dec 2005 21:28:47 -0000 1.47 +++ Formatter.cpp 29 Dec 2005 19:29:50 -0000 1.48 @@ -8,7 +8,7 @@ /************************************************************************** begin : Wed Dez 25 2002 - copyright : (C) 2002-2005 by Ewald Arnold + copyright : (C) 2002-2006 by Ewald Arnold email : mockpp at ewald-arnold dot de This program is free software; you can redistribute it and/or modify Index: Asserter.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/compat/Asserter.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Asserter.h 28 Dec 2005 21:57:33 -0000 1.1 +++ Asserter.h 29 Dec 2005 19:29:50 -0000 1.2 @@ -8,7 +8,7 @@ /************************************************************************** begin : Sat Dec 21 2002 - copyright : (C) 2002-2005 by Ewald Arnold + copyright : (C) 2002-2006 by Ewald Arnold email : mockpp at ewald-arnold dot de This program is free software; you can redistribute it and/or modify Index: AssertionFailedError.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/compat/AssertionFailedError.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- AssertionFailedError.cpp 23 Dec 2005 22:03:30 -0000 1.17 +++ AssertionFailedError.cpp 29 Dec 2005 19:29:50 -0000 1.18 @@ -8,7 +8,7 @@ /************************************************************************** begin : Mon Dec 23 2002 - copyright : (C) 2002-2005 by Ewald Arnold + copyright : (C) 2002-2006 by Ewald Arnold email : mockpp at ewald-arnold dot de This program is free software; you can redistribute it and/or modify |
Update of /cvsroot/mockpp/mockpp/mockpp/framework In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12933/mockpp/framework Modified Files: CxxTestRunner.h CxxTestSupport.h SelectUnittestFramework.h VerifyingTestCaller.cpp VerifyingTestCaller.h VerifyingTestCase.cpp VerifyingTestCase.h Log Message: update copyright date Index: CxxTestRunner.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/framework/CxxTestRunner.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- CxxTestRunner.h 28 Dec 2005 09:23:30 -0000 1.2 +++ CxxTestRunner.h 29 Dec 2005 19:29:51 -0000 1.3 @@ -8,7 +8,7 @@ /************************************************************************** begin : Sat Dec 10 2005 - copyright : (C) 2002-2005 by Ewald Arnold + copyright : (C) 2002-2006 by Ewald Arnold email : mockpp at ewald-arnold dot de This program is free software; you can redistribute it and/or modify Index: VerifyingTestCaller.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/framework/VerifyingTestCaller.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- VerifyingTestCaller.cpp 10 Dec 2005 20:07:21 -0000 1.2 +++ VerifyingTestCaller.cpp 29 Dec 2005 19:29:51 -0000 1.3 @@ -8,7 +8,7 @@ /************************************************************************** begin : Sun Jan 23 2005 - copyright : (C) 2002-2005 by Ewald Arnold + copyright : (C) 2002-2006 by Ewald Arnold email : mockpp at ewald-arnold dot de This program is free software; you can redistribute it and/or modify Index: VerifyingTestCaller.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/framework/VerifyingTestCaller.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- VerifyingTestCaller.h 28 Dec 2005 09:23:30 -0000 1.3 +++ VerifyingTestCaller.h 29 Dec 2005 19:29:51 -0000 1.4 @@ -8,7 +8,7 @@ /************************************************************************** begin : Sun Jan 23 2005 - copyright : (C) 2002-2005 by Ewald Arnold + copyright : (C) 2002-2006 by Ewald Arnold email : mockpp at ewald-arnold dot de This program is free software; you can redistribute it and/or modify Index: VerifyingTestCase.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/framework/VerifyingTestCase.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- VerifyingTestCase.h 28 Dec 2005 09:23:30 -0000 1.3 +++ VerifyingTestCase.h 29 Dec 2005 19:29:51 -0000 1.4 @@ -8,7 +8,7 @@ /************************************************************************** begin : Sun Aug 22 2004 - copyright : (C) 2002-2005 by Ewald Arnold + copyright : (C) 2002-2006 by Ewald Arnold email : mockpp at ewald-arnold dot de This program is free software; you can redistribute it and/or modify Index: VerifyingTestCase.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/framework/VerifyingTestCase.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- VerifyingTestCase.cpp 28 Dec 2005 09:23:30 -0000 1.3 +++ VerifyingTestCase.cpp 29 Dec 2005 19:29:51 -0000 1.4 @@ -8,7 +8,7 @@ /************************************************************************** begin : Sun Aug 22 2004 - copyright : (C) 2002-2005 by Ewald Arnold + copyright : (C) 2002-2006 by Ewald Arnold email : mockpp at ewald-arnold dot de This program is free software; you can redistribute it and/or modify Index: SelectUnittestFramework.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/framework/SelectUnittestFramework.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- SelectUnittestFramework.h 28 Dec 2005 09:23:30 -0000 1.4 +++ SelectUnittestFramework.h 29 Dec 2005 19:29:51 -0000 1.5 @@ -2,7 +2,7 @@ SelectUnittestFramework.h - setup for unittest framework in use ------------------- begin : Fri Dec 9 2005 - copyright : (C) 2002-2005 by Ewald Arnold + copyright : (C) 2002-2006 by Ewald Arnold email : mockpp at ewald-arnold dot de $Id$ Index: CxxTestSupport.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/framework/CxxTestSupport.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- CxxTestSupport.h 10 Dec 2005 19:23:45 -0000 1.1 +++ CxxTestSupport.h 29 Dec 2005 19:29:51 -0000 1.2 @@ -8,7 +8,7 @@ /************************************************************************** begin : Fri Dec 9 2005 - copyright : (C) 2002-2005 by Ewald Arnold + copyright : (C) 2002-2006 by Ewald Arnold email : mockpp at ewald-arnold dot de This program is free software; you can redistribute it and/or modify |
|
From: Ewald A. <ewa...@us...> - 2005-12-29 19:30:05
|
Update of /cvsroot/mockpp/mockpp/mockpp/builder In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12933/mockpp/builder Modified Files: ArgumentsMatchBuilder.h ArgumentsMatchBuilderN.h BuilderNamespace.cpp BuilderNamespace.h IdentityBuilder.cpp IdentityBuilder.h InvocationMockerBuilder.h MatchBuilder.h StubBuilder.h gen_argumentsmatchbuilder_N.pl Log Message: update copyright date Index: gen_argumentsmatchbuilder_N.pl =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/builder/gen_argumentsmatchbuilder_N.pl,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- gen_argumentsmatchbuilder_N.pl 29 Oct 2005 19:09:27 -0000 1.2 +++ gen_argumentsmatchbuilder_N.pl 29 Dec 2005 19:29:50 -0000 1.3 @@ -28,7 +28,7 @@ /************************************************************************** begin : Sun Aug 22 2004 - copyright : (C) 2002-2005 by Ewald Arnold + copyright : (C) 2002-2006 by Ewald Arnold email : mockpp at ewald-arnold dot de This program is free software; you can redistribute it and/or modify Index: IdentityBuilder.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/builder/IdentityBuilder.h,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- IdentityBuilder.h 4 Mar 2005 23:35:55 -0000 1.11 +++ IdentityBuilder.h 29 Dec 2005 19:29:50 -0000 1.12 @@ -9,7 +9,7 @@ /************************************************************************** begin : Sun Aug 22 2004 - copyright : (C) 2002-2005 by Ewald Arnold + copyright : (C) 2002-2006 by Ewald Arnold email : mockpp at ewald-arnold dot de This program is free software; you can redistribute it and/or modify Index: ArgumentsMatchBuilderN.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/builder/ArgumentsMatchBuilderN.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- ArgumentsMatchBuilderN.h 13 Nov 2005 11:53:18 -0000 1.7 +++ ArgumentsMatchBuilderN.h 29 Dec 2005 19:29:50 -0000 1.8 @@ -9,7 +9,7 @@ /************************************************************************** begin : Sun Aug 22 2004 - copyright : (C) 2002-2005 by Ewald Arnold + copyright : (C) 2002-2006 by Ewald Arnold email : mockpp at ewald-arnold dot de This program is free software; you can redistribute it and/or modify Index: ArgumentsMatchBuilder.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/builder/ArgumentsMatchBuilder.h,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- ArgumentsMatchBuilder.h 28 Oct 2005 19:04:04 -0000 1.30 +++ ArgumentsMatchBuilder.h 29 Dec 2005 19:29:50 -0000 1.31 @@ -9,7 +9,7 @@ /************************************************************************** begin : Sun Aug 22 2004 - copyright : (C) 2002-2005 by Ewald Arnold + copyright : (C) 2002-2006 by Ewald Arnold email : mockpp at ewald-arnold dot de This program is free software; you can redistribute it and/or modify Index: InvocationMockerBuilder.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/builder/InvocationMockerBuilder.h,v retrieving revision 1.36 retrieving revision 1.37 diff -u -d -r1.36 -r1.37 --- InvocationMockerBuilder.h 3 Apr 2005 18:32:45 -0000 1.36 +++ InvocationMockerBuilder.h 29 Dec 2005 19:29:50 -0000 1.37 @@ -9,7 +9,7 @@ /************************************************************************** begin : Sun Aug 22 2004 - copyright : (C) 2002-2005 by Ewald Arnold + copyright : (C) 2002-2006 by Ewald Arnold email : mockpp at ewald-arnold dot de This program is free software; you can redistribute it and/or modify @@ -113,25 +113,25 @@ protected: - /** Indicate a matcher for a set of arguments. - * @param constraintset constraint set - * @return the builder object - */ - virtual MatchBuilder<R, I> &with_cs( const CS &constraintset ) - { - return internalWith_cs( constraintset); - } - - /** Indicate a matcher for a set of arguments. - * Needed for compilers that can't invoke \c InvocationMockerBuilder<>::with_cs() directly. - * @param constraintset constraint set - * @return the builder object - */ - virtual MatchBuilder<R, I> &internalWith_cs( const CS &constraintset ) - { - return addMatcher( new ArgumentsMatcher<I>( constraintset ) ); - } - + /** Indicate a matcher for a set of arguments. + * @param constraintset constraint set + * @return the builder object + */ + virtual MatchBuilder<R, I> &with_cs( const CS &constraintset ) + { + return internalWith_cs( constraintset); + } + + /** Indicate a matcher for a set of arguments. + * Needed for compilers that can't invoke \c InvocationMockerBuilder<>::with_cs() directly. + * @param constraintset constraint set + * @return the builder object + */ + virtual MatchBuilder<R, I> &internalWith_cs( const CS &constraintset ) + { + return addMatcher( new ArgumentsMatcher<I>( constraintset ) ); + } + /** Gets the builder namespace. * @return pointer to builder namspace */ Index: BuilderNamespace.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/builder/BuilderNamespace.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- BuilderNamespace.cpp 30 Dec 2004 20:54:04 -0000 1.4 +++ BuilderNamespace.cpp 29 Dec 2005 19:29:50 -0000 1.5 @@ -8,7 +8,7 @@ /************************************************************************** begin : Sun Aug 22 2004 - copyright : (C) 2002-2005 by Ewald Arnold + copyright : (C) 2002-2006 by Ewald Arnold email : mockpp at ewald-arnold dot de This program is free software; you can redistribute it and/or modify Index: BuilderNamespace.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/builder/BuilderNamespace.h,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- BuilderNamespace.h 13 Nov 2005 11:53:18 -0000 1.25 +++ BuilderNamespace.h 29 Dec 2005 19:29:50 -0000 1.26 @@ -9,7 +9,7 @@ /************************************************************************** begin : Sun Aug 22 2004 - copyright : (C) 2002-2005 by Ewald Arnold + copyright : (C) 2002-2006 by Ewald Arnold email : mockpp at ewald-arnold dot de This program is free software; you can redistribute it and/or modify Index: MatchBuilder.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/builder/MatchBuilder.h,v retrieving revision 1.36 retrieving revision 1.37 diff -u -d -r1.36 -r1.37 --- MatchBuilder.h 6 Apr 2005 19:26:38 -0000 1.36 +++ MatchBuilder.h 29 Dec 2005 19:29:50 -0000 1.37 @@ -9,7 +9,7 @@ /************************************************************************** begin : Sat Aug 21 2004 - copyright : (C) 2002-2005 by Ewald Arnold + copyright : (C) 2002-2006 by Ewald Arnold email : mockpp at ewald-arnold dot de This program is free software; you can redistribute it and/or modify @@ -172,12 +172,12 @@ getMocker() ->addMatcher( new InvokedAfterMatcher<I>( priorCallRecorder.get(), priorCallDescription ) ); - if (priorCallBuilder != 0) + if (priorCallBuilder != 0) #if defined(_MSC_VER) && (_MSC_VER <= 1300) - priorCallBuilder->match( (TypelessMatcher*)priorCallRecorder.release() ); + priorCallBuilder->match( (TypelessMatcher*)priorCallRecorder.release() ); #else - priorCallBuilder->match(priorCallRecorder); -#endif + priorCallBuilder->match(priorCallRecorder); +#endif else idTable.addPendingRecorder(priorCallID, priorCallRecorder); } Index: IdentityBuilder.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/builder/IdentityBuilder.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- IdentityBuilder.cpp 5 Mar 2005 15:50:46 -0000 1.2 +++ IdentityBuilder.cpp 29 Dec 2005 19:29:50 -0000 1.3 @@ -9,7 +9,7 @@ /************************************************************************** begin : Sun Aug 22 2004 - copyright : (C) 2002-2005 by Ewald Arnold + copyright : (C) 2002-2006 by Ewald Arnold email : mockpp at ewald-arnold dot de This program is free software; you can redistribute it and/or modify Index: StubBuilder.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/builder/StubBuilder.h,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- StubBuilder.h 25 Mar 2005 16:30:28 -0000 1.24 +++ StubBuilder.h 29 Dec 2005 19:29:50 -0000 1.25 @@ -9,7 +9,7 @@ /************************************************************************** begin : Sun Aug 22 2004 - copyright : (C) 2002-2005 by Ewald Arnold + copyright : (C) 2002-2006 by Ewald Arnold email : mockpp at ewald-arnold dot de This program is free software; you can redistribute it and/or modify |
|
From: Ewald A. <ewa...@us...> - 2005-12-29 19:30:03
|
Update of /cvsroot/mockpp/mockpp/mockpp/util In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12933/mockpp/util Modified Files: AssertMo.cpp AssertMo.h AutoPointer.h NotImplementedException.cpp NotImplementedException.h Log Message: update copyright date Index: AssertMo.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/util/AssertMo.cpp,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- AssertMo.cpp 23 Dec 2005 22:03:30 -0000 1.23 +++ AssertMo.cpp 29 Dec 2005 19:29:52 -0000 1.24 @@ -8,7 +8,7 @@ /************************************************************************** begin : Sat Dec 21 2002 - copyright : (C) 2002-2005 by Ewald Arnold + copyright : (C) 2002-2006 by Ewald Arnold email : mockpp at ewald-arnold dot de This program is free software; you can redistribute it and/or modify Index: AssertMo.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/util/AssertMo.h,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- AssertMo.h 28 Dec 2005 21:30:16 -0000 1.25 +++ AssertMo.h 29 Dec 2005 19:29:52 -0000 1.26 @@ -8,7 +8,7 @@ /************************************************************************** begin : Sat Dec 21 2002 - copyright : (C) 2002-2005 by Ewald Arnold + copyright : (C) 2002-2006 by Ewald Arnold email : mockpp at ewald-arnold dot de This program is free software; you can redistribute it and/or modify Index: AutoPointer.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/util/AutoPointer.h,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- AutoPointer.h 2 Apr 2005 20:45:33 -0000 1.14 +++ AutoPointer.h 29 Dec 2005 19:29:52 -0000 1.15 @@ -9,7 +9,7 @@ /************************************************************************** begin : Sun Aug 22 2004 - copyright : (C) 2002-2005 by Ewald Arnold + copyright : (C) 2002-2006 by Ewald Arnold email : mockpp at ewald-arnold dot de This program is free software; you can redistribute it and/or modify Index: NotImplementedException.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/util/NotImplementedException.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- NotImplementedException.cpp 8 Dec 2005 17:30:45 -0000 1.20 +++ NotImplementedException.cpp 29 Dec 2005 19:29:52 -0000 1.21 @@ -8,7 +8,7 @@ /************************************************************************** begin : Sat Dec 21 2002 - copyright : (C) 2002-2005 by Ewald Arnold + copyright : (C) 2002-2006 by Ewald Arnold email : mockpp at ewald-arnold dot de This program is free software; you can redistribute it and/or modify Index: NotImplementedException.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/util/NotImplementedException.h,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- NotImplementedException.h 6 Jan 2005 13:09:23 -0000 1.14 +++ NotImplementedException.h 29 Dec 2005 19:29:52 -0000 1.15 @@ -8,7 +8,7 @@ /************************************************************************** begin : Sat Dec 21 2002 - copyright : (C) 2002-2005 by Ewald Arnold + copyright : (C) 2002-2006 by Ewald Arnold email : mockpp at ewald-arnold dot de This program is free software; you can redistribute it and/or modify |
|
From: Ewald A. <ewa...@us...> - 2005-12-29 19:30:03
|
Update of /cvsroot/mockpp/mockpp/mockpp/stub In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12933/mockpp/stub Modified Files: CustomStub.h DefaultResultStub.h ReturnStub.h Stub.h StubHolder.h StubSequence.h TestFailureStub.h ThrowStub.h TypelessStub.h TypelessStubSequence.h VoidStub.cpp VoidStub.h Log Message: update copyright date Index: VoidStub.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/stub/VoidStub.h,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- VoidStub.h 3 Mar 2005 16:11:42 -0000 1.18 +++ VoidStub.h 29 Dec 2005 19:29:51 -0000 1.19 @@ -8,7 +8,7 @@ /************************************************************************** begin : Thu Aug 24 2004 - copyright : (C) 2002-2005 by Ewald Arnold + copyright : (C) 2002-2006 by Ewald Arnold email : mockpp at ewald-arnold dot de This program is free software; you can redistribute it and/or modify Index: StubSequence.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/stub/StubSequence.h,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- StubSequence.h 28 Dec 2005 21:29:19 -0000 1.28 +++ StubSequence.h 29 Dec 2005 19:29:51 -0000 1.29 @@ -8,7 +8,7 @@ /************************************************************************** begin : Thu Aug 24 2004 - copyright : (C) 2002-2005 by Ewald Arnold + copyright : (C) 2002-2006 by Ewald Arnold email : mockpp at ewald-arnold dot de This program is free software; you can redistribute it and/or modify Index: ReturnStub.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/stub/ReturnStub.h,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- ReturnStub.h 28 Dec 2005 21:29:19 -0000 1.20 +++ ReturnStub.h 29 Dec 2005 19:29:51 -0000 1.21 @@ -8,7 +8,7 @@ /************************************************************************** begin : Thu Aug 24 2004 - copyright : (C) 2002-2005 by Ewald Arnold + copyright : (C) 2002-2006 by Ewald Arnold email : mockpp at ewald-arnold dot de This program is free software; you can redistribute it and/or modify Index: StubHolder.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/stub/StubHolder.h,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- StubHolder.h 3 Apr 2005 18:32:53 -0000 1.11 +++ StubHolder.h 29 Dec 2005 19:29:51 -0000 1.12 @@ -1,105 +1,105 @@ -/** @file - @internal - @brief Container helper for Stub objects. - - $Id$ - - ***************************************************************************/ - -/************************************************************************** - - begin : Sun Oct 24 2004 - copyright : (C) 2002-2005 by Ewald Arnold - email : mockpp at ewald-arnold dot de - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2 of the License, - or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - - **/ - -#ifndef MOCKPP_STUBHOLDER_H -#define MOCKPP_STUBHOLDER_H - -#include <mockpp/util/AutoPointer.h> - -#include <mockpp/mockpp.h> // always first - -#include <mockpp/stub/Stub.h> -#include <mockpp/stub/TypelessStub.h> - - -namespace mockpp { - - -/** Proxy class to conveniently move Stubs into Stub related methods. - * @internal - * @attention Not intended for common use since this class is actually a liar. - */ -template <typename R, // Returntype - typename I> // Invocation -class StubHolder -{ - public: - - /** Creates the object. - * @param in_stub pointer to the stub - */ - StubHolder(const typename TypelessStub<R>::AP &in_stub) - : stub(new TypelessStubAdapter<R, I>(in_stub)) - {} - - /** Creates the object. - * @param in_stub pointer to the stub - */ - StubHolder(TypelessStub<R> *in_stub) - : stub(new TypelessStubAdapter<R, I>(in_stub)) - {} - - /** Creates the object. - * @param in_stub pointer to the stub - */ - StubHolder(Stub<R, I> *in_stub) - : stub(in_stub) - {} - -#ifndef _MSC_VER - - /** Creates the object. - * @param in_stub pointer to the stub - */ - StubHolder(const AutoPointer<Stub<R, I> > &in_stub) - : stub(in_stub) - {} - -#endif - - /** Returns the stub object. - * @attention After this method is called this object becomes invalid. - * @return the stub object - */ - operator AutoPointer<Stub<R, I> > () const // we we actually lie a bit - { - return stub; - } - - private: - - mutable typename Stub<R, I>::AP stub; // we we actually lie a bit -}; - - -} // namespace mockpp - - -#endif // MOCKPP_STUBHOLDER_H +/** @file + @internal + @brief Container helper for Stub objects. + + $Id$ + + ***************************************************************************/ + +/************************************************************************** + + begin : Sun Oct 24 2004 + copyright : (C) 2002-2006 by Ewald Arnold + email : mockpp at ewald-arnold dot de + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2 of the License, + or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + + **/ + +#ifndef MOCKPP_STUBHOLDER_H +#define MOCKPP_STUBHOLDER_H + +#include <mockpp/util/AutoPointer.h> + +#include <mockpp/mockpp.h> // always first + +#include <mockpp/stub/Stub.h> +#include <mockpp/stub/TypelessStub.h> + + +namespace mockpp { + + +/** Proxy class to conveniently move Stubs into Stub related methods. + * @internal + * @attention Not intended for common use since this class is actually a liar. + */ +template <typename R, // Returntype + typename I> // Invocation +class StubHolder +{ + public: + + /** Creates the object. + * @param in_stub pointer to the stub + */ + StubHolder(const typename TypelessStub<R>::AP &in_stub) + : stub(new TypelessStubAdapter<R, I>(in_stub)) + {} + + /** Creates the object. + * @param in_stub pointer to the stub + */ + StubHolder(TypelessStub<R> *in_stub) + : stub(new TypelessStubAdapter<R, I>(in_stub)) + {} + + /** Creates the object. + * @param in_stub pointer to the stub + */ + StubHolder(Stub<R, I> *in_stub) + : stub(in_stub) + {} + +#ifndef _MSC_VER + + /** Creates the object. + * @param in_stub pointer to the stub + */ + StubHolder(const AutoPointer<Stub<R, I> > &in_stub) + : stub(in_stub) + {} + +#endif + + /** Returns the stub object. + * @attention After this method is called this object becomes invalid. + * @return the stub object + */ + operator AutoPointer<Stub<R, I> > () const // we we actually lie a bit + { + return stub; + } + + private: + + mutable typename Stub<R, I>::AP stub; // we we actually lie a bit +}; + + +} // namespace mockpp + + +#endif // MOCKPP_STUBHOLDER_H Index: DefaultResultStub.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/stub/DefaultResultStub.h,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- DefaultResultStub.h 6 Jan 2005 13:09:23 -0000 1.20 +++ DefaultResultStub.h 29 Dec 2005 19:29:51 -0000 1.21 @@ -8,7 +8,7 @@ /************************************************************************** begin : Thu Aug 24 2004 - copyright : (C) 2002-2005 by Ewald Arnold + copyright : (C) 2002-2006 by Ewald Arnold email : mockpp at ewald-arnold dot de This program is free software; you can redistribute it and/or modify Index: ThrowStub.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/stub/ThrowStub.h,v retrieving revision 1.32 retrieving revision 1.33 diff -u -d -r1.32 -r1.33 --- ThrowStub.h 27 Nov 2005 15:34:36 -0000 1.32 +++ ThrowStub.h 29 Dec 2005 19:29:51 -0000 1.33 @@ -8,7 +8,7 @@ /************************************************************************** begin : Thu Aug 24 2004 - copyright : (C) 2002-2005 by Ewald Arnold + copyright : (C) 2002-2006 by Ewald Arnold email : mockpp at ewald-arnold dot de This program is free software; you can redistribute it and/or modify Index: Stub.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/stub/Stub.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- Stub.h 6 Jan 2005 13:09:23 -0000 1.6 +++ Stub.h 29 Dec 2005 19:29:51 -0000 1.7 @@ -9,7 +9,7 @@ /************************************************************************** begin : Thu Aug 24 2004 - copyright : (C) 2002-2005 by Ewald Arnold + copyright : (C) 2002-2006 by Ewald Arnold email : mockpp at ewald-arnold dot de This program is free software; you can redistribute it and/or modify Index: CustomStub.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/stub/CustomStub.h,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- CustomStub.h 3 Apr 2005 18:32:53 -0000 1.18 +++ CustomStub.h 29 Dec 2005 19:29:51 -0000 1.19 @@ -8,7 +8,7 @@ /************************************************************************** begin : Thu Aug 24 2004 - copyright : (C) 2002-2005 by Ewald Arnold + copyright : (C) 2002-2006 by Ewald Arnold email : mockpp at ewald-arnold dot de This program is free software; you can redistribute it and/or modify @@ -68,20 +68,20 @@ } protected: - - /** Appends the description of this object to the buffer. - * Needed for compilers that can't invoke \c CustumStub<>::describeTo() directly. - * @param buffer The buffer that the description is appended to. - * @return The current content of the buffer data - */ - String internalDescribeTo( String &buffer ) const // msvc6 hack - { - buffer += description; - return buffer; - } - - private: - + + /** Appends the description of this object to the buffer. + * Needed for compilers that can't invoke \c CustumStub<>::describeTo() directly. + * @param buffer The buffer that the description is appended to. + * @return The current content of the buffer data + */ + String internalDescribeTo( String &buffer ) const // msvc6 hack + { + buffer += description; + return buffer; + } + + private: + const String description; }; Index: VoidStub.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/stub/VoidStub.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- VoidStub.cpp 3 Mar 2005 16:11:42 -0000 1.1 +++ VoidStub.cpp 29 Dec 2005 19:29:51 -0000 1.2 @@ -8,7 +8,7 @@ /************************************************************************** begin : Thu Aug 24 2004 - copyright : (C) 2002-2005 by Ewald Arnold + copyright : (C) 2002-2006 by Ewald Arnold email : mockpp at ewald-arnold dot de This program is free software; you can redistribute it and/or modify Index: TypelessStubSequence.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/stub/TypelessStubSequence.h,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- TypelessStubSequence.h 28 Dec 2005 21:29:19 -0000 1.10 +++ TypelessStubSequence.h 29 Dec 2005 19:29:51 -0000 1.11 @@ -8,7 +8,7 @@ /************************************************************************** begin : Fri Oct 22 2004 - copyright : (C) 2002-2005 by Ewald Arnold + copyright : (C) 2002-2006 by Ewald Arnold email : mockpp at ewald-arnold dot de This program is free software; you can redistribute it and/or modify Index: TypelessStub.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/stub/TypelessStub.h,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- TypelessStub.h 3 Apr 2005 21:49:57 -0000 1.17 +++ TypelessStub.h 29 Dec 2005 19:29:51 -0000 1.18 @@ -9,7 +9,7 @@ /************************************************************************** begin : Sun Aug 22 2004 - copyright : (C) 2002-2005 by Ewald Arnold + copyright : (C) 2002-2006 by Ewald Arnold email : mockpp at ewald-arnold dot de This program is free software; you can redistribute it and/or modify Index: TestFailureStub.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/stub/TestFailureStub.h,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- TestFailureStub.h 28 Aug 2005 20:40:24 -0000 1.21 +++ TestFailureStub.h 29 Dec 2005 19:29:51 -0000 1.22 @@ -8,7 +8,7 @@ /************************************************************************** begin : Thu Aug 24 2004 - copyright : (C) 2002-2005 by Ewald Arnold + copyright : (C) 2002-2006 by Ewald Arnold email : mockpp at ewald-arnold dot de This program is free software; you can redistribute it and/or modify |
|
From: Ewald A. <ewa...@us...> - 2005-12-29 19:30:01
|
Update of /cvsroot/mockpp/mockpp/mockpp/production In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12933/mockpp/production Modified Files: TimeServer.cpp TimeServer.h mockpp_production.h Log Message: update copyright date Index: TimeServer.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/production/TimeServer.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- TimeServer.h 30 Apr 2005 21:15:45 -0000 1.2 +++ TimeServer.h 29 Dec 2005 19:29:51 -0000 1.3 @@ -1,79 +1,79 @@ -/** @file - @brief Time dependent objects - - $Id$ - - **************************************************************************/ - -/************************************************************************** - - begin : Sat Apr 30 2005 - copyright : (C) 2002-2005 by Ewald Arnold - email : mockpp at ewald-arnold dot de - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2 of the License, - or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - - **/ - -#ifndef MOCKPP_TimeServer_H -#define MOCKPP_TimeServer_H - -#include <mockpp/mockpp.h> // always first - -#include <ctime> - - -namespace mockpp { - - -/** Base class for time serving purposes - * \ingroup grp_production - * @see MockTimeServer - */ -class TimeServer -{ - public: - - /** Destroys the time server. - */ - virtual ~TimeServer(); - - /** Returns the current unix time - * @return unix time - */ - virtual std::time_t getUnixTime() = 0; -}; - - -/** Real time serving. - * \ingroup grp_production - */ -class RealTimeServer : public TimeServer -{ - public: - - /** Returns the current unix time - * @return unix time - */ - virtual std::time_t getUnixTime(); -}; - - -} // namespace mockpp - - -#endif // MOCKPP_TimeServer_H - - +/** @file + @brief Time dependent objects + + $Id$ + + **************************************************************************/ + +/************************************************************************** + + begin : Sat Apr 30 2005 + copyright : (C) 2002-2006 by Ewald Arnold + email : mockpp at ewald-arnold dot de + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2 of the License, + or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + + **/ + +#ifndef MOCKPP_TimeServer_H +#define MOCKPP_TimeServer_H + +#include <mockpp/mockpp.h> // always first + +#include <ctime> + + +namespace mockpp { + + +/** Base class for time serving purposes + * \ingroup grp_production + * @see MockTimeServer + */ +class TimeServer +{ + public: + + /** Destroys the time server. + */ + virtual ~TimeServer(); + + /** Returns the current unix time + * @return unix time + */ + virtual std::time_t getUnixTime() = 0; +}; + + +/** Real time serving. + * \ingroup grp_production + */ +class RealTimeServer : public TimeServer +{ + public: + + /** Returns the current unix time + * @return unix time + */ + virtual std::time_t getUnixTime(); +}; + + +} // namespace mockpp + + +#endif // MOCKPP_TimeServer_H + + Index: mockpp_production.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/production/mockpp_production.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- mockpp_production.h 27 May 2005 08:20:59 -0000 1.3 +++ mockpp_production.h 29 Dec 2005 19:29:51 -0000 1.4 @@ -1,49 +1,49 @@ -/** @file - @brief Support in production code - - $Id$ - - **************************************************************************/ - -/************************************************************************** - - begin : Dat Apr 30 2005 - copyright : (C) 2002-2005 by Ewald Arnold - email : mockpp at ewald-arnold dot de - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2 of the License, - or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - - **/ - -#ifndef MOCKPP_PRODUCTION_H -#define MOCKPP_PRODUCTION_H - -#include <mockpp/mockpp.h> // always first - -/** @defgroup grp_production Support in production code - * This module contains classes that help to prepare production code - * for testing with mock objects. This code is placed in a library - * of its own. So it is still possible to run production code - * without the bloat of the testing environment. - */ - -namespace mockpp { - -} // namespace mockpp - - -#endif // MOCKPP_PRODUCTION_H - - +/** @file + @brief Support in production code + + $Id$ + + **************************************************************************/ + +/************************************************************************** + + begin : Dat Apr 30 2005 + copyright : (C) 2002-2006 by Ewald Arnold + email : mockpp at ewald-arnold dot de + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2 of the License, + or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + + **/ + +#ifndef MOCKPP_PRODUCTION_H +#define MOCKPP_PRODUCTION_H + +#include <mockpp/mockpp.h> // always first + +/** @defgroup grp_production Support in production code + * This module contains classes that help to prepare production code + * for testing with mock objects. This code is placed in a library + * of its own. So it is still possible to run production code + * without the bloat of the testing environment. + */ + +namespace mockpp { + +} // namespace mockpp + + +#endif // MOCKPP_PRODUCTION_H + + Index: TimeServer.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/production/TimeServer.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- TimeServer.cpp 8 Dec 2005 17:30:18 -0000 1.7 +++ TimeServer.cpp 29 Dec 2005 19:29:51 -0000 1.8 @@ -1,59 +1,59 @@ -/** @file - @brief Time dependent objects - - $Id$ - - **************************************************************************/ - -/************************************************************************** - - begin : Sat Apr 30 2005 - copyright : (C) 2002-2005 by Ewald Arnold - email : mockpp at ewald-arnold dot de - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2 of the License, - or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - - **/ - -#include <mockpp/mockpp.h> // always first - -#include <mockpp/production/TimeServer.h> - - -namespace mockpp { - - -MOCKPP_EXPORT TimeServer::~TimeServer() -{ -} - - -/////////////////////////////////////////////////////////////// - - -std::time_t MOCKPP_EXPORT RealTimeServer::getUnixTime() -{ - return std::time(NULL); -} - - -} // namespace mockpp - - - - - - - +/** @file + @brief Time dependent objects + + $Id$ + + **************************************************************************/ + +/************************************************************************** + + begin : Sat Apr 30 2005 + copyright : (C) 2002-2006 by Ewald Arnold + email : mockpp at ewald-arnold dot de + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2 of the License, + or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + + **/ + +#include <mockpp/mockpp.h> // always first + +#include <mockpp/production/TimeServer.h> + + +namespace mockpp { + + +MOCKPP_EXPORT TimeServer::~TimeServer() +{ +} + + +/////////////////////////////////////////////////////////////// + + +std::time_t MOCKPP_EXPORT RealTimeServer::getUnixTime() +{ + return std::time(NULL); +} + + +} // namespace mockpp + + + + + + + |
|
From: Ewald A. <ewa...@us...> - 2005-12-29 19:30:01
|
Update of /cvsroot/mockpp/mockpp/mockpp/examples In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12933/mockpp/examples Modified Files: mock_greeter.cpp Log Message: update copyright date Index: mock_greeter.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/examples/mock_greeter.cpp,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- mock_greeter.cpp 28 Dec 2005 09:23:30 -0000 1.21 +++ mock_greeter.cpp 29 Dec 2005 19:29:51 -0000 1.22 @@ -5,7 +5,7 @@ ------------------- begin : Wed Jan 1 2003 - copyright : (C) 2002-2005 by Ewald Arnold + copyright : (C) 2002-2006 by Ewald Arnold email : mockpp at ewald-arnold dot de $Id$ |
|
From: Ewald A. <ewa...@us...> - 2005-12-29 19:30:01
|
Update of /cvsroot/mockpp/mockpp/mockpp/docs/en In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12933/mockpp/docs/en Modified Files: bookinfo.docbook index.docbook Log Message: update copyright date Index: index.docbook =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/docs/en/index.docbook,v retrieving revision 1.36 retrieving revision 1.37 diff -u -d -r1.36 -r1.37 --- index.docbook 21 Dec 2005 20:05:40 -0000 1.36 +++ index.docbook 29 Dec 2005 19:29:51 -0000 1.37 @@ -11,7 +11,7 @@ <!ENTITY cxxtest '<application>CxxTest</application>' > <!ENTITY boosttest '<application>Boost.Test</application>' > <!ENTITY cygwin '<application>Cygwin</application>' > - <!ENTITY copyyears '2002-2005' > + <!ENTITY copyyears '2002-2006' > <!ENTITY mockpp_email 'mockpp at ewald-arnold dot de' > <!ENTITY release_date '<pubdate>Published: <?dbtimestamp format="Y-m-d"?></pubdate>' > <!ENTITY release_info '<releaseinfo>1.11.00</releaseinfo>' > Index: bookinfo.docbook =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/docs/en/bookinfo.docbook,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- bookinfo.docbook 27 Dec 2005 18:01:44 -0000 1.10 +++ bookinfo.docbook 29 Dec 2005 19:29:51 -0000 1.11 @@ -21,6 +21,7 @@ <year>2003</year> <year>2004</year> <year>2005</year> + <year>2006</year> <holder>Ewald Arnold</holder> </copyright> |
|
From: Ewald A. <ewa...@us...> - 2005-12-29 12:29:59
|
Update of /cvsroot/mockpp/mockpp/mockpp/config In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20682/mockpp/config Modified Files: gen-config-common.sh Log Message: release beta1 Index: gen-config-common.sh =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/config/gen-config-common.sh,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- gen-config-common.sh 28 Dec 2005 19:43:08 -0000 1.3 +++ gen-config-common.sh 29 Dec 2005 12:29:51 -0000 1.4 @@ -16,7 +16,7 @@ #undef MOCKPP_USE_CPPUNIT /* Define to 1 if you have the <cppunit/Message.h> header file. */ -#undef HAVE_CPPUNIT_MESSAGE_H +#undef HAVE_CPPUNIT_MESSAGE_H /* Define if you have CxxTest installed. */ #define MOCKPP_USE_CXXTEST @@ -42,16 +42,26 @@ /* Define to supress compiler warnings about unused variables. */ #define MOCKPP_UNUSED(x) x; +/* Define to enable built-in mini-stl. */ +/* #undef MOCKPP_USE_MINI_STL */ +/* #undef CXXTEST_USE_MINI_STL */ + +/* Define to disable runtime type information. */ +/* #undef MOCKPP_NO_RTTI */ + +/* Define to disable exceptions. */ +/* #undef MOCKPP_NO_EXCEPTIONS */ + __EOF -echo "/* Define to enable built-in mini-stl. */" >>$1 -grep MOCKPP_USE_MINI_STL ../config.h >>$1 -grep CXXTEST_USE_MINI_STL ../config.h >>$1 -echo >>$1 +#echo "/* Define to enable built-in mini-stl. */" >>$1 +#grep MOCKPP_USE_MINI_STL ../config.h >>$1 +#grep CXXTEST_USE_MINI_STL ../config.h >>$1 +#echo >>$1 -echo "/* Define to disable runtime type information. */" >>$1 -grep MOCKPP_NO_RTTI ../config.h >>$1 -echo >>$1 +#echo "/* Define to disable runtime type information. */" >>$1 +#grep MOCKPP_NO_RTTI ../config.h >>$1 +#echo >>$1 -echo "/* Define to disable exceptions. */" >>$1 -grep MOCKPP_NO_EXCEPTIONS ../config.h >>$1 +#echo "/* Define to disable exceptions. */" >>$1 +#grep MOCKPP_NO_EXCEPTIONS ../config.h >>$1 |
|
From: Ewald A. <ewa...@us...> - 2005-12-29 12:29:58
|
Update of /cvsroot/mockpp/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20682 Modified Files: configure.in Log Message: release beta1 Index: configure.in =================================================================== RCS file: /cvsroot/mockpp/mockpp/configure.in,v retrieving revision 1.106 retrieving revision 1.107 diff -u -d -r1.106 -r1.107 --- configure.in 28 Dec 2005 09:23:30 -0000 1.106 +++ configure.in 29 Dec 2005 12:29:51 -0000 1.107 @@ -45,7 +45,7 @@ AC_CONFIG_AUX_DIR(config) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(mockpp, $MOCKPP_VERSION) +AM_INIT_AUTOMAKE(mockpp, $MOCKPP_VERSION-beta1) AC_SUBST(all_includes) AC_SUBST(all_libraries) |
|
From: Ewald A. <ewa...@us...> - 2005-12-29 12:08:57
|
Update of /cvsroot/mockpp/mockpp/bcb5 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17068/bcb5 Modified Files: mockpp.bpr Log Message: update Index: mockpp.bpr =================================================================== RCS file: /cvsroot/mockpp/mockpp/bcb5/mockpp.bpr,v retrieving revision 1.54 retrieving revision 1.55 diff -u -d -r1.54 -r1.55 --- mockpp.bpr 28 Dec 2005 19:43:08 -0000 1.54 +++ mockpp.bpr 29 Dec 2005 12:08:48 -0000 1.55 @@ -9,7 +9,7 @@ h:\tmp\compile\mockpp_34\\AssertionFailedError.obj h:\tmp\compile\mockpp_34\\Exception.obj h:\tmp\compile\mockpp_34\\Formatter.obj - h:\tmp\compile\mockpp_34\\Assert.obj + h:\tmp\compile\mockpp_34\\Asserter.obj h:\tmp\compile\mockpp_34\\ChainingMockObjectSupport.obj h:\tmp\compile\mockpp_34\\ExpectationCounter.obj h:\tmp\compile\mockpp_34\\ThrowableList.obj |
|
From: Ewald A. <ewa...@us...> - 2005-12-29 12:08:43
|
Update of /cvsroot/mockpp/mockpp/bcb5 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17017/bcb5 Modified Files: Makefile.am Log Message: missing files Index: Makefile.am =================================================================== RCS file: /cvsroot/mockpp/mockpp/bcb5/Makefile.am,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- Makefile.am 28 Dec 2005 21:31:40 -0000 1.14 +++ Makefile.am 29 Dec 2005 12:08:35 -0000 1.15 @@ -37,6 +37,8 @@ mockpp.bpr \ mock_test.bpf \ mock_test.bpr \ + mock_test_win32.bpf \ + mock_test_win32.bpr \ jmock_test.bpf \ jmock_test.bpr |
|
From: Ewald A. <ewa...@us...> - 2005-12-29 12:08:19
|
Update of /cvsroot/mockpp/mockpp/mockpp/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16854/mockpp/tests Modified Files: NoException_test.cpp Log Message: avoid warning Index: NoException_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/NoException_test.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- NoException_test.cpp 28 Dec 2005 21:29:21 -0000 1.8 +++ NoException_test.cpp 29 Dec 2005 12:07:57 -0000 1.9 @@ -126,7 +126,7 @@ template <> -void storeMalfunctionData(const MyStruct &e) +void storeMalfunctionData(const MyStruct &/*e*/) { bad_data2 = MOCKPP_PCHAR("MyStruct"); } |
|
From: Ewald A. <ewa...@us...> - 2005-12-29 12:07:48
|
Update of /cvsroot/mockpp/mockpp/3party/cxxtest/cxxtest In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16739/3party/cxxtest/cxxtest Modified Files: Flags.h StdHeaders.h Log Message: fix regular stl Index: Flags.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/3party/cxxtest/cxxtest/Flags.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Flags.h 18 Dec 2005 16:56:22 -0000 1.3 +++ Flags.h 29 Dec 2005 12:07:36 -0000 1.4 @@ -45,6 +45,7 @@ #else +#define CXXTEST_DEQUE_H <deque> #define CXXTEST_STRING_H <string> #define CXXTEST_VECTOR_H <vector> #define CXXTEST_MAP_H <map> Index: StdHeaders.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/3party/cxxtest/cxxtest/StdHeaders.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- StdHeaders.h 18 Dec 2005 16:56:22 -0000 1.2 +++ StdHeaders.h 29 Dec 2005 12:07:36 -0000 1.3 @@ -22,6 +22,10 @@ // #include CXXTEST_ALGORITHM_H // #include CXXTEST_FUNCTION_H +#ifndef CXXTEST_USE_MINI_STL +#include CXXTEST_DEQUE_H +#endif + #ifdef _MSC_VER # pragma warning( pop ) #endif // _MSC_VER |
|
From: Ewald A. <ewa...@us...> - 2005-12-29 08:05:18
|
Update of /cvsroot/mockpp/mockpp/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12772/mockpp Modified Files: Makefile.am Log Message: prepare release Index: Makefile.am =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/Makefile.am,v retrieving revision 1.105 retrieving revision 1.106 diff -u -d -r1.105 -r1.106 --- Makefile.am 28 Dec 2005 21:41:32 -0000 1.105 +++ Makefile.am 29 Dec 2005 08:04:40 -0000 1.106 @@ -119,6 +119,7 @@ echo "" >>$@ echo "/* Define to use sprintf_s instead of sprintf. */" >>$@ echo "#define HAVE_SPRINTF_S" >>$@ + echo "" >>$@ $(SHELL) $(srcdir)/config/gen-config-common.sh $@ $(VERSION) $(PACKAGE) -test $@ -ef $(srcdir) || cp $@ $(srcdir) |
|
From: Ewald A. <ewa...@us...> - 2005-12-29 08:05:18
|
Update of /cvsroot/mockpp/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12772 Modified Files: ChangeLog TODO Log Message: prepare release Index: TODO =================================================================== RCS file: /cvsroot/mockpp/mockpp/TODO,v retrieving revision 1.52 retrieving revision 1.53 diff -u -d -r1.52 -r1.53 --- TODO 28 Dec 2005 19:40:58 -0000 1.52 +++ TODO 29 Dec 2005 08:04:40 -0000 1.53 @@ -9,6 +9,10 @@ Boost.Test +check sprintf_s +check qt +check x11 + DOC: ---- Index: ChangeLog =================================================================== RCS file: /cvsroot/mockpp/mockpp/ChangeLog,v retrieving revision 1.87 retrieving revision 1.88 diff -u -d -r1.87 -r1.88 --- ChangeLog 28 Dec 2005 21:31:53 -0000 1.87 +++ ChangeLog 29 Dec 2005 08:04:40 -0000 1.88 @@ -17,7 +17,7 @@ - compatibility break: moved all framework related files to mockpp/framework - CxxTest (built-in version) is default test framework now, CppUnit remains an option - - rename Assert.* to Asserter.* due to collisions with Asserter.h on + - rename Assert.* to Asserter.* due to collisions with <assert.h> on win platforms 2005-11-19 1.10.0: |
|
From: Ewald A. <ewa...@us...> - 2005-12-29 08:04:51
|
Update of /cvsroot/mockpp/mockpp/msvc2005/mockpp/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12772/msvc2005/mockpp/tests Modified Files: Makefile.am Log Message: prepare release Index: Makefile.am =================================================================== RCS file: /cvsroot/mockpp/mockpp/msvc2005/mockpp/tests/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile.am 8 Dec 2005 17:24:13 -0000 1.1 +++ Makefile.am 29 Dec 2005 08:04:42 -0000 1.2 @@ -1,4 +1,6 @@ -EXTRA_DIST = mock_test.vcproj +EXTRA_DIST = \ + mock_test.vcproj \ + mock_test_win32.vcproj CLEAN_FILES = *.plg *.opt *.ncb *.dep *.~* *.~~* *~ |
|
From: Ewald A. <ewa...@us...> - 2005-12-29 08:04:50
|
Update of /cvsroot/mockpp/mockpp/msvc2005/mockpp/examples/tutorial In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12772/msvc2005/mockpp/examples/tutorial Modified Files: Makefile.am Log Message: prepare release Index: Makefile.am =================================================================== RCS file: /cvsroot/mockpp/mockpp/msvc2005/mockpp/examples/tutorial/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile.am 8 Dec 2005 17:26:05 -0000 1.1 +++ Makefile.am 29 Dec 2005 08:04:41 -0000 1.2 @@ -1,6 +1,12 @@ all: -EXTRA_DIST = basicmock.vcproj visitmock.vcproj chainmock.vcproj poormock.vcproj poormock_se.vcproj cppunit.vcproj +EXTRA_DIST = \ + basicmock.vcproj \ + visitmock.vcproj \ + chainmock.vcproj \ + poormock.vcproj \ + poormock_se.vcproj \ + cppunit.vcproj CLEAN_FILES = *.plg *.opt *.ncb *.dep *.~* *.~~* *~ *SD*.EA |
|
From: Ewald A. <ewa...@us...> - 2005-12-29 08:04:49
|
Update of /cvsroot/mockpp/mockpp/msvc2005/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12772/msvc2005/mockpp Modified Files: Makefile.am Log Message: prepare release Index: Makefile.am =================================================================== RCS file: /cvsroot/mockpp/mockpp/msvc2005/mockpp/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile.am 8 Dec 2005 17:24:13 -0000 1.1 +++ Makefile.am 29 Dec 2005 08:04:40 -0000 1.2 @@ -1,6 +1,10 @@ SUBDIRS = examples tests -EXTRA_DIST = mockpp.vcproj mockpp_production.vcproj mockpp.sln +EXTRA_DIST = \ + mockpp.vcproj \ + mockpp_production.vcproj \ + mockpp_cxxtest.vcproj \ + mockpp.sln CLEAN_FILES = *.plg *.opt *.ncb *.dep *.~* *.~~* *~ |
|
From: Ewald A. <ewa...@us...> - 2005-12-28 21:57:41
|
Update of /cvsroot/mockpp/mockpp/mockpp/compat In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6453/mockpp/compat Added Files: Asserter.cpp Asserter.h Removed Files: Assert.cpp Assert.h Log Message: avoid name collision on win32 --- NEW FILE: Asserter.h --- /** @file @brief Handle assertions $Id: Asserter.h,v 1.1 2005/12/28 21:57:33 ewald-arnold Exp $ ***************************************************************************/ /************************************************************************** begin : Sat Dec 21 2002 copyright : (C) 2002-2005 by Ewald Arnold email : mockpp at ewald-arnold dot de This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ #ifndef MOCKPP_ASSERT_H #define MOCKPP_ASSERT_H #include <mockpp/mockpp.h> // always first #include <mockpp/compat/AssertionFailedError.h> namespace mockpp { /** Asserts that a condition is true. If it isn't it throws * an AssertionFailedError with the given infomation. * @ingroup grp_helper * @param srcline the line in the sourcefile * @param srcfile the name of the sourcefile * @param message a human readable description about the cause * @param condition if false, an AssertionFailedError is thrown */ void assertTrue(unsigned srcline, const char* srcfile, const String &message, bool condition); /** Asserts that a condition is true. If it isn't it throws * an AssertionFailedError. * @ingroup grp_helper * @param srcline the line in the sourcefile * @param srcfile the name of the sourcefile * @param condition if false, an AssertionFailedError is thrown */ void assertTrue(unsigned srcline, const char* srcfile, bool condition); /** Asserts that a condition is false. If it isn't it throws * an AssertionFailedError with the given message. * @ingroup grp_helper * @param srcline the line in the sourcefile * @param srcfile the name of the sourcefile * @param message a human readable description about the cause * @param condition if true, an AssertionFailedError is thrown */ void assertFalse(unsigned srcline, const char* srcfile, const String &message, bool condition); /** Asserts that a condition is false. If it isn't it throws * an AssertionFailedError. * @ingroup grp_helper * @param srcline the line in the sourcefile * @param srcfile the name of the sourcefile * @param condition if true, an AssertionFailedError is thrown */ void assertFalse(unsigned srcline, const char* srcfile, bool condition); /** Fails a test with the given message (AssertionFailedError is thrown). * @ingroup grp_helper * @param srcline the line in the sourcefile * @param srcfile the name of the sourcefile * @param message a human readable description about the cause */ void fail(unsigned srcline, const char* srcfile, const String &message); /** Fails a test with no message. * @ingroup grp_helper * @param srcline the line in the sourcefile * @param srcfile the name of the sourcefile */ void fail(unsigned srcline, const char* srcfile); /** Asserts that two doubles are equal concerning a delta. If they are not * an AssertionFailedError is thrown with the given message. If the expected * value is infinity then the delta value is ignored. * @ingroup grp_helper * @param srcline the line in the sourcefile * @param srcfile the name of the sourcefile * @param message a human readable description about the cause * @param expected the expected value * @param actual the actual value * @param delta the maximal difference which is allowed for actual from expected */ void assertDelta(unsigned srcline, const char* srcfile, const String &message, double expected, double actual, double delta); /** Asserts that two doubles are equal concerning a delta. If the expected * value is infinity then the delta value is ignored. * @ingroup grp_helper * @param srcline the line in the sourcefile * @param srcfile the name of the sourcefile * @param expected the expected value * @param actual the actual value * @param delta the maximal difference which is allowed for actual from expected */ void assertDelta(unsigned srcline, const char* srcfile, double expected, double actual, double delta); /** Asserts that two floats are equal concerning a delta. If they are not * an AssertionFailedError is thrown with the given message. If the expected * value is infinity then the delta value is ignored. * @ingroup grp_helper * @param srcline the line in the sourcefile * @param srcfile the name of the sourcefile * @param message a human readable description about the cause * @param expected the expected value * @param actual the actual value * @param delta the maximal difference which is allowed for actual from expected */ void assertDelta(unsigned srcline, const char* srcfile, const String &message, float expected, float actual, float delta); /** Asserts that two floats are equal concerning a delta. If the expected * value is infinity then the delta value is ignored. * @ingroup grp_helper * @param srcline the line in the sourcefile * @param srcfile the name of the sourcefile * @param expected the expected value * @param actual the actual value * @param delta the maximal difference which is allowed for actual from expected */ void assertDelta(unsigned srcline, const char* srcfile, float expected, float actual, float delta); /** Asserts that two c-string are equal. If they are not * an AssertionFailedError is thrown with the given message. * @ingroup grp_helper * @param srcline the line in the sourcefile * @param srcfile the name of the sourcefile * @param message a human readable description about the cause * @param expected the expected value * @param actual the actual value */ void assertEquals(unsigned srcline, const char* srcfile, const String &message, const char *expected, const char *actual); /** Asserts that two c-string are equal. * @ingroup grp_helper * @param srcline the line in the sourcefile * @param srcfile the name of the sourcefile * @param expected the expected value * @param actual the actual value */ void assertEquals(unsigned srcline, const char* srcfile, const char *expected, const char *actual); #ifdef MOCKPP_UNICODE /** Asserts that two unicode c-string are equal. If they are not * an AssertionFailedError is thrown with the given message. * @ingroup grp_helper * @param srcline the line in the sourcefile * @param srcfile the name of the sourcefile * @param message a human readable description about the cause * @param expected the expected value * @param actual the actual value */ void assertEquals(unsigned srcline, const char* srcfile, const String &message, const wchar_t *expected, const wchar_t *actual); /** Asserts that two unicode c-string are equal. * @ingroup grp_helper * @param srcline the line in the sourcefile * @param srcfile the name of the sourcefile * @param expected the expected value * @param actual the actual value */ void assertEquals(unsigned srcline, const char* srcfile, const wchar_t *expected, const wchar_t *actual); #endif /** Asserts that two values are equal. * @ingroup grp_helper * @param srcline the line in the sourcefile * @param srcfile the name of the sourcefile * @param message a human readable description about the cause * @param expected the expected value * @param actual the actual value */ template <class T> void assertEquals(unsigned srcline, const char* srcfile, const String &message, const T &expected, const T &actual) { if (expected != actual) fail(srcline, srcfile, message); } /** Asserts that two values are equal. * @ingroup grp_helper * @param srcline the line in the sourcefile * @param srcfile the name of the sourcefile * @param expected the expected value * @param actual the actual value */ template <class T> void assertEquals(unsigned srcline, const char* srcfile, const T &expected, const T &actual) { assertEquals(srcline, srcfile, MOCKPP_PCHAR(""), expected, actual); } /** Asserts that two values are equal concerning a delta. If they are not * an AssertionFailedError is thrown with the given message. * @ingroup grp_helper * @param srcline the line in the sourcefile * @param srcfile the name of the sourcefile * @param message a human readable description about the cause * @param expected the expected value * @param actual the actual value * @param delta the maximal difference which is allowed for actual from expected */ template <class T> void assertDelta(unsigned srcline, const char* srcfile, const String &message, const T &expected, const T &actual, const T &delta) { T diff = expected < actual ? actual - expected : expected - actual; if (diff > delta) fail(srcline, srcfile, message); } /** Asserts that two values are equal concerning a delta. * @ingroup grp_helper * @param srcline the line in the sourcefile * @param srcfile the name of the sourcefile * @param expected the expected value * @param actual the actual value * @param delta the maximal difference which is allowed for actual from expected */ template <class T> void assertDelta(unsigned srcline, const char* srcfile, const T &expected, const T &actual, const T &delta) { assertDelta(srcline, srcfile, MOCKPP_PCHAR(""), expected, actual, delta); } /** Asserts that a values lies between two boundary values. * @ingroup grp_helper * @param srcline the line in the sourcefile * @param srcfile the name of the sourcefile * @param message a human readable description about the cause * @param lo lower boundaray * @param up upper boundary * @param actual value */ template <class T> void assertBoundary(unsigned srcline, const char* srcfile, const String &message, const T &lo, const T &up, const T &actual) { if ((actual < lo) || (up < actual)) fail(srcline, srcfile, message); } /** Asserts that a values lies between two boundary values. * @ingroup grp_helper * @param srcline the line in the sourcefile * @param srcfile the name of the sourcefile * @param lo lower boundaray * @param up upper boundary * @param actual value */ template <class T> void assertBoundary(unsigned srcline, const char* srcfile, const T &lo, const T &up, const T &actual) { assertBoundary(srcline, srcfile, MOCKPP_PCHAR(""), lo, up, actual); } } // namespace mockpp /** Asserts that two values are equal. * @ingroup grp_helper * @param msg a human readable description about the cause * @param a first value * @param b second value */ #define MOCKPP_ASSERT_EQUALS_MESSAGE(msg, a, b) mockpp::assertEquals(__LINE__, __FILE__, msg, a, b) /** @def MOCKPP_ASSERT_EQUALS * @ingroup grp_helper * Asserts that two values are equal. * The condition is converted and passed as the according message. * @param a first value * @param b second value */ # define MOCKPP_ASSERT_EQUALS(a, b) mockpp::assertEquals(__LINE__, __FILE__, MOCKPP_PCHAR("invalid: ") \ MOCKPP_PCHAR(#a) MOCKPP_PCHAR(" == ") MOCKPP_PCHAR(#b), a, b) /** Asserts that two values are equal concerning a delta. * @ingroup grp_helper * @param msg a human readable description about the cause * @param a first value * @param b second value * @param delta maximal difference a to b */ #define MOCKPP_ASSERT_DELTA_MESSAGE(msg, a, b, delta) mockpp::assertDelta(__LINE__, __FILE__, msg, a, b, delta) /** @def MOCKPP_ASSERT_DELTA * @ingroup grp_helper * Asserts that two values are equal concerning a delta. * The condition is converted and passed as the according message. * @param a first value * @param b second value * @param delta maximal difference a to b */ # define MOCKPP_ASSERT_DELTA(a, b, delta) mockpp::assertDelta(__LINE__, __FILE__, MOCKPP_PCHAR("invalid: ") \ MOCKPP_PCHAR(#a) MOCKPP_PCHAR(" +- ") MOCKPP_PCHAR(#delta) \ MOCKPP_PCHAR(" == ") MOCKPP_PCHAR(#b), a, b, delta) /** Asserts that a values lies between two boundary values. * @ingroup grp_helper * @param msg a human readable description about the cause * @param lo lower boundaray * @param up upper boundary * @param a value */ #define MOCKPP_ASSERT_BOUNDARY_MESSAGE(msg, lo, up, a) mockpp::assertBoundary(__LINE__, __FILE__, msg, lo, up, a) /** @def MOCKPP_ASSERT_BOUNDARY * @ingroup grp_helper * Asserts that two values are equal concerning a delta. * The condition is converted and passed as the according message. * @param lo lower boundaray * @param up upper boundary * @param a value */ # define MOCKPP_ASSERT_BOUNDARY(lo, up, a) mockpp::assertBoundary(__LINE__, __FILE__, MOCKPP_PCHAR("invalid: ") \ MOCKPP_PCHAR(#lo) MOCKPP_PCHAR(" < ") MOCKPP_PCHAR(#a) \ MOCKPP_PCHAR(" < ") MOCKPP_PCHAR(#up), lo, up, a) /** Asserts that a condition is true. * @ingroup grp_helper * @param msg a human readable description about the cause * @param cond boolean condition */ #define MOCKPP_ASSERT_TRUE_MESSAGE(msg, cond) mockpp::assertTrue(__LINE__, __FILE__, msg, cond) /** @def MOCKPP_ASSERT_TRUE * @ingroup grp_helper * Asserts that a condition is true. * The condition is converted and passed as the according message. * @param cond boolean condition */ # define MOCKPP_ASSERT_TRUE(cond) mockpp::assertTrue(__LINE__, __FILE__, MOCKPP_PCHAR("!true: ") MOCKPP_PCHAR(#cond), cond) /** Asserts that a condition is false. * @ingroup grp_helper * @param msg a human readable description about the cause * @param cond boolean condition */ #define MOCKPP_ASSERT_FALSE_MESSAGE(msg, cond) mockpp::assertFalse(__LINE__, __FILE__, msg, cond) /** @def MOCKPP_ASSERT_FALSE * @ingroup grp_helper * Asserts that a condition is false. * The condition is converted and passed as the according message. * @param cond boolean condition */ # define MOCKPP_ASSERT_FALSE(cond) mockpp::assertFalse(__LINE__, __FILE__, MOCKPP_PCHAR("!false: ") MOCKPP_PCHAR(#cond), cond) /** Unconditionally throws an AssertionFailedError. * @ingroup grp_helper * @param msg a human readable description about the cause */ #define MOCKPP_FAIL(msg) mockpp::fail(__LINE__, __FILE__, msg) #endif // MOCKPP_ASSERT_H --- Assert.h DELETED --- --- Assert.cpp DELETED --- --- NEW FILE: Asserter.cpp --- /** @file @brief handle assertions $Id: Asserter.cpp,v 1.1 2005/12/28 21:57:33 ewald-arnold Exp $ ***************************************************************************/ /************************************************************************** begin : Sat Dec 21 2002 copyright : (C) 2002-2005 by Ewald Arnold email : mockpp at ewald-arnold dot de This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ #include <mockpp/mockpp.h> // always first #include <cmath> #include <cstring> #ifdef HAVE_CWCHAR #include <cwchar> #endif // Taken almost literally from GNU Libc sources: #if !defined(HAVE_WCSCMP) && defined(MOCKPP_UNICODE) /* Compare S1 and S2, returning less than, equal to or greater than zero if S1 is lexicographically less than, equal to or greater than S2. */ static int wcscmp (const wchar_t *s1, const wchar_t *s2) { wchar_t c1, c2; do { c1 = *s1++; c2 = *s2++; if (c1 == L'\0') return c1 - c2; } while (c1 == c2); return c1 - c2; } #endif // HAVE_WCSCMP #include <mockpp/compat/Asserter.h> namespace mockpp { void MOCKPP_EXPORT assertTrue(unsigned srcline, const char* srcfile, const String &message, bool condition) { if (!condition) fail(srcline, srcfile, message); } void MOCKPP_EXPORT assertTrue(unsigned srcline, const char* srcfile, bool condition) { assertTrue(srcline, srcfile, MOCKPP_PCHAR(""), condition); } void MOCKPP_EXPORT assertFalse(unsigned srcline, const char* srcfile, const String &message, bool condition) { assertTrue(srcline, srcfile, message, !condition); } void MOCKPP_EXPORT assertFalse(unsigned srcline, const char* srcfile, bool condition) { assertFalse(srcline, srcfile, MOCKPP_PCHAR(""), condition); } void MOCKPP_EXPORT fail(unsigned srcline, const char* srcfile, const String &message) { assertionFailed(srcline, srcfile, message); } void MOCKPP_EXPORT fail(unsigned srcline, const char* srcfile) { fail(srcline, srcfile, MOCKPP_PCHAR("")); } void MOCKPP_EXPORT assertEquals(unsigned srcline, const char* srcfile, const char *expected, const char *actual) { assertEquals(srcline, srcfile, MOCKPP_PCHAR(""), expected, actual); } void MOCKPP_EXPORT assertEquals(unsigned srcline, const char* srcfile, const String &message, const char *expected, const char *actual) { #if defined(_MSC_VER) if (strcmp(expected, actual) != 0) #else if (std::strcmp(expected, actual) != 0) #endif fail(srcline, srcfile, message); } #ifdef MOCKPP_UNICODE void MOCKPP_EXPORT assertEquals(unsigned srcline, const char* srcfile, const wchar_t *expected, const wchar_t *actual) { assertEquals(srcline, srcfile, MOCKPP_PCHAR(""), expected, actual); } void MOCKPP_EXPORT assertEquals(unsigned srcline, const char* srcfile, const String &message, const wchar_t *expected, const wchar_t *actual) { #if !defined(HAVE_STD_WCSCMP) if (wcscmp(expected, actual) != 0) #else if (std::wcscmp(expected, actual) != 0) #endif fail(srcline, srcfile, message); } #endif void MOCKPP_EXPORT assertDelta(unsigned srcline, const char* srcfile, const String &message, double expected, double actual, double delta) { // handle infinity specially since subtracting to infinite values gives NaN and the // the following test fails #ifdef HAVE_LIMITS if (expected == std::numeric_limits<double>::infinity()) { if (!(expected == actual)) fail(srcline, srcfile, message); } else #endif #if defined(_MSC_VER) if (!(fabs(expected-actual) <= fabs(delta))) // Because comparison with NaN always returns false #else if (!(std::fabs(expected-actual) <= std::fabs(delta))) // Because comparison with NaN always returns false #endif fail(srcline, srcfile, message); } void MOCKPP_EXPORT assertDelta(unsigned srcline, const char* srcfile, double expected, double actual, double delta) { assertDelta(srcline, srcfile, MOCKPP_PCHAR(""), expected, actual, delta); } void MOCKPP_EXPORT assertDelta(unsigned srcline, const char* srcfile, const String &message, float expected, float actual, float delta) { // handle infinity specially since subtracting to infinite values gives NaN and the // the following test fails #ifdef HAVE_LIMITS if (expected == std::numeric_limits<float>::infinity()) { if (!(expected == actual)) fail(srcline, srcfile, message); } else #endif #if defined(_MSC_VER) if (!(fabs(expected-actual) <= fabs(delta))) #else if (!(std::fabs(expected-actual) <= std::fabs(delta))) #endif fail(srcline, srcfile, message); } void MOCKPP_EXPORT assertDelta(unsigned srcline, const char* srcfile, float expected, float actual, float delta) { assertDelta(srcline, srcfile, MOCKPP_PCHAR(""), expected, actual, delta); } } // namespace mockpp |
|
From: Ewald A. <ewa...@us...> - 2005-12-28 21:49:45
|
Update of /cvsroot/mockpp/mockpp/3party/cxxtest/cxxtest In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4637/3party/cxxtest/cxxtest Modified Files: .cvsignore Log Message: cvsignore Index: .cvsignore =================================================================== RCS file: /cvsroot/mockpp/mockpp/3party/cxxtest/cxxtest/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- .cvsignore 28 Dec 2005 21:41:31 -0000 1.4 +++ .cvsignore 28 Dec 2005 21:49:32 -0000 1.5 @@ -4,3 +4,4 @@ *.BAK *.~* .deps +Makefile |
|
From: Ewald A. <ewa...@us...> - 2005-12-28 21:49:45
|
Update of /cvsroot/mockpp/mockpp/mockpp/visiting In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4637/mockpp/visiting Modified Files: .cvsignore Log Message: cvsignore Index: .cvsignore =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/visiting/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- .cvsignore 10 Dec 2005 20:07:22 -0000 1.2 +++ .cvsignore 28 Dec 2005 21:49:32 -0000 1.3 @@ -1 +1,4 @@ Makefile.in +Makefile +.deps + |
|
From: Ewald A. <ewa...@us...> - 2005-12-28 21:41:44
|
Update of /cvsroot/mockpp/mockpp/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3177/mockpp Modified Files: Makefile.am Log Message: cvsignore Index: Makefile.am =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/Makefile.am,v retrieving revision 1.104 retrieving revision 1.105 diff -u -d -r1.104 -r1.105 --- Makefile.am 28 Dec 2005 21:30:16 -0000 1.104 +++ Makefile.am 28 Dec 2005 21:41:32 -0000 1.105 @@ -118,7 +118,7 @@ TODAY=`date +%Y-%m-%d` ; echo "/* Generated: $$TODAY */" >>$@ echo "" >>$@ echo "/* Define to use sprintf_s instead of sprintf. */" >>$@ - echo "#define HAVE_SPRINTF_S" + echo "#define HAVE_SPRINTF_S" >>$@ $(SHELL) $(srcdir)/config/gen-config-common.sh $@ $(VERSION) $(PACKAGE) -test $@ -ef $(srcdir) || cp $@ $(srcdir) |
|
From: Ewald A. <ewa...@us...> - 2005-12-28 21:41:44
|
Update of /cvsroot/mockpp/mockpp/3party/cxxtest In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3177/3party/cxxtest Modified Files: .cvsignore Log Message: cvsignore Index: .cvsignore =================================================================== RCS file: /cvsroot/mockpp/mockpp/3party/cxxtest/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- .cvsignore 10 Dec 2005 15:20:05 -0000 1.2 +++ .cvsignore 28 Dec 2005 21:41:31 -0000 1.3 @@ -1,2 +1,4 @@ sample Makefile.in +Makefile + |
