[Mockpp-commits] mockpp/mockpp/tests ExpectationList_test.cpp,1.14,1.15 VisitableMockObject_1_test.c
Brought to you by:
ewald-arnold
Menu
▾
▴
[Mockpp-commits] mockpp/mockpp/tests ExpectationList_test.cpp,1.14,1.15 VisitableMockObject_1_test.cpp,1.17,1.18 VisitableMockObject_1_void_test.cpp,1.16,1.17 VisitableMockObject_2_test.cpp,1.16,1.17 VisitableMockObject_2_void_test.cpp,1.15,1.16 VisitableMockObject_3_test.cpp,1.15,1.16 VisitableMockObject_3_void_test.cpp,1.14,1.15 VisitableMockObject_4_test.cpp,1.15,1.16 VisitableMockObject_4_void_test.cpp,1.14,1.15 VisitableMockObject_5_test.cpp,1.20,1.21 VisitableMockObject_5_void_test.cpp,1.17,1.18
Update of /cvsroot/mockpp/mockpp/mockpp/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4304/mockpp/tests Modified Files: ExpectationList_test.cpp VisitableMockObject_1_test.cpp VisitableMockObject_1_void_test.cpp VisitableMockObject_2_test.cpp VisitableMockObject_2_void_test.cpp VisitableMockObject_3_test.cpp VisitableMockObject_3_void_test.cpp VisitableMockObject_4_test.cpp VisitableMockObject_4_void_test.cpp VisitableMockObject_5_test.cpp VisitableMockObject_5_void_test.cpp Log Message: VisitableMockObjects also take constraints as controlling elements Index: VisitableMockObject_1_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_1_void_test.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** VisitableMockObject_1_void_test.cpp 27 Feb 2005 11:48:16 -0000 1.16 --- VisitableMockObject_1_void_test.cpp 27 Feb 2005 18:04:29 -0000 1.17 *************** *** 41,44 **** --- 41,46 ---- #include <mockpp/VisitableMockObject.h> + #include <mockpp/chaining/ChainingMockObjectSupport.h> + #include <mockpp/constraint/IsEqual.h> #include <mockpp/constraint/IsNot.h> *************** *** 59,62 **** --- 61,65 ---- CPPUNIT_TEST(test_default_throw); CPPUNIT_TEST(test_constraint); + CPPUNIT_TEST(test_controller_constraint); CPPUNIT_TEST_EXCEPTION(fail_add_throw_after_active, mockpp::AssertionFailedError); *************** *** 78,81 **** --- 81,85 ---- void test_parameter_ex(); void test_constraint(); + void test_controller_constraint(); void fail_unused_throwable(); *************** *** 335,339 **** MOCKPP_CONTROLLER_FOR(MyVisitableMockObject_1_void, visitable) ctr (&mvo); ! mvo.visitable(new mockpp::IsEqual<int>(13)); mvo.visitable(new mockpp::IsNot<int>(new mockpp::IsEqual<int>(13))); --- 339,343 ---- MOCKPP_CONTROLLER_FOR(MyVisitableMockObject_1_void, visitable) ctr (&mvo); ! mvo.visitable(mockpp::eq<int>(13)); mvo.visitable(new mockpp::IsNot<int>(new mockpp::IsEqual<int>(13))); *************** *** 345,347 **** --- 349,385 ---- + void VisitableMockObject_1_void_test::test_controller_constraint() + { + MyVisitableMockObject_1_void mvo(MOCKPP_PCHAR("mvo")); + MOCKPP_CONTROLLER_FOR(MyVisitableMockObject_1_void, visitable) ctr (&mvo); + + mvo.visitable(mockpp::eq<int>(10, 5)); + + mvo.visitable(mockpp::eq<int>(10, 5)); + + mvo.visitable(1); + + ctr.addResponseThrowable(mockpp::make_throwable((int)2), + mockpp::eq<int>(8)); + + ctr.addResponseThrowable(mockpp::make_throwable((int)1), + mockpp::eq<int>(12)); + + mvo.activate(); + + MOCKPP_ASSERT_THROWING(mvo.visitable(8), + MOCKPP_PCHAR("mvo.visitable(8)"), + int, + 2); + + MOCKPP_ASSERT_THROWING(mvo.visitable(12), + MOCKPP_PCHAR("mvo.visitable(12)"), + int, + 1); + + mvo.visitable(1); + mvo.verify(); + } + + #endif // HAVE_CPPUNIT Index: ExpectationList_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ExpectationList_test.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** ExpectationList_test.cpp 8 Jan 2005 13:24:10 -0000 1.14 --- ExpectationList_test.cpp 27 Feb 2005 18:04:29 -0000 1.15 *************** *** 100,110 **** { int exp_prep[10] = { 0, 1 }; ! mockpp::ExpectationList<int> ab = ! mockpp::ExpectationList<int> ! (MOCKPP_PCHAR("testExpectationList"), 0) ! .addExpected(200) ! .addExpected(exp_prep+0, exp_prep+2) ! .addExpected(700); ab.addActual(200); --- 100,108 ---- { int exp_prep[10] = { 0, 1 }; + mockpp::ExpectationList<int> ab (MOCKPP_PCHAR("testExpectationList"), 0); ! ab.addExpected(200) ! .addExpected(exp_prep+0, exp_prep+2) ! .addExpected(700); ab.addActual(200); Index: VisitableMockObject_3_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_3_test.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** VisitableMockObject_3_test.cpp 27 Feb 2005 11:48:16 -0000 1.15 --- VisitableMockObject_3_test.cpp 27 Feb 2005 18:04:29 -0000 1.16 *************** *** 41,44 **** --- 41,46 ---- #include <mockpp/constraint/IsNot.h> + #include <mockpp/chaining/ChainingMockObjectSupport.h> + #include <mockpp/ExpectationValue.h> #include <mockpp/VisitableMockObject.h> *************** *** 64,67 **** --- 66,70 ---- CPPUNIT_TEST(test_inline_post_1_2); CPPUNIT_TEST(test_constraint); + CPPUNIT_TEST(test_controller_constraint); CPPUNIT_TEST_EXCEPTION(fail_add_throw_after_active, mockpp::AssertionFailedError); *************** *** 91,94 **** --- 94,98 ---- void test_inline_post_1_2(); void test_constraint(); + void test_controller_constraint(); void fail_unused_value(); *************** *** 596,598 **** --- 600,663 ---- + void VisitableMockObject_3_test::test_controller_constraint() + { + MyVisitableMockObject_3 mvo(MOCKPP_PCHAR("mvo")); + MOCKPP_CONTROLLER_FOR(MyVisitableMockObject_3, visitable) ctr (&mvo); + ctr.setDefaultReturnValue(123); + + mvo.visitable(mockpp::eq<unsigned>(10, 5), + mockpp::eq<unsigned>(20, 5), + mockpp::eq<unsigned>(50, 5)); + + mvo.visitable(mockpp::eq<unsigned>(10, 5), + mockpp::eq<unsigned>(20, 5), + mockpp::eq<unsigned>(50, 5)); + + mvo.visitable(mockpp::eq<unsigned>(10, 5), + mockpp::eq<unsigned>(20, 5), + mockpp::eq<unsigned>(50, 5)); + + mvo.visitable(mockpp::eq<unsigned>(10, 5), + mockpp::eq<unsigned>(20, 5), + mockpp::eq<unsigned>(50, 5)); + + mvo.visitable(1, 1, 1); + + ctr.addResponseThrowable(mockpp::make_throwable((int)2), + mockpp::eq<unsigned>(8), + mockpp::eq<unsigned>(18), + mockpp::eq<unsigned>(48)); + + ctr.addResponseThrowable(mockpp::make_throwable((int)1), + mockpp::eq<unsigned>(12), + mockpp::eq<unsigned>(22), + mockpp::eq<unsigned>(52)); + + ctr.addResponseValue(2, mockpp::eq<unsigned>(9), + mockpp::eq<unsigned>(19), + mockpp::eq<unsigned>(49)); + + ctr.addResponseValue(1, mockpp::eq<unsigned>(11), + mockpp::eq<unsigned>(21), + mockpp::eq<unsigned>(51)); + + mvo.activate(); + CPPUNIT_ASSERT(1 == mvo.visitable(11, 21, 51)); + CPPUNIT_ASSERT(2 == mvo.visitable(9, 19, 49)); + + MOCKPP_ASSERT_THROWING(mvo.visitable(8, 18, 48), + MOCKPP_PCHAR("mvo.visitable(8, 18, 48)"), + int, + 2); + + MOCKPP_ASSERT_THROWING(mvo.visitable(12, 22, 52), + MOCKPP_PCHAR("mvo.visitable(12, 22, 52)"), + int, + 1); + + CPPUNIT_ASSERT(123 == mvo.visitable(1, 1, 1)); + mvo.verify(); + } + + #endif // HAVE_CPPUNIT Index: VisitableMockObject_2_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_2_test.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** VisitableMockObject_2_test.cpp 27 Feb 2005 11:48:16 -0000 1.16 --- VisitableMockObject_2_test.cpp 27 Feb 2005 18:04:29 -0000 1.17 *************** *** 38,41 **** --- 38,43 ---- #else + #include <mockpp/chaining/ChainingMockObjectSupport.h> + #include <mockpp/constraint/IsEqual.h> #include <mockpp/constraint/IsNot.h> *************** *** 64,67 **** --- 66,70 ---- CPPUNIT_TEST(test_inline_post_1_2); CPPUNIT_TEST(test_constraint); + CPPUNIT_TEST(test_controller_constraint); CPPUNIT_TEST_EXCEPTION(fail_add_throw_after_active, mockpp::AssertionFailedError); *************** *** 91,94 **** --- 94,98 ---- void test_inline_post_1_2(); void test_constraint(); + void test_controller_constraint(); void fail_unused_value(); *************** *** 584,586 **** --- 588,643 ---- + void VisitableMockObject_2_test::test_controller_constraint() + { + MyVisitableMockObject_2 mvo(MOCKPP_PCHAR("mvo")); + MOCKPP_CONTROLLER_FOR(MyVisitableMockObject_2, visitable) ctr (&mvo); + ctr.setDefaultReturnValue(123); + + mvo.visitable(mockpp::eq<unsigned>(10, 5), + mockpp::eq<unsigned>(50, 5)); + + mvo.visitable(mockpp::eq<unsigned>(10, 5), + mockpp::eq<unsigned>(50, 5)); + + mvo.visitable(mockpp::eq<unsigned>(10, 5), + mockpp::eq<unsigned>(50, 5)); + + mvo.visitable(mockpp::eq<unsigned>(10, 5), + mockpp::eq<unsigned>(50, 5)); + + mvo.visitable(1, 1); + + ctr.addResponseThrowable(mockpp::make_throwable((int)2), + mockpp::eq<unsigned>(8), + mockpp::eq<unsigned>(48)); + + ctr.addResponseThrowable(mockpp::make_throwable((int)1), + mockpp::eq<unsigned>(12), + mockpp::eq<unsigned>(52)); + + ctr.addResponseValue(2, mockpp::eq<unsigned>(9), + mockpp::eq<unsigned>(49)); + + ctr.addResponseValue(1, mockpp::eq<unsigned>(11), + mockpp::eq<unsigned>(51)); + + mvo.activate(); + CPPUNIT_ASSERT(1 == mvo.visitable(11, 51)); + CPPUNIT_ASSERT(2 == mvo.visitable(9, 49)); + + MOCKPP_ASSERT_THROWING(mvo.visitable(8, 48), + MOCKPP_PCHAR("mvo.visitable(8, 48)"), + int, + 2); + + MOCKPP_ASSERT_THROWING(mvo.visitable(12, 52), + MOCKPP_PCHAR("mvo.visitable(12, 52)"), + int, + 1); + + CPPUNIT_ASSERT(123 == mvo.visitable(1, 1)); + mvo.verify(); + } + + #endif // HAVE_CPPUNIT Index: VisitableMockObject_2_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_2_void_test.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** VisitableMockObject_2_void_test.cpp 27 Feb 2005 11:48:16 -0000 1.15 --- VisitableMockObject_2_void_test.cpp 27 Feb 2005 18:04:29 -0000 1.16 *************** *** 41,44 **** --- 41,46 ---- #include <mockpp/constraint/IsNot.h> + #include <mockpp/chaining/ChainingMockObjectSupport.h> + #include <mockpp/ExpectationValue.h> #include <mockpp/VisitableMockObject.h> *************** *** 59,62 **** --- 61,65 ---- CPPUNIT_TEST(test_default_throw); CPPUNIT_TEST(test_constraint); + CPPUNIT_TEST(test_controller_constraint); CPPUNIT_TEST_EXCEPTION(fail_add_throw_after_active, mockpp::AssertionFailedError); *************** *** 78,81 **** --- 81,85 ---- void test_parameter(); void test_constraint(); + void test_controller_constraint(); void fail_unused_throwable(); *************** *** 353,355 **** --- 357,397 ---- + void VisitableMockObject_2_void_test::test_controller_constraint() + { + MyVisitableMockObject_2_void mvo(MOCKPP_PCHAR("mvo")); + MOCKPP_CONTROLLER_FOR(MyVisitableMockObject_2_void, visitable) ctr (&mvo); + + mvo.visitable(mockpp::eq<unsigned>(10, 5), + mockpp::eq<unsigned>(50, 5)); + + mvo.visitable(mockpp::eq<unsigned>(10, 5), + mockpp::eq<unsigned>(50, 5)); + + mvo.visitable(1, 1); + + ctr.addResponseThrowable(mockpp::make_throwable((int)2), + mockpp::eq<unsigned>(8), + mockpp::eq<unsigned>(48)); + + ctr.addResponseThrowable(mockpp::make_throwable((int)1), + mockpp::eq<unsigned>(12), + mockpp::eq<unsigned>(52)); + + mvo.activate(); + + MOCKPP_ASSERT_THROWING(mvo.visitable(8, 48), + MOCKPP_PCHAR("mvo.visitable(8, 48)"), + int, + 2); + + MOCKPP_ASSERT_THROWING(mvo.visitable(12, 52), + MOCKPP_PCHAR("mvo.visitable(12, 52)"), + int, + 1); + + mvo.visitable(1, 1); + mvo.verify(); + } + + #endif // HAVE_CPPUNIT Index: VisitableMockObject_3_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_3_void_test.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** VisitableMockObject_3_void_test.cpp 27 Feb 2005 11:48:16 -0000 1.14 --- VisitableMockObject_3_void_test.cpp 27 Feb 2005 18:04:29 -0000 1.15 *************** *** 41,44 **** --- 41,46 ---- #include <mockpp/constraint/IsNot.h> + #include <mockpp/chaining/ChainingMockObjectSupport.h> + #include <mockpp/ExpectationValue.h> #include <mockpp/VisitableMockObject.h> *************** *** 59,62 **** --- 61,65 ---- CPPUNIT_TEST(test_default_throw); CPPUNIT_TEST(test_constraint); + CPPUNIT_TEST(test_controller_constraint); CPPUNIT_TEST_EXCEPTION(fail_add_throw_after_active, mockpp::AssertionFailedError); *************** *** 78,81 **** --- 81,85 ---- void test_parameter(); void test_constraint(); + void test_controller_constraint(); void fail_unused_throwable(); *************** *** 363,365 **** --- 367,411 ---- + void VisitableMockObject_3_void_test::test_controller_constraint() + { + MyVisitableMockObject_3_void mvo(MOCKPP_PCHAR("mvo")); + MOCKPP_CONTROLLER_FOR(MyVisitableMockObject_3_void, visitable) ctr (&mvo); + + mvo.visitable(mockpp::eq<unsigned>(10, 5), + mockpp::eq<unsigned>(20, 5), + mockpp::eq<unsigned>(50, 5)); + + mvo.visitable(mockpp::eq<unsigned>(10, 5), + mockpp::eq<unsigned>(20, 5), + mockpp::eq<unsigned>(50, 5)); + + mvo.visitable(1, 1, 1); + + ctr.addResponseThrowable(mockpp::make_throwable((int)2), + mockpp::eq<unsigned>(8), + mockpp::eq<unsigned>(18), + mockpp::eq<unsigned>(48)); + + ctr.addResponseThrowable(mockpp::make_throwable((int)1), + mockpp::eq<unsigned>(12), + mockpp::eq<unsigned>(22), + mockpp::eq<unsigned>(52)); + + mvo.activate(); + + MOCKPP_ASSERT_THROWING(mvo.visitable(8, 18, 48), + MOCKPP_PCHAR("mvo.visitable(8, 18, 48)"), + int, + 2); + + MOCKPP_ASSERT_THROWING(mvo.visitable(12, 22, 52), + MOCKPP_PCHAR("mvo.visitable(12, 22, 52)"), + int, + 1); + + mvo.visitable(1, 1, 1); + mvo.verify(); + } + + #endif // HAVE_CPPUNIT Index: VisitableMockObject_4_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_4_void_test.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** VisitableMockObject_4_void_test.cpp 27 Feb 2005 11:48:16 -0000 1.14 --- VisitableMockObject_4_void_test.cpp 27 Feb 2005 18:04:29 -0000 1.15 *************** *** 41,44 **** --- 41,46 ---- #include <mockpp/VisitableMockObject.h> + #include <mockpp/chaining/ChainingMockObjectSupport.h> + #include <mockpp/constraint/IsEqual.h> #include <mockpp/constraint/IsNot.h> *************** *** 59,62 **** --- 61,65 ---- CPPUNIT_TEST(test_default_throw); CPPUNIT_TEST(test_constraint); + CPPUNIT_TEST(test_controller_constraint); CPPUNIT_TEST_EXCEPTION(fail_add_throw_after_active, mockpp::AssertionFailedError); *************** *** 78,81 **** --- 81,85 ---- void test_parameter(); void test_constraint(); + void test_controller_constraint(); void fail_unused_throwable(); *************** *** 373,375 **** --- 377,425 ---- + void VisitableMockObject_4_void_test::test_controller_constraint() + { + MyVisitableMockObject_4_void_test mvo(MOCKPP_PCHAR("mvo")); + MOCKPP_CONTROLLER_FOR(MyVisitableMockObject_4_void_test, visitable) ctr (&mvo); + + mvo.visitable(mockpp::eq<unsigned>(10, 5), + mockpp::eq<unsigned>(20, 5), + mockpp::eq<unsigned>(30, 5), + mockpp::eq<unsigned>(50, 5)); + + mvo.visitable(mockpp::eq<unsigned>(10, 5), + mockpp::eq<unsigned>(20, 5), + mockpp::eq<unsigned>(30, 5), + mockpp::eq<unsigned>(50, 5)); + + mvo.visitable(1, 1, 1, 1); + + ctr.addResponseThrowable(mockpp::make_throwable((int)2), + mockpp::eq<unsigned>(8), + mockpp::eq<unsigned>(18), + mockpp::eq<unsigned>(28), + mockpp::eq<unsigned>(48)); + + ctr.addResponseThrowable(mockpp::make_throwable((int)1), + mockpp::eq<unsigned>(12), + mockpp::eq<unsigned>(22), + mockpp::eq<unsigned>(32), + mockpp::eq<unsigned>(52)); + + mvo.activate(); + + MOCKPP_ASSERT_THROWING(mvo.visitable(8, 18, 28, 48), + MOCKPP_PCHAR("mvo.visitable(8, 18, 28, 48)"), + int, + 2); + + MOCKPP_ASSERT_THROWING(mvo.visitable(12, 22, 32, 52), + MOCKPP_PCHAR("mvo.visitable(12, 22, 32, 52)"), + int, + 1); + + mvo.visitable(1, 1, 1, 1); + mvo.verify(); + } + + #endif // HAVE_CPPUNIT Index: VisitableMockObject_5_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_5_test.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** VisitableMockObject_5_test.cpp 27 Feb 2005 11:48:16 -0000 1.20 --- VisitableMockObject_5_test.cpp 27 Feb 2005 18:04:29 -0000 1.21 *************** *** 42,45 **** --- 42,47 ---- #include <mockpp/util/AssertMo.h> + #include <mockpp/chaining/ChainingMockObjectSupport.h> + #include <mockpp/constraint/IsEqual.h> #include <mockpp/constraint/IsNot.h> *************** *** 66,69 **** --- 68,72 ---- CPPUNIT_TEST(test_inline_post_1_2); CPPUNIT_TEST(test_constraint); + CPPUNIT_TEST(test_controller_constraint); CPPUNIT_TEST_EXCEPTION(fail_add_throw_after_active, mockpp::AssertionFailedError); *************** *** 93,96 **** --- 96,100 ---- void test_inline_post_1_2(); void test_constraint(); + void test_controller_constraint(); void fail_unused_value(); *************** *** 927,929 **** --- 931,1010 ---- + void VisitableMockObject_5_test::test_controller_constraint() + { + MyVisitableMockObject_5 mvo(MOCKPP_PCHAR("mvo")); + MOCKPP_CONTROLLER_FOR(MyVisitableMockObject_5, visitable5) ctr (&mvo); + ctr.setDefaultReturnValue(123); + + mvo.visitable5(mockpp::eq<unsigned>(10, 5), + mockpp::eq<unsigned>(20, 5), + mockpp::eq<unsigned>(30, 5), + mockpp::eq<unsigned>(40, 5), + mockpp::eq<unsigned>(50, 5)); + + mvo.visitable5(mockpp::eq<unsigned>(10, 5), + mockpp::eq<unsigned>(20, 5), + mockpp::eq<unsigned>(30, 5), + mockpp::eq<unsigned>(40, 5), + mockpp::eq<unsigned>(50, 5)); + + mvo.visitable5(mockpp::eq<unsigned>(10, 5), + mockpp::eq<unsigned>(20, 5), + mockpp::eq<unsigned>(30, 5), + mockpp::eq<unsigned>(40, 5), + mockpp::eq<unsigned>(50, 5)); + + mvo.visitable5(mockpp::eq<unsigned>(10, 5), + mockpp::eq<unsigned>(20, 5), + mockpp::eq<unsigned>(30, 5), + mockpp::eq<unsigned>(40, 5), + mockpp::eq<unsigned>(50, 5)); + + mvo.visitable5(1, 1, 1, 1, 1); + + ctr.addResponseThrowable(mockpp::make_throwable((int)2), + mockpp::eq<unsigned>(8), + mockpp::eq<unsigned>(18), + mockpp::eq<unsigned>(28), + mockpp::eq<unsigned>(38), + mockpp::eq<unsigned>(48)); + + ctr.addResponseThrowable(mockpp::make_throwable((int)1), + mockpp::eq<unsigned>(12), + mockpp::eq<unsigned>(22), + mockpp::eq<unsigned>(32), + mockpp::eq<unsigned>(42), + mockpp::eq<unsigned>(52)); + + ctr.addResponseValue(2, mockpp::eq<unsigned>(9), + mockpp::eq<unsigned>(19), + mockpp::eq<unsigned>(29), + mockpp::eq<unsigned>(39), + mockpp::eq<unsigned>(49)); + + ctr.addResponseValue(1, mockpp::eq<unsigned>(11), + mockpp::eq<unsigned>(21), + mockpp::eq<unsigned>(31), + mockpp::eq<unsigned>(41), + mockpp::eq<unsigned>(51)); + + mvo.activate(); + CPPUNIT_ASSERT(1 == mvo.visitable5(11, 21, 31, 41, 51)); + CPPUNIT_ASSERT(2 == mvo.visitable5(9, 19, 29, 39, 49)); + + MOCKPP_ASSERT_THROWING(mvo.visitable5(8, 18, 28, 38, 48), + MOCKPP_PCHAR("mvo.visitable5(8, 18, 28, 38, 48)"), + int, + 2); + + MOCKPP_ASSERT_THROWING(mvo.visitable5(12, 22, 32, 42, 52), + MOCKPP_PCHAR("mvo.visitable5(12, 22, 32, 42, 52)"), + int, + 1); + + CPPUNIT_ASSERT(123 == mvo.visitable5(1, 1, 1, 1, 1)); + mvo.verify(); + } + + #endif // HAVE_CPPUNIT Index: VisitableMockObject_5_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_5_void_test.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** VisitableMockObject_5_void_test.cpp 27 Feb 2005 11:48:16 -0000 1.17 --- VisitableMockObject_5_void_test.cpp 27 Feb 2005 18:04:29 -0000 1.18 *************** *** 41,44 **** --- 41,46 ---- #include <mockpp/VisitableMockObject.h> + #include <mockpp/chaining/ChainingMockObjectSupport.h> + #include <mockpp/constraint/IsEqual.h> #include <mockpp/constraint/IsNot.h> *************** *** 61,64 **** --- 63,67 ---- CPPUNIT_TEST(test_default_throw); CPPUNIT_TEST(test_constraint); + CPPUNIT_TEST(test_controller_constraint); CPPUNIT_TEST_EXCEPTION(fail_add_throw_after_active, mockpp::AssertionFailedError); *************** *** 80,83 **** --- 83,87 ---- void test_parameter_ex(); void test_constraint(); + void test_controller_constraint(); void fail_unused_throwable(); *************** *** 692,694 **** --- 696,747 ---- + void VisitableMockObject_5_void_test::test_controller_constraint() + { + MyVisitableMockObject_5_void_test mvo(MOCKPP_PCHAR("mvo")); + MOCKPP_CONTROLLER_FOR(MyVisitableMockObject_5_void_test, visitable5) ctr (&mvo); + + mvo.visitable5(mockpp::eq<unsigned>(10, 5), + mockpp::eq<unsigned>(20, 5), + mockpp::eq<unsigned>(30, 5), + mockpp::eq<unsigned>(40, 5), + mockpp::eq<unsigned>(50, 5)); + + mvo.visitable5(mockpp::eq<unsigned>(10, 5), + mockpp::eq<unsigned>(20, 5), + mockpp::eq<unsigned>(30, 5), + mockpp::eq<unsigned>(40, 5), + mockpp::eq<unsigned>(50, 5)); + + mvo.visitable5(1, 1, 1, 1, 1); + + ctr.addResponseThrowable(mockpp::make_throwable((int)2), + mockpp::eq<unsigned>(8), + mockpp::eq<unsigned>(18), + mockpp::eq<unsigned>(28), + mockpp::eq<unsigned>(38), + mockpp::eq<unsigned>(48)); + + ctr.addResponseThrowable(mockpp::make_throwable((int)1), + mockpp::eq<unsigned>(12), + mockpp::eq<unsigned>(22), + mockpp::eq<unsigned>(32), + mockpp::eq<unsigned>(42), + mockpp::eq<unsigned>(52)); + mvo.activate(); + + MOCKPP_ASSERT_THROWING(mvo.visitable5(8, 18, 28, 38, 48), + MOCKPP_PCHAR("mvo.visitable5(8, 18, 28, 38, 48)"), + int, + 2); + + MOCKPP_ASSERT_THROWING(mvo.visitable5(12, 22, 32, 42, 52), + MOCKPP_PCHAR("mvo.visitable5(12, 22, 32, 42, 52)"), + int, + 1); + + mvo.visitable5(1, 1, 1, 1, 1); + mvo.verify(); + } + + #endif // HAVE_CPPUNIT Index: VisitableMockObject_4_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_4_test.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** VisitableMockObject_4_test.cpp 27 Feb 2005 11:48:16 -0000 1.15 --- VisitableMockObject_4_test.cpp 27 Feb 2005 18:04:29 -0000 1.16 *************** *** 38,41 **** --- 38,43 ---- #else + #include <mockpp/chaining/ChainingMockObjectSupport.h> + #include <mockpp/constraint/IsEqual.h> #include <mockpp/constraint/IsNot.h> *************** *** 64,67 **** --- 66,70 ---- CPPUNIT_TEST(test_inline_post_1_2); CPPUNIT_TEST(test_constraint); + CPPUNIT_TEST(test_controller_constraint); CPPUNIT_TEST_EXCEPTION(fail_add_throw_after_active, mockpp::AssertionFailedError); *************** *** 91,94 **** --- 94,98 ---- void test_inline_post_1_2(); void test_constraint(); + void test_controller_constraint(); void fail_unused_value(); *************** *** 609,611 **** --- 613,684 ---- + void VisitableMockObject_4_test::test_controller_constraint() + { + MyVisitableMockObject_4 mvo(MOCKPP_PCHAR("mvo")); + MOCKPP_CONTROLLER_FOR(MyVisitableMockObject_4, visitable) ctr (&mvo); + ctr.setDefaultReturnValue(123); + + mvo.visitable(mockpp::eq<unsigned>(10, 5), + mockpp::eq<unsigned>(20, 5), + mockpp::eq<unsigned>(30, 5), + mockpp::eq<unsigned>(50, 5)); + + mvo.visitable(mockpp::eq<unsigned>(10, 5), + mockpp::eq<unsigned>(20, 5), + mockpp::eq<unsigned>(30, 5), + mockpp::eq<unsigned>(50, 5)); + + mvo.visitable(mockpp::eq<unsigned>(10, 5), + mockpp::eq<unsigned>(20, 5), + mockpp::eq<unsigned>(30, 5), + mockpp::eq<unsigned>(50, 5)); + + mvo.visitable(mockpp::eq<unsigned>(10, 5), + mockpp::eq<unsigned>(20, 5), + mockpp::eq<unsigned>(30, 5), + mockpp::eq<unsigned>(50, 5)); + + mvo.visitable(1, 1, 1, 1); + + ctr.addResponseThrowable(mockpp::make_throwable((int)2), + mockpp::eq<unsigned>(8), + mockpp::eq<unsigned>(18), + mockpp::eq<unsigned>(28), + mockpp::eq<unsigned>(48)); + + ctr.addResponseThrowable(mockpp::make_throwable((int)1), + mockpp::eq<unsigned>(12), + mockpp::eq<unsigned>(22), + mockpp::eq<unsigned>(32), + mockpp::eq<unsigned>(52)); + + ctr.addResponseValue(2, mockpp::eq<unsigned>(9), + mockpp::eq<unsigned>(19), + mockpp::eq<unsigned>(29), + mockpp::eq<unsigned>(49)); + + ctr.addResponseValue(1, mockpp::eq<unsigned>(11), + mockpp::eq<unsigned>(21), + mockpp::eq<unsigned>(31), + mockpp::eq<unsigned>(51)); + + mvo.activate(); + CPPUNIT_ASSERT(1 == mvo.visitable(11, 21, 31, 51)); + CPPUNIT_ASSERT(2 == mvo.visitable(9, 19, 29, 49)); + + MOCKPP_ASSERT_THROWING(mvo.visitable(8, 18, 28, 48), + MOCKPP_PCHAR("mvo.visitable(8, 18, 28, 48)"), + int, + 2); + + MOCKPP_ASSERT_THROWING(mvo.visitable(12, 22, 32, 52), + MOCKPP_PCHAR("mvo.visitable(12, 22, 32, 52)"), + int, + 1); + + CPPUNIT_ASSERT(123 == mvo.visitable(1, 1, 1, 1)); + mvo.verify(); + } + + #endif // HAVE_CPPUNIT Index: VisitableMockObject_1_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_1_test.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** VisitableMockObject_1_test.cpp 27 Feb 2005 11:48:16 -0000 1.17 --- VisitableMockObject_1_test.cpp 27 Feb 2005 18:04:29 -0000 1.18 *************** *** 42,45 **** --- 42,47 ---- #include <mockpp/util/AssertMo.h> + #include <mockpp/chaining/ChainingMockObjectSupport.h> + #include <mockpp/constraint/IsEqual.h> #include <mockpp/constraint/IsNot.h> *************** *** 64,67 **** --- 66,70 ---- CPPUNIT_TEST(test_inline_post_1_2); CPPUNIT_TEST(test_constraint); + CPPUNIT_TEST(test_controller_constraint); CPPUNIT_TEST_EXCEPTION(fail_add_throw_after_active, mockpp::AssertionFailedError); *************** *** 91,94 **** --- 94,98 ---- void test_inline_post_1_2(); void test_constraint(); + void test_controller_constraint(); void fail_unused_value(); *************** *** 574,576 **** --- 578,625 ---- + void VisitableMockObject_1_test::test_controller_constraint() + { + MyVisitableMockObject_1 mvo(MOCKPP_PCHAR("mvo")); + MOCKPP_CONTROLLER_FOR(MyVisitableMockObject_1, visitable) ctr (&mvo); + ctr.setDefaultReturnValue(123); + + mvo.visitable(mockpp::eq<unsigned>(10, 5)); + + mvo.visitable(mockpp::eq<unsigned>(10, 5)); + + mvo.visitable(mockpp::eq<unsigned>(10, 5)); + + mvo.visitable(mockpp::eq<unsigned>(10, 5)); + + mvo.visitable(1); + + ctr.addResponseThrowable(mockpp::make_throwable((int)2), + mockpp::eq<unsigned>(8)); + + ctr.addResponseThrowable(mockpp::make_throwable((int)1), + mockpp::eq<unsigned>(12)); + + ctr.addResponseValue(2, mockpp::eq<unsigned>(9)); + + ctr.addResponseValue(1, mockpp::eq<unsigned>(11)); + + mvo.activate(); + CPPUNIT_ASSERT(1 == mvo.visitable(11)); + CPPUNIT_ASSERT(2 == mvo.visitable(9)); + + MOCKPP_ASSERT_THROWING(mvo.visitable(8), + MOCKPP_PCHAR("mvo.visitable(8)"), + int, + 2); + + MOCKPP_ASSERT_THROWING(mvo.visitable(12), + MOCKPP_PCHAR("mvo.visitable(12)"), + int, + 1); + + CPPUNIT_ASSERT(123 == mvo.visitable(1)); + mvo.verify(); + } + + #endif // HAVE_CPPUNIT |
