[Mockpp-commits] mockpp/mockpp/tests VisitableMockMethod_2_test.cpp,1.3,1.4 VisitableMockMethod_test
Brought to you by:
ewald-arnold
Menu
▾
▴
[Mockpp-commits] mockpp/mockpp/tests VisitableMockMethod_2_test.cpp,1.3,1.4 VisitableMockMethod_test.cpp,1.11,1.12
|
From: Ewald A. <ewa...@us...> - 2005-11-13 11:52:37
|
Update of /cvsroot/mockpp/mockpp/mockpp/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27506/mockpp/tests Modified Files: VisitableMockMethod_2_test.cpp VisitableMockMethod_test.cpp Log Message: omit Controller class Index: VisitableMockMethod_2_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockMethod_2_test.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- VisitableMockMethod_2_test.cpp 15 Oct 2005 15:40:59 -0000 1.3 +++ VisitableMockMethod_2_test.cpp 13 Nov 2005 11:52:26 -0000 1.4 @@ -37,7 +37,7 @@ #else -#include <mockpp/VisitableMockMethod.h> +#include <mockpp/VisitableMockMethod2.h> #include <mockpp/VisitableMockObject.h> #include <mockpp/constraint/OutBound.h> @@ -47,9 +47,6 @@ namespace { // anon -#ifdef MOCKPP_XXX - - class VisitableMockMethod_2_test : public CppUnit::TestFixture { public: @@ -75,43 +72,100 @@ MyVisitableMockObject_2(const mockpp::String &name) : mockpp::VisitableMockObject(name, 0) - , visitable_mocker(MOCKPP_PCHAR("Visitable"), this) + , visitable_mocker(MOCKPP_PCHAR("visitablei2"), this) + , visitablev_mocker(MOCKPP_PCHAR("visitablev2"), this) {} - int visitable(unsigned i) + int visitable(unsigned i, unsigned j) { - return visitable_mocker.forward(i); + return visitable_mocker.forward(i, j); } - mockpp::VisitableMockMethod1<int, unsigned> visitable_mocker; + void visitablev(unsigned i, unsigned j) + { + visitablev_mocker.forward(i, j); + } + + mockpp::VisitableMockMethod2<int, unsigned, unsigned> visitable_mocker; + mockpp::VisitableMockMethod2<void, unsigned, unsigned> visitablev_mocker; }; void VisitableMockMethod_2_test::test_parameter_2() { - MyVisitableMockObject_2 mcm(MOCKPP_PCHAR("Visitable-object")); -/* - mockpp::VisitableMockMethod2<int, unsigned>::ChainerFor chain(mcm, mcm.Visitable_mocker); + MyVisitableMockObject_2 vmo(MOCKPP_PCHAR("Visitable-object")); + mockpp::VisitableMockMethod2<int, unsigned, unsigned> vmb (MOCKPP_PCHAR("methodbase"), &vmo); - MOCKPP_ASSERT_TRUE(mcm.Visitable(12) == 21); - MOCKPP_ASSERT_TRUE(mcm.Visitable(34) == 43); + vmb.setDefaultReturnValue(999); + vmb.addReturnValue(888, 2); + vmo.reset(); - try - { - mcm.Visitable(56); - MOCKPP_ASSERT_TRUE_MESSAGE(MOCKPP_PCHAR("should have thrown"), false); - } - catch(mockpp::AssertionFailedError &ex) - { - MOCKPP_ASSERT_TRUE(ex.getMessage().find(MOCKPP_PCHAR("unexpected invocation")) != mockpp::String::npos); - } -*/ - mcm.verify(); + ////////////////79////////////////////////////////////// + + vmb.setDefaultReturnValue(123); + vmb.addReturnValue(321, 2); + vmb.addThrowable(mockpp::make_throwable(123u)); + vmb.forward(1, 2); + vmb.forward(2, 3); + vmb.forward(3, 4); + vmb.forward(4, 5); + vmb.addResponseValue(222, 2, 2); + vmb.addResponseValue(333, 3, 3); + vmb.addResponseThrowable(mockpp::make_throwable(444u), 4, 4); + vmb.addResponseThrowable(mockpp::make_throwable(555u), 5, 5); + vmo.activate(); + + MOCKPP_ASSERT_EQUALS(321, vmb.forward(1, 2)); + MOCKPP_ASSERT_EQUALS(321, vmb.forward(2, 3)); + MOCKPP_ASSERT_EQUALS(123, vmb.forward(3, 4)); + MOCKPP_ASSERT_EQUALS(222, vmb.forward(2, 2)); + MOCKPP_ASSERT_EQUALS(333, vmb.forward(3, 3)); + + MOCKPP_ASSERT_THROWING(vmb.forward(9, 9), + MOCKPP_PCHAR("vmb.forward()-1"), + unsigned, + unsigned(123)); + + MOCKPP_ASSERT_THROWING(vmb.forward(4, 4), + MOCKPP_PCHAR("vmb.forward()-2"), + unsigned, + unsigned(444)); + + MOCKPP_ASSERT_THROWING(vmb.forward(5, 5), + MOCKPP_PCHAR("vmb.forward()-3"), + unsigned, + unsigned(555)); + + vmo.verify(); + vmb.verify(); + + ////////////////////////////////////////////////////// + + vmo.reset(); + vmb.unsetThrowablesInline(); + + vmb.setDefaultReturnValue(123); + vmb.addReturnValue(321, 2); + vmb.addThrowable(mockpp::make_throwable(123u)); + vmo.activate(); + + MOCKPP_ASSERT_THROWING(vmb.forward(9, 9), + MOCKPP_PCHAR("vmb.forward()-2"), + unsigned, + unsigned(123)); + + MOCKPP_ASSERT_EQUALS(321, vmb.forward(1, 2)); + MOCKPP_ASSERT_EQUALS(321, vmb.forward(2, 3)); + MOCKPP_ASSERT_EQUALS(123, vmb.forward(3, 4)); + + vmo.verify(); + vmb.verify(); + vmb.verify(); } -#endif } // anon ns #endif // HAVE_CPPUNIT + Index: VisitableMockMethod_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockMethod_test.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- VisitableMockMethod_test.cpp 8 Nov 2005 18:39:51 -0000 1.11 +++ VisitableMockMethod_test.cpp 13 Nov 2005 11:52:26 -0000 1.12 @@ -106,7 +106,7 @@ { return visitable_mocker.forward(); } - +i void visitablev() { visitablev_mocker.forward(); @@ -194,21 +194,21 @@ { mockpp::VisitableMockObject vmo (MOCKPP_PCHAR("mockobj"), 0); MyVisitableMockMethodBase vmb (MOCKPP_PCHAR("methodbase"), &vmo); + MOCKPP_ASSERT_TRUE(vmb.getMethodName() == MOCKPP_PCHAR("methodbase")); MOCKPP_ASSERT_TRUE(vmb.getMethodIdentifier() == "methodbase"); MOCKPP_ASSERT_TRUE(vmb.getVisitableMockObject() == &vmo); - mockpp::VisitableMockMethodBase::ControllerFor<mockpp::VisitableMockMethodBase> ctr(&vmb); - ctr.addThrowable(mockpp::make_throwable(123u)); - ctr.addThrowable(123u); - ctr.setDefaultThrowable(mockpp::make_throwable(321u)); + vmb.addThrowable(mockpp::make_throwable(123u)); + vmb.addThrowable(123u); + vmb.setDefaultThrowable(mockpp::make_throwable(321u)); vmo.activate(); vmo.reset(); - ctr.addThrowable(mockpp::make_throwable(123u)); - ctr.addThrowable(333u, 2); - ctr.setDefaultThrowable(mockpp::make_throwable(321u)); + vmb.addThrowable(mockpp::make_throwable(123u)); + vmb.addThrowable(333u, 2); + vmb.setDefaultThrowable(mockpp::make_throwable(321u)); vmo.activate(); MOCKPP_ASSERT_THROWING(vmb.throwAvailableException(), @@ -237,13 +237,13 @@ unsigned(321)); vmo.verify(); - ctr.verify(); + vmb.verify(); vmo.reset(); vmo.verify(); - ctr.verify(); + vmb.verify(); - ctr.setDefaultThrowable(mockpp::make_throwable(321u)); + vmb.setDefaultThrowable(mockpp::make_throwable(321u)); vmo.activate(); MOCKPP_ASSERT_THROWING_COND(vmo.verify(), MOCKPP_PCHAR("vmo.verify()"), @@ -269,18 +269,17 @@ void VisitableMockMethod_test::test_base_returning() { mockpp::VisitableMockObject vmo (MOCKPP_PCHAR("mockobj"), 0); - MyVisitableMockReturningMethodBase<int> vmb (MOCKPP_PCHAR("methodbase"), &vmo); - MyVisitableMockReturningMethodBase<int>::ControllerFor ctr(&vmb); + MyVisitableMockReturningMethodBase<int> vmb (MOCKPP_PCHAR("methodbase-2"), &vmo); - ctr.setDefaultReturnValue(123); - ctr.addReturnValue(321,2); - vmo.clear(); + vmb.setDefaultReturnValue(123); + vmb.addReturnValue(321,2); + vmo.reset(); ////////////////////////////////////////////////////// - ctr.setDefaultReturnValue(123); - ctr.addReturnValue(321, 2); - ctr.addThrowable(mockpp::make_throwable(123u)); + vmb.setDefaultReturnValue(123); + vmb.addReturnValue(321, 2); + vmb.addThrowable(mockpp::make_throwable(123u)); vmo.activate(); MOCKPP_ASSERT_EQUALS(321, vmb.determineReturnValue()); @@ -292,16 +291,16 @@ unsigned, unsigned(123)); vmo.verify(); - ctr.verify(); + vmb.verify(); ////////////////////////////////////////////////////// - vmo.clear(); - ctr.unsetThrowablesInline(); + vmo.reset(); + vmb.unsetThrowablesInline(); - ctr.setDefaultReturnValue(123); - ctr.addReturnValue(321, 2); - ctr.addThrowable(mockpp::make_throwable(123u)); + vmb.setDefaultReturnValue(123); + vmb.addReturnValue(321, 2); + vmb.addThrowable(mockpp::make_throwable(123u)); vmo.activate(); MOCKPP_ASSERT_THROWING(vmb.throwAvailableException(), @@ -314,12 +313,12 @@ MOCKPP_ASSERT_EQUALS(123, vmb.determineReturnValue()); vmo.verify(); - ctr.verify(); + vmb.verify(); ////////////////////////////////////////////////////// - vmo.clear(); - ctr.setDefaultReturnValue(123); + vmo.reset(); + vmb.setDefaultReturnValue(123); MOCKPP_ASSERT_THROWING_COND(vmo.verify(), MOCKPP_PCHAR("vmo.verify()"), mockpp::AssertionFailedError, |
