mockpp-commits Mailing List for Mock Objects for C++ (Page 2)
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
|
|
From: Ewald A. <ewa...@us...> - 2006-04-07 19:54:20
|
Update of /cvsroot/mockpp/mockpp/mockpp/chaining In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16579/mockpp/chaining Modified Files: ChainingMockObjectSupport.h Makefile.am Added Files: OnConsecutiveCalls.h gen_consecutive_N.pl Log Message: new generator script --- NEW FILE: OnConsecutiveCalls.h --- /** @file @internal NOT INTENDED FOR PUBLIC INCLUSION @brief Generated with gen_consecutive_N.pl. $Id: OnConsecutiveCalls.h,v 1.1 2006/04/07 19:54:14 ewald-arnold Exp $ ***************************************************************************/ /************************************************************************** begin : Fri Apr 7 2006 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_ONCONSECUTIVECALLS_H #define MOCKPP_ONCONSECUTIVECALLS_H #include <mockpp/mockpp.h> // always first MOCKPP_NS_START /** Creates a sequence of 1 typeless stubs. * @ingroup grp_stub_abbrev * @see mockpp::TypelessStubSequence * @param stub1 first stub * @return the new stub */ template <typename R> typename TypelessStub<R>::AP onConsecutiveCalls( TypelessStub<R> *stub1 ) { MOCKPP_STL::vector<TypelessStub<R>*> vec; vec.push_back( stub1); return new TypelessStubSequence<R>( vec.begin(), vec.end() ); } /** Creates a sequence of 1 stubs. * @ingroup grp_stub_abbrev * @see mockpp::StubSequence * @param stub1 first stub * @return the new stub */ template <typename R, // ReturnType typename I> // Invocation typename Stub<R, I>::AP onConsecutiveCalls( Stub<R, I> *stub1 ) { MOCKPP_STL::vector<Stub<R, I>*> vec; vec.push_back( stub1); return new StubSequence<R, I>( vec.begin(), vec.end() ); } /** Creates a sequence of 2 typeless stubs. * @ingroup grp_stub_abbrev * @see mockpp::TypelessStubSequence * @param stub1 first stub * @param stub2 the next stub * @return the new stub */ template <typename R> typename TypelessStub<R>::AP onConsecutiveCalls( TypelessStub<R> *stub1 , TypelessStub<R> *stub2 ) { MOCKPP_STL::vector<TypelessStub<R>*> vec; vec.push_back( stub1); vec.push_back( stub2); return new TypelessStubSequence<R>( vec.begin(), vec.end() ); } /** Creates a sequence of 2 stubs. * @ingroup grp_stub_abbrev * @see mockpp::StubSequence * @param stub1 first stub * @param stub2 the next stub * @return the new stub */ template <typename R, // ReturnType typename I> // Invocation typename Stub<R, I>::AP onConsecutiveCalls( Stub<R, I> *stub1 , Stub<R, I> *stub2 ) { MOCKPP_STL::vector<Stub<R, I>*> vec; vec.push_back( stub1); vec.push_back( stub2); return new StubSequence<R, I>( vec.begin(), vec.end() ); } /** Creates a sequence of 3 typeless stubs. * @ingroup grp_stub_abbrev * @see mockpp::TypelessStubSequence * @param stub1 first stub * @param stub2 the next stub * @param stub3 the next stub * @return the new stub */ template <typename R> typename TypelessStub<R>::AP onConsecutiveCalls( TypelessStub<R> *stub1 , TypelessStub<R> *stub2 , TypelessStub<R> *stub3 ) { MOCKPP_STL::vector<TypelessStub<R>*> vec; vec.push_back( stub1); vec.push_back( stub2); vec.push_back( stub3); return new TypelessStubSequence<R>( vec.begin(), vec.end() ); } /** Creates a sequence of 3 stubs. * @ingroup grp_stub_abbrev * @see mockpp::StubSequence * @param stub1 first stub * @param stub2 the next stub * @param stub3 the next stub * @return the new stub */ template <typename R, // ReturnType typename I> // Invocation typename Stub<R, I>::AP onConsecutiveCalls( Stub<R, I> *stub1 , Stub<R, I> *stub2 , Stub<R, I> *stub3 ) { MOCKPP_STL::vector<Stub<R, I>*> vec; vec.push_back( stub1); vec.push_back( stub2); vec.push_back( stub3); return new StubSequence<R, I>( vec.begin(), vec.end() ); } /** Creates a sequence of 4 typeless stubs. * @ingroup grp_stub_abbrev * @see mockpp::TypelessStubSequence * @param stub1 first stub * @param stub2 the next stub * @param stub3 the next stub * @param stub4 the next stub * @return the new stub */ template <typename R> typename TypelessStub<R>::AP onConsecutiveCalls( TypelessStub<R> *stub1 , TypelessStub<R> *stub2 , TypelessStub<R> *stub3 , TypelessStub<R> *stub4 ) { MOCKPP_STL::vector<TypelessStub<R>*> vec; vec.push_back( stub1); vec.push_back( stub2); vec.push_back( stub3); vec.push_back( stub4); return new TypelessStubSequence<R>( vec.begin(), vec.end() ); } /** Creates a sequence of 4 stubs. * @ingroup grp_stub_abbrev * @see mockpp::StubSequence * @param stub1 first stub * @param stub2 the next stub * @param stub3 the next stub * @param stub4 the next stub * @return the new stub */ template <typename R, // ReturnType typename I> // Invocation typename Stub<R, I>::AP onConsecutiveCalls( Stub<R, I> *stub1 , Stub<R, I> *stub2 , Stub<R, I> *stub3 , Stub<R, I> *stub4 ) { MOCKPP_STL::vector<Stub<R, I>*> vec; vec.push_back( stub1); vec.push_back( stub2); vec.push_back( stub3); vec.push_back( stub4); return new StubSequence<R, I>( vec.begin(), vec.end() ); } /** Creates a sequence of 5 typeless stubs. * @ingroup grp_stub_abbrev * @see mockpp::TypelessStubSequence * @param stub1 first stub * @param stub2 the next stub * @param stub3 the next stub * @param stub4 the next stub * @param stub5 the next stub * @return the new stub */ template <typename R> typename TypelessStub<R>::AP onConsecutiveCalls( TypelessStub<R> *stub1 , TypelessStub<R> *stub2 , TypelessStub<R> *stub3 , TypelessStub<R> *stub4 , TypelessStub<R> *stub5 ) { MOCKPP_STL::vector<TypelessStub<R>*> vec; vec.push_back( stub1); vec.push_back( stub2); vec.push_back( stub3); vec.push_back( stub4); vec.push_back( stub5); return new TypelessStubSequence<R>( vec.begin(), vec.end() ); } /** Creates a sequence of 5 stubs. * @ingroup grp_stub_abbrev * @see mockpp::StubSequence * @param stub1 first stub * @param stub2 the next stub * @param stub3 the next stub * @param stub4 the next stub * @param stub5 the next stub * @return the new stub */ template <typename R, // ReturnType typename I> // Invocation typename Stub<R, I>::AP onConsecutiveCalls( Stub<R, I> *stub1 , Stub<R, I> *stub2 , Stub<R, I> *stub3 , Stub<R, I> *stub4 , Stub<R, I> *stub5 ) { MOCKPP_STL::vector<Stub<R, I>*> vec; vec.push_back( stub1); vec.push_back( stub2); vec.push_back( stub3); vec.push_back( stub4); vec.push_back( stub5); return new StubSequence<R, I>( vec.begin(), vec.end() ); } /** Creates a sequence of 6 typeless stubs. * @ingroup grp_stub_abbrev * @see mockpp::TypelessStubSequence * @param stub1 first stub * @param stub2 the next stub * @param stub3 the next stub * @param stub4 the next stub * @param stub5 the next stub * @param stub6 the next stub * @return the new stub */ template <typename R> typename TypelessStub<R>::AP onConsecutiveCalls( TypelessStub<R> *stub1 , TypelessStub<R> *stub2 , TypelessStub<R> *stub3 , TypelessStub<R> *stub4 , TypelessStub<R> *stub5 , TypelessStub<R> *stub6 ) { MOCKPP_STL::vector<TypelessStub<R>*> vec; vec.push_back( stub1); vec.push_back( stub2); vec.push_back( stub3); vec.push_back( stub4); vec.push_back( stub5); vec.push_back( stub6); return new TypelessStubSequence<R>( vec.begin(), vec.end() ); } /** Creates a sequence of 6 stubs. * @ingroup grp_stub_abbrev * @see mockpp::StubSequence * @param stub1 first stub * @param stub2 the next stub * @param stub3 the next stub * @param stub4 the next stub * @param stub5 the next stub * @param stub6 the next stub * @return the new stub */ template <typename R, // ReturnType typename I> // Invocation typename Stub<R, I>::AP onConsecutiveCalls( Stub<R, I> *stub1 , Stub<R, I> *stub2 , Stub<R, I> *stub3 , Stub<R, I> *stub4 , Stub<R, I> *stub5 , Stub<R, I> *stub6 ) { MOCKPP_STL::vector<Stub<R, I>*> vec; vec.push_back( stub1); vec.push_back( stub2); vec.push_back( stub3); vec.push_back( stub4); vec.push_back( stub5); vec.push_back( stub6); return new StubSequence<R, I>( vec.begin(), vec.end() ); } /** Creates a sequence of 7 typeless stubs. * @ingroup grp_stub_abbrev * @see mockpp::TypelessStubSequence * @param stub1 first stub * @param stub2 the next stub * @param stub3 the next stub * @param stub4 the next stub * @param stub5 the next stub * @param stub6 the next stub * @param stub7 the next stub * @return the new stub */ template <typename R> typename TypelessStub<R>::AP onConsecutiveCalls( TypelessStub<R> *stub1 , TypelessStub<R> *stub2 , TypelessStub<R> *stub3 , TypelessStub<R> *stub4 , TypelessStub<R> *stub5 , TypelessStub<R> *stub6 , TypelessStub<R> *stub7 ) { MOCKPP_STL::vector<TypelessStub<R>*> vec; vec.push_back( stub1); vec.push_back( stub2); vec.push_back( stub3); vec.push_back( stub4); vec.push_back( stub5); vec.push_back( stub6); vec.push_back( stub7); return new TypelessStubSequence<R>( vec.begin(), vec.end() ); } /** Creates a sequence of 7 stubs. * @ingroup grp_stub_abbrev * @see mockpp::StubSequence * @param stub1 first stub * @param stub2 the next stub * @param stub3 the next stub * @param stub4 the next stub * @param stub5 the next stub * @param stub6 the next stub * @param stub7 the next stub * @return the new stub */ template <typename R, // ReturnType typename I> // Invocation typename Stub<R, I>::AP onConsecutiveCalls( Stub<R, I> *stub1 , Stub<R, I> *stub2 , Stub<R, I> *stub3 , Stub<R, I> *stub4 , Stub<R, I> *stub5 , Stub<R, I> *stub6 , Stub<R, I> *stub7 ) { MOCKPP_STL::vector<Stub<R, I>*> vec; vec.push_back( stub1); vec.push_back( stub2); vec.push_back( stub3); vec.push_back( stub4); vec.push_back( stub5); vec.push_back( stub6); vec.push_back( stub7); return new StubSequence<R, I>( vec.begin(), vec.end() ); } /** Creates a sequence of 8 typeless stubs. * @ingroup grp_stub_abbrev * @see mockpp::TypelessStubSequence * @param stub1 first stub * @param stub2 the next stub * @param stub3 the next stub * @param stub4 the next stub * @param stub5 the next stub * @param stub6 the next stub * @param stub7 the next stub * @param stub8 the next stub * @return the new stub */ template <typename R> typename TypelessStub<R>::AP onConsecutiveCalls( TypelessStub<R> *stub1 , TypelessStub<R> *stub2 , TypelessStub<R> *stub3 , TypelessStub<R> *stub4 , TypelessStub<R> *stub5 , TypelessStub<R> *stub6 , TypelessStub<R> *stub7 , TypelessStub<R> *stub8 ) { MOCKPP_STL::vector<TypelessStub<R>*> vec; vec.push_back( stub1); vec.push_back( stub2); vec.push_back( stub3); vec.push_back( stub4); vec.push_back( stub5); vec.push_back( stub6); vec.push_back( stub7); vec.push_back( stub8); return new TypelessStubSequence<R>( vec.begin(), vec.end() ); } /** Creates a sequence of 8 stubs. * @ingroup grp_stub_abbrev * @see mockpp::StubSequence * @param stub1 first stub * @param stub2 the next stub * @param stub3 the next stub * @param stub4 the next stub * @param stub5 the next stub * @param stub6 the next stub * @param stub7 the next stub * @param stub8 the next stub * @return the new stub */ template <typename R, // ReturnType typename I> // Invocation typename Stub<R, I>::AP onConsecutiveCalls( Stub<R, I> *stub1 , Stub<R, I> *stub2 , Stub<R, I> *stub3 , Stub<R, I> *stub4 , Stub<R, I> *stub5 , Stub<R, I> *stub6 , Stub<R, I> *stub7 , Stub<R, I> *stub8 ) { MOCKPP_STL::vector<Stub<R, I>*> vec; vec.push_back( stub1); vec.push_back( stub2); vec.push_back( stub3); vec.push_back( stub4); vec.push_back( stub5); vec.push_back( stub6); vec.push_back( stub7); vec.push_back( stub8); return new StubSequence<R, I>( vec.begin(), vec.end() ); } /** Creates a sequence of 9 typeless stubs. * @ingroup grp_stub_abbrev * @see mockpp::TypelessStubSequence * @param stub1 first stub * @param stub2 the next stub * @param stub3 the next stub * @param stub4 the next stub * @param stub5 the next stub * @param stub6 the next stub * @param stub7 the next stub * @param stub8 the next stub * @param stub9 the next stub * @return the new stub */ template <typename R> typename TypelessStub<R>::AP onConsecutiveCalls( TypelessStub<R> *stub1 , TypelessStub<R> *stub2 , TypelessStub<R> *stub3 , TypelessStub<R> *stub4 , TypelessStub<R> *stub5 , TypelessStub<R> *stub6 , TypelessStub<R> *stub7 , TypelessStub<R> *stub8 , TypelessStub<R> *stub9 ) { MOCKPP_STL::vector<TypelessStub<R>*> vec; vec.push_back( stub1); vec.push_back( stub2); vec.push_back( stub3); vec.push_back( stub4); vec.push_back( stub5); vec.push_back( stub6); vec.push_back( stub7); vec.push_back( stub8); vec.push_back( stub9); return new TypelessStubSequence<R>( vec.begin(), vec.end() ); } /** Creates a sequence of 9 stubs. * @ingroup grp_stub_abbrev * @see mockpp::StubSequence * @param stub1 first stub * @param stub2 the next stub * @param stub3 the next stub * @param stub4 the next stub * @param stub5 the next stub * @param stub6 the next stub * @param stub7 the next stub * @param stub8 the next stub * @param stub9 the next stub * @return the new stub */ template <typename R, // ReturnType typename I> // Invocation typename Stub<R, I>::AP onConsecutiveCalls( Stub<R, I> *stub1 , Stub<R, I> *stub2 , Stub<R, I> *stub3 , Stub<R, I> *stub4 , Stub<R, I> *stub5 , Stub<R, I> *stub6 , Stub<R, I> *stub7 , Stub<R, I> *stub8 , Stub<R, I> *stub9 ) { MOCKPP_STL::vector<Stub<R, I>*> vec; vec.push_back( stub1); vec.push_back( stub2); vec.push_back( stub3); vec.push_back( stub4); vec.push_back( stub5); vec.push_back( stub6); vec.push_back( stub7); vec.push_back( stub8); vec.push_back( stub9); return new StubSequence<R, I>( vec.begin(), vec.end() ); } /** Creates a sequence of 10 typeless stubs. * @ingroup grp_stub_abbrev * @see mockpp::TypelessStubSequence * @param stub1 first stub * @param stub2 the next stub * @param stub3 the next stub * @param stub4 the next stub * @param stub5 the next stub * @param stub6 the next stub * @param stub7 the next stub * @param stub8 the next stub * @param stub9 the next stub * @param stub10 the next stub * @return the new stub */ template <typename R> typename TypelessStub<R>::AP onConsecutiveCalls( TypelessStub<R> *stub1 , TypelessStub<R> *stub2 , TypelessStub<R> *stub3 , TypelessStub<R> *stub4 , TypelessStub<R> *stub5 , TypelessStub<R> *stub6 , TypelessStub<R> *stub7 , TypelessStub<R> *stub8 , TypelessStub<R> *stub9 , TypelessStub<R> *stub10 ) { MOCKPP_STL::vector<TypelessStub<R>*> vec; vec.push_back( stub1); vec.push_back( stub2); vec.push_back( stub3); vec.push_back( stub4); vec.push_back( stub5); vec.push_back( stub6); vec.push_back( stub7); vec.push_back( stub8); vec.push_back( stub9); vec.push_back( stub10); return new TypelessStubSequence<R>( vec.begin(), vec.end() ); } /** Creates a sequence of 10 stubs. * @ingroup grp_stub_abbrev * @see mockpp::StubSequence * @param stub1 first stub * @param stub2 the next stub * @param stub3 the next stub * @param stub4 the next stub * @param stub5 the next stub * @param stub6 the next stub * @param stub7 the next stub * @param stub8 the next stub * @param stub9 the next stub * @param stub10 the next stub * @return the new stub */ template <typename R, // ReturnType typename I> // Invocation typename Stub<R, I>::AP onConsecutiveCalls( Stub<R, I> *stub1 , Stub<R, I> *stub2 , Stub<R, I> *stub3 , Stub<R, I> *stub4 , Stub<R, I> *stub5 , Stub<R, I> *stub6 , Stub<R, I> *stub7 , Stub<R, I> *stub8 , Stub<R, I> *stub9 , Stub<R, I> *stub10 ) { MOCKPP_STL::vector<Stub<R, I>*> vec; vec.push_back( stub1); vec.push_back( stub2); vec.push_back( stub3); vec.push_back( stub4); vec.push_back( stub5); vec.push_back( stub6); vec.push_back( stub7); vec.push_back( stub8); vec.push_back( stub9); vec.push_back( stub10); return new StubSequence<R, I>( vec.begin(), vec.end() ); } MOCKPP_NS_END #endif // MOCKPP_ONCONSECUTIVECALLS_H Index: ChainingMockObjectSupport.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/ChainingMockObjectSupport.h,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- ChainingMockObjectSupport.h 15 Mar 2006 21:34:02 -0000 1.25 +++ ChainingMockObjectSupport.h 7 Apr 2006 19:54:10 -0000 1.26 @@ -394,190 +394,6 @@ } -/** Creates a sequence of typeless stubs. - * @ingroup grp_stub_abbrev - * @see MOCKPP_NS::TypelessStubSequence - * @param stub1 first stub - * @param stub2 the next stub - * @return the new stub - */ -template <typename R> -typename TypelessStub<R>::AP onConsecutiveCalls( TypelessStub<R> *stub1, - TypelessStub<R> *stub2 ) -{ - MOCKPP_STL::vector<TypelessStub<R>*> vec; - vec.push_back( stub1); - vec.push_back( stub2); - return new TypelessStubSequence<R>( vec.begin(), vec.end() ); -} - - -/** Creates a sequence of stubs. - * @ingroup grp_stub_abbrev - * @see MOCKPP_NS::StubSequence - * @param stub1 first stub - * @param stub2 the next stub - * @return the new stub - */ -template <typename R, // ReturnType - typename I> // Invocation -typename Stub<R, I>::AP onConsecutiveCalls( Stub<R, I> *stub1, - Stub<R, I> *stub2 ) -{ - MOCKPP_STL::vector<Stub<R, I>*> vec; - vec.push_back( stub1); - vec.push_back( stub2); - return new StubSequence<R, I>( vec.begin(), vec.end() ); -} - - -/** Creates a sequence of typeless stubs. - * @ingroup grp_stub_abbrev - * @see MOCKPP_NS::TypelessStubSequence - * @param stub1 first stub - * @param stub2 the next stub - * @param stub3 the next stub - * @return the new stub - */ -template <typename R> -typename TypelessStub<R>::AP onConsecutiveCalls( TypelessStub<R> *stub1, - TypelessStub<R> *stub2, - TypelessStub<R> *stub3 ) -{ - MOCKPP_STL::vector<TypelessStub<R>*> vec; - vec.push_back( stub1 ); - vec.push_back( stub2 ); - vec.push_back( stub3 ); - return new TypelessStubSequence<R>( vec.begin(), vec.end() ); -} - - -/** Creates a sequence of stubs. - * @ingroup grp_stub_abbrev - * @see MOCKPP_NS::StubSequence - * @param stub1 first stub - * @param stub2 the next stub - * @param stub3 the next stub - * @return the new stub - */ -template <typename R, // ReturnType - typename I> // Invocation -typename Stub<R, I>::AP onConsecutiveCalls( Stub<R, I> *stub1, - Stub<R, I> *stub2, - Stub<R, I> *stub3 ) -{ - MOCKPP_STL::vector<Stub<R, I>*> vec; - vec.push_back( stub1 ); - vec.push_back( stub2 ); - vec.push_back( stub3 ); - return new StubSequence<R, I>( vec.begin(), vec.end() ); -} - - -/** Creates a sequence of typeless stubs. - * @ingroup grp_stub_abbrev - * @see MOCKPP_NS::TypelessStubSequence - * @param stub1 first stub - * @param stub2 the next stub - * @param stub3 the next stub - * @param stub4 the next stub - * @return the new stub - */ -template <typename R> -typename TypelessStub<R>::AP onConsecutiveCalls( TypelessStub<R> *stub1, - TypelessStub<R> *stub2, - TypelessStub<R> *stub3, - TypelessStub<R> *stub4 ) -{ - MOCKPP_STL::vector<TypelessStub<R>*> vec; - vec.push_back( stub1 ); - vec.push_back( stub2 ); - vec.push_back( stub3 ); - vec.push_back( stub4 ); - return new TypelessStubSequence<R>( vec.begin(), vec.end() ); -} - - -/** Creates a sequence of stubs. - * @ingroup grp_stub_abbrev - * @see MOCKPP_NS::StubSequence - * @param stub1 first stub - * @param stub2 the next stub - * @param stub3 the next stub - * @param stub4 the next stub - * @return the new stub - */ -template <typename R, // ReturnType - typename I> // Invocation -typename Stub<R, I>::AP onConsecutiveCalls( Stub<R, I> *stub1, - Stub<R, I> *stub2, - Stub<R, I> *stub3, - Stub<R, I> *stub4 ) -{ - MOCKPP_STL::vector<Stub<R, I>*> vec; - vec.push_back( stub1 ); - vec.push_back( stub2 ); - vec.push_back( stub3 ); - vec.push_back( stub4 ); - return new StubSequence<R, I>( vec.begin(), vec.end() ); -} - - -/** Creates a sequence of typeless stubs. - * @ingroup grp_stub_abbrev - * @see MOCKPP_NS::TypelessStubSequence - * @param stub1 first stub - * @param stub2 the next stub - * @param stub3 the next stub - * @param stub4 the next stub - * @param stub5 the next stub - * @return the new stub - */ -template <typename R> -typename TypelessStub<R>::AP onConsecutiveCalls( TypelessStub<R> *stub1, - TypelessStub<R> *stub2, - TypelessStub<R> *stub3, - TypelessStub<R> *stub4, - TypelessStub<R> *stub5 ) -{ - MOCKPP_STL::vector<TypelessStub<R>*> vec; - vec.push_back( stub1 ); - vec.push_back( stub2 ); - vec.push_back( stub3 ); - vec.push_back( stub4 ); - vec.push_back( stub5 ); - return new TypelessStubSequence<R>( vec.begin(), vec.end() ); -} - - -/** Creates a sequence of stubs. - * @ingroup grp_stub_abbrev - * @see MOCKPP_NS::StubSequence - * @param stub1 first stub - * @param stub2 the next stub - * @param stub3 the next stub - * @param stub4 the next stub - * @param stub5 the next stub - * @return the new stub - */ -template <typename R, // ReturnType - typename I> // Invocation -typename Stub<R, I>::AP onConsecutiveCalls( Stub<R, I> *stub1, - Stub<R, I> *stub2, - Stub<R, I> *stub3, - Stub<R, I> *stub4, - Stub<R, I> *stub5 ) -{ - MOCKPP_STL::vector<Stub<R, I>*> vec; - vec.push_back( stub1 ); - vec.push_back( stub2 ); - vec.push_back( stub3 ); - vec.push_back( stub4 ); - vec.push_back( stub5 ); - return new StubSequence<R, I>( vec.begin(), vec.end() ); -} - - /** Creates a matcher to verify a single invocation * @ingroup grp_matcher_abbrev * @see MOCKPP_NS::InvokeOnceMatcher @@ -646,6 +462,9 @@ MOCKPP_NS_END +#include "OnConsecutiveCalls.h" + + /** Imports the abbreviations into the global namespace to enhance redability * by omitting namespace prefix. */ Index: Makefile.am =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/Makefile.am,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- Makefile.am 10 Dec 2005 20:07:21 -0000 1.17 +++ Makefile.am 7 Apr 2006 19:54:13 -0000 1.18 @@ -17,11 +17,12 @@ ChainableMockMethod5.h \ ChainableMockMethod6.h \ ChainableMockObject.h CountedChainableMethod.h \ - InvocationN.h + InvocationN.h OnConsecutiveCalls.h EXTRA_DIST = \ gen_chainablemethod_N.pl \ gen_countchainable_N.pl \ + gen_consecutive_N.pl \ gen_invocation_N.pl libchainingincludedir = $(includedir)/mockpp/chaining --- NEW FILE: gen_consecutive_N.pl --- #!/usr/bin/perl -w # # $Id: gen_consecutive_N.pl,v 1.1 2006/04/07 19:54:14 ewald-arnold Exp $ use English; if ($#ARGV < 0) { print "Usage: perl gen_consecutive_N <number of arguments>\n"; exit; } $totalNumArgs = $ARGV[0]; if ($totalNumArgs < 10) { $totalNumArgs = 10; } open OUT, ">OnConsecutiveCalls.h"; print OUT "/** \@file \@internal NOT INTENDED FOR PUBLIC INCLUSION \@brief Generated with gen_consecutive_N.pl. \$I" . "d: CountedChainableMethod.h,v 1.7 2005/10/19 20:53:09 ewald-arnold Exp \$ ***************************************************************************/ /************************************************************************** begin : Fri Apr 7 2006 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_ONCONSECUTIVECALLS_H #define MOCKPP_ONCONSECUTIVECALLS_H #include <mockpp/mockpp.h> // always first MOCKPP_NS_START "; for ($numArgs = 1; $numArgs <= $totalNumArgs; ++$numArgs) { $templateParms = ""; $templateParms_colon = ""; for ($i = 1; $i <= $numArgs; ++$i) { if ($i > 1) { $templateParms .= ", "; } $templateParms .= "typename P$i"; } if ($numArgs > 0) { $templateParms_colon = ", " . $templateParms; } $templateArgs_colon = ""; $_ = $templateParms; s/typename //g; $templateArgs = $_; if ($numArgs > 0) { $templateArgs_colon = ", ". $templateArgs; } print "Creating onConsectiveCalls " . $numArgs ."\n"; print OUT " /** Creates a sequence of " . $numArgs . " typeless stubs. * \@ingroup grp_stub_abbrev * \@see mockpp::TypelessStubSequence * \@param stub1 first stub"; for($p = 2; $p <= $numArgs; ++$p) { print OUT " * \@param stub" . $p . " the next stub"; } print OUT " * \@return the new stub */ template <typename R> typename TypelessStub<R>::AP onConsecutiveCalls( TypelessStub<R> *stub1"; for($p = 2; $p <= $numArgs; ++$p) { print OUT " , TypelessStub<R> *stub" . $p; } print OUT " ) { MOCKPP_STL::vector<TypelessStub<R>*> vec;"; for($p = 1; $p <= $numArgs; ++$p) { print OUT " vec.push_back( stub" . $p . ");" }; print OUT " return new TypelessStubSequence<R>( vec.begin(), vec.end() ); } /** Creates a sequence of " . $numArgs . " stubs. * \@ingroup grp_stub_abbrev * \@see mockpp::StubSequence * \@param stub1 first stub"; for($p = 2; $p <= $numArgs; ++$p) { print OUT " * \@param stub" . $p . " the next stub"; } print OUT " * \@return the new stub */ template <typename R, // ReturnType typename I> // Invocation typename Stub<R, I>::AP onConsecutiveCalls( Stub<R, I> *stub1"; for($p = 2; $p <= $numArgs; ++$p) { print OUT " , Stub<R, I> *stub" . $p; } print OUT " ) { MOCKPP_STL::vector<Stub<R, I>*> vec;"; for($p = 1; $p <= $numArgs; ++$p) { print OUT " vec.push_back( stub" . $p . ");" }; print OUT " return new StubSequence<R, I>( vec.begin(), vec.end() ); } " } print OUT " MOCKPP_NS_END #endif // MOCKPP_ONCONSECUTIVECALLS_H "; close OUT; |
|
From: Ewald A. <ewa...@us...> - 2006-04-07 16:51:23
|
Update of /cvsroot/mockpp/mockpp/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24135/mockpp Modified Files: install-win.bat Log Message: fix for certain platform Index: install-win.bat =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/install-win.bat,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- install-win.bat 15 Jan 2006 19:16:26 -0000 1.1 +++ install-win.bat 7 Apr 2006 16:51:15 -0000 1.2 @@ -1,27 +1,25 @@ -rem install mockpp on windows paltforms -rem -rem Call from within mockpp directory where this file -rem is located. -rem -rem synopsys: install-win <destdir> +@echo off +rem Install mockpp on windows paltforms +rem Call from within mockpp directory where this file is located. +rem synopsys: install-win <destination-directory> -if not "%1" == "" goto install -echo synopsys: install-win <destination-directory> -goto end +if not "%1" == "" goto :install +echo synopsys: %0 ^<destination-directory^> +goto :EOF :install -md %1\mockpp +echo on -xcopy /Y *.h %1\mockpp -xcopy /Y chaining\*.h %1\mockpp\chaining -xcopy /Y visiting\*.h %1\mockpp\visiting -xcopy /Y compat\*.h %1\mockpp\compat -xcopy /Y util\*.h %1\mockpp\util -xcopy /Y builder\*.h %1\mockpp\builder -xcopy /Y constraint\*.h %1\mockpp\constraint -xcopy /Y matcher\*.h %1\mockpp\matcher -xcopy /Y stub\*.h %1\mockpp\stub -xcopy /Y production\*.h %1\mockpp\production -xcopy /Y framework\*.h %1\mockpp\framework +md "%1\mockpp\" -:end \ No newline at end of file +xcopy /Y "*.h" "%1\mockpp\" +xcopy /Y "chaining\*.h" "%1\mockpp\chaining\" +xcopy /Y "visiting\*.h" "%1\mockpp\visiting\" +xcopy /Y "compat\*.h" "%1\mockpp\compat\" +xcopy /Y "util\*.h" "%1\mockpp\util\" +xcopy /Y "builder\*.h" "%1\mockpp\builder\" +xcopy /Y "constraint\*.h" "%1\mockpp\constraint\" +xcopy /Y "matcher\*.h" "%1\mockpp\matcher\" +xcopy /Y "stub\*.h" "%1\mockpp\stub\" +xcopy /Y "production\*.h" "%1\mockpp\production\" +xcopy /Y "framework\*.h" "%1\mockpp\framework\" |
|
From: Ewald A. <ewa...@us...> - 2006-04-07 16:48:42
|
Update of /cvsroot/mockpp/mockpp/mockpp/chaining In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22231/mockpp/chaining Modified Files: CountedChainableMethod.h gen_countchainable_N.pl Log Message: include mockpp.h Index: CountedChainableMethod.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/CountedChainableMethod.h,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- CountedChainableMethod.h 15 Mar 2006 21:56:33 -0000 1.10 +++ CountedChainableMethod.h 7 Apr 2006 16:48:37 -0000 1.11 @@ -31,6 +31,8 @@ #ifndef MOCKPP_COUNTEDCHAINABLEMETHOD_H #define MOCKPP_COUNTEDCHAINABLEMETHOD_H +#include <mockpp/mockpp.h> // always first + #include <mockpp/CountParameters.h> #include <mockpp/chaining/ChainableMockMethod0.h> Index: gen_countchainable_N.pl =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/gen_countchainable_N.pl,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- gen_countchainable_N.pl 15 Mar 2006 21:56:33 -0000 1.9 +++ gen_countchainable_N.pl 7 Apr 2006 16:48:37 -0000 1.10 @@ -51,6 +51,8 @@ #ifndef MOCKPP_COUNTEDCHAINABLEMETHOD_H #define MOCKPP_COUNTEDCHAINABLEMETHOD_H +#include <mockpp/mockpp.h> // always first + #include <mockpp/CountParameters.h> "; |
|
From: Ewald A. <ewa...@us...> - 2006-04-05 17:04:55
|
Update of /cvsroot/mockpp/mockpp/mockpp/util In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19970/mockpp/util Modified Files: AssertMo.h Log Message: more namespace disabling Index: AssertMo.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/util/AssertMo.h,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- AssertMo.h 15 Mar 2006 21:34:09 -0000 1.27 +++ AssertMo.h 5 Apr 2006 17:03:41 -0000 1.28 @@ -260,7 +260,7 @@ { \ MOCKPP_ASSERT_TRUE(exception_object == except_data); \ } \ - catch(std::exception &ex) \ + catch(MOCKPP_STD_NS::exception &ex) \ { \ MOCKPP_ASSERT_TRUE_MESSAGE(MOCKPP_GET_STRING(ex.what()), false); \ } \ @@ -294,7 +294,7 @@ { \ MOCKPP_ASSERT_TRUE(condition); \ } \ - catch(std::exception &ex) \ + catch(MOCKPP_STD_NS::exception &ex) \ { \ MOCKPP_ASSERT_TRUE_MESSAGE(MOCKPP_GET_STRING(ex.what()), false); \ } \ |
|
From: Ewald A. <ewa...@us...> - 2006-04-05 17:04:42
|
Update of /cvsroot/mockpp/mockpp/mockpp/compat In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19970/mockpp/compat Modified Files: Asserter.cpp Exception.cpp Exception.h Formatter.cpp Formatter.h Log Message: more namespace disabling Index: Exception.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/compat/Exception.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- Exception.cpp 15 Mar 2006 21:34:02 -0000 1.15 +++ Exception.cpp 5 Apr 2006 17:03:38 -0000 1.16 @@ -38,7 +38,7 @@ MOCKPP_EXPORT Exception::Exception(unsigned line, const char *file, const String &msg) : #ifdef MOCKPP_USE_STD_EXCEPTION - std::exception(), + MOCKPP_STD_NS::exception(), #endif message(msg), srcline(line), Index: Formatter.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/compat/Formatter.h,v retrieving revision 1.40 retrieving revision 1.41 diff -u -d -r1.40 -r1.41 --- Formatter.h 15 Mar 2006 21:34:02 -0000 1.40 +++ Formatter.h 5 Apr 2006 17:03:38 -0000 1.41 @@ -342,16 +342,20 @@ template <class T> MOCKPP_NS::String ostreamed(const T& t) { - std::basic_ostringstream<char> oss; + MOCKPP_STD_NS::basic_ostringstream<char> oss; oss << t; #ifdef MOCKPP_UNICODE +# ifdef MOCKPP_ALTERNATIVE_STL + return MOCKPP_NS::getUnicode(oss.str().c_str()); +# else return MOCKPP_NS::getUnicode(oss.str()); +# endif #else -#ifdef MOCKPP_ALTERNATIVE_STL +# ifdef MOCKPP_ALTERNATIVE_STL return oss.str().c_str(); -#else +# else return oss.str(); -#endif +# endif #endif } @@ -375,7 +379,7 @@ template <class T> MOCKPP_NS::String owstreamed(const T& t) { - std::basic_ostringstream<wchar_t> oss; + MOCKPP_STD_NS::basic_ostringstream<wchar_t> oss; oss << t; #ifndef MOCKPP_ALTERNATIVE_STL return oss.str(); Index: Asserter.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/compat/Asserter.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Asserter.cpp 15 Mar 2006 21:34:02 -0000 1.3 +++ Asserter.cpp 5 Apr 2006 17:03:37 -0000 1.4 @@ -126,7 +126,7 @@ #if defined(_MSC_VER) if (strcmp(expected, actual) != 0) #else - if (std::strcmp(expected, actual) != 0) + if (MOCKPP_STD_NS::strcmp(expected, actual) != 0) #endif fail(srcline, srcfile, message); } @@ -149,7 +149,7 @@ #if !defined(HAVE_STD_WCSCMP) if (wcscmp(expected, actual) != 0) #else - if (std::wcscmp(expected, actual) != 0) + if (MOCKPP_STD_NS::wcscmp(expected, actual) != 0) #endif fail(srcline, srcfile, message); } @@ -165,7 +165,7 @@ // the following test fails #ifdef HAVE_LIMITS - if (expected == std::numeric_limits<double>::infinity()) + if (expected == MOCKPP_STD_NS::numeric_limits<double>::infinity()) { if (!(expected == actual)) fail(srcline, srcfile, message); @@ -175,7 +175,7 @@ #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 + if (!(MOCKPP_STD_NS::fabs(expected-actual) <= MOCKPP_STD_NS::fabs(delta))) // Because comparison with NaN always returns false #endif fail(srcline, srcfile, message); } @@ -195,7 +195,7 @@ // the following test fails #ifdef HAVE_LIMITS - if (expected == std::numeric_limits<float>::infinity()) + if (expected == MOCKPP_STD_NS::numeric_limits<float>::infinity()) { if (!(expected == actual)) fail(srcline, srcfile, message); @@ -206,7 +206,7 @@ #if defined(_MSC_VER) if (!(fabs(expected-actual) <= fabs(delta))) #else - if (!(std::fabs(expected-actual) <= std::fabs(delta))) + if (!(MOCKPP_STD_NS::fabs(expected-actual) <= MOCKPP_STD_NS::fabs(delta))) #endif fail(srcline, srcfile, message); } Index: Exception.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/compat/Exception.h,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- Exception.h 15 Mar 2006 21:34:02 -0000 1.20 +++ Exception.h 5 Apr 2006 17:03:38 -0000 1.21 @@ -44,7 +44,7 @@ */ class Exception #ifdef MOCKPP_USE_STD_EXCEPTION - : public std::exception + : public MOCKPP_STD_NS::exception #endif { public: Index: Formatter.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/compat/Formatter.cpp,v retrieving revision 1.50 retrieving revision 1.51 diff -u -d -r1.50 -r1.51 --- Formatter.cpp 15 Mar 2006 21:34:02 -0000 1.50 +++ Formatter.cpp 5 Apr 2006 17:03:38 -0000 1.51 @@ -65,7 +65,7 @@ { neg = true; #ifdef HAVE_LIMITS - if ( n == std::numeric_limits<T>::min() ) + if ( n == MOCKPP_STD_NS::numeric_limits<T>::min() ) #else if ( n == INT_MIN ) #endif @@ -187,7 +187,7 @@ #if defined HAVE_SPRINTF_S sprintf_s( buf, format, n ); #else - std::sprintf( buf, format, n ); + MOCKPP_STD_NS::sprintf( buf, format, n ); #endif #ifdef MOCKPP_UNICODE @@ -250,7 +250,7 @@ #if (defined (_MSC_VER) && (_MSC_VER <= 1300)) || (defined (__GNUC__) && (__GNUC__ < 3)) if (!isalnum(x)) #else - if (!std::isalnum(x)) + if (!MOCKPP_STD_NS::isalnum(x)) #endif { text += MOCKPP_PCHAR("0x") + number((unsigned long)x, 16); |
|
From: Ewald A. <ewa...@us...> - 2006-04-05 17:04:42
|
Update of /cvsroot/mockpp/mockpp/mockpp/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19970/mockpp/tests Modified Files: ChainableMockObjectPolymorphism_test.cpp Formatter_test.cpp NoException_test.cpp TimeServer_test.cpp VerifyingTestCaller_test.cpp VisitableMockMethod_2_test.cpp compilecheck.cpp mock_test.cpp readability_test.cpp Log Message: more namespace disabling Index: readability_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/readability_test.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- readability_test.cpp 15 Mar 2006 21:34:08 -0000 1.7 +++ readability_test.cpp 5 Apr 2006 17:03:40 -0000 1.8 @@ -93,9 +93,9 @@ mmo.chain(CA(), CB(), "hallo", 12, true); } #ifndef MOCKPP_NO_EXCEPTIONS - catch(std::exception &ex) + catch(MOCKPP_STD_NS::exception &ex) { - std::cout << ex.what() << std::endl; + MOCKPP_STD_NS::cout << ex.what() << MOCKPP_STD_NS::endl; } #endif } @@ -112,9 +112,9 @@ mmo.visit(CA(), CB(), "hallo", 12, false); } #ifndef MOCKPP_NO_EXCEPTIONS - catch(std::exception &ex) + catch(MOCKPP_STD_NS::exception &ex) { - std::cout << ex.what() << std::endl; + MOCKPP_STD_NS::cout << ex.what() << MOCKPP_STD_NS::endl; } #endif } @@ -131,9 +131,9 @@ mmo.void_visit(CA(), CB(), "hallo", 21, false); } #ifndef MOCKPP_NO_EXCEPTIONS - catch(std::exception &ex) + catch(MOCKPP_STD_NS::exception &ex) { - std::cout << ex.what() << std::endl; + MOCKPP_STD_NS::cout << ex.what() << MOCKPP_STD_NS::endl; } #endif } @@ -148,9 +148,9 @@ list.addActual(MOCKPP_STL::string("no-string")); } #ifndef MOCKPP_NO_EXCEPTIONS - catch(std::exception &ex) + catch(MOCKPP_STD_NS::exception &ex) { - std::cout << ex.what() << std::endl; + MOCKPP_STD_NS::cout << ex.what() << MOCKPP_STD_NS::endl; } #endif } @@ -165,9 +165,9 @@ list.addActual(MOCKPP_STL::string("no-string")); } #ifndef MOCKPP_NO_EXCEPTIONS - catch(std::exception &ex) + catch(MOCKPP_STD_NS::exception &ex) { - std::cout << ex.what() << std::endl; + MOCKPP_STD_NS::cout << ex.what() << MOCKPP_STD_NS::endl; } #endif } @@ -183,9 +183,9 @@ list.addActual(MOCKPP_STL::string("no-string")); } #ifndef MOCKPP_NO_EXCEPTIONS - catch(std::exception &ex) + catch(MOCKPP_STD_NS::exception &ex) { - std::cout << ex.what() << std::endl; + MOCKPP_STD_NS::cout << ex.what() << MOCKPP_STD_NS::endl; } #endif } @@ -194,39 +194,39 @@ int main(int /* argc */, char ** /* argv */) { unsigned result = 0; - std::cout << "Starting readability tests..\n"; + MOCKPP_STD_NS::cout << "Starting readability tests..\n"; MOCKPP_TRY { - std::cout << "--\n"; + MOCKPP_STD_NS::cout << "--\n"; chainer_1(); - std::cout << "--\n"; + MOCKPP_STD_NS::cout << "--\n"; visiter_1(); - std::cout << "--\n"; + MOCKPP_STD_NS::cout << "--\n"; visiter_2(); - std::cout << "--\n"; + MOCKPP_STD_NS::cout << "--\n"; expectationlist_1(); - std::cout << "--\n"; + MOCKPP_STD_NS::cout << "--\n"; expectationlist_2(); - std::cout << "--\n"; + MOCKPP_STD_NS::cout << "--\n"; constraintlist_1(); - std::cout << "--\n"; + MOCKPP_STD_NS::cout << "--\n"; } #ifndef MOCKPP_NO_EXCEPTIONS catch(...) { - std::cout << "Caught unexpected exception\n"; + MOCKPP_STD_NS::cout << "Caught unexpected exception\n"; result = 1; } #endif - std::cout << "Finishing readability tests\n"; + MOCKPP_STD_NS::cout << "Finishing readability tests\n"; return result; } Index: VisitableMockMethod_2_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockMethod_2_test.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- VisitableMockMethod_2_test.cpp 15 Mar 2006 21:34:08 -0000 1.20 +++ VisitableMockMethod_2_test.cpp 5 Apr 2006 17:03:40 -0000 1.21 @@ -131,6 +131,8 @@ vmo.verify(); vmb.verify(); + vmb.addThrowable(0); + vmb.addThrowable(MOCKPP_NS::make_throwable(333u)); vmb.setDefaultThrowable(MOCKPP_NS::make_throwable(444u)); vmb.setDefaultReturnValue(999); Index: Formatter_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/Formatter_test.cpp,v retrieving revision 1.43 retrieving revision 1.44 diff -u -d -r1.43 -r1.44 --- Formatter_test.cpp 15 Mar 2006 21:34:08 -0000 1.43 +++ Formatter_test.cpp 5 Apr 2006 17:03:40 -0000 1.44 @@ -288,7 +288,7 @@ void Formatter_test::test_number_min_long_dec() { #ifdef HAVE_LIMITS - long ul = std::numeric_limits<long>::min(); + long ul = MOCKPP_STD_NS::numeric_limits<long>::min(); #else long ul = INT_MIN; #endif @@ -300,7 +300,7 @@ #ifdef HAVE_SPRINTF_S sprintf_s(buff, "%ld", ul ); #else - std::sprintf(buff, "%ld", ul ); + MOCKPP_STD_NS::sprintf(buff, "%ld", ul ); #endif #ifdef MOCKPP_UNICODE @@ -316,14 +316,14 @@ void Formatter_test::test_number_min_long_hex() { #ifdef HAVE_LIMITS - long long ull = std::numeric_limits<long long>::min(); + long long ull = MOCKPP_STD_NS::numeric_limits<long long>::min(); #else long long ull = INT_MIN; #endif MOCKPP_NS::String str = MOCKPP_NS::number((unsigned long)123, 16); str = MOCKPP_NS::number(ull, 16); -// std::cout << MOCKPP_NS::getLatin1(str).c_str() << std::endl; +// MOCKPP_STD_NS::cout << MOCKPP_NS::getLatin1(str).c_str() << MOCKPP_STD_NS::endl; MOCKPP_ASSERT_EQUALS(MOCKPP_PCSTRING("-8000000000000000"), str); // differs from sprintf(..) } @@ -331,7 +331,7 @@ void Formatter_test::test_number_max_long_dec() { #ifdef HAVE_LIMITS - long long ul = std::numeric_limits<long long>::max(); + long long ul = MOCKPP_STD_NS::numeric_limits<long long>::max(); #else long long ul = INT_MAX; #endif @@ -341,7 +341,7 @@ #ifdef HAVE_SPRINTF_S sprintf_s(buff, "%lld", ul ); #else - std::sprintf(buff, "%lld", ul ); + MOCKPP_STD_NS::sprintf(buff, "%lld", ul ); #endif #ifdef MOCKPP_UNICODE @@ -357,7 +357,7 @@ void Formatter_test::test_number_max_ulong_dec() { #ifdef HAVE_LIMITS - unsigned long long ul = std::numeric_limits<unsigned long long>::max(); + unsigned long long ul = MOCKPP_STD_NS::numeric_limits<unsigned long long>::max(); #else unsigned long long ul = UINT_MAX; #endif @@ -367,7 +367,7 @@ #ifdef HAVE_SPRINTF_S sprintf_s(buff, "%llu", ul ); #else - std::sprintf(buff, "%llu", ul ); + MOCKPP_STD_NS::sprintf(buff, "%llu", ul ); #endif #ifdef MOCKPP_UNICODE @@ -630,8 +630,8 @@ #ifdef MOCKPP_UNICODE -std::basic_ostream<wchar_t> & - operator<< (std::basic_ostream<wchar_t> &os, const Formatter_Dummy &/*fd*/) +MOCKPP_STD_NS::basic_ostream<wchar_t> & + operator<< (MOCKPP_STD_NS::basic_ostream<wchar_t> &os, const Formatter_Dummy &/*fd*/) { os << "Formatter_Dummy-wchar_t"; return os; @@ -641,8 +641,8 @@ #else // MOCKPP_UNICODE -std::basic_ostream<char> & - operator<< (std::basic_ostream<char> &os, const Formatter_Dummy &/*fd*/) +MOCKPP_STD_NS::basic_ostream<char> & + operator<< (MOCKPP_STD_NS::basic_ostream<char> &os, const Formatter_Dummy &/*fd*/) { os << "Formatter_Dummy-char"; return os; Index: mock_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/mock_test.cpp,v retrieving revision 1.44 retrieving revision 1.45 diff -u -d -r1.44 -r1.45 --- mock_test.cpp 19 Mar 2006 16:26:50 -0000 1.44 +++ mock_test.cpp 5 Apr 2006 17:03:40 -0000 1.45 @@ -86,8 +86,8 @@ #endif #ifndef _MSC_VER -using std::time; -using std::time_t; +using MOCKPP_STD_NS::time; +using MOCKPP_STD_NS::time_t; #endif @@ -110,11 +110,11 @@ #define STRINGIZE_I(text) #text #define PRINT_NS \ - std::cout << " - namespace mockpp : " << STRINGIZE(MOCKPP_NS) << std::endl \ - << " - namespace stl : " << STRINGIZE(MOCKPP_STL) << std::endl \ - << " - namespace std : " << STRINGIZE(MOCKPP_STD_NS) << std::endl \ - << " - namespace ministl: " << STRINGIZE(MINISTL_NS) << std::endl \ - << " - namespace CxxTest: " << STRINGIZE(CXXTEST_NS) << std::endl + MOCKPP_STD_NS::cout << " - namespace mockpp : " << STRINGIZE(MOCKPP_NS) << MOCKPP_STD_NS::endl \ + << " - namespace stl : " << STRINGIZE(MOCKPP_STL) << MOCKPP_STD_NS::endl \ + << " - namespace std : " << STRINGIZE(MOCKPP_STD_NS) << MOCKPP_STD_NS::endl \ + << " - namespace ministl: " << STRINGIZE(MINISTL_NS) << MOCKPP_STD_NS::endl \ + << " - namespace CxxTest: " << STRINGIZE(CXXTEST_NS) << MOCKPP_STD_NS::endl ///////////////////////////////////////////////////// @@ -133,7 +133,7 @@ void enterTest( const CXXTEST_NS::TestDescription &td ) { if (show) - std::cout << td.suiteName() << "::" << td.testName() << std::endl; + MOCKPP_STD_NS::cout << td.suiteName() << "::" << td.testName() << MOCKPP_STD_NS::endl; CXXTEST_NS::ErrorPrinter::enterTest(td); } @@ -178,35 +178,35 @@ MOCKPP_TESTMETHOD_DECL void startTest( CppUnit::Test *test ) { starttime = time(0); - std::cerr << ">>>>>>>>>>>>>>>> " << test->getName() << " : " + MOCKPP_STD_NS::cerr << ">>>>>>>>>>>>>>>> " << test->getName() << " : " << starttime - << std::endl; - std::cerr.flush(); + << MOCKPP_STD_NS::endl; + MOCKPP_STD_NS::cerr.flush(); } MOCKPP_TESTMETHOD_DECL void addFailure( const CppUnit::TestFailure &failure ) { - std::cerr << ( failure.isError() ? "E" : "F" ) << std::endl; - std::cerr.flush(); + MOCKPP_STD_NS::cerr << ( failure.isError() ? "E" : "F" ) << MOCKPP_STD_NS::endl; + MOCKPP_STD_NS::cerr.flush(); } MOCKPP_TESTMETHOD_DECL void endTest(CppUnit::Test *test) { - std::cerr << std::endl; + MOCKPP_STD_NS::cerr << MOCKPP_STD_NS::endl; time_t endtime = time(0); time_t difftime = starttime - endtime; unsigned m = difftime / 60; unsigned s = difftime % 60; - std::cerr << "<<<<<<<<<<<<<<<< " << test->getName() + MOCKPP_STD_NS::cerr << "<<<<<<<<<<<<<<<< " << test->getName() << " : " << endtime << " : " << m << ":" << s - << std::endl; + << MOCKPP_STD_NS::endl; } MOCKPP_TESTMETHOD_DECL void done() { - std::cerr << std::endl; - std::cerr.flush(); + MOCKPP_STD_NS::cerr << MOCKPP_STD_NS::endl; + MOCKPP_STD_NS::cerr.flush(); } }; @@ -227,7 +227,7 @@ #ifndef __BORLANDC__ // @todo for (int i2 = 1; i2 < argc; ++i2) if (strcmp (argv[i2], "--compiler-output") == 0) - runner.setOutputter( CppUnit::CompilerOutputter::defaultOutputter(&runner.result(), std::cerr ) ); + runner.setOutputter( CppUnit::CompilerOutputter::defaultOutputter(&runner.result(), MOCKPP_STD_NS::cerr ) ); #endif ret = runner.run() ? 0 : 1; @@ -246,21 +246,21 @@ test_suite* init_unit_test_suite( int argc, char* argv[] ) { - std::cout << "starting tests..\n"; - std::cout << " - using Boost.Test framework\n"; + MOCKPP_STD_NS::cout << "starting tests..\n"; + MOCKPP_STD_NS::cout << " - using Boost.Test framework\n"; #ifdef MOCKPP_PTI_WEAKNESS - std::cout << " - support pti-weakness enabled\n"; + MOCKPP_STD_NS::cout << " - support pti-weakness enabled\n"; #else - std::cout << " - support pti-weakness disabled\n"; + MOCKPP_STD_NS::cout << " - support pti-weakness disabled\n"; #endif PRINT_NS; - std::cout << " - size of <char> is " << sizeof(MOCKPP_CHAR('x')) << std::endl; - std::cout << "\n"; + MOCKPP_STD_NS::cout << " - size of <char> is " << sizeof(MOCKPP_CHAR('x')) << MOCKPP_STD_NS::endl; + MOCKPP_STD_NS::cout << "\n"; /* - std::cout << "Options\n"; - std::cout << " --show-name show method names before calling\n"; + MOCKPP_STD_NS::cout << "Options\n"; + MOCKPP_STD_NS::cout << " --show-name show method names before calling\n"; */ test_suite* test = boost::unit_test_framework::detail::auto_unit_test_suite(); @@ -279,7 +279,7 @@ */ unit_test_log::instance().set_log_threshold_level(log_messages); -// unit_test_result::instance().detailed_report(std::cout); +// unit_test_result::instance().detailed_report(MOCKPP_STD_NS::cout); return test; } @@ -288,24 +288,24 @@ int main(int argc, char **argv) { int ret = 1; - std::cout << "starting tests..\n"; + MOCKPP_STD_NS::cout << "starting tests..\n"; #if defined(MOCKPP_USE_CXXTEST) - std::cout << " - using cxxtest framework\n"; + MOCKPP_STD_NS::cout << " - using cxxtest framework\n"; #elif defined(MOCKPP_USE_CPPUNIT) - std::cout << " - using cppunit framework\n"; + MOCKPP_STD_NS::cout << " - using cppunit framework\n"; #endif PRINT_NS; #ifdef MOCKPP_PTI_WEAKNESS - std::cout << " - support pti-weakness enabled\n"; + MOCKPP_STD_NS::cout << " - support pti-weakness enabled\n"; #else - std::cout << " - support pti-weakness disabled\n"; + MOCKPP_STD_NS::cout << " - support pti-weakness disabled\n"; #endif - std::cout << " - size of <char> is " << sizeof(MOCKPP_CHAR('x')) << std::endl; - std::cout << "\n"; + MOCKPP_STD_NS::cout << " - size of <char> is " << sizeof(MOCKPP_CHAR('x')) << MOCKPP_STD_NS::endl; + MOCKPP_STD_NS::cout << "\n"; #if defined(MOCKPP_USE_CXXTEST) @@ -313,17 +313,17 @@ #elif defined(MOCKPP_USE_CPPUNIT) - std::cout << "Options\n"; - std::cout << " --show-name show method names before calling\n"; - std::cout << " --compiler-output output similar to compilers\n"; + MOCKPP_STD_NS::cout << "Options\n"; + MOCKPP_STD_NS::cout << " --show-name show method names before calling\n"; + MOCKPP_STD_NS::cout << " --compiler-output output similar to compilers\n"; ret = run_cppunit(argc, argv); - std::cout << "\n"; + MOCKPP_STD_NS::cout << "\n"; #endif - std::cout << "Result: " << ret << std::endl << std::endl; + MOCKPP_STD_NS::cout << "Result: " << ret << MOCKPP_STD_NS::endl << MOCKPP_STD_NS::endl; return ret; } Index: NoException_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/NoException_test.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- NoException_test.cpp 15 Mar 2006 21:34:08 -0000 1.15 +++ NoException_test.cpp 5 Apr 2006 17:03:40 -0000 1.16 @@ -27,20 +27,18 @@ * ***************************************************************************/ +#include <mockpp/mockpp.h> // always first + +// redefine default stuff always + #undef MOCKPP_THROW #define MOCKPP_THROW(x) storeMalfunctionData(x) #undef MOCKPP_RETHROW #define MOCKPP_RETHROW storeMalfunctionData("unexpected rethrow") -#undef MOCKPP_NO_EXCEPTIONS -#define MOCKPP_NO_EXCEPTIONS - #define MOCKPP_ENABLE_DEFAULT_FORMATTER - -#include <mockpp/mockpp.h> // always first - #include <mockpp/ExpectationValue.h> #include <mockpp/Throwable.h> Index: compilecheck.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/compilecheck.cpp,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- compilecheck.cpp 15 Mar 2006 21:34:08 -0000 1.27 +++ compilecheck.cpp 5 Apr 2006 17:03:40 -0000 1.28 @@ -210,15 +210,15 @@ MOCKPP_VISITABLE1(MyVisitableMockObject, unsigned, visitable1, int); MOCKPP_VISITABLE2(MyVisitableMockObject, unsigned, visitable2, int, wchar_t); MOCKPP_VISITABLE3(MyVisitableMockObject, unsigned, visitable3, int, wchar_t, float); - MOCKPP_VISITABLE4(MyVisitableMockObject, unsigned, visitable4, int, wchar_t, float, std::string); - MOCKPP_VISITABLE5(MyVisitableMockObject, unsigned, visitable5, int, wchar_t, float, std::string, long); + MOCKPP_VISITABLE4(MyVisitableMockObject, unsigned, visitable4, int, wchar_t, float, MOCKPP_STD_NS::string); + MOCKPP_VISITABLE5(MyVisitableMockObject, unsigned, visitable5, int, wchar_t, float, MOCKPP_STD_NS::string, long); MOCKPP_VOID_VISITABLE0(MyVisitableMockObject, void_visitable0); MOCKPP_VOID_VISITABLE1(MyVisitableMockObject, void_visitable1, int); MOCKPP_VOID_VISITABLE2(MyVisitableMockObject, void_visitable2, int, wchar_t); MOCKPP_VOID_VISITABLE3(MyVisitableMockObject, void_visitable3, int, wchar_t, float); - MOCKPP_VOID_VISITABLE4(MyVisitableMockObject, void_visitable4, int, wchar_t, float, std::string); - MOCKPP_VOID_VISITABLE5(MyVisitableMockObject, void_visitable5, int, wchar_t, float, std::string, long); + MOCKPP_VOID_VISITABLE4(MyVisitableMockObject, void_visitable4, int, wchar_t, float, MOCKPP_STD_NS::string); + MOCKPP_VOID_VISITABLE5(MyVisitableMockObject, void_visitable5, int, wchar_t, float, MOCKPP_STD_NS::string, long); }; @@ -247,9 +247,9 @@ MOCKPP_NS::String fmt = MOCKPP_PCHAR("abc %1 %2 xyz"); fmt << Output() << 1; #if MOCKPP_UNICODE == 1 - std::wcout << fmt << std::endl; + MOCKPP_STD_NS::wcout << fmt << MOCKPP_STD_NS::endl; #else - std::cout << fmt << std::endl; + MOCKPP_STD_NS::cout << fmt << MOCKPP_STD_NS::endl; #endif return 0; @@ -258,7 +258,7 @@ MyExpectation expectation; MyExpectationValue expectationValue(MOCKPP_PCHAR("exval")); - MOCKPP_NS::ExpectationSegment<std::string> expectationSegment(MOCKPP_PCHAR("exseg"), 0); + MOCKPP_NS::ExpectationSegment<MOCKPP_STD_NS::string> expectationSegment(MOCKPP_PCHAR("exseg"), 0); MOCKPP_NS::ExpectationList<double> expectationList(MOCKPP_PCHAR("exlist"), 0); MOCKPP_NS::ExpectationSet<char> expectationSet(MOCKPP_PCHAR("exset"), 0); MOCKPP_NS::ExpectationMap<int, MOCKPP_NS::String> expectationMap(MOCKPP_PCHAR("exmap"), 0); @@ -267,8 +267,8 @@ MOCKPP_NS::MockObject mockObject(MOCKPP_PCHAR("mo")); fmt = MOCKPP_PCHAR("abc %1 def"); - std::string s8; - std::basic_string<wchar_t> s16; + MOCKPP_STD_NS::string s8; + MOCKPP_STD_NS::basic_string<wchar_t> s16; fmt << s8; fmt << s16; @@ -285,9 +285,9 @@ MOCKPP_NS::String s = MOCKPP_PCHAR("abc %1 def"); s << 123; #if MOCKPP_UNICODE == 1 - std::wcout << s << std::endl; + MOCKPP_STD_NS::wcout << s << MOCKPP_STD_NS::endl; #else - std::cout << s << std::endl; + MOCKPP_STD_NS::cout << s << MOCKPP_STD_NS::endl; #endif fmt = MOCKPP_PCHAR("abc %1 def"); @@ -296,33 +296,33 @@ string_taker (fmt << 321); #if MOCKPP_UNICODE == 1 - std::wcout << s2 << std::endl; + MOCKPP_STD_NS::wcout << s2 << MOCKPP_STD_NS::endl; #else - std::cout << s2 << std::endl; + MOCKPP_STD_NS::cout << s2 << MOCKPP_STD_NS::endl; #endif - std::printf ("%f\n", 12.345678); - std::printf ("%.2f\n", 12.345678); + MOCKPP_STD_NS::printf ("%f\n", 12.345678); + MOCKPP_STD_NS::printf ("%.2f\n", 12.345678); - std::cout << "typeid int " << typeid(int).name() << std::endl; - std::cout << "typeid float " << typeid(float).name() << std::endl; - std::cout << "typeid long " << typeid(long).name() << std::endl; + MOCKPP_STD_NS::cout << "typeid int " << typeid(int).name() << MOCKPP_STD_NS::endl; + MOCKPP_STD_NS::cout << "typeid float " << typeid(float).name() << MOCKPP_STD_NS::endl; + MOCKPP_STD_NS::cout << "typeid long " << typeid(long).name() << MOCKPP_STD_NS::endl; - std::exception *ex = new MOCKPP_NS::AssertionFailedError(__LINE__, __FILE__, MOCKPP_PCHAR("abc %1 def")); + MOCKPP_STD_NS::exception *ex = new MOCKPP_NS::AssertionFailedError(__LINE__, __FILE__, MOCKPP_PCHAR("abc %1 def")); try { - std::cout << "throw?\n"; + MOCKPP_STD_NS::cout << "throw?\n"; forwardException(ex); } - catch(std::exception *ex) + catch(MOCKPP_STD_NS::exception *ex) { - std::cout << "typeid * " << typeid(*ex).name() << std::endl; + MOCKPP_STD_NS::cout << "typeid * " << typeid(*ex).name() << MOCKPP_STD_NS::endl; } - catch(std::exception &ex) + catch(MOCKPP_STD_NS::exception &ex) { - std::cout << "typeid & " << typeid(ex).name() << std::endl; + MOCKPP_STD_NS::cout << "typeid & " << typeid(ex).name() << MOCKPP_STD_NS::endl; } - std::cout << "after catch\n"; + MOCKPP_STD_NS::cout << "after catch\n"; try @@ -331,9 +331,9 @@ } catch(MOCKPP_NS::AssertionFailedError &ae) { - std::cout << "file: " << MOCKPP_NS::getLatin1(ae.getSrcFile()) << std::endl - << "line: " << ae.getSrcLine() << std::endl - << "msg : " << MOCKPP_NS::getLatin1(ae.getMessage()) << std::endl; + MOCKPP_STD_NS::cout << "file: " << MOCKPP_NS::getLatin1(ae.getSrcFile()) << MOCKPP_STD_NS::endl + << "line: " << ae.getSrcLine() << MOCKPP_STD_NS::endl + << "msg : " << MOCKPP_NS::getLatin1(ae.getMessage()) << MOCKPP_STD_NS::endl; } try @@ -344,15 +344,15 @@ } catch(MOCKPP_NS::AssertionFailedError &ae) { - std::cout << "file: " << MOCKPP_NS::getLatin1(ae.getSrcFile()) << std::endl - << "line: " << ae.getSrcLine() << std::endl - << "msg : " << MOCKPP_NS::getLatin1(ae.getMessage()) << std::endl; + MOCKPP_STD_NS::cout << "file: " << MOCKPP_NS::getLatin1(ae.getSrcFile()) << MOCKPP_STD_NS::endl + << "line: " << ae.getSrcLine() << MOCKPP_STD_NS::endl + << "msg : " << MOCKPP_NS::getLatin1(ae.getMessage()) << MOCKPP_STD_NS::endl; } MyVisitableMockObject mvo(MOCKPP_PCHAR("mvo")); MOCKPP_CONTROLLER_FOR(MyVisitableMockObject, visitable1) visit1_ctr (&mvo); - visit1_ctr.addThrowable(std::string("throw"), 2); + visit1_ctr.addThrowable(MOCKPP_STD_NS::string("throw"), 2); visit1_ctr.addThrowable(MOCKPP_NS::make_throwable(int(123))); visit1_ctr.setDefaultThrowable(MOCKPP_NS::make_throwable(float(123.456))); visit1_ctr.addReturnValue(0); @@ -366,15 +366,15 @@ u = mvo.visitable1(1); u = mvo.visitable2(1, L'a'); u = mvo.visitable3(1, L'a', 1.23); - u = mvo.visitable4(1, L'a', 1.23, std::string("abc")); - u = mvo.visitable5(1, L'a', 1.23, std::string("abc"), -12345678); + u = mvo.visitable4(1, L'a', 1.23, MOCKPP_STD_NS::string("abc")); + u = mvo.visitable5(1, L'a', 1.23, MOCKPP_STD_NS::string("abc"), -12345678); mvo.void_visitable0(); mvo.void_visitable1(1); mvo.void_visitable2(1, L'a'); mvo.void_visitable3(1, L'a', 1.23); - mvo.void_visitable4(1, L'a', 1.23, std::string("abc")); - mvo.void_visitable5(1, L'a', 1.23, std::string("abc"), -12345678); + mvo.void_visitable4(1, L'a', 1.23, MOCKPP_STD_NS::string("abc")); + mvo.void_visitable5(1, L'a', 1.23, MOCKPP_STD_NS::string("abc"), -12345678); mvo.activate(); Index: ChainableMockObjectPolymorphism_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObjectPolymorphism_test.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- ChainableMockObjectPolymorphism_test.cpp 15 Mar 2006 21:34:08 -0000 1.15 +++ ChainableMockObjectPolymorphism_test.cpp 5 Apr 2006 17:03:40 -0000 1.16 @@ -132,13 +132,13 @@ void accept1( Visitor &visitor ) { -// std::cout << "accept1\n"; +// MOCKPP_STD_NS::cout << "accept1\n"; visitor.visit1( parameter1 ); } void accept3( Visitor &visitor ) { -// std::cout << "accept3\n"; +// MOCKPP_STD_NS::cout << "accept3\n"; visitor.visit3( parameter1, parameter2, parameter3 ); } @@ -172,7 +172,7 @@ bool MOCKPP_NS::invocationComparison<MockParameter>(const MockParameter &left, const MockParameter &right) { - std::cout << "invocationComparison<MockParameter>\n"; + MOCKPP_STD_NS::cout << "invocationComparison<MockParameter>\n"; return left.a == right.a; } @@ -181,7 +181,7 @@ bool MOCKPP_NS::invocationComparison<Parameter>(const Parameter &left, const Parameter &right) { - std::cout << "invocationComparison<Parameter>\n"; + MOCKPP_STD_NS::cout << "invocationComparison<Parameter>\n"; return MOCKPP_NS::isSameComparison(left, right); } Index: VerifyingTestCaller_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VerifyingTestCaller_test.cpp,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- VerifyingTestCaller_test.cpp 15 Mar 2006 21:34:08 -0000 1.22 +++ VerifyingTestCaller_test.cpp 5 Apr 2006 17:03:40 -0000 1.23 @@ -149,7 +149,7 @@ { VerifyingTestCaseDummy vd; MOCKPP_NS::VerifyingTestCaller<VerifyingTestCaseDummy, true> - caller(std::string("caller"), &VerifyingTestCaseDummy::method, vd); + caller(MOCKPP_STD_NS::string("caller"), &VerifyingTestCaseDummy::method, vd); caller.runTest(); MOCKPP_ASSERT_EQUALS((unsigned)2, vd.ver); MOCKPP_ASSERT_EQUALS((unsigned)3, vd.clr); @@ -160,7 +160,7 @@ { VerifyingTestCaseDummy *vd = new VerifyingTestCaseDummy; MOCKPP_NS::VerifyingTestCaller<VerifyingTestCaseDummy, true> - caller(std::string("caller"), &VerifyingTestCaseDummy::method, vd); + caller(MOCKPP_STD_NS::string("caller"), &VerifyingTestCaseDummy::method, vd); caller.runTest(); MOCKPP_ASSERT_EQUALS((unsigned)2, vd->ver); MOCKPP_ASSERT_EQUALS((unsigned)3, vd->clr); Index: TimeServer_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/TimeServer_test.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- TimeServer_test.cpp 15 Mar 2006 21:34:08 -0000 1.10 +++ TimeServer_test.cpp 5 Apr 2006 17:03:40 -0000 1.11 @@ -90,11 +90,11 @@ rt.addUnixTime(0x5678); MOCKPP_NS::TimeServer *ts = &rt; - std::time_t t1 = ts->getUnixTime(); - MOCKPP_ASSERT_EQUALS((std::time_t)0x1234, t1); + MOCKPP_STD_NS::time_t t1 = ts->getUnixTime(); + MOCKPP_ASSERT_EQUALS((MOCKPP_STD_NS::time_t)0x1234, t1); t1 = ts->getUnixTime(); - MOCKPP_ASSERT_EQUALS((std::time_t)0x5678, t1); + MOCKPP_ASSERT_EQUALS((MOCKPP_STD_NS::time_t)0x5678, t1); } @@ -102,8 +102,8 @@ { MOCKPP_NS::RealTimeServer rt; MOCKPP_NS::TimeServer *ts = &rt; - std::time_t t1 = ts->getUnixTime(); - std::time_t t2 = std::time(0); + MOCKPP_STD_NS::time_t t1 = ts->getUnixTime(); + MOCKPP_STD_NS::time_t t2 = MOCKPP_STD_NS::time(0); MOCKPP_ASSERT_TRUE(t1 <= t2); // up to +2s should always succeed MOCKPP_ASSERT_TRUE((t1 + 2) >= t2); |
Update of /cvsroot/mockpp/mockpp/mockpp/examples/tutorial In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19970/mockpp/examples/tutorial Modified Files: basicmock.cpp chainmock.cpp chainmock2.cpp poormock-se.cpp poormock.cpp verifying.cpp visitmock.cpp visitmock2.cpp Log Message: more namespace disabling Index: verifying.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/examples/tutorial/verifying.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- verifying.cpp 15 Mar 2006 21:34:04 -0000 1.15 +++ verifying.cpp 5 Apr 2006 17:03:39 -0000 1.16 @@ -122,7 +122,7 @@ runner.addTest(registry.makeTest()); return runner.run() ? 0 : 1; #else - std::cout << "CppUnit was not available at compile time.\n"; + MOCKPP_STD_NS::cout << "CppUnit was not available at compile time.\n"; return 0; #endif } Index: visitmock2.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/examples/tutorial/visitmock2.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- visitmock2.cpp 15 Mar 2006 21:34:04 -0000 1.5 +++ visitmock2.cpp 5 Apr 2006 17:03:39 -0000 1.6 @@ -130,25 +130,25 @@ mock.activate(); // Run Consumer object - std::cout << "Tests starting" << std::endl; + MOCKPP_STD_NS::cout << "Tests starting" << MOCKPP_STD_NS::endl; Consumer consumer(&mock); consumer.load(); consumer.process(); consumer.save(); - std::cout << "Tests finished" << std::endl; + MOCKPP_STD_NS::cout << "Tests finished" << MOCKPP_STD_NS::endl; // Check pending expectations mock.verify(); - std::cout << "All tests have passed successfully" << std::endl; + MOCKPP_STD_NS::cout << "All tests have passed successfully" << MOCKPP_STD_NS::endl; } - catch(std::exception &ex) + catch(MOCKPP_STD_NS::exception &ex) { - std::cout << std::endl - << "Error occured.\n" << ex.what() << std::endl - << std::endl; + MOCKPP_STD_NS::cout << MOCKPP_STD_NS::endl + << "Error occured.\n" << ex.what() << MOCKPP_STD_NS::endl + << MOCKPP_STD_NS::endl; return 1; } Index: poormock-se.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/examples/tutorial/poormock-se.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- poormock-se.cpp 15 Mar 2006 21:34:04 -0000 1.8 +++ poormock-se.cpp 5 Apr 2006 17:03:39 -0000 1.9 @@ -77,7 +77,7 @@ { PoorMockSecondEdition mock; - std::cout << "Tests starting" << std::endl; + MOCKPP_STD_NS::cout << "Tests starting" << MOCKPP_STD_NS::endl; try { @@ -96,18 +96,18 @@ consumer.save(); mock.verify(); - std::cout << "Tests finished" << std::endl; + MOCKPP_STD_NS::cout << "Tests finished" << MOCKPP_STD_NS::endl; } - catch(std::exception &ex) + catch(MOCKPP_STD_NS::exception &ex) { - std::cout << std::endl - << "Error occured.\n" << ex.what() << std::endl - << std::endl; + MOCKPP_STD_NS::cout << MOCKPP_STD_NS::endl + << "Error occured.\n" << ex.what() << MOCKPP_STD_NS::endl + << MOCKPP_STD_NS::endl; return 1; } - std::cout << "All tests have passed successfully" << std::endl; + MOCKPP_STD_NS::cout << "All tests have passed successfully" << MOCKPP_STD_NS::endl; return 0; } Index: visitmock.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/examples/tutorial/visitmock.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- visitmock.cpp 15 Mar 2006 21:34:04 -0000 1.18 +++ visitmock.cpp 5 Apr 2006 17:03:39 -0000 1.19 @@ -101,25 +101,25 @@ mock.activate(); // Run Consumer object - std::cout << "Tests starting" << std::endl; + MOCKPP_STD_NS::cout << "Tests starting" << MOCKPP_STD_NS::endl; Consumer consumer(&mock); consumer.load(); consumer.process(); consumer.save(); - std::cout << "Tests finished" << std::endl; + MOCKPP_STD_NS::cout << "Tests finished" << MOCKPP_STD_NS::endl; // Check pending expectations mock.verify(); - std::cout << "All tests have passed successfully" << std::endl; + MOCKPP_STD_NS::cout << "All tests have passed successfully" << MOCKPP_STD_NS::endl; } - catch(std::exception &ex) + catch(MOCKPP_STD_NS::exception &ex) { - std::cout << std::endl - << "Error occured.\n" << ex.what() << std::endl - << std::endl; + MOCKPP_STD_NS::cout << MOCKPP_STD_NS::endl + << "Error occured.\n" << ex.what() << MOCKPP_STD_NS::endl + << MOCKPP_STD_NS::endl; return 1; } Index: chainmock2.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/examples/tutorial/chainmock2.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- chainmock2.cpp 15 Mar 2006 21:34:04 -0000 1.5 +++ chainmock2.cpp 5 Apr 2006 17:03:39 -0000 1.6 @@ -123,24 +123,24 @@ // Run Consumer object - std::cout << "Tests starting" << std::endl; + MOCKPP_STD_NS::cout << "Tests starting" << MOCKPP_STD_NS::endl; Consumer consumer(&mock); consumer.load(); consumer.process(); consumer.save(); - std::cout << "Tests finished" << std::endl; + MOCKPP_STD_NS::cout << "Tests finished" << MOCKPP_STD_NS::endl; // Check pending expectations mock.verify(); - std::cout << "All tests have passed successfully" << std::endl; + MOCKPP_STD_NS::cout << "All tests have passed successfully" << MOCKPP_STD_NS::endl; } - catch(std::exception &ex) + catch(MOCKPP_STD_NS::exception &ex) { - std::cout << std::endl - << "Error occured.\n" << ex.what() << std::endl - << std::endl; + MOCKPP_STD_NS::cout << MOCKPP_STD_NS::endl + << "Error occured.\n" << ex.what() << MOCKPP_STD_NS::endl + << MOCKPP_STD_NS::endl; return 1; } Index: poormock.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/examples/tutorial/poormock.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- poormock.cpp 29 Dec 2005 19:29:51 -0000 1.10 +++ poormock.cpp 5 Apr 2006 17:03:39 -0000 1.11 @@ -16,7 +16,7 @@ #include <iostream> #ifndef _MSC_VER -using std::exit; +using MOCKPP_STD_NS::exit; #endif /** Quick-n-dirty asserter. @@ -25,10 +25,10 @@ */ #define ASSERTER(x) \ if (!(x) ) { \ - std::cout << std::endl \ - << "Error occured.\n" << #x << std::endl \ - << std::endl \ - << std::flush; \ + MOCKPP_STD_NS::cout << MOCKPP_STD_NS::endl \ + << "Error occured.\n" << #x << MOCKPP_STD_NS::endl \ + << MOCKPP_STD_NS::endl \ + << MOCKPP_STD_NS::flush; \ exit(1); \ } @@ -84,7 +84,7 @@ { PoorMock mock; - std::cout << "Tests starting" << std::endl; + MOCKPP_STD_NS::cout << "Tests starting" << MOCKPP_STD_NS::endl; // Run Consumer object Consumer consumer(&mock); @@ -101,9 +101,9 @@ ASSERTER(mock.write_counter == 9); ASSERTER(mock.close_counter == 10); - std::cout << "Tests finished" << std::endl; + MOCKPP_STD_NS::cout << "Tests finished" << MOCKPP_STD_NS::endl; - std::cout << "All tests have passed successfully" << std::endl; + MOCKPP_STD_NS::cout << "All tests have passed successfully" << MOCKPP_STD_NS::endl; return 0; } Index: basicmock.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/examples/tutorial/basicmock.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- basicmock.cpp 15 Mar 2006 21:34:04 -0000 1.10 +++ basicmock.cpp 5 Apr 2006 17:03:39 -0000 1.11 @@ -113,24 +113,24 @@ mock.calculate_output.addObjectToReturn(30); // Run Consumer object - std::cout << "Tests starting" << std::endl; + MOCKPP_STD_NS::cout << "Tests starting" << MOCKPP_STD_NS::endl; Consumer consumer(&mock); consumer.load(); consumer.process(); consumer.save(); - std::cout << "Tests finished" << std::endl; + MOCKPP_STD_NS::cout << "Tests finished" << MOCKPP_STD_NS::endl; // Check pending expectations mock.verify(); - std::cout << "All tests have passed successfully" << std::endl; + MOCKPP_STD_NS::cout << "All tests have passed successfully" << MOCKPP_STD_NS::endl; } - catch(std::exception &ex) + catch(MOCKPP_STD_NS::exception &ex) { - std::cout << std::endl - << "Error occured.\n" << ex.what() << std::endl - << std::endl; + MOCKPP_STD_NS::cout << MOCKPP_STD_NS::endl + << "Error occured.\n" << ex.what() << MOCKPP_STD_NS::endl + << MOCKPP_STD_NS::endl; return 1; } Index: chainmock.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/examples/tutorial/chainmock.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- chainmock.cpp 15 Mar 2006 21:34:04 -0000 1.15 +++ chainmock.cpp 5 Apr 2006 17:03:39 -0000 1.16 @@ -113,24 +113,24 @@ // Run Consumer object - std::cout << "Tests starting" << std::endl; + MOCKPP_STD_NS::cout << "Tests starting" << MOCKPP_STD_NS::endl; Consumer consumer(&mock); consumer.load(); consumer.process(); consumer.save(); - std::cout << "Tests finished" << std::endl; + MOCKPP_STD_NS::cout << "Tests finished" << MOCKPP_STD_NS::endl; // Check pending expectations mock.verify(); - std::cout << "All tests have passed successfully" << std::endl; + MOCKPP_STD_NS::cout << "All tests have passed successfully" << MOCKPP_STD_NS::endl; } - catch(std::exception &ex) + catch(MOCKPP_STD_NS::exception &ex) { - std::cout << std::endl - << "Error occured.\n" << ex.what() << std::endl - << std::endl; + MOCKPP_STD_NS::cout << MOCKPP_STD_NS::endl + << "Error occured.\n" << ex.what() << MOCKPP_STD_NS::endl + << MOCKPP_STD_NS::endl; return 1; } |
|
From: Ewald A. <ewa...@us...> - 2006-04-05 17:04:34
|
Update of /cvsroot/mockpp/mockpp/3party/cxxtest/cxxtest In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19970/3party/cxxtest/cxxtest Modified Files: ErrorPrinter.h Flags.h StdValueTraits.h TestSuite.h ValueTraits.h Log Message: more namespace disabling Index: Flags.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/3party/cxxtest/cxxtest/Flags.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- Flags.h 17 Mar 2006 08:41:51 -0000 1.5 +++ Flags.h 5 Apr 2006 17:03:35 -0000 1.6 @@ -29,6 +29,15 @@ ////////////////////////////////////////////////// // +#ifdef CXXTEST_NO_STD_NS +# define CXXTEST_STD_NS /* nothing */ +#else +# define CXXTEST_STD_NS std +#endif + +////////////////////////////////////////////////// +// + #ifdef CXXTEST_NO_NAMESPACE # define CXXTEST_ANON_NS_START /* nothing */ # define CXXTEST_NS /* nothing */ Index: TestSuite.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/3party/cxxtest/cxxtest/TestSuite.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- TestSuite.h 19 Mar 2006 11:09:36 -0000 1.4 +++ TestSuite.h 5 Apr 2006 17:03:35 -0000 1.5 @@ -194,7 +194,7 @@ # define _TSM_LAST_CATCH(f,l,m) _TS_LAST_CATCH( { (CXXTEST_NS::tracker()).failedTest(f,l,m); } ) # ifdef _CXXTEST_HAVE_STD # define ___TSM_CATCH(f,l,m) \ - catch(const std::exception &e) { (CXXTEST_NS::tracker()).failedTest(f,l,e.what()); } \ + catch(const CXXTEST_STD_NS::exception &e) { (CXXTEST_NS::tracker()).failedTest(f,l,e.what()); } \ _TSM_LAST_CATCH(f,l,m) # else // !_CXXTEST_HAVE_STD # define ___TSM_CATCH(f,l,m) _TSM_LAST_CATCH(f,l,m) Index: ErrorPrinter.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/3party/cxxtest/cxxtest/ErrorPrinter.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- ErrorPrinter.h 17 Mar 2006 08:41:51 -0000 1.2 +++ ErrorPrinter.h 5 Apr 2006 17:03:35 -0000 1.3 @@ -5,7 +5,7 @@ // The ErrorPrinter is a simple TestListener that // just prints "OK" if everything goes well, otherwise // reports the error in the format of compiler messages. -// The ErrorPrinter uses std::cout +// The ErrorPrinter uses CXXTEST_STD_NS::cout // #include <cxxtest/Flags.h> Index: ValueTraits.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/3party/cxxtest/cxxtest/ValueTraits.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- ValueTraits.h 19 Mar 2006 11:09:36 -0000 1.5 +++ ValueTraits.h 5 Apr 2006 17:03:35 -0000 1.6 @@ -311,7 +311,7 @@ public: ValueTraits( double t ) { - ( requiredDigitsOnLeft( t ) > MAX_DIGITS_ON_LEFT ) ? + ( requiredDigitsOnLeft( t ) > (unsigned) MAX_DIGITS_ON_LEFT ) ? hugeNumber( t ) : normalNumber( t ); } @@ -319,7 +319,12 @@ const char *asString( void ) const { return _asString; } private: - enum { MAX_DIGITS_ON_LEFT = 24, DIGITS_ON_RIGHT = 4, BASE = 10 }; + enum Digits + { + MAX_DIGITS_ON_LEFT = 24, + DIGITS_ON_RIGHT = 4, + BASE = 10 + }; char _asString[1 + MAX_DIGITS_ON_LEFT + 1 + DIGITS_ON_RIGHT + 1]; static unsigned requiredDigitsOnLeft( double t ); Index: StdValueTraits.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/3party/cxxtest/cxxtest/StdValueTraits.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- StdValueTraits.h 17 Mar 2006 08:41:51 -0000 1.4 +++ StdValueTraits.h 5 Apr 2006 17:03:35 -0000 1.5 @@ -2,7 +2,7 @@ #define __cxxtest_StdValueTraits_h__ // -// This file defines ValueTraits for std:: stuff. +// This file defines ValueTraits for CXXTEST_STD_NS:: stuff. // It is #included by <cxxtest/ValueTraits.h> if you // define CXXTEST_HAVE_STD // @@ -13,7 +13,7 @@ #ifdef _CXXTEST_OLD_STD # define CXXTEST_STD(x) x #else // !_CXXTEST_OLD_STD -# define CXXTEST_STD(x) std::x +# define CXXTEST_STD(x) CXXTEST_STD_NS::x #endif // _CXXTEST_OLD_STD #ifndef CXXTEST_USER_VALUE_TRAITS @@ -22,12 +22,12 @@ // // NOTE: This should have been // template<class Char, class Traits, class Allocator> - // class ValueTraits< std::basic_string<Char, Traits, Allocator> > {}; + // class ValueTraits< CXXTEST_STD_NS::basic_string<Char, Traits, Allocator> > {}; // But MSVC doesn't support it (yet). // // - // If we have std::string, we might as well use it + // If we have CXXTEST_STD_NS::string, we might as well use it // class StdTraitsBase { @@ -40,7 +40,7 @@ }; // - // std::string + // CXXTEST_STD_NS::string // CXXTEST_TEMPLATE_INSTANTIATION class ValueTraits<const CXXTEST_STL::string> : public StdTraitsBase @@ -62,7 +62,7 @@ #ifndef _CXXTEST_OLD_STD // - // std::wstring + // CXXTEST_STD_NS::wstring // CXXTEST_TEMPLATE_INSTANTIATION class ValueTraits<const CXXTEST_STL::basic_string<wchar_t> > : public StdTraitsBase @@ -100,7 +100,7 @@ #ifdef _CXXTEST_PARTIAL_TEMPLATE_SPECIALIZATION // - // std::pair + // CXXTEST_STD_NS::pair // template<class First, class Second> class ValueTraits< CXXTEST_STL::pair<First, Second> > : public StdTraitsBase @@ -113,7 +113,7 @@ }; // - // std::vector + // CXXTEST_STD_NS::vector // template<class Element> class ValueTraits< CXXTEST_STL::vector<Element> > : public StdTraitsBase @@ -126,7 +126,7 @@ }; // - // std::list + // CXXTEST_STD_NS::list // template<class Element> class ValueTraits< CXXTEST_STL::list<Element> > : public StdTraitsBase @@ -139,7 +139,7 @@ }; // - // std::set + // CXXTEST_STD_NS::set // template<class Element> class ValueTraits< CXXTEST_STL::set<Element> > : public StdTraitsBase @@ -152,7 +152,7 @@ }; // - // std::map + // CXXTEST_STD_NS::map // template<class Key, class Value> class ValueTraits< CXXTEST_STL::map<Key, Value> > : public StdTraitsBase @@ -166,7 +166,7 @@ #ifndef CXXTEST_USE_MINI_STL // - // std::deque + // CXXTEST_STD_NS::deque // template<class Element> class ValueTraits< CXXTEST_STL::deque<Element> > : public StdTraitsBase @@ -181,7 +181,7 @@ #ifndef CXXTEST_USE_MINI_STL // - // std::multiset + // CXXTEST_STD_NS::multiset // template<class Element> class ValueTraits< CXXTEST_STL::multiset<Element> > : public StdTraitsBase @@ -195,7 +195,7 @@ #endif // - // std::multimap + // CXXTEST_STD_NS::multimap // template<class Key, class Value> class ValueTraits< CXXTEST_STL::multimap<Key, Value> > : public StdTraitsBase @@ -208,7 +208,7 @@ }; // - // std::complex + // CXXTEST_STD_NS::complex // template<class Number> class ValueTraits< CXXTEST_STD(complex)<Number> > : public StdTraitsBase |
|
From: Ewald A. <ewa...@us...> - 2006-04-05 17:04:34
|
Update of /cvsroot/mockpp/mockpp/mockpp/visiting In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19970/mockpp/visiting Modified Files: VisitableMockMethod.cpp VisitableMockMethod.h VisitableMockObject.h VisitableMockObject_macro.h Log Message: more namespace disabling Index: VisitableMockMethod.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/visiting/VisitableMockMethod.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- VisitableMockMethod.cpp 15 Mar 2006 21:34:09 -0000 1.4 +++ VisitableMockMethod.cpp 5 Apr 2006 17:03:41 -0000 1.5 @@ -38,7 +38,7 @@ MOCKPP_EXPORT VisitableMockMethodBase::VisitableMockMethodBase(const String &name, - VisitableMockObject *parent) + VisitableMockObject *parent) : MockObject(name, parent) , visitable(parent) , throwables (name + MOCKPP_PCHAR("/throwables"), this) Index: VisitableMockMethod.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/visiting/VisitableMockMethod.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- VisitableMockMethod.h 15 Mar 2006 21:34:09 -0000 1.4 +++ VisitableMockMethod.h 5 Apr 2006 17:03:41 -0000 1.5 @@ -116,8 +116,8 @@ */ void addThrowable(Throwable *t) { - std::auto_ptr<Throwable> at (t); - MOCKPP_ASSERT_FALSE(getVisitableMockObject()->isActivated()); + MOCKPP_STD_NS::auto_ptr<Throwable> at (t); + MOCKPP_ASSERT_FALSE(this->getVisitableMockObject()->isActivated()); this->throwables.push_back(at.release()); this->throwableInsteadReturn.push_back(true); } @@ -142,8 +142,8 @@ */ void setDefaultThrowable(Throwable *t) { - std::auto_ptr<Throwable> at (t); - MOCKPP_ASSERT_FALSE(getVisitableMockObject()->isActivated()); + MOCKPP_STD_NS::auto_ptr<Throwable> at (t); + MOCKPP_ASSERT_FALSE(this->getVisitableMockObject()->isActivated()); this->defaultThrowable.take(at.release()); } @@ -213,7 +213,7 @@ */ void setDefaultReturnValue(const R &rv) { - MOCKPP_ASSERT_FALSE(getVisitableMockObject()->isActivated()); + MOCKPP_ASSERT_FALSE(this->getVisitableMockObject()->isActivated()); this->haveDefaultReturnValue = true; this->defaultReturnValue = rv; } @@ -226,7 +226,7 @@ */ void addReturnValue(const R &rv, unsigned count = 1) { - MOCKPP_ASSERT_FALSE(getVisitableMockObject()->isActivated()); + MOCKPP_ASSERT_FALSE(this->getVisitableMockObject()->isActivated()); for ( ; count > 0; --count) { this->returnValues.addObjectToReturn(rv); Index: VisitableMockObject.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/visiting/VisitableMockObject.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- VisitableMockObject.h 15 Mar 2006 21:34:10 -0000 1.5 +++ VisitableMockObject.h 5 Apr 2006 17:03:41 -0000 1.6 @@ -262,7 +262,7 @@ */ void addResponseValue (const your_type &rv, const your_type1 &p1, - unsigned count = std::numeric_limits < unsigned >::max ()); + unsigned count = MOCKPP_UNLIMITED); /** Adds another response throwable. * Response throwables are determined on the parameters you pass. This way the @@ -273,7 +273,7 @@ */ void addResponseThrowable (Throwable *t, const your_type1 &p1, - unsigned count = std::numeric_limits < unsigned >::max ()); + unsigned count = MOCKPP_UNLIMITED); /** Adds another response value. * Response values are determined on the parameter constraints you pass. This way the @@ -307,7 +307,7 @@ */ void addResponseValue (const your_type &rv, const your_type1 &p1, const your_type2 &p2, - unsigned count = std::numeric_limits < unsigned >::max ()); + unsigned count = MOCKPP_UNLIMITED); /** Adds another response throwable. * Response throwables are determined on the parameters you pass. This way the @@ -319,7 +319,7 @@ */ void addResponseThrowable (Throwable *t, const your_type1 &p1, const your_type2 &p2, - unsigned count = std::numeric_limits < unsigned >::max ()); + unsigned count = MOCKPP_UNLIMITED); /** Adds another response value. * Response values are determined on the parameter constraints you pass. This way the @@ -358,7 +358,7 @@ */ void addResponseValue (const your_type &rv, const your_type1 &p1, const your_type2 &p2, const your_type3 &p3, - unsigned count = std::numeric_limits < unsigned >::max ()); + unsigned count = MOCKPP_UNLIMITED); /** Adds another response throwable. * Response throwables are determined on the parameters you pass. This way the @@ -371,7 +371,7 @@ */ void addResponseThrowable (Throwable *t, const your_type1 &p1, const your_type2 &p2, const your_type3 &p3, - unsigned count = std::numeric_limits < unsigned >::max ()); + unsigned count = MOCKPP_UNLIMITED); /** Adds another response value. * Response values are determined on the parameter constraints you pass. This way the @@ -416,7 +416,7 @@ void addResponseValue (const your_type &rv, const your_type1 &p1, const your_type2 &p2, const your_type3 &p3, const your_type4 &p4, - unsigned count = std::numeric_limits < unsigned >::max ()); + unsigned count = MOCKPP_UNLIMITED); /** Adds another response throwable. * Response throwables are determined on the parameters you pass. This way the @@ -431,7 +431,7 @@ void addResponseThrowable (Throwable *t, const your_type1 &p1, const your_type2 &p2, const your_type3 &p3, const your_type4 &p4, - unsigned count = std::numeric_limits < unsigned >::max ()); + unsigned count = MOCKPP_UNLIMITED); /** Adds another response value. * Response values are determined on the parameter constraints you pass. This way the @@ -481,7 +481,7 @@ void addResponseValue (const your_type &rv, const your_type1 &p1, const your_type2 &p2, const your_type3 &p3, const your_type4 &p4, const your_type5 &p5, - unsigned count = std::numeric_limits < unsigned >::max ()); + unsigned count = MOCKPP_UNLIMITED); /** Adds another response throwable. * Response throwables are determined on the parameters you pass. This way the @@ -497,7 +497,7 @@ void addResponseThrowable (Throwable *t, const your_type1 &p1, const your_type2 &p2, const your_type3 &p3, const your_type4 &p4, const your_type5 &p5, - unsigned count = std::numeric_limits < unsigned >::max ()); + unsigned count = MOCKPP_UNLIMITED); /** Adds another response value. * Response values are determined on the parameter constraints you pass. This way the Index: VisitableMockObject_macro.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/visiting/VisitableMockObject_macro.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- VisitableMockObject_macro.h 15 Mar 2006 21:34:10 -0000 1.3 +++ VisitableMockObject_macro.h 5 Apr 2006 17:03:41 -0000 1.4 @@ -195,7 +195,7 @@ #define MOCKPP_CONTROLLER_IMPL_THROW(methname) \ void addThrowable(MOCKPP_NS::Throwable *t_) \ { \ - std::auto_ptr<MOCKPP_NS::Throwable> at (t_); \ + MOCKPP_STD_NS::auto_ptr<MOCKPP_NS::Throwable> at (t_); \ MOCKPP_ASSERT_FALSE(objptr->isActivated()); \ objptr->methname ## Throwables.push_back(at.release()); \ objptr->methname ## ThrowableInsteadReturn.push_back(true); \ @@ -210,7 +210,7 @@ \ void setDefaultThrowable(MOCKPP_NS::Throwable *t_) \ { \ - std::auto_ptr<MOCKPP_NS::Throwable> at (t_); \ + MOCKPP_STD_NS::auto_ptr<MOCKPP_NS::Throwable> at (t_); \ MOCKPP_ASSERT_FALSE(objptr->isActivated()); \ objptr->methname ## DefaultThrowable.take(at.release()); \ } |
|
From: Ewald A. <ewa...@us...> - 2006-04-05 17:04:29
|
Update of /cvsroot/mockpp/mockpp/mockpp/docs/artikel/listings In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19970/mockpp/docs/artikel/listings Modified Files: basicmock.cpp chainmock.cpp consumer.h interface.h poormock.cpp visitmock.cpp Log Message: more namespace disabling Index: visitmock.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/docs/artikel/listings/visitmock.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- visitmock.cpp 15 Mar 2006 21:34:03 -0000 1.4 +++ visitmock.cpp 5 Apr 2006 17:03:38 -0000 1.5 @@ -24,13 +24,13 @@ , MOCKPP_CONSTRUCT_MEMBERS_FOR_VOID_VISITABLE0(close) {} - MOCKPP_VOID_VISITABLE_EXT1(VisitMock, open, const std::string &, - ext, std::string); + MOCKPP_VOID_VISITABLE_EXT1(VisitMock, open, const MOCKPP_STD_NS::string &, + ext, MOCKPP_STD_NS::string); - MOCKPP_VISITABLE0(VisitMock, std::string, read); + MOCKPP_VISITABLE0(VisitMock, MOCKPP_STD_NS::string, read); - MOCKPP_VOID_VISITABLE_EXT1(VisitMock, write, const std::string &, - ext, std::string); + MOCKPP_VOID_VISITABLE_EXT1(VisitMock, write, const MOCKPP_STD_NS::string &, + ext, MOCKPP_STD_NS::string); MOCKPP_VOID_VISITABLE0(VisitMock, close); }; @@ -66,24 +66,24 @@ mock.activate(); // Consumer-Klasse ablaufen lassen - std::cout << "Start der Tests" << std::endl; + MOCKPP_STD_NS::cout << "Start der Tests" << MOCKPP_STD_NS::endl; Consumer consumer(&mock); consumer.load(); consumer.process(); consumer.save(); - std::cout << "Ende der Tests" << std::endl; + MOCKPP_STD_NS::cout << "Ende der Tests" << MOCKPP_STD_NS::endl; // alle restlichen Bedingungen pr�fen mock.verify(); - std::cout << "Alle Tests wurden fehlerfrei durchlaufen" << std::endl; + MOCKPP_STD_NS::cout << "Alle Tests wurden fehlerfrei durchlaufen" << MOCKPP_STD_NS::endl; } - catch(std::exception &ex) + catch(MOCKPP_STD_NS::exception &ex) { - std::cout << std::endl - << "Fehler aufgetreten.\n" << ex.what() << std::endl - << std::endl; + MOCKPP_STD_NS::cout << MOCKPP_STD_NS::endl + << "Fehler aufgetreten.\n" << ex.what() << MOCKPP_STD_NS::endl + << MOCKPP_STD_NS::endl; } } Index: consumer.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/docs/artikel/listings/consumer.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- consumer.h 19 Dec 2004 17:58:31 -0000 1.1 +++ consumer.h 5 Apr 2006 17:03:38 -0000 1.2 @@ -23,8 +23,8 @@ private: Interface *configfile; - std::string config1; - std::string config2; - std::string config3; + MOCKPP_STD_NS::string config1; + MOCKPP_STD_NS::string config2; + MOCKPP_STD_NS::string config3; }; Index: interface.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/docs/artikel/listings/interface.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- interface.h 19 Dec 2004 17:58:31 -0000 1.1 +++ interface.h 5 Apr 2006 17:03:38 -0000 1.2 @@ -17,15 +17,15 @@ /** Öffnet die übergebene Datei. */ - virtual void open(const std::string &name) = 0; + virtual void open(const MOCKPP_STD_NS::string &name) = 0; /** Liest einen Datensatz bestehend aus einer Text-Zeile. */ - virtual std::string read() = 0; + virtual MOCKPP_STD_NS::string read() = 0; /** Schreibt einen Datensatz bestehend aus einer Text-Zeile. */ - virtual void write(const std::string &s) = 0; + virtual void write(const MOCKPP_STD_NS::string &s) = 0; /** Schliesst die Datei */ Index: poormock.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/docs/artikel/listings/poormock.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- poormock.cpp 29 Dec 2004 11:18:59 -0000 1.2 +++ poormock.cpp 5 Apr 2006 17:03:38 -0000 1.3 @@ -9,10 +9,10 @@ #define ASSERTER(x) \ if (!(x) ) { \ - std::cout << std::endl \ - << "Fehler aufgetreten.\n" << #x << std::endl \ - << std::endl \ - << std::flush; \ + MOCKPP_STD_NS::cout << MOCKPP_STD_NS::endl \ + << "Fehler aufgetreten.\n" << #x << MOCKPP_STD_NS::endl \ + << MOCKPP_STD_NS::endl \ + << MOCKPP_STD_NS::flush; \ exit(1); \ } @@ -30,18 +30,18 @@ close_counter = 0; } - virtual void open(const std::string & /* name */) + virtual void open(const MOCKPP_STD_NS::string & /* name */) { open_counter = ++counter; } - virtual std::string read() + virtual MOCKPP_STD_NS::string read() { read_counter = ++counter; return "dummy"; } - virtual void write(const std::string & /* s */) + virtual void write(const MOCKPP_STD_NS::string & /* s */) { write_counter = ++counter; } @@ -64,7 +64,7 @@ PoorMock mock; // Consumer-Klasse ablaufen lassen - std::cout << "Start der Tests" << std::endl; + MOCKPP_STD_NS::cout << "Start der Tests" << MOCKPP_STD_NS::endl; Consumer consumer(&mock); consumer.load(); @@ -80,8 +80,8 @@ ASSERTER(mock.write_counter == 9); ASSERTER(mock.close_counter == 10); - std::cout << "Ende der Tests" << std::endl; + MOCKPP_STD_NS::cout << "Ende der Tests" << MOCKPP_STD_NS::endl; - std::cout << "Alle Tests wurden fehlerfrei durchlaufen" << std::endl; + MOCKPP_STD_NS::cout << "Alle Tests wurden fehlerfrei durchlaufen" << MOCKPP_STD_NS::endl; } Index: basicmock.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/docs/artikel/listings/basicmock.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- basicmock.cpp 15 Mar 2006 21:34:03 -0000 1.3 +++ basicmock.cpp 5 Apr 2006 17:03:38 -0000 1.4 @@ -28,17 +28,17 @@ { } - virtual void open(const std::string &name) + virtual void open(const MOCKPP_STD_NS::string &name) { open_name.addActual(name); } - virtual std::string read() + virtual MOCKPP_STD_NS::string read() { return read_data.nextReturnObject(); } - virtual void write(const std::string &s) + virtual void write(const MOCKPP_STD_NS::string &s) { write_data.addActual(s); } @@ -48,10 +48,10 @@ close_counter.inc(); } - MOCKPP_NS::ExpectationList<std::string> open_name; + MOCKPP_NS::ExpectationList<MOCKPP_STD_NS::string> open_name; MOCKPP_NS::ExpectationCounter close_counter; - MOCKPP_NS::ExpectationList<std::string> write_data; - MOCKPP_NS::ReturnObjectList<std::string> read_data; + MOCKPP_NS::ExpectationList<MOCKPP_STD_NS::string> write_data; + MOCKPP_NS::ReturnObjectList<MOCKPP_STD_NS::string> read_data; }; @@ -79,23 +79,23 @@ mock.write_data.addExpected("Datenpaket-3/fertig"); // Consumer-Klasse ablaufen lassen - std::cout << "Start der Tests" << std::endl; + MOCKPP_STD_NS::cout << "Start der Tests" << MOCKPP_STD_NS::endl; Consumer consumer(&mock); consumer.load(); consumer.process(); consumer.save(); - std::cout << "Ende der Tests" << std::endl; + MOCKPP_STD_NS::cout << "Ende der Tests" << MOCKPP_STD_NS::endl; // alle restlichen Bedingungen pr�fen mock.verify(); - std::cout << "Alle Tests wurden fehlerfrei durchlaufen" << std::endl; + MOCKPP_STD_NS::cout << "Alle Tests wurden fehlerfrei durchlaufen" << MOCKPP_STD_NS::endl; } - catch(std::exception &ex) + catch(MOCKPP_STD_NS::exception &ex) { - std::cout << std::endl - << "Fehler aufgetreten.\n" << ex.what() << std::endl - << std::endl; + MOCKPP_STD_NS::cout << MOCKPP_STD_NS::endl + << "Fehler aufgetreten.\n" << ex.what() << MOCKPP_STD_NS::endl + << MOCKPP_STD_NS::endl; } } Index: chainmock.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/docs/artikel/listings/chainmock.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- chainmock.cpp 15 Mar 2006 21:34:03 -0000 1.4 +++ chainmock.cpp 5 Apr 2006 17:03:38 -0000 1.5 @@ -28,13 +28,13 @@ , MOCKPP_CONSTRUCT_MEMBERS_FOR_VOID_CHAINABLE0(close) {} - MOCKPP_VOID_CHAINABLE_EXT1(ChainMock, open, const std::string &, - ext, std::string); + MOCKPP_VOID_CHAINABLE_EXT1(ChainMock, open, const MOCKPP_STD_NS::string &, + ext, MOCKPP_STD_NS::string); - MOCKPP_CHAINABLE0(ChainMock, std::string, read); + MOCKPP_CHAINABLE0(ChainMock, MOCKPP_STD_NS::string, read); - MOCKPP_VOID_CHAINABLE_EXT1(ChainMock, write, const std::string &, - ext, std::string); + MOCKPP_VOID_CHAINABLE_EXT1(ChainMock, write, const MOCKPP_STD_NS::string &, + ext, MOCKPP_STD_NS::string); MOCKPP_VOID_CHAINABLE0(ChainMock, close); }; @@ -52,13 +52,13 @@ // Erwartungen f�r das Einlesen der Datei open_chainer.expects(once()) - .with(eq(std::string("datei1.lst"))) + .with(eq(MOCKPP_STD_NS::string("datei1.lst"))) .before(MOCKPP_PCHAR("reader")); read_chainer.stubs() - .will(onConsecutiveCalls(new ReturnStub<std::string>("Datenpaket-1"), - new ReturnStub<std::string>("Datenpaket-2"), - new ReturnStub<std::string>("Datenpaket-3"))) + .will(onConsecutiveCalls(new ReturnStub<MOCKPP_STD_NS::string>("Datenpaket-1"), + new ReturnStub<MOCKPP_STD_NS::string>("Datenpaket-2"), + new ReturnStub<MOCKPP_STD_NS::string>("Datenpaket-3"))) .id(MOCKPP_PCHAR("reader")); close_chainer.expects(once()) @@ -67,15 +67,15 @@ // Erwartungen f�r das Zur�ckschreiben der Datei open_chainer.expects(once()) - .with(eq(std::string("datei1.lst"))) + .with(eq(MOCKPP_STD_NS::string("datei1.lst"))) .before(MOCKPP_PCHAR("writer")); write_chainer.expects(once()) - .with(eq(std::string("Datenpaket-1/fertig"))); + .with(eq(MOCKPP_STD_NS::string("Datenpaket-1/fertig"))); write_chainer.expects(once()) - .with(eq(std::string("Datenpaket-2/fertig"))); + .with(eq(MOCKPP_STD_NS::string("Datenpaket-2/fertig"))); write_chainer.expects(once()) - .with(eq(std::string("Datenpaket-3/fertig"))) + .with(eq(MOCKPP_STD_NS::string("Datenpaket-3/fertig"))) .id(MOCKPP_PCHAR("writer")); close_chainer.expects(once()) @@ -83,23 +83,23 @@ // Consumer-Klasse ablaufen lassen - std::cout << "Start der Tests" << std::endl; + MOCKPP_STD_NS::cout << "Start der Tests" << MOCKPP_STD_NS::endl; Consumer consumer(&mock); consumer.load(); consumer.process(); consumer.save(); - std::cout << "Ende der Tests" << std::endl; + MOCKPP_STD_NS::cout << "Ende der Tests" << MOCKPP_STD_NS::endl; // alle restlichen Bedingungen pr�fen mock.verify(); - std::cout << "Alle Tests wurden fehlerfrei durchlaufen" << std::endl; + MOCKPP_STD_NS::cout << "Alle Tests wurden fehlerfrei durchlaufen" << MOCKPP_STD_NS::endl; } - catch(std::exception &ex) + catch(MOCKPP_STD_NS::exception &ex) { - std::cout << std::endl - << "Fehler aufgetreten.\n" << ex.what() << std::endl - << std::endl; + MOCKPP_STD_NS::cout << MOCKPP_STD_NS::endl + << "Fehler aufgetreten.\n" << ex.what() << MOCKPP_STD_NS::endl + << MOCKPP_STD_NS::endl; } } |
|
From: Ewald A. <ewa...@us...> - 2006-04-05 17:04:28
|
Update of /cvsroot/mockpp/mockpp/mockpp/framework In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19970/mockpp/framework Modified Files: CxxTestRunner.h VerifyingTestCaller.h VerifyingTestCase.cpp VerifyingTestCase.h Log Message: more namespace disabling Index: VerifyingTestCase.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/framework/VerifyingTestCase.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- VerifyingTestCase.cpp 15 Mar 2006 21:34:05 -0000 1.5 +++ VerifyingTestCase.cpp 5 Apr 2006 17:03:39 -0000 1.6 @@ -57,7 +57,7 @@ MOCKPP_EXPORT -VerifyingTestCase::VerifyingTestCase( const std::string &name) +VerifyingTestCase::VerifyingTestCase( const MOCKPP_STD_NS::string &name) : CppUnit::TestCase(name) #ifdef MOCKPP_ALTERNATIVE_STL , MockObject(MOCKPP_PCHAR("VerifyingTestCase/")+MOCKPP_GET_STRING(name.c_str()), 0) Index: VerifyingTestCaller.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/framework/VerifyingTestCaller.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- VerifyingTestCaller.h 15 Mar 2006 21:34:05 -0000 1.6 +++ VerifyingTestCaller.h 5 Apr 2006 17:03:39 -0000 1.7 @@ -66,7 +66,7 @@ * \param test the method this VerifyingTestCaller calls in runTest() * \param fixture the Fixture to invoke the test method on. */ - VerifyingTestCaller(const std::string &name, + VerifyingTestCaller(const MOCKPP_STD_NS::string &name, TestCaseMethod test, VerifyingFixtureType& fixture) : ::CppUnit::TestCaller<VerifyingFixtureType>(name, test, fixture) @@ -82,7 +82,7 @@ * \param test the method this VerifyingTestCaller calls in runTest() * \param fixture the Fixture to invoke the test method on. */ - VerifyingTestCaller(const std::string &name, + VerifyingTestCaller(const MOCKPP_STD_NS::string &name, TestCaseMethod test, VerifyingFixtureType* fixture) : ::CppUnit::TestCaller<VerifyingFixtureType>(name, test, fixture) Index: VerifyingTestCase.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/framework/VerifyingTestCase.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- VerifyingTestCase.h 15 Mar 2006 21:34:05 -0000 1.6 +++ VerifyingTestCase.h 5 Apr 2006 17:03:39 -0000 1.7 @@ -67,7 +67,7 @@ /** Constructs the test case. * @param name test case name */ - VerifyingTestCase( const std::string &name ); + VerifyingTestCase( const MOCKPP_STD_NS::string &name ); /** Constructs the test case. */ Index: CxxTestRunner.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/framework/CxxTestRunner.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- CxxTestRunner.h 19 Mar 2006 11:09:37 -0000 1.7 +++ CxxTestRunner.h 5 Apr 2006 17:03:39 -0000 1.8 @@ -61,7 +61,7 @@ _TS_CATCH_TYPE( (MOCKPP_NS::Exception &ex), {CXXTEST_NS::tracker().failedTest( MOCKPP_NS::getLatin1(ex.getSrcFile()).c_str(), ex.getSrcLine(), MOCKPP_NS::getLatin1(ex.getMessage()).c_str() ); } ) - _TS_CATCH_TYPE( (std::exception &ex), + _TS_CATCH_TYPE( (CXXTEST_STD_NS::exception &ex), {CXXTEST_NS::tracker().failedTest( __FILE__, __LINE__, ex.what() ); } ) _TS_LAST_CATCH( { CXXTEST_NS::tracker().failedTest( __FILE__, __LINE__, "Exception thrown from world" ); } ); |
|
From: Ewald A. <ewa...@us...> - 2006-04-05 17:04:27
|
Update of /cvsroot/mockpp/mockpp/mockpp/production In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19970/mockpp/production Modified Files: TimeServer.cpp TimeServer.h Log Message: more namespace disabling Index: TimeServer.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/production/TimeServer.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- TimeServer.h 22 Mar 2006 19:13:34 -0000 1.5 +++ TimeServer.h 5 Apr 2006 17:03:40 -0000 1.6 @@ -55,7 +55,7 @@ /** Returns the current unix time * @return unix time */ - virtual std::time_t getUnixTime() = 0; + virtual MOCKPP_STD_NS::time_t getUnixTime() = 0; }; @@ -69,7 +69,7 @@ /** Returns the current unix time * @return unix time */ - virtual std::time_t getUnixTime(); + virtual MOCKPP_STD_NS::time_t getUnixTime(); }; Index: TimeServer.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/production/TimeServer.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- TimeServer.cpp 22 Mar 2006 19:13:34 -0000 1.10 +++ TimeServer.cpp 5 Apr 2006 17:03:40 -0000 1.11 @@ -35,9 +35,9 @@ MOCKPP_NS_START -std::time_t MOCKPP_EXPORT RealTimeServer::getUnixTime() +MOCKPP_STD_NS::time_t MOCKPP_EXPORT RealTimeServer::getUnixTime() { - return std::time(NULL); + return MOCKPP_STD_NS::time(NULL); } |
|
From: Ewald A. <ewa...@us...> - 2006-04-05 17:04:27
|
Update of /cvsroot/mockpp/mockpp/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19970/mockpp Modified Files: ExpectationList.h ExpectationValue.h MockTimeServer.cpp MockTimeServer.h mockpp.cpp Log Message: more namespace disabling Index: mockpp.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/mockpp.cpp,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- mockpp.cpp 15 Mar 2006 21:33:58 -0000 1.26 +++ mockpp.cpp 5 Apr 2006 17:03:37 -0000 1.27 @@ -41,7 +41,7 @@ MOCKPP_STL::string num; info = ""; - std::size_t pos = s.find('.'); + MOCKPP_STD_NS::size_t pos = s.find('.'); bool good = true; if (pos != MOCKPP_STL::string::npos) { @@ -51,10 +51,10 @@ #ifdef _MSC_VER_60_70 // MAT using namespace std; instead ? EA: no :-) major = atoi(num.c_str()); #else - major = std::atoi(num.c_str()); + major = MOCKPP_STD_NS::atoi(num.c_str()); #endif s.erase(0, pos+1); - std::size_t pos = s.find('.'); + MOCKPP_STD_NS::size_t pos = s.find('.'); if (pos != MOCKPP_STL::string::npos) { @@ -64,7 +64,7 @@ #ifdef _MSC_VER_60_70 minor = atoi(num.c_str()); #else - minor = std::atoi(num.c_str()); + minor = MOCKPP_STD_NS::atoi(num.c_str()); #endif s.erase(0, pos+1); @@ -73,7 +73,7 @@ #ifdef _MSC_VER_60_70 patch = atoi(s.c_str()); #else - patch = std::atoi(s.c_str()); + patch = MOCKPP_STD_NS::atoi(s.c_str()); #endif } else Index: ExpectationList.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/ExpectationList.h,v retrieving revision 1.42 retrieving revision 1.43 diff -u -d -r1.42 -r1.43 --- ExpectationList.h 15 Mar 2006 21:33:56 -0000 1.42 +++ ExpectationList.h 5 Apr 2006 17:03:37 -0000 1.43 @@ -236,7 +236,7 @@ fmt = mockpp_i18n(MOCKPP_PCHAR("%1 added item[%2] does not match. %3 != %4.")); fmt << this->getVerifiableName() << size << expectedItems[(size - 1)] << actualItem; - assertEquals(fmt, actualItem, expectedItems[(size - 1)]); + this->assertEquals(fmt, actualItem, expectedItems[(size - 1)]); } private: Index: ExpectationValue.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/ExpectationValue.h,v retrieving revision 1.33 retrieving revision 1.34 diff -u -d -r1.33 -r1.34 --- ExpectationValue.h 15 Mar 2006 21:33:56 -0000 1.33 +++ ExpectationValue.h 5 Apr 2006 17:03:37 -0000 1.34 @@ -145,7 +145,7 @@ fmt = mockpp_i18n(MOCKPP_PCHAR("%1 did not receive the expected value. %2 != %3.")); fmt << this->getVerifiableName() << myExpectedValue << myActualValue; - assertEquals(fmt, myExpectedValue, myActualValue); + this->assertEquals(fmt, myExpectedValue, myActualValue); } } Index: MockTimeServer.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/MockTimeServer.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- MockTimeServer.h 15 Mar 2006 21:33:56 -0000 1.4 +++ MockTimeServer.h 5 Apr 2006 17:03:37 -0000 1.5 @@ -57,16 +57,16 @@ /** Returns the "current" unix time * @return unix time */ - virtual std::time_t getUnixTime(); + virtual MOCKPP_STD_NS::time_t getUnixTime(); /** Adds another "current" unix time * @param time unix time */ - void addUnixTime(std::time_t time); + void addUnixTime(MOCKPP_STD_NS::time_t time); private: - MOCKPP_NS::ReturnObjectList<std::time_t> mocktimes; + MOCKPP_NS::ReturnObjectList<MOCKPP_STD_NS::time_t> mocktimes; }; Index: MockTimeServer.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/MockTimeServer.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- MockTimeServer.cpp 15 Mar 2006 21:33:56 -0000 1.3 +++ MockTimeServer.cpp 5 Apr 2006 17:03:37 -0000 1.4 @@ -43,13 +43,13 @@ } -std::time_t MOCKPP_EXPORT MockTimeServer::getUnixTime() +MOCKPP_STD_NS::time_t MOCKPP_EXPORT MockTimeServer::getUnixTime() { return mocktimes.nextReturnObject(); } -void MOCKPP_EXPORT MockTimeServer::addUnixTime(std::time_t time) +void MOCKPP_EXPORT MockTimeServer::addUnixTime(MOCKPP_STD_NS::time_t time) { mocktimes.addObjectToReturn(time); } |
|
From: Ewald A. <ewa...@us...> - 2006-04-05 17:04:26
|
Update of /cvsroot/mockpp/mockpp/mockpp/examples In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19970/mockpp/examples Modified Files: mock_greeter.cpp Log Message: more namespace disabling Index: mock_greeter.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/examples/mock_greeter.cpp,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- mock_greeter.cpp 19 Mar 2006 11:09:37 -0000 1.24 +++ mock_greeter.cpp 5 Apr 2006 17:03:38 -0000 1.25 @@ -492,16 +492,16 @@ ret = run_cppunit(argc, argv); - std::cout << "\n"; + MOCKPP_STD_NS::cout << "\n"; #else - std::cout << MOCKPP_NS::getLatin1(mockpp_i18n("Test framework was not available at compile time!\n")).c_str(); - std::cout << MOCKPP_NS::getLatin1(mockpp_i18n("Will use mockpp features only.\n\n")).c_str(); + MOCKPP_STD_NS::cout << MOCKPP_NS::getLatin1(mockpp_i18n("Test framework was not available at compile time!\n")).c_str(); + MOCKPP_STD_NS::cout << MOCKPP_NS::getLatin1(mockpp_i18n("Will use mockpp features only.\n\n")).c_str(); #endif try { - std::cout << MOCKPP_NS::getLatin1(mockpp_i18n("Now running some tests with just mockpp features:\n\n")).c_str(); + MOCKPP_STD_NS::cout << MOCKPP_NS::getLatin1(mockpp_i18n("Now running some tests with just mockpp features:\n\n")).c_str(); Streamer_test st; st.test_write_ok(); @@ -533,12 +533,12 @@ } catch(MOCKPP_NS::Exception &ex) { - std::cout << "file: " << MOCKPP_NS::getLatin1(ex.getSrcFile()).c_str() << std::endl - << "line: " << ex.getSrcLine() << std::endl - << "msg : " << MOCKPP_NS::getLatin1(ex.getMessage()).c_str() << std::endl; + MOCKPP_STD_NS::cout << "file: " << MOCKPP_NS::getLatin1(ex.getSrcFile()).c_str() << MOCKPP_STD_NS::endl + << "line: " << ex.getSrcLine() << MOCKPP_STD_NS::endl + << "msg : " << MOCKPP_NS::getLatin1(ex.getMessage()).c_str() << MOCKPP_STD_NS::endl; ret = 1; } - std::cout << MOCKPP_NS::getLatin1(mockpp_i18n("Finished.\n")).c_str(); + MOCKPP_STD_NS::cout << MOCKPP_NS::getLatin1(mockpp_i18n("Finished.\n")).c_str(); return ret; } |
|
From: Ewald A. <ewa...@us...> - 2006-04-05 17:04:26
|
Update of /cvsroot/mockpp/mockpp/3party/ministl/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19970/3party/ministl/tests Modified Files: ministl_test.cpp Log Message: more namespace disabling Index: ministl_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/3party/ministl/tests/ministl_test.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- ministl_test.cpp 17 Mar 2006 08:40:52 -0000 1.8 +++ ministl_test.cpp 5 Apr 2006 17:03:36 -0000 1.9 @@ -54,7 +54,7 @@ bool map_test() { - std::cout << "Start map iter-test: \n"; + MINISTL_STD_NS::cout << "Start map iter-test: \n"; MINISTL_NS::map<int, unsigned> mm; MINISTL_NS::pair<int, unsigned> p(11, 22u); @@ -71,12 +71,12 @@ MINISTL_NS::map<int, unsigned>::iterator fit = mm.begin(); while (fit != mm.end()) { - std::cout << "fit++ " << (*fit).first - << " " << (*fit).second << std::endl; + MINISTL_STD_NS::cout << "fit++ " << (*fit).first + << " " << (*fit).second << MINISTL_STD_NS::endl; ++fit; } - std::cout << "End map iter-test: \n"; + MINISTL_STD_NS::cout << "End map iter-test: \n"; return 0; } @@ -84,7 +84,7 @@ bool multimap_test() { - std::cout << "Start multimap iter-test: \n"; + MINISTL_STD_NS::cout << "Start multimap iter-test: \n"; MINISTL_NS::multimap<unsigned, signed> mm; mm.insert(MINISTL_NS::make_pair(3u, 2)); @@ -111,12 +111,12 @@ fit = mm.begin(); while (fit != mm.end()) { - std::cout << "fit++ " << (*fit).first - << " " << (*fit).second << std::endl; + MINISTL_STD_NS::cout << "fit++ " << (*fit).first + << " " << (*fit).second << MINISTL_STD_NS::endl; ++fit; } - std::cout << "End multimap iter-test: \n"; + MINISTL_STD_NS::cout << "End multimap iter-test: \n"; return 0; } @@ -129,39 +129,39 @@ vv.push_back(2u); vv.push_back(3u); - std::cout << "Start vector iter-test:\n"; + MINISTL_STD_NS::cout << "Start vector iter-test:\n"; MINISTL_NS::vector<unsigned>::iterator fit = vv.begin(); if (*fit != 1) return 1; while (fit != vv.end()) - std::cout << "fit++ " << *fit++ << std::endl; + MINISTL_STD_NS::cout << "fit++ " << *fit++ << MINISTL_STD_NS::endl; fit = vv.end(); if (*(fit-1) != 3) return 1; while (fit != vv.begin()) - std::cout << "fit-- " << *--fit << std::endl; + MINISTL_STD_NS::cout << "fit-- " << *--fit << MINISTL_STD_NS::endl; - std::cout << "reverse iter-test:\n"; + MINISTL_STD_NS::cout << "reverse iter-test:\n"; MINISTL_NS::vector<unsigned>::reverse_iterator rit = vv.rbegin(); if (*rit != 3) return 1; while (rit != vv.rend()) - std::cout << "rit++ " << *rit++ << std::endl; + MINISTL_STD_NS::cout << "rit++ " << *rit++ << MINISTL_STD_NS::endl; rit = vv.rend(); if (*(rit-1) != 1) return 1; while (rit != vv.rbegin()) - std::cout << "rit-- " << *--rit << std::endl; + MINISTL_STD_NS::cout << "rit-- " << *--rit << MINISTL_STD_NS::endl; - std::cout << "End vector iter-test: \n"; + MINISTL_STD_NS::cout << "End vector iter-test: \n"; return 0; } |
|
From: Ewald A. <ewa...@us...> - 2006-04-05 17:04:26
|
Update of /cvsroot/mockpp/mockpp/mockpp/stub In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19970/mockpp/stub Modified Files: StubSequence.h TypelessStubSequence.h Log Message: more namespace disabling Index: TypelessStubSequence.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/stub/TypelessStubSequence.h,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- TypelessStubSequence.h 15 Mar 2006 21:34:07 -0000 1.12 +++ TypelessStubSequence.h 5 Apr 2006 17:03:40 -0000 1.13 @@ -77,7 +77,7 @@ { if (!stubs.empty()) { - std::auto_ptr< TypelessStub<R> > curr (stubs[0]); + MOCKPP_STD_NS::auto_ptr< TypelessStub<R> > curr (stubs[0]); stubs.erase(stubs.begin()); return curr->typelessInvoke(); } Index: StubSequence.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/stub/StubSequence.h,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- StubSequence.h 15 Mar 2006 21:34:07 -0000 1.30 +++ StubSequence.h 5 Apr 2006 17:03:40 -0000 1.31 @@ -85,7 +85,7 @@ { if (!stubs.empty()) { - std::auto_ptr< Stub<R, I> > curr (stubs[0]); + MOCKPP_STD_NS::auto_ptr< Stub<R, I> > curr (stubs[0]); stubs.erase(stubs.begin()); return curr->invoke(invocation); } |
|
From: Ewald A. <ewa...@us...> - 2006-04-05 17:04:26
|
Update of /cvsroot/mockpp/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19970 Modified Files: ChangeLog configure.in run-configure-unicode.sh Log Message: more namespace disabling Index: run-configure-unicode.sh =================================================================== RCS file: /cvsroot/mockpp/mockpp/run-configure-unicode.sh,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- run-configure-unicode.sh 19 Mar 2006 16:26:49 -0000 1.20 +++ run-configure-unicode.sh 5 Apr 2006 17:03:35 -0000 1.21 @@ -2,10 +2,14 @@ MYFLAGS="-O0 -g3 -Wall -Werror" #-pedantic +MYCC="g++"; + if which "gcc-4.0" 2>/dev/null >/dev/null; then MYCC="g++-4.0"; -else - MYCC="g++"; +fi + +if which "gcc-4.1" 2>/dev/null >/dev/null; then + MYCC="g++-4.1"; fi if which "ccache" 2>/dev/null >/dev/null; then @@ -15,7 +19,7 @@ echo MYCC: $MYCC #OPTS="--enable-doxygen --enable-docbook" -#OPTS="$OPTS --enable-builtin-stl" # --disable-exceptions --disable-rtti +OPTS="$OPTS --enable-builtin-stl" # --disable-rtti" # --disable-exceptions" OPTS="$OPTS --enable-debug=full" OPTS="$OPTS --disable-namespace" #OPTS="$OPTS --disable-builtin-cxxtest --enable-cppunit" Index: ChangeLog =================================================================== RCS file: /cvsroot/mockpp/mockpp/ChangeLog,v retrieving revision 1.103 retrieving revision 1.104 diff -u -d -r1.103 -r1.104 --- ChangeLog 22 Mar 2006 19:13:34 -0000 1.103 +++ ChangeLog 5 Apr 2006 17:03:35 -0000 1.104 @@ -4,12 +4,14 @@ -------------- 2006-03-23 1.11.4 - - added script to retrieve data from configure + - added script to retrieve data from configure for use in other + libraries - added compiler switches to disable namespaces for built-in sources to support older compilers at least partially - inline TimeServer class methods to make it independent from the library + - fixes for g++ 4.1 2006-03-05 1.11.3 Index: configure.in =================================================================== RCS file: /cvsroot/mockpp/mockpp/configure.in,v retrieving revision 1.116 retrieving revision 1.117 diff -u -d -r1.116 -r1.117 --- configure.in 19 Mar 2006 16:26:49 -0000 1.116 +++ configure.in 5 Apr 2006 17:03:35 -0000 1.117 @@ -466,6 +466,8 @@ AC_MSG_RESULT(yes) else AC_DEFINE(MOCKPP_NO_STD_NS, 1, [Define if the std namespace is missing.]) + AC_DEFINE(CXXTEST_NO_STD_NS, 1, [Define if the std namespace is missing.]) + AC_DEFINE(MINISTL_NO_STD_NS, 1, [Define if the std namespace is missing.]) AC_MSG_RESULT(no) fi |
|
From: Ewald A. <ewa...@us...> - 2006-04-05 17:04:18
|
Update of /cvsroot/mockpp/mockpp/3party/ministl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19970/3party/ministl Modified Files: ministl.h raw_iterator.h simplevec.h Log Message: more namespace disabling Index: simplevec.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/3party/ministl/simplevec.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- simplevec.h 17 Mar 2006 08:40:52 -0000 1.5 +++ simplevec.h 5 Apr 2006 17:03:36 -0000 1.6 @@ -42,7 +42,7 @@ public: typedef T* iterator; typedef const T* const_iterator; - typedef std::size_t size_type; + typedef MINISTL_STD_NS::size_t size_type; private: size_type _last, _size; T *_buf; Index: raw_iterator.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/3party/ministl/raw_iterator.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- raw_iterator.h 17 Mar 2006 08:40:52 -0000 1.4 +++ raw_iterator.h 5 Apr 2006 17:03:36 -0000 1.5 @@ -37,7 +37,7 @@ { public: - typedef std::size_t difference_type; + typedef MINISTL_STD_NS::size_t difference_type; typedef T* pointer; typedef const T* const_pointer; typedef T& reference; Index: ministl.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/3party/ministl/ministl.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- ministl.h 19 Mar 2006 11:09:36 -0000 1.6 +++ ministl.h 5 Apr 2006 17:03:36 -0000 1.7 @@ -38,6 +38,12 @@ #define ministl_assert(exp) assert(exp) #endif +#ifdef MINISTL_NO_STD_NS +# define MINISTL_STD_NS /* nothing */ +#else +# define MINISTL_STD_NS std +#endif + #ifdef MINISTL_NO_NAMESPACE # define MINISTL_ANON_NS_START /* nothing */ # define MINISTL_NS /* nothing */ |
|
From: Ewald A. <ewa...@us...> - 2006-03-22 19:13:45
|
Update of /cvsroot/mockpp/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25248 Modified Files: ChangeLog Log Message: make TimeServer class independent from lib Index: ChangeLog =================================================================== RCS file: /cvsroot/mockpp/mockpp/ChangeLog,v retrieving revision 1.102 retrieving revision 1.103 diff -u -d -r1.102 -r1.103 --- ChangeLog 19 Mar 2006 11:09:36 -0000 1.102 +++ ChangeLog 22 Mar 2006 19:13:34 -0000 1.103 @@ -2,11 +2,14 @@ mockpp history -------------- -2006-03-16 1.11.4 +2006-03-23 1.11.4 - added script to retrieve data from configure - - added compiler switch to disable namespaces + - added compiler switches to disable namespaces for built-in sources to support older compilers + at least partially + - inline TimeServer class methods to make it independent + from the library 2006-03-05 1.11.3 |
|
From: Ewald A. <ewa...@us...> - 2006-03-22 19:13:45
|
Update of /cvsroot/mockpp/mockpp/mockpp/production In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25248/mockpp/production Modified Files: TimeServer.cpp TimeServer.h Log Message: make TimeServer class independent from lib Index: TimeServer.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/production/TimeServer.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- TimeServer.h 15 Mar 2006 21:34:06 -0000 1.4 +++ TimeServer.h 22 Mar 2006 19:13:34 -0000 1.5 @@ -48,7 +48,9 @@ /** Destroys the time server. */ - virtual ~TimeServer(); + virtual ~TimeServer() + { + } /** Returns the current unix time * @return unix time Index: TimeServer.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/production/TimeServer.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- TimeServer.cpp 15 Mar 2006 21:34:06 -0000 1.9 +++ TimeServer.cpp 22 Mar 2006 19:13:34 -0000 1.10 @@ -35,14 +35,6 @@ MOCKPP_NS_START -MOCKPP_EXPORT TimeServer::~TimeServer() -{ -} - - -/////////////////////////////////////////////////////////////// - - std::time_t MOCKPP_EXPORT RealTimeServer::getUnixTime() { return std::time(NULL); |
|
From: Ewald A. <ewa...@us...> - 2006-03-20 17:30:50
|
Update of /cvsroot/mockpp/mockpp/bcb10 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5208/bcb10 Modified Files: .cvsignore Log Message: dos2unix Index: .cvsignore =================================================================== RCS file: /cvsroot/mockpp/mockpp/bcb10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- .cvsignore 20 Mar 2006 17:23:14 -0000 1.1 +++ .cvsignore 20 Mar 2006 17:30:30 -0000 1.2 @@ -1,9 +1,9 @@ -Debug_Build -__history -*.local -*.mak -*.dsk -*.bak -Makefile -Makefile.in -*.~* +Debug_Build +__history +*.local +*.mak +*.dsk +*.bak +Makefile +Makefile.in +*.~* |
|
From: Ewald A. <ewa...@us...> - 2006-03-20 17:28:22
|
Update of /cvsroot/mockpp/mockpp/bcb10 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4567/bcb10 Added Files: mockpp.bdsgroup Log Message: new project files --- NEW FILE: mockpp.bdsgroup --- (This appears to be a binary file; contents omitted.) |
Update of /cvsroot/mockpp/mockpp/bcb10 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2318 Added Files: .cvsignore Makefile.am basicmock.bpf chainmock.bpf chainmock2.bpf compile.bat cppunit.bpf gen-mak.bat mock_greeter.bpf mock_test.bpf mock_test_win32.bpf mockpp.bpf mockpp_cxxtest.bpf mockpp_production.bpf poormock-se.bpf poormock.bpf readability.bpf run.bat verifying.bpf visitmock.bpf visitmock2.bpf Log Message: new project files --- NEW FILE: .cvsignore --- Debug_Build __history *.local *.mak *.dsk *.bak Makefile Makefile.in *.~* --- NEW FILE: chainmock.bpf --- USELIB("c:\tmp\compile\mockpp_34.lib"); USEUNIT("..\mockpp\examples\tutorial\chainmock.cpp"); USEUNIT("..\mockpp\examples\tutorial\consumer.cpp"); //--------------------------------------------------------------------------- This file is used by the project manager only and should be treated like the project file main --- NEW FILE: mock_greeter.bpf --- USELIB("c:\tmp\compile\mockpp_34.lib"); USELIB("c:\tmp\compile\mockpp_cxxtest_34.lib"); USEUNIT("..\mockpp\examples\mock_greeter.cpp"); //--------------------------------------------------------------------------- This file is used by the project manager only and should be treated like the project file main --- NEW FILE: mock_test_win32.bpf --- //--------------------------------------------------------------------------- This file is used by the project manager only and should be treated like the project file main //--------------------------------------------------------------------------- USELIB("c:\tmp\compile\mockpp_34.lib"); USELIB("c:\tmp\compile\mockpp_production_34.lib"); USELIB("c:\tmp\compile\mockpp_cxxtest_34.lib"); USEUNIT("..\mockpp\tests\AssertMo_test.cpp"); USEUNIT("..\mockpp\tests\ExpectationCounter_test.cpp"); USEUNIT("..\mockpp\tests\ExpectationCounterRange_test.cpp"); USEUNIT("..\mockpp\tests\ExpectationList_test.cpp"); USEUNIT("..\mockpp\tests\ExpectationMap_test.cpp"); USEUNIT("..\mockpp\tests\ExpectationSegment_test.cpp"); USEUNIT("..\mockpp\tests\ExpectationSet_test.cpp"); USEUNIT("..\mockpp\tests\ExpectationValue_test.cpp"); USEUNIT("..\mockpp\tests\Formatter_test.cpp"); USEUNIT("..\mockpp\tests\mock_test_win32.cpp"); USEUNIT("..\mockpp\tests\VerifyingTestCase_test.cpp"); USEUNIT("..\mockpp\tests\Assert_test.cpp"); USEUNIT("..\mockpp\tests\MockObject_test.cpp"); USEUNIT("..\mockpp\tests\mockpp_test.cpp"); USEUNIT("..\mockpp\tests\ReturnObjectList_test.cpp"); USEUNIT("..\mockpp\tests\Verifiable_test.cpp"); USEUNIT("..\mockpp\tests\TrackingCounter_test.cpp"); USEUNIT("..\mockpp\tests\VisitableMockObject_void_test.cpp"); USEUNIT("..\mockpp\tests\Exception_test.cpp"); USEUNIT("..\mockpp\tests\ExpectationBoundary_test.cpp"); USEUNIT("..\mockpp\tests\Throwable_test.cpp"); USEUNIT("..\mockpp\tests\ThrowableList_test.cpp"); USEUNIT("..\mockpp\tests\VisitableMockObject_1_test.cpp"); USEUNIT("..\mockpp\tests\VisitableMockObject_1_void_test.cpp"); USEUNIT("..\mockpp\tests\VisitableMockObject_2_test.cpp"); USEUNIT("..\mockpp\tests\VisitableMockObject_2_void_test.cpp"); USEUNIT("..\mockpp\tests\VisitableMockObject_3_test.cpp"); USEUNIT("..\mockpp\tests\VisitableMockObject_3_void_test.cpp"); USEUNIT("..\mockpp\tests\VisitableMockObject_4_test.cpp"); USEUNIT("..\mockpp\tests\VisitableMockObject_4_void_test.cpp"); USEUNIT("..\mockpp\tests\VisitableMockObject_5_test.cpp"); USEUNIT("..\mockpp\tests\VisitableMockObject_5_void_test.cpp"); USEUNIT("..\mockpp\tests\MixedMockObject_5_test.cpp"); USEUNIT("..\mockpp\tests\VisitableMockObject_template_test.cpp"); USEUNIT("..\mockpp\tests\VisitableMockObject_test.cpp"); USEUNIT("..\mockpp\tests\ExpectationConglomeration_test.cpp"); USEUNIT("..\mockpp\tests\TimeServer_test.cpp"); USEUNIT("..\mockpp\tests\classes_ABCDE.cpp"); USEUNIT("..\mockpp\tests\VisitableMockMethod_test.cpp"); USEUNIT("..\mockpp\tests\VisitableMockMethod_1_test.cpp"); USEUNIT("..\mockpp\tests\VisitableMockMethod_2_test.cpp"); USEUNIT("..\mockpp\tests\ResponseVector_test.cpp"); USEUNIT("..\mockpp\tests\NoException_test.cpp"); USEUNIT("..\mockpp\tests\AbstractDynamicChainingMock_test.cpp"); USEUNIT("..\mockpp\tests\AbstractInvocationDispatcher_test.cpp"); USEUNIT("..\mockpp\tests\And_test.cpp"); USEUNIT("..\mockpp\tests\AnyArgumentsMatcher_test.cpp"); USEUNIT("..\mockpp\tests\ArgumentsMatchBuilder_test.cpp"); USEUNIT("..\mockpp\tests\ArgumentsMatcher_test.cpp"); USEUNIT("..\mockpp\tests\ChainableMockMethod_1_test.cpp"); USEUNIT("..\mockpp\tests\ChainableMockMethod_2_test.cpp"); USEUNIT("..\mockpp\tests\ChainableMockMethod_test.cpp"); USEUNIT("..\mockpp\tests\ChainableMockObject_1_test.cpp"); USEUNIT("..\mockpp\tests\ChainableMockObject_1_void_test.cpp"); USEUNIT("..\mockpp\tests\ChainableMockObject_2_test.cpp"); USEUNIT("..\mockpp\tests\ChainableMockObject_2_void_test.cpp"); USEUNIT("..\mockpp\tests\ChainableMockObject_3_test.cpp"); USEUNIT("..\mockpp\tests\ChainableMockObject_3_void_test.cpp"); USEUNIT("..\mockpp\tests\ChainableMockObject_4_test.cpp"); USEUNIT("..\mockpp\tests\ChainableMockObject_4_void_test.cpp"); USEUNIT("..\mockpp\tests\ChainableMockObject_5_test.cpp"); USEUNIT("..\mockpp\tests\ChainableMockObject_5_void_test.cpp"); USEUNIT("..\mockpp\tests\ChainableMockObject_test.cpp"); USEUNIT("..\mockpp\tests\ChainableMockObject_void_test.cpp"); USEUNIT("..\mockpp\tests\ChainableMockObjectPolymorphism_test.cpp"); USEUNIT("..\mockpp\tests\ChainingMockBuilder_test.cpp"); USEUNIT("..\mockpp\tests\ChainingMockObjectSupport_test.cpp"); USEUNIT("..\mockpp\tests\ConstraintList_test.cpp"); USEUNIT("..\mockpp\tests\ConstraintSet_test.cpp"); USEUNIT("..\mockpp\tests\CoreMock_test.cpp"); USEUNIT("..\mockpp\tests\CustomStub_test.cpp"); USEUNIT("..\mockpp\tests\DefaultResultStub_test.cpp"); USEUNIT("..\mockpp\tests\DynamicChainingMockError_test.cpp"); USEUNIT("..\mockpp\tests\FIFOInvocationDispatcher_test.cpp"); USEUNIT("..\mockpp\tests\Invocation_test.cpp"); USEUNIT("..\mockpp\tests\InvocationMocker_test.cpp"); USEUNIT("..\mockpp\tests\InvocationMockerBuilder_test.cpp"); USEUNIT("..\mockpp\tests\InvokeAtLeastMatcher_test.cpp"); USEUNIT("..\mockpp\tests\InvokeAtLeastOnceMatcher_test.cpp"); USEUNIT("..\mockpp\tests\InvokeAtMostMatcher_test.cpp"); USEUNIT("..\mockpp\tests\InvokeCountMatcher_test.cpp"); USEUNIT("..\mockpp\tests\InvokedAfterMatcher_test.cpp"); USEUNIT("..\mockpp\tests\InvokedBeforeMatcher_test.cpp"); USEUNIT("..\mockpp\tests\InvokedRecorder_test.cpp"); USEUNIT("..\mockpp\tests\InvokeOnceMatcher_test.cpp"); USEUNIT("..\mockpp\tests\IsAnything_test.cpp"); USEUNIT("..\mockpp\tests\IsCloseTo_test.cpp"); USEUNIT("..\mockpp\tests\IsEqual_test.cpp"); USEUNIT("..\mockpp\tests\IsGreaterOrEqual_test.cpp"); USEUNIT("..\mockpp\tests\IsGreaterThan_test.cpp"); USEUNIT("..\mockpp\tests\IsInstanceOf_test.cpp"); USEUNIT("..\mockpp\tests\IsLessOrEqual_test.cpp"); USEUNIT("..\mockpp\tests\IsLessThan_test.cpp"); USEUNIT("..\mockpp\tests\IsNot_test.cpp"); USEUNIT("..\mockpp\tests\IsNothing_test.cpp"); USEUNIT("..\mockpp\tests\IsSame_test.cpp"); USEUNIT("..\mockpp\tests\LIFOInvocationDispatcher_test.cpp"); USEUNIT("..\mockpp\tests\MatchBuilder_test.cpp"); USEUNIT("..\mockpp\tests\mockpp_pti_test.cpp"); USEUNIT("..\mockpp\tests\NoArgumentsMatcher_test.cpp"); USEUNIT("..\mockpp\tests\Or_test.cpp"); USEUNIT("..\mockpp\tests\OutBound_test.cpp"); USEUNIT("..\mockpp\tests\ReturnStub_test.cpp"); USEUNIT("..\mockpp\tests\StringContains_test.cpp"); USEUNIT("..\mockpp\tests\StringEndsWith_test.cpp"); USEUNIT("..\mockpp\tests\StringStartsWith_test.cpp"); USEUNIT("..\mockpp\tests\StubBuilder_test.cpp"); USEUNIT("..\mockpp\tests\StubSequence_test.cpp"); USEUNIT("..\mockpp\tests\TestFailureMatcher_test.cpp"); USEUNIT("..\mockpp\tests\TestFailureStub_test.cpp"); USEUNIT("..\mockpp\tests\ThrowStub_test.cpp"); USEUNIT("..\mockpp\tests\TypelessStubSequence_test.cpp"); USEUNIT("..\mockpp\tests\UnlimitedMatcher_test.cpp"); USEUNIT("..\mockpp\tests\VerifyingTestCaller_test.cpp"); USEUNIT("..\mockpp\tests\VoidStub_test.cpp"); //--------------------------------------------------------------------------- --- NEW FILE: mockpp_production.bpf --- USEUNIT("..\mockpp\production\TimeServer.cpp"); //--------------------------------------------------------------------------- This file is used by the project manager only and should be treated like the project file DllEntryPoint --- NEW FILE: compile.bat --- if exist c:\Programme\Borland\CBuilder5\Bin\make.exe set BCB_BIN=c:\Programme\Borland\CBuilder5\Bin if exist m:\ep\utilit\borland\cbuilder5\bin\make.exe set BCB_BIN=m:\ep\utilit\borland\cbuilder5\bin if exist d:\programme\borland\cbuilder5\bin\make.exe set BCB_BIN=d:\programme\borland\cbuilder5\bin if exist h:\Programme\Borland\CBuilder5\Bin\make.exe set BCB_BIN=h:\Programme\Borland\CBuilder5\Bin set path=%path%;%BCB_BIN% %BCB_BIN%\make -f mockpp_cxxtest.mak pause %BCB_BIN%\make -f mockpp_production.mak pause %BCB_BIN%\make -f mockpp.mak pause %BCB_BIN%\make -f mock_test.mak pause %BCB_BIN%\make -f mock_test_win32.mak pause %BCB_BIN%\make -f readability.mak pause %BCB_BIN%\make -f mock_greeter.mak pause %BCB_BIN%\make -f basicmock.mak pause %BCB_BIN%\make -f visitmock.mak pause %BCB_BIN%\make -f visitmock2.mak pause %BCB_BIN%\make -f chainmock.mak pause %BCB_BIN%\make -f chainmock2.mak pause %BCB_BIN%\make -f poormock.mak pause %BCB_BIN%\make -f poormock-se.mak pause %BCB_BIN%\make -f verifying.mak pause %BCB_BIN%\make -f cppunit.mak pause --- NEW FILE: cppunit.bpf --- USELIB("c:\tmp\compile\mockpp_34.lib"); USEUNIT("..\mockpp\examples\tutorial\cppunit.cpp"); //--------------------------------------------------------------------------- This file is used by the project manager only and should be treated like the project file main --- NEW FILE: mock_test.bpf --- //--------------------------------------------------------------------------- This file is used by the project manager only and should be treated like the project file main //--------------------------------------------------------------------------- USELIB("c:\tmp\compile\mockpp_34.lib"); USELIB("c:\tmp\compile\mockpp_production_34.lib"); USELIB("c:\tmp\compile\mockpp_cxxtest_34.lib"); //--------------------------------------------------------------------------- USEUNIT("..\mockpp\tests\AssertMo_test.cpp"); USEUNIT("..\mockpp\tests\ExpectationCounter_test.cpp"); USEUNIT("..\mockpp\tests\ExpectationCounterRange_test.cpp"); USEUNIT("..\mockpp\tests\ExpectationList_test.cpp"); USEUNIT("..\mockpp\tests\ExpectationMap_test.cpp"); USEUNIT("..\mockpp\tests\ExpectationSegment_test.cpp"); USEUNIT("..\mockpp\tests\ExpectationSet_test.cpp"); USEUNIT("..\mockpp\tests\ExpectationValue_test.cpp"); USEUNIT("..\mockpp\tests\Formatter_test.cpp"); USEUNIT("..\mockpp\tests\mock_test.cpp"); USEUNIT("..\mockpp\tests\VerifyingTestCase_test.cpp"); USEUNIT("..\mockpp\tests\Assert_test.cpp"); USEUNIT("..\mockpp\tests\MockObject_test.cpp"); USEUNIT("..\mockpp\tests\mockpp_test.cpp"); USEUNIT("..\mockpp\tests\ReturnObjectList_test.cpp"); USEUNIT("..\mockpp\tests\Verifiable_test.cpp"); USEUNIT("..\mockpp\tests\TrackingCounter_test.cpp"); USEUNIT("..\mockpp\tests\VisitableMockObject_void_test.cpp"); USEUNIT("..\mockpp\tests\Exception_test.cpp"); USEUNIT("..\mockpp\tests\ExpectationBoundary_test.cpp"); USEUNIT("..\mockpp\tests\Throwable_test.cpp"); USEUNIT("..\mockpp\tests\ThrowableList_test.cpp"); USEUNIT("..\mockpp\tests\VisitableMockObject_1_test.cpp"); USEUNIT("..\mockpp\tests\VisitableMockObject_1_void_test.cpp"); USEUNIT("..\mockpp\tests\VisitableMockObject_2_test.cpp"); USEUNIT("..\mockpp\tests\VisitableMockObject_2_void_test.cpp"); USEUNIT("..\mockpp\tests\VisitableMockObject_3_test.cpp"); USEUNIT("..\mockpp\tests\VisitableMockObject_3_void_test.cpp"); USEUNIT("..\mockpp\tests\VisitableMockObject_4_test.cpp"); USEUNIT("..\mockpp\tests\VisitableMockObject_4_void_test.cpp"); USEUNIT("..\mockpp\tests\VisitableMockObject_5_test.cpp"); USEUNIT("..\mockpp\tests\VisitableMockObject_5_void_test.cpp"); USEUNIT("..\mockpp\tests\MixedMockObject_5_test.cpp"); USEUNIT("..\mockpp\tests\VisitableMockObject_template_test.cpp"); USEUNIT("..\mockpp\tests\VisitableMockObject_test.cpp"); USEUNIT("..\mockpp\tests\ExpectationConglomeration_test.cpp"); USEUNIT("..\mockpp\tests\TimeServer_test.cpp"); USEUNIT("..\mockpp\tests\classes_ABCDE.cpp"); USEUNIT("..\mockpp\tests\VisitableMockMethod_test.cpp"); USEUNIT("..\mockpp\tests\VisitableMockMethod_1_test.cpp"); USEUNIT("..\mockpp\tests\VisitableMockMethod_2_test.cpp"); USEUNIT("..\mockpp\tests\ResponseVector_test.cpp"); USEUNIT("..\mockpp\tests\NoException_test.cpp"); USEUNIT("..\mockpp\tests\AbstractDynamicChainingMock_test.cpp"); USEUNIT("..\mockpp\tests\AbstractInvocationDispatcher_test.cpp"); USEUNIT("..\mockpp\tests\And_test.cpp"); USEUNIT("..\mockpp\tests\AnyArgumentsMatcher_test.cpp"); USEUNIT("..\mockpp\tests\ArgumentsMatchBuilder_test.cpp"); USEUNIT("..\mockpp\tests\ArgumentsMatcher_test.cpp"); USEUNIT("..\mockpp\tests\ChainableMockMethod_1_test.cpp"); USEUNIT("..\mockpp\tests\ChainableMockMethod_2_test.cpp"); USEUNIT("..\mockpp\tests\ChainableMockMethod_test.cpp"); USEUNIT("..\mockpp\tests\ChainableMockObject_1_test.cpp"); USEUNIT("..\mockpp\tests\ChainableMockObject_1_void_test.cpp"); USEUNIT("..\mockpp\tests\ChainableMockObject_2_test.cpp"); USEUNIT("..\mockpp\tests\ChainableMockObject_2_void_test.cpp"); USEUNIT("..\mockpp\tests\ChainableMockObject_3_test.cpp"); USEUNIT("..\mockpp\tests\ChainableMockObject_3_void_test.cpp"); USEUNIT("..\mockpp\tests\ChainableMockObject_4_test.cpp"); USEUNIT("..\mockpp\tests\ChainableMockObject_4_void_test.cpp"); USEUNIT("..\mockpp\tests\ChainableMockObject_5_test.cpp"); USEUNIT("..\mockpp\tests\ChainableMockObject_5_void_test.cpp"); USEUNIT("..\mockpp\tests\ChainableMockObject_test.cpp"); USEUNIT("..\mockpp\tests\ChainableMockObject_void_test.cpp"); USEUNIT("..\mockpp\tests\ChainableMockObjectPolymorphism_test.cpp"); USEUNIT("..\mockpp\tests\ChainingMockBuilder_test.cpp"); USEUNIT("..\mockpp\tests\ChainingMockObjectSupport_test.cpp"); USEUNIT("..\mockpp\tests\ConstraintList_test.cpp"); USEUNIT("..\mockpp\tests\ConstraintSet_test.cpp"); USEUNIT("..\mockpp\tests\CoreMock_test.cpp"); USEUNIT("..\mockpp\tests\CustomStub_test.cpp"); USEUNIT("..\mockpp\tests\DefaultResultStub_test.cpp"); USEUNIT("..\mockpp\tests\DynamicChainingMockError_test.cpp"); USEUNIT("..\mockpp\tests\FIFOInvocationDispatcher_test.cpp"); USEUNIT("..\mockpp\tests\Invocation_test.cpp"); USEUNIT("..\mockpp\tests\InvocationMocker_test.cpp"); USEUNIT("..\mockpp\tests\InvocationMockerBuilder_test.cpp"); USEUNIT("..\mockpp\tests\InvokeAtLeastMatcher_test.cpp"); USEUNIT("..\mockpp\tests\InvokeAtLeastOnceMatcher_test.cpp"); USEUNIT("..\mockpp\tests\InvokeAtMostMatcher_test.cpp"); USEUNIT("..\mockpp\tests\InvokeCountMatcher_test.cpp"); USEUNIT("..\mockpp\tests\InvokedAfterMatcher_test.cpp"); USEUNIT("..\mockpp\tests\InvokedBeforeMatcher_test.cpp"); USEUNIT("..\mockpp\tests\InvokedRecorder_test.cpp"); USEUNIT("..\mockpp\tests\InvokeOnceMatcher_test.cpp"); USEUNIT("..\mockpp\tests\IsAnything_test.cpp"); USEUNIT("..\mockpp\tests\IsCloseTo_test.cpp"); USEUNIT("..\mockpp\tests\IsEqual_test.cpp"); USEUNIT("..\mockpp\tests\IsGreaterOrEqual_test.cpp"); USEUNIT("..\mockpp\tests\IsGreaterThan_test.cpp"); USEUNIT("..\mockpp\tests\IsInstanceOf_test.cpp"); USEUNIT("..\mockpp\tests\IsLessOrEqual_test.cpp"); USEUNIT("..\mockpp\tests\IsLessThan_test.cpp"); USEUNIT("..\mockpp\tests\IsNot_test.cpp"); USEUNIT("..\mockpp\tests\IsNothing_test.cpp"); USEUNIT("..\mockpp\tests\IsSame_test.cpp"); USEUNIT("..\mockpp\tests\LIFOInvocationDispatcher_test.cpp"); USEUNIT("..\mockpp\tests\MatchBuilder_test.cpp"); USEUNIT("..\mockpp\tests\mockpp_pti_test.cpp"); USEUNIT("..\mockpp\tests\NoArgumentsMatcher_test.cpp"); USEUNIT("..\mockpp\tests\Or_test.cpp"); USEUNIT("..\mockpp\tests\OutBound_test.cpp"); USEUNIT("..\mockpp\tests\ReturnStub_test.cpp"); USEUNIT("..\mockpp\tests\StringContains_test.cpp"); USEUNIT("..\mockpp\tests\StringEndsWith_test.cpp"); USEUNIT("..\mockpp\tests\StringStartsWith_test.cpp"); USEUNIT("..\mockpp\tests\StubBuilder_test.cpp"); USEUNIT("..\mockpp\tests\StubSequence_test.cpp"); USEUNIT("..\mockpp\tests\TestFailureMatcher_test.cpp"); USEUNIT("..\mockpp\tests\TestFailureStub_test.cpp"); USEUNIT("..\mockpp\tests\ThrowStub_test.cpp"); USEUNIT("..\mockpp\tests\TypelessStubSequence_test.cpp"); USEUNIT("..\mockpp\tests\UnlimitedMatcher_test.cpp"); USEUNIT("..\mockpp\tests\VerifyingTestCaller_test.cpp"); USEUNIT("..\mockpp\tests\VoidStub_test.cpp"); --- NEW FILE: readability.bpf --- USELIB("c:\tmp\compile\mockpp_34.lib"); USEUNIT("..\mockpp\tests\readability_test.cpp"); USEUNIT("..\mockpp\tests\classes_ABCDE.cpp"); //--------------------------------------------------------------------------- This file is used by the project manager only and should be treated like the project file main --- NEW FILE: visitmock.bpf --- USELIB("c:\tmp\compile\mockpp_34.lib"); USEUNIT("..\mockpp\examples\tutorial\visitmock.cpp"); USEUNIT("..\mockpp\examples\tutorial\consumer.cpp"); //--------------------------------------------------------------------------- This file is used by the project manager only and should be treated like the project file main --- NEW FILE: poormock-se.bpf --- USELIB("c:\tmp\compile\mockpp_34.lib"); USEUNIT("..\mockpp\examples\tutorial\poormock-se.cpp"); USEUNIT("..\mockpp\examples\tutorial\consumer.cpp"); T//--------------------------------------------------------------------------- his file is used by the project manager only and should be treated like the project file main --- NEW FILE: visitmock2.bpf --- USELIB("c:\tmp\compile\mockpp_34.lib"); USEUNIT("..\mockpp\examples\tutorial\visitmock2.cpp"); USEUNIT("..\mockpp\examples\tutorial\consumer.cpp"); //--------------------------------------------------------------------------- This file is used by the project manager only and should be treated like the project file main --- NEW FILE: poormock.bpf --- USELIB("c:\tmp\compile\mockpp_34.lib"); USEUNIT("..\mockpp\examples\tutorial\poormock.cpp"); USEUNIT("..\mockpp\examples\tutorial\consumer.cpp"); T//--------------------------------------------------------------------------- his file is used by the project manager only and should be treated like the project file main --- NEW FILE: basicmock.bpf --- USELIB("c:\tmp\compile\mockpp_34.lib"); USEUNIT("..\mockpp\examples\tutorial\basicmock.cpp"); USEUNIT("..\mockpp\examples\tutorial\consumer.cpp"); //--------------------------------------------------------------------------- This file is used by the project manager only and should be treated like the project file main --- NEW FILE: verifying.bpf --- USELIB("c:\tmp\compile\mockpp_34.lib"); USEUNIT("..\mockpp\examples\tutorial\verifying.cpp"); T//--------------------------------------------------------------------------- his file is used by the project manager only and should be treated like the project file main --- NEW FILE: chainmock2.bpf --- USELIB("c:\tmp\compile\mockpp_34.lib"); USEUNIT("..\mockpp\examples\tutorial\chainmock2.cpp"); USEUNIT("..\mockpp\examples\tutorial\consumer.cpp"); //--------------------------------------------------------------------------- This file is used by the project manager only and should be treated like the project file main --- NEW FILE: mockpp_cxxtest.bpf --- USEUNIT("..\3party\cxxtest\cxxtest\Descriptions.cpp"); USEUNIT("..\3party\cxxtest\cxxtest\DummyDescriptions.cpp"); USEUNIT("..\3party\cxxtest\cxxtest\GlobalFixture.cpp"); USEUNIT("..\3party\cxxtest\cxxtest\LinkedList.cpp"); USEUNIT("..\3party\cxxtest\cxxtest\RealDescriptions.cpp"); USEUNIT("..\3party\cxxtest\cxxtest\TestSuite.cpp"); USEUNIT("..\3party\cxxtest\cxxtest\TestTracker.cpp"); USEUNIT("..\3party\cxxtest\cxxtest\ValueTraits.cpp"); //--------------------------------------------------------------------------- This file is used by the project manager only and should be treated like the project file DllEntryPoint --- NEW FILE: gen-mak.bat --- if exist c:\Programme\Borland\CBuilder5\Bin\make.exe set BCB_BIN=c:\Programme\Borland\CBuilder5\Bin if exist m:\ep\utilit\borland\cbuilder5\bin\make.exe set BCB_BIN=m:\ep\utilit\borland\cbuilder5\bin if exist d:\programme\borland\cbuilder5\bin\make.exe set BCB_BIN=d:\programme\borland\cbuilder5\bin if exist h:\programme\borland\cbuilder5\bin\make.exe set BCB_BIN=h:\programme\borland\cbuilder5\bin set path=%path%;%BCB_BIN% set COMPILE=c:\tmp\compile if not exist c:\tmp\. md c:\tmp if not exist c:\tmp\compile\. md c:\tmp\compile if not exist c:\tmp\compile\mockpp_34\. md c:\tmp\compile\mockpp_34 %BCB_BIN%\bpr2mak mockpp.bpr %BCB_BIN%\bpr2mak mockpp_cxxtest.bpr %BCB_BIN%\bpr2mak mockpp_production.bpr %BCB_BIN%\bpr2mak mock_test.bpr %BCB_BIN%\bpr2mak mock_test_win32.bpr %BCB_BIN%\bpr2mak readability.bpr %BCB_BIN%\bpr2mak jmock_test.bpr %BCB_BIN%\bpr2mak mock_greeter.bpr %BCB_BIN%\bpr2mak basicmock.bpr %BCB_BIN%\bpr2mak visitmock.bpr %BCB_BIN%\bpr2mak visitmock2.bpr %BCB_BIN%\bpr2mak chainmock.bpr %BCB_BIN%\bpr2mak chainmock2.bpr %BCB_BIN%\bpr2mak poormock.bpr %BCB_BIN%\bpr2mak poormock-se.bpr %BCB_BIN%\bpr2mak verifying.bpr %BCB_BIN%\bpr2mak cppunit.bpr --- NEW FILE: run.bat --- c:\tmp\compile\mock_test_34.exe pause c:\tmp\compile\readability_test_34.exe pause c:\tmp\compile\mock_greeter_34.exe pause c:\tmp\compile\basicmock_34.exe pause c:\tmp\compile\visitmock_34.exe pause c:\tmp\compile\visitmock2_34.exe pause c:\tmp\compile\chainmock_34.exe pause c:\tmp\compile\chainmock2_34.exe pause c:\tmp\compile\poormock_34.exe pause c:\tmp\compile\poormock_se_34.exe pause c:\tmp\compile\verifying_34.exe pause c:\tmp\compile\cppunit_34.exe pause --- NEW FILE: Makefile.am --- SUBDIRS = CLEANFILES = *.~* *.~~* *~ EXTRA_DIST = \ gen-mak.bat \ run.bat \ compile.bat \ mockpp.bpg \ mockpp_production.bpr \ mockpp_production.bpf \ mockpp_cxxtest.bpr \ mockpp_cxxtest.bpf \ readability.bpf \ readability.bpr \ mock_greeter.bpf \ mock_greeter.bpr \ basicmock.bpf \ basicmock.bpr \ visitmock.bpf \ visitmock.bpr \ visitmock2.bpf \ visitmock2.bpr \ chainmock.bpf \ chainmock.bpr \ chainmock2.bpf \ chainmock2.bpr \ poormock.bpf \ poormock.bpr \ poormock-se.bpf \ poormock-se.bpr \ cppunit.bpf \ cppunit.bpr \ verifying.bpf \ verifying.bpr \ mockpp.bpf \ mockpp.bpr \ mock_test.bpf \ mock_test.bpr \ mock_test_win32.bpf \ mock_test_win32.bpr mock_test_count: grep cpp $(srcdir)/mock_test.bpf | sort >mock_test.files cat mock_test.files | wc -l ; echo "Dateien in mock_test"; --- NEW FILE: mockpp.bpf --- USELIB("c:\tmp\compile\mockpp_cxxtest_34.lib"); USELIB("c:\tmp\compile\mockpp_production_34.lib"); //--------------------------------------------------------------------------- USEUNIT("..\mockpp\util\NotImplementedException.cpp"); USEUNIT("..\mockpp\util\AssertMo.cpp"); USEUNIT("..\mockpp\compat\AssertionFailedError.cpp"); USEUNIT("..\mockpp\compat\Exception.cpp"); USEUNIT("..\mockpp\compat\Formatter.cpp"); USEUNIT("..\mockpp\compat\Asserter.cpp"); USEUNIT("..\mockpp\chaining\ChainingMockObjectSupport.cpp"); USEUNIT("..\mockpp\ExpectationCounter.cpp"); USEUNIT("..\mockpp\ThrowableList.cpp"); USEUNIT("..\mockpp\Verifiable.cpp"); USEUNIT("..\mockpp\VerifiableList.cpp"); USEUNIT("..\mockpp\visiting\VisitableMockObject.cpp"); USEUNIT("..\mockpp\visiting\VisitableMockMethod.cpp"); USEUNIT("..\mockpp\MixedMockObject.cpp"); USEUNIT("..\mockpp\Throwable.cpp"); USEUNIT("..\mockpp\TrackingCounter.cpp"); USEUNIT("..\mockpp\mockpp.cpp"); USEUNIT("..\mockpp\MockObject.cpp"); USEUNIT("..\mockpp\framework\VerifyingTestCase.cpp"); USEUNIT("..\mockpp\framework\VerifyingTestCaller.cpp"); USEUNIT("..\mockpp\SelfDescribing.cpp"); USEUNIT("..\mockpp\chaining\ChainableMockObject.cpp"); USEUNIT("..\mockpp\builder\BuilderNamespace.cpp"); USEUNIT("..\mockpp\stub\VoidStub.cpp"); USEUNIT("..\mockpp\chaining\Invocation.cpp"); USEUNIT("..\mockpp\constraint\IsNothing.cpp"); USEUNIT("..\mockpp\constraint\IsAnything.cpp"); USEUNIT("..\mockpp\matcher\TypelessMatcher.cpp"); USEUNIT("..\mockpp\matcher\InvokeAtMostMatcher.cpp"); USEUNIT("..\mockpp\matcher\InvokeAtLeastOnceMatcher.cpp"); USEUNIT("..\mockpp\matcher\UnlimitedMatcher.cpp"); USEUNIT("..\mockpp\matcher\InvokeCountMatcher.cpp"); USEUNIT("..\mockpp\matcher\InvokedRecorder.cpp"); USEUNIT("..\mockpp\matcher\InvokeOnceMatcher.cpp"); USEUNIT("..\mockpp\matcher\TestFailureMatcher.cpp"); USEUNIT("..\mockpp\matcher\InvokeAtLeastMatcher.cpp"); USEUNIT("..\mockpp\builder\IdentityBuilder.cpp"); USEUNIT("..\mockpp\constraint\TypelessConstraint.cpp"); USEUNIT("..\mockpp\constraint\ConstraintSet.cpp"); USEUNIT("..\mockpp\MockTimeServer.cpp"); //--------------------------------------------------------------------------- This file is used by the project manager only and should be treated like the project file DllEntryPoint |
Update of /cvsroot/mockpp/mockpp/bcb10 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv857 Added Files: basicmock.bdsproj chainmock.bdsproj chainmock2.bdsproj cppunit.bdsproj mock_greeter.bdsproj mock_test.bdsproj mock_test_win32.bdsproj mockpp.bdsproj mockpp_cxxtest.bdsproj mockpp_production.bdsproj poormock-se.bdsproj poormock.bdsproj readability.bdsproj verifying.bdsproj visitmock.bdsproj visitmock2.bdsproj Log Message: new project files --- NEW FILE: cppunit.bdsproj --- (This appears to be a binary file; contents omitted.) --- NEW FILE: mockpp.bdsproj --- (This appears to be a binary file; contents omitted.) --- NEW FILE: readability.bdsproj --- (This appears to be a binary file; contents omitted.) --- NEW FILE: mock_test.bdsproj --- (This appears to be a binary file; contents omitted.) --- NEW FILE: visitmock.bdsproj --- (This appears to be a binary file; contents omitted.) --- NEW FILE: poormock-se.bdsproj --- (This appears to be a binary file; contents omitted.) --- NEW FILE: visitmock2.bdsproj --- (This appears to be a binary file; contents omitted.) --- NEW FILE: mockpp_cxxtest.bdsproj --- (This appears to be a binary file; contents omitted.) --- NEW FILE: chainmock.bdsproj --- (This appears to be a binary file; contents omitted.) --- NEW FILE: mock_greeter.bdsproj --- (This appears to be a binary file; contents omitted.) --- NEW FILE: verifying.bdsproj --- (This appears to be a binary file; contents omitted.) --- NEW FILE: basicmock.bdsproj --- (This appears to be a binary file; contents omitted.) --- NEW FILE: poormock.bdsproj --- (This appears to be a binary file; contents omitted.) --- NEW FILE: chainmock2.bdsproj --- (This appears to be a binary file; contents omitted.) --- NEW FILE: mockpp_production.bdsproj --- (This appears to be a binary file; contents omitted.) --- NEW FILE: mock_test_win32.bdsproj --- (This appears to be a binary file; contents omitted.) |
|
From: Ewald A. <ewa...@us...> - 2006-03-20 17:17:07
|
Update of /cvsroot/mockpp/mockpp/bcb10 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31444/bcb10 Log Message: Directory /cvsroot/mockpp/mockpp/bcb10 added to the repository |
