mockpp-commits Mailing List for Mock Objects for C++ (Page 12)
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...> - 2005-12-28 19:43:16
|
Update of /cvsroot/mockpp/mockpp/mockpp/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15261/mockpp/tests Modified Files: Formatter_test.cpp VerifyingTestCaller_test.cpp Log Message: fixes bcb5, msvc Index: VerifyingTestCaller_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VerifyingTestCaller_test.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- VerifyingTestCaller_test.cpp 28 Dec 2005 09:23:31 -0000 1.15 +++ VerifyingTestCaller_test.cpp 28 Dec 2005 19:43:08 -0000 1.16 @@ -39,13 +39,19 @@ # include <memory> #endif -#include <mockpp/framework/VerifyingTestCaller.h> - #include <mockpp/compat/Assert.h> +#if defined (MOCKPP_USE_CXXTEST) + +#elif defined(MOCKPP_USE_CPPUNIT) + +#include <mockpp/framework/VerifyingTestCaller.h> + #include <cppunit/extensions/HelperMacros.h> #include <cppunit/TestResult.h> +#endif + namespace { Index: Formatter_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/Formatter_test.cpp,v retrieving revision 1.33 retrieving revision 1.34 diff -u -d -r1.33 -r1.34 --- Formatter_test.cpp 28 Dec 2005 09:23:31 -0000 1.33 +++ Formatter_test.cpp 28 Dec 2005 19:43:08 -0000 1.34 @@ -262,10 +262,10 @@ mockpp::String str = mockpp::number(ul); // base 10 char buff[100]; -#if defined(_MSC_VER) - sprintf( buff, "%ld", ul ); +#ifdef HAVE_SPRINTF_S + sprintf_s(buff, "%ld", ul ); #else - std::sprintf(buff, "%ld", ul ); + std::sprintf(buff, "%ld", ul ); #endif #ifdef MOCKPP_UNICODE @@ -301,10 +301,10 @@ mockpp::String str = mockpp::number(ul); // base 10 char buff[100]; -#if defined(_MSC_VER) - sprintf( buff, "%ld", ul ); +#ifdef HAVE_SPRINTF_S + sprintf_s(buff, "%ld", ul ); #else - std::sprintf(buff, "%ld", ul ); + std::sprintf(buff, "%ld", ul ); #endif #ifdef MOCKPP_UNICODE @@ -327,10 +327,10 @@ mockpp::String str = mockpp::number(ul); // base 10 char buff[100]; -#if defined(_MSC_VER) - sprintf( buff, "%lu", ul ); +#ifdef HAVE_SPRINTF_S + sprintf_s(buff, "%ld", ul ); #else - std::sprintf(buff, "%lu", ul ); + std::sprintf(buff, "%lu", ul ); #endif #ifdef MOCKPP_UNICODE |
|
From: Ewald A. <ewa...@us...> - 2005-12-28 19:43:16
|
Update of /cvsroot/mockpp/mockpp/3party/ministl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15261/3party/ministl Modified Files: defalloc.h ministl.h string vector Log Message: fixes bcb5, msvc Index: vector =================================================================== RCS file: /cvsroot/mockpp/mockpp/3party/ministl/vector,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- vector 1 Dec 2005 18:15:08 -0000 1.4 +++ vector 28 Dec 2005 19:43:08 -0000 1.5 @@ -30,8 +30,6 @@ #include <ministl/ministl.h> -//#include <ministl/bool.h> - #include <ministl/defalloc.h> #include <ministl/raw_iterator.h> #include <ministl/reverse_iterator.h> Index: defalloc.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/3party/ministl/defalloc.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- defalloc.h 1 Dec 2005 18:15:08 -0000 1.4 +++ defalloc.h 28 Dec 2005 19:43:07 -0000 1.5 @@ -1,5 +1,6 @@ /* -* Copyright (C) 2005 Ewald Arnold mockpp at ewald-arnold dot de * + * Copyright (C) 2005 Ewald Arnold mockpp at ewald-arnold dot de + * * Copyright (c) 1994 * Hewlett-Packard Company * @@ -83,3 +84,4 @@ #endif // MINISTL_DEFALLOC_H + Index: string =================================================================== RCS file: /cvsroot/mockpp/mockpp/3party/ministl/string,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- string 1 Dec 2005 18:15:08 -0000 1.5 +++ string 28 Dec 2005 19:43:08 -0000 1.6 @@ -17,11 +17,11 @@ #error Must use C++ for BSTRING.H #endif -#include <ministl/vector> - #ifndef MINISTL_MBSTRING_H #define MINISTL_MBSTRING_H +#include <ministl/vector> + extern "C" { #ifdef MOCKPP_UNICODE @@ -35,27 +35,6 @@ //#include <ostream> -// bool.h - -// #include <ministl/bool.h> - -// a typedef is less sweeping than a #define for "bool" -#ifndef __BOOL_DEFINED -//typedef int bool; -#endif - -// bc4const - -#ifdef __BC4_STL -#define __BC401_STL -#endif - -#ifdef __BC401_STL -#define __BC401_const -#else -#define __BC401_const const -#endif - namespace ministl { @@ -233,7 +212,7 @@ is_del (char_type c) _THROW_NONE { // characteristic function for delimiters of char_type - return isspace(c); + return std::isspace(c); } // @@ -242,18 +221,18 @@ static int compare (const char_type* s1, const char_type* s2, size_t n) _THROW_NONE { - return memcmp(s1, s2, n); + return std::memcmp(s1, s2, n); } static size_t length (const char_type* s) _THROW_NONE { - return strlen(s); + return std::strlen(s); } static char_type* copy (char_type* s1, const char_type* s2, size_t n) _THROW_NONE { // type cast required as memcpy returns void* - return (char_type*)memcpy(s1, s2, n); + return (char_type*)std::memcpy(s1, s2, n); } }; Index: ministl.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/3party/ministl/ministl.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- ministl.h 29 Nov 2005 23:18:05 -0000 1.2 +++ ministl.h 28 Dec 2005 19:43:07 -0000 1.3 @@ -27,10 +27,9 @@ #define __ministl_ministl_h__ #ifndef assert -#include <assert.h> +#include <cassert> #endif - #ifdef MINISTL_NDEBUG #define ministl_assert(exp) #else |
|
From: Ewald A. <ewa...@us...> - 2005-12-28 19:43:16
|
Update of /cvsroot/mockpp/mockpp/mockpp/compat In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15261/mockpp/compat Modified Files: Formatter.cpp Formatter.h Log Message: fixes bcb5, msvc Index: Formatter.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/compat/Formatter.h,v retrieving revision 1.36 retrieving revision 1.37 diff -u -d -r1.36 -r1.37 --- Formatter.h 1 Dec 2005 16:14:09 -0000 1.36 +++ Formatter.h 28 Dec 2005 19:43:08 -0000 1.37 @@ -330,8 +330,12 @@ #ifdef MOCKPP_UNICODE return mockpp::getUnicode(oss.str()); #else +#ifdef MOCKPP_ALTERNATIVE_STL + return oss.str().c_str(); +#else return oss.str(); #endif +#endif } } Index: Formatter.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/compat/Formatter.cpp,v retrieving revision 1.45 retrieving revision 1.46 diff -u -d -r1.45 -r1.46 --- Formatter.cpp 26 Nov 2005 17:56:44 -0000 1.45 +++ Formatter.cpp 28 Dec 2005 19:43:08 -0000 1.46 @@ -151,8 +151,8 @@ } *fs++ = 'g'; *fs = '\0'; -#if defined(_MSC_VER) - sprintf( buf, format, n ); +#if defined HAVE_SPRINTF_S + sprintf_s( buf, format, n ); #else std::sprintf( buf, format, n ); #endif |
|
From: Ewald A. <ewa...@us...> - 2005-12-28 19:43:15
|
Update of /cvsroot/mockpp/mockpp/3party/cxxtest/cxxtest In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15261/3party/cxxtest/cxxtest Modified Files: TestListener.h Log Message: fixes bcb5, msvc Index: TestListener.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/3party/cxxtest/cxxtest/TestListener.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- TestListener.h 9 Dec 2005 15:57:51 -0000 1.1 +++ TestListener.h 28 Dec 2005 19:43:06 -0000 1.2 @@ -14,7 +14,7 @@ namespace CxxTest { - class TestListener + class CXXTEST_EXPORT TestListener { public: TestListener() {} |
|
From: Ewald A. <ewa...@us...> - 2005-12-28 19:41:06
|
Update of /cvsroot/mockpp/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15011 Modified Files: ChangeLog TODO release-check Log Message: prepare release Index: TODO =================================================================== RCS file: /cvsroot/mockpp/mockpp/TODO,v retrieving revision 1.51 retrieving revision 1.52 diff -u -d -r1.51 -r1.52 --- TODO 28 Dec 2005 09:23:29 -0000 1.51 +++ TODO 28 Dec 2005 19:40:58 -0000 1.52 @@ -7,6 +7,8 @@ ThreadedTest +Boost.Test + DOC: ---- Index: release-check =================================================================== RCS file: /cvsroot/mockpp/mockpp/release-check,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- release-check 18 Dec 2005 16:56:22 -0000 1.3 +++ release-check 28 Dec 2005 19:40:58 -0000 1.4 @@ -9,7 +9,7 @@ rm -rf /tmp/$1 tar xzf $2/$1.tar.gz cd $1 -./configure --prefix=$BUILD/_inst1 --enable-unicode --enable-builtin-stl --enable-builtin-cxxtest || exit 1 +./configure --prefix=$BUILD/_inst1 --enable-unicode --enable-builtin-stl || exit 1 make install || exit 1 make check || exit 1 make dist || exit 1 @@ -17,7 +17,7 @@ make distclean cd $BUILD -../$1/configure --prefix=$BUILD/_inst2 --enable-doxygen --enable-docbook || exit 1 +../$1/configure --prefix=$BUILD/_inst2 --enable-doxygen --enable-docbook --disable-builtin-cxxtest --enable-cppunit || exit 1 make install || exit 1 make check || exit 1 make dist || exit 1 Index: ChangeLog =================================================================== RCS file: /cvsroot/mockpp/mockpp/ChangeLog,v retrieving revision 1.85 retrieving revision 1.86 diff -u -d -r1.85 -r1.86 --- ChangeLog 10 Dec 2005 20:07:20 -0000 1.85 +++ ChangeLog 28 Dec 2005 19:40:58 -0000 1.86 @@ -9,12 +9,14 @@ - provide ways for alternative STL - optionally disable runtime type information (rtti) - optionally disable exceptions - - project files MSVC2005 Express (free as in beer) + - project files MSVC2005 Express (this one is free as in beer) - fixed compilation problem with msvc - - removed msvc6/7/bcb6/bcbX project trees (not working/supported) + - removed msvc6/msvc7/bcb6/bcbX project trees (not working/supported) - compatibility break: moved all visitable files to mockpp/visiting - compatibility break: moved all chainableable files to mockpp/chaining - compatibility break: moved all framework related files to mockpp/framework + - CxxTest (built-in version) is default test framework now, + CppUnit remains an option 2005-11-19 1.10.0: |
|
From: Ewald A. <ewa...@us...> - 2005-12-28 19:41:05
|
Update of /cvsroot/mockpp/mockpp/mockpp/docs/en In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15011/mockpp/docs/en Modified Files: Makefile.am Log Message: prepare release Index: Makefile.am =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/docs/en/Makefile.am,v retrieving revision 1.41 retrieving revision 1.42 diff -u -d -r1.41 -r1.42 --- Makefile.am 18 Dec 2005 16:56:23 -0000 1.41 +++ Makefile.am 28 Dec 2005 19:40:58 -0000 1.42 @@ -8,7 +8,7 @@ CLEANFILES = *.~* *.~~* *~ -doc-dist: html-files +doc-dist: doc -test -d $(PACKAGE)-$(VERSION)-handbook && rm -rf $(PACKAGE)-$(VERSION)-handbook mkdir -p mockpp-$(VERSION)-handbook/handbook/ cp -R -H var/* mockpp-$(VERSION)-handbook/handbook |
Update of /cvsroot/mockpp/mockpp/mockpp/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28468/mockpp/tests Modified Files: AbstractDynamicChainingMock_test.cpp AbstractInvocationDispatcher_test.cpp And_test.cpp AnyArgumentsMatcher_test.cpp ArgumentsMatchBuilder_test.cpp ArgumentsMatcher_test.cpp AssertMo_test.cpp Assert_test.cpp ChainableMockMethod_1_test.cpp ChainableMockMethod_2_test.cpp ChainableMockMethod_test.cpp ChainableMockObjectPolymorphism_test.cpp ChainableMockObject_1_test.cpp ChainableMockObject_1_void_test.cpp ChainableMockObject_2_test.cpp ChainableMockObject_2_void_test.cpp ChainableMockObject_3_test.cpp ChainableMockObject_3_void_test.cpp ChainableMockObject_4_test.cpp ChainableMockObject_4_void_test.cpp ChainableMockObject_5_test.cpp ChainableMockObject_5_void_test.cpp ChainableMockObject_test.cpp ChainableMockObject_void_test.cpp ChainingMockBuilder_test.cpp ChainingMockObjectSupport_test.cpp ConstraintList_test.cpp ConstraintSet_test.cpp CoreMock_test.cpp CustomStub_test.cpp DefaultResultStub_test.cpp DynamicChainingMockError_test.cpp Exception_test.cpp ExpectationBoundary_test.cpp ExpectationConglomeration_test.cpp ExpectationCounterRange_test.cpp ExpectationCounter_test.cpp ExpectationList_test.cpp ExpectationMap_test.cpp ExpectationSegment_test.cpp ExpectationSet_test.cpp ExpectationValue_test.cpp FIFOInvocationDispatcher_test.cpp Formatter_test.cpp InvocationMockerBuilder_test.cpp InvocationMocker_test.cpp Invocation_test.cpp InvokeAtLeastMatcher_test.cpp InvokeAtLeastOnceMatcher_test.cpp InvokeAtMostMatcher_test.cpp InvokeCountMatcher_test.cpp InvokeOnceMatcher_test.cpp InvokedAfterMatcher_test.cpp InvokedBeforeMatcher_test.cpp InvokedRecorder_test.cpp IsAnything_test.cpp IsCloseTo_test.cpp IsEqual_test.cpp IsGreaterOrEqual_test.cpp IsGreaterThan_test.cpp IsInstanceOf_test.cpp IsLessOrEqual_test.cpp IsLessThan_test.cpp IsNot_test.cpp IsNothing_test.cpp IsSame_test.cpp LIFOInvocationDispatcher_test.cpp Makefile.am MatchBuilder_test.cpp MixedMockObject_5_test.cpp MockObject_test.cpp NoArgumentsMatcher_test.cpp NoException_test.cpp Or_test.cpp OutBound_test.cpp ResponseVector_test.cpp ReturnObjectList_test.cpp ReturnStub_test.cpp StringContains_test.cpp StringEndsWith_test.cpp StringStartsWith_test.cpp StubBuilder_test.cpp StubSequence_test.cpp TestFailureMatcher_test.cpp TestFailureStub_test.cpp ThrowStub_test.cpp ThrowableList_test.cpp Throwable_test.cpp TimeServer_test.cpp TrackingCounter_test.cpp TypelessStubSequence_test.cpp UnlimitedMatcher_test.cpp Verifiable_test.cpp VerifyingTestCaller_test.cpp VerifyingTestCase_test.cpp VisitableMockMethod_1_test.cpp VisitableMockMethod_2_test.cpp VisitableMockMethod_test.cpp VisitableMockObject_1_test.cpp VisitableMockObject_1_void_test.cpp VisitableMockObject_2_test.cpp VisitableMockObject_2_void_test.cpp VisitableMockObject_3_test.cpp VisitableMockObject_3_void_test.cpp VisitableMockObject_4_test.cpp VisitableMockObject_4_void_test.cpp VisitableMockObject_5_test.cpp VisitableMockObject_5_void_test.cpp VisitableMockObject_template_test.cpp VisitableMockObject_test.cpp VisitableMockObject_void_test.cpp VoidStub_test.cpp mock_test.cpp mockpp_pti_test.cpp mockpp_test.cpp Log Message: select test framework Index: Or_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/Or_test.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- Or_test.cpp 11 Dec 2005 20:03:44 -0000 1.13 +++ Or_test.cpp 28 Dec 2005 09:23:31 -0000 1.14 @@ -43,9 +43,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( Or_test ); @@ -63,13 +63,13 @@ }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( Or_test ); MOCKPP_CXXTEST(Or_test, test_describe); MOCKPP_CXXTEST(Or_test, test_invoke); -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (Or_test); Index: TestFailureMatcher_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/TestFailureMatcher_test.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- TestFailureMatcher_test.cpp 11 Dec 2005 20:03:44 -0000 1.11 +++ TestFailureMatcher_test.cpp 28 Dec 2005 09:23:31 -0000 1.12 @@ -39,9 +39,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( TestFailureMatcher_test ); @@ -57,12 +57,12 @@ }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( TestFailureMatcher_test ); MOCKPP_CXXTEST(TestFailureMatcher_test, test_invoke); -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (TestFailureMatcher_test); Index: DynamicChainingMockError_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/DynamicChainingMockError_test.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- DynamicChainingMockError_test.cpp 11 Dec 2005 20:03:44 -0000 1.17 +++ DynamicChainingMockError_test.cpp 28 Dec 2005 09:23:30 -0000 1.18 @@ -47,9 +47,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( DynamicChainingMockError_test ); @@ -65,12 +65,12 @@ }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( DynamicChainingMockError_test ); MOCKPP_CXXTEST(DynamicChainingMockError_test, test_describe); -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (DynamicChainingMockError_test); Index: AbstractDynamicChainingMock_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/AbstractDynamicChainingMock_test.cpp,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- AbstractDynamicChainingMock_test.cpp 11 Dec 2005 20:03:44 -0000 1.35 +++ AbstractDynamicChainingMock_test.cpp 28 Dec 2005 09:23:30 -0000 1.36 @@ -59,9 +59,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( AbstractDynamicChainingMock_test ); @@ -87,7 +87,7 @@ }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION(AbstractDynamicChainingMock_test); MOCKPP_CXXTEST(AbstractDynamicChainingMock_test, test_void_invocation ); @@ -97,7 +97,7 @@ MOCKPP_CXXTEST(AbstractDynamicChainingMock_test, test_void_describe ); MOCKPP_CXXTEST(AbstractDynamicChainingMock_test, test_verify ); -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION ( AbstractDynamicChainingMock_test ); Index: IsInstanceOf_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/IsInstanceOf_test.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- IsInstanceOf_test.cpp 17 Dec 2005 18:38:48 -0000 1.17 +++ IsInstanceOf_test.cpp 28 Dec 2005 09:23:31 -0000 1.18 @@ -41,9 +41,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( IsInstanceOf_test ); @@ -61,13 +61,13 @@ }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( IsInstanceOf_test ); MOCKPP_CXXTEST(IsInstanceOf_test, test_describe); MOCKPP_CXXTEST(IsInstanceOf_test, test_invoke); -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (IsInstanceOf_test); Index: ExpectationList_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ExpectationList_test.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- ExpectationList_test.cpp 11 Dec 2005 20:03:44 -0000 1.19 +++ ExpectationList_test.cpp 28 Dec 2005 09:23:31 -0000 1.20 @@ -39,9 +39,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( ExpectationList_test ); @@ -94,7 +94,7 @@ void fail_ifNoActual(); }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( ExpectationList_test ); @@ -119,7 +119,7 @@ MOCKPP_CXXTEST(ExpectationList_test, fail_ifNoActual); -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (ExpectationList_test); Index: IsLessThan_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/IsLessThan_test.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- IsLessThan_test.cpp 11 Dec 2005 20:03:44 -0000 1.9 +++ IsLessThan_test.cpp 28 Dec 2005 09:23:31 -0000 1.10 @@ -40,9 +40,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( IsLessThan_test ); @@ -60,13 +60,13 @@ }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( IsLessThan_test ); MOCKPP_CXXTEST(IsLessThan_test, test_describe); MOCKPP_CXXTEST(IsLessThan_test, test_invoke); -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (IsLessThan_test); Index: ExpectationMap_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ExpectationMap_test.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- ExpectationMap_test.cpp 11 Dec 2005 20:03:44 -0000 1.19 +++ ExpectationMap_test.cpp 28 Dec 2005 09:23:31 -0000 1.20 @@ -39,9 +39,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( ExpectationMap_test ); @@ -100,7 +100,7 @@ void fail_ifNoActual(); }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( ExpectationMap_test ); @@ -128,7 +128,7 @@ MOCKPP_CXXTEST(ExpectationMap_test, fail_ifNoActual); MOCKPP_CXXTEST(ExpectationMap_test, fail_clearActual); -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (ExpectationMap_test); Index: CustomStub_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/CustomStub_test.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- CustomStub_test.cpp 11 Dec 2005 20:03:44 -0000 1.13 +++ CustomStub_test.cpp 28 Dec 2005 09:23:30 -0000 1.14 @@ -40,9 +40,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( CustomStub_test ); @@ -58,12 +58,12 @@ }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( CustomStub_test ); MOCKPP_CXXTEST(CustomStub_test, test_invoke); -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (CustomStub_test); Index: VisitableMockObject_2_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_2_void_test.cpp,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- VisitableMockObject_2_void_test.cpp 11 Dec 2005 20:03:44 -0000 1.24 +++ VisitableMockObject_2_void_test.cpp 28 Dec 2005 09:23:31 -0000 1.25 @@ -47,9 +47,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( VisitableMockObject_2_void_test ); @@ -95,7 +95,7 @@ }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( VisitableMockObject_2_void_test ); @@ -116,7 +116,7 @@ MOCKPP_CXXTEST(VisitableMockObject_2_void_test, fail_parameter); MOCKPP_CXXTEST(VisitableMockObject_2_void_test, fail_unused_throwable); -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (VisitableMockObject_2_void_test); Index: VisitableMockObject_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_test.cpp,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- VisitableMockObject_test.cpp 11 Dec 2005 20:03:44 -0000 1.28 +++ VisitableMockObject_test.cpp 28 Dec 2005 09:23:31 -0000 1.29 @@ -41,9 +41,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( VisitableMockObject_test ); @@ -95,7 +95,7 @@ }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( VisitableMockObject_test ); @@ -119,7 +119,7 @@ MOCKPP_CXXTEST(VisitableMockObject_test, fail_unused_value); MOCKPP_CXXTEST(VisitableMockObject_test, test_stub_return_const_ref); -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (VisitableMockObject_test); Index: Assert_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/Assert_test.cpp,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- Assert_test.cpp 11 Dec 2005 20:03:44 -0000 1.21 +++ Assert_test.cpp 28 Dec 2005 09:23:30 -0000 1.22 @@ -38,9 +38,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( Assert_test ); @@ -96,7 +96,7 @@ }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( Assert_test ); @@ -123,7 +123,7 @@ MOCKPP_CXXTEST(Assert_test, fail_fail); MOCKPP_CXXTEST(Assert_test, fail_failmsg); -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (Assert_test); Index: IsLessOrEqual_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/IsLessOrEqual_test.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- IsLessOrEqual_test.cpp 11 Dec 2005 20:03:44 -0000 1.9 +++ IsLessOrEqual_test.cpp 28 Dec 2005 09:23:31 -0000 1.10 @@ -40,9 +40,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( IsLessOrEqual_test ); @@ -60,13 +60,13 @@ }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( IsLessOrEqual_test ); MOCKPP_CXXTEST(IsLessOrEqual_test, test_describe); MOCKPP_CXXTEST(IsLessOrEqual_test, test_invoke); -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (IsLessOrEqual_test); Index: MixedMockObject_5_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/MixedMockObject_5_test.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- MixedMockObject_5_test.cpp 11 Dec 2005 20:03:44 -0000 1.9 +++ MixedMockObject_5_test.cpp 28 Dec 2005 09:23:31 -0000 1.10 @@ -54,9 +54,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( MixedMockObject_5_test ); @@ -76,14 +76,14 @@ }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( MixedMockObject_5_test ); MOCKPP_CXXTEST(MixedMockObject_5_test, test_controller); MOCKPP_CXXTEST(MixedMockObject_5_test, test_chainer); MOCKPP_CXXTEST(MixedMockObject_5_test, test_return); -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (MixedMockObject_5_test); Index: ChainableMockObject_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_test.cpp,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- ChainableMockObject_test.cpp 11 Dec 2005 20:03:44 -0000 1.27 +++ ChainableMockObject_test.cpp 28 Dec 2005 09:23:30 -0000 1.28 @@ -47,9 +47,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( ChainableMockObject_test ); @@ -87,7 +87,7 @@ }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( ChainableMockObject_test ); MOCKPP_CXXTEST(ChainableMockObject_test, test_register); @@ -103,7 +103,7 @@ MOCKPP_CXXTEST(ChainableMockObject_test, test_stub_return); MOCKPP_CXXTEST(ChainableMockObject_test, test_stub_return_const_ref); -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (ChainableMockObject_test); Index: Invocation_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/Invocation_test.cpp,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- Invocation_test.cpp 11 Dec 2005 20:03:44 -0000 1.22 +++ Invocation_test.cpp 28 Dec 2005 09:23:31 -0000 1.23 @@ -42,9 +42,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( Invocation_test ); @@ -82,7 +82,7 @@ }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( Invocation_test ); @@ -99,7 +99,7 @@ MOCKPP_CXXTEST(Invocation_test, test_get5); MOCKPP_CXXTEST(Invocation_test, test_invoked); -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (Invocation_test); Index: IsGreaterThan_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/IsGreaterThan_test.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- IsGreaterThan_test.cpp 11 Dec 2005 20:03:44 -0000 1.9 +++ IsGreaterThan_test.cpp 28 Dec 2005 09:23:31 -0000 1.10 @@ -40,9 +40,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( IsGreaterThan_test ); @@ -60,13 +60,13 @@ }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( IsGreaterThan_test ); MOCKPP_CXXTEST(IsGreaterThan_test, test_describe); MOCKPP_CXXTEST(IsGreaterThan_test, test_invoke); -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (IsGreaterThan_test); Index: NoException_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/NoException_test.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- NoException_test.cpp 27 Dec 2005 18:12:28 -0000 1.6 +++ NoException_test.cpp 28 Dec 2005 09:23:31 -0000 1.7 @@ -59,9 +59,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( NoException_test ); @@ -80,12 +80,12 @@ }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( NoException_test ); MOCKPP_CXXTEST(NoException_test, test_invoke); -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (NoException_test); @@ -97,12 +97,15 @@ mockpp::String bad_data3; -struct MyStruct { +struct MyStruct +{ MyStruct(int v) - : val(v){} + : val(v) + {} MyStruct() - : val(0){} + : val(0) + {} bool operator==(const MyStruct &o) const { Index: ChainableMockObject_4_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_4_void_test.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- ChainableMockObject_4_void_test.cpp 11 Dec 2005 20:03:44 -0000 1.15 +++ ChainableMockObject_4_void_test.cpp 28 Dec 2005 09:23:30 -0000 1.16 @@ -47,9 +47,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( ChainableMockObject_4_void_test ); @@ -67,13 +67,13 @@ }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( ChainableMockObject_4_void_test ); MOCKPP_CXXTEST(ChainableMockObject_4_void_test, test_outbound); MOCKPP_CXXTEST(ChainableMockObject_4_void_test, test_parameter_4 ); -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (ChainableMockObject_4_void_test); Index: InvocationMockerBuilder_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/InvocationMockerBuilder_test.cpp,v retrieving revision 1.32 retrieving revision 1.33 diff -u -d -r1.32 -r1.33 --- InvocationMockerBuilder_test.cpp 11 Dec 2005 20:03:44 -0000 1.32 +++ InvocationMockerBuilder_test.cpp 28 Dec 2005 09:23:31 -0000 1.33 @@ -67,9 +67,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( InvocationMockerBuilder_test ); @@ -91,7 +91,7 @@ }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( InvocationMockerBuilder_test ); MOCKPP_CXXTEST(InvocationMockerBuilder_test, test_instance0 ); @@ -99,7 +99,7 @@ MOCKPP_CXXTEST(InvocationMockerBuilder_test, test_instancev0 ); MOCKPP_CXXTEST(InvocationMockerBuilder_test, test_instancev5 ); -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION ( InvocationMockerBuilder_test ); Index: StringContains_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/StringContains_test.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- StringContains_test.cpp 11 Dec 2005 20:03:44 -0000 1.13 +++ StringContains_test.cpp 28 Dec 2005 09:23:31 -0000 1.14 @@ -40,9 +40,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( StringContains_test ); @@ -60,13 +60,13 @@ }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( StringContains_test ); MOCKPP_CXXTEST(StringContains_test, test_describe); MOCKPP_CXXTEST(StringContains_test, test_invoke); -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (StringContains_test); Index: InvokeAtLeastOnceMatcher_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/InvokeAtLeastOnceMatcher_test.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- InvokeAtLeastOnceMatcher_test.cpp 11 Dec 2005 20:03:44 -0000 1.11 +++ InvokeAtLeastOnceMatcher_test.cpp 28 Dec 2005 09:23:31 -0000 1.12 @@ -38,9 +38,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( InvokeAtLeastOnceMatcher_test ); @@ -56,12 +56,12 @@ }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( InvokeAtLeastOnceMatcher_test ); MOCKPP_CXXTEST(InvokeAtLeastOnceMatcher_test, test_invoke); -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (InvokeAtLeastOnceMatcher_test); Index: ExpectationSet_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ExpectationSet_test.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- ExpectationSet_test.cpp 11 Dec 2005 20:03:44 -0000 1.17 +++ ExpectationSet_test.cpp 28 Dec 2005 09:23:31 -0000 1.18 @@ -39,9 +39,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( ExpectationSet_test ); @@ -92,7 +92,7 @@ void fail_ifNoActual(); }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( ExpectationSet_test ); @@ -116,7 +116,7 @@ MOCKPP_CXXTEST(ExpectationSet_test, fail_ifNoActual); -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (ExpectationSet_test); Index: ChainableMockObject_1_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_1_void_test.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- ChainableMockObject_1_void_test.cpp 11 Dec 2005 20:03:44 -0000 1.18 +++ ChainableMockObject_1_void_test.cpp 28 Dec 2005 09:23:30 -0000 1.19 @@ -52,9 +52,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( ChainableMockObject_1_void_test ); @@ -73,13 +73,13 @@ -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( ChainableMockObject_1_void_test ); MOCKPP_CXXTEST(ChainableMockObject_1_void_test, test_outbound); MOCKPP_CXXTEST(ChainableMockObject_1_void_test, test_parameter_1 ); -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (ChainableMockObject_1_void_test); Index: ChainableMockMethod_2_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockMethod_2_test.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- ChainableMockMethod_2_test.cpp 11 Dec 2005 20:03:44 -0000 1.12 +++ ChainableMockMethod_2_test.cpp 28 Dec 2005 09:23:30 -0000 1.13 @@ -56,9 +56,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( ChainableMockMethod_2_test ); @@ -76,13 +76,13 @@ }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( ChainableMockMethod_2_test ); MOCKPP_CXXTEST(ChainableMockMethod_2_test, test_parameter_2 ); MOCKPP_CXXTEST(ChainableMockMethod_2_test, test_parameter_2v ); -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (ChainableMockMethod_2_test); Index: InvokedAfterMatcher_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/InvokedAfterMatcher_test.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- InvokedAfterMatcher_test.cpp 11 Dec 2005 20:03:44 -0000 1.11 +++ InvokedAfterMatcher_test.cpp 28 Dec 2005 09:23:31 -0000 1.12 @@ -38,9 +38,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( InvokedAfterMatcher_test ); @@ -56,12 +56,12 @@ }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( InvokedAfterMatcher_test ); MOCKPP_CXXTEST(InvokedAfterMatcher_test, test_invoke); -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (InvokedAfterMatcher_test); Index: InvokeOnceMatcher_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/InvokeOnceMatcher_test.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- InvokeOnceMatcher_test.cpp 11 Dec 2005 20:03:44 -0000 1.11 +++ InvokeOnceMatcher_test.cpp 28 Dec 2005 09:23:31 -0000 1.12 @@ -38,9 +38,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( InvokeOnceMatcher_test ); @@ -56,12 +56,12 @@ }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( InvokeOnceMatcher_test ); MOCKPP_CXXTEST(InvokeOnceMatcher_test, test_invoke); -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (InvokeOnceMatcher_test); Index: ChainableMockObject_3_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_3_void_test.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- ChainableMockObject_3_void_test.cpp 11 Dec 2005 20:03:44 -0000 1.15 +++ ChainableMockObject_3_void_test.cpp 28 Dec 2005 09:23:30 -0000 1.16 @@ -47,9 +47,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( ChainableMockObject_3_void_test ); @@ -67,13 +67,13 @@ }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( ChainableMockObject_3_void_test ); MOCKPP_CXXTEST(ChainableMockObject_3_void_test, test_outbound); MOCKPP_CXXTEST(ChainableMockObject_3_void_test, test_parameter_3 ); -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (ChainableMockObject_3_void_test); Index: VoidStub_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VoidStub_test.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- VoidStub_test.cpp 11 Dec 2005 20:03:44 -0000 1.13 +++ VoidStub_test.cpp 28 Dec 2005 09:23:31 -0000 1.14 @@ -40,9 +40,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( VoidStub_test ); @@ -60,13 +60,13 @@ }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( VoidStub_test ); MOCKPP_CXXTEST(VoidStub_test, test_describe); MOCKPP_CXXTEST(VoidStub_test, test_invoke); -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (VoidStub_test); Index: ExpectationCounter_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ExpectationCounter_test.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- ExpectationCounter_test.cpp 11 Dec 2005 20:03:44 -0000 1.16 +++ ExpectationCounter_test.cpp 28 Dec 2005 09:23:31 -0000 1.17 @@ -40,9 +40,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( ExpectationCounter_test ); @@ -90,7 +90,7 @@ void doActualVerify(mockpp::ExpectationCounter &ec); }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( ExpectationCounter_test ); @@ -111,7 +111,7 @@ MOCKPP_CXXTEST(ExpectationCounter_test, fail_ifNoActual); -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (ExpectationCounter_test); Index: OutBound_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/OutBound_test.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- OutBound_test.cpp 11 Dec 2005 20:03:44 -0000 1.4 +++ OutBound_test.cpp 28 Dec 2005 09:23:31 -0000 1.5 @@ -38,9 +38,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( OutBound_test ); @@ -58,13 +58,13 @@ }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( OutBound_test ); MOCKPP_CXXTEST(OutBound_test, test_describe); MOCKPP_CXXTEST(OutBound_test, test_invoke); -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (OutBound_test); Index: ResponseVector_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ResponseVector_test.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- ResponseVector_test.cpp 11 Dec 2005 20:03:44 -0000 1.8 +++ ResponseVector_test.cpp 28 Dec 2005 09:23:31 -0000 1.9 @@ -40,9 +40,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( ResponseVector_Test ); @@ -60,13 +60,13 @@ }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( ResponseVector_Test ); MOCKPP_CXXTEST(ResponseVector_Test, test_value); MOCKPP_CXXTEST(ResponseVector_Test, test_thrower); -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (ResponseVector_Test); Index: ExpectationConglomeration_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ExpectationConglomeration_test.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- ExpectationConglomeration_test.cpp 11 Dec 2005 20:03:44 -0000 1.15 +++ ExpectationConglomeration_test.cpp 28 Dec 2005 09:23:31 -0000 1.16 @@ -39,9 +39,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( ExpectationConglomeration_test ); @@ -94,7 +94,7 @@ void fail_ifNoActual(); }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( ExpectationConglomeration_test ); @@ -119,7 +119,7 @@ MOCKPP_CXXTEST(ExpectationConglomeration_test, fail_ifNoActual); -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (ExpectationConglomeration_test); Index: NoArgumentsMatcher_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/NoArgumentsMatcher_test.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- NoArgumentsMatcher_test.cpp 11 Dec 2005 20:03:44 -0000 1.12 +++ NoArgumentsMatcher_test.cpp 28 Dec 2005 09:23:31 -0000 1.13 @@ -42,9 +42,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE(NoArgumentsMatcher_test ); @@ -60,12 +60,12 @@ }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( NoArgumentsMatcher_test ); MOCKPP_CXXTEST(NoArgumentsMatcher_test, test_invoke); -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (NoArgumentsMatcher_test); Index: InvokeAtMostMatcher_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/InvokeAtMostMatcher_test.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- InvokeAtMostMatcher_test.cpp 11 Dec 2005 20:03:44 -0000 1.10 +++ InvokeAtMostMatcher_test.cpp 28 Dec 2005 09:23:31 -0000 1.11 @@ -38,9 +38,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( InvokeAtMostMatcher_test ); @@ -56,12 +56,12 @@ }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( InvokeAtMostMatcher_test ); MOCKPP_CXXTEST(InvokeAtMostMatcher_test, test_invoke); -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (InvokeAtMostMatcher_test); Index: VisitableMockObject_4_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_4_test.cpp,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- VisitableMockObject_4_test.cpp 11 Dec 2005 20:03:44 -0000 1.23 +++ VisitableMockObject_4_test.cpp 28 Dec 2005 09:23:31 -0000 1.24 @@ -47,9 +47,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( VisitableMockObject_4_test ); @@ -109,7 +109,7 @@ }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( VisitableMockObject_4_test ); @@ -137,7 +137,7 @@ MOCKPP_CXXTEST(VisitableMockObject_4_test, fail_unused_throwable); MOCKPP_CXXTEST(VisitableMockObject_4_test, fail_unused_value); -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (VisitableMockObject_4_test); Index: VisitableMockObject_3_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_3_void_test.cpp,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- VisitableMockObject_3_void_test.cpp 11 Dec 2005 20:03:44 -0000 1.23 +++ VisitableMockObject_3_void_test.cpp 28 Dec 2005 09:23:31 -0000 1.24 @@ -47,9 +47,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( VisitableMockObject_3_void_test ); @@ -95,7 +95,7 @@ }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( VisitableMockObject_3_void_test ); @@ -116,7 +116,7 @@ MOCKPP_CXXTEST(VisitableMockObject_3_void_test, fail_parameter); MOCKPP_CXXTEST(VisitableMockObject_3_void_test, fail_unused_throwable); -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (VisitableMockObject_3_void_test); Index: StubSequence_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/StubSequence_test.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- StubSequence_test.cpp 11 Dec 2005 20:03:44 -0000 1.18 +++ StubSequence_test.cpp 28 Dec 2005 09:23:31 -0000 1.19 @@ -44,9 +44,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( StubSequence_test ); @@ -64,13 +64,13 @@ }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( StubSequence_test ); MOCKPP_CXXTEST(StubSequence_test, test_describe); MOCKPP_CXXTEST(StubSequence_test, test_invoke); -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (StubSequence_test); Index: MatchBuilder_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/MatchBuilder_test.cpp,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- MatchBuilder_test.cpp 11 Dec 2005 20:03:44 -0000 1.24 +++ MatchBuilder_test.cpp 28 Dec 2005 09:23:31 -0000 1.25 @@ -53,9 +53,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( MatchBuilder_test ); @@ -73,13 +73,13 @@ }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( MatchBuilder_test ); MOCKPP_CXXTEST(MatchBuilder_test, test_order ); MOCKPP_CXXTEST(MatchBuilder_test, test_order_defered ); -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION ( MatchBuilder_test ); Index: ChainableMockObject_2_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_2_void_test.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- ChainableMockObject_2_void_test.cpp 11 Dec 2005 20:03:44 -0000 1.15 +++ ChainableMockObject_2_void_test.cpp 28 Dec 2005 09:23:30 -0000 1.16 @@ -47,9 +47,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( ChainableMockObject_2_void_test ); @@ -67,13 +67,13 @@ }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( ChainableMockObject_2_void_test ); MOCKPP_CXXTEST(ChainableMockObject_2_void_test, test_outbound); MOCKPP_CXXTEST(ChainableMockObject_2_void_test, test_parameter_2 ); -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (ChainableMockObject_2_void_test); Index: ChainableMockObject_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_void_test.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- ChainableMockObject_void_test.cpp 11 Dec 2005 20:03:44 -0000 1.15 +++ ChainableMockObject_void_test.cpp 28 Dec 2005 09:23:30 -0000 1.16 @@ -48,9 +48,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( ChainableMockObject_void_test ); @@ -68,13 +68,13 @@ }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( ChainableMockObject_void_test ); MOCKPP_CXXTEST(ChainableMockObject_void_test, test_register); MOCKPP_CXXTEST(ChainableMockObject_void_test, test_expect_throw); -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (ChainableMockObject_void_test); Index: Exception_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/Exception_test.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- Exception_test.cpp 10 Dec 2005 15:18:34 -0000 1.15 +++ Exception_test.cpp 28 Dec 2005 09:23:30 -0000 1.16 @@ -39,9 +39,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( Exception_test ); @@ -57,12 +57,12 @@ }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( Exception_test ); MOCKPP_CXXTEST(Exception_test, test_file_line); -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (Exception_test); Index: ChainingMockObjectSupport_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainingMockObjectSupport_test.cpp,v retrieving revision 1.36 retrieving revision 1.37 diff -u -d -r1.36 -r1.37 --- ChainingMockObjectSupport_test.cpp 11 Dec 2005 20:03:44 -0000 1.36 +++ ChainingMockObjectSupport_test.cpp 28 Dec 2005 09:23:30 -0000 1.37 @@ -48,9 +48,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( ChainingMockObjectSupport_test ); @@ -111,7 +111,7 @@ }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( ChainingMockObjectSupport_test ); MOCKPP_CXXTEST(ChainingMockObjectSupport_test, test_closeto_func ); @@ -138,7 +138,7 @@ MOCKPP_CXXTEST(ChainingMockObjectSupport_test, test_consecutive_typeless ); MOCKPP_CXXTEST(ChainingMockObjectSupport_test, test_consecutive_custom ); -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION ( ChainingMockObjectSupport_test ); Index: LIFOInvocationDispatcher_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/LIFOInvocationDispatcher_test.cpp,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- LIFOInvocationDispatcher_test.cpp 11 Dec 2005 20:03:44 -0000 1.21 +++ LIFOInvocationDispatcher_test.cpp 28 Dec 2005 09:23:31 -0000 1.22 @@ -57,9 +57,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( LIFOInvocationDispatcher_test ); @@ -77,13 +77,13 @@ }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( LIFOInvocationDispatcher_test ); MOCKPP_CXXTEST(LIFOInvocationDispatcher_test, test_dispatch); MOCKPP_CXXTEST(LIFOInvocationDispatcher_test, test_void_dispatch); -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (LIFOInvocationDispatcher_test); Index: VisitableMockObject_template_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_template_test.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- VisitableMockObject_template_test.cpp 11 Dec 2005 20:03:44 -0000 1.12 +++ VisitableMockObject_template_test.cpp 28 Dec 2005 09:23:31 -0000 1.13 @@ -40,9 +40,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( VisitableMockObject_template_test ); @@ -75,7 +75,7 @@ }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( VisitableMockObject_template_test ); @@ -90,7 +90,7 @@ MOCKPP_CXXTEST(VisitableMockObject_template_test, test_throw_4); MOCKPP_CXXTEST(VisitableMockObject_template_test, test_throw_5); -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (VisitableMockObject_template_test); Index: VisitableMockMethod_1_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockMethod_1_test.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- VisitableMockMethod_1_test.cpp 11 Dec 2005 20:03:44 -0000 1.8 +++ VisitableMockMethod_1_test.cpp 28 Dec 2005 09:23:31 -0000 1.9 @@ -46,9 +46,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( VisitableMockMethod_1_test ); @@ -66,13 +66,13 @@ }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( VisitableMockMethod_1_test ); MOCKPP_CXXTEST(VisitableMockMethod_1_test, test_parameter_1 ); MOCKPP_CXXTEST(VisitableMockMethod_1_test, test_parameter_1v ); -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (VisitableMockMethod_1_test); Index: VisitableMockObject_4_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_4_void_test.cpp,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- VisitableMockObject_4_void_test.cpp 11 Dec 2005 20:03:44 -0000 1.23 +++ VisitableMockObject_4_void_test.cpp 28 Dec 2005 09:23:31 -0000 1.24 @@ -47,9 +47,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( VisitableMockObject_4_void_test ); @@ -95,7 +95,7 @@ }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( VisitableMockObject_4_void_test ); @@ -116,7 +116,7 @@ MOCKPP_CXXTEST(VisitableMockObject_4_void_test, fail_parameter); MOCKPP_CXXTEST(VisitableMockObject_4_void_test, fail_unused_throwable); -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (VisitableMockObject_4_void_test); Index: ReturnObjectList_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ReturnObjectList_test.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- ReturnObjectList_test.cpp 11 Dec 2005 20:03:44 -0000 1.19 +++ ReturnObjectList_test.cpp 28 Dec 2005 09:23:31 -0000 1.20 @@ -38,9 +38,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( ReturnObjectList_test ); @@ -66,7 +66,7 @@ }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( ReturnObjectList_test ); @@ -77,7 +77,7 @@ MOCKPP_CXXTEST(ReturnObjectList_test, fail_get_object); MOCKPP_CXXTEST(ReturnObjectList_test, fail_not_empty); -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (ReturnObjectList_test); Index: StringStartsWith_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/StringStartsWith_test.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- StringStartsWith_test.cpp 11 Dec 2005 20:03:44 -0000 1.6 +++ StringStartsWith_test.cpp 28 Dec 2005 09:23:31 -0000 1.7 @@ -40,9 +40,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( StringStartsWith_test ); @@ -60,13 +60,13 @@ }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( StringStartsWith_test ); MOCKPP_CXXTEST(StringStartsWith_test, test_describe); MOCKPP_CXXTEST(StringStartsWith_test, test_invoke); -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (StringStartsWith_test); Index: VisitableMockObject_3_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_3_test.cpp,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- VisitableMockObject_3_test.cpp 11 Dec 2005 20:03:44 -0000 1.23 +++ VisitableMockObject_3_test.cpp 28 Dec 2005 09:23:31 -0000 1.24 @@ -47,9 +47,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( VisitableMockObject_3_test ); @@ -109,7 +109,7 @@ }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( VisitableMockObject_3_test ); @@ -137,7 +137,7 @@ MOCKPP_CXXTEST(VisitableMockObject_3_test, fail_unused_throwable); MOCKPP_CXXTEST(VisitableMockObject_3_test, fail_unused_value); -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (VisitableMockObject_3_test); Index: ChainableMockObjectPolymorphism_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObjectPolymorphism_test.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- ChainableMockObjectPolymorphism_test.cpp 11 Dec 2005 20:03:44 -0000 1.8 +++ ChainableMockObjectPolymorphism_test.cpp 28 Dec 2005 09:23:30 -0000 1.9 @@ -48,9 +48,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( MockVisitorPolymorphism_test ); @@ -68,13 +68,13 @@ }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( MockVisitorPolymorphism_test ); MOCKPP_CXXTEST(MockVisitorPolymorphism_test, test_visitor_retrieves_parameter); MOCKPP_CXXTEST(MockVisitorPolymorphism_test, test_visitor_retrieves_mock_parameter); -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (MockVisitorPolymorphism_test); Index: IsGreaterOrEqual_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/IsGreaterOrEqual_test.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- IsGreaterOrEqual_test.cpp 11 Dec 2005 20:03:44 -0000 1.9 +++ IsGreaterOrEqual_test.cpp 28 Dec 2005 09:23:31 -0000 1.10 @@ -40,9 +40,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( IsGreaterOrEqual_test ); @@ -60,13 +60,13 @@ }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( IsGreaterOrEqual_test ); MOCKPP_CXXTEST(IsGreaterOrEqual_test, test_describe); MOCKPP_CXXTEST(IsGreaterOrEqual_test, test_invoke); -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (IsGreaterOrEqual_test); Index: mockpp_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/mockpp_test.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- mockpp_test.cpp 9 Dec 2005 18:56:21 -0000 1.16 +++ mockpp_test.cpp 28 Dec 2005 09:23:31 -0000 1.17 @@ -39,9 +39,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( mockpp_test ); @@ -62,9 +62,9 @@ }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (mockpp_test); Index: Throwable_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/Throwable_test.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- Throwable_test.cpp 11 Dec 2005 20:03:44 -0000 1.17 +++ Throwable_test.cpp 28 Dec 2005 09:23:31 -0000 1.18 @@ -40,9 +40,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( Throwable_test ); @@ -66,7 +66,7 @@ }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( Throwable_test ); @@ -76,7 +76,7 @@ MOCKPP_CXXTEST(Throwable_test, test_clear); MOCKPP_CXXTEST(Throwable_test, test_copy); -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (Throwable_test); Index: ChainableMockObject_2_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_2_test.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- ChainableMockObject_2_test.cpp 11 Dec 2005 20:03:44 -0000 1.14 +++ ChainableMockObject_2_test.cpp 28 Dec 2005 09:23:30 -0000 1.15 @@ -45,9 +45,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( ChainableMockObject_2_test ); @@ -65,13 +65,13 @@ }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( ChainableMockObject_2_test ); MOCKPP_CXXTEST(ChainableMockObject_2_test, test_outbound); MOCKPP_CXXTEST(ChainableMockObject_2_test, test_parameter_2 ); -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (ChainableMockObject_2_test); Index: UnlimitedMatcher_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/UnlimitedMatcher_test.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- UnlimitedMatcher_test.cpp 11 Dec 2005 20:03:44 -0000 1.6 +++ UnlimitedMatcher_test.cpp 28 Dec 2005 09:23:31 -0000 1.7 @@ -37,9 +37,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( UnlimitedMatcher_test ); CPPUNIT_TEST(test_invoke); @@ -53,12 +53,12 @@ }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( UnlimitedMatcher_test ); MOCKPP_CXXTEST(UnlimitedMatcher_test, test_invoke); -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION(UnlimitedMatcher_test); Index: CoreMock_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/CoreMock_test.cpp,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- CoreMock_test.cpp 11 Dec 2005 20:03:44 -0000 1.25 +++ CoreMock_test.cpp 28 Dec 2005 09:23:30 -0000 1.26 @@ -58,9 +58,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( CoreMock_test ); @@ -78,13 +78,13 @@ }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( CoreMock_test ); MOCKPP_CXXTEST(CoreMock_test, test_void_invocation ); MOCKPP_CXXTEST(CoreMock_test, test_invocation ); -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION ( CoreMock_test ); Index: ChainableMockObject_4_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_4_test.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- ChainableMockObject_4_test.cpp 11 Dec 2005 20:03:44 -0000 1.14 +++ ChainableMockObject_4_test.cpp 28 Dec 2005 09:23:30 -0000 1.15 @@ -46,9 +46,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( ChainableMo... [truncated message content] |
|
From: Ewald A. <ewa...@us...> - 2005-12-28 09:23:42
|
Update of /cvsroot/mockpp/mockpp/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28468/mockpp Modified Files: Makefile.am Log Message: select test framework Index: Makefile.am =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/Makefile.am,v retrieving revision 1.101 retrieving revision 1.102 diff -u -d -r1.101 -r1.102 --- Makefile.am 18 Dec 2005 19:13:08 -0000 1.101 +++ Makefile.am 28 Dec 2005 09:23:30 -0000 1.102 @@ -70,12 +70,14 @@ TODAY=`date +%Y-%m-%d` ; echo "/* Generated: $$TODAY */" >>$@ grep "#define[ ]\+VERSION[ ]\+" ../config.h | sed "s/#define[ ]\+VERSION[ ]\+\(.*\)/#define MOCKPP_VERSION \\1/g">>$@ grep "#define[ ]\+PACKAGE[ ]\+" ../config.h | sed "s/#define[ ]\+PACKAGE[ ]\+\(.*\)/#define MOCKPP_PACKAGE \\1/g">>$@ - grep "MOCKPP_UNICODE " ../config.h >>$@ - grep HAVE_LIMITS ../config.h >>$@ - grep HAVE_WSTRING ../config.h >>$@ - grep HAVE_VALUES ../config.h >>$@ - grep MOCKPP_USE_MINI_STL ../config.h >>$@ + grep "MOCKPP_UNICODE " ../config.h >>$@ + grep HAVE_LIMITS ../config.h >>$@ + grep HAVE_WSTRING ../config.h >>$@ + grep HAVE_VALUES ../config.h >>$@ grep CXXTEST_USE_MINI_STL ../config.h >>$@ + grep MOCKPP_USE_MINI_STL ../config.h >>$@ + grep MOCKPP_USE_CXXTEST ../config.h >>$@ + grep MOCKPP_USE_CPPUNIT ../config.h >>$@ grep MOCKPP_NO_RTTI ../config.h >>$@ grep MOCKPP_NO_EXCEPTIONS ../config.h >>$@ -test $@ -ef $(srcdir) || cp $@ $(srcdir) |
|
From: Ewald A. <ewa...@us...> - 2005-12-28 09:23:42
|
Update of /cvsroot/mockpp/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28468 Modified Files: TODO configure.in run-configure-unicode.sh Log Message: select test framework Index: run-configure-unicode.sh =================================================================== RCS file: /cvsroot/mockpp/mockpp/run-configure-unicode.sh,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- run-configure-unicode.sh 18 Dec 2005 16:56:22 -0000 1.13 +++ run-configure-unicode.sh 28 Dec 2005 09:23:30 -0000 1.14 @@ -13,5 +13,5 @@ #OPTS="--enable-doxygen --enable-docbook" OPTS="$OPTS --enable-builtin-stl" # --disable-exceptions --disable-rtti OPTS="$OPTS --enable-debug=full" -OPTS="$OPTS --enable-builtin-cxxtest" +#OPTS="$OPTS --disable-builtin-cxxtest --enable-cppunit" CFLAGS="$MYFLAGS" CXXFLAGS="$MYFLAGS" CXX=$MYCC CC=$MYCC ${0%/*}/configure --enable-unicode $OPTS --prefix=/tmp/mockpp-install Index: TODO =================================================================== RCS file: /cvsroot/mockpp/mockpp/TODO,v retrieving revision 1.50 retrieving revision 1.51 diff -u -d -r1.50 -r1.51 --- TODO 29 Jul 2005 08:00:38 -0000 1.50 +++ TODO 28 Dec 2005 09:23:29 -0000 1.51 @@ -5,6 +5,7 @@ verify(); +ThreadedTest DOC: ---- Index: configure.in =================================================================== RCS file: /cvsroot/mockpp/mockpp/configure.in,v retrieving revision 1.105 retrieving revision 1.106 diff -u -d -r1.105 -r1.106 --- configure.in 18 Dec 2005 16:56:22 -0000 1.105 +++ configure.in 28 Dec 2005 09:23:30 -0000 1.106 @@ -112,6 +112,22 @@ echo "*******************************************************" fi +AC_ARG_ENABLE(cppunit, [ --enable-cppunit use cppunit as framework, unless cxxtest selected (no) ], [enable_cppunit=yes]) + +if test x$cppunit_inc != xNO; then + if test x$enable_cppunit = xyes; then + echo "*******************************************************" + echo "** using cppunit framework" + echo "*******************************************************" + AC_DEFINE(MOCKPP_USE_CPPUNIT, 1, [Define to use cppunit as framework.]) + else + echo "*******************************************************" + echo "** NOT using cppunit framework" + echo "*******************************************************" + AH_TEMPLATE(MOCKPP_USE_CPPUNIT, [Define if you have cppunit installed.]) + fi +fi + AC_SUBST(LIBCPPUNIT) ]) @@ -270,25 +286,25 @@ AC_DEFUN([EA_BUILTIN_CXXTEST], [ -AC_ARG_ENABLE(builtin_cxxtest, [ --enable-builtin-cxxtest use built-in cxxtest (no)]) +AC_ARG_ENABLE(builtin_cxxtest, [ --disable-builtin-cxxtest do NOT use built-in cxxtest (no)], [disable_builtin_cxxtest=yes]) -if test x$enable_builtin_cxxtest = xyes; then +if test x$disable_builtin_cxxtest != xyes; then echo "*******************************************************" echo "** using builtin cxxtest" echo "*******************************************************" AC_DEFINE(MOCKPP_USE_BUILTIN_CXXTEST, 1, [Define to use built-in cxxtest.]) EA_EXTRA_INC="$EA_EXTRA_INC -I\$(top_srcdir)/3party/cxxtest" # EA_EXTRA_LIB="$EA_EXTRA_LIB -lmockpp_cxxtest" - AC_DEFINE(HAVE_CXXTEST, 1, [Define if you have CxxTest installed.]) + AC_DEFINE(MOCKPP_USE_CXXTEST, 1, [Define if you have CxxTest installed.]) else echo "*******************************************************" echo "** NOT using builtin cxxtest" echo "*******************************************************" - AH_TEMPLATE(HAVE_CXXTEST, [Define if you have CxxTest installed.]) + AH_TEMPLATE(MOCKPP_USE_CXXTEST, [Define if you have CxxTest installed.]) AH_TEMPLATE([MOCKPP_USE_BUILTIN_CXXTEST], [Define to use built-in cxxtest.]) fi ]) -AM_CONDITIONAL(BUILTIN_CXXTEST, test x$enable_builtin_cxxtest = xyes) +AM_CONDITIONAL(BUILTIN_CXXTEST, test x$disable_builtin_cxxtest != xyes) dnl ------------------------------------------------------------------------ dnl Find a file (or one of more files in a list of dirs) @@ -388,6 +404,11 @@ EA_CHECK_STD_WCSCMP EA_CHECK_LIBCPPUNIT +# TODO +AM_CONDITIONAL(WORKING_QT, test x = y) +AM_CONDITIONAL(WORKING_X11, test x = y) +AM_CONDITIONAL(WORKING_WIN32, test x = y) + # ---------------------------------------------------------------------------- AC_PATH_PROG(BZIP2, bzip2, , $PATH) |
|
From: Ewald A. <ewa...@us...> - 2005-12-28 09:23:42
|
Update of /cvsroot/mockpp/mockpp/mockpp/examples In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28468/mockpp/examples Modified Files: mock_greeter.cpp Log Message: select test framework Index: mock_greeter.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/examples/mock_greeter.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- mock_greeter.cpp 18 Dec 2005 16:56:23 -0000 1.20 +++ mock_greeter.cpp 28 Dec 2005 09:23:30 -0000 1.21 @@ -36,7 +36,7 @@ #include <iostream> -#if defined(HAVE_CXXTEST) +#if defined(MOCKPP_USE_CXXTEST) #include <cxxtest/TestRunner.h> @@ -55,7 +55,7 @@ # include <cxxtest/ErrorPrinter.h> #endif -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) # include <cppunit/extensions/HelperMacros.h> # include <cppunit/extensions/TestFactoryRegistry.h> @@ -282,9 +282,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( Streamer_test ); @@ -298,7 +298,7 @@ CPPUNIT_TEST_SUITE_END(); -#endif // HAVE_CPPUNIT +#endif // MOCKPP_USE_CPPUNIT public: @@ -313,7 +313,7 @@ }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( Streamer_test ); @@ -325,11 +325,11 @@ MOCKPP_CXXTEST(Streamer_test, fail_missing_close); MOCKPP_CXXTEST(Streamer_test, fail_missing_close_on_error); -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION(Streamer_test); -#endif // HAVE_CPPUNIT +#endif // MOCKPP_USE_CPPUNIT void Streamer_test::test_write_ok() @@ -450,7 +450,7 @@ MOCKPP_ASSERT_TRUE(thrown == true); } -#if defined(HAVE_CXXTEST) +#if defined(MOCKPP_USE_CXXTEST) int run_cxxtest(int argc, char **argv) { @@ -468,7 +468,7 @@ #endif } -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) int run_cppunit(int argc, char **argv) { @@ -484,11 +484,11 @@ { int ret = 1; -#if defined(HAVE_CXXTEST) +#if defined(MOCKPP_USE_CXXTEST) ret = run_cxxtest(argc, argv); -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) ret = run_cppunit(argc, argv); |
|
From: Ewald A. <ewa...@us...> - 2005-12-28 09:23:42
|
Update of /cvsroot/mockpp/mockpp/mockpp/examples/tutorial In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28468/mockpp/examples/tutorial Modified Files: verifying.cpp Log Message: select test framework Index: verifying.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/examples/tutorial/verifying.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- verifying.cpp 10 Dec 2005 20:07:21 -0000 1.12 +++ verifying.cpp 28 Dec 2005 09:23:30 -0000 1.13 @@ -14,7 +14,7 @@ #include <iostream> -#ifdef HAVE_CPPUNIT +#ifdef MOCKPP_USE_CPPUNIT #include <mockpp/framework/VerifyingTestCase.h> @@ -108,11 +108,11 @@ // missing actual } -#endif // HAVE_CPPUNIT +#endif // MOCKPP_USE_CPPUNIT int main(int argc, char ** /*argv*/) { -#ifdef HAVE_CPPUNIT +#ifdef MOCKPP_USE_CPPUNIT if (argc != 1) global_error = argc; // disturb tests @@ -123,6 +123,6 @@ return runner.run() ? 0 : 1; #else std::cout << "CppUnit was not available at compile time.\n"; - return 1; + return 0; #endif } |
|
From: Ewald A. <ewa...@us...> - 2005-12-28 09:23:42
|
Update of /cvsroot/mockpp/mockpp/mockpp/config In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28468/mockpp/config Modified Files: gen-config-common.sh Log Message: select test framework Index: gen-config-common.sh =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/config/gen-config-common.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- gen-config-common.sh 18 Dec 2005 19:13:08 -0000 1.1 +++ gen-config-common.sh 28 Dec 2005 09:23:30 -0000 1.2 @@ -13,13 +13,13 @@ #define MOCKPP_PACKAGE $3 /* Define if you have CppUnit installed. */ -#define HAVE_CPPUNIT +#undef MOCKPP_USE_CPPUNIT /* Define to 1 if you have the <cppunit/Message.h> header file. */ -#define HAVE_CPPUNIT_MESSAGE_H 1 +#undef HAVE_CPPUNIT_MESSAGE_H 1 /* Define if you have CxxTest installed. */ -#define HAVE_CXXTEST +#define MOCKPP_USE_CXXTEST /* Define to 1 if you have the <limits> header file. */ #define HAVE_LIMITS |
|
From: Ewald A. <ewa...@us...> - 2005-12-28 09:23:42
|
Update of /cvsroot/mockpp/mockpp/config In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28468/config Modified Files: ac_cxx_cxxtest.m4 Log Message: select test framework Index: ac_cxx_cxxtest.m4 =================================================================== RCS file: /cvsroot/mockpp/mockpp/config/ac_cxx_cxxtest.m4,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- ac_cxx_cxxtest.m4 10 Dec 2005 15:15:08 -0000 1.1 +++ ac_cxx_cxxtest.m4 28 Dec 2005 09:23:30 -0000 1.2 @@ -21,12 +21,12 @@ if test x$cxxtest_inc != xNO; then echo "found cxxtest/TestCase.h at $cxxtest_inc" EA_EXTRA_INC="$EA_EXTRA_INC -I$cxxtest_inc" - AC_DEFINE(HAVE_CXXTEST, 1, [Define if you have CxxTest installed.]) + AC_DEFINE(MOCKPP_USE_CXXTEST, 1, [Define if you have CxxTest installed.]) else echo "*******************************************************" echo "*** cxxtest/TestSuite.h not found." echo "*******************************************************" - AH_TEMPLATE(HAVE_CXXTEST, [Define if you have CxxTest installed.]) + AH_TEMPLATE(MOCKPP_USE_CXXTEST, [Define if you have CxxTest installed.]) fi fi |
|
From: Ewald A. <ewa...@us...> - 2005-12-28 09:23:42
|
Update of /cvsroot/mockpp/mockpp/mockpp/docs/en In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28468/mockpp/docs/en Modified Files: appendix.docbook dev_embedded.docbook dev_intro.docbook dev_test_framework.docbook Log Message: select test framework Index: appendix.docbook =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/docs/en/appendix.docbook,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- appendix.docbook 27 Dec 2005 18:01:44 -0000 1.14 +++ appendix.docbook 28 Dec 2005 09:23:30 -0000 1.15 @@ -17,12 +17,6 @@ <sect1 id="requirements"> <title>Requirements</title> -<para> -In order to fully benefit from &mockpp;, you need -<ulink url="http://cppunit.sf.net">&cppunit;</ulink>, a framework for unit tests -with C++. Any other framework should work for development as well but &cppunit; -is used for the internal unittests.</para> - </sect1> <sect1 id="compilation"> Index: dev_intro.docbook =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/docs/en/dev_intro.docbook,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- dev_intro.docbook 27 Dec 2005 18:01:44 -0000 1.7 +++ dev_intro.docbook 28 Dec 2005 09:23:30 -0000 1.8 @@ -33,7 +33,7 @@ </listitem> <listitem>&mockpp; has no testing framework of it's own so it is recommended - to use <ulink url="http://cppunit.sf.net">CppUnit</ulink> for that purpose. + to use <ulink url="http://cppunit.sf.net">&cppunit;</ulink> for that purpose. See the test and example files how to do it. </listitem> Index: dev_test_framework.docbook =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/docs/en/dev_test_framework.docbook,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- dev_test_framework.docbook 27 Dec 2005 18:01:44 -0000 1.3 +++ dev_test_framework.docbook 28 Dec 2005 09:23:30 -0000 1.4 @@ -14,7 +14,8 @@ <sect2 id="framework-cppunit"> <title>CppUnit</title> -<para>Tests with &cppunit; are usually grouped in classes. A method contains one +<para>Tests with <ulink url="http://cppunit.sf.net">&cppunit;</ulink> +are usually grouped in classes. A method contains one single test. Each of the tests is typically registered automatically with a test runner by using some macros. This is internally done by instantiating a static variable.</para> @@ -50,9 +51,11 @@ <sect2 id="framework-cxxtest"> <title>CxxTest</title> -<para>The original working method of &cxxtest; is different to &cppunit;. A perl +<para>The original working method of +<ulink url="http://cxxtest.sf.net">&cxxtest;</ulink> +is different to &cppunit;. A perl script searches the test sources and creates an additional source file which -is then call compiled and run. All the library source files are directly included +is then compiled and run. All the library source files are directly included into the main source file which means that you do not need to create a binary library for &cxxtest;.</para> Index: dev_embedded.docbook =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/docs/en/dev_embedded.docbook,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- dev_embedded.docbook 27 Dec 2005 18:01:44 -0000 1.9 +++ dev_embedded.docbook 28 Dec 2005 09:23:30 -0000 1.10 @@ -144,7 +144,9 @@ to print a message to the screen and exit the application. Alternatively you may as well call the according collector of your unittest framework. E.g. <methodname>CPPUNIT_FAIL</methodname> for &cppunit; or -<methodname>TS_FAIL</methodname> for &cxxtest;. +<methodname>TS_FAIL</methodname> for &cxxtest;.</para> + +<para>The following listing shows a possible scenario without exceptions: <programlisting> @@ -179,14 +181,16 @@ ... - setAssertionFailedForwarder(printMalfunctionData<mockpp::AssertionFailedError>); +setAssertionFailedForwarder(printMalfunctionData<mockpp::AssertionFailedError>); </programlisting> </para> <para>The test file <filename>tests/NoException_test.cpp</filename> shows a -working solution.</para> +working solution. This file is designed to work under all library settings by +using special types. Using types like <token>int</token> or +<token>std::string</token> might not work with the settings on your machine.</para> </sect2> |
|
From: Ewald A. <ewa...@us...> - 2005-12-28 09:23:41
|
Update of /cvsroot/mockpp/mockpp/mockpp/framework In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28468/mockpp/framework Modified Files: CxxTestRunner.h SelectUnittestFramework.h VerifyingTestCaller.h VerifyingTestCase.cpp VerifyingTestCase.h Log Message: select test framework Index: CxxTestRunner.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/framework/CxxTestRunner.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- CxxTestRunner.h 10 Dec 2005 21:57:12 -0000 1.1 +++ CxxTestRunner.h 28 Dec 2005 09:23:30 -0000 1.2 @@ -32,7 +32,7 @@ #include <mockpp/mockpp.h> // always first -#if defined(HAVE_CXXTEST) +#if defined(MOCKPP_USE_CXXTEST) #include <mockpp/compat/Exception.h> @@ -68,7 +68,7 @@ } // namespace mockpp -#endif // HAVE_CXXTEST +#endif // MOCKPP_USE_CXXTEST #endif // MOCKPP_CXXTESTRUNNER_H Index: VerifyingTestCase.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/framework/VerifyingTestCase.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- VerifyingTestCase.cpp 10 Dec 2005 20:07:21 -0000 1.2 +++ VerifyingTestCase.cpp 28 Dec 2005 09:23:30 -0000 1.3 @@ -39,7 +39,7 @@ #include <mockpp/compat/Formatter.h> #include <mockpp/compat/AssertionFailedError.h> -#ifdef HAVE_CPPUNIT +#ifdef MOCKPP_USE_CPPUNIT #include <cppunit/Exception.h> #include <cppunit/SourceLine.h> @@ -113,5 +113,5 @@ } // namespace mockpp -#endif // HAVE_CPPUNIT +#endif // MOCKPP_USE_CPPUNIT Index: VerifyingTestCaller.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/framework/VerifyingTestCaller.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- VerifyingTestCaller.h 10 Dec 2005 20:07:21 -0000 1.2 +++ VerifyingTestCaller.h 28 Dec 2005 09:23:30 -0000 1.3 @@ -36,7 +36,7 @@ #include <mockpp/framework/VerifyingTestCase.h> -#ifdef HAVE_CPPUNIT +#ifdef MOCKPP_USE_CPPUNIT #include <cppunit/TestCaller.h> @@ -196,7 +196,7 @@ &TestFixtureType::testMethod, \ context.makeFixture() ) ) ) ) -#endif // HAVE_CPPUNIT +#endif // MOCKPP_USE_CPPUNIT #endif // MOCKPP_VerifyingTestCaller_H Index: VerifyingTestCase.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/framework/VerifyingTestCase.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- VerifyingTestCase.h 10 Dec 2005 20:07:21 -0000 1.2 +++ VerifyingTestCase.h 28 Dec 2005 09:23:30 -0000 1.3 @@ -40,7 +40,7 @@ #include <mockpp/util/AutoPointer.h> -#ifdef HAVE_CPPUNIT +#ifdef MOCKPP_USE_CPPUNIT #include <cppunit/TestCaller.h> Index: SelectUnittestFramework.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/framework/SelectUnittestFramework.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- SelectUnittestFramework.h 11 Dec 2005 20:47:01 -0000 1.3 +++ SelectUnittestFramework.h 28 Dec 2005 09:23:30 -0000 1.4 @@ -30,7 +30,7 @@ #ifndef MOCKPP_SELECTUNITTESTFRAMEWORK_H #define MOCKPP_SELECTUNITTESTFRAMEWORK_H -#if defined(HAVE_CXXTEST) +#if defined(MOCKPP_USE_CXXTEST) # define MOCKPP_DERIVE_PUBLIC_UNITFRAMEWORK : public CxxTest::TestSuite @@ -52,7 +52,7 @@ #include <mockpp/framework/CxxTestSupport.h> -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) # include <cppunit/extensions/HelperMacros.h> # define MOCKPP_DERIVE_PUBLIC_UNITFRAMEWORK : public CppUnit::TestFixture |
|
From: Ewald A. <ewa...@us...> - 2005-12-27 18:12:37
|
Update of /cvsroot/mockpp/mockpp/mockpp/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9349/mockpp/tests Modified Files: NoException_test.cpp Log Message: debugging Index: NoException_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/NoException_test.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- NoException_test.cpp 24 Dec 2005 01:38:39 -0000 1.5 +++ NoException_test.cpp 27 Dec 2005 18:12:28 -0000 1.6 @@ -41,8 +41,6 @@ #include <mockpp/mockpp.h> // always first -#include <iostream> - #include <mockpp/ExpectationValue.h> #include <mockpp/Throwable.h> @@ -165,8 +163,6 @@ mockpp::setAssertionFailedForwarder(0); - std::cout << mockpp::getLatin1(bad_data3).c_str() << std::endl; - MOCKPP_ASSERT_EQUALS(bad_data1, mockpp::String(MOCKPP_PCHAR("unknown exception occured"))); MOCKPP_ASSERT_EQUALS(bad_data2, mockpp::String(MOCKPP_PCHAR("MyStruct"))); MOCKPP_ASSERT_TRUE(bad_data3.find(mockpp::String(MOCKPP_PCHAR("did not receive the expected value"))) != mockpp::String::npos); |
|
From: Ewald A. <ewa...@us...> - 2005-12-27 18:01:56
|
Update of /cvsroot/mockpp/mockpp/mockpp/docs/en In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4794/mockpp/docs/en Modified Files: appendix.docbook bookinfo.docbook dev_advanced_intro.docbook dev_advanced_jmock.docbook dev_basic.docbook dev_embedded.docbook dev_helper.docbook dev_intro.docbook dev_poor_mans_mock.docbook dev_production.docbook dev_test_framework.docbook faq.docbook Log Message: spell check Index: dev_poor_mans_mock.docbook =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/docs/en/dev_poor_mans_mock.docbook,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- dev_poor_mans_mock.docbook 19 Feb 2005 17:57:52 -0000 1.6 +++ dev_poor_mans_mock.docbook 27 Dec 2005 18:01:44 -0000 1.7 @@ -9,7 +9,7 @@ <para>I hate a bit to mention but most of the time you don't need a full blown mock object libray. Often a more or less quick and dirty approach suffices if you do the right thing. In such cases I don't care too much about correct access -restrictions or hiding variables behind methods. Tests usally lie in the lower +restrictions or hiding variables behind methods. Tests usually lie in the lower areas of your project tree and nobody should try to re-use a test object in production code. So a more pragmatic approach won't hurt your project. But if you prefer you can of course do it the clean way.</para> Index: dev_embedded.docbook =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/docs/en/dev_embedded.docbook,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- dev_embedded.docbook 24 Dec 2005 01:40:06 -0000 1.8 +++ dev_embedded.docbook 27 Dec 2005 18:01:44 -0000 1.9 @@ -5,9 +5,9 @@ <title>The Problem</title> <para>There are hidden costs concerning memory resources when programming in -C++. On a desktop system with plenty of virtual memory you don't neccessarily -recognize it. But working with embedded systems is different as there is only a -limited amout of physical memory available.</para> +C++. On a desktop system with plenty of virtual memory you don't necessarily +recognise it. But working with embedded systems is different as there is only a +limited amount of physical memory available.</para> <para>For that reasons it is important to know the places where he compiler adds additional code: @@ -87,10 +87,10 @@ miss the one or the other feature current implementations have. Either you find a workaround for this or you implement what is missing. There are also STL implementations -available which are optimzied for embedded systems.</para> +available which are optimised for embedded systems.</para> <para>The only real problem is exception handling. You can't simply turn his -feature off and continue with the programm flow instead of throwing. When +feature off and continue with the program flow instead of throwing. When throwing an exception an application is typically in a critical state and its objects tend to be unusable. Continuing to use such an object is likely to crash the application. The other problem is the @@ -102,7 +102,7 @@ the thread upon the first malfunction. Probably this significantly slows down the test execution. Another possibility is to split the tests into portable and platform specific sections. The portable sections can be run on the development -machine with high speed very often wherereas the complete tests are run on the +machine with high speed very often whereas the complete tests are run on the target device only if appropriate.</para> <para>Without exceptions you have to provide a way to forward the messages @@ -134,14 +134,17 @@ <caution>Please note that the macro is located in source (*.cpp) files as well as in header files. So changing the macro between different test files or projects might not work -as expected. It is inteded as immutable glue between &mockpp; and your favourite +as expected. It is intended as immutable glue between &mockpp; and your favourite unittest framework.</caution> To relax this constraint there is a mutable function pointer which can be changed at runtime to actually process the exception data. All internal assertions use -this approch. The default is to throw an exception. But by calling +this approach. The default is to throw an exception. But by calling <function>setAssertionFailedForwarder()</function> appropriately it is possible -to print a message to the screen and exit the application. +to print a message to the screen and exit the application. Alternatively you may +as well call the according collector of your unittest framework. E.g. +<methodname>CPPUNIT_FAIL</methodname> for &cppunit; or +<methodname>TS_FAIL</methodname> for &cxxtest;. <programlisting> @@ -154,7 +157,7 @@ inline void printMalfunctionData(const T & /* dummy fallback */) { - std::cout << "unknown exception occured" << std::endl; + std::cout << "unknown exception occurred" << std::end; exit(1); } @@ -162,7 +165,7 @@ inline void printMalfunctionData(const mockpp::AssertionFailedError &e) { - std::cout << e.getMessage() << std::endl; + std::cout << e.getMessage() << std::end; exit(1); } @@ -170,7 +173,7 @@ inline void printMalfunctionData(const std::exception &e) { - std::cout << e.what() << std::endl; + std::cout << e.what() << std::end; exit(1); } Index: bookinfo.docbook =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/docs/en/bookinfo.docbook,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- bookinfo.docbook 15 Nov 2005 19:19:25 -0000 1.9 +++ bookinfo.docbook 27 Dec 2005 18:01:44 -0000 1.10 @@ -36,8 +36,8 @@ and <ulink url="http://www.jmock.org/">jMock</ulink>. </para> -<para>Mock objects allow you to set up exactly predictible -behaviour to help you test your production code by emulating some functionalitiy your code depends on. +<para>Mock objects allow you to set up exactly predictable +behaviour to help you test your production code by emulating some functionality your code depends on. This might for example be a huge database which is too difficult and time consuming to maintain just for testing purposes.</para> Index: appendix.docbook =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/docs/en/appendix.docbook,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- appendix.docbook 2 Dec 2005 17:28:36 -0000 1.13 +++ appendix.docbook 27 Dec 2005 18:01:44 -0000 1.14 @@ -70,7 +70,7 @@ </varlistentry> <varlistentry> - <term>--disable-rtti</term> + <term>--disable-RTTI</term> <listitem>Some environments don't use runtime type information to reduce the size of the footprint of the binaries. In this case the according debugging information is omitted. @@ -86,7 +86,7 @@ </varlistentry> <varlistentry> - <term>--enable-builtin-stl</term> + <term>--enable-builtin-STL</term> <listitem>By default &mockpp; is compiled with the C++ Standard Template Libray that comes with your compiler. Unfortunately the current implementations consume rather much resources. For that reason a built-in minimalistic STL can be used. @@ -116,7 +116,7 @@ <sect2 id="creating-rpms"> <title>Creating and Installing an RPM</title> -<para>Using the previous installation procedure has drawacks when you +<para>Using the previous installation procedure has drawbacks when you want do uninstall or upgrade to a newer version. Maybe you rather want to benefit from the common mechanism provided by <application>rpm</application>. Before installing the library this way you need to create rpm packages @@ -133,7 +133,7 @@ After completion you will receive two rpm packages: one for the library and the headers and one for the documentation. They are usually located at -<filename>/usr/src/pacakges/RPMS</filename>. +<filename>/usr/src/packages/RPMS</filename>. </para> </sect2> Index: dev_test_framework.docbook =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/docs/en/dev_test_framework.docbook,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- dev_test_framework.docbook 21 Dec 2005 20:05:40 -0000 1.2 +++ dev_test_framework.docbook 27 Dec 2005 18:01:44 -0000 1.3 @@ -52,7 +52,7 @@ <para>The original working method of &cxxtest; is different to &cppunit;. A perl script searches the test sources and creates an additional source file which -is then call ompiled and run. All the library source files are directly included +is then call compiled and run. All the library source files are directly included into the main source file which means that you do not need to create a binary library for &cxxtest;.</para> @@ -64,7 +64,7 @@ &cxxtest; included in &mockpp; comes as binary library which should help to save some memory and download time which is important on embedded platforms.</para> -<para>&cxxtest; does netiher need RTTI nor exceptions to work. But it is possible +<para>&cxxtest; does neither need RTTI nor exceptions to work. But it is possible to check exception conditions.</para> <para>Similar to &cppunit; the test methods are invoked in unspecified order.</para> Index: dev_intro.docbook =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/docs/en/dev_intro.docbook,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- dev_intro.docbook 21 Nov 2004 19:32:39 -0000 1.6 +++ dev_intro.docbook 27 Dec 2005 18:01:44 -0000 1.7 @@ -1,7 +1,7 @@ <sect1 id="devel-intro"> <title>Introduction</title> -<para>The following developer's guide is to get you started and to +<para>The following developer's guide is to get you started and to give you a quick overview over the features of &mockpp;. For a complete list of all functions please refer to the api documentation.</para> @@ -9,34 +9,34 @@ <itemizedlist> <listitem><para>&mockpp; uses a data type <token>String</token> which is no data type of it's own - but is a typdef to std::string or std::wstring depending on your choice. - It also provides a minumum functionality for unicode if you compile for + but is a typedef to std::string or std::wstring depending on your choice. + It also provides a mminimumfunctionality for unicode if you compile for a unicode environment. See <xref linkend="compilation" /> how to do that.</para> - - <para>Since &mockpp; provides both environments with the same sources it uses some - macros to convert string literals to the intended environment. You can check for + + <para>Since &mockpp; provides both environments with the same sources it uses some + macros to convert string literals to the intended environment. You can check for the actual setting by adding a conditional <literal>#ifdef MOCKPP_UNICODE</literal> in your sources.</para> - + <itemizedlist> <listitem><literal>MOCKPP_PCHAR</literal> transforms a literal string either to a <token>char*</token> or to a <token>wchar_t *</token> by prepending an <token>L</token> for unicode. </listitem> - + <listitem>In the same manner <literal>MOCKPP_STRING</literal> yields either a <token>std::string</token> or a <token>std::wstring</token>. </listitem> </itemizedlist> - + </listitem> - + <listitem>&mockpp; has no testing framework of it's own so it is recommended to use <ulink url="http://cppunit.sf.net">CppUnit</ulink> for that purpose. See the test and example files how to do it. </listitem> - + </itemizedlist> </para> Index: dev_basic.docbook =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/docs/en/dev_basic.docbook,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- dev_basic.docbook 2 Dec 2005 17:28:36 -0000 1.13 +++ dev_basic.docbook 27 Dec 2005 18:01:44 -0000 1.14 @@ -35,7 +35,7 @@ <varlistentry> <term><methodname>setExpectNothing()</methodname></term> - <listitem>If you want to prevent the occurance of any actual values + <listitem>If you want to prevent the occurrence of any actual values you should invoke this method at the beginning. <note><title>Attention</title> @@ -59,7 +59,7 @@ <para> The most common application is the use of <classname>ExpectationValue</classname> -which does an exact comparision. Your own data types should implement a meaningful +which does an exact comparison. Your own data types should implement a meaningful <methodname>operator==()</methodname> to be usable with &mockpp;. Depending on your type <methodname>operator<()</methodname> can replace the formar operator by supplying a template which does the following @@ -89,7 +89,7 @@ Sometimes you have not only a single value but a series of values. For this purpose you set up a list of expectations of the same type. The next example creates an expectation list for <token>int</token> values. The list members are compared with the -actaul values one after the other in exactly the same order they were inserted. +actual values one after the other in exactly the same order they were inserted. <programlisting> @@ -179,7 +179,7 @@ <calloutlist> <callout arearefs="expset-co" id="expset" > - <para>Adding the same actual value more than once is ok for the set.</para> + <para>Adding the same actual value more than once is OK for the set.</para> </callout> </calloutlist> Index: faq.docbook =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/docs/en/faq.docbook,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- faq.docbook 2 Dec 2005 17:28:36 -0000 1.10 +++ faq.docbook 27 Dec 2005 18:01:44 -0000 1.11 @@ -64,7 +64,7 @@ <para>A flexible and clean approach is the one used within mockpp: <itemizedlist> - <listitem>Place all the classes and funcions of your production code into + <listitem>Place all the classes and functions of your production code into appropriate libraries. All the source code for the according library is in a separate subdirectory.</listitem> @@ -74,7 +74,7 @@ <listitem>Create a subdirectory <filename>tests</filename> within each sub-project which contains all the test files needed. Depending on your test framework - the test files form a libary or an executable. Upon execution the above libray + the test files form a library or an executable. Upon execution the above libray with the production code is linked dynamically.</listitem> </itemizedlist> @@ -108,7 +108,7 @@ </question> <answer> - <para>The two reasons to use this aproach were enhanced readability and + <para>The two reasons to use this approach were enhanced readability and better support for internationalisation:</para> <para>Simply take the example from the handbook: @@ -151,12 +151,12 @@ << three; </programlisting> - I am pretty sure you will forget the one or the other space which seperates + I am pretty sure you will forget the one or the other space which separates for example the literal "plus" from the variable "two".</para> <para>The other important point is: you can't translate the second solution reasonably. - Translating "says:" and "plus" seperately and concatenating them like above often + Translating "says:" and "plus" separately and concatenating them like above often results in the nonsense you get when you read manuals for devices from the far east. Often also the order of the substituted words change in the translated version. In this case the translator simply would swap <token>%1</token> Index: dev_advanced_jmock.docbook =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/docs/en/dev_advanced_jmock.docbook,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- dev_advanced_jmock.docbook 2 Dec 2005 17:28:36 -0000 1.17 +++ dev_advanced_jmock.docbook 27 Dec 2005 18:01:44 -0000 1.18 @@ -79,7 +79,7 @@ <para>Chainable mock objects provide <emphasis>stubbed</emphasis> and <emphasis>expected</emphasis> methods. An expected method must occur as specified, otherwise the object will fail when verified. A stubbed method -without specifiction may be invoked unlimited times or not at all +without specification may be invoked unlimited times or not at all but the test still passes.</para> <para>In general, you will <emphasis>stub</emphasis> when you want to get some @@ -166,7 +166,7 @@ <listitem><classname>Or</classname> = <methodname>logic_or()</methodname> provides a logical-or of two constraints</listitem> <listitem><classname>IsAnything</classname> = <methodname>any()</methodname> is always true</listitem> <listitem><classname>IsNothing</classname> = <methodname>nothing()</methodname> is never true</listitem> - <listitem><classname>StringContains</classname> = <methodname>stringContains()</methodname> checks for the occurence of a substring</listitem> + <listitem><classname>StringContains</classname> = <methodname>stringContains()</methodname> checks for the occurrence of a substring</listitem> <listitem><classname>IsInstanceOf</classname> = <methodname>isA()</methodname> tests if an object is of a type</listitem> </itemizedlist> @@ -198,7 +198,7 @@ <sect4 id="comparing-constraint"> <title>Constraints for Comparison</title> -<para>&mockpp; contains two conststraint classes to compare objects. +<para>&mockpp; contains two constraint classes to compare objects. <classname>IsEqual</classname> is probably appropriate for most cases. It takes an object and stores it's value for later comparison.</para> @@ -207,7 +207,7 @@ of two objects. There is a template function <function>isSameComparison</function> which implements this default behaviour. If you need a differing implementation for a certain class you can provide -a specialized template. This may happen if you are using a shared pointer and +a specialised template. This may happen if you are using a shared pointer and don't want to compare the helper but the shared object at the end of the pointers.</para> @@ -223,7 +223,7 @@ <classname>IsEqual</classname> and <classname>IsSame</classname> in exactly the same manner. Unfortunately this may now lead to dangling pointers and crashes if -existing code referes to temporary objects.</para> +existing code refers to temporary objects.</para> <para>The following fragment shows the problem. When constructing the object a temporary string is created and this pointer is Index: dev_advanced_intro.docbook =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/docs/en/dev_advanced_intro.docbook,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- dev_advanced_intro.docbook 2 Dec 2005 17:28:36 -0000 1.9 +++ dev_advanced_intro.docbook 27 Dec 2005 18:01:44 -0000 1.10 @@ -12,7 +12,7 @@ <para>To emulate the behaviour of an object in your production code you need more than just single values that meet your expectations. Usually you need a collection of the different expectation types and some code -to generate a deterministic and predictible behaviour to test a limited area.</para> +to generate a deterministic and predictable behaviour to test a limited area.</para> <para>The following methods all require a separation of the code under test and the code using it. But most of the times you would split the two parts @@ -117,14 +117,14 @@ <classname>VisitableMockObject</classname>. It was named like this because you set up part of its behaviour by recording an execution path for the tests, thus by "visiting" the object. This approach is rather strict because the invocation order -and parameter values must match exactly. Unfortunatley it is almost impossible to add +and parameter values must match exactly. Unfortunately it is almost impossible to add new capabilities. </listitem> <listitem>The second approach is represented by the class <classname>ChainableMockObject</classname>. The name stems from the fact that you define the -behaviour with a "chain" of invocations of a helper object. Each chain link sets a contraint, a return -value or some other aspect. The big benefit from this approach is the extensiblity +behaviour with a "chain" of invocations of a helper object. Each chain link sets a constraint, a return +value or some other aspect. The big benefit from this approach is the extensibility concerning the behaviour by simply feeding it new objects which reflect your needs. Therefor it is far more flexible in execution: everything depends on user defined objects outside the mock object. A large set of such classes is already included.</listitem> @@ -157,7 +157,7 @@ <para>But caution: if you take the wrong macro or maybe just have a small typo you will get loads of error messages all pointing to the same line. I strongly recommend to take little steps when setting up such objects: add one single method and compile. To get started I recommend to - use the "recipies" below.</para> + use the "recipes" below.</para> <para>If you want to have an overview what is created behind the scenes, look at <filename>chainable-template.h</filename> and @@ -169,7 +169,7 @@ <listitem><para>The newer and recommended approach with the help of mock methods. The methods are templates which wrap the method under test. Since they are fully - accessible in constrast to an obscure macro they are easier to use and better to debug.</para> + accessible in contrast to an obscure macro they are easier to use and better to debug.</para> <para>For both the Visitable and the Chainable types there are sets of templates for mock methods according to the number of parameters the method under test takes. @@ -253,7 +253,7 @@ <itemizedlist> <listitem> <para> - The macro for the initializer list in the constructor is built like this: + The macro for the initialiser list in the constructor is built like this: <itemizedlist> <listitem>Always start with <token>MOCKPP_CONSTRUCT_MEMBERS_FOR_</token></listitem> <listitem>If the method is of type <token>void</token> add <token>VOID_</token></listitem> @@ -300,7 +300,7 @@ <listitem>A void and const method without parameters in a visitable mock object and extended parameter values and method name: <token>MOCKPP_VOID_CONST_VISITABLE_EXT0</token></listitem> - <listitem>Macro for initializer list for a void method with 2 parameters: + <listitem>Macro for initialiser list for a void method with 2 parameters: <token>MOCKPP_CONSTRUCT_MEMBERS_FOR_VOID_CHAINABLE2</token></listitem> </itemizedlist> @@ -331,7 +331,7 @@ <sect3 id="auto-verify"> <title>Automated Verification</title> -<para>After the last invocation to a mock object has occured you should always invoke +<para>After the last invocation to a mock object has occurred you should always invoke <methodname>verify()</methodname> on the mock object to verify all pending expectations. Maybe there are some unused return objects or outstanding calls. If you use &cppunit; as test framework you should use <classname>VerifyingTestCase</classname> from &mockpp; Index: dev_helper.docbook =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/docs/en/dev_helper.docbook,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- dev_helper.docbook 25 Jul 2005 19:02:14 -0000 1.10 +++ dev_helper.docbook 27 Dec 2005 18:01:44 -0000 1.11 @@ -33,7 +33,7 @@ MOCKPP_ASSERT_FALSE(condition); MOCKPP_ASSERT_EQUALS(a, b); MOCKPP_ASSERT_DELTA(a, b, delta); <co id="delta-co" linkends="assert-delta" /> - MOCKPP_ASSERT_BOUNDARY(lo, up, a); <co id="boundary-co" linkends="assert-boudary" /> + MOCKPP_ASSERT_BOUNDARY(lo, up, a); <co id="boundary-co" linkends="assert-boundary" /> MOCKPP_ASSERT_INCLUDES(substr, target); <co id="includes-co" linkends="assert-includes" /> MOCKPP_ASSERT_EXCLUDES(substr, target); MOCKPP_ASSERT_STARTSWITH(substr, target); @@ -96,7 +96,7 @@ <para>A lot of people are using the <methodname>printf()</methodname> family for outputting. Unfortunately these are not typesafe. And nor are they appropriate for -translations when the positions of the substituted parameters are swaped for +translations when the positions of the substituted parameters are swapped for grammatical reasons.</para> <para>So I decided to implement a typesafe approach which also takes into account @@ -107,7 +107,7 @@ <para>The built-in methods handle the common data types like <token>int</token>, <token>float</token> or <token>std::string</token>. -But it is also easily possible to extend the ouput capabilities for your own data types. +But it is also easily possible to extend the output capabilities for your own data types. No changes inside the &mockpp; framework are needed, it needn't even be in the &mockpp; namespace.</para> Index: dev_production.docbook =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/docs/en/dev_production.docbook,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- dev_production.docbook 19 Nov 2005 19:14:29 -0000 1.5 +++ dev_production.docbook 27 Dec 2005 18:01:44 -0000 1.6 @@ -7,12 +7,12 @@ <title>Support for Production Code</title> <para>To effectively benefit from unit tests it is frequently necessary to - optimize production code. The following sections show some of the + optimise production code. The following sections show some of the possibilities. The common pattern is as usual to delegate the detailed work - to a helper class which is approriately instantiated.</para> + to a helper class which is appropriately instantiated.</para> <para>Some of the following approaches have the drawback to weaken the - protection of your class mebers. You have to decide yourself if this is + protection of your class members. You have to decide yourself if this is acceptable for you.</para> <para>But you should keep in mind that mechanisms like @@ -26,9 +26,9 @@ <sect2 id="reproducible-time-values"> <title>Reproducible Time Values</title> - <para>Sometimes you need predictible time values. Either you want to - minimize the impact of timeouts in error conditions or prevent idle times. - <application>mockpp</application> contains a sample imlementation of how + <para>Sometimes you need predictable time values. Either you want to + minimise the impact of timeouts in error conditions or prevent idle times. + <application>mockpp</application> contains a sample implementation of how to handle calls to <methodname>std::time()</methodname>. This only covers a resolution of 1 second. If you need a more sophisticated solution you have to create your own code similar to this example. See the sources and |
|
From: Ewald A. <ewa...@us...> - 2005-12-24 01:40:27
|
Update of /cvsroot/mockpp/mockpp/mockpp/docs/en In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28976/mockpp/docs/en Modified Files: dev_embedded.docbook Log Message: update Index: dev_embedded.docbook =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/docs/en/dev_embedded.docbook,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- dev_embedded.docbook 23 Dec 2005 22:03:30 -0000 1.7 +++ dev_embedded.docbook 24 Dec 2005 01:40:06 -0000 1.8 @@ -139,9 +139,9 @@ To relax this constraint there is a mutable function pointer which can be changed at runtime to actually process the exception data. All internal assertions use -this approch. The default is to throw an exception but by calling -<function>setAssertionFailedForwarder</function> appropriately it is possible -to print a message to the screen a exit the application. +this approch. The default is to throw an exception. But by calling +<function>setAssertionFailedForwarder()</function> appropriately it is possible +to print a message to the screen and exit the application. <programlisting> |
|
From: Ewald A. <ewa...@us...> - 2005-12-24 01:38:55
|
Update of /cvsroot/mockpp/mockpp/mockpp/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28774/mockpp/tests Modified Files: NoException_test.cpp Log Message: catch failure Index: NoException_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/NoException_test.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- NoException_test.cpp 23 Dec 2005 22:03:30 -0000 1.4 +++ NoException_test.cpp 24 Dec 2005 01:38:39 -0000 1.5 @@ -94,7 +94,9 @@ #endif // frameworks -mockpp::String bad_data; +mockpp::String bad_data1; +mockpp::String bad_data2; +mockpp::String bad_data3; struct MyStruct { @@ -118,24 +120,21 @@ template <class T> void storeMalfunctionData(const T & /* dummy */) { - std::cout << "dummy\n"; - bad_data = MOCKPP_PCHAR("unknown exception occured"); + bad_data1 = MOCKPP_PCHAR("unknown exception occured"); } template <> void storeMalfunctionData(const MyStruct &e) { - std::cout << "mystruct\n"; - bad_data = MOCKPP_PCHAR("MyStruct"); + bad_data2 = MOCKPP_PCHAR("MyStruct"); } template <> void storeMalfunctionData(const mockpp::AssertionFailedError &e) { - std::cout << mockpp::getLatin1(e.getMessage()).c_str() << std::endl; - bad_data = e.getMessage(); + bad_data3 = e.getMessage(); } @@ -156,11 +155,9 @@ mockpp::ThrowableItem it; it.take(MyStruct()); it.get()->throw_me(); - MOCKPP_ASSERT_EQUALS(bad_data, mockpp::String(MOCKPP_PCHAR("MyStruct"))); it.take(OtherStruct()); it.get()->throw_me(); - MOCKPP_ASSERT_EQUALS(bad_data, mockpp::String(MOCKPP_PCHAR("unknown exception occured"))); mockpp::ExpectationValue<MyStruct> ec (MOCKPP_PCHAR("verifyValue"), 0); ec.setExpected(MyStruct(3)); @@ -168,7 +165,11 @@ mockpp::setAssertionFailedForwarder(0); - MOCKPP_ASSERT_EQUALS(bad_data, mockpp::String(MOCKPP_PCHAR("unknown exception occured"))); + std::cout << mockpp::getLatin1(bad_data3).c_str() << std::endl; + + MOCKPP_ASSERT_EQUALS(bad_data1, mockpp::String(MOCKPP_PCHAR("unknown exception occured"))); + MOCKPP_ASSERT_EQUALS(bad_data2, mockpp::String(MOCKPP_PCHAR("MyStruct"))); + MOCKPP_ASSERT_TRUE(bad_data3.find(mockpp::String(MOCKPP_PCHAR("did not receive the expected value"))) != mockpp::String::npos); } |
|
From: Ewald A. <ewa...@us...> - 2005-12-23 22:03:42
|
Update of /cvsroot/mockpp/mockpp/mockpp/util In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19465/mockpp/util Modified Files: AssertMo.cpp Log Message: forward failures without execptions Index: AssertMo.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/util/AssertMo.cpp,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- AssertMo.cpp 3 Dec 2005 13:10:12 -0000 1.22 +++ AssertMo.cpp 23 Dec 2005 22:03:30 -0000 1.23 @@ -124,7 +124,7 @@ { mockpp::String fmt = mockpp_i18n(MOCKPP_PCHAR("Not Implemented in %1.")); fmt << mockName; - forwardMalfunctionData(NotImplementedException(srcline, srcfile, fmt)); + MOCKPP_THROW(NotImplementedException(srcline, srcfile, fmt)); } |
|
From: Ewald A. <ewa...@us...> - 2005-12-23 22:03:39
|
Update of /cvsroot/mockpp/mockpp/mockpp/compat In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19465/mockpp/compat Modified Files: AssertionFailedError.cpp Exception.h Log Message: forward failures without execptions Index: AssertionFailedError.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/compat/AssertionFailedError.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- AssertionFailedError.cpp 3 Dec 2005 13:10:30 -0000 1.16 +++ AssertionFailedError.cpp 23 Dec 2005 22:03:30 -0000 1.17 @@ -29,7 +29,6 @@ #include <mockpp/mockpp.h> // always first - #include <mockpp/compat/AssertionFailedError.h> @@ -58,11 +57,23 @@ } +void defaultAssertionFailedForwarder(const AssertionFailedError &err) +{ + MOCKPP_THROW(err); +} + + +AssertionFailedForwarder_t forwardAssertionFailed = defaultAssertionFailedForwarder; + + MOCKPP_EXPORT void assertionFailed(unsigned srcline, const char* srcfile, const String &message) { - forwardMalfunctionData(AssertionFailedError(srcline, srcfile, message)); + if (forwardAssertionFailed != 0) + forwardAssertionFailed(AssertionFailedError(srcline, srcfile, message)); + else + defaultAssertionFailedForwarder(AssertionFailedError(srcline, srcfile, message)); } Index: Exception.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/compat/Exception.h,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- Exception.h 3 Dec 2005 13:10:30 -0000 1.17 +++ Exception.h 23 Dec 2005 22:03:30 -0000 1.18 @@ -87,6 +87,7 @@ #endif private: + String message; unsigned srcline; String srcfile; @@ -96,18 +97,6 @@ }; -/** Handle exceptions based on errors and failures. - * The default implementation throws the object. - * @param e excption data - */ -template <typename T> -inline -void forwardMalfunctionData(const T &e) -{ - MOCKPP_THROW(e); -} - - } // namespace mockpp |
|
From: Ewald A. <ewa...@us...> - 2005-12-23 22:03:39
|
Update of /cvsroot/mockpp/mockpp/mockpp/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19465/mockpp/tests Modified Files: AssertMo_test.cpp Makefile.am NoException_test.cpp VerifyingTestCaller_test.cpp mock_test.cpp Log Message: forward failures without execptions Index: AssertMo_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/AssertMo_test.cpp,v retrieving revision 1.29 retrieving revision 1.30 diff -u -d -r1.29 -r1.30 --- AssertMo_test.cpp 11 Dec 2005 20:03:44 -0000 1.29 +++ AssertMo_test.cpp 23 Dec 2005 22:03:30 -0000 1.30 @@ -459,7 +459,7 @@ #ifndef MOCKPP_NO_EXCEPTIONS static void do_a_throw(unsigned val) { - mockpp::forwardMalfunctionData((unsigned) val); + MOCKPP_THROW((unsigned) val); } #endif Index: VerifyingTestCaller_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VerifyingTestCaller_test.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- VerifyingTestCaller_test.cpp 11 Dec 2005 20:03:44 -0000 1.13 +++ VerifyingTestCaller_test.cpp 23 Dec 2005 22:03:30 -0000 1.14 @@ -125,7 +125,7 @@ void thrower() { - mockpp::forwardMalfunctionData(1); + MOCKPP_THROW(1); } }; Index: Makefile.am =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/Makefile.am,v retrieving revision 1.96 retrieving revision 1.97 diff -u -d -r1.96 -r1.97 --- Makefile.am 11 Dec 2005 20:11:33 -0000 1.96 +++ Makefile.am 23 Dec 2005 22:03:30 -0000 1.97 @@ -7,9 +7,9 @@ AM_LDFLAGS = $(all_libraries) -#mock_test_win32 +#mock_test_win32 +#mock_test_qt mock_test_x11 check_PROGRAMS = mock_test \ - mock_test_qt mock_test_x11 \ jmock_test \ readability_test check_inst Index: mock_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/mock_test.cpp,v retrieving revision 1.29 retrieving revision 1.30 diff -u -d -r1.29 -r1.30 --- mock_test.cpp 17 Dec 2005 18:38:48 -0000 1.29 +++ mock_test.cpp 23 Dec 2005 22:03:30 -0000 1.30 @@ -29,7 +29,7 @@ // Expected number of tests: // 8 cppunit specific -// mock_test : 511 +// mock_test : 511 // jmock_test: 199 #include <mockpp/mockpp.h> // always first @@ -167,6 +167,8 @@ int main(int argc, char **argv) { +// mockpp::setAssertionFailedForwarder(0); + int ret = 1; std::cout << "starting tests..\n"; Index: NoException_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/NoException_test.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- NoException_test.cpp 11 Dec 2005 20:03:44 -0000 1.3 +++ NoException_test.cpp 23 Dec 2005 22:03:30 -0000 1.4 @@ -27,11 +27,35 @@ * ***************************************************************************/ +#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 <iostream> + +#include <mockpp/ExpectationValue.h> +#include <mockpp/Throwable.h> + +#include <mockpp/util/AssertMo.h> + +#include <mockpp/compat/Assert.h> +#include <mockpp/compat/Exception.h> + #include "SelectFramework.h" +namespace { + class NoException_test MOCKPP_DERIVE_PUBLIC_UNITFRAMEWORK { @@ -52,6 +76,9 @@ public: void test_invoke(); + + virtual void setUp(); + virtual void tearDown(); }; @@ -67,10 +94,83 @@ #endif // frameworks +mockpp::String bad_data; + + +struct MyStruct { + MyStruct(int v) + : val(v){} + + MyStruct() + : val(0){} + + bool operator==(const MyStruct &o) const + { + return val == o.val; + } + + int val; +}; + +struct OtherStruct {}; + + +template <class T> +void storeMalfunctionData(const T & /* dummy */) +{ + std::cout << "dummy\n"; + bad_data = MOCKPP_PCHAR("unknown exception occured"); +} + + +template <> +void storeMalfunctionData(const MyStruct &e) +{ + std::cout << "mystruct\n"; + bad_data = MOCKPP_PCHAR("MyStruct"); +} + + +template <> +void storeMalfunctionData(const mockpp::AssertionFailedError &e) +{ + std::cout << mockpp::getLatin1(e.getMessage()).c_str() << std::endl; + bad_data = e.getMessage(); +} + + +void NoException_test::setUp() +{ + mockpp::setAssertionFailedForwarder(storeMalfunctionData<mockpp::AssertionFailedError>); +} + + +void NoException_test::tearDown() +{ + mockpp::setAssertionFailedForwarder(0); +} + void NoException_test::test_invoke() { + mockpp::ThrowableItem it; + it.take(MyStruct()); + it.get()->throw_me(); + MOCKPP_ASSERT_EQUALS(bad_data, mockpp::String(MOCKPP_PCHAR("MyStruct"))); + + it.take(OtherStruct()); + it.get()->throw_me(); + MOCKPP_ASSERT_EQUALS(bad_data, mockpp::String(MOCKPP_PCHAR("unknown exception occured"))); + + mockpp::ExpectationValue<MyStruct> ec (MOCKPP_PCHAR("verifyValue"), 0); + ec.setExpected(MyStruct(3)); + ec.setActual(MyStruct(4)); + + mockpp::setAssertionFailedForwarder(0); + + MOCKPP_ASSERT_EQUALS(bad_data, mockpp::String(MOCKPP_PCHAR("unknown exception occured"))); } +} // anon namespace |
|
From: Ewald A. <ewa...@us...> - 2005-12-23 22:03:38
|
Update of /cvsroot/mockpp/mockpp/mockpp/docs/en In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19465/mockpp/docs/en Modified Files: dev_embedded.docbook Log Message: forward failures without execptions Index: dev_embedded.docbook =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/docs/en/dev_embedded.docbook,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- dev_embedded.docbook 8 Dec 2005 18:16:19 -0000 1.6 +++ dev_embedded.docbook 23 Dec 2005 22:03:30 -0000 1.7 @@ -71,7 +71,7 @@ </table> When changing the options for the test executables the size was reduced down to -45%, but using the regular STL resulted only in 13% more code.</para> +45%, but using the regular STL resulted only in 13% larger code.</para> </sect2> @@ -80,7 +80,7 @@ <para>Disabling RTTI in &mockpp; has little consequences. It is only used for a few diagnostic messages. In the worst case you might have to search for the -problematic class.</para> +problematic class because the name is not displayed.</para> <para>Disabling the regular STL is also no problem as far as &mockpp; is affected. If you use the minimalistic built-in STL for your own code you might @@ -102,24 +102,89 @@ the thread upon the first malfunction. Probably this significantly slows down the test execution. Another possibility is to split the tests into portable and platform specific sections. The portable sections can be run on the development -machine with full speed very often wherereas the complete tests are run on the -target device only if appropriate. +machine with high speed very often wherereas the complete tests are run on the +target device only if appropriate.</para> +<para>Without exceptions you have to provide a way to forward the messages +about the malfunction. &mockpp; uses some macros to run the built-in tests +with or without exceptions using the same source files. When exceptions are +enabled theses macros contain what you probably expect: <programlisting> -void forwardMalfunctionData(const T &e) - -#define MOCKPP_THROW(x) throw (x) -#define MOCKPP_RETHROW throw -#define MOCKPP_TRY try -#define MOCKPP_CATCH(x) (x) +#define MOCKPP_THROW(x) throw (x) +#define MOCKPP_RETHROW throw +#define MOCKPP_TRY try +#define MOCKPP_CATCH(x) (x) #define MOCKPP_CATCH_ALL catch(...) </programlisting> +</para> + +<para>One way to react upon bad test results without exceptions is to call a +method which prints +the results to the screen and exits with an according error level. Since the +container with the resulting data can vary you might want to use a template +with specialisations. The following example shows how this could look like. +The macros should occur before the inclusion of +<filename>mockpp.h</filename>. Otherwise they are defined with empty +content. + +<caution>Please note that the macro is located in source (*.cpp) files as well as +in header files. So changing the macro between different test files or projects +might not work +as expected. It is inteded as immutable glue between &mockpp; and your favourite +unittest framework.</caution> + +To relax this constraint there is a mutable function pointer which can be changed +at runtime to actually process the exception data. All internal assertions use +this approch. The default is to throw an exception but by calling +<function>setAssertionFailedForwarder</function> appropriately it is possible +to print a message to the screen a exit the application. + +<programlisting> + +#define MOCKPP_THROW(x) printMalfunctionData(x) +#define MOCKPP_RETHROW printMalfunctionData("unexpected rethrow") + +... + +template <class T> +inline +void printMalfunctionData(const T & /* dummy fallback */) +{ + std::cout << "unknown exception occured" << std::endl; + exit(1); +} + +template <> +inline +void printMalfunctionData(const mockpp::AssertionFailedError &e) +{ + std::cout << e.getMessage() << std::endl; + exit(1); +} + +template <> +inline +void printMalfunctionData(const std::exception &e) +{ + std::cout << e.what() << std::endl; + exit(1); +} + +... + + setAssertionFailedForwarder(printMalfunctionData<mockpp::AssertionFailedError>); + +</programlisting> </para> +<para>The test file <filename>tests/NoException_test.cpp</filename> shows a +working solution.</para> + </sect2> + </sect1> |
|
From: Ewald A. <ewa...@us...> - 2005-12-23 22:03:38
|
Update of /cvsroot/mockpp/mockpp/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19465/mockpp Modified Files: Throwable.h mockpp.cpp mockpp.h Log Message: forward failures without execptions Index: mockpp.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/mockpp.h,v retrieving revision 1.67 retrieving revision 1.68 diff -u -d -r1.67 -r1.68 --- mockpp.h 18 Dec 2005 16:56:23 -0000 1.67 +++ mockpp.h 23 Dec 2005 22:03:30 -0000 1.68 @@ -196,11 +196,11 @@ #ifndef MOCKPP_NO_EXCEPTIONS -#define MOCKPP_THROW(x) throw (x) -#define MOCKPP_RETHROW throw -#define MOCKPP_TRY try -#define MOCKPP_CATCH(x) (x) -#define MOCKPP_CATCH_ALL catch(...) +#define MOCKPP_THROW(x) throw (x) +#define MOCKPP_RETHROW throw +#define MOCKPP_TRY try +#define MOCKPP_CATCH(x) (x) +#define MOCKPP_CATCH_ALL catch(...) #else @@ -480,6 +480,16 @@ return latin1; } + class AssertionFailedError; + typedef void (*AssertionFailedForwarder_t)(const AssertionFailedError &err); + +/** Sets the function pointer which handels failed assertions. + * @param fwd pointer to function. + * @return previous pointer + */ + AssertionFailedForwarder_t + setAssertionFailedForwarder(AssertionFailedForwarder_t fwd); + } // namespace mockpp #ifdef MOCKPP_UNICODE Index: mockpp.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/mockpp.cpp,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- mockpp.cpp 26 Nov 2005 18:00:16 -0000 1.21 +++ mockpp.cpp 23 Dec 2005 22:03:30 -0000 1.22 @@ -121,4 +121,15 @@ #endif +extern AssertionFailedForwarder_t forwardAssertionFailed; + +AssertionFailedForwarder_t +setAssertionFailedForwarder(AssertionFailedForwarder_t fwd) +{ + AssertionFailedForwarder_t temp = forwardAssertionFailed; + forwardAssertionFailed = fwd; + return temp; +} + + } // namespace mockpp Index: Throwable.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/Throwable.h,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- Throwable.h 3 Dec 2005 13:10:12 -0000 1.17 +++ Throwable.h 23 Dec 2005 22:03:30 -0000 1.18 @@ -76,7 +76,7 @@ virtual void throw_me() { ++thrown; - forwardMalfunctionData(obj); + MOCKPP_THROW(obj); } |
|
From: Ewald A. <ewa...@us...> - 2005-12-23 22:03:38
|
Update of /cvsroot/mockpp/mockpp/mockpp/chaining In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19465/mockpp/chaining Modified Files: AbstractDynamicChainingMock.h Log Message: forward failures without execptions Index: AbstractDynamicChainingMock.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/AbstractDynamicChainingMock.h,v retrieving revision 1.38 retrieving revision 1.39 diff -u -d -r1.38 -r1.39 --- AbstractDynamicChainingMock.h 3 Dec 2005 13:10:30 -0000 1.38 +++ AbstractDynamicChainingMock.h 23 Dec 2005 22:03:30 -0000 1.39 @@ -318,7 +318,7 @@ virtual void mockInvocation( const I &invocation ) { if ( this->failure.get() != 0 ) - forwardMalfunctionData(*this->failure.get()); + MOCKPP_THROW(*this->failure.get()); MOCKPP_TRY { @@ -333,7 +333,7 @@ this->invocationDispatcher.get(), assertion.getMessage() ); this->failure.reset( new AssertionFailedError(__LINE__, __FILE__, dme.getMessage())); - forwardMalfunctionData(*this->failure.get()); + MOCKPP_THROW(*this->failure.get()); } #endif // MOCKPP_NO_EXCEPTIONS } @@ -380,7 +380,7 @@ void mockInvocation( const I &invocation ) \ { \ if ( this->failure.get() != 0 ) \ - forwardMalfunctionData(*this->failure.get()); \ + MOCKPP_THROW(*this->failure.get()); \ \ try \ { \ @@ -394,7 +394,7 @@ this->invocationDispatcher.get(), \ assertion.getMessage() ); \ this->failure.reset( new AssertionFailedError(__LINE__, __FILE__, dme.getMessage())); \ - forwardMalfunctionData(*this->failure.get()); \ + MOCKPP_THROW(*this->failure.get()); \ } \ } \ }; \ |
