[Mockpp-commits] mockpp/mockpp/tests AbstractDynamicChainingMock_test.cpp,1.27,1.28 ChainableMockObj
Brought to you by:
ewald-arnold
Update of /cvsroot/mockpp/mockpp/mockpp/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9425/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 ChainingMockObjectSupport_test.cpp CoreMock_test.cpp InvocationMockerBuilder_test.cpp InvocationMocker_test.cpp MixedMockObject_5_test.cpp StringContains_test.cpp StringEndsWith_test.cpp StringStartsWith_test.cpp StubBuilder_test.cpp Verifiable_test.cpp mock_test.cpp Log Message: more efforts to make msvc6 compile Index: ChainableMockObject_5_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_5_void_test.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- ChainableMockObject_5_void_test.cpp 25 Mar 2005 17:20:35 -0000 1.9 +++ ChainableMockObject_5_void_test.cpp 3 Apr 2005 18:32:54 -0000 1.10 @@ -73,9 +73,10 @@ typedef mockpp::Invocation5<unsigned, unsigned, unsigned, unsigned, unsigned> mockpp_Invocation5_unsigned_unsigned_unsigned_unsigned_unsigned; -MOCKPP_PTI_DECLARE(mockpp_Invocation5_unsigned_unsigned_unsigned_unsigned_unsigned) - - + +MOCKPP_PTI_IMPLEMENT(mockpp_Invocation5_unsigned_unsigned_unsigned_unsigned_unsigned) + + class MyChainableMockObject_5_void_Interface { public: @@ -369,7 +370,4 @@ } -MOCKPP_PTI_IMPLEMENT(mockpp_Invocation5_unsigned_unsigned_unsigned_unsigned_unsigned) - - #endif // HAVE_CPPUNIT Index: StringStartsWith_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/StringStartsWith_test.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- StringStartsWith_test.cpp 5 Jan 2005 19:30:06 -0000 1.1 +++ StringStartsWith_test.cpp 3 Apr 2005 18:32:54 -0000 1.2 @@ -64,8 +64,8 @@ { mockpp::StringStartsWith<std::string> mystr ("the-string"); mockpp::String s = MOCKPP_PCHAR("mystr?"); - CPPUNIT_ASSERT(mystr.describeTo(s) == MOCKPP_PCHAR("mystr?a string starting with \"the-string\"")); - CPPUNIT_ASSERT(s == MOCKPP_PCHAR("mystr?a string starting with \"the-string\"")); + CPPUNIT_ASSERT(mystr.describeTo(s) == MOCKPP_GET_STRING("mystr?a string starting with \"the-string")+MOCKPP_CHAR('\"')); + CPPUNIT_ASSERT(s == MOCKPP_GET_STRING("mystr?a string starting with \"the-string")+MOCKPP_CHAR('\"')); } Index: mock_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/mock_test.cpp,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- mock_test.cpp 2 Apr 2005 20:45:33 -0000 1.22 +++ mock_test.cpp 3 Apr 2005 18:32:54 -0000 1.23 @@ -43,7 +43,7 @@ # include <cppunit/CompilerOutputter.h> -#ifndef MSC_VER +#ifndef _MSC_VER using std::time; using std::time_t; #endif Index: ChainableMockObject_4_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_4_void_test.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- ChainableMockObject_4_void_test.cpp 25 Mar 2005 17:20:35 -0000 1.7 +++ ChainableMockObject_4_void_test.cpp 3 Apr 2005 18:32:54 -0000 1.8 @@ -67,9 +67,10 @@ typedef mockpp::Invocation4<unsigned, unsigned, unsigned, unsigned> mockpp_Invocation4_unsigned_unsigned_unsigned_unsigned; -MOCKPP_PTI_DECLARE(mockpp_Invocation4_unsigned_unsigned_unsigned_unsigned) - - + +MOCKPP_PTI_IMPLEMENT(mockpp_Invocation4_unsigned_unsigned_unsigned_unsigned) + + class MyChainableMockObject_4_void : public mockpp::ChainableMockObject { public: @@ -151,7 +152,4 @@ } -MOCKPP_PTI_IMPLEMENT(mockpp_Invocation4_unsigned_unsigned_unsigned_unsigned) - - #endif // HAVE_CPPUNIT Index: InvocationMockerBuilder_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/InvocationMockerBuilder_test.cpp,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- InvocationMockerBuilder_test.cpp 2 Apr 2005 20:45:32 -0000 1.26 +++ InvocationMockerBuilder_test.cpp 3 Apr 2005 18:32:54 -0000 1.27 @@ -40,6 +40,8 @@ #include <mockpp/matcher/InvokeCountMatcher.h> +#include <mockpp/chaining/mockpp_pti.h> + #include <mockpp/stub/ReturnStub.h> #include <mockpp/stub/StubHolder.h> @@ -51,6 +53,12 @@ #include "MyBuilderNamespace.h" +typedef mockpp::Invocation5<CA, CB, CC, CD, CE> Getter5Invocation; +typedef mockpp::Invocation5<CA, CB, CC, CD, CE> Setter5Invocation; +typedef mockpp::Invocation0 Getter0Invocation; +typedef mockpp::Invocation0 Setter0Invocation; + + namespace { @@ -79,12 +87,6 @@ CPPUNIT_TEST_SUITE_REGISTRATION( InvocationMockerBuilder_test ); -typedef mockpp::Invocation5<CA, CB, CC, CD, CE> Getter5Invocation; -typedef mockpp::Invocation5<CA, CB, CC, CD, CE> Setter5Invocation; -typedef mockpp::Invocation0 Getter0Invocation; -typedef mockpp::Invocation0 Setter0Invocation; - - template <typename AMB> // ArgumentsMatchBuilder class InvocationMockerBuilderDummy : public mockpp::InvocationMockerBuilder<AMB> { @@ -102,7 +104,7 @@ #if defined( __BORLANDC__) || (defined(_MSC_VER) && (_MSC_VER < 1300)) mockpp::MatchBuilder<R, I> &with_cs( const CS &constraintset ) { - return mockpp::InvocationMockerBuilder<AMB>::with_cs(constraintset); + return internalWith_cs(constraintset); } #else using mockpp::InvocationMockerBuilder<AMB>::with_cs; Index: StringContains_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/StringContains_test.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- StringContains_test.cpp 30 Dec 2004 20:54:06 -0000 1.8 +++ StringContains_test.cpp 3 Apr 2005 18:32:54 -0000 1.9 @@ -64,8 +64,8 @@ { mockpp::StringContains<std::string> mystr ("the-string"); mockpp::String s = MOCKPP_PCHAR("mystr?"); - CPPUNIT_ASSERT(mystr.describeTo(s) == MOCKPP_PCHAR("mystr?a string containing \"the-string\"")); - CPPUNIT_ASSERT(s == MOCKPP_PCHAR("mystr?a string containing \"the-string\"")); + CPPUNIT_ASSERT(mystr.describeTo(s) == MOCKPP_GET_STRING("mystr?a string containing \"the-string")+MOCKPP_CHAR('\"')); + CPPUNIT_ASSERT(s == MOCKPP_GET_STRING("mystr?a string containing \"the-string")+MOCKPP_CHAR('\"')); } Index: AbstractDynamicChainingMock_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/AbstractDynamicChainingMock_test.cpp,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- AbstractDynamicChainingMock_test.cpp 2 Apr 2005 20:45:32 -0000 1.27 +++ AbstractDynamicChainingMock_test.cpp 3 Apr 2005 18:32:53 -0000 1.28 @@ -41,13 +41,44 @@ #include <mockpp/chaining/FIFOInvocationDispatcher.h> #include <mockpp/chaining/mockpp_pti.h> -#include <mockpp/stub/ReturnStub.h> +#include <mockpp/stub/ReturnStub.h> +#include <mockpp/stub/TypelessStub.h> #include <mockpp/chaining/ChainingMockObjectSupport.h> #include <cppunit/extensions/HelperMacros.h> - + +typedef mockpp::Invocation0 GetterInvocation; +typedef mockpp::Invocation0 VoidInvocation; +typedef mockpp::ConstraintSet1<int> CSet1; + + + +MOCKPP_INVOCATIONMOCKER_PTI_IMPL(VoidInvocation) + + +#define I VoidInvocation + + +namespace mockpp { +template<> +class TypelessStubAdapter<void, VoidInvocation > : public TypelessStubAdapterBase<void, VoidInvocation > +{ + + TypelessStubAdapter<void, I >(TypelessStub<void>::AP tm, bool in_delete) + : TypelessStubAdapterBase<void, I >(tm, in_delete) + {} + + void invoke( const I &invocation) + { + this->stubber->typelessInvoke(); + } + +}; +} + + namespace { @@ -80,7 +111,6 @@ CPPUNIT_TEST_SUITE_REGISTRATION( AbstractDynamicChainingMock_test ); - template <typename R, // Returntype typename I> // Invocation class ChainingMockDummy : public mockpp::AbstractDynamicChainingMock<R, I> @@ -201,22 +231,10 @@ }; -class InvocationDummy -{ - public: - - typedef void ( InvocationDummy::*SetterPMF ) (); - typedef int ( InvocationDummy::*GetterPMF ) (); -}; - -typedef mockpp::Invocation0 GetterInvocation; -typedef mockpp::Invocation0 VoidInvocation; -typedef mockpp::ConstraintSet1<int> CSet1; - - + void AbstractDynamicChainingMock_test::test_describer() { -#if !defined(__BORLANDC__) && ((__GNUC__ >= 3) || defined(_MSC_VER)) // @todo make compiling +#if !defined(__BORLANDC__) && ((__GNUC__ >= 3) /* || defined(_MSC_VER) */) // @todo make compiling mockpp::AbstractDynamicChainingMock<int, GetterInvocation>::Describer desc; CPPUNIT_ASSERT(desc.hasDescription() == false); @@ -245,7 +263,7 @@ void AbstractDynamicChainingMock_test::test_void_describe() -{ +{ mockpp::AbstractDynamicChainingMock<void, VoidInvocation> adc_default ( MOCKPP_PCHAR( "adc-name" ), 0 ); @@ -253,7 +271,7 @@ adc ( new mockpp::LIFOInvocationDispatcher<void, VoidInvocation>, MOCKPP_PCHAR( "adc-name" ), 0 ); CPPUNIT_ASSERT( adc.toString() == MOCKPP_PCHAR( "adc-name" ) ); - CPPUNIT_ASSERT( adc.getMockName() == MOCKPP_PCHAR( "adc-name" ) ); + CPPUNIT_ASSERT( adc.getMockName() == MOCKPP_PCHAR( "adc-name" ) ); } @@ -290,7 +308,7 @@ ChainingMockDummy<int, GetterInvocation> cmd ( new mockpp::LIFOInvocationDispatcher<int, GetterInvocation>, MOCKPP_PCHAR( "adc-name" ), 0 ); - GetterInvocation inv(MOCKPP_PCHAR("InvocationDummy::getProp")); + GetterInvocation inv(MOCKPP_PCHAR("GetterInvocation")); MatcherDummy<GetterInvocation> *md1 = new MatcherDummy<GetterInvocation>; md1->invocation_result = 10; @@ -361,11 +379,11 @@ void AbstractDynamicChainingMock_test::test_void_invocation() -{ +{ ChainingMockDummy<void, VoidInvocation> cmd ( new mockpp::LIFOInvocationDispatcher<void, VoidInvocation>, MOCKPP_PCHAR( "adc-name" ), 0 ); - VoidInvocation inv(MOCKPP_PCHAR("InvocationDummy::setProp")); + VoidInvocation inv(MOCKPP_PCHAR("VoidInvocation")); VoidMatcherDummy<VoidInvocation> *md1 = new VoidMatcherDummy<VoidInvocation>; md1->enable_except = false; @@ -411,7 +429,7 @@ } cmd.reset(); - cmd.void_invoke(inv); + cmd.void_invoke(inv); } Index: Verifiable_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/Verifiable_test.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- Verifiable_test.cpp 27 Feb 2005 11:48:16 -0000 1.20 +++ Verifiable_test.cpp 3 Apr 2005 18:32:54 -0000 1.21 @@ -154,18 +154,18 @@ void addVerifiable(mockpp::Verifiable *vf) { #ifdef _MSC_VER - return VerifiableList::addVerifiable(vf); + VerifiableList::addVerifiable(vf); #else - return mockpp::VerifiableList::addVerifiable(vf); + mockpp::VerifiableList::addVerifiable(vf); #endif } void removeVerifiable(mockpp::Verifiable *vf) { #ifdef _MSC_VER - return VerifiableList::removeVerifiable(vf); + VerifiableList::removeVerifiable(vf); #else - return mockpp::VerifiableList::removeVerifiable(vf); + mockpp::VerifiableList::removeVerifiable(vf); #endif } }; Index: StringEndsWith_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/StringEndsWith_test.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- StringEndsWith_test.cpp 5 Jan 2005 19:30:06 -0000 1.1 +++ StringEndsWith_test.cpp 3 Apr 2005 18:32:54 -0000 1.2 @@ -64,8 +64,8 @@ { mockpp::StringEndsWith<std::string> mystr ("the-string"); mockpp::String s = MOCKPP_PCHAR("mystr?"); - CPPUNIT_ASSERT(mystr.describeTo(s) == MOCKPP_PCHAR("mystr?a string ending with \"the-string\"")); - CPPUNIT_ASSERT(s == MOCKPP_PCHAR("mystr?a string ending with \"the-string\"")); + CPPUNIT_ASSERT(mystr.describeTo(s) == MOCKPP_GET_STRING("mystr?a string ending with \"the-string")+MOCKPP_CHAR('\"')); + CPPUNIT_ASSERT(s == MOCKPP_GET_STRING("mystr?a string ending with \"the-string")+MOCKPP_CHAR('\"')); } Index: InvocationMocker_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/InvocationMocker_test.cpp,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- InvocationMocker_test.cpp 2 Apr 2005 20:45:33 -0000 1.31 +++ InvocationMocker_test.cpp 3 Apr 2005 18:32:54 -0000 1.32 @@ -48,6 +48,13 @@ #include "classes_ABCDE.h" + +typedef mockpp::Invocation5<CA, CB, CC, CD, CE> SetterInvocation; +typedef mockpp::Invocation5<CA, CB, CC, CD, CE> GetterInvocation; + + +MOCKPP_PTI_DECLARE(SetterInvocation) + namespace { @@ -164,10 +171,6 @@ }; -typedef mockpp::Invocation5<CA, CB, CC, CD, CE> SetterInvocation; -typedef mockpp::Invocation5<CA, CB, CC, CD, CE> GetterInvocation; - - void InvocationMocker_test::test_instance() { mockpp::InvocationMocker<int, GetterInvocation> im; @@ -176,14 +179,6 @@ } -} // namespace - - -MOCKPP_PTI_DECLARE(SetterInvocation) - - -namespace { - void InvocationMocker_test::test_instance_void() { Index: MixedMockObject_5_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/MixedMockObject_5_test.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- MixedMockObject_5_test.cpp 24 Mar 2005 21:43:07 -0000 1.3 +++ MixedMockObject_5_test.cpp 3 Apr 2005 18:32:54 -0000 1.4 @@ -49,6 +49,7 @@ #include "classes_ABCDE.h" #include <cppunit/extensions/HelperMacros.h> + class MixedMockObject_5_test : public CppUnit::TestFixture { Index: ChainableMockObject_1_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_1_void_test.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- ChainableMockObject_1_void_test.cpp 25 Mar 2005 17:20:35 -0000 1.7 +++ ChainableMockObject_1_void_test.cpp 3 Apr 2005 18:32:53 -0000 1.8 @@ -61,13 +61,15 @@ void test_parameter_1(); }; + +MOCKPP_PTI_IMPLEMENT(mockpp::Invocation1<unsigned>) + + + CPPUNIT_TEST_SUITE_REGISTRATION(ChainableMockObject_1_void_test); -MOCKPP_PTI_DECLARE(mockpp::Invocation1<unsigned>) - - class MyChainableMockObject_1_void : public mockpp::ChainableMockObject { public: @@ -143,7 +145,4 @@ } -MOCKPP_PTI_IMPLEMENT(mockpp::Invocation1<unsigned>) - - #endif // HAVE_CPPUNIT Index: ChainableMockObject_3_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_3_void_test.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- ChainableMockObject_3_void_test.cpp 25 Mar 2005 17:20:35 -0000 1.7 +++ ChainableMockObject_3_void_test.cpp 3 Apr 2005 18:32:54 -0000 1.8 @@ -66,8 +66,9 @@ typedef mockpp::Invocation3<unsigned, unsigned, unsigned> mockpp_Invocation3_unsigned_unsigned_unsigned; -MOCKPP_PTI_DECLARE(mockpp_Invocation3_unsigned_unsigned_unsigned) - + +MOCKPP_PTI_IMPLEMENT(mockpp_Invocation3_unsigned_unsigned_unsigned) + class MyChainableMockObject_3_void : public mockpp::ChainableMockObject { @@ -148,7 +149,4 @@ } -MOCKPP_PTI_IMPLEMENT(mockpp_Invocation3_unsigned_unsigned_unsigned) - - #endif // HAVE_CPPUNIT Index: ChainingMockObjectSupport_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainingMockObjectSupport_test.cpp,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- ChainingMockObjectSupport_test.cpp 24 Mar 2005 21:43:07 -0000 1.27 +++ ChainingMockObjectSupport_test.cpp 3 Apr 2005 18:32:54 -0000 1.28 @@ -416,7 +416,7 @@ { mockpp::String fmt = MOCKPP_PCHAR("%1"); fmt << position; - mockpp::CustomStub<int, int>::describeTo(buffer); + internalDescribeTo(buffer); buffer += fmt; return buffer; } Index: StubBuilder_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/StubBuilder_test.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- StubBuilder_test.cpp 25 Mar 2005 17:20:35 -0000 1.12 +++ StubBuilder_test.cpp 3 Apr 2005 18:32:54 -0000 1.13 @@ -74,6 +74,8 @@ typedef mockpp::Invocation5<CA, CB, CC, CD, CE> GetterInvocation; typedef mockpp::Invocation5<CA, CB, CC, CD, CE> VoidInvocation; +MOCKPP_TYPELESSSTUBADAPTER_PTI_IMPL(VoidInvocation) + template <typename R, // Returntype typename I> // Invocation Index: CoreMock_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/CoreMock_test.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- CoreMock_test.cpp 25 Mar 2005 17:20:35 -0000 1.19 +++ CoreMock_test.cpp 3 Apr 2005 18:32:54 -0000 1.20 @@ -45,6 +45,15 @@ #include <cppunit/extensions/HelperMacros.h> + +typedef mockpp::Invocation0 GetterInvocation; +typedef mockpp::Invocation0 VoidInvocation; + + +MOCKPP_COREMOCK_PTI_IMPL(VoidInvocation) +MOCKPP_ABSTRACTDYNAMICCHAININGMOCK_PTI_IMPL(VoidInvocation) +MOCKPP_INVOCATIONMOCKER_PTI_DECL(VoidInvocation) + namespace { @@ -146,10 +155,6 @@ }; -typedef mockpp::Invocation0 GetterInvocation; -typedef mockpp::Invocation0 VoidInvocation; - - void CoreMock_test::test_invocation() { { Index: ChainableMockObject_2_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_2_void_test.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- ChainableMockObject_2_void_test.cpp 25 Mar 2005 17:20:35 -0000 1.7 +++ ChainableMockObject_2_void_test.cpp 3 Apr 2005 18:32:53 -0000 1.8 @@ -67,7 +67,8 @@ typedef mockpp::Invocation2<unsigned, unsigned> mockpp_Invocation2_unsigned_unsigned; -MOCKPP_PTI_DECLARE(mockpp_Invocation2_unsigned_unsigned) + +MOCKPP_PTI_IMPLEMENT(mockpp_Invocation2_unsigned_unsigned) class MyChainableMockObject_2_void : public mockpp::ChainableMockObject @@ -146,7 +147,6 @@ mcm.verify(); } -MOCKPP_PTI_IMPLEMENT(mockpp_Invocation2_unsigned_unsigned) #endif // HAVE_CPPUNIT |