[Mockpp-commits] mockpp/mockpp/tests AbstractDynamicChainingMock_test.cpp,1.25,1.26 ChainableMockObj
Brought to you by:
ewald-arnold
Update of /cvsroot/mockpp/mockpp/mockpp/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2704/mockpp/tests Modified Files: AbstractDynamicChainingMock_test.cpp ChainableMockObject_1_void_test.cpp ChainableMockObject_2_void_test.cpp ChainableMockObject_3_void_test.cpp ChainableMockObject_4_void_test.cpp ChainableMockObject_5_void_test.cpp CoreMock_test.cpp FIFOInvocationDispatcher_test.cpp InvocationMocker_test.cpp LIFOInvocationDispatcher_test.cpp StubBuilder_test.cpp mock_test.cpp Log Message: correctly disable pti support Index: LIFOInvocationDispatcher_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/LIFOInvocationDispatcher_test.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- LIFOInvocationDispatcher_test.cpp 27 Feb 2005 11:48:16 -0000 1.15 +++ LIFOInvocationDispatcher_test.cpp 25 Mar 2005 17:20:35 -0000 1.16 @@ -27,10 +27,6 @@ * ***************************************************************************/ -#ifdef MOCKPP_PTI_WEAKNESS_TEST -#define MOCKPP_PTI_WEAKNESS // before mockpp headers! -#endif - #include <mockpp/mockpp.h> // always first #ifndef HAVE_CPPUNIT Index: ChainableMockObject_5_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_5_void_test.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- ChainableMockObject_5_void_test.cpp 25 Mar 2005 16:30:31 -0000 1.8 +++ ChainableMockObject_5_void_test.cpp 25 Mar 2005 17:20:35 -0000 1.9 @@ -37,10 +37,7 @@ #else -#ifdef MOCKPP_PTI_WEAKNESS #include <mockpp/chaining/mockpp_pti.h> -#endif - #include <mockpp/ChainableMockObject.h> #include "classes_ABCDE.h" Index: ChainableMockObject_2_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_2_void_test.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- ChainableMockObject_2_void_test.cpp 25 Mar 2005 16:30:30 -0000 1.6 +++ ChainableMockObject_2_void_test.cpp 25 Mar 2005 17:20:35 -0000 1.7 @@ -37,10 +37,7 @@ #else -#ifdef MOCKPP_PTI_WEAKNESS #include <mockpp/chaining/mockpp_pti.h> -#endif - #include <mockpp/ChainableMockObject.h> #include <cppunit/extensions/HelperMacros.h> Index: ChainableMockObject_4_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_4_void_test.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- ChainableMockObject_4_void_test.cpp 25 Mar 2005 16:30:31 -0000 1.6 +++ ChainableMockObject_4_void_test.cpp 25 Mar 2005 17:20:35 -0000 1.7 @@ -37,10 +37,7 @@ #else -#ifdef MOCKPP_PTI_WEAKNESS #include <mockpp/chaining/mockpp_pti.h> -#endif - #include <mockpp/ChainableMockObject.h> #include <cppunit/extensions/HelperMacros.h> Index: AbstractDynamicChainingMock_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/AbstractDynamicChainingMock_test.cpp,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- AbstractDynamicChainingMock_test.cpp 25 Mar 2005 16:53:30 -0000 1.25 +++ AbstractDynamicChainingMock_test.cpp 25 Mar 2005 17:20:35 -0000 1.26 @@ -40,10 +40,7 @@ #include <mockpp/chaining/LIFOInvocationDispatcher.h> #include <mockpp/chaining/FIFOInvocationDispatcher.h> -#ifdef MOCKPP_PTI_WEAKNESS #include <mockpp/chaining/mockpp_pti.h> -#endif - #include <mockpp/stub/ReturnStub.h> #include <mockpp/chaining/ChainingMockObjectSupport.h> Index: FIFOInvocationDispatcher_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/FIFOInvocationDispatcher_test.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- FIFOInvocationDispatcher_test.cpp 25 Mar 2005 16:53:31 -0000 1.16 +++ FIFOInvocationDispatcher_test.cpp 25 Mar 2005 17:20:35 -0000 1.17 @@ -27,10 +27,6 @@ * ***************************************************************************/ -#ifdef MOCKPP_PTI_WEAKNESS_TEST -#define MOCKPP_PTI_WEAKNESS // before mockpp headers! -#endif - #include <mockpp/mockpp.h> // always first #ifndef HAVE_CPPUNIT @@ -42,10 +38,7 @@ #include <mockpp/chaining/FIFOInvocationDispatcher.h> #include <mockpp/chaining/Invokable.h> #include <mockpp/chaining/Invocation.h> - -#ifdef MOCKPP_PTI_WEAKNESS #include <mockpp/chaining/mockpp_pti.h> -#endif #include <mockpp/stub/ReturnStub.h> #include <mockpp/stub/VoidStub.h> Index: InvocationMocker_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/InvocationMocker_test.cpp,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- InvocationMocker_test.cpp 25 Mar 2005 16:53:31 -0000 1.28 +++ InvocationMocker_test.cpp 25 Mar 2005 17:20:35 -0000 1.29 @@ -37,10 +37,7 @@ #include <mockpp/chaining/InvocationMocker.h> -#ifdef MOCKPP_PTI_WEAKNESS #include <mockpp/chaining/mockpp_pti.h> -#endif - #include <mockpp/stub/ReturnStub.h> #include <mockpp/constraint/IsEqual.h> Index: ChainableMockObject_1_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_1_void_test.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- ChainableMockObject_1_void_test.cpp 25 Mar 2005 16:30:30 -0000 1.6 +++ ChainableMockObject_1_void_test.cpp 25 Mar 2005 17:20:35 -0000 1.7 @@ -37,10 +37,7 @@ #else -#ifdef MOCKPP_PTI_WEAKNESS #include <mockpp/chaining/mockpp_pti.h> -#endif - #include <mockpp/ChainableMockObject.h> #include <cppunit/extensions/HelperMacros.h> Index: ChainableMockObject_3_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_3_void_test.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- ChainableMockObject_3_void_test.cpp 25 Mar 2005 16:30:30 -0000 1.6 +++ ChainableMockObject_3_void_test.cpp 25 Mar 2005 17:20:35 -0000 1.7 @@ -37,10 +37,7 @@ #else -#ifdef MOCKPP_PTI_WEAKNESS #include <mockpp/chaining/mockpp_pti.h> -#endif - #include <mockpp/ChainableMockObject.h> #include <cppunit/extensions/HelperMacros.h> Index: StubBuilder_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/StubBuilder_test.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- StubBuilder_test.cpp 25 Mar 2005 16:53:36 -0000 1.11 +++ StubBuilder_test.cpp 25 Mar 2005 17:20:35 -0000 1.12 @@ -29,10 +29,6 @@ #define MOCKPP_ENABLE_DEFAULT_FORMATTER -#ifdef MOCKPP_PTI_WEAKNESS_TEST -#define MOCKPP_PTI_WEAKNESS // before mockpp headers! -#endif - #include <mockpp/mockpp.h> // always first #ifndef HAVE_CPPUNIT @@ -45,10 +41,7 @@ #include <mockpp/builder/StubBuilder.h> -#ifdef MOCKPP_PTI_WEAKNESS #include <mockpp/chaining/mockpp_pti.h> -#endif - #include <mockpp/stub/ReturnStub.h> #include <mockpp/stub/StubHolder.h> #include <mockpp/stub/ThrowStub.h> Index: CoreMock_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/CoreMock_test.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- CoreMock_test.cpp 25 Mar 2005 16:53:31 -0000 1.18 +++ CoreMock_test.cpp 25 Mar 2005 17:20:35 -0000 1.19 @@ -40,10 +40,7 @@ #include <mockpp/chaining/LIFOInvocationDispatcher.h> #include <mockpp/chaining/FIFOInvocationDispatcher.h> -#ifdef MOCKPP_PTI_WEAKNESS #include <mockpp/chaining/mockpp_pti.h> -#endif - #include <mockpp/stub/ReturnStub.h> #include <cppunit/extensions/HelperMacros.h> Index: mock_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/mock_test.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- mock_test.cpp 26 Jan 2005 21:59:13 -0000 1.20 +++ mock_test.cpp 25 Mar 2005 17:20:36 -0000 1.21 @@ -95,7 +95,14 @@ runner.addTest(registry.makeTest()); std::cout << "starting tests..\n"; - std::cout << " size of <char> is " << sizeof(MOCKPP_CHAR('x')) << std::endl; + +#ifdef MOCKPP_PTI_WEAKNESS + std::cout << " - support pti-weakness enabled\n"; +#else + std::cout << " - support pti-weakness disabled\n"; +#endif + + std::cout << " - size of <char> is " << sizeof(MOCKPP_CHAR('x')) << std::endl; std::cout << "\n"; std::cout << "Options\n"; std::cout << " --show-name show method names before calling\n"; |