[Mockpp-commits] mockpp/mockpp/tests AssertMo_test.cpp,1.25,1.26 Assert_test.cpp,1.18,1.19 Exception
Brought to you by:
ewald-arnold
Menu
▾
▴
[Mockpp-commits] mockpp/mockpp/tests AssertMo_test.cpp,1.25,1.26 Assert_test.cpp,1.18,1.19 Exception_test.cpp,1.12,1.13 ResponseVector_test.cpp,1.4,1.5 ThrowableList_test.cpp,1.15,1.16 Throwable_test.cpp,1.14,1.15 TrackingCounter_test.cpp,1.8,1.9 VerifyingTestCase_test.cpp,1.16,1.17 VisitableMockMethod_1_test.cpp,1.4,1.5 VisitableMockMethod_2_test.cpp,1.9,1.10 VisitableMockMethod_test.cpp,1.16,1.17 VisitableMockObject_1_test.cpp,1.21,1.22 VisitableMockObject_1_void_test.cpp,1.21,1.22 VisitableMockObject_2_test.cpp,1.20,1.21 VisitableMockObject_2_void_test.cpp,1.20,1.21 VisitableMockObject_3_test.cpp,1.19,1.20 VisitableMockObject_3_void_test.cpp,1.19,1.20 VisitableMockObject_4_test.cpp,1.19,1.20 VisitableMockObject_4_void_test.cpp,1.19,1.20 VisitableMockObject_5_test.cpp,1.28,1.29 VisitableMockObject_5_void_test.cpp,1.24,1.25 VisitableMockObject_test.cpp,1.24,1.25 VisitableMockObject_void_test.cpp,1.17,1.18 readability_test.cpp,1.4,1.5
Update of /cvsroot/mockpp/mockpp/mockpp/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24721/mockpp/tests Modified Files: AssertMo_test.cpp Assert_test.cpp Exception_test.cpp ResponseVector_test.cpp ThrowableList_test.cpp Throwable_test.cpp TrackingCounter_test.cpp VerifyingTestCase_test.cpp VisitableMockMethod_1_test.cpp VisitableMockMethod_2_test.cpp VisitableMockMethod_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 VisitableMockObject_test.cpp VisitableMockObject_void_test.cpp readability_test.cpp Log Message: optionally disable exceptions Index: readability_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/readability_test.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- readability_test.cpp 26 Nov 2005 17:57:49 -0000 1.4 +++ readability_test.cpp 28 Nov 2005 19:03:09 -0000 1.5 @@ -88,14 +88,16 @@ eq(false)) .will(returnValue(123)); - try + MOCKPP_TRY { mmo.chain(CA(), CB(), "hallo", 12, true); } +#ifndef MOCKPP_NO_EXCEPTIONS catch(std::exception &ex) { std::cout << ex.what() << std::endl; } +#endif } @@ -105,14 +107,16 @@ mmo.void_visit(CA(), CB(), "hallo", 12, true); mmo.activate(); - try + MOCKPP_TRY { mmo.visit(CA(), CB(), "hallo", 12, false); } +#ifndef MOCKPP_NO_EXCEPTIONS catch(std::exception &ex) { std::cout << ex.what() << std::endl; } +#endif } @@ -122,14 +126,16 @@ mmo.void_visit(CA(), CB(), "hallo", 12, true); mmo.activate(); - try + MOCKPP_TRY { mmo.void_visit(CA(), CB(), "hallo", 21, false); } +#ifndef MOCKPP_NO_EXCEPTIONS catch(std::exception &ex) { std::cout << ex.what() << std::endl; } +#endif } @@ -137,14 +143,16 @@ { mockpp::ConstraintList<MOCKPP_STL::string> list(MOCKPP_PCHAR("ConstraintListInstance")); list.addExpected(eq(MOCKPP_STL::string("string"))); - try + MOCKPP_TRY { list.addActual(MOCKPP_STL::string("no-string")); } +#ifndef MOCKPP_NO_EXCEPTIONS catch(std::exception &ex) { std::cout << ex.what() << std::endl; } +#endif } @@ -152,14 +160,16 @@ { mockpp::ExpectationList<MOCKPP_STL::string> list(MOCKPP_PCHAR("ExpectationListInstance")); list.addExpected(MOCKPP_STL::string("string")); - try + MOCKPP_TRY { list.addActual(MOCKPP_STL::string("no-string")); } +#ifndef MOCKPP_NO_EXCEPTIONS catch(std::exception &ex) { std::cout << ex.what() << std::endl; } +#endif } @@ -168,14 +178,16 @@ mockpp::ExpectationList<MOCKPP_STL::string> list(MOCKPP_PCHAR("ExpectationListInstance") ); list.addExpected(MOCKPP_STL::string("string")); list.addActual(MOCKPP_STL::string("string")); - try + MOCKPP_TRY { list.addActual(MOCKPP_STL::string("no-string")); } +#ifndef MOCKPP_NO_EXCEPTIONS catch(std::exception &ex) { std::cout << ex.what() << std::endl; } +#endif } @@ -184,7 +196,7 @@ unsigned result = 0; std::cout << "Starting readability tests..\n"; - try + MOCKPP_TRY { std::cout << "--\n"; @@ -207,11 +219,13 @@ std::cout << "--\n"; } +#ifndef MOCKPP_NO_EXCEPTIONS catch(...) { std::cout << "Caught unexpected exception\n"; result = 1; } +#endif std::cout << "Finishing readability tests\n"; return result; Index: ResponseVector_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ResponseVector_test.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- ResponseVector_test.cpp 2 Nov 2005 20:57:30 -0000 1.4 +++ ResponseVector_test.cpp 28 Nov 2005 19:03:09 -0000 1.5 @@ -72,13 +72,15 @@ rtv.add(long(654), 31, 21, 11, MOCKPP_UNLIMITED); mockpp::Throwable *t; - + MOCKPP_ASSERT_TRUE(rtv.find(t, 30, 20, 10)); +#ifndef MOCKPP_NO_EXCEPTIONS MOCKPP_ASSERT_THROWING(t->throw_me(), MOCKPP_PCHAR("321"), int, int(321)); - +#endif + long r; MOCKPP_ASSERT_FALSE(rtv.find(r, 32, 22, 12)); MOCKPP_ASSERT_TRUE(rtv.find(r, 31, 21, 11)); @@ -113,34 +115,40 @@ void ResponseVector_Test::test_thrower() { mockpp::ResponseThrowableVector3<int, int, int> rtv(MOCKPP_PCHAR("rtv3"), 0); - + rtv.add(mockpp::make_throwable(int(123)), 10, 20, 30, 1); rtv.add(mockpp::make_throwable(int(321)), 30, 20, 10, MOCKPP_UNLIMITED); rtv.add(0, 10, 10, 10, MOCKPP_UNLIMITED); - + mockpp::Throwable *t; - + MOCKPP_ASSERT_TRUE(rtv.find(t, 30, 20, 10)); +#ifndef MOCKPP_NO_EXCEPTIONS MOCKPP_ASSERT_THROWING(t->throw_me(), MOCKPP_PCHAR("321"), int, int(321)); - +#endif + MOCKPP_ASSERT_TRUE(rtv.find(t, 10, 20, 30)); +#ifndef MOCKPP_NO_EXCEPTIONS MOCKPP_ASSERT_THROWING(t->throw_me(), MOCKPP_PCHAR("123"), int, int(123)); - +#endif + MOCKPP_ASSERT_FALSE(rtv.find(t, 10, 10, 10)); MOCKPP_ASSERT_FALSE(rtv.find(t, 10, 20, 30)); MOCKPP_ASSERT_TRUE(rtv.find(t, 30, 20, 10)); +#ifndef MOCKPP_NO_EXCEPTIONS MOCKPP_ASSERT_THROWING(t->throw_me(), MOCKPP_PCHAR("321"), int, int(321)); +#endif } Index: TrackingCounter_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/TrackingCounter_test.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- TrackingCounter_test.cpp 26 Nov 2005 17:57:48 -0000 1.8 +++ TrackingCounter_test.cpp 28 Nov 2005 19:03:09 -0000 1.9 @@ -337,16 +337,20 @@ ec.setExpected(2); ec.setFailOnVerify(); ec.inc(); +#ifndef MOCKPP_NO_EXCEPTIONS MOCKPP_ASSERT_THROWING_COND(ec.verify(), MOCKPP_PCHAR("test_client_verify()"), mockpp::AssertionFailedError, exception_object.getMessage().find(MOCKPP_PCHAR("tagged with 1 which is less ")) != MOCKPP_STL::string::npos); +#endif ec.inc(); ec.inc(); +#ifndef MOCKPP_NO_EXCEPTIONS MOCKPP_ASSERT_THROWING_COND(ec.verify(), MOCKPP_PCHAR("test_client_verify()"), mockpp::AssertionFailedError, exception_object.getMessage().find(MOCKPP_PCHAR("tagged with 3 which is more")) != MOCKPP_STL::string::npos); +#endif } @@ -368,16 +372,20 @@ master.setExpected(2); master.setFailOnVerify(); ec.inc(); +#ifndef MOCKPP_NO_EXCEPTIONS MOCKPP_ASSERT_THROWING_COND(master.verify(), MOCKPP_PCHAR("test_master_verify()"), mockpp::AssertionFailedError, exception_object.getMessage().find(MOCKPP_PCHAR("tagged 1 times which is less ")) != MOCKPP_STL::string::npos); +#endif ec.inc(); ec.inc(); +#ifndef MOCKPP_NO_EXCEPTIONS MOCKPP_ASSERT_THROWING_COND(master.verify(), MOCKPP_PCHAR("test_master_verify()"), mockpp::AssertionFailedError, exception_object.getMessage().find(MOCKPP_PCHAR("tagged 3 times which is more")) != MOCKPP_STL::string::npos); +#endif } Index: ThrowableList_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ThrowableList_test.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- ThrowableList_test.cpp 26 Nov 2005 17:57:48 -0000 1.15 +++ ThrowableList_test.cpp 28 Nov 2005 19:03:09 -0000 1.16 @@ -74,11 +74,12 @@ tl.push_back(mockpp::make_throwable(MOCKPP_STL::string("my-item 1"))); tl.addObjectToThrow(MOCKPP_STL::string("my-item 2")); - try + MOCKPP_TRY { tl.nextThrowableObject()->throw_me(); MOCKPP_FAIL(MOCKPP_PCHAR("Did not throw the exception")); } +#ifndef MOCKPP_NO_EXCEPTIONS catch(MOCKPP_STL::string &s) { MOCKPP_ASSERT_TRUE(s == "my-item 1"); @@ -87,12 +88,14 @@ { MOCKPP_FAIL(MOCKPP_PCHAR("Caught unexpected exception")); } +#endif - try + MOCKPP_TRY { tl.nextThrowableObject()->throw_me(); MOCKPP_FAIL(MOCKPP_PCHAR("Did not throw the exception")); } +#ifndef MOCKPP_NO_EXCEPTIONS catch(MOCKPP_STL::string &s) { MOCKPP_ASSERT_TRUE(s == "my-item 2"); @@ -101,6 +104,8 @@ { MOCKPP_FAIL(MOCKPP_PCHAR("Caught unexpected exception")); } +#endif + MOCKPP_ASSERT_TRUE(tl.hasMoreObjects() == false); tl.verify(); } Index: VisitableMockObject_5_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_5_void_test.cpp,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- VisitableMockObject_5_void_test.cpp 26 Nov 2005 17:57:49 -0000 1.24 +++ VisitableMockObject_5_void_test.cpp 28 Nov 2005 19:03:09 -0000 1.25 @@ -533,6 +533,7 @@ mvo.activate(); +#ifndef MOCKPP_NO_EXCEPTIONS MOCKPP_ASSERT_THROWING(mvo.visitable5(2, 2, 3, 4, 5), MOCKPP_PCSTRING("1"), MOCKPP_STL::string, "exceptional string 1"); @@ -541,7 +542,7 @@ MOCKPP_ASSERT_THROWING(mvo.visitable5(222, 2, 3, 4, 5), MOCKPP_PCSTRING("3"), MOCKPP_STL::string, "exceptional string 2"); - +#endif mvo.visitable5(2222, 2, 3, 4, 5); mvo.visitable5(22222, 2, 3, 4, 5); mvo.visitable5(222222, 2, 3, 4, 5); @@ -688,6 +689,7 @@ mvo.activate(); +#ifndef MOCKPP_NO_EXCEPTIONS MOCKPP_ASSERT_THROWING(mvo.visitable5(922, 2, 3, 4, 5), MOCKPP_PCHAR("response 1"), MOCKPP_STL::string, MOCKPP_STL::string("throw me 2")); @@ -699,7 +701,7 @@ MOCKPP_ASSERT_THROWING(mvo.visitable5(2, 2, 3, 4, 5), MOCKPP_PCHAR("default response"), MOCKPP_STL::string, MOCKPP_STL::string("throw default")); - +#endif mvo.verify(); } @@ -784,6 +786,7 @@ mockpp::eq<unsigned>(52)); mvo.activate(); +#ifndef MOCKPP_NO_EXCEPTIONS MOCKPP_ASSERT_THROWING(mvo.visitable5(8, 18, 28, 38, 48), MOCKPP_PCHAR("mvo.visitable5(8, 18, 28, 38, 48)"), int, @@ -793,7 +796,7 @@ MOCKPP_PCHAR("mvo.visitable5(12, 22, 32, 42, 52)"), int, 1); - +#endif mvo.visitable5(1, 1, 1, 1, 1); mvo.verify(); } @@ -851,10 +854,12 @@ mvo.activate(); +#ifndef MOCKPP_NO_EXCEPTIONS MOCKPP_ASSERT_THROWING(mvo.abc_visitable5(CA(10), CB(20), CC(30), CD(40), CE(50)), MOCKPP_PCHAR("mvo.abc_visitable5(CA(10), CB(20), CC(30), CD(40), CE(50))"), int, 2); +#endif mvo.abc_visitable5(CA(10), CB(20), CC(30), CD(40), CF(50)); Index: VisitableMockObject_4_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_4_test.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- VisitableMockObject_4_test.cpp 26 Nov 2005 17:57:48 -0000 1.19 +++ VisitableMockObject_4_test.cpp 28 Nov 2005 19:03:09 -0000 1.20 @@ -219,6 +219,7 @@ mvo.activate(); +#ifndef MOCKPP_NO_EXCEPTIONS MOCKPP_ASSERT_THROWING(mvo.visitable(1, 2, 3, 4), MOCKPP_PCSTRING("1"), MOCKPP_STL::string, "exceptional string 1"); @@ -230,6 +231,7 @@ MOCKPP_ASSERT_THROWING(mvo.visitable(1, 2, 3, 4), MOCKPP_PCSTRING("4"), MOCKPP_STL::string, "exceptional string 3"); +#endif } @@ -422,6 +424,7 @@ mvo.activate(); +#ifndef MOCKPP_NO_EXCEPTIONS MOCKPP_ASSERT_THROWING(mvo.visitable(922, 2, 3, 4), MOCKPP_PCHAR("response 1"), MOCKPP_STL::string, MOCKPP_STL::string("throw me 2")); @@ -433,6 +436,7 @@ MOCKPP_ASSERT_THROWING(mvo.visitable(2, 2, 3, 4), MOCKPP_PCHAR("default response"), MOCKPP_STL::string, MOCKPP_STL::string("throw default")); +#endif } @@ -462,11 +466,13 @@ MOCKPP_ASSERT_TRUE(321 == mvo.visitable(654, 2, 3, 4)); MOCKPP_ASSERT_TRUE(111 == mvo.visitable(1, 2, 3, 4)); +#ifndef MOCKPP_NO_EXCEPTIONS MOCKPP_ASSERT_THROWING(mvo.visitable(922, 2, 3, 4), MOCKPP_PCHAR("response 1"), MOCKPP_STL::string, MOCKPP_STL::string("throw me 2")); MOCKPP_ASSERT_THROWING(mvo.visitable(911, 2, 3, 4), MOCKPP_PCHAR("response 2"), MOCKPP_STL::string, MOCKPP_STL::string("throw me 1")); +#endif MOCKPP_ASSERT_TRUE(111 == mvo.visitable(2, 2, 3, 4)); MOCKPP_ASSERT_TRUE(111 == mvo.visitable(3, 2, 3, 4)); @@ -530,25 +536,29 @@ mvo.unsetThrowablesInline(); // old pre-1.2 mode mvo.activate(); - try + MOCKPP_TRY { mvo.visitable(1, 2, 3, 4); MOCKPP_FAIL(MOCKPP_PCHAR("should have thrown here")); } +#ifndef MOCKPP_NO_EXCEPTIONS catch(MOCKPP_STL::string &ex) { MOCKPP_ASSERT_EQUALS(ex, MOCKPP_STL::string("throw 1")); } +#endif - try + MOCKPP_TRY { mvo.visitable(1, 2, 3, 4); MOCKPP_FAIL(MOCKPP_PCHAR("should have thrown here")); } +#ifndef MOCKPP_NO_EXCEPTIONS catch(MOCKPP_STL::string &ex) { MOCKPP_ASSERT_EQUALS(ex, MOCKPP_STL::string("throw 2")); } +#endif MOCKPP_ASSERT_TRUE(111 == mvo.visitable(1, 2, 3, 4)); MOCKPP_ASSERT_TRUE(222 == mvo.visitable(1, 2, 3, 4)); @@ -569,28 +579,30 @@ MOCKPP_ASSERT_TRUE(111 == mvo.visitable(1, 2, 3, 4)); - try + MOCKPP_TRY { mvo.visitable(1, 2, 3, 4); MOCKPP_FAIL(MOCKPP_PCHAR("should have thrown here")); } +#ifndef MOCKPP_NO_EXCEPTIONS catch(MOCKPP_STL::string &ex) { MOCKPP_ASSERT_EQUALS(ex, MOCKPP_STL::string("throw 1")); } - +#endif MOCKPP_ASSERT_TRUE(222 == mvo.visitable(1, 2, 3, 4)); - try + MOCKPP_TRY { mvo.visitable(1, 2, 3, 4); MOCKPP_FAIL(MOCKPP_PCHAR("should have thrown here")); } +#ifndef MOCKPP_NO_EXCEPTIONS catch(MOCKPP_STL::string &ex) { MOCKPP_ASSERT_EQUALS(ex, MOCKPP_STL::string("throw 2")); } - +#endif mvo.verify(); } @@ -666,6 +678,7 @@ MOCKPP_ASSERT_TRUE(1 == mvo.visitable(11, 21, 31, 51)); MOCKPP_ASSERT_TRUE(2 == mvo.visitable(9, 19, 29, 49)); +#ifndef MOCKPP_NO_EXCEPTIONS MOCKPP_ASSERT_THROWING(mvo.visitable(8, 18, 28, 48), MOCKPP_PCHAR("mvo.visitable(8, 18, 28, 48)"), int, @@ -675,6 +688,7 @@ MOCKPP_PCHAR("mvo.visitable(12, 22, 32, 52)"), int, 1); +#endif MOCKPP_ASSERT_TRUE(123 == mvo.visitable(1, 1, 1, 1)); mvo.verify(); Index: VisitableMockObject_1_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_1_test.cpp,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- VisitableMockObject_1_test.cpp 26 Nov 2005 17:57:48 -0000 1.21 +++ VisitableMockObject_1_test.cpp 28 Nov 2005 19:03:09 -0000 1.22 @@ -200,6 +200,7 @@ mvo.activate(); +#ifndef MOCKPP_NO_EXCEPTIONS MOCKPP_ASSERT_THROWING(mvo.visitable(1), MOCKPP_PCSTRING("1"), MOCKPP_STL::string, "exceptional string 1"); @@ -211,6 +212,7 @@ MOCKPP_ASSERT_THROWING(mvo.visitable(1), MOCKPP_PCSTRING("4"), MOCKPP_STL::string, "exceptional string 3"); +#endif } @@ -388,6 +390,7 @@ mvo.activate(); +#ifndef MOCKPP_NO_EXCEPTIONS MOCKPP_ASSERT_THROWING(mvo.visitable(922), MOCKPP_PCHAR("response 1"), MOCKPP_STL::string, MOCKPP_STL::string("throw me 1")); @@ -399,6 +402,7 @@ MOCKPP_ASSERT_THROWING(mvo.visitable(2), MOCKPP_PCHAR("default response"), MOCKPP_STL::string, MOCKPP_STL::string("throw default")); +#endif } @@ -428,11 +432,13 @@ MOCKPP_ASSERT_TRUE(321 == mvo.visitable(654)); MOCKPP_ASSERT_TRUE(111 == mvo.visitable(1)); +#ifndef MOCKPP_NO_EXCEPTIONS MOCKPP_ASSERT_THROWING(mvo.visitable(922), MOCKPP_PCHAR("response 1"), MOCKPP_STL::string, MOCKPP_STL::string("throw me 1")); MOCKPP_ASSERT_THROWING(mvo.visitable(911), MOCKPP_PCHAR("response 2"), MOCKPP_STL::string, MOCKPP_STL::string("throw me 2")); +#endif MOCKPP_ASSERT_TRUE(111 == mvo.visitable(2)); MOCKPP_ASSERT_TRUE(111 == mvo.visitable(3)); @@ -496,25 +502,29 @@ mvo.unsetThrowablesInline(); // old pre-1.2 mode mvo.activate(); - try + MOCKPP_TRY { mvo.visitable(1); MOCKPP_FAIL(MOCKPP_PCHAR("should have thrown here")); } +#ifndef MOCKPP_NO_EXCEPTIONS catch(MOCKPP_STL::string &ex) { MOCKPP_ASSERT_EQUALS(ex, MOCKPP_STL::string("throw 1")); } +#endif - try + MOCKPP_TRY { mvo.visitable(1); MOCKPP_FAIL(MOCKPP_PCHAR("should have thrown here")); } +#ifndef MOCKPP_NO_EXCEPTIONS catch(MOCKPP_STL::string &ex) { MOCKPP_ASSERT_EQUALS(ex, MOCKPP_STL::string("throw 2")); } +#endif MOCKPP_ASSERT_TRUE(111 == mvo.visitable(3)); MOCKPP_ASSERT_TRUE(222 == mvo.visitable(3)); @@ -535,28 +545,31 @@ MOCKPP_ASSERT_TRUE(111 == mvo.visitable(3)); - try + MOCKPP_TRY { mvo.visitable(1); MOCKPP_FAIL(MOCKPP_PCHAR("should have thrown here")); } +#ifndef MOCKPP_NO_EXCEPTIONS catch(MOCKPP_STL::string &ex) { MOCKPP_ASSERT_EQUALS(ex, MOCKPP_STL::string("throw 1")); } +#endif MOCKPP_ASSERT_TRUE(222 == mvo.visitable(3)); - try + MOCKPP_TRY { mvo.visitable(1); MOCKPP_FAIL(MOCKPP_PCHAR("should have thrown here")); } +#ifndef MOCKPP_NO_EXCEPTIONS catch(MOCKPP_STL::string &ex) { MOCKPP_ASSERT_EQUALS(ex, MOCKPP_STL::string("throw 2")); } - +#endif mvo.verify(); } @@ -607,6 +620,7 @@ MOCKPP_ASSERT_TRUE(1 == mvo.visitable(11)); MOCKPP_ASSERT_TRUE(2 == mvo.visitable(9)); +#ifndef MOCKPP_NO_EXCEPTIONS MOCKPP_ASSERT_THROWING(mvo.visitable(8), MOCKPP_PCHAR("mvo.visitable(8)"), int, @@ -616,6 +630,7 @@ MOCKPP_PCHAR("mvo.visitable(12)"), int, 1); +#endif MOCKPP_ASSERT_TRUE(123 == mvo.visitable(1)); mvo.verify(); Index: VisitableMockObject_1_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_1_void_test.cpp,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- VisitableMockObject_1_void_test.cpp 26 Nov 2005 17:57:48 -0000 1.21 +++ VisitableMockObject_1_void_test.cpp 28 Nov 2005 19:03:09 -0000 1.22 @@ -177,6 +177,7 @@ mvo.activate(); +#ifndef MOCKPP_NO_EXCEPTIONS MOCKPP_ASSERT_THROWING(mvo.visitable(2), MOCKPP_PCSTRING("1"), MOCKPP_STL::string, "exceptional string 1"); @@ -185,7 +186,7 @@ MOCKPP_ASSERT_THROWING(mvo.visitable(222), MOCKPP_PCSTRING("3"), MOCKPP_STL::string, "exceptional string 2"); - +#endif mvo.visitable(2222); mvo.visitable(22222); mvo.visitable(222222); @@ -295,6 +296,7 @@ mvo.activate(); +#ifndef MOCKPP_NO_EXCEPTIONS MOCKPP_ASSERT_THROWING(mvo.visitable(922), MOCKPP_PCHAR("response 1"), MOCKPP_STL::string, MOCKPP_STL::string("throw me 1")); @@ -306,7 +308,7 @@ MOCKPP_ASSERT_THROWING(mvo.visitable(2), MOCKPP_PCHAR("default response"), MOCKPP_STL::string, MOCKPP_STL::string("throw default")); - +#endif mvo.verify(); } @@ -374,6 +376,7 @@ mvo.activate(); +#ifndef MOCKPP_NO_EXCEPTIONS MOCKPP_ASSERT_THROWING(mvo.visitable(8), MOCKPP_PCHAR("mvo.visitable(8)"), int, @@ -383,7 +386,7 @@ MOCKPP_PCHAR("mvo.visitable(12)"), int, 1); - +#endif mvo.visitable(1); mvo.verify(); } Index: VisitableMockObject_2_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_2_test.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- VisitableMockObject_2_test.cpp 26 Nov 2005 17:57:48 -0000 1.20 +++ VisitableMockObject_2_test.cpp 28 Nov 2005 19:03:09 -0000 1.21 @@ -206,6 +206,7 @@ mvo.activate(); +#ifndef MOCKPP_NO_EXCEPTIONS MOCKPP_ASSERT_THROWING(mvo.visitable(1, 2), MOCKPP_PCSTRING("1"), MOCKPP_STL::string, "exceptional string 1"); @@ -217,6 +218,7 @@ MOCKPP_ASSERT_THROWING(mvo.visitable(1, 2), MOCKPP_PCSTRING("4"), MOCKPP_STL::string, "exceptional string 3"); +#endif } @@ -399,6 +401,7 @@ mvo.activate(); +#ifndef MOCKPP_NO_EXCEPTIONS MOCKPP_ASSERT_THROWING(mvo.visitable(922, 2), MOCKPP_PCHAR("response 1"), MOCKPP_STL::string, MOCKPP_STL::string("throw me 2")); @@ -410,6 +413,7 @@ MOCKPP_ASSERT_THROWING(mvo.visitable(2, 2), MOCKPP_PCHAR("default response"), MOCKPP_STL::string, MOCKPP_STL::string("throw default")); +#endif } @@ -439,11 +443,13 @@ MOCKPP_ASSERT_TRUE(321 == mvo.visitable(654, 2)); MOCKPP_ASSERT_TRUE(111 == mvo.visitable(1, 2)); +#ifndef MOCKPP_NO_EXCEPTIONS MOCKPP_ASSERT_THROWING(mvo.visitable(922, 2), MOCKPP_PCHAR("response 1"), MOCKPP_STL::string, MOCKPP_STL::string("throw me 2")); MOCKPP_ASSERT_THROWING(mvo.visitable(911, 2), MOCKPP_PCHAR("response 2"), MOCKPP_STL::string, MOCKPP_STL::string("throw me 1")); +#endif MOCKPP_ASSERT_TRUE(111 == mvo.visitable(2, 2)); MOCKPP_ASSERT_TRUE(111 == mvo.visitable(3, 2)); @@ -507,25 +513,29 @@ mvo.unsetThrowablesInline(); // old pre-1.2 mode mvo.activate(); - try + MOCKPP_TRY { mvo.visitable(1, 2); MOCKPP_FAIL(MOCKPP_PCHAR("should have thrown here")); } +#ifndef MOCKPP_NO_EXCEPTIONS catch(MOCKPP_STL::string &ex) { MOCKPP_ASSERT_EQUALS(ex, MOCKPP_STL::string("throw 1")); } +#endif - try + MOCKPP_TRY { mvo.visitable(1, 2); MOCKPP_FAIL(MOCKPP_PCHAR("should have thrown here")); } +#ifndef MOCKPP_NO_EXCEPTIONS catch(MOCKPP_STL::string &ex) { MOCKPP_ASSERT_EQUALS(ex, MOCKPP_STL::string("throw 2")); } +#endif MOCKPP_ASSERT_TRUE(111 == mvo.visitable(1, 2)); MOCKPP_ASSERT_TRUE(222 == mvo.visitable(1, 2)); @@ -546,27 +556,31 @@ MOCKPP_ASSERT_TRUE(111 == mvo.visitable(1, 2)); - try + MOCKPP_TRY { mvo.visitable(1, 2); MOCKPP_FAIL(MOCKPP_PCHAR("should have thrown here")); } +#ifndef MOCKPP_NO_EXCEPTIONS catch(MOCKPP_STL::string &ex) { MOCKPP_ASSERT_EQUALS(ex, MOCKPP_STL::string("throw 1")); } +#endif MOCKPP_ASSERT_TRUE(222 == mvo.visitable(1, 2)); - try + MOCKPP_TRY { mvo.visitable(1, 2); MOCKPP_FAIL(MOCKPP_PCHAR("should have thrown here")); } +#ifndef MOCKPP_NO_EXCEPTIONS catch(MOCKPP_STL::string &ex) { MOCKPP_ASSERT_EQUALS(ex, MOCKPP_STL::string("throw 2")); } +#endif mvo.verify(); } @@ -625,6 +639,7 @@ MOCKPP_ASSERT_TRUE(1 == mvo.visitable(11, 51)); MOCKPP_ASSERT_TRUE(2 == mvo.visitable(9, 49)); +#ifndef MOCKPP_NO_EXCEPTIONS MOCKPP_ASSERT_THROWING(mvo.visitable(8, 48), MOCKPP_PCHAR("mvo.visitable(8, 48)"), int, @@ -634,6 +649,7 @@ MOCKPP_PCHAR("mvo.visitable(12, 52)"), int, 1); +#endif MOCKPP_ASSERT_TRUE(123 == mvo.visitable(1, 1)); mvo.verify(); Index: VisitableMockObject_2_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_2_void_test.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- VisitableMockObject_2_void_test.cpp 26 Nov 2005 17:57:48 -0000 1.20 +++ VisitableMockObject_2_void_test.cpp 28 Nov 2005 19:03:09 -0000 1.21 @@ -183,6 +183,7 @@ mvo.activate(); +#ifndef MOCKPP_NO_EXCEPTIONS MOCKPP_ASSERT_THROWING(mvo.visitable(2, 2), MOCKPP_PCSTRING("1"), MOCKPP_STL::string, "exceptional string 1"); @@ -191,7 +192,7 @@ MOCKPP_ASSERT_THROWING(mvo.visitable(222, 2), MOCKPP_PCSTRING("3"), MOCKPP_STL::string, "exceptional string 2"); - +#endif mvo.visitable(2222, 2); mvo.visitable(22222, 2); mvo.visitable(222222, 2); @@ -304,6 +305,7 @@ mvo.activate(); +#ifndef MOCKPP_NO_EXCEPTIONS MOCKPP_ASSERT_THROWING(mvo.visitable(922, 2), MOCKPP_PCHAR("response 1"), MOCKPP_STL::string, MOCKPP_STL::string("throw me 2")); @@ -315,7 +317,7 @@ MOCKPP_ASSERT_THROWING(mvo.visitable(2, 2), MOCKPP_PCHAR("default response"), MOCKPP_STL::string, MOCKPP_STL::string("throw default")); - +#endif mvo.verify(); } @@ -386,6 +388,7 @@ mvo.activate(); +#ifndef MOCKPP_NO_EXCEPTIONS MOCKPP_ASSERT_THROWING(mvo.visitable(8, 48), MOCKPP_PCHAR("mvo.visitable(8, 48)"), int, @@ -395,7 +398,7 @@ MOCKPP_PCHAR("mvo.visitable(12, 52)"), int, 1); - +#endif mvo.visitable(1, 1); mvo.verify(); } Index: VisitableMockObject_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_test.cpp,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- VisitableMockObject_test.cpp 26 Nov 2005 17:57:49 -0000 1.24 +++ VisitableMockObject_test.cpp 28 Nov 2005 19:03:09 -0000 1.25 @@ -200,6 +200,7 @@ mvo.activate(); +#ifndef MOCKPP_NO_EXCEPTIONS MOCKPP_ASSERT_THROWING(mvo.visitable(), MOCKPP_PCSTRING("1"), MOCKPP_STL::string, "exceptional string 1"); @@ -211,6 +212,8 @@ MOCKPP_ASSERT_THROWING(mvo.visitable(), MOCKPP_PCSTRING("4"), MOCKPP_STL::string, "exceptional string 3"); +#endif + mvo.verify(); } @@ -237,10 +240,12 @@ mvo.activate(); mvo.visitable(); +#ifndef MOCKPP_NO_EXCEPTIONS MOCKPP_ASSERT_THROWING_COND(mvo.verify(), MOCKPP_PCSTRING("mvo.verify()"), mockpp::AssertionFailedError, exception_object.getMessage().find(MOCKPP_PCHAR("did not receive the expected item list")) != mockpp::String::npos); +#endif } @@ -384,25 +389,29 @@ mvo.unsetThrowablesInline(); // old pre-1.2 mode mvo.activate(); - try + MOCKPP_TRY { mvo.visitable(); MOCKPP_FAIL(MOCKPP_PCHAR("should have thrown here")); } +#ifndef MOCKPP_NO_EXCEPTIONS catch(MOCKPP_STL::string &ex) { MOCKPP_ASSERT_EQUALS(ex, MOCKPP_STL::string("throw 1")); } +#endif - try + MOCKPP_TRY { mvo.visitable(); MOCKPP_FAIL(MOCKPP_PCHAR("should have thrown here")); } +#ifndef MOCKPP_NO_EXCEPTIONS catch(MOCKPP_STL::string &ex) { MOCKPP_ASSERT_EQUALS(ex, MOCKPP_STL::string("throw 2")); } +#endif MOCKPP_ASSERT_TRUE(111 == mvo.visitable()); MOCKPP_ASSERT_TRUE(222 == mvo.visitable()); @@ -423,27 +432,31 @@ MOCKPP_ASSERT_TRUE(111 == mvo.visitable()); - try + MOCKPP_TRY { mvo.visitable(); MOCKPP_FAIL(MOCKPP_PCHAR("should have thrown here")); } +#ifndef MOCKPP_NO_EXCEPTIONS catch(MOCKPP_STL::string &ex) { MOCKPP_ASSERT_EQUALS(ex, MOCKPP_STL::string("throw 1")); } MOCKPP_ASSERT_TRUE(222 == mvo.visitable()); +#endif - try + MOCKPP_TRY { mvo.visitable(); MOCKPP_FAIL(MOCKPP_PCHAR("should have thrown here")); } +#ifndef MOCKPP_NO_EXCEPTIONS catch(MOCKPP_STL::string &ex) { MOCKPP_ASSERT_EQUALS(ex, MOCKPP_STL::string("throw 2")); } +#endif mvo.verify(); } Index: VisitableMockObject_3_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_3_void_test.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- VisitableMockObject_3_void_test.cpp 26 Nov 2005 17:57:48 -0000 1.19 +++ VisitableMockObject_3_void_test.cpp 28 Nov 2005 19:03:09 -0000 1.20 @@ -189,6 +189,7 @@ mvo.activate(); +#ifndef MOCKPP_NO_EXCEPTIONS MOCKPP_ASSERT_THROWING(mvo.visitable(2, 2, 3), MOCKPP_PCSTRING("1"), MOCKPP_STL::string, "exceptional string 1"); @@ -197,7 +198,7 @@ MOCKPP_ASSERT_THROWING(mvo.visitable(222, 2, 3), MOCKPP_PCSTRING("3"), MOCKPP_STL::string, "exceptional string 2"); - +#endif mvo.visitable(2222, 2, 3); mvo.visitable(22222, 2, 3); mvo.visitable(222222, 2, 3); @@ -313,6 +314,7 @@ mvo.activate(); +#ifndef MOCKPP_NO_EXCEPTIONS MOCKPP_ASSERT_THROWING(mvo.visitable(922, 2, 3), MOCKPP_PCHAR("response 1"), MOCKPP_STL::string, MOCKPP_STL::string("throw me 2")); @@ -324,7 +326,7 @@ MOCKPP_ASSERT_THROWING(mvo.visitable(2, 2, 3), MOCKPP_PCHAR("default response"), MOCKPP_STL::string, MOCKPP_STL::string("throw default")); - +#endif mvo.verify(); } @@ -400,6 +402,7 @@ mvo.activate(); +#ifndef MOCKPP_NO_EXCEPTIONS MOCKPP_ASSERT_THROWING(mvo.visitable(8, 18, 48), MOCKPP_PCHAR("mvo.visitable(8, 18, 48)"), int, @@ -409,7 +412,7 @@ MOCKPP_PCHAR("mvo.visitable(12, 22, 52)"), int, 1); - +#endif mvo.visitable(1, 1, 1); mvo.verify(); } Index: VisitableMockMethod_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockMethod_test.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- VisitableMockMethod_test.cpp 24 Nov 2005 19:46:10 -0000 1.16 +++ VisitableMockMethod_test.cpp 28 Nov 2005 19:03:09 -0000 1.17 @@ -193,6 +193,7 @@ vmb.setDefaultThrowable(mockpp::make_throwable(321u)); vmo.activate(); +#ifndef MOCKPP_NO_EXCEPTIONS MOCKPP_ASSERT_THROWING(vmb.throwAvailableException(), MOCKPP_PCHAR("vmb.throwAvailableException()"), unsigned, @@ -217,6 +218,7 @@ MOCKPP_PCHAR("vmb.throwAvailableException()"), unsigned, unsigned(321)); +#endif vmo.verify(); vmb.verify(); @@ -227,10 +229,12 @@ vmb.setDefaultThrowable(mockpp::make_throwable(321u)); vmo.activate(); +#ifndef MOCKPP_NO_EXCEPTIONS MOCKPP_ASSERT_THROWING_COND(vmo.verify(), MOCKPP_PCHAR("vmo.verify()"), mockpp::AssertionFailedError, exception_object.getMessage().find(MOCKPP_PCHAR("/defaultThrowable is unused")) != mockpp::String::npos); +#endif } @@ -282,10 +286,12 @@ vmb.throwAvailableException(); vmb.throwAvailableException(); +#ifndef MOCKPP_NO_EXCEPTIONS MOCKPP_ASSERT_THROWING(vmb.throwAvailableException(), MOCKPP_PCHAR("vmb.throwAvailableException()-1"), unsigned, unsigned(123)); +#endif vmo.verify(); vmb.verify(); @@ -299,10 +305,12 @@ vmb.addThrowable(mockpp::make_throwable(123u)); vmo.activate(); +#ifndef MOCKPP_NO_EXCEPTIONS MOCKPP_ASSERT_THROWING(vmb.throwAvailableException(), MOCKPP_PCHAR("vmb.throwAvailableException()-2"), unsigned, unsigned(123)); +#endif MOCKPP_ASSERT_EQUALS(321, vmb.determineReturnValue()); MOCKPP_ASSERT_EQUALS(321, vmb.determineReturnValue()); @@ -315,10 +323,12 @@ vmo.reset(); vmb.setDefaultReturnValue(123); +#ifndef MOCKPP_NO_EXCEPTIONS MOCKPP_ASSERT_THROWING_COND(vmo.verify(), MOCKPP_PCHAR("vmo.verify()"), mockpp::AssertionFailedError, exception_object.getMessage().find(MOCKPP_PCHAR("/defaultReturnValueUsed is unused")) != mockpp::String::npos); +#endif } @@ -351,17 +361,21 @@ MOCKPP_ASSERT_EQUALS(321, vmo.visitable()); +#ifndef MOCKPP_NO_EXCEPTIONS MOCKPP_ASSERT_THROWING(vmo.visitable(), MOCKPP_PCHAR("vmo.visitable()-1a"), unsigned, unsigned(123)); +#endif MOCKPP_ASSERT_EQUALS(432, vmo.visitable()); +#ifndef MOCKPP_NO_EXCEPTIONS MOCKPP_ASSERT_THROWING(vmo.visitable(), MOCKPP_PCHAR("vmo.visitable()-1b"), unsigned, unsigned(321)); +#endif MOCKPP_ASSERT_EQUALS(123, vmo.visitable()); @@ -388,6 +402,7 @@ vmo.activate(); +#ifndef MOCKPP_NO_EXCEPTIONS MOCKPP_ASSERT_THROWING(vmo.visitable(), MOCKPP_PCHAR("vmo.visitable()-2a"), unsigned, @@ -397,6 +412,7 @@ MOCKPP_PCHAR("vmo.visitable()-2b"), unsigned, unsigned(321)); +#endif MOCKPP_ASSERT_EQUALS(321, vmo.visitable()); MOCKPP_ASSERT_EQUALS(432, vmo.visitable()); @@ -417,6 +433,7 @@ vmo.activate(); +#ifndef MOCKPP_NO_EXCEPTIONS MOCKPP_ASSERT_THROWING(vmo.visitable(), MOCKPP_PCHAR("vmo.visitable()-3a"), unsigned, @@ -431,6 +448,7 @@ MOCKPP_PCHAR("vmo.visitable()-3c"), unsigned, unsigned(111)); +#endif vmo.verify(); vmb.verify(); @@ -463,6 +481,7 @@ vmo.activate(); +#ifndef MOCKPP_NO_EXCEPTIONS MOCKPP_ASSERT_THROWING(vmo.visitablev(), MOCKPP_PCHAR("vmo.visitablev()-1a"), unsigned, @@ -472,6 +491,7 @@ MOCKPP_PCHAR("vmo.visitablev()-1b"), unsigned, unsigned(321)); +#endif vmo.visitablev(); vmo.visitable(); @@ -497,6 +517,7 @@ vmo.activate(); +#ifndef MOCKPP_NO_EXCEPTIONS MOCKPP_ASSERT_THROWING(vmo.visitablev(), MOCKPP_PCHAR("vmo.visitablev()-2a"), unsigned, @@ -506,6 +527,7 @@ MOCKPP_PCHAR("vmo.visitablev()-2b"), unsigned, unsigned(321)); +#endif vmo.visitablev(); vmo.visitablev(); @@ -525,6 +547,7 @@ vmo.visitablev(); vmo.activate(); +#ifndef MOCKPP_NO_EXCEPTIONS MOCKPP_ASSERT_THROWING(vmo.visitablev(), MOCKPP_PCHAR("vmo.visitablev()-3a"), unsigned, @@ -539,6 +562,7 @@ MOCKPP_PCHAR("vmo.visitablev()-3c"), unsigned, unsigned(111)); +#endif vmo.verify(); vmb.verify(); Index: Assert_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/Assert_test.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- Assert_test.cpp 26 Nov 2005 17:57:48 -0000 1.18 +++ Assert_test.cpp 28 Nov 2005 19:03:09 -0000 1.19 @@ -103,132 +103,152 @@ bool thrown; thrown = false; - try + MOCKPP_TRY { MOCKPP_ASSERT_EQUALS_MESSAGE(MOCKPP_PCHAR("equals 1==2"), 1, 2); } +#ifndef MOCKPP_NO_EXCEPTIONS catch (mockpp::AssertionFailedError &ae) { thrown = true; MOCKPP_ASSERT_TRUE(MOCKPP_PCHAR("equals 1==2") == ae.getMessage()); } +#endif MOCKPP_ASSERT_TRUE(thrown == true); thrown = false; - try + MOCKPP_TRY { MOCKPP_ASSERT_EQUALS(123, 321); } +#ifndef MOCKPP_NO_EXCEPTIONS catch (mockpp::AssertionFailedError &ae) { thrown = true; MOCKPP_ASSERT_TRUE(MOCKPP_PCHAR("invalid: 123 == 321") == ae.getMessage()); } +#endif MOCKPP_ASSERT_TRUE(thrown == true); thrown = false; - try + MOCKPP_TRY { MOCKPP_ASSERT_DELTA_MESSAGE(MOCKPP_PCHAR("range 1 +- 2 == 4"), 1, 4, 2); } +#ifndef MOCKPP_NO_EXCEPTIONS catch (mockpp::AssertionFailedError &ae) { thrown = true; MOCKPP_ASSERT_TRUE(MOCKPP_PCHAR("range 1 +- 2 == 4") == ae.getMessage()); } +#endif MOCKPP_ASSERT_TRUE(thrown == true); thrown = false; - try + MOCKPP_TRY { MOCKPP_ASSERT_DELTA(123, 321, 3); } +#ifndef MOCKPP_NO_EXCEPTIONS catch (mockpp::AssertionFailedError &ae) { thrown = true; MOCKPP_ASSERT_TRUE(MOCKPP_PCHAR("invalid: 123 +- 3 == 321") == ae.getMessage()); } +#endif MOCKPP_ASSERT_TRUE(thrown == true); thrown = false; - try + MOCKPP_TRY { MOCKPP_ASSERT_BOUNDARY(123, 321, 789); } +#ifndef MOCKPP_NO_EXCEPTIONS catch (mockpp::AssertionFailedError &ae) { thrown = true; MOCKPP_ASSERT_TRUE(MOCKPP_PCHAR("invalid: 123 < 789 < 321") == ae.getMessage()); } +#endif MOCKPP_ASSERT_TRUE(thrown == true); thrown = false; - try + MOCKPP_TRY { MOCKPP_ASSERT_BOUNDARY_MESSAGE(MOCKPP_PCHAR("123 321 789"), 123, 321, 789); } - catch (mockpp::AssertionFailedError &ae) +#ifndef MOCKPP_NO_EXCEPTIONS +catch (mockpp::AssertionFailedError &ae) { thrown = true; MOCKPP_ASSERT_TRUE(MOCKPP_PCHAR("123 321 789") == ae.getMessage()); } +#endif MOCKPP_ASSERT_TRUE(thrown == true); thrown = false; - try + MOCKPP_TRY { MOCKPP_ASSERT_TRUE_MESSAGE(MOCKPP_PCHAR("condition true == false"), true == false); } +#ifndef MOCKPP_NO_EXCEPTIONS catch (mockpp::AssertionFailedError &ae) { thrown = true; MOCKPP_ASSERT_TRUE(MOCKPP_PCHAR("condition true == false") == ae.getMessage()); } +#endif MOCKPP_ASSERT_TRUE(thrown == true); thrown = false; - try + MOCKPP_TRY { MOCKPP_ASSERT_TRUE( true == false ); // some spaces AROUND the expression } +#ifndef MOCKPP_NO_EXCEPTIONS catch (mockpp::AssertionFailedError &ae) { thrown = true; MOCKPP_ASSERT_TRUE(MOCKPP_PCHAR("!true: true == false") == ae.getMessage()); } +#endif MOCKPP_ASSERT_TRUE(thrown == true); thrown = false; - try + MOCKPP_TRY { MOCKPP_ASSERT_FALSE_MESSAGE(MOCKPP_PCHAR("condition true != false"), true != false); } +#ifndef MOCKPP_NO_EXCEPTIONS catch (mockpp::AssertionFailedError &ae) { thrown = true; MOCKPP_ASSERT_TRUE(MOCKPP_PCHAR("condition true != false") == ae.getMessage()); } +#endif MOCKPP_ASSERT_TRUE(thrown == true); thrown = false; - try + MOCKPP_TRY { MOCKPP_ASSERT_FALSE( true != false ); // some spaces AROUND the expression } +#ifndef MOCKPP_NO_EXCEPTIONS catch (mockpp::AssertionFailedError &ae) { thrown = true; MOCKPP_ASSERT_TRUE(MOCKPP_PCHAR("!false: true != false") == ae.getMessage()); } +#endif MOCKPP_ASSERT_TRUE(thrown == true); } @@ -242,27 +262,31 @@ bool thrown = false; - try + MOCKPP_TRY { MOCKPP_ASSERT_EQUALS_MESSAGE(MOCKPP_PCHAR("assertEquals \"123\" == \"321\""), MOCKPP_STL::string("123"), MOCKPP_STL::string("321")); } +#ifndef MOCKPP_NO_EXCEPTIONS catch(mockpp::AssertionFailedError &) { thrown = true; } +#endif MOCKPP_ASSERT_TRUE(thrown == true); thrown = false; - try + MOCKPP_TRY { MOCKPP_ASSERT_EQUALS_MESSAGE(MOCKPP_PCHAR(""), MOCKPP_STL::string("123"), MOCKPP_STL::string("321")); } +#ifndef MOCKPP_NO_EXCEPTIONS catch(mockpp::AssertionFailedError &) { thrown = true; } +#endif MOCKPP_ASSERT_TRUE(thrown == true); } @@ -278,27 +302,31 @@ bool thrown = false; - try + MOCKPP_TRY { MOCKPP_ASSERT_EQUALS_MESSAGE(MOCKPP_PCHAR("assertEquals \"123\" == \"321\""), MOCKPP_STL::basic_string<wchar_t>(L"123"), MOCKPP_STL::basic_string<wchar_t>(L"321")); } +#ifndef MOCKPP_NO_EXCEPTIONS catch(mockpp::AssertionFailedError &) { thrown = true; } +#endif MOCKPP_ASSERT_TRUE(thrown == true); thrown = false; - try + MOCKPP_TRY { MOCKPP_ASSERT_EQUALS_MESSAGE(MOCKPP_PCHAR(""), MOCKPP_STL::basic_string<wchar_t>(L"123"), MOCKPP_STL::basic_string<wchar_t>(L"321")); } +#ifndef MOCKPP_NO_EXCEPTIONS catch(mockpp::AssertionFailedError &) { thrown = true; } +#endif MOCKPP_ASSERT_TRUE(thrown == true); } @@ -313,27 +341,31 @@ bool thrown = false; - try + MOCKPP_TRY { MOCKPP_ASSERT_EQUALS_MESSAGE(MOCKPP_PCHAR("assertEquals \"123\" == \"321\""), "123", "321"); } +#ifndef MOCKPP_NO_EXCEPTIONS catch(mockpp::AssertionFailedError &) { thrown = true; } +#endif MOCKPP_ASSERT_TRUE(thrown == true); thrown = false; - try + MOCKPP_TRY { MOCKPP_ASSERT_EQUALS_MESSAGE(MOCKPP_PCHAR(""), "123", "321"); } +#ifndef MOCKPP_NO_EXCEPTIONS catch(mockpp::AssertionFailedError &) { thrown = true; } +#endif MOCKPP_ASSERT_TRUE(thrown == true); } @@ -348,27 +380,31 @@ bool thrown = false; - try + MOCKPP_TRY { MOCKPP_ASSERT_EQUALS_MESSAGE(MOCKPP_PCHAR("assertEquals \"123\" == \"321\""), L"123", L"321"); } +#ifndef MOCKPP_NO_EXCEPTIONS catch(mockpp::AssertionFailedError &) { thrown = true; } +#endif MOCKPP_ASSERT_TRUE(thrown == true); thrown = false; - try + MOCKPP_TRY { MOCKPP_ASSERT_EQUALS_MESSAGE(MOCKPP_PCHAR(""), L"123", L"321"); } +#ifndef MOCKPP_NO_EXCEPTIONS catch(mockpp::AssertionFailedError &) { thrown = true; } +#endif MOCKPP_ASSERT_TRUE(thrown == true); } @@ -382,26 +418,30 @@ MOCKPP_ASSERT_EQUALS_MESSAGE(MOCKPP_PCHAR(""), (long) -12345678, (long) -12345678); bool thrown = false; - try + MOCKPP_TRY { MOCKPP_ASSERT_EQUALS_MESSAGE(MOCKPP_PCHAR("assertEquals 12345678 == 876543321"), (long) 12345678, (long) 87654321); } +#ifndef MOCKPP_NO_EXCEPTIONS catch(mockpp::AssertionFailedError &) { thrown = true; } +#endif MOCKPP_ASSERT_TRUE(thrown == true); thrown = false; - try + MOCKPP_TRY { MOCKPP_ASSERT_EQUALS_MESSAGE(MOCKPP_PCHAR(""), (long) -12345678, (long) -87654321); } +#ifndef MOCKPP_NO_EXCEPTIONS catch(mockpp::AssertionFailedError &) { thrown = true; } +#endif MOCKPP_ASSERT_TRUE(thrown == true); } @@ -415,27 +455,31 @@ bool thrown = false; - try + MOCKPP_TRY { MOCKPP_ASSERT_EQUALS_MESSAGE(MOCKPP_PCHAR(""), (short) -1234, (short) -4321); } +#ifndef MOCKPP_NO_EXCEPTIONS catch(mockpp::AssertionFailedError &) { thrown = true; } +#endif MOCKPP_ASSERT_TRUE(thrown == true); thrown = false; - try + MOCKPP_TRY { MOCKPP_ASSERT_EQUALS_MESSAGE(MOCKPP_PCHAR("assertEquals 1234 != 4321"), (short) -1234, (short) -4321); } +#ifndef MOCKPP_NO_EXCEPTIONS catch(mockpp::AssertionFailedError &) { thrown = true; } +#endif MOCKPP_ASSERT_TRUE(thrown == true); } @@ -448,27 +492,31 @@ MOCKPP_ASSERT_EQUALS_MESSAGE(MOCKPP_PCHAR(""), (int) -1234, (int) -1234); bool thrown = false; - try + MOCKPP_TRY { MOCKPP_ASSERT_EQUALS_MESSAGE(MOCKPP_PCHAR("assertEquals 1234 == 4321"), (int) 1234, (int) 4321); } +#ifndef MOCKPP_NO_EXCEPTIONS catch(mockpp::AssertionFailedError &) { thrown = true; } +#endif MOCKPP_ASSERT_TRUE(thrown == true); thrown = false; - try + MOCKPP_TRY { MOCKPP_ASSERT_EQUALS_MESSAGE(MOCKPP_PCHAR(""), (int) 1234, (int) 4321); } +#ifndef MOCKPP_NO_EXCEPTIONS catch(mockpp::AssertionFailedError &) { thrown = true; } +#endif MOCKPP_ASSERT_TRUE(thrown == true); } @@ -482,27 +530,31 @@ bool thrown = false; - try + MOCKPP_TRY { MOCKPP_ASSERT_EQUALS_MESSAGE(MOCKPP_PCHAR("assertEquals 'x' == 'u'"), MOCKPP_CHAR('x'), MOCKPP_CHAR('u')); } +#ifndef MOCKPP_NO_EXCEPTIONS catch(mockpp::AssertionFailedError &) { thrown = true; } +#endif MOCKPP_ASSERT_TRUE(thrown == true); thrown = false; - try + MOCKPP_TRY { MOCKPP_ASSERT_EQUALS_MESSAGE(MOCKPP_PCHAR(""), MOCKPP_CHAR('x'), MOCKPP_CHAR('u')); } +#ifndef MOCKPP_NO_EXCEPTIONS catch(mockpp::AssertionFailedError &) { thrown = true; } +#endif MOCKPP_ASSERT_TRUE(thrown == true); } @@ -516,27 +568,31 @@ bool thrown = false; - try + MOCKPP_TRY { MOCKPP_ASSERT_EQUALS_MESSAGE(MOCKPP_PCHAR("assertEquals true == false"), (bool)true, (bool)false); } +#ifndef MOCKPP_NO_EXCEPTIONS catch(mockpp::AssertionFailedError &) { thrown = true; } +#endif MOCKPP_ASSERT_TRUE(thrown == true); thrown = false; - try + MOCKPP_TRY { MOCKPP_ASSERT_EQUALS_MESSAGE(MOCKPP_PCHAR(""), (bool)true, (bool)false); } +#ifndef MOCKPP_NO_EXCEPTIONS catch(mockpp::AssertionFailedError &) { thrown = true; } +#endif MOCKPP_ASSERT_TRUE(thrown == true); } @@ -562,27 +618,31 @@ bool thrown = false; - try + MOCKPP_TRY { MOCKPP_ASSERT_DELTA_MESSAGE(MOCKPP_PCHAR("assertEquals 12.5 +- 0.5 == 13.1"), (double)12.5, (double)13.1, (double)0.5); } +#ifndef MOCKPP_NO_EXCEPTIONS catch(mockpp::AssertionFailedError &) { thrown = true; } +#endif MOCKPP_ASSERT_TRUE(thrown == true); thrown = false; - try + MOCKPP_TRY { MOCKPP_ASSERT_DELTA((double)12.5, (double)13.1, (double)-0.5); } +#ifndef MOCKPP_NO_EXCEPTIONS catch(mockpp::AssertionFailedError &) { thrown = true; } +#endif MOCKPP_ASSERT_TRUE(thrown == true); } @@ -608,27 +668,31 @@ bool thrown = false; - try + MOCKPP_TRY { MOCKPP_ASSERT_DELTA_MESSAGE(MOCKPP_PCHAR("assertEquals 12.5 +- 0.5 == 11.9"), (float)12.5, (float)11.9, (float)0.5); } +#ifndef MOCKPP_NO_EXCEPTIONS catch(mockpp::AssertionFailedError &) { thrown = true; } +#endif MOCKPP_ASSERT_TRUE(thrown == true); thrown = false; - try + MOCKPP_TRY { MOCKPP_ASSERT_DELTA((float)12.5, (float)11.9, (float)0.5); } +#ifndef MOCKPP_NO_EXCEPTIONS catch(mockpp::AssertionFailedError &) { thrown = true; } +#endif MOCKPP_ASSERT_TRUE(thrown == true); } @@ -645,50 +709,58 @@ bool thrown = false; - try + MOCKPP_TRY { MOCKPP_ASSERT_TRUE_MESSAGE(MOCKPP_PCHAR("assertTrue 1 != 1"), 1 != 1); } +#ifndef MOCKPP_NO_EXCEPTIONS catch(mockpp::AssertionFailedError &) { thrown = true; } +#endif MOCKPP_ASSERT_TRUE(thrown == true); thrown = false; - try + MOCKPP_TRY { MOCKPP_ASSERT_TRUE_MESSAGE(MOCKPP_PCHAR(""), 1 != 1); } +#ifndef MOCKPP_NO_EXCEPTIONS catch(mockpp::AssertionFailedError &) { thrown = true; } +#endif MOCKPP_ASSERT_TRUE(thrown == true); thrown = false; - try + MOCKPP_TRY { MOCKPP_ASSERT_FALSE_MESSAGE(MOCKPP_PCHAR("assertTrue 1 == 1"), 1 == 1); } +#ifndef MOCKPP_NO_EXCEPTIONS catch(mockpp::AssertionFailedError &) { thrown = true; } +#endif MOCKPP_ASSERT_TRUE(thrown == true); thrown = false; - try + MOCKPP_TRY { MOCKPP_ASSERT_FALSE_MESSAGE(MOCKPP_PCHAR(""), 1 == 1); } +#ifndef MOCKPP_NO_EXCEPTIONS catch(mockpp::AssertionFailedError &) { thrown = true; } +#endif MOCKPP_ASSERT_TRUE(thrown == true); } @@ -715,26 +787,30 @@ bool thrown = false; - try + MOCKPP_TRY { MOCKPP_ASSERT_BOUNDARY(2, 4, 1); } +#ifndef MOCKPP_NO_EXCEPTIONS catch(mockpp::AssertionFailedError &) { thrown = true; } +#endif MOCKPP_ASSERT_TRUE(thrown == true); thrown = false; - try + MOCKPP_TRY { MOCKPP_ASSERT_BOUNDARY(2, 4, 5); } +#ifndef MOCKPP_NO_EXCEPTIONS catch(mockpp::AssertionFailedError &) { thrown = true; } +#endif MOCKPP_ASSERT_TRUE(thrown == true); } Index: Exception_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/Exception_test.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- Exception_test.cpp 26 Nov 2005 17:57:48 -0000 1.12 +++ Exception_test.cpp 28 Nov 2005 19:03:09 -0000 1.13 @@ -64,11 +64,12 @@ bool thrown = false; unsigned l = 0; const char* f = 0; - try + MOCKPP_TRY { // keep on the same line l = __LINE__; f = __FILE__; MOCKPP_FAIL(MOCKPP_PCHAR("test-assert\n\rline 2")); } +#ifndef MOCKPP_NO_EXCEPTIONS catch(mockpp::AssertionFailedError &ex) { MOCKPP_ASSERT_EQUALS_MESSAGE(MOCKPP_PCHAR("error line parameter"), (int)l, (int)ex.getSrcLine()); @@ -83,6 +84,7 @@ MOCKPP_STL::string("test-assert\n\rline 2"), MOCKPP_STL::string(ex.what())); thrown = true; } +#endif MOCKPP_ASSERT_TRUE_MESSAGE(MOCKPP_PCHAR("Should have thrown"), thrown); } Index: VisitableMockMethod_2_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockMethod_2_test.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- VisitableMockMethod_2_test.cpp 18 Nov 2005 10:49:31 -0000 1.9 +++ VisitableMockMethod_2_test.cpp 28 Nov 2005 19:03:09 -0000 1.10 @@ -151,17 +151,21 @@ MOCKPP_ASSERT_EQUALS(321, vmo.visitable(1, 2)); +#ifndef MOCKPP_NO_EXCEPTIONS MOCKPP_ASSERT_THROWING(vmo.visitable(2, 3), MOCKPP_PCHAR("vmo.visitable()-1a"), unsigned, unsigned(123)); +#endif MOCKPP_ASSERT_EQUALS(432, vmo.visitable(3, 4)); +#ifndef MOCKPP_NO_EXCEPTIONS MOCKPP_ASSERT_THROWING(vmo.visitable(4, 5), MOCKPP_PCHAR("vmo.visitable()-1b"), unsigned, unsigned(321)); +#endif MOCKPP_ASSERT_EQUALS(123, vmo.visitable(5, 6)); @@ -169,6 +173,7 @@ MOCKPP_ASSERT_EQUALS(666, vmo.visitable(3, 21)); MOCKPP_ASSERT_EQUALS(333, vmo.visitable(3, 3)); +#ifndef MOCKPP_NO_EXCEPTIONS MOCKPP_ASSERT_THROWING(vmo.visitable(4, 4), MOCKPP_PCHAR("vmo.visitable()-2"), unsigned, @@ -183,6 +188,7 @@ MOCKPP_PCHAR("vmo.visitable()-3"), unsigned, unsigned(666)); +#endif vmo.verify(); vmb.verify(); @@ -206,6 +212,7 @@ vmo.visitable(3, 4); vmo.activate(); +#ifndef MOCKPP_NO_EXCEPTIONS MOCKPP_ASSERT_THROWING(vmo.visitable(9, 9), MOCKPP_PCHAR("vmo.visitable()-2a"), unsigned, @@ -215,6 +222,7 @@ MOCKPP_PCHAR("vmo.visitable()-2b"), unsigned, unsigned(321)); +#endif MOCKPP_ASSERT_EQUALS(321, vmo.visitable(1, 2)); MOCKPP_ASSERT_EQUALS(432, vmo.visitable(2, 3)); @@ -234,6 +242,7 @@ vmo.visitable(3, 4); vmo.activate(); +#ifndef MOCKPP_NO_EXCEPTIONS MOCKPP_ASSERT_THROWING(vmo.visitable(1, 2), MOCKPP_PCHAR("vmo.visitable()-3a"), unsigned, @@ -248,6 +257,7 @@ MOCKPP_PCHAR("vmo.visitable()-3c"), unsigned, unsigned(111)); +#endif vmo.verify(); vmb.verify(); @@ -288,6 +298,7 @@ vmo.activate(); +#ifndef MOCKPP_NO_EXCEPTIONS MOCKPP_ASSERT_THROWING(vmo.visitablev(2, 3), MOCKPP_PCHAR("vmo.visitablev()-1a"), unsigned, @@ -297,6 +308,7 @@ MOCKPP_PCHAR("vmo.visitablev()-1b"), unsigned, unsigned(321)); +#endif vmo.visitablev(2, 2); vmo.visitablev(1, 19); @@ -304,6 +316,7 @@ MOCKPP_ASSERT_EQUALS(999, vmo.visitable(200, 300)); vmo.visitablev(3, 3); +#ifndef MOCKPP_NO_EXCEPTIONS MOCKPP_ASSERT_THROWING(vmo.visitablev(4, 4), MOCKPP_PCHAR("vmo.visitablev()-2"), unsigned, @@ -313,6 +326,7 @@ MOCKPP_PCHAR("vmo.visitablev()-3"), unsigned, unsigned(555)); +#endif vmo.verify(); vmb.verify(); @@ -332,6 +346,7 @@ vmo.visitablev(3, 4); vmo.activate(); +#ifndef MOCKPP_NO_EXCEPTIONS MOCKPP_ASSERT_THROWING(vmo.visitablev(9, 9), MOCKPP_PCHAR("vmo.visitablev()-2a"), unsigned, @@ -341,6 +356,7 @@ MOCKPP_PCHAR("vmo.visitablev()-2b"), unsigned, unsigned(321)); +#endif vmo.visitablev(1, 2); vmo.visitablev(2, 3); @@ -360,6 +376,7 @@ vmo.visitablev(3, 4); vmo.activate(); +#ifndef MOCKPP_NO_EXCEPTIONS MOCKPP_ASSERT_THROWING(vmo.visitablev(1, 2), MOCKPP_PCHAR("vmo.visitablev()-3a"), unsigned, @@ -374,6 +391,7 @@ MOCKPP_PCHAR("vmo.visitablev()-3c"), unsigned, unsigned(111)); +#endif vmo.verify(); vmb.verify(); Index: VerifyingTestCase_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VerifyingTestCase_test.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- VerifyingTestCase_test.cpp 15 Oct 2005 15:40:59 -0000 1.16 +++ VerifyingTestCase_test.cpp 28 Nov 2005 19:03:09 -0000 1.17 @@ -124,15 +124,17 @@ mockpp::VerifyingTestCase mtc("dummy"); - try + MOCKPP_TRY { mtc.verify(); MOCKPP_ASSERT_TRUE_MESSAGE(MOCKPP_PCHAR("should have thrown"), false); } +#ifndef MOCKPP_NO_EXCEPTIONS catch(mockpp::AssertionFailedError &ex) { MOCKPP_ASSERT_TRUE(ex.getMessage().find(MOCKPP_PCHAR("no sub-objects to verify")) != mockpp::String::npos); } +#endif } Index: AssertMo_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/AssertMo_test.cpp,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- AssertMo_test.cpp 26 Nov 2005 17:57:48 -0000 1.25 +++ AssertMo_test.cpp 28 Nov 2005 19:03:09 -0000 1.26 @@ -114,83 +114,95 @@ bool thrown; thrown = false; - try + MOCKPP_TRY { MOCKPP_ASSERT_INCLUDES_MESSAGE(MOCKPP_PCHAR("includes abc xyz"), MOCKPP_PCHAR("abc"), MOCKPP_PCHAR("xyz") ); } +#ifndef MOCKPP_NO_EXCEPTIONS catch (mockpp::AssertionFailedError &ae) { thrown = true; MOCKPP_ASSERT_TRUE(MOCKPP_PCHAR("includes abc xyz") == ae.getMessage()); } +#endif MOCKPP_ASSERT_TRUE(thrown == true); thrown = false; - try + MOCKPP_TRY { MOCKPP_ASSERT_INCLUDES(MOCKPP_PCHAR("abc"), MOCKPP_PCHAR("xyz") ); } +#ifndef MOCKPP_NO_EXCEPTIONS catch (mockpp::AssertionFailedError &ae) { thrown = true; // use \042 instead of \" because m$vc is too stupid to escape correctly MOCKPP_ASSERT_TRUE(MOCKPP_PCHAR("MOCKPP_PCHAR(\042abc\042) <in> MOCKPP_PCHAR(\042xyz\042)") == ae.getMessage()); } +#endif MOCKPP_ASSERT_TRUE(thrown == true); thrown = false; - try + MOCKPP_TRY { MOCKPP_ASSERT_EXCLUDES_MESSAGE(MOCKPP_PCHAR("excludes abc abc"), MOCKPP_PCHAR("abc"), MOCKPP_PCHAR("abc") ); } +#ifndef MOCKPP_NO_EXCEPTIONS catch (mockpp::AssertionFailedError &ae) { thrown = true; MOCKPP_ASSERT_TRUE(MOCKPP_PCHAR("excludes abc abc") == ae.getMessage()); } +#endif MOCKPP_ASSERT_TRUE(thrown == true); thrown = false; - try + MOCKPP_TRY { MOCKPP_ASSERT_EXCLUDES(MOCKPP_PCHAR("abc"), MOCKPP_PCHAR("abc") ); } +#ifndef MOCKPP_NO_EXCEPTIONS catch (mockpp::AssertionFailedError &ae) { thrown = true; // use \042 instead of \" because m$vc is too stupid to escape correctly MOCKPP_ASSERT_TRUE(MOCKPP_PCHAR("MOCKPP_PCHAR(\042abc\042) <!in> MOCKPP_PCHAR(\042abc\042)") == ae.getMessage()); } +#endif MOCKPP_ASSERT_TRUE(thrown == true); thrown = false; - try + MOCKPP_TRY { MOCKPP_ASSERT_STARTSWITH_MESSAGE(MOCKPP_PCHAR("starts with abc xyz"), MOCKPP_PCHAR("abc"), MOCKPP_PCHAR("xyz") ); } +#ifndef MOCKPP_NO_EXCEPTIONS catch (mockpp::AssertionFailedError &ae) { thrown = true; MOCKPP_ASSERT_TRUE(MOCKPP_PCHAR("starts with abc xyz") == ae.getMessage()); } +#endif MOCKPP_ASSERT_TRUE(thrown == true); thrown = false; - try + MOCKPP_TRY { MOCKPP_ASSERT_STARTSWITH(MOCKPP_PCHAR("abc"), MOCKPP_PCHAR("xyz") ); } +#ifndef MOCKPP_NO_EXCEPTIONS catch (mockpp::AssertionFailedError &ae) { thrown = true; // use \042 instead of \" because m$vc is too stupid to escape correctly MOCKPP_ASSERT_TRUE(MOCKPP_PCHAR("MOCKPP_PCHAR(\042abc\042) <starts> MOCKPP_PCHAR(\042xyz\042)") == ae.getMessage()); } +#endif MOCKPP_ASSERT_TRUE(thrown == true); } @@ -330,25 +342,30 @@ } +#ifndef MOCKPP_NO_EXCEPTIONS static void do_a_throw(unsigned val) { - throw (unsigned) val; + MOCKPP_THROW((unsigned) val); } - +#endif void AssertMo_test::test_throwing() { unsigned ret = 0; +#ifndef MOCKPP_NO_EXCEPTIONS MOCKPP_ASSERT_THROWING(do_a_throw(123), MOCKPP_PCHAR("throw 123"), unsigned, 123); +#endif ret = 0; +#ifndef MOCKPP_NO_EXCEPTIONS MOCKPP_ASSERT_THROWING_COND(do_a_throw(321), MOCKPP_PCHAR("throw 321"), unsigned, (ret = exception_object) == 321); +#endif MOCKPP_ASSERT_TRUE(ret == 321); } Index: VisitableMockMethod_1_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockMethod_1_test.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- VisitableMockMethod_1_test.cpp 14 Nov 2005 19:20:35 -0000 1.4 +++ VisitableMockMethod_1_test.cpp 28 Nov 2005 19:03:09 -0000 1.5 @@ -144,17 +144,21 @@ MOCKPP_ASSERT_EQUALS(321, vmo.visitable(1)); +#ifndef MOCKPP_NO_EXCEPTIONS MOCKPP_ASSERT_THROWING(vmo.visitable(2), MOCKPP_PCHAR("vmo.visitable()-1a"), unsigned, unsigned(123)); +#endif MOCKPP_ASSERT_EQUALS(432, vmo.visitable(3)); +#ifndef MOCKPP_NO_EXCEPTIONS MOCKPP_ASSERT_THROWING(vmo.visitable(4), MOCKPP_PCHAR("vmo.visitable()-1b"), unsigned, unsigned(321)); +#endif MOCKPP_ASSERT_EQUALS(123, vmo.visitable(5)); @@ -162,6 +166,7 @@ MOCKPP_ASSERT_EQUALS(666, vmo.visitable(11)); MOCKPP_ASSERT_EQUALS(333, vmo.visitable(13)); +#ifndef MOCKPP_NO_EXCEPTIONS MOCKPP_ASSERT_THROWING(vmo.visitable(14), MOCKPP_PCHAR("vmo.visitable()-1a"), unsigned, @@ -176,6 +181,7 @@ MOCKPP_PCHAR("vmo.visitable()-1c"), unsigned, unsigned(666)); +#endif vmo.verify(); vmb.verify(); @@ -199,6 +205,7 @@ vmo.visitable(3); vmo.activate(); +#ifndef MOCKPP_NO_EXCEPTIONS MOCKPP_ASSERT_THROWING(vmo.visitable(9), MOCKPP_PCHAR("vmo.visitable()-2a"), unsigned, @@ -208,6 +215,7 @@ MOCKPP_... [truncated message content] |
