[Mockpp-commits] mockpp/mockpp/tests AbstractDynamicChainingMock_test.cpp,1.41,1.42 AbstractInvocati
Brought to you by:
ewald-arnold
Menu
▾
▴
[Mockpp-commits] mockpp/mockpp/tests AbstractDynamicChainingMock_test.cpp,1.41,1.42 AbstractInvocationDispatcher_test.cpp,1.31,1.32 And_test.cpp,1.19,1.20 AnyArgumentsMatcher_test.cpp,1.15,1.16 ArgumentsMatchBuilder_test.cpp,1.32,1.33 ArgumentsMatcher_test.cpp,1.20,1.21 AssertMo_test.cpp,1.35,1.36 Assert_test.cpp,1.27,1.28 ChainableMockMethod_1_test.cpp,1.20,1.21 ChainableMockMethod_2_test.cpp,1.18,1.19 ChainableMockMethod_test.cpp,1.21,1.22 ChainableMockObjectPolymorphism_test.cpp,1.14,1.15 ChainableMockObject_1_test.cpp,1.22,1.23 ChainableMockObject_1_void_test.cpp,1.23,1.24 ChainableMockObject_2_test.cpp,1.19,1.20 ChainableMockObject_2_void_test.cpp,1.20,1.21 ChainableMockObject_3_test.cpp,1.17,1.18 ChainableMockObject_3_void_test.cpp,1.20,1.21 ChainableMockObject_4_test.cpp,1.19,1.20 ChainableMockObject_4_void_test.cpp,1.20,1.21 ChainableMockObject_5_test.cpp,1.20,1.21 ChainableMockObject_5_void_test.cpp,1.22,1.23 ChainableMockObject_test.cpp,1.32,1.33 ChainableMockObject_void_test.cpp,1.20,1.21 ChainingMockBuilder_test.cpp,1.30,1.31 ChainingMockObjectSupport_test.cpp,1.41,1.42 ConstraintList_test.cpp,1.11,1.12 ConstraintSet_test.cpp,1.23,1.24 CoreMock_test.cpp,1.31,1.32 CustomStub_test.cpp,1.19,1.20 DefaultResultStub_test.cpp,1.18,1.19 DynamicChainingMockError_test.cpp,1.22,1.23 Exception_test.cpp,1.21,1.22 ExpectationBoundary_test.cpp,1.21,1.22 ExpectationConglomeration_test.cpp,1.21,1.22 ExpectationCounterRange_test.cpp,1.21,1.22 ExpectationCounter_test.cpp,1.22,1.23 ExpectationList_test.cpp,1.25,1.26 ExpectationMap_test.cpp,1.26,1.27 ExpectationSegment_test.cpp,1.22,1.23 ExpectationSet_test.cpp,1.23,1.24 ExpectationValue_test.cpp,1.22,1.23 FIFOInvocationDispatcher_test.cpp,1.27,1.28 Formatter_test.cpp,1.42,1.43 IncCounter.h,1.4,1.5 InvocationMockerBuilder_test.cpp,1.37,1.38 InvocationMocker_test.cpp,1.44,1.45 Invocation_test.cpp,1.28,1.29 InvokeAtLeastMatcher_test.cpp,1.13,1.14 InvokeAtLeastOnceMatcher_test.cpp,1.16,1.17 InvokeAtMostMatcher_test.cpp,1.15,1.16 InvokeCountMatcher_test.cpp,1.17,1.18 InvokeOnceMatcher_test.cpp,1.16,1.17 InvokedAfterMatcher_test.cpp,1.16,1.17 InvokedBeforeMatcher_test.cpp,1.13,1.14 InvokedRecorder_test.cpp,1.17,1.18 IsAnything_test.cpp,1.20,1.21 IsCloseTo_test.cpp,1.17,1.18 IsEqual_test.cpp,1.16,1.17 IsGreaterOrEqual_test.cpp,1.15,1.16 IsGreaterThan_test.cpp,1.15,1.16 IsInstanceOf_test.cpp,1.23,1.24 IsLessOrEqual_test.cpp,1.15,1.16 IsLessThan_test.cpp,1.15,1.16 IsNot_test.cpp,1.21,1.22 IsNothing_test.cpp,1.18,1.19 IsSame_test.cpp,1.18,1.19 LIFOInvocationDispatcher_test.cpp,1.26,1.27 MatchBuilder_test.cpp,1.30,1.31 MixedMockObject_5_test.cpp,1.14,1.15 MockObject_test.cpp,1.26,1.27 MyBuilderNamespace.h,1.16,1.17 MyMatchBuilder.h,1.5,1.6 NoArgumentsMatcher_test.cpp,1.18,1.19 NoException_test.cpp,1.14,1.15 Or_test.cpp,1.19,1.20 OutBound_test.cpp,1.9,1.10 ResponseVector_test.cpp,1.13,1.14 ReturnObjectList_test.cpp,1.24,1.25 ReturnStub_test.cpp,1.18,1.19 StringContains_test.cpp,1.19,1.20 StringEndsWith_test.cpp,1.12,1.13 StringStartsWith_test.cpp,1.12,1.13 StubBuilder_test.cpp,1.23,1.24 StubSequence_test.cpp,1.23,1.24 TestFailureMatcher_test.cpp,1.17,1.18 TestFailureStub_test.cpp,1.15,1.16 ThrowStub_test.cpp,1.21,1.22 ThrowableList_test.cpp,1.25,1.26 Throwable_test.cpp,1.23,1.24 TimeServer_test.cpp,1.9,1.10 TrackingCounter_test.cpp,1.18,1.19 TypelessStubSequence_test.cpp,1.13,1.14 UnlimitedMatcher_test.cpp,1.11,1.12 Verifiable_test.cpp,1.31,1.32 VerifyingTestCaller_test.cpp,1.21,1.22 VerifyingTestCase_test.cpp,1.27,1.28 VisitableMockMethod_1_test.cpp,1.14,1.15 VisitableMockMethod_2_test.cpp,1.19,1.20 VisitableMockMethod_test.cpp,1.28,1.29 VisitableMockObject_1_test.cpp,1.30,1.31 VisitableMockObject_1_void_test.cpp,1.30,1.31 VisitableMockObject_2_test.cpp,1.29,1.30 VisitableMockObject_2_void_test.cpp,1.29,1.30 VisitableMockObject_3_test.cpp,1.28,1.29 VisitableMockObject_3_void_test.cpp,1.28,1.29 VisitableMockObject_4_test.cpp,1.28,1.29 VisitableMockObject_4_void_test.cpp,1.28,1.29 VisitableMockObject_5_test.cpp,1.37,1.38 VisitableMockObject_5_void_test.cpp,1.33,1.34 VisitableMockObject_template_test.cpp,1.17,1.18 VisitableMockObject_test.cpp,1.33,1.34 VisitableMockObject_void_test.cpp,1.26,1.27 VoidStub_test.cpp,1.19,1.20 classes_ABCDE.cpp,1.6,1.7 classes_ABCDE.h,1.8,1.9 compilecheck.cpp,1.26,1.27 mock_test.cpp,1.41,1.42 mockpp_pti_test.cpp,1.17,1.18 mockpp_test.cpp,1.24,1.25 readability_test.cpp,1.6,1.7
Update of /cvsroot/mockpp/mockpp/mockpp/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv763/mockpp/tests Modified Files: AbstractDynamicChainingMock_test.cpp AbstractInvocationDispatcher_test.cpp And_test.cpp AnyArgumentsMatcher_test.cpp ArgumentsMatchBuilder_test.cpp ArgumentsMatcher_test.cpp AssertMo_test.cpp Assert_test.cpp ChainableMockMethod_1_test.cpp ChainableMockMethod_2_test.cpp ChainableMockMethod_test.cpp ChainableMockObjectPolymorphism_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 ChainableMockObject_5_test.cpp ChainableMockObject_5_void_test.cpp ChainableMockObject_test.cpp ChainableMockObject_void_test.cpp ChainingMockBuilder_test.cpp ChainingMockObjectSupport_test.cpp ConstraintList_test.cpp ConstraintSet_test.cpp CoreMock_test.cpp CustomStub_test.cpp DefaultResultStub_test.cpp DynamicChainingMockError_test.cpp Exception_test.cpp ExpectationBoundary_test.cpp ExpectationConglomeration_test.cpp ExpectationCounterRange_test.cpp ExpectationCounter_test.cpp ExpectationList_test.cpp ExpectationMap_test.cpp ExpectationSegment_test.cpp ExpectationSet_test.cpp ExpectationValue_test.cpp FIFOInvocationDispatcher_test.cpp Formatter_test.cpp IncCounter.h InvocationMockerBuilder_test.cpp InvocationMocker_test.cpp Invocation_test.cpp InvokeAtLeastMatcher_test.cpp InvokeAtLeastOnceMatcher_test.cpp InvokeAtMostMatcher_test.cpp InvokeCountMatcher_test.cpp InvokeOnceMatcher_test.cpp InvokedAfterMatcher_test.cpp InvokedBeforeMatcher_test.cpp InvokedRecorder_test.cpp IsAnything_test.cpp IsCloseTo_test.cpp IsEqual_test.cpp IsGreaterOrEqual_test.cpp IsGreaterThan_test.cpp IsInstanceOf_test.cpp IsLessOrEqual_test.cpp IsLessThan_test.cpp IsNot_test.cpp IsNothing_test.cpp IsSame_test.cpp LIFOInvocationDispatcher_test.cpp MatchBuilder_test.cpp MixedMockObject_5_test.cpp MockObject_test.cpp MyBuilderNamespace.h MyMatchBuilder.h NoArgumentsMatcher_test.cpp NoException_test.cpp Or_test.cpp OutBound_test.cpp ResponseVector_test.cpp ReturnObjectList_test.cpp ReturnStub_test.cpp StringContains_test.cpp StringEndsWith_test.cpp StringStartsWith_test.cpp StubBuilder_test.cpp StubSequence_test.cpp TestFailureMatcher_test.cpp TestFailureStub_test.cpp ThrowStub_test.cpp ThrowableList_test.cpp Throwable_test.cpp TimeServer_test.cpp TrackingCounter_test.cpp TypelessStubSequence_test.cpp UnlimitedMatcher_test.cpp Verifiable_test.cpp VerifyingTestCaller_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_template_test.cpp VisitableMockObject_test.cpp VisitableMockObject_void_test.cpp VoidStub_test.cpp classes_ABCDE.cpp classes_ABCDE.h compilecheck.cpp mock_test.cpp mockpp_pti_test.cpp mockpp_test.cpp readability_test.cpp Log Message: optionally disable mockpp namespace Index: readability_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/readability_test.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- readability_test.cpp 29 Dec 2005 19:29:52 -0000 1.6 +++ readability_test.cpp 15 Mar 2006 21:34:08 -0000 1.7 @@ -41,12 +41,12 @@ #include "classes_ABCDE.h" -class MyMixedMockObject : public mockpp::MixedMockObject +class MyMixedMockObject : public MOCKPP_NS::MixedMockObject { public: MyMixedMockObject() - : mockpp::MixedMockObject(MOCKPP_PCHAR("MyMixedMockObjectInstance") , 0) + : MOCKPP_NS::MixedMockObject(MOCKPP_PCHAR("MyMixedMockObjectInstance") , 0) , MOCKPP_CONSTRUCT_MEMBERS_FOR_CHAINABLE5(chain) , MOCKPP_CONSTRUCT_MEMBERS_FOR_VISITABLE5(visit) , MOCKPP_CONSTRUCT_MEMBERS_FOR_VOID_CHAINABLE5(void_chain) @@ -141,7 +141,7 @@ void constraintlist_1() { - mockpp::ConstraintList<MOCKPP_STL::string> list(MOCKPP_PCHAR("ConstraintListInstance")); + MOCKPP_NS::ConstraintList<MOCKPP_STL::string> list(MOCKPP_PCHAR("ConstraintListInstance")); list.addExpected(eq(MOCKPP_STL::string("string"))); MOCKPP_TRY { @@ -158,7 +158,7 @@ void expectationlist_1() { - mockpp::ExpectationList<MOCKPP_STL::string> list(MOCKPP_PCHAR("ExpectationListInstance")); + MOCKPP_NS::ExpectationList<MOCKPP_STL::string> list(MOCKPP_PCHAR("ExpectationListInstance")); list.addExpected(MOCKPP_STL::string("string")); MOCKPP_TRY { @@ -175,7 +175,7 @@ void expectationlist_2() { - mockpp::ExpectationList<MOCKPP_STL::string> list(MOCKPP_PCHAR("ExpectationListInstance") ); + MOCKPP_NS::ExpectationList<MOCKPP_STL::string> list(MOCKPP_PCHAR("ExpectationListInstance") ); list.addExpected(MOCKPP_STL::string("string")); list.addActual(MOCKPP_STL::string("string")); MOCKPP_TRY Index: Or_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/Or_test.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- Or_test.cpp 1 Jan 2006 16:34:48 -0000 1.19 +++ Or_test.cpp 15 Mar 2006 21:34:08 -0000 1.20 @@ -86,9 +86,9 @@ void Or_test::test_describe() { - mockpp::Or<bool> or1 (new mockpp::IsAnything, - new mockpp::IsNothing); - mockpp::String s = MOCKPP_PCHAR("or1?"); + MOCKPP_NS::Or<bool> or1 (new MOCKPP_NS::IsAnything, + new MOCKPP_NS::IsNothing); + MOCKPP_NS::String s = MOCKPP_PCHAR("or1?"); MOCKPP_ASSERT_TRUE(or1.describeTo(s) == MOCKPP_PCHAR("or1?(ANYTHING || NOTHING)")); MOCKPP_ASSERT_TRUE(s == MOCKPP_PCHAR("or1?(ANYTHING || NOTHING)")); } @@ -96,8 +96,8 @@ void Or_test::test_invoke() { - mockpp::Or<int> or1 (new mockpp::IsEqual<int>(1), - new mockpp::IsEqual<int>(5)); + MOCKPP_NS::Or<int> or1 (new MOCKPP_NS::IsEqual<int>(1), + new MOCKPP_NS::IsEqual<int>(5)); MOCKPP_ASSERT_TRUE(or1.eval(1) == true); MOCKPP_ASSERT_TRUE(or1.eval(2) == false); MOCKPP_ASSERT_TRUE(or1.eval(4) == false); Index: TestFailureMatcher_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/TestFailureMatcher_test.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- TestFailureMatcher_test.cpp 1 Jan 2006 16:34:48 -0000 1.17 +++ TestFailureMatcher_test.cpp 15 Mar 2006 21:34:08 -0000 1.18 @@ -78,7 +78,7 @@ void TestFailureMatcher_test::test_invoke() { - mockpp::TestFailureMatcher tfm (MOCKPP_PCHAR("knorxi")); + MOCKPP_NS::TestFailureMatcher tfm (MOCKPP_PCHAR("knorxi")); MOCKPP_TRY { @@ -87,10 +87,10 @@ } #ifndef MOCKPP_NO_EXCEPTIONS - catch(mockpp::AssertionFailedError &x) + catch(MOCKPP_NS::AssertionFailedError &x) { MOCKPP_ASSERT_TRUE(x.getMessage().find(MOCKPP_PCHAR("knorxi")) - != mockpp::String::npos); + != MOCKPP_NS::String::npos); } catch(...) @@ -99,7 +99,7 @@ } #endif - mockpp::String s = MOCKPP_PCHAR("hallo"); + MOCKPP_NS::String s = MOCKPP_PCHAR("hallo"); MOCKPP_ASSERT_TRUE(tfm.describeTo(s) == MOCKPP_PCHAR("halloknorxi")); MOCKPP_ASSERT_TRUE(s == MOCKPP_PCHAR("halloknorxi")); Index: DynamicChainingMockError_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/DynamicChainingMockError_test.cpp,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- DynamicChainingMockError_test.cpp 1 Jan 2006 16:34:47 -0000 1.22 +++ DynamicChainingMockError_test.cpp 15 Mar 2006 21:34:08 -0000 1.23 @@ -40,7 +40,7 @@ -namespace { +MOCKPP_ANON_NS_START class DynamicChainingMockError_test MOCKPP_DERIVE_PUBLIC_UNITFRAMEWORK @@ -84,7 +84,7 @@ template <typename R, typename I> -class AID : public mockpp::AbstractInvocationDispatcher<R, I> +class AID : public MOCKPP_NS::AbstractInvocationDispatcher<R, I> { public: @@ -99,30 +99,30 @@ void DynamicChainingMockError_test::test_describe() { - typedef mockpp::Invocation0 SetterInvocation; + typedef MOCKPP_NS::Invocation0 SetterInvocation; - mockpp::AbstractDynamicChainingMock<int, SetterInvocation> - adc (new mockpp::LIFOInvocationDispatcher<int, SetterInvocation>, MOCKPP_PCHAR("adcm-name"), 0); + MOCKPP_NS::AbstractDynamicChainingMock<int, SetterInvocation> + adc (new MOCKPP_NS::LIFOInvocationDispatcher<int, SetterInvocation>, MOCKPP_PCHAR("adcm-name"), 0); SetterInvocation invoc(MOCKPP_PCHAR("InvocationDummy::setProp")); AID<int, SetterInvocation> dispatcher; - mockpp::DynamicChainingMockError<int, SetterInvocation> + MOCKPP_NS::DynamicChainingMockError<int, SetterInvocation> dcme (&adc, invoc, &dispatcher, MOCKPP_PCHAR("error-description") ); - mockpp::String ref (MOCKPP_PCHAR("adcm-name: error-description\n") + MOCKPP_NS::String ref (MOCKPP_PCHAR("adcm-name: error-description\n") MOCKPP_PCHAR("Invoked: InvocationDummy::setProp()\n") MOCKPP_PCHAR("Allowed: ") MOCKPP_PCHAR("no expectations set")); MOCKPP_ASSERT_TRUE(dcme.getMessage() == ref); - mockpp::String s; + MOCKPP_NS::String s; MOCKPP_ASSERT_TRUE(dcme.writeTo(s) == ref); MOCKPP_ASSERT_TRUE(s == ref); } -} // namespace +MOCKPP_NS_END Index: AbstractDynamicChainingMock_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/AbstractDynamicChainingMock_test.cpp,v retrieving revision 1.41 retrieving revision 1.42 diff -u -d -r1.41 -r1.42 --- AbstractDynamicChainingMock_test.cpp 1 Jan 2006 16:34:47 -0000 1.41 +++ AbstractDynamicChainingMock_test.cpp 15 Mar 2006 21:34:08 -0000 1.42 @@ -44,15 +44,15 @@ -typedef mockpp::Invocation0 GetterInvocation; -typedef mockpp::Invocation0 VoidInvocation; -typedef mockpp::ConstraintSet1<int> CSet1; +typedef MOCKPP_NS::Invocation0 GetterInvocation; +typedef MOCKPP_NS::Invocation0 VoidInvocation; +typedef MOCKPP_NS::ConstraintSet1<int> CSet1; MOCKPP_INVOCATIONMOCKER_PTI_IMPL(VoidInvocation) -namespace { +MOCKPP_ANON_NS_START class AbstractDynamicChainingMock_test MOCKPP_DERIVE_PUBLIC_UNITFRAMEWORK @@ -118,14 +118,14 @@ template <typename R, // Returntype typename I> // Invocation -class ChainingMockDummy : public mockpp::AbstractDynamicChainingMock<R, I> +class ChainingMockDummy : public MOCKPP_NS::AbstractDynamicChainingMock<R, I> { public: - ChainingMockDummy( typename mockpp::InvocationDispatcher<R, I>::AP invocationDispatcher, - const mockpp::String &name, - mockpp::VerifiableList *parent ) - : mockpp::AbstractDynamicChainingMock<R,I>(invocationDispatcher, name, parent) + ChainingMockDummy( typename MOCKPP_NS::InvocationDispatcher<R, I>::AP invocationDispatcher, + const MOCKPP_NS::String &name, + MOCKPP_NS::VerifiableList *parent ) + : MOCKPP_NS::AbstractDynamicChainingMock<R,I>(invocationDispatcher, name, parent) {} R invoke(const I &invocation) @@ -141,13 +141,13 @@ template <typename I> // Invocation -class MatcherDummy : public mockpp::Invokable<int, I> +class MatcherDummy : public MOCKPP_NS::Invokable<int, I> { public: bool match_result; int invocation_result; - mockpp::String describe_value; + MOCKPP_NS::String describe_value; bool enable_except; bool is_invoke; // @@ -165,7 +165,7 @@ is_invoke = true; if (enable_except) - mockpp::assertionFailed(__LINE__, __FILE__, MOCKPP_PCHAR("invoke-fail")); + MOCKPP_NS::assertionFailed(__LINE__, __FILE__, MOCKPP_PCHAR("invoke-fail")); return invocation_result; } @@ -173,10 +173,10 @@ virtual void verify() { if (enable_except) - mockpp::assertionFailed(__LINE__, __FILE__, MOCKPP_PCHAR("dummy-verify")); + MOCKPP_NS::assertionFailed(__LINE__, __FILE__, MOCKPP_PCHAR("dummy-verify")); } - virtual mockpp::String describeTo (mockpp::String &buffer) const + virtual MOCKPP_NS::String describeTo (MOCKPP_NS::String &buffer) const { buffer += describe_value; return buffer; @@ -190,13 +190,13 @@ template <typename I> // Invocation -class VoidMatcherDummy : public mockpp::Invokable<void, I> +class VoidMatcherDummy : public MOCKPP_NS::Invokable<void, I> { public: bool match_result; bool is_invoke; - mockpp::String describe_value; + MOCKPP_NS::String describe_value; bool enable_except; virtual bool matches( const I &/*invocation*/ ) @@ -213,17 +213,17 @@ is_invoke = true; if (enable_except) - mockpp::assertionFailed(__LINE__, __FILE__, MOCKPP_PCHAR("invoke-fail")); + MOCKPP_NS::assertionFailed(__LINE__, __FILE__, MOCKPP_PCHAR("invoke-fail")); } virtual void verify() { if (enable_except) - mockpp::assertionFailed(__LINE__, __FILE__, MOCKPP_PCHAR("dummy-verify")); + MOCKPP_NS::assertionFailed(__LINE__, __FILE__, MOCKPP_PCHAR("dummy-verify")); } - virtual mockpp::String describeTo (mockpp::String &buffer) const + virtual MOCKPP_NS::String describeTo (MOCKPP_NS::String &buffer) const { buffer += describe_value; return buffer; @@ -240,27 +240,27 @@ void AbstractDynamicChainingMock_test::test_describer() { #if !defined(__BORLANDC__) && ((__GNUC__ >= 3) /* || defined(_MSC_VER) */) // @todo make compiling - mockpp::AbstractDynamicChainingMock<int, GetterInvocation>::Describer desc; + MOCKPP_NS::AbstractDynamicChainingMock<int, GetterInvocation>::Describer desc; MOCKPP_ASSERT_TRUE(desc.hasDescription() == false); - mockpp::String s; - mockpp::InvocationMocker<int, GetterInvocation>::List matchers; + MOCKPP_NS::String s; + MOCKPP_NS::InvocationMocker<int, GetterInvocation>::List matchers; MOCKPP_ASSERT_TRUE(desc.describeTo(s, matchers, - mockpp::returnValue<int>(1).get(), - mockpp::String(MOCKPP_PCHAR("name")) ) == MOCKPP_PCHAR("") ); + MOCKPP_NS::returnValue<int>(1).get(), + MOCKPP_NS::String(MOCKPP_PCHAR("name")) ) == MOCKPP_PCHAR("") ); #endif } void AbstractDynamicChainingMock_test::test_describe() { - mockpp::AbstractDynamicChainingMock<int, GetterInvocation> + MOCKPP_NS::AbstractDynamicChainingMock<int, GetterInvocation> adc_default ( MOCKPP_PCHAR( "adc-name" ), 0 ); - mockpp::AbstractDynamicChainingMock<int, GetterInvocation> - adc ( new mockpp::LIFOInvocationDispatcher<int, GetterInvocation>, MOCKPP_PCHAR( "adc-name" ), 0 ); + MOCKPP_NS::AbstractDynamicChainingMock<int, GetterInvocation> + adc ( new MOCKPP_NS::LIFOInvocationDispatcher<int, GetterInvocation>, MOCKPP_PCHAR( "adc-name" ), 0 ); MOCKPP_ASSERT_TRUE( adc.toString() == MOCKPP_PCHAR( "adc-name" ) ); MOCKPP_ASSERT_TRUE( adc.getMockName() == MOCKPP_PCHAR( "adc-name" ) ); @@ -269,11 +269,11 @@ void AbstractDynamicChainingMock_test::test_void_describe() { - mockpp::AbstractDynamicChainingMock<void, VoidInvocation> + MOCKPP_NS::AbstractDynamicChainingMock<void, VoidInvocation> adc_default ( MOCKPP_PCHAR( "adc-name" ), 0 ); - mockpp::AbstractDynamicChainingMock<void, VoidInvocation> - adc ( new mockpp::LIFOInvocationDispatcher<void, VoidInvocation>, MOCKPP_PCHAR( "adc-name" ), 0 ); + MOCKPP_NS::AbstractDynamicChainingMock<void, VoidInvocation> + adc ( new MOCKPP_NS::LIFOInvocationDispatcher<void, VoidInvocation>, MOCKPP_PCHAR( "adc-name" ), 0 ); MOCKPP_ASSERT_TRUE( adc.toString() == MOCKPP_PCHAR( "adc-name" ) ); MOCKPP_ASSERT_TRUE( adc.getMockName() == MOCKPP_PCHAR( "adc-name" ) ); @@ -283,7 +283,7 @@ void AbstractDynamicChainingMock_test::test_verify() { ChainingMockDummy<int, GetterInvocation> - cmd (new mockpp::LIFOInvocationDispatcher<int, GetterInvocation>, MOCKPP_PCHAR( "adc-name" ), 0 ); + cmd (new MOCKPP_NS::LIFOInvocationDispatcher<int, GetterInvocation>, MOCKPP_PCHAR( "adc-name" ), 0 ); MatcherDummy<GetterInvocation> *md1 = new MatcherDummy<GetterInvocation>; cmd.addInvokable(md1); @@ -298,10 +298,10 @@ MOCKPP_ASSERT_TRUE_MESSAGE(MOCKPP_PCHAR("did not throw the exception"), false); } #ifndef MOCKPP_NO_EXCEPTIONS - catch (mockpp::AssertionFailedError &ex ) + catch (MOCKPP_NS::AssertionFailedError &ex ) { - MOCKPP_ASSERT_TRUE(ex.getMessage().find(MOCKPP_PCHAR("dummy-verify")) != mockpp::String::npos ); - MOCKPP_ASSERT_TRUE(ex.getMessage().find(MOCKPP_PCHAR("adc-name")) != mockpp::String::npos ); + MOCKPP_ASSERT_TRUE(ex.getMessage().find(MOCKPP_PCHAR("dummy-verify")) != MOCKPP_NS::String::npos ); + MOCKPP_ASSERT_TRUE(ex.getMessage().find(MOCKPP_PCHAR("adc-name")) != MOCKPP_NS::String::npos ); } #endif md1->enable_except = false; @@ -312,7 +312,7 @@ void AbstractDynamicChainingMock_test::test_invocation() { ChainingMockDummy<int, GetterInvocation> - cmd ( new mockpp::LIFOInvocationDispatcher<int, GetterInvocation>, MOCKPP_PCHAR( "adc-name" ), 0 ); + cmd ( new MOCKPP_NS::LIFOInvocationDispatcher<int, GetterInvocation>, MOCKPP_PCHAR( "adc-name" ), 0 ); GetterInvocation inv(MOCKPP_PCHAR("GetterInvocation")); @@ -320,7 +320,7 @@ md1->invocation_result = 10; md1->enable_except = false; cmd.addInvokable(md1); - cmd.setDefaultStub(mockpp::returnValue<int>(33)); + cmd.setDefaultStub(MOCKPP_NS::returnValue<int>(33)); md1->match_result = false; MOCKPP_ASSERT_TRUE(cmd.invoke(inv) == 33); @@ -343,10 +343,10 @@ MOCKPP_ASSERT_TRUE_MESSAGE(MOCKPP_PCHAR("did not throw the exception"), false); } #ifndef MOCKPP_NO_EXCEPTIONS - catch (mockpp::AssertionFailedError &ex ) + catch (MOCKPP_NS::AssertionFailedError &ex ) { - MOCKPP_ASSERT_TRUE(ex.getMessage().find(MOCKPP_PCHAR("invoke-fail")) != mockpp::String::npos ); - MOCKPP_ASSERT_TRUE(ex.getMessage().find(MOCKPP_PCHAR("adc-name")) != mockpp::String::npos ); + MOCKPP_ASSERT_TRUE(ex.getMessage().find(MOCKPP_PCHAR("invoke-fail")) != MOCKPP_NS::String::npos ); + MOCKPP_ASSERT_TRUE(ex.getMessage().find(MOCKPP_PCHAR("adc-name")) != MOCKPP_NS::String::npos ); } #endif @@ -357,10 +357,10 @@ MOCKPP_ASSERT_TRUE_MESSAGE(MOCKPP_PCHAR("did not throw the exception"), false); } #ifndef MOCKPP_NO_EXCEPTIONS - catch (mockpp::AssertionFailedError &ex ) + catch (MOCKPP_NS::AssertionFailedError &ex ) { - MOCKPP_ASSERT_TRUE(ex.getMessage().find(MOCKPP_PCHAR("invoke-fail")) != mockpp::String::npos ); - MOCKPP_ASSERT_TRUE(ex.getMessage().find(MOCKPP_PCHAR("adc-name")) != mockpp::String::npos ); + MOCKPP_ASSERT_TRUE(ex.getMessage().find(MOCKPP_PCHAR("invoke-fail")) != MOCKPP_NS::String::npos ); + MOCKPP_ASSERT_TRUE(ex.getMessage().find(MOCKPP_PCHAR("adc-name")) != MOCKPP_NS::String::npos ); } #endif @@ -370,7 +370,7 @@ template <typename I> // Invocation -class StoreStub : public mockpp::Stub<void, I> +class StoreStub : public MOCKPP_NS::Stub<void, I> { public: @@ -381,7 +381,7 @@ invoked = true; } - virtual mockpp::String describeTo( mockpp::String &buffer ) const + virtual MOCKPP_NS::String describeTo( MOCKPP_NS::String &buffer ) const { return buffer; } @@ -391,7 +391,7 @@ void AbstractDynamicChainingMock_test::test_void_invocation() { ChainingMockDummy<void, VoidInvocation> - cmd ( new mockpp::LIFOInvocationDispatcher<void, VoidInvocation>, MOCKPP_PCHAR( "adc-name" ), 0 ); + cmd ( new MOCKPP_NS::LIFOInvocationDispatcher<void, VoidInvocation>, MOCKPP_PCHAR( "adc-name" ), 0 ); VoidInvocation inv(MOCKPP_PCHAR("VoidInvocation")); @@ -420,11 +420,11 @@ MOCKPP_ASSERT_TRUE_MESSAGE(MOCKPP_PCHAR("did not throw the exception"), false); } #ifndef MOCKPP_NO_EXCEPTIONS - catch (mockpp::AssertionFailedError &ex ) + catch (MOCKPP_NS::AssertionFailedError &ex ) { - mockpp::String s = ex.getMessage(); - MOCKPP_ASSERT_TRUE(s.find(MOCKPP_PCHAR("invoke-fail")) != mockpp::String::npos ); - MOCKPP_ASSERT_TRUE(s.find(MOCKPP_PCHAR("adc-name")) != mockpp::String::npos ); + MOCKPP_NS::String s = ex.getMessage(); + MOCKPP_ASSERT_TRUE(s.find(MOCKPP_PCHAR("invoke-fail")) != MOCKPP_NS::String::npos ); + MOCKPP_ASSERT_TRUE(s.find(MOCKPP_PCHAR("adc-name")) != MOCKPP_NS::String::npos ); } #endif @@ -435,10 +435,10 @@ MOCKPP_ASSERT_TRUE_MESSAGE(MOCKPP_PCHAR("did not throw the exception"), false); } #ifndef MOCKPP_NO_EXCEPTIONS - catch (mockpp::AssertionFailedError &ex ) + catch (MOCKPP_NS::AssertionFailedError &ex ) { - MOCKPP_ASSERT_TRUE(ex.getMessage().find(MOCKPP_PCHAR("invoke-fail")) != mockpp::String::npos ); - MOCKPP_ASSERT_TRUE(ex.getMessage().find(MOCKPP_PCHAR("adc-name")) != mockpp::String::npos ); + MOCKPP_ASSERT_TRUE(ex.getMessage().find(MOCKPP_PCHAR("invoke-fail")) != MOCKPP_NS::String::npos ); + MOCKPP_ASSERT_TRUE(ex.getMessage().find(MOCKPP_PCHAR("adc-name")) != MOCKPP_NS::String::npos ); } #endif @@ -447,7 +447,7 @@ } -} // namesspace +MOCKPP_NS_END Index: IsInstanceOf_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/IsInstanceOf_test.cpp,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- IsInstanceOf_test.cpp 1 Jan 2006 16:34:48 -0000 1.23 +++ IsInstanceOf_test.cpp 15 Mar 2006 21:34:08 -0000 1.24 @@ -124,8 +124,8 @@ void IsInstanceOf_test::test_describe() { - mockpp::IsInstanceOf<A, B> instance; - mockpp::String s = MOCKPP_PCHAR("instance?"); + MOCKPP_NS::IsInstanceOf<A, B> instance; + MOCKPP_NS::String s = MOCKPP_PCHAR("instance?"); MOCKPP_ASSERT_TRUE(instance.describeTo(s).find(MOCKPP_PCHAR("instance?derived from ")) == 0); MOCKPP_ASSERT_TRUE(s.find(MOCKPP_PCHAR("instance?derived from ")) == 0); } @@ -138,7 +138,7 @@ A *pc = new C; A *pd = (A*)new D; - mockpp::IsInstanceOf<A, B> instance; + MOCKPP_NS::IsInstanceOf<A, B> instance; MOCKPP_ASSERT_TRUE(instance.eval((B*)pa) == false); MOCKPP_ASSERT_TRUE(instance.eval(pb) == true); Index: ExpectationList_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ExpectationList_test.cpp,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- ExpectationList_test.cpp 1 Jan 2006 16:34:47 -0000 1.25 +++ ExpectationList_test.cpp 15 Mar 2006 21:34:08 -0000 1.26 @@ -155,7 +155,7 @@ void ExpectationList_test::test_chain() { int exp_prep[10] = { 0, 1 }; - mockpp::ExpectationList<int> ab (MOCKPP_PCHAR("testExpectationList"), 0); + MOCKPP_NS::ExpectationList<int> ab (MOCKPP_PCHAR("testExpectationList"), 0); ab.addExpected(200) .addExpected(exp_prep+0, exp_prep+2) @@ -171,7 +171,7 @@ void ExpectationList_test::test_name() { - mockpp::ExpectationList<int> ec (MOCKPP_PCHAR("testList"), 0); + MOCKPP_NS::ExpectationList<int> ec (MOCKPP_PCHAR("testList"), 0); MOCKPP_ASSERT_TRUE(ec.getVerifiableName() == (MOCKPP_PCHAR("testList"))); } @@ -179,13 +179,13 @@ void ExpectationList_test::test_hasExpectations() { { - mockpp::ExpectationList<int> ec (MOCKPP_PCHAR("testList"), 0); + MOCKPP_NS::ExpectationList<int> ec (MOCKPP_PCHAR("testList"), 0); MOCKPP_ASSERT_TRUE(false == ec.hasExpectations()); ec.addExpected(2); MOCKPP_ASSERT_TRUE(true == ec.hasExpectations()); } - mockpp::ExpectationList<int> ec2 (MOCKPP_PCHAR("testList"), 0); + MOCKPP_NS::ExpectationList<int> ec2 (MOCKPP_PCHAR("testList"), 0); MOCKPP_ASSERT_TRUE(false == ec2.hasExpectations()); ec2.setExpectNothing(); MOCKPP_ASSERT_TRUE(true == ec2.hasExpectations()); @@ -194,7 +194,7 @@ void ExpectationList_test::test_clear() { - mockpp::ExpectationList<int> ec (MOCKPP_PCHAR("nothingValue"), 0); + MOCKPP_NS::ExpectationList<int> ec (MOCKPP_PCHAR("nothingValue"), 0); ec.addExpected(1234); ec.reset(); MOCKPP_ASSERT_TRUE(false == ec.hasExpectations()); @@ -204,7 +204,7 @@ void ExpectationList_test::fail_clearActual() { - mockpp::ExpectationList<int> ec (MOCKPP_PCHAR("testList"), 0); + MOCKPP_NS::ExpectationList<int> ec (MOCKPP_PCHAR("testList"), 0); ec.addExpected(3); ec.addActual(3); ec.clearActual(); @@ -214,7 +214,7 @@ ec.verify(); } #ifndef MOCKPP_NO_EXCEPTIONS - catch(mockpp::AssertionFailedError &) + catch(MOCKPP_NS::AssertionFailedError &) { thrown = true; } @@ -225,14 +225,14 @@ void ExpectationList_test::test_ifNoExpected() { - mockpp::ExpectationList<int> ec (MOCKPP_PCHAR("nothingList"), 0); + MOCKPP_NS::ExpectationList<int> ec (MOCKPP_PCHAR("nothingList"), 0); ec.addActual(3); // fails because no expectation value } void ExpectationList_test::fail_ifNoActual() { - mockpp::ExpectationList<int> ec (MOCKPP_PCHAR("nothingList"), 0); + MOCKPP_NS::ExpectationList<int> ec (MOCKPP_PCHAR("nothingList"), 0); ec.addExpected(3); bool thrown = false; MOCKPP_TRY @@ -240,7 +240,7 @@ ec.verify(); // fails because no value } #ifndef MOCKPP_NO_EXCEPTIONS - catch(mockpp::AssertionFailedError &) + catch(MOCKPP_NS::AssertionFailedError &) { thrown = true; } @@ -249,7 +249,7 @@ } -static void doNothing(mockpp::ExpectationList<int> &ec) +static void doNothing(MOCKPP_NS::ExpectationList<int> &ec) { ec.addExpected(3); ec.setExpectNothing(); @@ -258,7 +258,7 @@ void ExpectationList_test::test_expectNothing() { - mockpp::ExpectationList<int> ec (MOCKPP_PCHAR("nothingList"), 0); + MOCKPP_NS::ExpectationList<int> ec (MOCKPP_PCHAR("nothingList"), 0); doNothing(ec); ec.verify(); // no fail } @@ -266,7 +266,7 @@ void ExpectationList_test::test_expectNothing_revoked() { - mockpp::ExpectationList<int> ec (MOCKPP_PCHAR("nothingList"), 0); + MOCKPP_NS::ExpectationList<int> ec (MOCKPP_PCHAR("nothingList"), 0); ec.setExpectNothing(); ec.addExpected(3); ec.addActual(3); @@ -276,7 +276,7 @@ void ExpectationList_test::fail_expectNothing() { - mockpp::ExpectationList<int> ec (MOCKPP_PCHAR("nothingList"), 0); + MOCKPP_NS::ExpectationList<int> ec (MOCKPP_PCHAR("nothingList"), 0); doNothing(ec); bool thrown = false; MOCKPP_TRY @@ -284,7 +284,7 @@ ec.addActual(3); // fails even if equal } #ifndef MOCKPP_NO_EXCEPTIONS - catch(mockpp::AssertionFailedError &) + catch(MOCKPP_NS::AssertionFailedError &) { thrown = true; } @@ -293,7 +293,7 @@ } -static void doActualImmediate(mockpp::ExpectationList<int> &ec) +static void doActualImmediate(MOCKPP_NS::ExpectationList<int> &ec) { ec.addExpected(1234); ec.addExpected(5678); @@ -309,7 +309,7 @@ void ExpectationList_test::test_expectActualImmediate() { - mockpp::ExpectationList<int> ec (MOCKPP_PCHAR("actualList"), 0); + MOCKPP_NS::ExpectationList<int> ec (MOCKPP_PCHAR("actualList"), 0); doActualImmediate(ec); ec.verify(); // no fail } @@ -317,7 +317,7 @@ void ExpectationList_test::test_many() { - mockpp::ExpectationList<int> ec (MOCKPP_PCHAR("actualList"), 0); + MOCKPP_NS::ExpectationList<int> ec (MOCKPP_PCHAR("actualList"), 0); int prep[10] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 }; ec.addExpected(prep+0, prep+10); @@ -327,7 +327,7 @@ void ExpectationList_test::fail_many() { - mockpp::ExpectationList<int> ec (MOCKPP_PCHAR("actualList"), 0); + MOCKPP_NS::ExpectationList<int> ec (MOCKPP_PCHAR("actualList"), 0); int prep[10] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 }; @@ -338,7 +338,7 @@ ec.addActual(prep+2, prep+10); } #ifndef MOCKPP_NO_EXCEPTIONS - catch(mockpp::AssertionFailedError &) + catch(MOCKPP_NS::AssertionFailedError &) { thrown = true; } @@ -349,7 +349,7 @@ void ExpectationList_test::fail_expectActualImmediate() { - mockpp::ExpectationList<int> ec (MOCKPP_PCHAR("actualList"), 0); + MOCKPP_NS::ExpectationList<int> ec (MOCKPP_PCHAR("actualList"), 0); doActualImmediate(ec); bool thrown = false; MOCKPP_TRY @@ -357,7 +357,7 @@ ec.addActual(4321); // fails } #ifndef MOCKPP_NO_EXCEPTIONS - catch(mockpp::AssertionFailedError &) + catch(MOCKPP_NS::AssertionFailedError &) { thrown = true; } @@ -366,7 +366,7 @@ } -static void doActualVerify(mockpp::ExpectationList<int> &ec) +static void doActualVerify(MOCKPP_NS::ExpectationList<int> &ec) { ec.addExpected(1234); ec.setFailOnVerify(); @@ -376,14 +376,14 @@ void ExpectationList_test::test_expectActualVerify() { - mockpp::ExpectationList<int> ec (MOCKPP_PCHAR("verifyList"), 0); + MOCKPP_NS::ExpectationList<int> ec (MOCKPP_PCHAR("verifyList"), 0); doActualVerify(ec); // no fail } void ExpectationList_test::fail_expectActualVerify() { - mockpp::ExpectationList<int> ec (MOCKPP_PCHAR("verifyList"), 0); + MOCKPP_NS::ExpectationList<int> ec (MOCKPP_PCHAR("verifyList"), 0); doActualVerify(ec); // no fail bool thrown = false; MOCKPP_TRY @@ -391,7 +391,7 @@ ec.verify(); // fails } #ifndef MOCKPP_NO_EXCEPTIONS - catch(mockpp::AssertionFailedError &) + catch(MOCKPP_NS::AssertionFailedError &) { thrown = true; } @@ -402,7 +402,7 @@ void ExpectationList_test::test_balance() { - mockpp::ExpectationList<int> ec (MOCKPP_PCHAR("verifyList"), 0); + MOCKPP_NS::ExpectationList<int> ec (MOCKPP_PCHAR("verifyList"), 0); ec.addExpected(1); ec.addExpected(2); Index: IsLessThan_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/IsLessThan_test.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- IsLessThan_test.cpp 1 Jan 2006 16:34:48 -0000 1.15 +++ IsLessThan_test.cpp 15 Mar 2006 21:34:08 -0000 1.16 @@ -83,8 +83,8 @@ void IsLessThan_test::test_describe() { - mockpp::IsLessThan<int> less (12); - mockpp::String s = MOCKPP_PCHAR("less?"); + MOCKPP_NS::IsLessThan<int> less (12); + MOCKPP_NS::String s = MOCKPP_PCHAR("less?"); MOCKPP_ASSERT_TRUE(less.describeTo(s) == MOCKPP_PCHAR("less?lessThan 12")); MOCKPP_ASSERT_TRUE(s == MOCKPP_PCHAR("less?lessThan 12")); } @@ -92,7 +92,7 @@ void IsLessThan_test::test_invoke() { - mockpp::IsLessThan<int> less (10); + MOCKPP_NS::IsLessThan<int> less (10); MOCKPP_ASSERT_TRUE(less.eval(11) == false); MOCKPP_ASSERT_TRUE(less.eval(10) == false); MOCKPP_ASSERT_TRUE(less.eval(9) == true); Index: ExpectationMap_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ExpectationMap_test.cpp,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- ExpectationMap_test.cpp 1 Jan 2006 19:40:37 -0000 1.26 +++ ExpectationMap_test.cpp 15 Mar 2006 21:34:08 -0000 1.27 @@ -168,13 +168,13 @@ void ExpectationMap_test::test_chain() { - mockpp::ExpectationMap<int, MOCKPP_STL::string> ec (MOCKPP_PCHAR("actualMap"), 0); + MOCKPP_NS::ExpectationMap<int, MOCKPP_STL::string> ec (MOCKPP_PCHAR("actualMap"), 0); MOCKPP_STL::vector<MOCKPP_STL::pair<int, MOCKPP_STL::string> > vp; vp.push_back(MOCKPP_STL::make_pair(3, (const char*)"three")); // gcc2.95 needs this "const char*" thing vp.push_back(MOCKPP_STL::make_pair(4, (const char*)"four")); - mockpp::ExpectationMap<int, MOCKPP_STL::string> ab = - mockpp::ExpectationMap<int, MOCKPP_STL::string> + MOCKPP_NS::ExpectationMap<int, MOCKPP_STL::string> ab = + MOCKPP_NS::ExpectationMap<int, MOCKPP_STL::string> (MOCKPP_PCHAR("testExpectationMap"), 0) .addExpected(MOCKPP_STL::pair<int, MOCKPP_STL::string>(6,"six")) .addExpected(vp.begin(), vp.end()) @@ -194,7 +194,7 @@ void ExpectationMap_test::test_name() { - mockpp::ExpectationMap<int, MOCKPP_STL::string> ec (MOCKPP_PCHAR("testMap"), 0); + MOCKPP_NS::ExpectationMap<int, MOCKPP_STL::string> ec (MOCKPP_PCHAR("testMap"), 0); MOCKPP_ASSERT_TRUE(ec.getVerifiableName() == MOCKPP_PCHAR("testMap")); } @@ -202,13 +202,13 @@ void ExpectationMap_test::test_hasExpectations() { { - mockpp::ExpectationMap<int, MOCKPP_STL::string> ec (MOCKPP_PCHAR("testMap"), 0); + MOCKPP_NS::ExpectationMap<int, MOCKPP_STL::string> ec (MOCKPP_PCHAR("testMap"), 0); MOCKPP_ASSERT_TRUE(false == ec.hasExpectations()); ec.addExpected(2, "two"); MOCKPP_ASSERT_TRUE(true == ec.hasExpectations()); } - mockpp::ExpectationMap<int, MOCKPP_STL::string> ec2 (MOCKPP_PCHAR("testMap"), 0); + MOCKPP_NS::ExpectationMap<int, MOCKPP_STL::string> ec2 (MOCKPP_PCHAR("testMap"), 0); MOCKPP_ASSERT_TRUE(false == ec2.hasExpectations()); ec2.setExpectNothing(); MOCKPP_ASSERT_TRUE(true == ec2.hasExpectations()); @@ -217,7 +217,7 @@ void ExpectationMap_test::test_clear() { - mockpp::ExpectationMap<int, MOCKPP_STL::string> ec (MOCKPP_PCHAR("testMap"), 0); + MOCKPP_NS::ExpectationMap<int, MOCKPP_STL::string> ec (MOCKPP_PCHAR("testMap"), 0); ec.addExpected(3, "three"); ec.reset(); MOCKPP_ASSERT_TRUE(false == ec.hasExpectations()); @@ -226,7 +226,7 @@ void ExpectationMap_test::fail_clearActual() { - mockpp::ExpectationMap<int, MOCKPP_STL::string> ec (MOCKPP_PCHAR("testMap"), 0); + MOCKPP_NS::ExpectationMap<int, MOCKPP_STL::string> ec (MOCKPP_PCHAR("testMap"), 0); ec.addExpected(3, "three"); ec.clearActual(); bool thrown = false; @@ -235,7 +235,7 @@ ec.verify(); } #ifndef MOCKPP_NO_EXCEPTIONS - catch(mockpp::AssertionFailedError &) + catch(MOCKPP_NS::AssertionFailedError &) { thrown = true; } @@ -246,14 +246,14 @@ void ExpectationMap_test::test_ifNoExpected() { - mockpp::ExpectationMap<int, MOCKPP_STL::string> ec (MOCKPP_PCHAR("nothingMap"), 0); + MOCKPP_NS::ExpectationMap<int, MOCKPP_STL::string> ec (MOCKPP_PCHAR("nothingMap"), 0); ec.addActual(3); // fails because no expectation value } void ExpectationMap_test::fail_ifNoActual() { - mockpp::ExpectationMap<int, MOCKPP_STL::string> ec (MOCKPP_PCHAR("nothingMap"), 0); + MOCKPP_NS::ExpectationMap<int, MOCKPP_STL::string> ec (MOCKPP_PCHAR("nothingMap"), 0); ec.addExpected(3, "three"); bool thrown = false; MOCKPP_TRY @@ -261,7 +261,7 @@ ec.verify(); // fails because no value } #ifndef MOCKPP_NO_EXCEPTIONS - catch(mockpp::AssertionFailedError &) + catch(MOCKPP_NS::AssertionFailedError &) { thrown = true; } @@ -270,7 +270,7 @@ } -static void doNothing(mockpp::ExpectationMap<int, MOCKPP_STL::string> &ec) +static void doNothing(MOCKPP_NS::ExpectationMap<int, MOCKPP_STL::string> &ec) { ec.addExpected(3, "three"); ec.setExpectNothing(); @@ -279,7 +279,7 @@ void ExpectationMap_test::test_expectNothing() { - mockpp::ExpectationMap<int, MOCKPP_STL::string> ec (MOCKPP_PCHAR("nothingMap"), 0); + MOCKPP_NS::ExpectationMap<int, MOCKPP_STL::string> ec (MOCKPP_PCHAR("nothingMap"), 0); doNothing(ec); ec.verify(); // no fail } @@ -287,7 +287,7 @@ void ExpectationMap_test::test_expectNothing_revoked() { - mockpp::ExpectationMap<int, MOCKPP_STL::string> ec (MOCKPP_PCHAR("nothingMap"), 0); + MOCKPP_NS::ExpectationMap<int, MOCKPP_STL::string> ec (MOCKPP_PCHAR("nothingMap"), 0); ec.setExpectNothing(); ec.addExpected(3, "three"); ec.addActual(3); @@ -297,7 +297,7 @@ void ExpectationMap_test::fail_expectNothing() { - mockpp::ExpectationMap<int, MOCKPP_STL::string> ec (MOCKPP_PCHAR("nothingMap"), 0); + MOCKPP_NS::ExpectationMap<int, MOCKPP_STL::string> ec (MOCKPP_PCHAR("nothingMap"), 0); doNothing(ec); bool thrown = false; MOCKPP_TRY @@ -305,7 +305,7 @@ ec.addActual(3); // fails even if equal } #ifndef MOCKPP_NO_EXCEPTIONS - catch(mockpp::AssertionFailedError &) + catch(MOCKPP_NS::AssertionFailedError &) { thrown = true; } @@ -316,7 +316,7 @@ void ExpectationMap_test::test_get() { - mockpp::ExpectationMap<int, MOCKPP_STL::string> ec (MOCKPP_PCHAR("actualMap"), 0); + MOCKPP_NS::ExpectationMap<int, MOCKPP_STL::string> ec (MOCKPP_PCHAR("actualMap"), 0); ec.addExpected(3, "three"); ec.addExpected(4, "four"); MOCKPP_ASSERT_TRUE("three" == ec.get(3)); @@ -325,7 +325,7 @@ void ExpectationMap_test::test_pair_get() { - mockpp::ExpectationMap<int, MOCKPP_STL::string> ec (MOCKPP_PCHAR("actualMap"), 0); + MOCKPP_NS::ExpectationMap<int, MOCKPP_STL::string> ec (MOCKPP_PCHAR("actualMap"), 0); ec.addExpected(MOCKPP_STL::make_pair(3, (const char*)"three")); // gcc2.95 needs this "const char*" thing ec.addExpected(MOCKPP_STL::make_pair(4, (const char*)"four")); MOCKPP_ASSERT_TRUE("three" == ec.get(3)); @@ -335,7 +335,7 @@ void ExpectationMap_test::test_pair_getmany() { - mockpp::ExpectationMap<int, MOCKPP_STL::string> ec (MOCKPP_PCHAR("actualMap"), 0); + MOCKPP_NS::ExpectationMap<int, MOCKPP_STL::string> ec (MOCKPP_PCHAR("actualMap"), 0); MOCKPP_STL::vector<MOCKPP_STL::pair<int, MOCKPP_STL::string> > vp; vp.push_back(MOCKPP_STL::make_pair(3, (const char*)"three")); // gcc2.95 needs this "const char*" thing vp.push_back(MOCKPP_STL::make_pair(4, (const char*)"four")); @@ -351,7 +351,7 @@ void ExpectationMap_test::test_many() { - mockpp::ExpectationMap<int, MOCKPP_STL::string> ec (MOCKPP_PCHAR("actualMap"), 0); + MOCKPP_NS::ExpectationMap<int, MOCKPP_STL::string> ec (MOCKPP_PCHAR("actualMap"), 0); ec.addExpected(MOCKPP_STL::pair<int, MOCKPP_STL::string>(6,"zero")); ec.addExpected(MOCKPP_STL::pair<int, MOCKPP_STL::string>(5, "one")); @@ -371,7 +371,7 @@ void ExpectationMap_test::fail_many() { - mockpp::ExpectationMap<int, MOCKPP_STL::string> ec (MOCKPP_PCHAR("actualMap"), 0); + MOCKPP_NS::ExpectationMap<int, MOCKPP_STL::string> ec (MOCKPP_PCHAR("actualMap"), 0); ec.addExpected(MOCKPP_STL::pair<int, MOCKPP_STL::string>(6,"zero")); ec.addExpected(MOCKPP_STL::pair<int, MOCKPP_STL::string>(5, "one")); @@ -386,7 +386,7 @@ ec.addActual(10); } #ifndef MOCKPP_NO_EXCEPTIONS - catch(mockpp::AssertionFailedError &) + catch(MOCKPP_NS::AssertionFailedError &) { thrown = true; } @@ -395,7 +395,7 @@ } -static void doActualImmediate(mockpp::ExpectationMap<int, MOCKPP_STL::string> &ec) +static void doActualImmediate(MOCKPP_NS::ExpectationMap<int, MOCKPP_STL::string> &ec) { ec.addExpected(1234, "1234"); ec.addExpected(5678, "5678"); @@ -411,7 +411,7 @@ void ExpectationMap_test::test_expectActualImmediate() { - mockpp::ExpectationMap<int, MOCKPP_STL::string> ec (MOCKPP_PCHAR("actualMap"), 0); + MOCKPP_NS::ExpectationMap<int, MOCKPP_STL::string> ec (MOCKPP_PCHAR("actualMap"), 0); doActualImmediate(ec); ec.verify(); // no fail } @@ -419,7 +419,7 @@ void ExpectationMap_test::fail_expectActualImmediate() { - mockpp::ExpectationMap<int, MOCKPP_STL::string> ec (MOCKPP_PCHAR("actualMap"), 0); + MOCKPP_NS::ExpectationMap<int, MOCKPP_STL::string> ec (MOCKPP_PCHAR("actualMap"), 0); doActualImmediate(ec); bool thrown = false; MOCKPP_TRY @@ -427,7 +427,7 @@ ec.addActual(1111); // fails } #ifndef MOCKPP_NO_EXCEPTIONS - catch(mockpp::AssertionFailedError &) + catch(MOCKPP_NS::AssertionFailedError &) { thrown = true; } @@ -438,7 +438,7 @@ void ExpectationMap_test::test_missing() { - mockpp::ExpectationMap<int, MOCKPP_STL::string> ec (MOCKPP_PCHAR("actualMap"), 0); + MOCKPP_NS::ExpectationMap<int, MOCKPP_STL::string> ec (MOCKPP_PCHAR("actualMap"), 0); ec.addExpectedMissing(1234); ec.addExpectedMissing(5678); ec.addExpectedMissing(8765); @@ -452,7 +452,7 @@ } -static void doActualVerify(mockpp::ExpectationMap<int, MOCKPP_STL::string> &ec) +static void doActualVerify(MOCKPP_NS::ExpectationMap<int, MOCKPP_STL::string> &ec) { ec.addExpected(1234, "1234"); ec.setFailOnVerify(); @@ -462,14 +462,14 @@ void ExpectationMap_test::test_expectActualVerify() { - mockpp::ExpectationMap<int, MOCKPP_STL::string> ec (MOCKPP_PCHAR("verifyMap"), 0); + MOCKPP_NS::ExpectationMap<int, MOCKPP_STL::string> ec (MOCKPP_PCHAR("verifyMap"), 0); doActualVerify(ec); // no fail } void ExpectationMap_test::fail_expectActualVerify() { - mockpp::ExpectationMap<int, MOCKPP_STL::string> ec (MOCKPP_PCHAR("verifyMap"), 0); + MOCKPP_NS::ExpectationMap<int, MOCKPP_STL::string> ec (MOCKPP_PCHAR("verifyMap"), 0); doActualVerify(ec); // no fail bool thrown = false; MOCKPP_TRY @@ -477,7 +477,7 @@ ec.verify(); // fails } #ifndef MOCKPP_NO_EXCEPTIONS - catch(mockpp::AssertionFailedError &) + catch(MOCKPP_NS::AssertionFailedError &) { thrown = true; } Index: CustomStub_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/CustomStub_test.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- CustomStub_test.cpp 1 Jan 2006 16:34:47 -0000 1.19 +++ CustomStub_test.cpp 15 Mar 2006 21:34:08 -0000 1.20 @@ -78,11 +78,11 @@ template <typename R, // Returntype typename I> // Invocation -class MyCustomStub : public mockpp::CustomStub<R, I> +class MyCustomStub : public MOCKPP_NS::CustomStub<R, I> { public: - MyCustomStub( const mockpp::String &in_description ) - : mockpp::CustomStub<R, I>(in_description) + MyCustomStub( const MOCKPP_NS::String &in_description ) + : MOCKPP_NS::CustomStub<R, I>(in_description) { } @@ -96,9 +96,9 @@ void CustomStub_test::test_invoke() { MyCustomStub<int, int> cs(MOCKPP_PCHAR("custom")); - mockpp::String s; - MOCKPP_ASSERT_TRUE(cs.describeTo(s) == mockpp::String(MOCKPP_PCHAR("custom"))); - MOCKPP_ASSERT_TRUE(s == mockpp::String(MOCKPP_PCHAR("custom"))); + MOCKPP_NS::String s; + MOCKPP_ASSERT_TRUE(cs.describeTo(s) == MOCKPP_NS::String(MOCKPP_PCHAR("custom"))); + MOCKPP_ASSERT_TRUE(s == MOCKPP_NS::String(MOCKPP_PCHAR("custom"))); } Index: VisitableMockObject_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_test.cpp,v retrieving revision 1.33 retrieving revision 1.34 diff -u -d -r1.33 -r1.34 --- VisitableMockObject_test.cpp 1 Jan 2006 16:34:49 -0000 1.33 +++ VisitableMockObject_test.cpp 15 Mar 2006 21:34:08 -0000 1.34 @@ -151,12 +151,12 @@ -class MyVisitableMockObject : public mockpp::VisitableMockObject +class MyVisitableMockObject : public MOCKPP_NS::VisitableMockObject { public: - MyVisitableMockObject(const mockpp::String &name) - : mockpp::VisitableMockObject(name, 0) + MyVisitableMockObject(const MOCKPP_NS::String &name) + : MOCKPP_NS::VisitableMockObject(name, 0) , MOCKPP_CONSTRUCT_MEMBERS_FOR_VISITABLE0(visitable) , MOCKPP_CONSTRUCT_MEMBERS_FOR_VISITABLE0(visitable_e_Shadow) {} @@ -185,12 +185,12 @@ }; -class MyVisitableMockObject_ex : public mockpp::VisitableMockObject +class MyVisitableMockObject_ex : public MOCKPP_NS::VisitableMockObject { public: - MyVisitableMockObject_ex(const mockpp::String &name) - : mockpp::VisitableMockObject(name, 0), + MyVisitableMockObject_ex(const MOCKPP_NS::String &name) + : MOCKPP_NS::VisitableMockObject(name, 0), MOCKPP_CONSTRUCT_MEMBERS_FOR_VISITABLE_EXT0(visitable, Ext) {} @@ -231,9 +231,9 @@ { MyVisitableMockObject mvo(MOCKPP_PCHAR("mvo")); MOCKPP_CONTROLLER_FOR(MyVisitableMockObject, visitable) ctr (&mvo); - ctr.addThrowable(mockpp::make_throwable(MOCKPP_STL::string("exceptional string"))); + ctr.addThrowable(MOCKPP_NS::make_throwable(MOCKPP_STL::string("exceptional string"))); ctr.addThrowable(MOCKPP_STL::string("exceptional string"), 3); - ctr.setDefaultThrowable(mockpp::make_throwable(int(123))); + ctr.setDefaultThrowable(MOCKPP_NS::make_throwable(int(123))); ctr.addReturnValue(11); ctr.setDefaultReturnValue(123); } @@ -243,9 +243,9 @@ { MyVisitableMockObject mvo(MOCKPP_PCHAR("mvo")); MOCKPP_CONTROLLER_FOR(MyVisitableMockObject, visitable) ctr (&mvo); - ctr.addThrowable(mockpp::make_throwable(MOCKPP_STL::string("exceptional string 1"))); + ctr.addThrowable(MOCKPP_NS::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"))); + ctr.setDefaultThrowable(MOCKPP_NS::make_throwable(MOCKPP_STL::string("exceptional string 3"))); mvo.visitable(); mvo.visitable(); @@ -284,7 +284,7 @@ mvo.visitable(); } #ifndef MOCKPP_NO_EXCEPTIONS - catch(mockpp::AssertionFailedError &) + catch(MOCKPP_NS::AssertionFailedError &) { thrown = true; } @@ -307,8 +307,8 @@ #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); + MOCKPP_NS::AssertionFailedError, + exception_object.getMessage().find(MOCKPP_PCHAR("did not receive the expected item list")) != MOCKPP_NS::String::npos); #endif } @@ -321,10 +321,10 @@ bool thrown = false; MOCKPP_TRY { - ctr.addThrowable(mockpp::make_throwable(MOCKPP_STL::string("exceptional string"))); + ctr.addThrowable(MOCKPP_NS::make_throwable(MOCKPP_STL::string("exceptional string"))); } #ifndef MOCKPP_NO_EXCEPTIONS - catch(mockpp::AssertionFailedError &) + catch(MOCKPP_NS::AssertionFailedError &) { thrown = true; } @@ -344,7 +344,7 @@ ctr.addThrowable(MOCKPP_STL::string("exceptional string"), 1); } #ifndef MOCKPP_NO_EXCEPTIONS - catch(mockpp::AssertionFailedError &) + catch(MOCKPP_NS::AssertionFailedError &) { thrown = true; } @@ -361,10 +361,10 @@ bool thrown = false; MOCKPP_TRY { - ctr.setDefaultThrowable(mockpp::make_throwable(MOCKPP_STL::string("exceptional string"))); + ctr.setDefaultThrowable(MOCKPP_NS::make_throwable(MOCKPP_STL::string("exceptional string"))); } #ifndef MOCKPP_NO_EXCEPTIONS - catch(mockpp::AssertionFailedError &) + catch(MOCKPP_NS::AssertionFailedError &) { thrown = true; } @@ -384,7 +384,7 @@ ctr.addReturnValue(1); } #ifndef MOCKPP_NO_EXCEPTIONS - catch(mockpp::AssertionFailedError &) + catch(MOCKPP_NS::AssertionFailedError &) { thrown = true; } @@ -404,7 +404,7 @@ ctr.setDefaultReturnValue(1); } #ifndef MOCKPP_NO_EXCEPTIONS - catch(mockpp::AssertionFailedError &) + catch(MOCKPP_NS::AssertionFailedError &) { thrown = true; } @@ -435,7 +435,7 @@ mvo.visitable(); // no more return objects } #ifndef MOCKPP_NO_EXCEPTIONS - catch(mockpp::AssertionFailedError &) + catch(MOCKPP_NS::AssertionFailedError &) { thrown = true; } @@ -475,7 +475,7 @@ MOCKPP_CONTROLLER_FOR(MyVisitableMockObject, visitable) ctr (&mvo); ctr.addThrowable(MOCKPP_STL::string("exceptional string"), 3); - ctr.setDefaultThrowable(mockpp::make_throwable(int(123))); + ctr.setDefaultThrowable(MOCKPP_NS::make_throwable(int(123))); ctr.addReturnValue(1); ctr.setDefaultReturnValue(123); @@ -491,7 +491,7 @@ { MyVisitableMockObject mvo(MOCKPP_PCHAR("mvo")); MOCKPP_CONTROLLER_FOR(MyVisitableMockObject, visitable) ctr (&mvo); - ctr.setDefaultThrowable(mockpp::make_throwable(MOCKPP_STL::string("throw default"))); + ctr.setDefaultThrowable(MOCKPP_NS::make_throwable(MOCKPP_STL::string("throw default"))); mvo.activate(); bool thrown = false; MOCKPP_TRY @@ -499,7 +499,7 @@ mvo.verify(); } #ifndef MOCKPP_NO_EXCEPTIONS - catch(mockpp::AssertionFailedError &) + catch(MOCKPP_NS::AssertionFailedError &) { thrown = true; } @@ -520,7 +520,7 @@ mvo.verify(); } #ifndef MOCKPP_NO_EXCEPTIONS - catch(mockpp::AssertionFailedError &) + catch(MOCKPP_NS::AssertionFailedError &) { thrown = true; } @@ -534,9 +534,9 @@ MyVisitableMockObject mvo(MOCKPP_PCHAR("mvo")); MOCKPP_CONTROLLER_FOR(MyVisitableMockObject, visitable) ctr (&mvo); ctr.addReturnValue(111); - ctr.addThrowable(mockpp::make_throwable(MOCKPP_STL::string("throw 1"))); + ctr.addThrowable(MOCKPP_NS::make_throwable(MOCKPP_STL::string("throw 1"))); ctr.addReturnValue(222); - ctr.addThrowable(mockpp::make_throwable(MOCKPP_STL::string("throw 2"))); + ctr.addThrowable(MOCKPP_NS::make_throwable(MOCKPP_STL::string("throw 2"))); mvo.unsetThrowablesInline(); // old pre-1.2 mode mvo.activate(); @@ -577,9 +577,9 @@ MyVisitableMockObject mvo(MOCKPP_PCHAR("mvo")); MOCKPP_CONTROLLER_FOR(MyVisitableMockObject, visitable) ctr (&mvo); ctr.addReturnValue(111); - ctr.addThrowable(mockpp::make_throwable(MOCKPP_STL::string("throw 1"))); + ctr.addThrowable(MOCKPP_NS::make_throwable(MOCKPP_STL::string("throw 1"))); ctr.addReturnValue(222); - ctr.addThrowable(mockpp::make_throwable(MOCKPP_STL::string("throw 2"))); + ctr.addThrowable(MOCKPP_NS::make_throwable(MOCKPP_STL::string("throw 2"))); mvo.activate(); MOCKPP_ASSERT_TRUE(111 == mvo.visitable()); Index: Assert_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/Assert_test.cpp,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- Assert_test.cpp 1 Jan 2006 16:34:47 -0000 1.27 +++ Assert_test.cpp 15 Mar 2006 21:34:08 -0000 1.28 @@ -168,7 +168,7 @@ MOCKPP_ASSERT_EQUALS_MESSAGE(MOCKPP_PCHAR("equals 1==2"), 1, 2); } #ifndef MOCKPP_NO_EXCEPTIONS - catch (mockpp::AssertionFailedError &ae) + catch (MOCKPP_NS::AssertionFailedError &ae) { thrown = true; MOCKPP_ASSERT_TRUE(MOCKPP_PCHAR("equals 1==2") == ae.getMessage()); @@ -183,7 +183,7 @@ MOCKPP_ASSERT_EQUALS(123, 321); } #ifndef MOCKPP_NO_EXCEPTIONS - catch (mockpp::AssertionFailedError &ae) + catch (MOCKPP_NS::AssertionFailedError &ae) { thrown = true; MOCKPP_ASSERT_TRUE(MOCKPP_PCHAR("invalid: 123 == 321") == ae.getMessage()); @@ -198,7 +198,7 @@ MOCKPP_ASSERT_DELTA_MESSAGE(MOCKPP_PCHAR("range 1 +- 2 == 4"), 1, 4, 2); } #ifndef MOCKPP_NO_EXCEPTIONS - catch (mockpp::AssertionFailedError &ae) + catch (MOCKPP_NS::AssertionFailedError &ae) { thrown = true; MOCKPP_ASSERT_TRUE(MOCKPP_PCHAR("range 1 +- 2 == 4") == ae.getMessage()); @@ -213,7 +213,7 @@ MOCKPP_ASSERT_DELTA(123, 321, 3); } #ifndef MOCKPP_NO_EXCEPTIONS - catch (mockpp::AssertionFailedError &ae) + catch (MOCKPP_NS::AssertionFailedError &ae) { thrown = true; MOCKPP_ASSERT_TRUE(MOCKPP_PCHAR("invalid: 123 +- 3 == 321") == ae.getMessage()); @@ -228,7 +228,7 @@ MOCKPP_ASSERT_BOUNDARY(123, 321, 789); } #ifndef MOCKPP_NO_EXCEPTIONS - catch (mockpp::AssertionFailedError &ae) + catch (MOCKPP_NS::AssertionFailedError &ae) { thrown = true; MOCKPP_ASSERT_TRUE(MOCKPP_PCHAR("invalid: 123 < 789 < 321") == ae.getMessage()); @@ -243,7 +243,7 @@ MOCKPP_ASSERT_BOUNDARY_MESSAGE(MOCKPP_PCHAR("123 321 789"), 123, 321, 789); } #ifndef MOCKPP_NO_EXCEPTIONS -catch (mockpp::AssertionFailedError &ae) +catch (MOCKPP_NS::AssertionFailedError &ae) { thrown = true; MOCKPP_ASSERT_TRUE(MOCKPP_PCHAR("123 321 789") == ae.getMessage()); @@ -258,7 +258,7 @@ MOCKPP_ASSERT_TRUE_MESSAGE(MOCKPP_PCHAR("condition true == false"), true == false); } #ifndef MOCKPP_NO_EXCEPTIONS - catch (mockpp::AssertionFailedError &ae) + catch (MOCKPP_NS::AssertionFailedError &ae) { thrown = true; MOCKPP_ASSERT_TRUE(MOCKPP_PCHAR("condition true == false") == ae.getMessage()); @@ -273,7 +273,7 @@ MOCKPP_ASSERT_TRUE( true == false ); // some spaces AROUND the expression } #ifndef MOCKPP_NO_EXCEPTIONS - catch (mockpp::AssertionFailedError &ae) + catch (MOCKPP_NS::AssertionFailedError &ae) { thrown = true; MOCKPP_ASSERT_TRUE(MOCKPP_PCHAR("!true: true == false") == ae.getMessage()); @@ -288,7 +288,7 @@ MOCKPP_ASSERT_FALSE_MESSAGE(MOCKPP_PCHAR("condition true != false"), true != false); } #ifndef MOCKPP_NO_EXCEPTIONS - catch (mockpp::AssertionFailedError &ae) + catch (MOCKPP_NS::AssertionFailedError &ae) { thrown = true; MOCKPP_ASSERT_TRUE(MOCKPP_PCHAR("condition true != false") == ae.getMessage()); @@ -303,7 +303,7 @@ MOCKPP_ASSERT_FALSE( true != false ); // some spaces AROUND the expression } #ifndef MOCKPP_NO_EXCEPTIONS - catch (mockpp::AssertionFailedError &ae) + catch (MOCKPP_NS::AssertionFailedError &ae) { thrown = true; MOCKPP_ASSERT_TRUE(MOCKPP_PCHAR("!false: true != false") == ae.getMessage()); @@ -328,7 +328,7 @@ MOCKPP_STL::string("123"), MOCKPP_STL::string("321")); } #ifndef MOCKPP_NO_EXCEPTIONS - catch(mockpp::AssertionFailedError &) + catch(MOCKPP_NS::AssertionFailedError &) { thrown = true; } @@ -342,7 +342,7 @@ MOCKPP_ASSERT_EQUALS_MESSAGE(MOCKPP_PCHAR(""), MOCKPP_STL::string("123"), MOCKPP_STL::string("321")); } #ifndef MOCKPP_NO_EXCEPTIONS - catch(mockpp::AssertionFailedError &) + catch(MOCKPP_NS::AssertionFailedError &) { thrown = true; } @@ -368,7 +368,7 @@ MOCKPP_STL::basic_string<wchar_t>(L"123"), MOCKPP_STL::basic_string<wchar_t>(L"321")); } #ifndef MOCKPP_NO_EXCEPTIONS - catch(mockpp::AssertionFailedError &) + catch(MOCKPP_NS::AssertionFailedError &) { thrown = true; } @@ -382,7 +382,7 @@ 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 &) + catch(MOCKPP_NS::AssertionFailedError &) { thrown = true; } @@ -407,7 +407,7 @@ "123", "321"); } #ifndef MOCKPP_NO_EXCEPTIONS - catch(mockpp::AssertionFailedError &) + catch(MOCKPP_NS::AssertionFailedError &) { thrown = true; } @@ -421,7 +421,7 @@ MOCKPP_ASSERT_EQUALS_MESSAGE(MOCKPP_PCHAR(""), "123", "321"); } #ifndef MOCKPP_NO_EXCEPTIONS - catch(mockpp::AssertionFailedError &) + catch(MOCKPP_NS::AssertionFailedError &) { thrown = true; } @@ -446,7 +446,7 @@ L"123", L"321"); } #ifndef MOCKPP_NO_EXCEPTIONS - catch(mockpp::AssertionFailedError &) + catch(MOCKPP_NS::AssertionFailedError &) { thrown = true; } @@ -460,7 +460,7 @@ MOCKPP_ASSERT_EQUALS_MESSAGE(MOCKPP_PCHAR(""), L"123", L"321"); } #ifndef MOCKPP_NO_EXCEPTIONS - catch(mockpp::AssertionFailedError &) + catch(MOCKPP_NS::AssertionFailedError &) { thrown = true; } @@ -484,7 +484,7 @@ (long) 12345678, (long) 87654321); } #ifndef MOCKPP_NO_EXCEPTIONS - catch(mockpp::AssertionFailedError &) + catch(MOCKPP_NS::AssertionFailedError &) { thrown = true; } @@ -497,7 +497,7 @@ MOCKPP_ASSERT_EQUALS_MESSAGE(MOCKPP_PCHAR(""), (long) -12345678, (long) -87654321); } #ifndef MOCKPP_NO_EXCEPTIONS - catch(mockpp::AssertionFailedError &) + catch(MOCKPP_NS::AssertionFailedError &) { thrown = true; } @@ -520,7 +520,7 @@ MOCKPP_ASSERT_EQUALS_MESSAGE(MOCKPP_PCHAR(""), (short) -1234, (short) -4321); } #ifndef MOCKPP_NO_EXCEPTIONS - catch(mockpp::AssertionFailedError &) + catch(MOCKPP_NS::AssertionFailedError &) { thrown = true; } @@ -535,7 +535,7 @@ (short) -1234, (short) -4321); } #ifndef MOCKPP_NO_EXCEPTIONS - catch(mockpp::AssertionFailedError &) + catch(MOCKPP_NS::AssertionFailedError &) { thrown = true; } @@ -558,7 +558,7 @@ (int) 1234, (int) 4321); } #ifndef MOCKPP_NO_EXCEPTIONS - catch(mockpp::AssertionFailedError &) + catch(MOCKPP_NS::AssertionFailedError &) { thrown = true; } @@ -572,7 +572,7 @@ MOCKPP_ASSERT_EQUALS_MESSAGE(MOCKPP_PCHAR(""), (int) 1234, (int) 4321); } #ifndef MOCKPP_NO_EXCEPTIONS - catch(mockpp::AssertionFailedError &) + catch(MOCKPP_NS::AssertionFailedError &) { thrown = true; } @@ -596,7 +596,7 @@ MOCKPP_CHAR('x'), MOCKPP_CHAR('u')); } #ifndef MOCKPP_NO_EXCEPTIONS - catch(mockpp::AssertionFailedError &) + catch(MOCKPP_NS::AssertionFailedError &) { thrown = true; } @@ -610,7 +610,7 @@ MOCKPP_ASSERT_EQUALS_MESSAGE(MOCKPP_PCHAR(""), MOCKPP_CHAR('x'), MOCKPP_CHAR('u')); } #ifndef MOCKPP_NO_EXCEPTIONS - catch(mockpp::AssertionFailedError &) + catch(MOCKPP_NS::AssertionFailedError &) { thrown = true; } @@ -634,7 +634,7 @@ (bool)true, (bool)false); } #ifndef MOCKPP_NO_EXCEPTIONS - catch(mockpp::AssertionFailedError &) + catch(MOCKPP_NS::AssertionFailedError &) { thrown = true; } @@ -648,7 +648,7 @@ MOCKPP_ASSERT_EQUALS_MESSAGE(MOCKPP_PCHAR(""), (bool)true, (bool)false); } #ifndef MOCKPP_NO_EXCEPTIONS - catch(mockpp::AssertionFailedError &) + catch(MOCKPP_NS::AssertionFailedError &) { thrown = true; } @@ -684,7 +684,7 @@ (double)12.5, (double)13.1, (double)0.5); } #ifndef MOCKPP_NO_EXCEPTIONS - catch(mockpp::AssertionFailedError &) + catch(MOCKPP_NS::AssertionFailedError &) { thrown = true; } @@ -698,7 +698,7 @@ MOCKPP_ASSERT_DELTA((double)12.5, (double)13.1, (double)-0.5); } #ifndef MOCKPP_NO_EXCEPTIONS - catch(mockpp::AssertionFailedError &) + catch(MOCKPP_NS::AssertionFailedError &) { thrown = true; } @@ -734,7 +734,7 @@ (float)12.5, (float)11.9, (float)0.5); } #ifndef MOCKPP_NO_EXCEPTIONS - catch(mockpp::AssertionFailedError &) + catch(MOCKPP_NS::AssertionFailedError &) { thrown = true; } @@ -748,7 +748,7 @@ MOCKPP_ASSERT_DELTA((float)12.5, (float)11.9, (float)0.5); } #ifndef MOCKPP_NO_EXCEPTIONS - catch(mockpp::AssertionFailedError &) + catch(MOCKPP_NS::AssertionFailedError &) { thrown = true; } @@ -774,7 +774,7 @@ MOCKPP_ASSERT_TRUE_MESSAGE(MOCKPP_PCHAR("assertTrue 1 != 1"), 1 != 1); } #ifndef MOCKPP_NO_EXCEPTIONS - catch(mockpp::AssertionFailedError &) + catch(MOCKPP_NS::AssertionFailedError &) { thrown = true; } @@ -788,7 +788,7 @@ MOCKPP_ASSERT_TRUE_MESSAGE(MOCKPP_PCHAR(""), 1 != 1); } #ifndef MOCKPP_NO_EXCEPTIONS - catch(mockpp::AssertionFailedError &) + catch(MOCKPP_NS::AssertionFailedError &) { thrown = true; } @@ -802,7 +802,7 @@ MOCKPP_ASSERT_FALSE_MESSAGE(MOCKPP_PCHAR("assertTrue 1 == 1"), 1 == 1); } #ifndef MOCKPP_NO_EXCEPTIONS - catch(mockpp::AssertionFailedError &) + catch(MOCKPP_NS::AssertionFailedError &) { thrown = true; } @@ -816,7 +816,7 @@ MOCKPP_ASSERT_FALSE_MESSAGE(MOCKPP_PCHAR(""), 1 == 1); } #ifndef MOCKPP_NO_EXCEPTIONS - catch(mockpp::AssertionFailedError &) + catch(MOCKPP_NS::AssertionFailedError &) { thrown = true; } @@ -833,7 +833,7 @@ MOCKPP_FAIL(MOCKPP_PCHAR("")); } #ifndef MOCKPP_NO_EXCEPTIONS - catch(mockpp::AssertionFailedError &) + catch(MOCKPP_NS::AssertionFailedError &) { thrown = true; } @@ -850,7 +850,7 @@ MOCKPP_FAIL(MOCKPP_PCHAR("fail with msg")); } #ifndef MOCKPP_NO_EXCEPTIONS - catch(mockpp::AssertionFailedError &) + catch(MOCKPP_NS::AssertionFailedError &) { thrown = true; } @@ -874,7 +874,7 @@ MOCKPP_ASSERT_BOUNDARY(2, 4, 1); } #ifndef MOCKPP_NO_EXCEPTIONS - catch(mockpp::AssertionFailedError &) + catch(MOCKPP_NS::AssertionFailedError &) { thrown = true; } @@ -888,7 +888,7 @@ MOCKPP_ASSERT_BOUNDARY(2, 4, 5); } #ifndef MOCKPP_NO_EXCEPTIONS - catch(mockpp::AssertionFailedError &) + catch(MOCKPP_NS::AssertionFailedError &) { thrown = true; ... [truncated message content] |
