[Mockpp-commits] mockpp/3party/cxxtest/cxxtest Mock.h,1.2,1.3 TestSuite.h,1.3,1.4 ValueTraits.h,1.4,
Brought to you by:
ewald-arnold
Menu
▾
▴
[Mockpp-commits] mockpp/3party/cxxtest/cxxtest Mock.h,1.2,1.3 TestSuite.h,1.3,1.4 ValueTraits.h,1.4,1.5
|
From: Ewald A. <ewa...@us...> - 2006-03-19 11:09:51
|
Update of /cvsroot/mockpp/mockpp/3party/cxxtest/cxxtest In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16313/3party/cxxtest/cxxtest Modified Files: Mock.h TestSuite.h ValueTraits.h Log Message: optionally disable namespace Index: TestSuite.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/3party/cxxtest/cxxtest/TestSuite.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- TestSuite.h 17 Mar 2006 08:41:51 -0000 1.3 +++ TestSuite.h 19 Mar 2006 11:09:36 -0000 1.4 @@ -27,7 +27,7 @@ class AbortTest {}; void doAbortTest(); -# define TS_ABORT() CxxTest::doAbortTest() +# define TS_ABORT() CXXTEST_NS::doAbortTest() bool abortTestOnFail(); void setAbortTestOnFail( bool value = CXXTEST_DEFAULT_ABORT ); @@ -189,12 +189,12 @@ # ifdef _CXXTEST_HAVE_EH # define _TS_TRY try # define _TS_CATCH_TYPE(t, b) catch t b -# define _TS_CATCH_ABORT(b) _TS_CATCH_TYPE( (const CxxTest::AbortTest &), b ) +# define _TS_CATCH_ABORT(b) _TS_CATCH_TYPE( (const CXXTEST_NS::AbortTest &), b ) # define _TS_LAST_CATCH(b) _TS_CATCH_TYPE( (...), b ) -# define _TSM_LAST_CATCH(f,l,m) _TS_LAST_CATCH( { (CxxTest::tracker()).failedTest(f,l,m); } ) +# 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::tracker()).failedTest(f,l,e.what()); } \ + catch(const std::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) @@ -216,19 +216,19 @@ # endif // _CXXTEST_HAVE_EH // TS_TRACE -# define _TS_TRACE(f,l,e) CxxTest::doTrace( (f), (l), TS_AS_STRING(e) ) +# define _TS_TRACE(f,l,e) CXXTEST_NS::doTrace( (f), (l), TS_AS_STRING(e) ) # define TS_TRACE(e) _TS_TRACE( __FILE__, __LINE__, e ) // TS_WARN -# define _TS_WARN(f,l,e) CxxTest::doWarn( (f), (l), TS_AS_STRING(e) ) +# define _TS_WARN(f,l,e) CXXTEST_NS::doWarn( (f), (l), TS_AS_STRING(e) ) # define TS_WARN(e) _TS_WARN( __FILE__, __LINE__, e ) // TS_FAIL -# define _TS_FAIL(f,l,e) CxxTest::doFailTest( (f), (l), TS_AS_STRING(e) ) +# define _TS_FAIL(f,l,e) CXXTEST_NS::doFailTest( (f), (l), TS_AS_STRING(e) ) # define TS_FAIL(e) _TS_FAIL( __FILE__, __LINE__, e ) // TS_ASSERT -# define ___ETS_ASSERT(f,l,e,m) { if ( !(e) ) CxxTest::doFailAssert( (f), (l), #e, (m) ); } +# define ___ETS_ASSERT(f,l,e,m) { if ( !(e) ) CXXTEST_NS::doFailAssert( (f), (l), #e, (m) ); } # define ___TS_ASSERT(f,l,e,m) { _TS_TRY { ___ETS_ASSERT(f,l,e,m); } __TS_CATCH(f,l) } # define _ETS_ASSERT(f,l,e) ___ETS_ASSERT(f,l,e,0) @@ -244,7 +244,7 @@ # define TSM_ASSERT(m,e) _TSM_ASSERT(__FILE__,__LINE__,m,e) // TS_ASSERT_EQUALS -# define ___ETS_ASSERT_EQUALS(f,l,x,y,m) CxxTest::doAssertEquals( (f), (l), #x, (x), #y, (y), (m) ) +# define ___ETS_ASSERT_EQUALS(f,l,x,y,m) CXXTEST_NS::doAssertEquals( (f), (l), #x, (x), #y, (y), (m) ) # define ___TS_ASSERT_EQUALS(f,l,x,y,m) { _TS_TRY { ___ETS_ASSERT_EQUALS(f,l,x,y,m); } __TS_CATCH(f,l) } # define _ETS_ASSERT_EQUALS(f,l,x,y) ___ETS_ASSERT_EQUALS(f,l,x,y,0) @@ -260,7 +260,7 @@ # define TSM_ASSERT_EQUALS(m,x,y) _TSM_ASSERT_EQUALS(__FILE__,__LINE__,m,x,y) // TS_ASSERT_SAME_DATA -# define ___ETS_ASSERT_SAME_DATA(f,l,x,y,s,m) CxxTest::doAssertSameData( (f), (l), #x, (x), #y, (y), #s, (s), (m) ) +# define ___ETS_ASSERT_SAME_DATA(f,l,x,y,s,m) CXXTEST_NS::doAssertSameData( (f), (l), #x, (x), #y, (y), #s, (s), (m) ) # define ___TS_ASSERT_SAME_DATA(f,l,x,y,s,m) { _TS_TRY { ___ETS_ASSERT_SAME_DATA(f,l,x,y,s,m); } __TS_CATCH(f,l) } # define _ETS_ASSERT_SAME_DATA(f,l,x,y,s) ___ETS_ASSERT_SAME_DATA(f,l,x,y,s,0) @@ -276,7 +276,7 @@ # define TSM_ASSERT_SAME_DATA(m,x,y,s) _TSM_ASSERT_SAME_DATA(__FILE__,__LINE__,m,x,y,s) // TS_ASSERT_DIFFERS -# define ___ETS_ASSERT_DIFFERS(f,l,x,y,m) CxxTest::doAssertDiffers( (f), (l), #x, (x), #y, (y), (m) ) +# define ___ETS_ASSERT_DIFFERS(f,l,x,y,m) CXXTEST_NS::doAssertDiffers( (f), (l), #x, (x), #y, (y), (m) ) # define ___TS_ASSERT_DIFFERS(f,l,x,y,m) { _TS_TRY { ___ETS_ASSERT_DIFFERS(f,l,x,y,m); } __TS_CATCH(f,l) } # define _ETS_ASSERT_DIFFERS(f,l,x,y) ___ETS_ASSERT_DIFFERS(f,l,x,y,0) @@ -292,7 +292,7 @@ # define TSM_ASSERT_DIFFERS(m,x,y) _TSM_ASSERT_DIFFERS(__FILE__,__LINE__,m,x,y) // TS_ASSERT_LESS_THAN -# define ___ETS_ASSERT_LESS_THAN(f,l,x,y,m) CxxTest::doAssertLessThan( (f), (l), #x, (x), #y, (y), (m) ) +# define ___ETS_ASSERT_LESS_THAN(f,l,x,y,m) CXXTEST_NS::doAssertLessThan( (f), (l), #x, (x), #y, (y), (m) ) # define ___TS_ASSERT_LESS_THAN(f,l,x,y,m) { _TS_TRY { ___ETS_ASSERT_LESS_THAN(f,l,x,y,m); } __TS_CATCH(f,l) } # define _ETS_ASSERT_LESS_THAN(f,l,x,y) ___ETS_ASSERT_LESS_THAN(f,l,x,y,0) @@ -309,7 +309,7 @@ // TS_ASSERT_LESS_THAN_EQUALS # define ___ETS_ASSERT_LESS_THAN_EQUALS(f,l,x,y,m) \ - CxxTest::doAssertLessThanEquals( (f), (l), #x, (x), #y, (y), (m) ) + CXXTEST_NS::doAssertLessThanEquals( (f), (l), #x, (x), #y, (y), (m) ) # define ___TS_ASSERT_LESS_THAN_EQUALS(f,l,x,y,m) \ { _TS_TRY { ___ETS_ASSERT_LESS_THAN_EQUALS(f,l,x,y,m); } __TS_CATCH(f,l) } @@ -327,7 +327,7 @@ // TS_ASSERT_PREDICATE # define ___ETS_ASSERT_PREDICATE(f,l,p,x,m) \ - CxxTest::doAssertPredicate( (f), (l), #p, p(), #x, (x), (m) ) + CXXTEST_NS::doAssertPredicate( (f), (l), #p, p(), #x, (x), (m) ) # define ___TS_ASSERT_PREDICATE(f,l,p,x,m) \ { _TS_TRY { ___ETS_ASSERT_PREDICATE(f,l,p,x,m); } __TS_CATCH(f,l) } @@ -345,7 +345,7 @@ // TS_ASSERT_RELATION # define ___ETS_ASSERT_RELATION(f,l,r,x,y,m) \ - CxxTest::doAssertRelation( (f), (l), #r, r(), #x, (x), #y, (y), (m) ) + CXXTEST_NS::doAssertRelation( (f), (l), #r, r(), #x, (x), #y, (y), (m) ) # define ___TS_ASSERT_RELATION(f,l,r,x,y,m) \ { _TS_TRY { ___ETS_ASSERT_RELATION(f,l,r,x,y,m); } __TS_CATCH(f,l) } @@ -362,7 +362,7 @@ # define TSM_ASSERT_RELATION(m,r,x,y) _TSM_ASSERT_RELATION(__FILE__,__LINE__,m,r,x,y) // TS_ASSERT_DELTA -# define ___ETS_ASSERT_DELTA(f,l,x,y,d,m) CxxTest::doAssertDelta( (f), (l), #x, (x), #y, (y), #d, (d), (m) ) +# define ___ETS_ASSERT_DELTA(f,l,x,y,d,m) CXXTEST_NS::doAssertDelta( (f), (l), #x, (x), #y, (y), #d, (d), (m) ) # define ___TS_ASSERT_DELTA(f,l,x,y,d,m) { _TS_TRY { ___ETS_ASSERT_DELTA(f,l,x,y,d,m); } __TS_CATCH(f,l) } # define _ETS_ASSERT_DELTA(f,l,x,y,d) ___ETS_ASSERT_DELTA(f,l,x,y,d,0) @@ -384,7 +384,7 @@ _TS_CATCH_TYPE( (t), { _ts_threw_expected = true; } ) \ _TS_CATCH_ABORT( { throw; } ) \ _TS_LAST_CATCH( { _ts_threw_else = true; } ) \ - if ( !_ts_threw_expected ) { CxxTest::doFailAssertThrows( (f), (l), #e, #t, _ts_threw_else, (m) ); } } + if ( !_ts_threw_expected ) { CXXTEST_NS::doFailAssertThrows( (f), (l), #e, #t, _ts_threw_else, (m) ); } } # define _TS_ASSERT_THROWS(f,l,e,t) ___TS_ASSERT_THROWS(f,l,e,t,0) # define TS_ASSERT_THROWS(e,t) _TS_ASSERT_THROWS(__FILE__,__LINE__,e,t) @@ -399,7 +399,7 @@ _TS_CATCH_TYPE( (t), { a; _ts_threw_expected = true; } ) \ _TS_CATCH_ABORT( { throw; } ) \ _TS_LAST_CATCH( { _ts_threw_else = true; } ) \ - if ( !_ts_threw_expected ) { CxxTest::doFailAssertThrows( (f), (l), #e, #t, _ts_threw_else, (m) ); } } + if ( !_ts_threw_expected ) { CXXTEST_NS::doFailAssertThrows( (f), (l), #e, #t, _ts_threw_else, (m) ); } } # define _TS_ASSERT_THROWS_ASSERT(f,l,e,t,a) ___TS_ASSERT_THROWS_ASSERT(f,l,e,t,a,0) # define TS_ASSERT_THROWS_ASSERT(e,t,a) _TS_ASSERT_THROWS_ASSERT(__FILE__,__LINE__,e,t,a) @@ -444,7 +444,7 @@ bool _ts_threw = false; \ _TS_TRY { e; } \ _TS_LAST_CATCH( { _ts_threw = true; } ) \ - if ( !_ts_threw ) { CxxTest::doFailAssertThrows( (f), (l), #e, "...", false, (m) ); } } + if ( !_ts_threw ) { CXXTEST_NS::doFailAssertThrows( (f), (l), #e, "...", false, (m) ); } } # define _TS_ASSERT_THROWS_ANYTHING(f,l,e) ___TS_ASSERT_THROWS_ANYTHING(f,l,e,0) # define TS_ASSERT_THROWS_ANYTHING(e) _TS_ASSERT_THROWS_ANYTHING(__FILE__, __LINE__, e) @@ -456,7 +456,7 @@ # define ___TS_ASSERT_THROWS_NOTHING(f,l,e,m) { \ _TS_TRY { e; } \ _TS_CATCH_ABORT( { throw; } ) \ - _TS_LAST_CATCH( { CxxTest::doFailAssertThrowsNot( (f), (l), #e, (m) ); } ) } + _TS_LAST_CATCH( { CXXTEST_NS::doFailAssertThrowsNot( (f), (l), #e, (m) ); } ) } # define _TS_ASSERT_THROWS_NOTHING(f,l,e) ___TS_ASSERT_THROWS_NOTHING(f,l,e,0) # define TS_ASSERT_THROWS_NOTHING(e) _TS_ASSERT_THROWS_NOTHING(__FILE__,__LINE__,e) Index: ValueTraits.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/3party/cxxtest/cxxtest/ValueTraits.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- ValueTraits.h 17 Mar 2006 08:41:51 -0000 1.4 +++ ValueTraits.h 19 Mar 2006 11:09:36 -0000 1.5 @@ -22,7 +22,7 @@ // // This is how we use the value traits // -# define TS_AS_STRING(x) CxxTest::traits(x).asString() +# define TS_AS_STRING(x) CXXTEST_NS::traits(x).asString() // // Char representation of a digit Index: Mock.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/3party/cxxtest/cxxtest/Mock.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Mock.h 17 Mar 2006 08:41:51 -0000 1.2 +++ Mock.h 19 Mar 2006 11:09:36 -0000 1.3 @@ -50,7 +50,7 @@ // #define __CXXTEST_MOCK__CLASS_DECLARATION( MOCK, TYPE, NAME, ARGS, REAL, CALL ) \ CXXTEST_NS_START \ - class Base_##MOCK : public CxxTest::Link \ + class Base_##MOCK : public CXXTEST_NS::Link \ { \ public: \ Base_##MOCK(); \ @@ -63,7 +63,7 @@ virtual TYPE NAME ARGS = 0; \ \ private: \ - static CxxTest::List _list; \ + static CXXTEST_NS::List _list; \ }; \ \ class Real_##MOCK : public Base_##MOCK \ @@ -84,7 +84,7 @@ #define __CXXTEST_SUPPLY__CLASS_DECLARATION( MOCK, TYPE, NAME, ARGS, REAL, CALL ) \ CXXTEST_NS_START \ - class Base_##MOCK : public CxxTest::Link \ + class Base_##MOCK : public CXXTEST_NS::Link \ { \ public: \ Base_##MOCK(); \ @@ -97,7 +97,7 @@ virtual TYPE NAME ARGS = 0; \ \ private: \ - static CxxTest::List _list; \ + static CXXTEST_NS::List _list; \ }; \ \ class _Unimplemented_##MOCK : public Base_##MOCK \ @@ -116,7 +116,7 @@ #define __CXXTEST_MOCK__COMMON_CLASS_IMPLEMENTATION( MOCK, NAME ) \ CXXTEST_NS_START \ \ - CxxTest::List Base_##MOCK::_list = { 0, 0 }; \ + CXXTEST_NS::List Base_##MOCK::_list = { 0, 0 }; \ \ Base_##MOCK::Base_##MOCK() { attach( _list ); } \ Base_##MOCK::~Base_##MOCK() { detach( _list ); } \ |
