[Mockpp-commits] mockpp/mockpp/tests AssertMo_test.cpp,1.24,1.25 Assert_test.cpp,1.17,1.18 Chainable
Brought to you by:
ewald-arnold
Menu
▾
▴
[Mockpp-commits] mockpp/mockpp/tests AssertMo_test.cpp,1.24,1.25 Assert_test.cpp,1.17,1.18 ChainableMockObject_1_test.cpp,1.10,1.11 ChainableMockObject_1_void_test.cpp,1.13,1.14 ChainableMockObject_2_test.cpp,1.9,1.10 ChainableMockObject_2_void_test.cpp,1.10,1.11 ChainableMockObject_3_test.cpp,1.8,1.9 ChainableMockObject_3_void_test.cpp,1.10,1.11 ChainableMockObject_4_test.cpp,1.9,1.10 ChainableMockObject_4_void_test.cpp,1.10,1.11 ChainingMockBuilder_test.cpp,1.19,1.20 ChainingMockObjectSupport_test.cpp,1.32,1.33 Exception_test.cpp,1.11,1.12 ExpectationMap_test.cpp,1.16,1.17 Invocation_test.cpp,1.19,1.20 IsEqual_test.cpp,1.7,1.8 IsInstanceOf_test.cpp,1.12,1.13 IsSame_test.cpp,1.9,1.10 MatchBuilder_test.cpp,1.21,1.22 MixedMockObject_5_test.cpp,1.6,1.7 MyBuilderNamespace.h,1.14,1.15 StringContains_test.cpp,1.10,1.11 StringEndsWith_test.cpp,1.3,1.4 StringStartsWith_test.cpp,1.3,1.4 StubSequence_test.cpp,1.14,1.15 ThrowStub_test.cpp,1.11,1.12 ThrowableList_test.cpp,1.14,1.15 Throwable_test.cpp,1.13,1.14 TrackingCounter_test.cpp,1.7,1.8 TypelessStubSequence_test.cpp,1.4,1.5 VerifyingTestCaller_test.cpp,1.6,1.7 VisitableMockObject_1_test.cpp,1.20,1.21 VisitableMockObject_1_void_test.cpp,1.20,1.21 VisitableMockObject_2_test.cpp,1.19,1.20 VisitableMockObject_2_void_test.cpp,1.19,1.20 VisitableMockObject_3_test.cpp,1.18,1.19 VisitableMockObject_3_void_test.cpp,1.18,1.19 VisitableMockObject_4_test.cpp,1.18,1.19 VisitableMockObject_4_void_test.cpp,1.18,1.19 VisitableMockObject_5_test.cpp,1.27,1.28 VisitableMockObject_5_void_test.cpp,1.23,1.24 VisitableMockObject_test.cpp,1.23,1.24 VisitableMockObject_void_test.cpp,1.16,1.17 mockpp_test.cpp,1.14,1.15 readability_test.cpp,1.3,1.4
Update of /cvsroot/mockpp/mockpp/mockpp/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20655/mockpp/tests Modified Files: AssertMo_test.cpp Assert_test.cpp ChainableMockObject_1_test.cpp ChainableMockObject_1_void_test.cpp ChainableMockObject_2_test.cpp ChainableMockObject_2_void_test.cpp ChainableMockObject_3_test.cpp ChainableMockObject_3_void_test.cpp ChainableMockObject_4_test.cpp ChainableMockObject_4_void_test.cpp ChainingMockBuilder_test.cpp ChainingMockObjectSupport_test.cpp Exception_test.cpp ExpectationMap_test.cpp Invocation_test.cpp IsEqual_test.cpp IsInstanceOf_test.cpp IsSame_test.cpp MatchBuilder_test.cpp MixedMockObject_5_test.cpp MyBuilderNamespace.h StringContains_test.cpp StringEndsWith_test.cpp StringStartsWith_test.cpp StubSequence_test.cpp ThrowStub_test.cpp ThrowableList_test.cpp Throwable_test.cpp TrackingCounter_test.cpp TypelessStubSequence_test.cpp VerifyingTestCaller_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 mockpp_test.cpp readability_test.cpp Log Message: prepare use of alternative stl Index: readability_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/readability_test.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- readability_test.cpp 19 Oct 2005 19:42:19 -0000 1.3 +++ readability_test.cpp 26 Nov 2005 17:57:49 -0000 1.4 @@ -57,10 +57,10 @@ , void_visiter(this) {} - MOCKPP_CHAINABLE5(MyMixedMockObject, int, chain, CA, CB, std::string, char, bool); - MOCKPP_VISITABLE5(MyMixedMockObject, int, visit, CA, CB, std::string, char, bool); - MOCKPP_VOID_CHAINABLE5(MyMixedMockObject, void_chain, CA, CB, std::string, char, bool); - MOCKPP_VOID_VISITABLE5(MyMixedMockObject, void_visit, CA, CB, std::string, char, bool); + MOCKPP_CHAINABLE5(MyMixedMockObject, int, chain, CA, CB, MOCKPP_STL::string, char, bool); + MOCKPP_VISITABLE5(MyMixedMockObject, int, visit, CA, CB, MOCKPP_STL::string, char, bool); + MOCKPP_VOID_CHAINABLE5(MyMixedMockObject, void_chain, CA, CB, MOCKPP_STL::string, char, bool); + MOCKPP_VOID_VISITABLE5(MyMixedMockObject, void_visit, CA, CB, MOCKPP_STL::string, char, bool); MOCKPP_CHAINER_FOR(MyMixedMockObject, chain) chainer; MOCKPP_CHAINER_FOR(MyMixedMockObject, void_chain) void_chainer; @@ -75,7 +75,7 @@ mmo.chainer.expects(exactly(3)) .with(eq(CA()), eq(CB(3)), - stringContains(std::string("string")), + stringContains(MOCKPP_STL::string("string")), eq<char>(123, 45), eq(true)) .will(returnValue(321)); @@ -83,7 +83,7 @@ mmo.chainer.expects(atLeast(3)) .with(eq(CA(5)), eq(CB()), - stringContains(std::string("no-string")), + stringContains(MOCKPP_STL::string("no-string")), eq<char>(0x23), eq(false)) .will(returnValue(123)); @@ -135,11 +135,11 @@ void constraintlist_1() { - mockpp::ConstraintList<std::string> list(MOCKPP_PCHAR("ConstraintListInstance")); - list.addExpected(eq(std::string("string"))); + mockpp::ConstraintList<MOCKPP_STL::string> list(MOCKPP_PCHAR("ConstraintListInstance")); + list.addExpected(eq(MOCKPP_STL::string("string"))); try { - list.addActual(std::string("no-string")); + list.addActual(MOCKPP_STL::string("no-string")); } catch(std::exception &ex) { @@ -150,11 +150,11 @@ void expectationlist_1() { - mockpp::ExpectationList<std::string> list(MOCKPP_PCHAR("ExpectationListInstance")); - list.addExpected(std::string("string")); + mockpp::ExpectationList<MOCKPP_STL::string> list(MOCKPP_PCHAR("ExpectationListInstance")); + list.addExpected(MOCKPP_STL::string("string")); try { - list.addActual(std::string("no-string")); + list.addActual(MOCKPP_STL::string("no-string")); } catch(std::exception &ex) { @@ -165,12 +165,12 @@ void expectationlist_2() { - mockpp::ExpectationList<std::string> list(MOCKPP_PCHAR("ExpectationListInstance") ); - list.addExpected(std::string("string")); - list.addActual(std::string("string")); + mockpp::ExpectationList<MOCKPP_STL::string> list(MOCKPP_PCHAR("ExpectationListInstance") ); + list.addExpected(MOCKPP_STL::string("string")); + list.addActual(MOCKPP_STL::string("string")); try { - list.addActual(std::string("no-string")); + list.addActual(MOCKPP_STL::string("no-string")); } catch(std::exception &ex) { Index: ChainableMockObject_4_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_4_test.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- ChainableMockObject_4_test.cpp 18 Oct 2005 20:03:54 -0000 1.9 +++ ChainableMockObject_4_test.cpp 26 Nov 2005 17:57:48 -0000 1.10 @@ -92,8 +92,8 @@ , MOCKPP_CONSTRUCT_MEMBERS_FOR_CHAINABLE_EXT4(outbound, Ext) {} - MOCKPP_CHAINABLE_EXT4(MyChainableMockObject_4ex, std::string, chainable4, const std::string &, const std::string &, const std::string &, const std::string &, - std::string, Ext, std::string, std::string, std::string, std::string); + MOCKPP_CHAINABLE_EXT4(MyChainableMockObject_4ex, MOCKPP_STL::string, chainable4, const MOCKPP_STL::string &, const MOCKPP_STL::string &, const MOCKPP_STL::string &, const MOCKPP_STL::string &, + MOCKPP_STL::string, Ext, MOCKPP_STL::string, MOCKPP_STL::string, MOCKPP_STL::string, MOCKPP_STL::string); MOCKPP_CHAINABLE_EXT4(MyChainableMockObject_4ex, int, outbound, unsigned &, unsigned &, unsigned &, unsigned &, int, Ext, unsigned, unsigned, unsigned, unsigned); Index: IsInstanceOf_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/IsInstanceOf_test.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- IsInstanceOf_test.cpp 15 Oct 2005 15:40:59 -0000 1.12 +++ IsInstanceOf_test.cpp 26 Nov 2005 17:57:48 -0000 1.13 @@ -89,7 +89,7 @@ virtual ~C() {} - std::string b; + MOCKPP_STL::string b; }; Index: TrackingCounter_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/TrackingCounter_test.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- TrackingCounter_test.cpp 13 Nov 2005 11:53:18 -0000 1.7 +++ TrackingCounter_test.cpp 26 Nov 2005 17:57:48 -0000 1.8 @@ -340,13 +340,13 @@ 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 ")) != std::string::npos); + exception_object.getMessage().find(MOCKPP_PCHAR("tagged with 1 which is less ")) != MOCKPP_STL::string::npos); ec.inc(); ec.inc(); 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")) != std::string::npos); + exception_object.getMessage().find(MOCKPP_PCHAR("tagged with 3 which is more")) != MOCKPP_STL::string::npos); } @@ -371,13 +371,13 @@ 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 ")) != std::string::npos); + exception_object.getMessage().find(MOCKPP_PCHAR("tagged 1 times which is less ")) != MOCKPP_STL::string::npos); ec.inc(); ec.inc(); 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")) != std::string::npos); + exception_object.getMessage().find(MOCKPP_PCHAR("tagged 3 times which is more")) != MOCKPP_STL::string::npos); } Index: IsEqual_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/IsEqual_test.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- IsEqual_test.cpp 15 Oct 2005 15:40:59 -0000 1.7 +++ IsEqual_test.cpp 26 Nov 2005 17:57:48 -0000 1.8 @@ -73,7 +73,7 @@ void IsEqual_test::test_invoke() { - mockpp::IsEqual<std::string> myequal ("string"); + mockpp::IsEqual<MOCKPP_STL::string> myequal ("string"); MOCKPP_ASSERT_TRUE(myequal.eval("string") == true); MOCKPP_ASSERT_TRUE(myequal.eval("not-string") == false); } Index: ThrowableList_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ThrowableList_test.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- ThrowableList_test.cpp 13 Nov 2005 11:53:18 -0000 1.14 +++ ThrowableList_test.cpp 26 Nov 2005 17:57:48 -0000 1.15 @@ -71,15 +71,15 @@ void ThrowableList_test::test_throw() { mockpp::ThrowableList tl(MOCKPP_PCHAR("tl"), 0); - tl.push_back(mockpp::make_throwable(std::string("my-item 1"))); - tl.addObjectToThrow(std::string("my-item 2")); + tl.push_back(mockpp::make_throwable(MOCKPP_STL::string("my-item 1"))); + tl.addObjectToThrow(MOCKPP_STL::string("my-item 2")); try { tl.nextThrowableObject()->throw_me(); MOCKPP_FAIL(MOCKPP_PCHAR("Did not throw the exception")); } - catch(std::string &s) + catch(MOCKPP_STL::string &s) { MOCKPP_ASSERT_TRUE(s == "my-item 1"); } @@ -93,7 +93,7 @@ tl.nextThrowableObject()->throw_me(); MOCKPP_FAIL(MOCKPP_PCHAR("Did not throw the exception")); } - catch(std::string &s) + catch(MOCKPP_STL::string &s) { MOCKPP_ASSERT_TRUE(s == "my-item 2"); } @@ -110,10 +110,10 @@ { mockpp::ThrowableList tl(MOCKPP_PCHAR("tl"), 0); - mockpp::Throwable *tt1 = mockpp::make_throwable(std::string("my-item 1")); - mockpp::Throwable *tt2 = mockpp::make_throwable(std::string("my-item 2")); - mockpp::Throwable *tt3 = mockpp::make_throwable(std::string("my-item 3")); - mockpp::Throwable *tt4 = mockpp::make_throwable(std::string("my-item 4")); + mockpp::Throwable *tt1 = mockpp::make_throwable(MOCKPP_STL::string("my-item 1")); + mockpp::Throwable *tt2 = mockpp::make_throwable(MOCKPP_STL::string("my-item 2")); + mockpp::Throwable *tt3 = mockpp::make_throwable(MOCKPP_STL::string("my-item 3")); + mockpp::Throwable *tt4 = mockpp::make_throwable(MOCKPP_STL::string("my-item 4")); tl.push_back(tt1); tl.push_back(tt2); tl.addObjectToThrow(tt3); @@ -129,10 +129,10 @@ { mockpp::ThrowableList tl(MOCKPP_PCHAR("tl"), 0); - mockpp::Throwable *tt1 = mockpp::make_throwable(std::string("my-item 1")); - mockpp::Throwable *tt2 = mockpp::make_throwable(std::string("my-item 2")); - mockpp::Throwable *tt3 = mockpp::make_throwable(std::string("my-item 3")); - mockpp::Throwable *tt4 = mockpp::make_throwable(std::string("my-item 4")); + mockpp::Throwable *tt1 = mockpp::make_throwable(MOCKPP_STL::string("my-item 1")); + mockpp::Throwable *tt2 = mockpp::make_throwable(MOCKPP_STL::string("my-item 2")); + mockpp::Throwable *tt3 = mockpp::make_throwable(MOCKPP_STL::string("my-item 3")); + mockpp::Throwable *tt4 = mockpp::make_throwable(MOCKPP_STL::string("my-item 4")); tl.push_back(tt1); tl.push_back(tt2); @@ -168,12 +168,12 @@ { mockpp::ThrowableList tl(MOCKPP_PCHAR("tl"), 0); - mockpp::Throwable *tt1 = mockpp::make_throwable(std::string("my-item 1")); + mockpp::Throwable *tt1 = mockpp::make_throwable(MOCKPP_STL::string("my-item 1")); tl.push_back(tt1); MOCKPP_ASSERT_TRUE(tl.hasMoreObjects() == true); - tl.push_back(mockpp::make_throwable(std::string("my-item 2"))); - tl.addObjectToThrow(std::string("my-item 3")); - tl.addObjectToThrow(std::string("my-item 4")); + tl.push_back(mockpp::make_throwable(MOCKPP_STL::string("my-item 2"))); + tl.addObjectToThrow(MOCKPP_STL::string("my-item 3")); + tl.addObjectToThrow(MOCKPP_STL::string("my-item 4")); MOCKPP_ASSERT_TRUE(tl.hasMoreObjects() == true); Index: VisitableMockObject_5_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_5_void_test.cpp,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- VisitableMockObject_5_void_test.cpp 15 Oct 2005 15:40:59 -0000 1.23 +++ VisitableMockObject_5_void_test.cpp 26 Nov 2005 17:57:49 -0000 1.24 @@ -221,20 +221,20 @@ virtual ~MyVisitableMockObject_5_void_ex_Interface() {} - virtual void visitable5 (const std::string &, const std::string &, const std::string &, const std::string &, long) = 0; - virtual void visitable5 (const std::string &, const std::string &, const std::string &, const std::string &, const std::string &) = 0; - virtual void visitable4 (const std::string &, const std::string &, const std::string &, const std::string &) = 0; - virtual void visitable3 (const std::string &, const std::string &, const std::string &) = 0; - virtual void visitable2 (const std::string &, const std::string &) = 0; - virtual void visitable1 (const std::string &) = 0; + virtual void visitable5 (const MOCKPP_STL::string &, const MOCKPP_STL::string &, const MOCKPP_STL::string &, const MOCKPP_STL::string &, long) = 0; + virtual void visitable5 (const MOCKPP_STL::string &, const MOCKPP_STL::string &, const MOCKPP_STL::string &, const MOCKPP_STL::string &, const MOCKPP_STL::string &) = 0; + virtual void visitable4 (const MOCKPP_STL::string &, const MOCKPP_STL::string &, const MOCKPP_STL::string &, const MOCKPP_STL::string &) = 0; + virtual void visitable3 (const MOCKPP_STL::string &, const MOCKPP_STL::string &, const MOCKPP_STL::string &) = 0; + virtual void visitable2 (const MOCKPP_STL::string &, const MOCKPP_STL::string &) = 0; + virtual void visitable1 (const MOCKPP_STL::string &) = 0; virtual void visitable0 () = 0; - virtual void const_visitable5 (const std::string &, const std::string &, const std::string &, const std::string &, long) const = 0; - virtual void const_visitable5 (const std::string &, const std::string &, const std::string &, const std::string &, const std::string &) const = 0; - virtual void const_visitable4 (const std::string &, const std::string &, const std::string &, const std::string &) const = 0; - virtual void const_visitable3 (const std::string &, const std::string &, const std::string &) const = 0; - virtual void const_visitable2 (const std::string &, const std::string &) const = 0; - virtual void const_visitable1 (const std::string &) const = 0; + virtual void const_visitable5 (const MOCKPP_STL::string &, const MOCKPP_STL::string &, const MOCKPP_STL::string &, const MOCKPP_STL::string &, long) const = 0; + virtual void const_visitable5 (const MOCKPP_STL::string &, const MOCKPP_STL::string &, const MOCKPP_STL::string &, const MOCKPP_STL::string &, const MOCKPP_STL::string &) const = 0; + virtual void const_visitable4 (const MOCKPP_STL::string &, const MOCKPP_STL::string &, const MOCKPP_STL::string &, const MOCKPP_STL::string &) const = 0; + virtual void const_visitable3 (const MOCKPP_STL::string &, const MOCKPP_STL::string &, const MOCKPP_STL::string &) const = 0; + virtual void const_visitable2 (const MOCKPP_STL::string &, const MOCKPP_STL::string &) const = 0; + virtual void const_visitable1 (const MOCKPP_STL::string &) const = 0; virtual void const_visitable0 () const = 0; virtual void abc_visitable5 (const CA&, const CB&, const CC&, const CD&, CE) = 0; @@ -329,45 +329,45 @@ , MOCKPP_CONSTRUCT_MEMBERS_FOR_VOID_VISITABLE_EXT5(outbound, Ext) {} - MOCKPP_VOID_VISITABLE_EXT5(MyVisitableMockObject_5_void_ex, visitable5, const std::string &, const std::string &, const std::string &, const std::string &, const std::string &, - Ext1, std::string, std::string, std::string, std::string, std::string); + MOCKPP_VOID_VISITABLE_EXT5(MyVisitableMockObject_5_void_ex, visitable5, const MOCKPP_STL::string &, const MOCKPP_STL::string &, const MOCKPP_STL::string &, const MOCKPP_STL::string &, const MOCKPP_STL::string &, + Ext1, MOCKPP_STL::string, MOCKPP_STL::string, MOCKPP_STL::string, MOCKPP_STL::string, MOCKPP_STL::string); - MOCKPP_VOID_VISITABLE_EXT5(MyVisitableMockObject_5_void_ex, visitable5, const std::string &, const std::string &, const std::string &, const std::string &, long, - Ext2, std::string, std::string, std::string, std::string, long); + MOCKPP_VOID_VISITABLE_EXT5(MyVisitableMockObject_5_void_ex, visitable5, const MOCKPP_STL::string &, const MOCKPP_STL::string &, const MOCKPP_STL::string &, const MOCKPP_STL::string &, long, + Ext2, MOCKPP_STL::string, MOCKPP_STL::string, MOCKPP_STL::string, MOCKPP_STL::string, long); - MOCKPP_VOID_VISITABLE_EXT4(MyVisitableMockObject_5_void_ex, visitable4, const std::string &, const std::string &, const std::string &, const std::string &, - Ext, std::string, std::string, std::string, std::string); + MOCKPP_VOID_VISITABLE_EXT4(MyVisitableMockObject_5_void_ex, visitable4, const MOCKPP_STL::string &, const MOCKPP_STL::string &, const MOCKPP_STL::string &, const MOCKPP_STL::string &, + Ext, MOCKPP_STL::string, MOCKPP_STL::string, MOCKPP_STL::string, MOCKPP_STL::string); - MOCKPP_VOID_VISITABLE_EXT3(MyVisitableMockObject_5_void_ex, visitable3, const std::string &, const std::string &, const std::string &, - Ext, std::string, std::string, std::string); + MOCKPP_VOID_VISITABLE_EXT3(MyVisitableMockObject_5_void_ex, visitable3, const MOCKPP_STL::string &, const MOCKPP_STL::string &, const MOCKPP_STL::string &, + Ext, MOCKPP_STL::string, MOCKPP_STL::string, MOCKPP_STL::string); - MOCKPP_VOID_VISITABLE_EXT2(MyVisitableMockObject_5_void_ex, visitable2, const std::string &, const std::string &, - Ext, std::string, std::string); + MOCKPP_VOID_VISITABLE_EXT2(MyVisitableMockObject_5_void_ex, visitable2, const MOCKPP_STL::string &, const MOCKPP_STL::string &, + Ext, MOCKPP_STL::string, MOCKPP_STL::string); - MOCKPP_VOID_VISITABLE_EXT1(MyVisitableMockObject_5_void_ex, visitable1, const std::string &, - Ext, std::string); + MOCKPP_VOID_VISITABLE_EXT1(MyVisitableMockObject_5_void_ex, visitable1, const MOCKPP_STL::string &, + Ext, MOCKPP_STL::string); MOCKPP_VOID_VISITABLE_EXT0(MyVisitableMockObject_5_void_ex, visitable0, Ext); - MOCKPP_VOID_CONST_VISITABLE_EXT5(MyVisitableMockObject_5_void_ex, const_visitable5, const std::string &, const std::string &, const std::string &, const std::string &, const std::string &, - Ext1, std::string, std::string, std::string, std::string, std::string); + MOCKPP_VOID_CONST_VISITABLE_EXT5(MyVisitableMockObject_5_void_ex, const_visitable5, const MOCKPP_STL::string &, const MOCKPP_STL::string &, const MOCKPP_STL::string &, const MOCKPP_STL::string &, const MOCKPP_STL::string &, + Ext1, MOCKPP_STL::string, MOCKPP_STL::string, MOCKPP_STL::string, MOCKPP_STL::string, MOCKPP_STL::string); - MOCKPP_VOID_CONST_VISITABLE_EXT5(MyVisitableMockObject_5_void_ex, const_visitable5, const std::string &, const std::string &, const std::string &, const std::string &, long, - Ext2, std::string, std::string, std::string, std::string, long); + MOCKPP_VOID_CONST_VISITABLE_EXT5(MyVisitableMockObject_5_void_ex, const_visitable5, const MOCKPP_STL::string &, const MOCKPP_STL::string &, const MOCKPP_STL::string &, const MOCKPP_STL::string &, long, + Ext2, MOCKPP_STL::string, MOCKPP_STL::string, MOCKPP_STL::string, MOCKPP_STL::string, long); - MOCKPP_VOID_CONST_VISITABLE_EXT4(MyVisitableMockObject_5_void_ex, const_visitable4, const std::string &, const std::string &, const std::string &, const std::string &, - Ext, std::string, std::string, std::string, std::string); + MOCKPP_VOID_CONST_VISITABLE_EXT4(MyVisitableMockObject_5_void_ex, const_visitable4, const MOCKPP_STL::string &, const MOCKPP_STL::string &, const MOCKPP_STL::string &, const MOCKPP_STL::string &, + Ext, MOCKPP_STL::string, MOCKPP_STL::string, MOCKPP_STL::string, MOCKPP_STL::string); - MOCKPP_VOID_CONST_VISITABLE_EXT3(MyVisitableMockObject_5_void_ex, const_visitable3, const std::string &, const std::string &, const std::string &, - Ext, std::string, std::string, std::string); + MOCKPP_VOID_CONST_VISITABLE_EXT3(MyVisitableMockObject_5_void_ex, const_visitable3, const MOCKPP_STL::string &, const MOCKPP_STL::string &, const MOCKPP_STL::string &, + Ext, MOCKPP_STL::string, MOCKPP_STL::string, MOCKPP_STL::string); - MOCKPP_VOID_CONST_VISITABLE_EXT2(MyVisitableMockObject_5_void_ex, const_visitable2, const std::string &, const std::string &, - Ext, std::string, std::string); + MOCKPP_VOID_CONST_VISITABLE_EXT2(MyVisitableMockObject_5_void_ex, const_visitable2, const MOCKPP_STL::string &, const MOCKPP_STL::string &, + Ext, MOCKPP_STL::string, MOCKPP_STL::string); - MOCKPP_VOID_CONST_VISITABLE_EXT1(MyVisitableMockObject_5_void_ex, const_visitable1, const std::string &, - Ext, std::string); + MOCKPP_VOID_CONST_VISITABLE_EXT1(MyVisitableMockObject_5_void_ex, const_visitable1, const MOCKPP_STL::string &, + Ext, MOCKPP_STL::string); MOCKPP_VOID_CONST_VISITABLE_EXT0(MyVisitableMockObject_5_void_ex, const_visitable0, Ext); @@ -509,8 +509,8 @@ { MyVisitableMockObject_5_void_test mvo(MOCKPP_PCHAR("mvo")); MOCKPP_CONTROLLER_FOR(MyVisitableMockObject_5_void_test, visitable5) ctr (&mvo); - ctr.addThrowable(mockpp::make_throwable(std::string("exceptional string"))); - ctr.addThrowable(std::string("exceptional string"), 3); + ctr.addThrowable(mockpp::make_throwable(MOCKPP_STL::string("exceptional string"))); + ctr.addThrowable(MOCKPP_STL::string("exceptional string"), 3); ctr.setDefaultThrowable(mockpp::make_throwable(int(123))); ctr.addResponseThrowable(mockpp::make_throwable(int(1)), 1, 2, 3, 4, 5); ctr.addResponseThrowable(mockpp::make_throwable(int(0)), 0, 2, 3, 4, 5); @@ -521,8 +521,8 @@ { MyVisitableMockObject_5_void_test mvo(MOCKPP_PCHAR("mvo")); MOCKPP_CONTROLLER_FOR(MyVisitableMockObject_5_void_test, visitable5) ctr (&mvo); - ctr.addThrowable(mockpp::make_throwable(std::string("exceptional string 1"))); - ctr.addThrowable(std::string("exceptional string 2"), 2); + ctr.addThrowable(mockpp::make_throwable(MOCKPP_STL::string("exceptional string 1"))); + ctr.addThrowable(MOCKPP_STL::string("exceptional string 2"), 2); mvo.visitable5(2, 2, 3, 4, 5); mvo.visitable5(22, 2, 3, 4, 5); @@ -534,13 +534,13 @@ mvo.activate(); MOCKPP_ASSERT_THROWING(mvo.visitable5(2, 2, 3, 4, 5), MOCKPP_PCSTRING("1"), - std::string, "exceptional string 1"); + MOCKPP_STL::string, "exceptional string 1"); MOCKPP_ASSERT_THROWING(mvo.visitable5(22, 2, 3, 4, 5), MOCKPP_PCSTRING("2"), - std::string, "exceptional string 2"); + MOCKPP_STL::string, "exceptional string 2"); MOCKPP_ASSERT_THROWING(mvo.visitable5(222, 2, 3, 4, 5), MOCKPP_PCSTRING("3"), - std::string, "exceptional string 2"); + MOCKPP_STL::string, "exceptional string 2"); mvo.visitable5(2222, 2, 3, 4, 5); mvo.visitable5(22222, 2, 3, 4, 5); @@ -565,7 +565,7 @@ MyVisitableMockObject_5_void_test mvo(MOCKPP_PCHAR("mvo")); MOCKPP_CONTROLLER_FOR(MyVisitableMockObject_5_void_test, visitable5) ctr (&mvo); mvo.activate(); - ctr.addThrowable(mockpp::make_throwable(std::string("exceptional string"))); + ctr.addThrowable(mockpp::make_throwable(MOCKPP_STL::string("exceptional string"))); } @@ -574,7 +574,7 @@ MyVisitableMockObject_5_void_test mvo(MOCKPP_PCHAR("mvo")); MOCKPP_CONTROLLER_FOR(MyVisitableMockObject_5_void_test, visitable5) ctr (&mvo); mvo.activate(); - ctr.addThrowable(std::string("exceptional string"), 1); + ctr.addThrowable(MOCKPP_STL::string("exceptional string"), 1); } @@ -583,7 +583,7 @@ MyVisitableMockObject_5_void_test mvo(MOCKPP_PCHAR("mvo")); MOCKPP_CONTROLLER_FOR(MyVisitableMockObject_5_void_test, visitable5) ctr (&mvo); mvo.activate(); - ctr.setDefaultThrowable(mockpp::make_throwable(std::string("exceptional string"))); + ctr.setDefaultThrowable(mockpp::make_throwable(MOCKPP_STL::string("exceptional string"))); } @@ -677,9 +677,9 @@ { MyVisitableMockObject_5_void_test mvo(MOCKPP_PCHAR("mvo")); MOCKPP_CONTROLLER_FOR(MyVisitableMockObject_5_void_test, visitable5) ctr (&mvo); - ctr.addResponseThrowable(mockpp::make_throwable(std::string("throw me 2")), 922, 2, 3, 4, 5); - ctr.addResponseThrowable(mockpp::make_throwable(std::string("throw me 1")), 911, 2, 3, 4, 5); - ctr.setDefaultThrowable(mockpp::make_throwable(std::string("throw default"))); + ctr.addResponseThrowable(mockpp::make_throwable(MOCKPP_STL::string("throw me 2")), 922, 2, 3, 4, 5); + ctr.addResponseThrowable(mockpp::make_throwable(MOCKPP_STL::string("throw me 1")), 911, 2, 3, 4, 5); + ctr.setDefaultThrowable(mockpp::make_throwable(MOCKPP_STL::string("throw default"))); mvo.visitable5(922, 2, 3, 4, 5); mvo.visitable5(911, 2, 3, 4, 5); @@ -689,16 +689,16 @@ mvo.activate(); MOCKPP_ASSERT_THROWING(mvo.visitable5(922, 2, 3, 4, 5), MOCKPP_PCHAR("response 1"), - std::string, std::string("throw me 2")); + MOCKPP_STL::string, MOCKPP_STL::string("throw me 2")); MOCKPP_ASSERT_THROWING(mvo.visitable5(911, 2, 3, 4, 5), MOCKPP_PCHAR("response 2"), - std::string, std::string("throw me 1")); + MOCKPP_STL::string, MOCKPP_STL::string("throw me 1")); MOCKPP_ASSERT_THROWING(mvo.visitable5(1, 2, 3, 4, 5), MOCKPP_PCHAR("default response"), - std::string, std::string("throw default")); + MOCKPP_STL::string, MOCKPP_STL::string("throw default")); MOCKPP_ASSERT_THROWING(mvo.visitable5(2, 2, 3, 4, 5), MOCKPP_PCHAR("default response"), - std::string, std::string("throw default")); + MOCKPP_STL::string, MOCKPP_STL::string("throw default")); mvo.verify(); } @@ -711,7 +711,7 @@ MOCKPP_CONTROLLER_FOR(MyVisitableMockObject_5_void_test, visitable5) ctr (&mvo); - ctr.addThrowable(std::string("exceptional string"), 3); + ctr.addThrowable(MOCKPP_STL::string("exceptional string"), 3); ctr.setDefaultThrowable(mockpp::make_throwable(int(123))); ctr.addResponseThrowable(mockpp::make_throwable(int(1)), 0, 2, 3, 4, 5); @@ -727,7 +727,7 @@ { MyVisitableMockObject_5_void_test mvo(MOCKPP_PCHAR("mvo")); MOCKPP_CONTROLLER_FOR(MyVisitableMockObject_5_void_test, visitable5) ctr (&mvo); - ctr.setDefaultThrowable(mockpp::make_throwable(std::string("throw default"))); + ctr.setDefaultThrowable(mockpp::make_throwable(MOCKPP_STL::string("throw default"))); mvo.activate(); mvo.verify(); } Index: VisitableMockObject_4_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_4_test.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- VisitableMockObject_4_test.cpp 15 Oct 2005 15:50:36 -0000 1.18 +++ VisitableMockObject_4_test.cpp 26 Nov 2005 17:57:48 -0000 1.19 @@ -154,20 +154,20 @@ MOCKPP_CONSTRUCT_MEMBERS_FOR_VISITABLE_EXT0(visitable0, Ext) {} - MOCKPP_VISITABLE_EXT4(MyVisitableMockObject_4ex, const std::string, visitable4, const std::string &, const std::string &, const std::string &, const std::string &, - std::string, Ext, std::string, std::string, std::string, std::string); + MOCKPP_VISITABLE_EXT4(MyVisitableMockObject_4ex, const MOCKPP_STL::string, visitable4, const MOCKPP_STL::string &, const MOCKPP_STL::string &, const MOCKPP_STL::string &, const MOCKPP_STL::string &, + MOCKPP_STL::string, Ext, MOCKPP_STL::string, MOCKPP_STL::string, MOCKPP_STL::string, MOCKPP_STL::string); - MOCKPP_VISITABLE_EXT3(MyVisitableMockObject_4ex, const std::string, visitable3, const std::string &, const std::string &, const std::string &, - std::string, Ext, std::string, std::string, std::string); + MOCKPP_VISITABLE_EXT3(MyVisitableMockObject_4ex, const MOCKPP_STL::string, visitable3, const MOCKPP_STL::string &, const MOCKPP_STL::string &, const MOCKPP_STL::string &, + MOCKPP_STL::string, Ext, MOCKPP_STL::string, MOCKPP_STL::string, MOCKPP_STL::string); - MOCKPP_VISITABLE_EXT2(MyVisitableMockObject_4ex, const std::string, visitable2, const std::string &, const std::string &, - std::string, Ext, std::string, std::string); + MOCKPP_VISITABLE_EXT2(MyVisitableMockObject_4ex, const MOCKPP_STL::string, visitable2, const MOCKPP_STL::string &, const MOCKPP_STL::string &, + MOCKPP_STL::string, Ext, MOCKPP_STL::string, MOCKPP_STL::string); - MOCKPP_VISITABLE_EXT1(MyVisitableMockObject_4ex, const std::string, visitable1, const std::string &, - std::string, Ext, std::string); + MOCKPP_VISITABLE_EXT1(MyVisitableMockObject_4ex, const MOCKPP_STL::string, visitable1, const MOCKPP_STL::string &, + MOCKPP_STL::string, Ext, MOCKPP_STL::string); - MOCKPP_VISITABLE_EXT0(MyVisitableMockObject_4ex, const std::string, visitable0, - std::string, Ext); + MOCKPP_VISITABLE_EXT0(MyVisitableMockObject_4ex, const MOCKPP_STL::string, visitable0, + MOCKPP_STL::string, Ext); bool isClear() { @@ -191,8 +191,8 @@ { MyVisitableMockObject_4 mvo(MOCKPP_PCHAR("mvo")); MOCKPP_CONTROLLER_FOR(MyVisitableMockObject_4, visitable) ctr (&mvo); - ctr.addThrowable(mockpp::make_throwable(std::string("exceptional string"))); - ctr.addThrowable(std::string("exceptional string"), 3); + ctr.addThrowable(mockpp::make_throwable(MOCKPP_STL::string("exceptional string"))); + ctr.addThrowable(MOCKPP_STL::string("exceptional string"), 3); ctr.setDefaultThrowable(mockpp::make_throwable(int(123))); ctr.addReturnValue(1); ctr.addReturnValue(11); @@ -208,9 +208,9 @@ { MyVisitableMockObject_4 mvo(MOCKPP_PCHAR("mvo")); MOCKPP_CONTROLLER_FOR(MyVisitableMockObject_4, visitable) ctr (&mvo); - ctr.addThrowable(mockpp::make_throwable(std::string("exceptional string 1"))); - ctr.addThrowable(std::string("exceptional string 2"), 2); - ctr.setDefaultThrowable(mockpp::make_throwable(std::string("exceptional string 3"))); + ctr.addThrowable(mockpp::make_throwable(MOCKPP_STL::string("exceptional string 1"))); + ctr.addThrowable(MOCKPP_STL::string("exceptional string 2"), 2); + ctr.setDefaultThrowable(mockpp::make_throwable(MOCKPP_STL::string("exceptional string 3"))); mvo.visitable(1, 2, 3, 4); mvo.visitable(1, 2, 3, 4); @@ -220,16 +220,16 @@ mvo.activate(); MOCKPP_ASSERT_THROWING(mvo.visitable(1, 2, 3, 4), MOCKPP_PCSTRING("1"), - std::string, "exceptional string 1"); + MOCKPP_STL::string, "exceptional string 1"); MOCKPP_ASSERT_THROWING(mvo.visitable(1, 2, 3, 4), MOCKPP_PCSTRING("2"), - std::string, "exceptional string 2"); + MOCKPP_STL::string, "exceptional string 2"); MOCKPP_ASSERT_THROWING(mvo.visitable(1, 2, 3, 4), MOCKPP_PCSTRING("3"), - std::string, "exceptional string 2"); + MOCKPP_STL::string, "exceptional string 2"); MOCKPP_ASSERT_THROWING(mvo.visitable(1, 2, 3, 4), MOCKPP_PCSTRING("4"), - std::string, "exceptional string 3"); + MOCKPP_STL::string, "exceptional string 3"); } @@ -249,7 +249,7 @@ MyVisitableMockObject_4 mvo(MOCKPP_PCHAR("mvo")); MOCKPP_CONTROLLER_FOR(MyVisitableMockObject_4, visitable) ctr (&mvo); mvo.activate(); - ctr.addThrowable(mockpp::make_throwable(std::string("exceptional string"))); + ctr.addThrowable(mockpp::make_throwable(MOCKPP_STL::string("exceptional string"))); } @@ -258,7 +258,7 @@ MyVisitableMockObject_4 mvo(MOCKPP_PCHAR("mvo")); MOCKPP_CONTROLLER_FOR(MyVisitableMockObject_4, visitable) ctr (&mvo); mvo.activate(); - ctr.addThrowable(std::string("exceptional string"), 1); + ctr.addThrowable(MOCKPP_STL::string("exceptional string"), 1); } @@ -267,7 +267,7 @@ MyVisitableMockObject_4 mvo(MOCKPP_PCHAR("mvo")); MOCKPP_CONTROLLER_FOR(MyVisitableMockObject_4, visitable) ctr (&mvo); mvo.activate(); - ctr.setDefaultThrowable(mockpp::make_throwable(std::string("exceptional string"))); + ctr.setDefaultThrowable(mockpp::make_throwable(MOCKPP_STL::string("exceptional string"))); } @@ -380,11 +380,11 @@ mvo.activate(); - MOCKPP_ASSERT_TRUE(std::string("4") == mvo.visitable4("1", "2", "3", "4")); - MOCKPP_ASSERT_TRUE(std::string("3") == mvo.visitable3("2", "3", "4")); - MOCKPP_ASSERT_TRUE(std::string("2") == mvo.visitable2("3", "4")); - MOCKPP_ASSERT_TRUE(std::string("1") == mvo.visitable1("4")); - MOCKPP_ASSERT_TRUE(std::string("0") == mvo.visitable0()); + MOCKPP_ASSERT_TRUE(MOCKPP_STL::string("4") == mvo.visitable4("1", "2", "3", "4")); + MOCKPP_ASSERT_TRUE(MOCKPP_STL::string("3") == mvo.visitable3("2", "3", "4")); + MOCKPP_ASSERT_TRUE(MOCKPP_STL::string("2") == mvo.visitable2("3", "4")); + MOCKPP_ASSERT_TRUE(MOCKPP_STL::string("1") == mvo.visitable1("4")); + MOCKPP_ASSERT_TRUE(MOCKPP_STL::string("0") == mvo.visitable0()); mvo.verify(); } @@ -410,9 +410,9 @@ { MyVisitableMockObject_4 mvo(MOCKPP_PCHAR("mvo")); MOCKPP_CONTROLLER_FOR(MyVisitableMockObject_4, visitable) ctr (&mvo); - ctr.addResponseThrowable(mockpp::make_throwable(std::string("throw me 2")), 922, 2, 3, 4); - ctr.addResponseThrowable(mockpp::make_throwable(std::string("throw me 1")), 911, 2, 3, 4); - ctr.setDefaultThrowable(mockpp::make_throwable(std::string("throw default"))); + ctr.addResponseThrowable(mockpp::make_throwable(MOCKPP_STL::string("throw me 2")), 922, 2, 3, 4); + ctr.addResponseThrowable(mockpp::make_throwable(MOCKPP_STL::string("throw me 1")), 911, 2, 3, 4); + ctr.setDefaultThrowable(mockpp::make_throwable(MOCKPP_STL::string("throw default"))); mvo.visitable(922, 2, 3, 4); mvo.visitable(911, 2, 3, 4); @@ -423,16 +423,16 @@ mvo.activate(); MOCKPP_ASSERT_THROWING(mvo.visitable(922, 2, 3, 4), MOCKPP_PCHAR("response 1"), - std::string, std::string("throw me 2")); + MOCKPP_STL::string, MOCKPP_STL::string("throw me 2")); MOCKPP_ASSERT_THROWING(mvo.visitable(911, 2, 3, 4), MOCKPP_PCHAR("response 2"), - std::string, std::string("throw me 1")); + MOCKPP_STL::string, MOCKPP_STL::string("throw me 1")); MOCKPP_ASSERT_THROWING(mvo.visitable(1, 2, 3, 4), MOCKPP_PCHAR("default response"), - std::string, std::string("throw default")); + MOCKPP_STL::string, MOCKPP_STL::string("throw default")); MOCKPP_ASSERT_THROWING(mvo.visitable(2, 2, 3, 4), MOCKPP_PCHAR("default response"), - std::string, std::string("throw default")); + MOCKPP_STL::string, MOCKPP_STL::string("throw default")); } @@ -445,8 +445,8 @@ ctr.addResponseValue(123, 456, 2, 3, 4); ctr.addResponseValue(321, 654, 2, 3, 4); - ctr.addResponseThrowable(mockpp::make_throwable(std::string("throw me 2")), 922, 2, 3, 4); - ctr.addResponseThrowable(mockpp::make_throwable(std::string("throw me 1")), 911, 2, 3, 4); + ctr.addResponseThrowable(mockpp::make_throwable(MOCKPP_STL::string("throw me 2")), 922, 2, 3, 4); + ctr.addResponseThrowable(mockpp::make_throwable(MOCKPP_STL::string("throw me 1")), 911, 2, 3, 4); mvo.visitable(456, 2, 3, 4); mvo.visitable(654, 2, 3, 4); @@ -463,10 +463,10 @@ MOCKPP_ASSERT_TRUE(111 == mvo.visitable(1, 2, 3, 4)); MOCKPP_ASSERT_THROWING(mvo.visitable(922, 2, 3, 4), MOCKPP_PCHAR("response 1"), - std::string, std::string("throw me 2")); + MOCKPP_STL::string, MOCKPP_STL::string("throw me 2")); MOCKPP_ASSERT_THROWING(mvo.visitable(911, 2, 3, 4), MOCKPP_PCHAR("response 2"), - std::string, std::string("throw me 1")); + MOCKPP_STL::string, MOCKPP_STL::string("throw me 1")); MOCKPP_ASSERT_TRUE(111 == mvo.visitable(2, 2, 3, 4)); MOCKPP_ASSERT_TRUE(111 == mvo.visitable(3, 2, 3, 4)); @@ -482,7 +482,7 @@ MOCKPP_ASSERT_TRUE(mvo.isClear() == true); MOCKPP_CONTROLLER_FOR(MyVisitableMockObject_4, visitable) ctr (&mvo); - ctr.addThrowable(std::string("exceptional string"), 3); + ctr.addThrowable(MOCKPP_STL::string("exceptional string"), 3); ctr.setDefaultThrowable(mockpp::make_throwable(int(123))); ctr.addReturnValue(1); @@ -502,7 +502,7 @@ { MyVisitableMockObject_4 mvo(MOCKPP_PCHAR("mvo")); MOCKPP_CONTROLLER_FOR(MyVisitableMockObject_4, visitable) ctr (&mvo); - ctr.setDefaultThrowable(mockpp::make_throwable(std::string("throw default"))); + ctr.setDefaultThrowable(mockpp::make_throwable(MOCKPP_STL::string("throw default"))); mvo.activate(); mvo.verify(); } @@ -523,9 +523,9 @@ MyVisitableMockObject_4 mvo(MOCKPP_PCHAR("mvo")); MOCKPP_CONTROLLER_FOR(MyVisitableMockObject_4, visitable) ctr (&mvo); ctr.addReturnValue(111); - ctr.addThrowable(mockpp::make_throwable(std::string("throw 1"))); + ctr.addThrowable(mockpp::make_throwable(MOCKPP_STL::string("throw 1"))); ctr.addReturnValue(222); - ctr.addThrowable(mockpp::make_throwable(std::string("throw 2"))); + ctr.addThrowable(mockpp::make_throwable(MOCKPP_STL::string("throw 2"))); mvo.unsetThrowablesInline(); // old pre-1.2 mode mvo.activate(); @@ -535,9 +535,9 @@ mvo.visitable(1, 2, 3, 4); MOCKPP_FAIL(MOCKPP_PCHAR("should have thrown here")); } - catch(std::string &ex) + catch(MOCKPP_STL::string &ex) { - MOCKPP_ASSERT_EQUALS(ex, std::string("throw 1")); + MOCKPP_ASSERT_EQUALS(ex, MOCKPP_STL::string("throw 1")); } try @@ -545,9 +545,9 @@ mvo.visitable(1, 2, 3, 4); MOCKPP_FAIL(MOCKPP_PCHAR("should have thrown here")); } - catch(std::string &ex) + catch(MOCKPP_STL::string &ex) { - MOCKPP_ASSERT_EQUALS(ex, std::string("throw 2")); + MOCKPP_ASSERT_EQUALS(ex, MOCKPP_STL::string("throw 2")); } MOCKPP_ASSERT_TRUE(111 == mvo.visitable(1, 2, 3, 4)); @@ -562,9 +562,9 @@ MyVisitableMockObject_4 mvo(MOCKPP_PCHAR("mvo")); MOCKPP_CONTROLLER_FOR(MyVisitableMockObject_4, visitable) ctr (&mvo); ctr.addReturnValue(111); - ctr.addThrowable(mockpp::make_throwable(std::string("throw 1"))); + ctr.addThrowable(mockpp::make_throwable(MOCKPP_STL::string("throw 1"))); ctr.addReturnValue(222); - ctr.addThrowable(mockpp::make_throwable(std::string("throw 2"))); + ctr.addThrowable(mockpp::make_throwable(MOCKPP_STL::string("throw 2"))); mvo.activate(); MOCKPP_ASSERT_TRUE(111 == mvo.visitable(1, 2, 3, 4)); @@ -574,9 +574,9 @@ mvo.visitable(1, 2, 3, 4); MOCKPP_FAIL(MOCKPP_PCHAR("should have thrown here")); } - catch(std::string &ex) + catch(MOCKPP_STL::string &ex) { - MOCKPP_ASSERT_EQUALS(ex, std::string("throw 1")); + MOCKPP_ASSERT_EQUALS(ex, MOCKPP_STL::string("throw 1")); } MOCKPP_ASSERT_TRUE(222 == mvo.visitable(1, 2, 3, 4)); @@ -586,9 +586,9 @@ mvo.visitable(1, 2, 3, 4); MOCKPP_FAIL(MOCKPP_PCHAR("should have thrown here")); } - catch(std::string &ex) + catch(MOCKPP_STL::string &ex) { - MOCKPP_ASSERT_EQUALS(ex, std::string("throw 2")); + MOCKPP_ASSERT_EQUALS(ex, MOCKPP_STL::string("throw 2")); } mvo.verify(); Index: VisitableMockObject_1_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_1_test.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- VisitableMockObject_1_test.cpp 15 Oct 2005 15:50:36 -0000 1.20 +++ VisitableMockObject_1_test.cpp 26 Nov 2005 17:57:48 -0000 1.21 @@ -147,11 +147,11 @@ MOCKPP_CONSTRUCT_MEMBERS_FOR_VISITABLE_EXT0(visitable0, Ext) {} - MOCKPP_VISITABLE_EXT1(MyVisitableMockObject_1ex, const std::string, visitable1, const std::string &, - std::string, Ext, std::string); + MOCKPP_VISITABLE_EXT1(MyVisitableMockObject_1ex, const MOCKPP_STL::string, visitable1, const MOCKPP_STL::string &, + MOCKPP_STL::string, Ext, MOCKPP_STL::string); - MOCKPP_VISITABLE_EXT0(MyVisitableMockObject_1ex, const std::string, visitable0, - std::string, Ext); + MOCKPP_VISITABLE_EXT0(MyVisitableMockObject_1ex, const MOCKPP_STL::string, visitable0, + MOCKPP_STL::string, Ext); bool isClear() { @@ -172,8 +172,8 @@ { MyVisitableMockObject_1 mvo(MOCKPP_PCHAR("mvo")); MOCKPP_CONTROLLER_FOR(MyVisitableMockObject_1, visitable) ctr (&mvo); - ctr.addThrowable(mockpp::make_throwable(std::string("exceptional string"))); - ctr.addThrowable(std::string("exceptional string"), 3); + ctr.addThrowable(mockpp::make_throwable(MOCKPP_STL::string("exceptional string"))); + ctr.addThrowable(MOCKPP_STL::string("exceptional string"), 3); ctr.setDefaultThrowable(mockpp::make_throwable(int(123))); ctr.addReturnValue(1); ctr.addReturnValue(11); @@ -189,9 +189,9 @@ { MyVisitableMockObject_1 mvo(MOCKPP_PCHAR("mvo")); MOCKPP_CONTROLLER_FOR(MyVisitableMockObject_1, visitable) ctr (&mvo); - ctr.addThrowable(mockpp::make_throwable(std::string("exceptional string 1"))); - ctr.addThrowable(std::string("exceptional string 2"), 2); - ctr.setDefaultThrowable(mockpp::make_throwable(std::string("exceptional string 3"))); + ctr.addThrowable(mockpp::make_throwable(MOCKPP_STL::string("exceptional string 1"))); + ctr.addThrowable(MOCKPP_STL::string("exceptional string 2"), 2); + ctr.setDefaultThrowable(mockpp::make_throwable(MOCKPP_STL::string("exceptional string 3"))); mvo.visitable(1); mvo.visitable(1); @@ -201,16 +201,16 @@ mvo.activate(); MOCKPP_ASSERT_THROWING(mvo.visitable(1), MOCKPP_PCSTRING("1"), - std::string, "exceptional string 1"); + MOCKPP_STL::string, "exceptional string 1"); MOCKPP_ASSERT_THROWING(mvo.visitable(1), MOCKPP_PCSTRING("2"), - std::string, "exceptional string 2"); + MOCKPP_STL::string, "exceptional string 2"); MOCKPP_ASSERT_THROWING(mvo.visitable(1), MOCKPP_PCSTRING("3"), - std::string, "exceptional string 2"); + MOCKPP_STL::string, "exceptional string 2"); MOCKPP_ASSERT_THROWING(mvo.visitable(1), MOCKPP_PCSTRING("4"), - std::string, "exceptional string 3"); + MOCKPP_STL::string, "exceptional string 3"); } @@ -230,7 +230,7 @@ MyVisitableMockObject_1 mvo(MOCKPP_PCHAR("mvo")); MOCKPP_CONTROLLER_FOR(MyVisitableMockObject_1, visitable) ctr (&mvo); mvo.activate(); - ctr.addThrowable(mockpp::make_throwable(std::string("exceptional string"))); + ctr.addThrowable(mockpp::make_throwable(MOCKPP_STL::string("exceptional string"))); } @@ -239,7 +239,7 @@ MyVisitableMockObject_1 mvo(MOCKPP_PCHAR("mvo")); MOCKPP_CONTROLLER_FOR(MyVisitableMockObject_1, visitable) ctr (&mvo); mvo.activate(); - ctr.addThrowable(std::string("exceptional string"), 1); + ctr.addThrowable(MOCKPP_STL::string("exceptional string"), 1); } @@ -248,7 +248,7 @@ MyVisitableMockObject_1 mvo(MOCKPP_PCHAR("mvo")); MOCKPP_CONTROLLER_FOR(MyVisitableMockObject_1, visitable) ctr (&mvo); mvo.activate(); - ctr.setDefaultThrowable(mockpp::make_throwable(std::string("exceptional string"))); + ctr.setDefaultThrowable(mockpp::make_throwable(MOCKPP_STL::string("exceptional string"))); } @@ -349,8 +349,8 @@ mvo.activate(); - MOCKPP_ASSERT_TRUE(std::string("1") == mvo.visitable1("4")); - MOCKPP_ASSERT_TRUE(std::string("0") == mvo.visitable0()); + MOCKPP_ASSERT_TRUE(MOCKPP_STL::string("1") == mvo.visitable1("4")); + MOCKPP_ASSERT_TRUE(MOCKPP_STL::string("0") == mvo.visitable0()); mvo.verify(); } @@ -376,9 +376,9 @@ { MyVisitableMockObject_1 mvo(MOCKPP_PCHAR("mvo")); MOCKPP_CONTROLLER_FOR(MyVisitableMockObject_1, visitable) ctr (&mvo); - ctr.addResponseThrowable(mockpp::make_throwable(std::string("throw me 1")), 922); - ctr.addResponseThrowable(mockpp::make_throwable(std::string("throw me 2")), 911); - ctr.setDefaultThrowable(mockpp::make_throwable(std::string("throw default"))); + ctr.addResponseThrowable(mockpp::make_throwable(MOCKPP_STL::string("throw me 1")), 922); + ctr.addResponseThrowable(mockpp::make_throwable(MOCKPP_STL::string("throw me 2")), 911); + ctr.setDefaultThrowable(mockpp::make_throwable(MOCKPP_STL::string("throw default"))); mvo.visitable(922); mvo.visitable(911); @@ -389,16 +389,16 @@ mvo.activate(); MOCKPP_ASSERT_THROWING(mvo.visitable(922), MOCKPP_PCHAR("response 1"), - std::string, std::string("throw me 1")); + MOCKPP_STL::string, MOCKPP_STL::string("throw me 1")); MOCKPP_ASSERT_THROWING(mvo.visitable(911), MOCKPP_PCHAR("response 2"), - std::string, std::string("throw me 2")); + MOCKPP_STL::string, MOCKPP_STL::string("throw me 2")); MOCKPP_ASSERT_THROWING(mvo.visitable(1), MOCKPP_PCHAR("default response"), - std::string, std::string("throw default")); + MOCKPP_STL::string, MOCKPP_STL::string("throw default")); MOCKPP_ASSERT_THROWING(mvo.visitable(2), MOCKPP_PCHAR("default response"), - std::string, std::string("throw default")); + MOCKPP_STL::string, MOCKPP_STL::string("throw default")); } @@ -411,8 +411,8 @@ ctr.addResponseValue(123, 456); ctr.addResponseValue(321, 654); - ctr.addResponseThrowable(mockpp::make_throwable(std::string("throw me 1")), 922); - ctr.addResponseThrowable(mockpp::make_throwable(std::string("throw me 2")), 911); + ctr.addResponseThrowable(mockpp::make_throwable(MOCKPP_STL::string("throw me 1")), 922); + ctr.addResponseThrowable(mockpp::make_throwable(MOCKPP_STL::string("throw me 2")), 911); mvo.visitable(456); mvo.visitable(654); @@ -429,10 +429,10 @@ MOCKPP_ASSERT_TRUE(111 == mvo.visitable(1)); MOCKPP_ASSERT_THROWING(mvo.visitable(922), MOCKPP_PCHAR("response 1"), - std::string, std::string("throw me 1")); + MOCKPP_STL::string, MOCKPP_STL::string("throw me 1")); MOCKPP_ASSERT_THROWING(mvo.visitable(911), MOCKPP_PCHAR("response 2"), - std::string, std::string("throw me 2")); + MOCKPP_STL::string, MOCKPP_STL::string("throw me 2")); MOCKPP_ASSERT_TRUE(111 == mvo.visitable(2)); MOCKPP_ASSERT_TRUE(111 == mvo.visitable(3)); @@ -448,7 +448,7 @@ MOCKPP_ASSERT_TRUE(mvo.isClear() == true); MOCKPP_CONTROLLER_FOR(MyVisitableMockObject_1, visitable) ctr (&mvo); - ctr.addThrowable(std::string("exceptional string"), 3); + ctr.addThrowable(MOCKPP_STL::string("exceptional string"), 3); ctr.setDefaultThrowable(mockpp::make_throwable(int(123))); ctr.addReturnValue(1); @@ -468,7 +468,7 @@ { MyVisitableMockObject_1 mvo(MOCKPP_PCHAR("mvo")); MOCKPP_CONTROLLER_FOR(MyVisitableMockObject_1, visitable) ctr (&mvo); - ctr.setDefaultThrowable(mockpp::make_throwable(std::string("throw default"))); + ctr.setDefaultThrowable(mockpp::make_throwable(MOCKPP_STL::string("throw default"))); mvo.activate(); mvo.verify(); } @@ -489,9 +489,9 @@ MyVisitableMockObject_1 mvo(MOCKPP_PCHAR("mvo")); MOCKPP_CONTROLLER_FOR(MyVisitableMockObject_1, visitable) ctr (&mvo); ctr.addReturnValue(111); - ctr.addThrowable(mockpp::make_throwable(std::string("throw 1"))); + ctr.addThrowable(mockpp::make_throwable(MOCKPP_STL::string("throw 1"))); ctr.addReturnValue(222); - ctr.addThrowable(mockpp::make_throwable(std::string("throw 2"))); + ctr.addThrowable(mockpp::make_throwable(MOCKPP_STL::string("throw 2"))); mvo.unsetThrowablesInline(); // old pre-1.2 mode mvo.activate(); @@ -501,9 +501,9 @@ mvo.visitable(1); MOCKPP_FAIL(MOCKPP_PCHAR("should have thrown here")); } - catch(std::string &ex) + catch(MOCKPP_STL::string &ex) { - MOCKPP_ASSERT_EQUALS(ex, std::string("throw 1")); + MOCKPP_ASSERT_EQUALS(ex, MOCKPP_STL::string("throw 1")); } try @@ -511,9 +511,9 @@ mvo.visitable(1); MOCKPP_FAIL(MOCKPP_PCHAR("should have thrown here")); } - catch(std::string &ex) + catch(MOCKPP_STL::string &ex) { - MOCKPP_ASSERT_EQUALS(ex, std::string("throw 2")); + MOCKPP_ASSERT_EQUALS(ex, MOCKPP_STL::string("throw 2")); } MOCKPP_ASSERT_TRUE(111 == mvo.visitable(3)); @@ -528,9 +528,9 @@ MyVisitableMockObject_1 mvo(MOCKPP_PCHAR("mvo")); MOCKPP_CONTROLLER_FOR(MyVisitableMockObject_1, visitable) ctr (&mvo); ctr.addReturnValue(111); - ctr.addThrowable(mockpp::make_throwable(std::string("throw 1"))); + ctr.addThrowable(mockpp::make_throwable(MOCKPP_STL::string("throw 1"))); ctr.addReturnValue(222); - ctr.addThrowable(mockpp::make_throwable(std::string("throw 2"))); + ctr.addThrowable(mockpp::make_throwable(MOCKPP_STL::string("throw 2"))); mvo.activate(); MOCKPP_ASSERT_TRUE(111 == mvo.visitable(3)); @@ -540,9 +540,9 @@ mvo.visitable(1); MOCKPP_FAIL(MOCKPP_PCHAR("should have thrown here")); } - catch(std::string &ex) + catch(MOCKPP_STL::string &ex) { - MOCKPP_ASSERT_EQUALS(ex, std::string("throw 1")); + MOCKPP_ASSERT_EQUALS(ex, MOCKPP_STL::string("throw 1")); } MOCKPP_ASSERT_TRUE(222 == mvo.visitable(3)); @@ -552,9 +552,9 @@ mvo.visitable(1); MOCKPP_FAIL(MOCKPP_PCHAR("should have thrown here")); } - catch(std::string &ex) + catch(MOCKPP_STL::string &ex) { - MOCKPP_ASSERT_EQUALS(ex, std::string("throw 2")); + MOCKPP_ASSERT_EQUALS(ex, MOCKPP_STL::string("throw 2")); } mvo.verify(); Index: VisitableMockObject_1_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_1_void_test.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- VisitableMockObject_1_void_test.cpp 15 Oct 2005 15:40:59 -0000 1.20 +++ VisitableMockObject_1_void_test.cpp 26 Nov 2005 17:57:48 -0000 1.21 @@ -129,8 +129,8 @@ MOCKPP_CONSTRUCT_MEMBERS_FOR_VOID_VISITABLE_EXT0(visitable0, Ext) {} - MOCKPP_VOID_VISITABLE_EXT1(MyVisitableMockObject_1_void_ex, visitable1, const std::string &, - Ext, std::string); + MOCKPP_VOID_VISITABLE_EXT1(MyVisitableMockObject_1_void_ex, visitable1, const MOCKPP_STL::string &, + Ext, MOCKPP_STL::string); MOCKPP_VOID_VISITABLE_EXT1(MyVisitableMockObject_1_void_ex, outbound, unsigned &, Ext, unsigned ); @@ -153,8 +153,8 @@ { MyVisitableMockObject_1_void mvo(MOCKPP_PCHAR("mvo")); MOCKPP_CONTROLLER_FOR(MyVisitableMockObject_1_void, visitable) ctr (&mvo); - ctr.addThrowable(mockpp::make_throwable(std::string("exceptional string"))); - ctr.addThrowable(std::string("exceptional string"), 3); + ctr.addThrowable(mockpp::make_throwable(MOCKPP_STL::string("exceptional string"))); + ctr.addThrowable(MOCKPP_STL::string("exceptional string"), 3); ctr.setDefaultThrowable(mockpp::make_throwable(int(123))); ctr.addResponseThrowable(mockpp::make_throwable(int(1)), 1); ctr.addResponseThrowable(mockpp::make_throwable(int(0)), 0); @@ -165,8 +165,8 @@ { MyVisitableMockObject_1_void mvo(MOCKPP_PCHAR("mvo")); MOCKPP_CONTROLLER_FOR(MyVisitableMockObject_1_void, visitable) ctr (&mvo); - ctr.addThrowable(mockpp::make_throwable(std::string("exceptional string 1"))); - ctr.addThrowable(std::string("exceptional string 2"), 2); + ctr.addThrowable(mockpp::make_throwable(MOCKPP_STL::string("exceptional string 1"))); + ctr.addThrowable(MOCKPP_STL::string("exceptional string 2"), 2); mvo.visitable(2); mvo.visitable(22); @@ -178,13 +178,13 @@ mvo.activate(); MOCKPP_ASSERT_THROWING(mvo.visitable(2), MOCKPP_PCSTRING("1"), - std::string, "exceptional string 1"); + MOCKPP_STL::string, "exceptional string 1"); MOCKPP_ASSERT_THROWING(mvo.visitable(22), MOCKPP_PCSTRING("2"), - std::string, "exceptional string 2"); + MOCKPP_STL::string, "exceptional string 2"); MOCKPP_ASSERT_THROWING(mvo.visitable(222), MOCKPP_PCSTRING("3"), - std::string, "exceptional string 2"); + MOCKPP_STL::string, "exceptional string 2"); mvo.visitable(2222); mvo.visitable(22222); @@ -209,7 +209,7 @@ MyVisitableMockObject_1_void mvo(MOCKPP_PCHAR("mvo")); MOCKPP_CONTROLLER_FOR(MyVisitableMockObject_1_void, visitable) ctr (&mvo); mvo.activate(); - ctr.addThrowable(mockpp::make_throwable(std::string("exceptional string"))); + ctr.addThrowable(mockpp::make_throwable(MOCKPP_STL::string("exceptional string"))); } @@ -218,7 +218,7 @@ MyVisitableMockObject_1_void mvo(MOCKPP_PCHAR("mvo")); MOCKPP_CONTROLLER_FOR(MyVisitableMockObject_1_void, visitable) ctr (&mvo); mvo.activate(); - ctr.addThrowable(std::string("exceptional string"), 1); + ctr.addThrowable(MOCKPP_STL::string("exceptional string"), 1); } @@ -227,7 +227,7 @@ MyVisitableMockObject_1_void mvo(MOCKPP_PCHAR("mvo")); MOCKPP_CONTROLLER_FOR(MyVisitableMockObject_1_void, visitable) ctr (&mvo); mvo.activate(); - ctr.setDefaultThrowable(mockpp::make_throwable(std::string("exceptional string"))); + ctr.setDefaultThrowable(mockpp::make_throwable(MOCKPP_STL::string("exceptional string"))); } @@ -284,9 +284,9 @@ { MyVisitableMockObject_1_void mvo(MOCKPP_PCHAR("mvo")); MOCKPP_CONTROLLER_FOR(MyVisitableMockObject_1_void, visitable) ctr (&mvo); - ctr.addResponseThrowable(mockpp::make_throwable(std::string("throw me 1")), 922); - ctr.addResponseThrowable(mockpp::make_throwable(std::string("throw me 2")), 911); - ctr.setDefaultThrowable(mockpp::make_throwable(std::string("throw default"))); + ctr.addResponseThrowable(mockpp::make_throwable(MOCKPP_STL::string("throw me 1")), 922); + ctr.addResponseThrowable(mockpp::make_throwable(MOCKPP_STL::string("throw me 2")), 911); + ctr.setDefaultThrowable(mockpp::make_throwable(MOCKPP_STL::string("throw default"))); mvo.visitable(922); mvo.visitable(911); @@ -296,16 +296,16 @@ mvo.activate(); MOCKPP_ASSERT_THROWING(mvo.visitable(922), MOCKPP_PCHAR("response 1"), - std::string, std::string("throw me 1")); + MOCKPP_STL::string, MOCKPP_STL::string("throw me 1")); MOCKPP_ASSERT_THROWING(mvo.visitable(911), MOCKPP_PCHAR("response 2"), - std::string, std::string("throw me 2")); + MOCKPP_STL::string, MOCKPP_STL::string("throw me 2")); MOCKPP_ASSERT_THROWING(mvo.visitable(1), MOCKPP_PCHAR("default response"), - std::string, std::string("throw default")); + MOCKPP_STL::string, MOCKPP_STL::string("throw default")); MOCKPP_ASSERT_THROWING(mvo.visitable(2), MOCKPP_PCHAR("default response"), - std::string, std::string("throw default")); + MOCKPP_STL::string, MOCKPP_STL::string("throw default")); mvo.verify(); } @@ -318,7 +318,7 @@ MOCKPP_CONTROLLER_FOR(MyVisitableMockObject_1_void, visitable) ctr (&mvo); - ctr.addThrowable(std::string("exceptional string"), 3); + ctr.addThrowable(MOCKPP_STL::string("exceptional string"), 3); ctr.setDefaultThrowable(mockpp::make_throwable(int(123))); ctr.addResponseThrowable(mockpp::make_throwable(int(1)), 0); @@ -334,7 +334,7 @@ { MyVisitableMockObject_1_void mvo(MOCKPP_PCHAR("mvo")); MOCKP... [truncated message content] |
