[Mockpp-commits] mockpp/mockpp/tests VisitableMockMethod_2_test.cpp,1.5,1.6
Brought to you by:
ewald-arnold
Menu
▾
▴
[Mockpp-commits] mockpp/mockpp/tests VisitableMockMethod_2_test.cpp,1.5,1.6
|
From: Ewald A. <ewa...@us...> - 2005-11-14 17:25:27
|
Update of /cvsroot/mockpp/mockpp/mockpp/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11563/mockpp/tests Modified Files: VisitableMockMethod_2_test.cpp Log Message: more tests and fixes Index: VisitableMockMethod_2_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockMethod_2_test.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- VisitableMockMethod_2_test.cpp 13 Nov 2005 14:07:12 -0000 1.5 +++ VisitableMockMethod_2_test.cpp 14 Nov 2005 17:25:14 -0000 1.6 @@ -40,6 +40,8 @@ #include <mockpp/VisitableMockMethod2.h> #include <mockpp/VisitableMockObject.h> +#include <mockpp/chaining/ChainingMockObjectSupport.h> + #include <mockpp/constraint/OutBound.h> #include <cppunit/extensions/HelperMacros.h> @@ -54,12 +56,14 @@ CPPUNIT_TEST_SUITE( VisitableMockMethod_2_test ); CPPUNIT_TEST( test_parameter_2 ); + CPPUNIT_TEST( test_parameter_2v ); CPPUNIT_TEST_SUITE_END(); public: void test_parameter_2(); + void test_parameter_2v(); }; @@ -76,11 +80,23 @@ , visitablev_mocker(MOCKPP_PCHAR("visitablev2"), this) {} + void visitable(const mockpp::ConstraintHolder<unsigned> &p1, + const mockpp::ConstraintHolder<unsigned> &p2) + { + visitable_mocker.forward(p1, p2); + } + int visitable(unsigned i, unsigned j) { return visitable_mocker.forward(i, j); } + void visitablev(const mockpp::ConstraintHolder<unsigned> &p1, + const mockpp::ConstraintHolder<unsigned> &p2) + { + visitablev_mocker.forward(p1, p2); + } + void visitablev(unsigned i, unsigned j) { visitablev_mocker.forward(i, j); @@ -94,8 +110,10 @@ void VisitableMockMethod_2_test::test_parameter_2() { MyVisitableMockObject_2 vmo(MOCKPP_PCHAR("Visitable-object")); - mockpp::VisitableMockMethod2<int, unsigned, unsigned> vmb (MOCKPP_PCHAR("methodbase"), &vmo); + mockpp::VisitableMockMethod2<int, unsigned, unsigned> &vmb (vmo.visitable_mocker); + vmb.addThrowable(mockpp::make_throwable(333u)); + vmb.setDefaultThrowable(mockpp::make_throwable(444u)); vmb.setDefaultReturnValue(999); vmb.addReturnValue(888, 2); vmo.reset(); @@ -108,15 +126,17 @@ vmb.addReturnValue(432, 1); vmb.addThrowable(mockpp::make_throwable(321u)); - vmb.forward(1, 2); - vmb.forward(2, 3); - vmb.forward(3, 4); - vmb.forward(4, 5); - vmb.forward(5, 6); - vmb.forward(2, 2); - vmb.forward(3, 3); - vmb.forward(4, 4); - vmb.forward(5, 5); + vmo.visitable(1, 2); + vmo.visitable(2, 3); + vmo.visitable(3, 4); + vmo.visitable(4, 5); + vmo.visitable(5, 6); + vmo.visitable(2, 2); + vmo.visitable(mockpp::eq<unsigned>(2, 2), + mockpp::eq<unsigned>(20, 2)); + vmo.visitable(3, 3); + vmo.visitable(4, 4); + vmo.visitable(5, 5); vmb.addResponseValue(222, 2, 2); vmb.addResponseValue(333, 3, 3); vmb.addResponseThrowable(mockpp::make_throwable(444u), 4, 4); @@ -124,32 +144,33 @@ vmo.activate(); - MOCKPP_ASSERT_EQUALS(321, vmb.forward(1, 2)); + MOCKPP_ASSERT_EQUALS(321, vmo.visitable(1, 2)); - MOCKPP_ASSERT_THROWING(vmb.forward(2, 3), - MOCKPP_PCHAR("vmb.forward()-1a"), + MOCKPP_ASSERT_THROWING(vmo.visitable(2, 3), + MOCKPP_PCHAR("vmo.visitable()-1a"), unsigned, unsigned(123)); - MOCKPP_ASSERT_EQUALS(432, vmb.forward(3, 4)); + MOCKPP_ASSERT_EQUALS(432, vmo.visitable(3, 4)); - MOCKPP_ASSERT_THROWING(vmb.forward(4, 5), - MOCKPP_PCHAR("vmb.forward()-1b"), + MOCKPP_ASSERT_THROWING(vmo.visitable(4, 5), + MOCKPP_PCHAR("vmo.visitable()-1b"), unsigned, unsigned(321)); - MOCKPP_ASSERT_EQUALS(123, vmb.forward(5, 6)); + MOCKPP_ASSERT_EQUALS(123, vmo.visitable(5, 6)); - MOCKPP_ASSERT_EQUALS(222, vmb.forward(2, 2)); - MOCKPP_ASSERT_EQUALS(333, vmb.forward(3, 3)); + MOCKPP_ASSERT_EQUALS(222, vmo.visitable(2, 2)); + MOCKPP_ASSERT_EQUALS(123, vmo.visitable(3, 21)); + MOCKPP_ASSERT_EQUALS(333, vmo.visitable(3, 3)); - MOCKPP_ASSERT_THROWING(vmb.forward(4, 4), - MOCKPP_PCHAR("vmb.forward()-2"), + MOCKPP_ASSERT_THROWING(vmo.visitable(4, 4), + MOCKPP_PCHAR("vmo.visitable()-2"), unsigned, unsigned(444)); - MOCKPP_ASSERT_THROWING(vmb.forward(5, 5), - MOCKPP_PCHAR("vmb.forward()-3"), + MOCKPP_ASSERT_THROWING(vmo.visitable(5, 5), + MOCKPP_PCHAR("vmo.visitable()-3"), unsigned, unsigned(555)); @@ -168,26 +189,26 @@ vmb.addReturnValue(432, 1); vmb.addThrowable(mockpp::make_throwable(321u)); - vmb.forward(9, 9); - vmb.forward(8, 8); - vmb.forward(1, 2); - vmb.forward(2, 3); - vmb.forward(3, 4); + vmo.visitable(9, 9); + vmo.visitable(8, 8); + vmo.visitable(1, 2); + vmo.visitable(2, 3); + vmo.visitable(3, 4); vmo.activate(); - MOCKPP_ASSERT_THROWING(vmb.forward(9, 9), - MOCKPP_PCHAR("vmb.forward()-2a"), + MOCKPP_ASSERT_THROWING(vmo.visitable(9, 9), + MOCKPP_PCHAR("vmo.visitable()-2a"), unsigned, unsigned(123)); - MOCKPP_ASSERT_THROWING(vmb.forward(9, 9), - MOCKPP_PCHAR("vmb.forward()-2b"), + MOCKPP_ASSERT_THROWING(vmo.visitable(9, 9), + MOCKPP_PCHAR("vmo.visitable()-2b"), unsigned, unsigned(321)); - MOCKPP_ASSERT_EQUALS(321, vmb.forward(1, 2)); - MOCKPP_ASSERT_EQUALS(432, vmb.forward(2, 3)); - MOCKPP_ASSERT_EQUALS(123, vmb.forward(3, 4)); + MOCKPP_ASSERT_EQUALS(321, vmo.visitable(1, 2)); + MOCKPP_ASSERT_EQUALS(432, vmo.visitable(2, 3)); + MOCKPP_ASSERT_EQUALS(123, vmo.visitable(3, 4)); vmo.verify(); vmb.verify(); @@ -198,23 +219,147 @@ vmb.setDefaultThrowable(mockpp::make_throwable(111u)); vmb.addThrowable(mockpp::make_throwable(123u)); - vmb.forward(1, 2); - vmb.forward(2, 3); - vmb.forward(3, 4); + vmo.visitable(1, 2); + vmo.visitable(2, 3); + vmo.visitable(3, 4); vmo.activate(); - MOCKPP_ASSERT_THROWING(vmb.forward(1, 2), - MOCKPP_PCHAR("vmb.forward()-3a"), + MOCKPP_ASSERT_THROWING(vmo.visitable(1, 2), + MOCKPP_PCHAR("vmo.visitable()-3a"), unsigned, unsigned(123)); - MOCKPP_ASSERT_THROWING(vmb.forward(2, 3), - MOCKPP_PCHAR("vmb.forward()-3b"), + MOCKPP_ASSERT_THROWING(vmo.visitable(2, 3), + MOCKPP_PCHAR("vmo.visitable()-3b"), unsigned, unsigned(111)); - MOCKPP_ASSERT_THROWING(vmb.forward(3, 4), - MOCKPP_PCHAR("vmb.forward()-3c"), + MOCKPP_ASSERT_THROWING(vmo.visitable(3, 4), + MOCKPP_PCHAR("vmo.visitable()-3c"), + unsigned, + unsigned(111)); + + vmo.verify(); + vmb.verify(); +} + + +void VisitableMockMethod_2_test::test_parameter_2v() +{ + MyVisitableMockObject_2 vmo(MOCKPP_PCHAR("Visitable-object")); + mockpp::VisitableMockMethod2<void, unsigned, unsigned> &vmb (vmo.visitablev_mocker); + mockpp::VisitableMockMethod2<int, unsigned, unsigned> &vmbi (vmo.visitable_mocker); + + vmb.setDefaultThrowable(mockpp::make_throwable(444u)); + vmb.addThrowable(mockpp::make_throwable(333u)); + vmo.reset(); + + vmbi.setDefaultReturnValue(999); + + ////////////////////////////////////////////////////// + + vmb.addThrowable(mockpp::make_throwable(123u)); + vmb.addThrowable(mockpp::make_throwable(321u)); + + vmo.visitablev(1, 2); + vmo.visitablev(2, 3); + vmo.visitablev(2, 2); + vmo.visitablev(mockpp::eq<unsigned>(2, 1), + mockpp::eq<unsigned>(20, 3)); + vmo.visitable(20, 30); + vmo.visitable(200, 300); + vmo.visitablev(3, 3); + vmo.visitablev(4, 4); + vmo.visitablev(5, 5); + vmb.addResponseThrowable(mockpp::make_throwable(444u), 4, 4); + vmb.addResponseThrowable(mockpp::make_throwable(555u), 5, 5); + + vmo.activate(); + + MOCKPP_ASSERT_THROWING(vmo.visitablev(2, 3), + MOCKPP_PCHAR("vmo.visitablev()-1a"), + unsigned, + unsigned(123)); + + MOCKPP_ASSERT_THROWING(vmo.visitablev(4, 5), + MOCKPP_PCHAR("vmo.visitablev()-1b"), + unsigned, + unsigned(321)); + + vmo.visitablev(2, 2); + vmo.visitablev(2, 20); + MOCKPP_ASSERT_EQUALS(999, vmo.visitable(20, 30)); + MOCKPP_ASSERT_EQUALS(999, vmo.visitable(200, 300)); + vmo.visitablev(3, 3); + + MOCKPP_ASSERT_THROWING(vmo.visitablev(4, 4), + MOCKPP_PCHAR("vmo.visitablev()-2"), + unsigned, + unsigned(444)); + + MOCKPP_ASSERT_THROWING(vmo.visitablev(5, 5), + MOCKPP_PCHAR("vmo.visitablev()-3"), + unsigned, + unsigned(555)); + + vmo.verify(); + vmb.verify(); + + ////////////////////////////////////////////////////// + + vmo.reset(); + vmb.unsetThrowablesInline(); + + vmb.addThrowable(mockpp::make_throwable(123u)); + vmb.addThrowable(mockpp::make_throwable(321u)); + + vmo.visitablev(9, 9); + vmo.visitablev(8, 8); + vmo.visitablev(1, 2); + vmo.visitablev(2, 3); + vmo.visitablev(3, 4); + vmo.activate(); + + MOCKPP_ASSERT_THROWING(vmo.visitablev(9, 9), + MOCKPP_PCHAR("vmo.visitablev()-2a"), + unsigned, + unsigned(123)); + + MOCKPP_ASSERT_THROWING(vmo.visitablev(8, 8), + MOCKPP_PCHAR("vmo.visitablev()-2b"), + unsigned, + unsigned(321)); + + vmo.visitablev(1, 2); + vmo.visitablev(2, 3); + vmo.visitablev(3, 4); + + vmo.verify(); + vmb.verify(); + + ////////////////////////////////////////////////////// + + vmo.reset(); + vmb.setDefaultThrowable(mockpp::make_throwable(111u)); + vmb.addThrowable(mockpp::make_throwable(123u)); + + vmo.visitablev(1, 2); + vmo.visitablev(2, 3); + vmo.visitablev(3, 4); + vmo.activate(); + + MOCKPP_ASSERT_THROWING(vmo.visitablev(1, 2), + MOCKPP_PCHAR("vmo.visitablev()-3a"), + unsigned, + unsigned(123)); + + MOCKPP_ASSERT_THROWING(vmo.visitablev(2, 3), + MOCKPP_PCHAR("vmo.visitablev()-3b"), + unsigned, + unsigned(111)); + + MOCKPP_ASSERT_THROWING(vmo.visitablev(3, 4), + MOCKPP_PCHAR("vmo.visitablev()-3c"), unsigned, unsigned(111)); |
