[Mockpp-commits] mockpp/mockpp/tests AssertMo_test.cpp,1.21,1.22 ChainableMockObject_5_test.cpp,1.6,
Brought to you by:
ewald-arnold
Menu
▾
▴
[Mockpp-commits] mockpp/mockpp/tests AssertMo_test.cpp,1.21,1.22 ChainableMockObject_5_test.cpp,1.6,1.7 ChainableMockObject_5_void_test.cpp,1.6,1.7 ChainableMockObject_test.cpp,1.18,1.19 ChainingMockObjectSupport_test.cpp,1.26,1.27 MixedMockObject_5_test.cpp,1.2,1.3 VerifyingTestCaller_test.cpp,1.4,1.5 VisitableMockObject_5_test.cpp,1.23,1.24 VisitableMockObject_5_void_test.cpp,1.19,1.20 VisitableMockObject_test.cpp,1.19,1.20
|
From: Ewald A. <ewa...@us...> - 2005-03-24 21:43:19
|
Update of /cvsroot/mockpp/mockpp/mockpp/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9209/mockpp/tests Modified Files: AssertMo_test.cpp ChainableMockObject_5_test.cpp ChainableMockObject_5_void_test.cpp ChainableMockObject_test.cpp ChainingMockObjectSupport_test.cpp MixedMockObject_5_test.cpp VerifyingTestCaller_test.cpp VisitableMockObject_5_test.cpp VisitableMockObject_5_void_test.cpp VisitableMockObject_test.cpp Log Message: fixed compiler warnings Index: ChainableMockObject_5_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_5_test.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- ChainableMockObject_5_test.cpp 30 Dec 2004 20:54:05 -0000 1.6 +++ ChainableMockObject_5_test.cpp 24 Mar 2005 21:43:07 -0000 1.7 @@ -73,6 +73,9 @@ { public: + virtual ~MyChainableMockObject_5_Interface() + {} + virtual int chainable5 (const CA&, const CB&, const CC&, const CD&, const CE&) = 0; virtual int chainable4 (const CA&, const CB&, const CC&, const CD&) = 0; virtual int chainable3 (const CA&, const CB&, const CC&) = 0; @@ -109,10 +112,12 @@ , MOCKPP_CONSTRUCT_MEMBERS_FOR_CHAINABLE2(const_chainable2) , MOCKPP_CONSTRUCT_MEMBERS_FOR_CHAINABLE1(const_chainable1) , MOCKPP_CONSTRUCT_MEMBERS_FOR_CHAINABLE0(const_chainable0) - , MOCKPP_CONSTRUCT_MEMBERS_FOR_CHAINABLE5(chainable_i) {} + virtual ~MyChainableMockObject_5() + {} + MOCKPP_CHAINABLE5(MyChainableMockObject_5, int, chainable5, CA, CB, CC, CD, CE); MOCKPP_CHAINABLE4(MyChainableMockObject_5, int, chainable4, CA, CB, CC, CD); MOCKPP_CHAINABLE3(MyChainableMockObject_5, int, chainable3, CA, CB, CC); @@ -126,7 +131,7 @@ MOCKPP_CONST_CHAINABLE2(MyChainableMockObject_5, int, const_chainable2, CA, CB); MOCKPP_CONST_CHAINABLE1(MyChainableMockObject_5, int, const_chainable1, CA); MOCKPP_CONST_CHAINABLE0(MyChainableMockObject_5, int, const_chainable0); - + MOCKPP_CHAINABLE5(MyChainableMockObject_5, int, chainable_i, unsigned, unsigned, unsigned, unsigned, unsigned); }; @@ -135,6 +140,9 @@ { public: + virtual ~MyChainableMockObject_5_ex_Interface() + {} + virtual int chainable5 (const CA&, const CB&, const CC&, const CD&, CE) = 0; virtual int chainable5 (const CA&, const CB&, const CC&, const CD&, CF) = 0; virtual int chainable4 (const CA&, const CB&, const CC&, const CD&) = 0; @@ -191,6 +199,9 @@ , MOCKPP_CONSTRUCT_MEMBERS_FOR_CHAINABLE_EXT0(const_chainable0_p, Ext) {} + virtual ~MyChainableMockObject_5ex() + {} + MOCKPP_CHAINABLE_EXT5(MyChainableMockObject_5ex, int, chainable5, const CA&, const CB&, const CC&, const CD&, CE, int, over1, CA, CB, CC, CD, CE); @@ -274,23 +285,23 @@ mockpp::eq( (unsigned int) 54), mockpp::eq( (unsigned int) 43), mockpp::eq( (unsigned int) 32), - mockpp::eq( (unsigned int) 21)) + mockpp::eq( (unsigned int) 21)) .will(new mockpp::ReturnStub<int>(54321)); - - CPPUNIT_ASSERT(mcm.chainable_i(12, 23, 34, 45, 56) == 12345); - CPPUNIT_ASSERT(mcm.chainable_i(65, 54, 43, 32, 21) == 54321); - + + CPPUNIT_ASSERT(mcm.chainable_i(12, 23, 34, 45, 56) == 12345); + CPPUNIT_ASSERT(mcm.chainable_i(65, 54, 43, 32, 21) == 54321); + try { - mcm.chainable_i(1, 2, 3, 4, 5) == 999; + mcm.chainable_i(1, 2, 3, 4, 5) == 999; CPPUNIT_ASSERT_MESSAGE("should have thrown", false); } catch(mockpp::AssertionFailedError &ex) { CPPUNIT_ASSERT(ex.getMessage().find(MOCKPP_PCHAR("unexpected invocation")) != mockpp::String::npos); } - - mcm.verify(); + + mcm.verify(); } Index: VerifyingTestCaller_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VerifyingTestCaller_test.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- VerifyingTestCaller_test.cpp 22 Mar 2005 22:03:26 -0000 1.4 +++ VerifyingTestCaller_test.cpp 24 Mar 2005 21:43:07 -0000 1.5 @@ -37,7 +37,7 @@ #include <stdexcept> -#if (_MSC_VER < 1400) // at least MSCV6 incomplete +#if defined(_MSC_VER) && (_MSC_VER < 1300) // at least MSCV6 incomplete # include <mockpp/util/AutoPointer.h> #else # include <memory> Index: VisitableMockObject_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_test.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- VisitableMockObject_test.cpp 27 Feb 2005 11:48:16 -0000 1.19 +++ VisitableMockObject_test.cpp 24 Mar 2005 21:43:08 -0000 1.20 @@ -65,6 +65,7 @@ CPPUNIT_TEST_EXCEPTION(fail_return, mockpp::AssertionFailedError); CPPUNIT_TEST_EXCEPTION(fail_unused_throwable, mockpp::AssertionFailedError); CPPUNIT_TEST_EXCEPTION(fail_unused_value, mockpp::AssertionFailedError); + CPPUNIT_TEST(test_stub_return_const_ref); CPPUNIT_TEST_SUITE_END(); @@ -87,6 +88,7 @@ void fail_set_throw_after_active(); void fail_add_return_after_active(); void fail_set_return_after_active(); + void test_stub_return_const_ref(); }; @@ -98,11 +100,22 @@ public: MyVisitableMockObject(const mockpp::String &name) - : mockpp::VisitableMockObject(name, 0), - MOCKPP_CONSTRUCT_MEMBERS_FOR_VISITABLE0(visitable) + : mockpp::VisitableMockObject(name, 0) + , MOCKPP_CONSTRUCT_MEMBERS_FOR_VISITABLE0(visitable) + , MOCKPP_CONSTRUCT_MEMBERS_FOR_VISITABLE0(visitable_e_Shadow) {} MOCKPP_VISITABLE0(MyVisitableMockObject, int, visitable); + MOCKPP_VISITABLE0(MyVisitableMockObject, int, visitable_e_Shadow); + + int visitable_e_shadow; + + virtual const int& visitable_e() + { + visitable_e_shadow = visitable_e_Shadow(); + return visitable_e_shadow; + } + bool isClear() { @@ -416,5 +429,21 @@ } +void VisitableMockObject_test::test_stub_return_const_ref() +{ + MyVisitableMockObject mvo(MOCKPP_PCHAR("mvo")); + MOCKPP_CONTROLLER_FOR(MyVisitableMockObject, visitable_e_Shadow) ctr (&mvo); + + ctr.addReturnValue(321); + ctr.addReturnValue(123); + mvo.activate(); + + CPPUNIT_ASSERT_EQUAL(321, mvo.visitable_e_Shadow()); + CPPUNIT_ASSERT_EQUAL(123, mvo.visitable_e()); + + mvo.verify(); +} + + #endif // HAVE_CPPUNIT Index: AssertMo_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/AssertMo_test.cpp,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- AssertMo_test.cpp 27 Feb 2005 11:48:16 -0000 1.21 +++ AssertMo_test.cpp 24 Mar 2005 21:43:07 -0000 1.22 @@ -330,7 +330,7 @@ } -void do_a_throw(unsigned val) +static void do_a_throw(unsigned val) { throw (unsigned) val; } Index: ChainableMockObject_5_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_5_void_test.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- ChainableMockObject_5_void_test.cpp 30 Dec 2004 20:54:05 -0000 1.6 +++ ChainableMockObject_5_void_test.cpp 24 Mar 2005 21:43:07 -0000 1.7 @@ -74,6 +74,9 @@ { public: + virtual ~MyChainableMockObject_5_void_Interface() + {} + virtual void chainable5 (const CA&, const CB&, const CC&, const CD&, const CE&) = 0; virtual void chainable4 (const CA&, const CB&, const CC&, const CD&) = 0; virtual void chainable3 (const CA&, const CB&, const CC&) = 0; @@ -110,10 +113,13 @@ , MOCKPP_CONSTRUCT_MEMBERS_FOR_VOID_CHAINABLE2(const_chainable2) , MOCKPP_CONSTRUCT_MEMBERS_FOR_VOID_CHAINABLE1(const_chainable1) , MOCKPP_CONSTRUCT_MEMBERS_FOR_VOID_CHAINABLE0(const_chainable0) - + , MOCKPP_CONSTRUCT_MEMBERS_FOR_CHAINABLE5(chainable_i) {} + virtual ~MyChainableMockObject_5_void() + {} + MOCKPP_VOID_CHAINABLE5(MyChainableMockObject_5_void, chainable5, CA, CB, CC, CD, CE); MOCKPP_VOID_CHAINABLE4(MyChainableMockObject_5_void, chainable4, CA, CB, CC, CD); MOCKPP_VOID_CHAINABLE3(MyChainableMockObject_5_void, chainable3, CA, CB, CC); @@ -137,6 +143,9 @@ { public: + virtual ~MyChainableMockObject_5_void_ex_Interface() + {} + virtual void chainable5 (const CA&, const CB&, const CC&, const CD&, CE) = 0; virtual void chainable5 (const CA&, const CB&, const CC&, const CD&, CF) = 0; virtual void chainable4 (const CA&, const CB&, const CC&, const CD&) = 0; @@ -277,40 +286,40 @@ mockpp::eq( (unsigned int) 54), mockpp::eq( (unsigned int) 43), mockpp::eq( (unsigned int) 32), - mockpp::eq( (unsigned int) 21)) + mockpp::eq( (unsigned int) 21)) .will(mockpp::throwException<void, int>(54321)); - + try { - mcm.chainable_i(12, 23, 34, 45, 56); + mcm.chainable_i(12, 23, 34, 45, 56); CPPUNIT_ASSERT_MESSAGE("should have thrown", false); } catch(int i) { CPPUNIT_ASSERT(i == 12345); } - + try { - mcm.chainable_i(65, 54, 43, 32, 21); + mcm.chainable_i(65, 54, 43, 32, 21); CPPUNIT_ASSERT_MESSAGE("should have thrown", false); } catch(int i) { CPPUNIT_ASSERT(i == 54321); } - + try { - mcm.chainable_i(1, 2, 3, 4, 5); + mcm.chainable_i(1, 2, 3, 4, 5); CPPUNIT_ASSERT_MESSAGE("should have thrown", false); } catch(mockpp::AssertionFailedError &ex) { CPPUNIT_ASSERT(ex.getMessage().find(MOCKPP_PCHAR("unexpected invocation")) != mockpp::String::npos); } - - mcm.verify(); + + mcm.verify(); } Index: ChainingMockObjectSupport_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainingMockObjectSupport_test.cpp,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- ChainingMockObjectSupport_test.cpp 22 Mar 2005 22:03:26 -0000 1.26 +++ ChainingMockObjectSupport_test.cpp 24 Mar 2005 21:43:07 -0000 1.27 @@ -157,7 +157,9 @@ D d; mockpp::Constraint<A*>::AP instance0 = mockpp::isA<A, B>( b ); + MOCKPP_UNUSED(instance0); mockpp::Constraint<A*>::AP instance1 = mockpp::isA<A>( b ); + MOCKPP_UNUSED(instance1); mockpp::Constraint<A*>::AP instance = mockpp::isA<A>( B() ); CPPUNIT_ASSERT( instance->eval((B*) &a ) == false ); @@ -321,6 +323,7 @@ mockpp::Constraint<bool>::AP v_false = new mockpp::IsEqual<bool>( false ); mockpp::Constraint<bool>::AP and1 = mockpp::logic_and<bool>( v_true, v_false ); + MOCKPP_UNUSED(and1); mockpp::Constraint<bool>::AP and2 = mockpp::logic_and<bool>( new mockpp::IsEqual<bool>( false ), @@ -345,6 +348,7 @@ mockpp::Constraint<int>::AP or0 = mockpp::logic_or<int>( new mockpp::IsEqual<int>( 1 ), new mockpp::IsEqual<int>( 5 ) ); + MOCKPP_UNUSED(or0); mockpp::Constraint<int>::AP or1 = mockpp::logic_or<int>( v_1, v_5 ); or1 = mockpp::logic_or<int>( new mockpp::IsEqual<int>( 1 ), Index: VisitableMockObject_5_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_5_test.cpp,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- VisitableMockObject_5_test.cpp 12 Mar 2005 17:50:55 -0000 1.23 +++ VisitableMockObject_5_test.cpp 24 Mar 2005 21:43:07 -0000 1.24 @@ -118,6 +118,9 @@ { public: + virtual ~MyVisitableMockObject_5_Interface() + {} + virtual int visitable5 (const unsigned&, const unsigned&, const unsigned&, const unsigned&, const unsigned&) = 0; virtual int visitable4 (const unsigned&, const unsigned&, const unsigned&, const unsigned&) = 0; virtual int visitable3 (const unsigned&, const unsigned&, const unsigned&) = 0; @@ -242,6 +245,9 @@ { public: + virtual ~MyVisitableMockObject_5_ex_Interface() + {} + virtual const std::string visitable5 (const std::string &, const std::string &, const std::string &, const std::string &, long) = 0; virtual const std::string visitable5 (const std::string &, const std::string &, const std::string &, const std::string &, const std::string &) = 0; virtual const std::string visitable4 (const std::string &, const std::string &, const std::string &, const std::string &) = 0; Index: VisitableMockObject_5_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_5_void_test.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- VisitableMockObject_5_void_test.cpp 4 Mar 2005 17:40:32 -0000 1.19 +++ VisitableMockObject_5_void_test.cpp 24 Mar 2005 21:43:07 -0000 1.20 @@ -101,6 +101,9 @@ { public: + virtual ~MyVisitableMockObject_5_void_Interface() + {} + virtual void visitable5 (const unsigned&, const unsigned&, const unsigned&, const unsigned&, const unsigned&) = 0; virtual void visitable4 (const unsigned&, const unsigned&, const unsigned&, const unsigned&) = 0; virtual void visitable3 (const unsigned&, const unsigned&, const unsigned&) = 0; @@ -212,6 +215,9 @@ { public: + virtual ~MyVisitableMockObject_5_void_ex_Interface() + {} + virtual void visitable5 (const std::string &, const std::string &, const std::string &, const std::string &, long) = 0; virtual void visitable5 (const std::string &, const std::string &, const std::string &, const std::string &, const std::string &) = 0; virtual void visitable4 (const std::string &, const std::string &, const std::string &, const std::string &) = 0; Index: ChainableMockObject_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_test.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- ChainableMockObject_test.cpp 30 Dec 2004 20:54:05 -0000 1.18 +++ ChainableMockObject_test.cpp 24 Mar 2005 21:43:07 -0000 1.19 @@ -65,6 +65,7 @@ CPPUNIT_TEST(test_expect_return); CPPUNIT_TEST(test_expect_throw); CPPUNIT_TEST(test_stub_return); + CPPUNIT_TEST(test_stub_return_const_ref); CPPUNIT_TEST_SUITE_END(); @@ -81,6 +82,7 @@ void test_expect_return(); void test_expect_throw(); void test_stub_return(); + void test_stub_return_const_ref(); }; @@ -97,12 +99,22 @@ , MOCKPP_CONSTRUCT_MEMBERS_FOR_CHAINABLE0(chainable_b) , MOCKPP_CONSTRUCT_MEMBERS_FOR_CHAINABLE0(chainable_c) , MOCKPP_CONSTRUCT_MEMBERS_FOR_CHAINABLE0(chainable_d) + , MOCKPP_CONSTRUCT_MEMBERS_FOR_CHAINABLE0(chainable_e_Shadow) {} - MOCKPP_CHAINABLE0(MyChainableMockObject, int, chainable_a); + MOCKPP_CHAINABLE0(MyChainableMockObject, int, chainable_a); MOCKPP_CHAINABLE0(MyChainableMockObject, int, chainable_b); MOCKPP_CHAINABLE0(MyChainableMockObject, int, chainable_c); MOCKPP_CHAINABLE0(MyChainableMockObject, int, chainable_d); + MOCKPP_CHAINABLE0(MyChainableMockObject, int, chainable_e_Shadow); + + int chainable_e_shadow; + + virtual const int& chainable_e() + { + chainable_e_shadow = chainable_e_Shadow(); + return chainable_e_shadow; + } }; @@ -225,7 +237,7 @@ cm.clear(); CPPUNIT_ASSERT(0 == cm.lookupID(MOCKPP_PCHAR("second-name"))); - + cm.verify(); } @@ -242,27 +254,27 @@ chain_a.expects(mockpp::once()) .will(new mockpp::ReturnStub<int>(123)) .id(MOCKPP_PCHAR("chainable-a")); - + chain_b.expects(mockpp::once()) .after(MOCKPP_PCHAR("chainable-a")) .will(new mockpp::ReturnStub<int>(456)) .id(MOCKPP_PCHAR("chainable-b")); - + chain_c.expects(mockpp::once()) .after(MOCKPP_PCHAR("chainable-a")) .will(new mockpp::ReturnStub<int>(789)) .id(MOCKPP_PCHAR("chainable-c")); - + chain_d.expects(mockpp::once()) .after(MOCKPP_PCHAR("chainable-a")) .will(new mockpp::ReturnStub<int>(111)) .id(MOCKPP_PCHAR("chainable-d")); - + CPPUNIT_ASSERT(mcm.chainable_a() == 123); CPPUNIT_ASSERT(mcm.chainable_b() == 456); CPPUNIT_ASSERT(mcm.chainable_c() == 789); CPPUNIT_ASSERT(mcm.chainable_d() == 111); - + mcm.verify(); } @@ -280,26 +292,26 @@ .after(MOCKPP_PCHAR("chainable-d")) .will(new mockpp::ReturnStub<int>(123)) .id(MOCKPP_PCHAR("chainable-a")); - + chain_b.expects(mockpp::once()) .after(MOCKPP_PCHAR("chainable-d")) .will(new mockpp::ReturnStub<int>(456)) .id(MOCKPP_PCHAR("chainable-b")); - + chain_c.expects(mockpp::once()) .after(MOCKPP_PCHAR("chainable-d")) .will(new mockpp::ReturnStub<int>(789)) .id(MOCKPP_PCHAR("chainable-c")); - + chain_d.expects(mockpp::once()) .will(new mockpp::ReturnStub<int>(111)) .id(MOCKPP_PCHAR("chainable-d")); - + CPPUNIT_ASSERT(mcm.chainable_d() == 111); CPPUNIT_ASSERT(mcm.chainable_c() == 789); CPPUNIT_ASSERT(mcm.chainable_b() == 456); CPPUNIT_ASSERT(mcm.chainable_a() == 123); - + mcm.verify(); } @@ -315,22 +327,22 @@ .after(MOCKPP_PCHAR("chainable-b")) .will(new mockpp::ReturnStub<int>(123)) .id(MOCKPP_PCHAR("chainable-a")); - + chain_b.expects(mockpp::once()) .will(new mockpp::ReturnStub<int>(456)) .id(MOCKPP_PCHAR("chainable-b")); - + try - { + { mcm.chainable_a(); CPPUNIT_ASSERT_MESSAGE("should have thrown", false); } catch(mockpp::AssertionFailedError &ex) { mockpp::String s = ex.getMessage(); - CPPUNIT_ASSERT(s.find(MOCKPP_PCHAR("after")) != mockpp::String::npos); + CPPUNIT_ASSERT(s.find(MOCKPP_PCHAR("after")) != mockpp::String::npos); CPPUNIT_ASSERT(s.find(MOCKPP_PCHAR("(not invoked)")) != mockpp::String::npos); - CPPUNIT_ASSERT(s.find(MOCKPP_PCHAR("chainable-b")) != mockpp::String::npos); + CPPUNIT_ASSERT(s.find(MOCKPP_PCHAR("chainable-b")) != mockpp::String::npos); } } @@ -348,26 +360,26 @@ .before(MOCKPP_PCHAR("chainable-a")) .will(new mockpp::ReturnStub<int>(111)) .id(MOCKPP_PCHAR("chainable-d")); - + chain_c.expects(mockpp::once()) .before(MOCKPP_PCHAR("chainable-a")) .will(new mockpp::ReturnStub<int>(789)) .id(MOCKPP_PCHAR("chainable-c")); - + chain_b.expects(mockpp::once()) .before(MOCKPP_PCHAR("chainable-a")) .will(new mockpp::ReturnStub<int>(123)) .id(MOCKPP_PCHAR("chainable-b")); - + chain_a.expects(mockpp::once()) .will(new mockpp::ReturnStub<int>(456)) .id(MOCKPP_PCHAR("chainable-a")); - + CPPUNIT_ASSERT(mcm.chainable_d() == 111); CPPUNIT_ASSERT(mcm.chainable_c() == 789); CPPUNIT_ASSERT(mcm.chainable_b() == 123); CPPUNIT_ASSERT(mcm.chainable_a() == 456); - + mcm.verify(); } @@ -384,27 +396,27 @@ chain_a.expects(mockpp::once()) .will(new mockpp::ReturnStub<int>(123)) .id(MOCKPP_PCHAR("chainable-a")); - + chain_b.expects(mockpp::once()) .before(MOCKPP_PCHAR("chainable-a")) .will(new mockpp::ReturnStub<int>(456)) .id(MOCKPP_PCHAR("chainable-b")); - + chain_c.expects(mockpp::once()) .before(MOCKPP_PCHAR("chainable-a")) .will(new mockpp::ReturnStub<int>(789)) .id(MOCKPP_PCHAR("chainable-c")); - + chain_d.expects(mockpp::once()) .before(MOCKPP_PCHAR("chainable-a")) .will(new mockpp::ReturnStub<int>(111)) .id(MOCKPP_PCHAR("chainable-d")); - + CPPUNIT_ASSERT(mcm.chainable_d() == 111); CPPUNIT_ASSERT(mcm.chainable_c() == 789); CPPUNIT_ASSERT(mcm.chainable_b() == 456); CPPUNIT_ASSERT(mcm.chainable_a() == 123); - + mcm.verify(); } @@ -420,14 +432,14 @@ .before(MOCKPP_PCHAR("chainable-b")) .will(new mockpp::ReturnStub<int>(123)) .id(MOCKPP_PCHAR("chainable-a")); - + chain_b.expects(mockpp::once()) .will(new mockpp::ReturnStub<int>(456)) .id(MOCKPP_PCHAR("chainable-b")); - + CPPUNIT_ASSERT(mcm.chainable_b() == 456); try - { + { mcm.chainable_a() == 123; CPPUNIT_ASSERT_MESSAGE("should have thrown", false); } @@ -435,11 +447,25 @@ { mockpp::String s = ex.getMessage(); CPPUNIT_ASSERT(s.find(MOCKPP_PCHAR("(invoked)")) != mockpp::String::npos); - CPPUNIT_ASSERT(s.find(MOCKPP_PCHAR("before")) != mockpp::String::npos); - CPPUNIT_ASSERT(s.find(MOCKPP_PCHAR("chainable-b")) != mockpp::String::npos); + CPPUNIT_ASSERT(s.find(MOCKPP_PCHAR("before")) != mockpp::String::npos); + CPPUNIT_ASSERT(s.find(MOCKPP_PCHAR("chainable-b")) != mockpp::String::npos); } } +void ChainableMockObject_test::test_stub_return_const_ref() +{ + MyChainableMockObject mcm(MOCKPP_PCHAR("chainable-object")); + + MOCKPP_CHAINER_FOR(MyChainableMockObject, chainable_e_Shadow) chain(&mcm); + + chain.setDefaultStub(new mockpp::ReturnStub<int>(321)); + + CPPUNIT_ASSERT(mcm.chainable_e() == 321); + + mcm.verify(); +} + + #endif // HAVE_CPPUNIT Index: MixedMockObject_5_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/MixedMockObject_5_test.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- MixedMockObject_5_test.cpp 12 Mar 2005 18:34:27 -0000 1.2 +++ MixedMockObject_5_test.cpp 24 Mar 2005 21:43:07 -0000 1.3 @@ -76,6 +76,9 @@ { public: + virtual ~MyMixedMockObject_5_Interface() + {} + virtual int chain_mixed5 (const CA&, const CB&, const CC&, const CD&, const CE&) = 0; virtual int chain_mixed4 (const CA&, const CB&, const CC&, const CD&) = 0; virtual int chain_mixed3 (const CA&, const CB&, const CC&) = 0; |
