[Mockpp-commits] mockpp/mockpp/tests AbstractDynamicChainingMock_test.cpp,1.40,1.41 AbstractInvocati
Brought to you by:
ewald-arnold
Menu
▾
▴
[Mockpp-commits] mockpp/mockpp/tests AbstractDynamicChainingMock_test.cpp,1.40,1.41 AbstractInvocationDispatcher_test.cpp,1.30,1.31 And_test.cpp,1.18,1.19 AnyArgumentsMatcher_test.cpp,1.14,1.15 ArgumentsMatchBuilder_test.cpp,1.31,1.32 ArgumentsMatcher_test.cpp,1.19,1.20 AssertMo_test.cpp,1.34,1.35 Assert_test.cpp,1.26,1.27 ChainableMockMethod_1_test.cpp,1.18,1.19 ChainableMockMethod_2_test.cpp,1.17,1.18 ChainableMockMethod_test.cpp,1.20,1.21 ChainableMockObjectPolymorphism_test.cpp,1.13,1.14 ChainableMockObject_1_test.cpp,1.19,1.20 ChainableMockObject_1_void_test.cpp,1.22,1.23 ChainableMockObject_2_test.cpp,1.18,1.19 ChainableMockObject_2_void_test.cpp,1.19,1.20 ChainableMockObject_3_test.cpp,1.16,1.17 ChainableMockObject_3_void_test.cpp,1.19,1.20 ChainableMockObject_4_test.cpp,1.18,1.19 ChainableMockObject_4_void_test.cpp,1.19,1.20 ChainableMockObject_5_test.cpp,1.19,1.20 ChainableMockObject_5_void_test.cpp,1.21,1.22 ChainableMockObject_test.cpp,1.31,1.32 ChainableMockObject_void_test.cpp,1.19,1.20 ChainingMockBuilder_test.cpp,1.28,1.29 ChainingMockObjectSupport_test.cpp,1.40,1.41 ConstraintList_test.cpp,1.10,1.11 ConstraintSet_test.cpp,1.22,1.23 CoreMock_test.cpp,1.30,1.31 CustomStub_test.cpp,1.18,1.19 DefaultResultStub_test.cpp,1.17,1.18 DynamicChainingMockError_test.cpp,1.21,1.22 Exception_test.cpp,1.20,1.21 ExpectationBoundary_test.cpp,1.20,1.21 ExpectationConglomeration_test.cpp,1.20,1.21 ExpectationCounterRange_test.cpp,1.20,1.21 ExpectationCounter_test.cpp,1.21,1.22 ExpectationList_test.cpp,1.24,1.25 ExpectationMap_test.cpp,1.24,1.25 ExpectationSegment_test.cpp,1.21,1.22 ExpectationSet_test.cpp,1.22,1.23 ExpectationValue_test.cpp,1.21,1.22 FIFOInvocationDispatcher_test.cpp,1.26,1.27 Formatter_test.cpp,1.38,1.39 InvocationMockerBuilder_test.cpp,1.36,1.37 InvocationMocker_test.cpp,1.43,1.44 Invocation_test.cpp,1.27,1.28 InvokeAtLeastMatcher_test.cpp,1.12,1.13 InvokeAtLeastOnceMatcher_test.cpp,1.15,1.16 InvokeAtMostMatcher_test.cpp,1.14,1.15 InvokeCountMatcher_test.cpp,1.16,1.17 InvokeOnceMatcher_test.cpp,1.15,1.16 InvokedAfterMatcher_test.cpp,1.15,1.16 InvokedBeforeMatcher_test.cpp,1.12,1.13 InvokedRecorder_test.cpp,1.16,1.17 IsAnything_test.cpp,1.19,1.20 IsCloseTo_test.cpp,1.16,1.17 IsEqual_test.cpp,1.15,1.16 IsGreaterOrEqual_test.cpp,1.14,1.15 IsGreaterThan_test.cpp,1.14,1.15 IsInstanceOf_test.cpp,1.22,1.23 IsLessOrEqual_test.cpp,1.14,1.15 IsLessThan_test.cpp,1.14,1.15 IsNot_test.cpp,1.20,1.21 IsNothing_test.cpp,1.17,1.18 IsSame_test.cpp,1.17,1.18 LIFOInvocationDispatcher_test.cpp,1.25,1.26 MatchBuilder_test.cpp,1.29,1.30 MixedMockObject_5_test.cpp,1.13,1.14 MockObject_test.cpp,1.25,1.26 NoArgumentsMatcher_test.cpp,1.17,1.18 NoException_test.cpp,1.12,1.13 Or_test.cpp,1.18,1.19 OutBound_test.cpp,1.8,1.9 ResponseVector_test.cpp,1.12,1.13 ReturnObjectList_test.cpp,1.23,1.24 ReturnStub_test.cpp,1.17,1.18 StringContains_test.cpp,1.18,1.19 StringEndsWith_test.cpp,1.11,1.12 StringStartsWith_test.cpp,1.11,1.12 StubBuilder_test.cpp,1.22,1.23 StubSequence_test.cpp,1.22,1.23 TestFailureMatcher_test.cpp,1.16,1.17 TestFailureStub_test.cpp,1.14,1.15 ThrowStub_test.cpp,1.20,1.21 ThrowableList_test.cpp,1.23,1.24 Throwable_test.cpp,1.22,1.23 TimeServer_test.cpp,1.8,1.9 TrackingCounter_test.cpp,1.17,1.18 TypelessStubSequence_test.cpp,1.12,1.13 UnlimitedMatcher_test.cpp,1.10,1.11 Verifiable_test.cpp,1.29,1.30 VerifyingTestCaller_test.cpp,1.20,1.21 VerifyingTestCase_test.cpp,1.26,1.27 VisitableMockMethod_1_test.cpp,1.13,1.14 VisitableMockMethod_2_test.cpp,1.18,1.19 VisitableMockMethod_test.cpp,1.26,1.27 VisitableMockObject_1_test.cpp,1.29,1.30 VisitableMockObject_1_void_test.cpp,1.29,1.30 VisitableMockObject_2_test.cpp,1.28,1.29 VisitableMockObject_2_void_test.cpp,1.28,1.29 VisitableMockObject_3_test.cpp,1.27,1.28 VisitableMockObject_3_void_test.cpp,1.27,1.28 VisitableMockObject_4_test.cpp,1.27,1.28 VisitableMockObject_4_void_test.cpp,1.27,1.28 VisitableMockObject_5_test.cpp,1.36,1.37 VisitableMockObject_5_void_test.cpp,1.32,1.33 VisitableMockObject_template_test.cpp,1.16,1.17 VisitableMockObject_test.cpp,1.32,1.33 VisitableMockObject_void_test.cpp,1.25,1.26 VoidStub_test.cpp,1.18,1.19 mock_test.cpp,1.35,1.36 mockpp_pti_test.cpp,1.15,1.16 mockpp_test.cpp,1.21,1.22
Update of /cvsroot/mockpp/mockpp/mockpp/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30752/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 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 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 mock_test.cpp mockpp_pti_test.cpp mockpp_test.cpp Log Message: more descriptive name Index: Or_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/Or_test.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- Or_test.cpp 1 Jan 2006 16:28:36 -0000 1.18 +++ Or_test.cpp 1 Jan 2006 16:34:48 -0000 1.19 @@ -60,8 +60,8 @@ public: - MOCKPP_TEST_DECL void test_invoke(); - MOCKPP_TEST_DECL void test_describe(); + MOCKPP_TESTMETHOD_DECL void test_invoke(); + MOCKPP_TESTMETHOD_DECL void test_describe(); }; Index: TestFailureMatcher_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/TestFailureMatcher_test.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- TestFailureMatcher_test.cpp 1 Jan 2006 16:28:36 -0000 1.16 +++ TestFailureMatcher_test.cpp 1 Jan 2006 16:34:48 -0000 1.17 @@ -55,7 +55,7 @@ public: - MOCKPP_TEST_DECL void test_invoke(); + MOCKPP_TESTMETHOD_DECL void test_invoke(); }; Index: DynamicChainingMockError_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/DynamicChainingMockError_test.cpp,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- DynamicChainingMockError_test.cpp 1 Jan 2006 16:28:36 -0000 1.21 +++ DynamicChainingMockError_test.cpp 1 Jan 2006 16:34:47 -0000 1.22 @@ -63,7 +63,7 @@ public: - MOCKPP_TEST_DECL void test_describe(); + MOCKPP_TESTMETHOD_DECL void test_describe(); }; Index: AbstractDynamicChainingMock_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/AbstractDynamicChainingMock_test.cpp,v retrieving revision 1.40 retrieving revision 1.41 diff -u -d -r1.40 -r1.41 --- AbstractDynamicChainingMock_test.cpp 1 Jan 2006 11:17:28 -0000 1.40 +++ AbstractDynamicChainingMock_test.cpp 1 Jan 2006 16:34:47 -0000 1.41 @@ -80,12 +80,12 @@ public: - MOCKPP_TEST_DECL void test_void_invocation(); - MOCKPP_TEST_DECL void test_invocation(); - MOCKPP_TEST_DECL void test_describer(); - MOCKPP_TEST_DECL void test_describe(); - MOCKPP_TEST_DECL void test_void_describe(); - MOCKPP_TEST_DECL void test_verify(); + MOCKPP_TESTMETHOD_DECL void test_void_invocation(); + MOCKPP_TESTMETHOD_DECL void test_invocation(); + MOCKPP_TESTMETHOD_DECL void test_describer(); + MOCKPP_TESTMETHOD_DECL void test_describe(); + MOCKPP_TESTMETHOD_DECL void test_void_describe(); + MOCKPP_TESTMETHOD_DECL void test_verify(); }; Index: IsInstanceOf_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/IsInstanceOf_test.cpp,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- IsInstanceOf_test.cpp 1 Jan 2006 16:28:36 -0000 1.22 +++ IsInstanceOf_test.cpp 1 Jan 2006 16:34:48 -0000 1.23 @@ -58,8 +58,8 @@ public: - MOCKPP_TEST_DECL void test_describe(); - MOCKPP_TEST_DECL void test_invoke(); + MOCKPP_TESTMETHOD_DECL void test_describe(); + MOCKPP_TESTMETHOD_DECL void test_invoke(); }; Index: ExpectationList_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ExpectationList_test.cpp,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- ExpectationList_test.cpp 1 Jan 2006 16:28:36 -0000 1.24 +++ ExpectationList_test.cpp 1 Jan 2006 16:34:47 -0000 1.25 @@ -73,27 +73,27 @@ #endif public: - MOCKPP_TEST_DECL void test_expectNothing(); - MOCKPP_TEST_DECL void test_expectNothing_revoked(); - MOCKPP_TEST_DECL void fail_expectNothing(); + MOCKPP_TESTMETHOD_DECL void test_expectNothing(); + MOCKPP_TESTMETHOD_DECL void test_expectNothing_revoked(); + MOCKPP_TESTMETHOD_DECL void fail_expectNothing(); - MOCKPP_TEST_DECL void test_expectActualImmediate(); - MOCKPP_TEST_DECL void fail_expectActualImmediate(); + MOCKPP_TESTMETHOD_DECL void test_expectActualImmediate(); + MOCKPP_TESTMETHOD_DECL void fail_expectActualImmediate(); - MOCKPP_TEST_DECL void test_expectActualVerify(); - MOCKPP_TEST_DECL void fail_expectActualVerify(); + MOCKPP_TESTMETHOD_DECL void test_expectActualVerify(); + MOCKPP_TESTMETHOD_DECL void fail_expectActualVerify(); - MOCKPP_TEST_DECL void test_clear(); - MOCKPP_TEST_DECL void fail_many(); - MOCKPP_TEST_DECL void test_name(); - MOCKPP_TEST_DECL void fail_clearActual(); - MOCKPP_TEST_DECL void test_hasExpectations(); - MOCKPP_TEST_DECL void test_ifNoExpected(); + MOCKPP_TESTMETHOD_DECL void test_clear(); + MOCKPP_TESTMETHOD_DECL void fail_many(); + MOCKPP_TESTMETHOD_DECL void test_name(); + MOCKPP_TESTMETHOD_DECL void fail_clearActual(); + MOCKPP_TESTMETHOD_DECL void test_hasExpectations(); + MOCKPP_TESTMETHOD_DECL void test_ifNoExpected(); - MOCKPP_TEST_DECL void test_chain(); - MOCKPP_TEST_DECL void test_balance(); - MOCKPP_TEST_DECL void test_many(); - MOCKPP_TEST_DECL void fail_ifNoActual(); + MOCKPP_TESTMETHOD_DECL void test_chain(); + MOCKPP_TESTMETHOD_DECL void test_balance(); + MOCKPP_TESTMETHOD_DECL void test_many(); + MOCKPP_TESTMETHOD_DECL void fail_ifNoActual(); }; #if defined (MOCKPP_USE_CXXTEST) Index: IsLessThan_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/IsLessThan_test.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- IsLessThan_test.cpp 1 Jan 2006 16:28:36 -0000 1.14 +++ IsLessThan_test.cpp 1 Jan 2006 16:34:48 -0000 1.15 @@ -57,8 +57,8 @@ public: - MOCKPP_TEST_DECL void test_invoke(); - MOCKPP_TEST_DECL void test_describe(); + MOCKPP_TESTMETHOD_DECL void test_invoke(); + MOCKPP_TESTMETHOD_DECL void test_describe(); }; Index: ExpectationMap_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ExpectationMap_test.cpp,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- ExpectationMap_test.cpp 1 Jan 2006 16:28:36 -0000 1.24 +++ ExpectationMap_test.cpp 1 Jan 2006 16:34:47 -0000 1.25 @@ -76,30 +76,30 @@ #endif public: - MOCKPP_TEST_DECL void test_expectNothing_revoked(); - MOCKPP_TEST_DECL void test_expectNothing(); - MOCKPP_TEST_DECL void fail_expectNothing(); + MOCKPP_TESTMETHOD_DECL void test_expectNothing_revoked(); + MOCKPP_TESTMETHOD_DECL void test_expectNothing(); + MOCKPP_TESTMETHOD_DECL void fail_expectNothing(); - MOCKPP_TEST_DECL void test_expectActualImmediate(); - MOCKPP_TEST_DECL void fail_expectActualImmediate(); + MOCKPP_TESTMETHOD_DECL void test_expectActualImmediate(); + MOCKPP_TESTMETHOD_DECL void fail_expectActualImmediate(); - MOCKPP_TEST_DECL void test_expectActualVerify(); - MOCKPP_TEST_DECL void fail_expectActualVerify(); + MOCKPP_TESTMETHOD_DECL void test_expectActualVerify(); + MOCKPP_TESTMETHOD_DECL void fail_expectActualVerify(); - MOCKPP_TEST_DECL void test_chain(); - MOCKPP_TEST_DECL void fail_many(); - MOCKPP_TEST_DECL void fail_clearActual(); - MOCKPP_TEST_DECL void test_name(); - MOCKPP_TEST_DECL void test_missing(); - MOCKPP_TEST_DECL void test_get(); - MOCKPP_TEST_DECL void test_pair_get(); - MOCKPP_TEST_DECL void test_pair_getmany(); - MOCKPP_TEST_DECL void test_clear(); - MOCKPP_TEST_DECL void test_hasExpectations(); - MOCKPP_TEST_DECL void test_ifNoExpected(); + MOCKPP_TESTMETHOD_DECL void test_chain(); + MOCKPP_TESTMETHOD_DECL void fail_many(); + MOCKPP_TESTMETHOD_DECL void fail_clearActual(); + MOCKPP_TESTMETHOD_DECL void test_name(); + MOCKPP_TESTMETHOD_DECL void test_missing(); + MOCKPP_TESTMETHOD_DECL void test_get(); + MOCKPP_TESTMETHOD_DECL void test_pair_get(); + MOCKPP_TESTMETHOD_DECL void test_pair_getmany(); + MOCKPP_TESTMETHOD_DECL void test_clear(); + MOCKPP_TESTMETHOD_DECL void test_hasExpectations(); + MOCKPP_TESTMETHOD_DECL void test_ifNoExpected(); - MOCKPP_TEST_DECL void test_many(); - MOCKPP_TEST_DECL void fail_ifNoActual(); + MOCKPP_TESTMETHOD_DECL void test_many(); + MOCKPP_TESTMETHOD_DECL void fail_ifNoActual(); }; #if defined (MOCKPP_USE_CXXTEST) Index: CustomStub_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/CustomStub_test.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- CustomStub_test.cpp 1 Jan 2006 16:28:36 -0000 1.18 +++ CustomStub_test.cpp 1 Jan 2006 16:34:47 -0000 1.19 @@ -56,7 +56,7 @@ public: - MOCKPP_TEST_DECL void test_invoke(); + MOCKPP_TESTMETHOD_DECL void test_invoke(); }; Index: VisitableMockObject_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_test.cpp,v retrieving revision 1.32 retrieving revision 1.33 diff -u -d -r1.32 -r1.33 --- VisitableMockObject_test.cpp 1 Jan 2006 10:27:23 -0000 1.32 +++ VisitableMockObject_test.cpp 1 Jan 2006 16:34:49 -0000 1.33 @@ -75,25 +75,25 @@ public: - MOCKPP_TEST_DECL void test_controller(); - MOCKPP_TEST_DECL void test_thrower(); - MOCKPP_TEST_DECL void test_return(); - MOCKPP_TEST_DECL void test_clear(); - MOCKPP_TEST_DECL void test_parameter_ex(); - MOCKPP_TEST_DECL void test_inline_pre_1_2(); - MOCKPP_TEST_DECL void test_inline_post_1_2(); - MOCKPP_TEST_DECL void test_method_unused(); + MOCKPP_TESTMETHOD_DECL void test_controller(); + MOCKPP_TESTMETHOD_DECL void test_thrower(); + MOCKPP_TESTMETHOD_DECL void test_return(); + MOCKPP_TESTMETHOD_DECL void test_clear(); + MOCKPP_TESTMETHOD_DECL void test_parameter_ex(); + MOCKPP_TESTMETHOD_DECL void test_inline_pre_1_2(); + MOCKPP_TESTMETHOD_DECL void test_inline_post_1_2(); + MOCKPP_TESTMETHOD_DECL void test_method_unused(); - MOCKPP_TEST_DECL void fail_unused_value(); - MOCKPP_TEST_DECL void fail_unused_throwable(); - MOCKPP_TEST_DECL void fail_return(); - MOCKPP_TEST_DECL void fail_add_method_after_active(); - MOCKPP_TEST_DECL void fail_add_throw_val_after_active(); - MOCKPP_TEST_DECL void fail_add_throw_after_active(); - MOCKPP_TEST_DECL void fail_set_throw_after_active(); - MOCKPP_TEST_DECL void fail_add_return_after_active(); - MOCKPP_TEST_DECL void fail_set_return_after_active(); - MOCKPP_TEST_DECL void test_stub_return_const_ref(); + MOCKPP_TESTMETHOD_DECL void fail_unused_value(); + MOCKPP_TESTMETHOD_DECL void fail_unused_throwable(); + MOCKPP_TESTMETHOD_DECL void fail_return(); + MOCKPP_TESTMETHOD_DECL void fail_add_method_after_active(); + MOCKPP_TESTMETHOD_DECL void fail_add_throw_val_after_active(); + MOCKPP_TESTMETHOD_DECL void fail_add_throw_after_active(); + MOCKPP_TESTMETHOD_DECL void fail_set_throw_after_active(); + MOCKPP_TESTMETHOD_DECL void fail_add_return_after_active(); + MOCKPP_TESTMETHOD_DECL void fail_set_return_after_active(); + MOCKPP_TESTMETHOD_DECL void test_stub_return_const_ref(); }; Index: Assert_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/Assert_test.cpp,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- Assert_test.cpp 1 Jan 2006 16:28:36 -0000 1.26 +++ Assert_test.cpp 1 Jan 2006 16:34:47 -0000 1.27 @@ -74,27 +74,27 @@ #endif public: - MOCKPP_TEST_DECL void fail_fail(); - MOCKPP_TEST_DECL void fail_failmsg(); + MOCKPP_TESTMETHOD_DECL void fail_fail(); + MOCKPP_TESTMETHOD_DECL void fail_failmsg(); - MOCKPP_TEST_DECL void test_FalseTrue(); - MOCKPP_TEST_DECL void test_boundary(); + MOCKPP_TESTMETHOD_DECL void test_FalseTrue(); + MOCKPP_TESTMETHOD_DECL void test_boundary(); - MOCKPP_TEST_DECL void test_equalsPChar(); - MOCKPP_TEST_DECL void test_equalsAString(); + MOCKPP_TESTMETHOD_DECL void test_equalsPChar(); + MOCKPP_TESTMETHOD_DECL void test_equalsAString(); #ifdef MOCKPP_UNICODE - MOCKPP_TEST_DECL void test_equalsPWChar(); - MOCKPP_TEST_DECL void test_equalsWString(); + MOCKPP_TESTMETHOD_DECL void test_equalsPWChar(); + MOCKPP_TESTMETHOD_DECL void test_equalsWString(); #endif - MOCKPP_TEST_DECL void test_equalsDouble(); - MOCKPP_TEST_DECL void test_equalsFloat(); - MOCKPP_TEST_DECL void test_equalsLong(); - MOCKPP_TEST_DECL void test_equalsBool(); - MOCKPP_TEST_DECL void test_equalsChar(); - MOCKPP_TEST_DECL void test_equalsInt(); - MOCKPP_TEST_DECL void test_equalsShort(); - MOCKPP_TEST_DECL void test_macros(); + MOCKPP_TESTMETHOD_DECL void test_equalsDouble(); + MOCKPP_TESTMETHOD_DECL void test_equalsFloat(); + MOCKPP_TESTMETHOD_DECL void test_equalsLong(); + MOCKPP_TESTMETHOD_DECL void test_equalsBool(); + MOCKPP_TESTMETHOD_DECL void test_equalsChar(); + MOCKPP_TESTMETHOD_DECL void test_equalsInt(); + MOCKPP_TESTMETHOD_DECL void test_equalsShort(); + MOCKPP_TESTMETHOD_DECL void test_macros(); }; Index: IsLessOrEqual_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/IsLessOrEqual_test.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- IsLessOrEqual_test.cpp 1 Jan 2006 16:28:36 -0000 1.14 +++ IsLessOrEqual_test.cpp 1 Jan 2006 16:34:48 -0000 1.15 @@ -57,8 +57,8 @@ public: - MOCKPP_TEST_DECL void test_invoke(); - MOCKPP_TEST_DECL void test_describe(); + MOCKPP_TESTMETHOD_DECL void test_invoke(); + MOCKPP_TESTMETHOD_DECL void test_describe(); }; Index: MixedMockObject_5_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/MixedMockObject_5_test.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- MixedMockObject_5_test.cpp 1 Jan 2006 16:28:36 -0000 1.13 +++ MixedMockObject_5_test.cpp 1 Jan 2006 16:34:48 -0000 1.14 @@ -72,9 +72,9 @@ public: - MOCKPP_TEST_DECL void test_controller(); - MOCKPP_TEST_DECL void test_chainer(); - MOCKPP_TEST_DECL void test_return(); + MOCKPP_TESTMETHOD_DECL void test_controller(); + MOCKPP_TESTMETHOD_DECL void test_chainer(); + MOCKPP_TESTMETHOD_DECL void test_return(); }; Index: ChainableMockObject_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_test.cpp,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- ChainableMockObject_test.cpp 1 Jan 2006 16:28:36 -0000 1.31 +++ ChainableMockObject_test.cpp 1 Jan 2006 16:34:47 -0000 1.32 @@ -74,18 +74,18 @@ public: - MOCKPP_TEST_DECL void test_after_1(); - MOCKPP_TEST_DECL void test_after_2(); - MOCKPP_TEST_DECL void test_bad_after(); - MOCKPP_TEST_DECL void test_before_1(); - MOCKPP_TEST_DECL void test_before_2(); - MOCKPP_TEST_DECL void test_bad_before(); - MOCKPP_TEST_DECL void test_register(); - MOCKPP_TEST_DECL void test_pending(); - MOCKPP_TEST_DECL void test_expect_return(); - MOCKPP_TEST_DECL void test_expect_throw(); - MOCKPP_TEST_DECL void test_stub_return(); - MOCKPP_TEST_DECL void test_stub_return_const_ref(); + MOCKPP_TESTMETHOD_DECL void test_after_1(); + MOCKPP_TESTMETHOD_DECL void test_after_2(); + MOCKPP_TESTMETHOD_DECL void test_bad_after(); + MOCKPP_TESTMETHOD_DECL void test_before_1(); + MOCKPP_TESTMETHOD_DECL void test_before_2(); + MOCKPP_TESTMETHOD_DECL void test_bad_before(); + MOCKPP_TESTMETHOD_DECL void test_register(); + MOCKPP_TESTMETHOD_DECL void test_pending(); + MOCKPP_TESTMETHOD_DECL void test_expect_return(); + MOCKPP_TESTMETHOD_DECL void test_expect_throw(); + MOCKPP_TESTMETHOD_DECL void test_stub_return(); + MOCKPP_TESTMETHOD_DECL void test_stub_return_const_ref(); }; Index: Invocation_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/Invocation_test.cpp,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- Invocation_test.cpp 1 Jan 2006 16:28:36 -0000 1.27 +++ Invocation_test.cpp 1 Jan 2006 16:34:47 -0000 1.28 @@ -69,18 +69,18 @@ public: - MOCKPP_TEST_DECL void test_equals0(); - MOCKPP_TEST_DECL void test_equals1(); - MOCKPP_TEST_DECL void test_equals2(); - MOCKPP_TEST_DECL void test_equals3(); - MOCKPP_TEST_DECL void test_equals4(); - MOCKPP_TEST_DECL void test_equals5(); - MOCKPP_TEST_DECL void test_get1(); - MOCKPP_TEST_DECL void test_get2(); - MOCKPP_TEST_DECL void test_get3(); - MOCKPP_TEST_DECL void test_get4(); - MOCKPP_TEST_DECL void test_get5(); - MOCKPP_TEST_DECL void test_invoked(); + MOCKPP_TESTMETHOD_DECL void test_equals0(); + MOCKPP_TESTMETHOD_DECL void test_equals1(); + MOCKPP_TESTMETHOD_DECL void test_equals2(); + MOCKPP_TESTMETHOD_DECL void test_equals3(); + MOCKPP_TESTMETHOD_DECL void test_equals4(); + MOCKPP_TESTMETHOD_DECL void test_equals5(); + MOCKPP_TESTMETHOD_DECL void test_get1(); + MOCKPP_TESTMETHOD_DECL void test_get2(); + MOCKPP_TESTMETHOD_DECL void test_get3(); + MOCKPP_TESTMETHOD_DECL void test_get4(); + MOCKPP_TESTMETHOD_DECL void test_get5(); + MOCKPP_TESTMETHOD_DECL void test_invoked(); }; Index: IsGreaterThan_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/IsGreaterThan_test.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- IsGreaterThan_test.cpp 1 Jan 2006 16:28:36 -0000 1.14 +++ IsGreaterThan_test.cpp 1 Jan 2006 16:34:48 -0000 1.15 @@ -57,8 +57,8 @@ public: - MOCKPP_TEST_DECL void test_describe(); - MOCKPP_TEST_DECL void test_invoke(); + MOCKPP_TESTMETHOD_DECL void test_describe(); + MOCKPP_TESTMETHOD_DECL void test_invoke(); }; Index: NoException_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/NoException_test.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- NoException_test.cpp 1 Jan 2006 10:27:23 -0000 1.12 +++ NoException_test.cpp 1 Jan 2006 16:34:48 -0000 1.13 @@ -78,7 +78,7 @@ public: - MOCKPP_TEST_DECL void test_invoke(); + MOCKPP_TESTMETHOD_DECL void test_invoke(); virtual void setUp(); virtual void tearDown(); Index: ChainableMockObject_4_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_4_void_test.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- ChainableMockObject_4_void_test.cpp 1 Jan 2006 16:28:36 -0000 1.19 +++ ChainableMockObject_4_void_test.cpp 1 Jan 2006 16:34:47 -0000 1.20 @@ -64,8 +64,8 @@ public: - MOCKPP_TEST_DECL void test_outbound(); - MOCKPP_TEST_DECL void test_parameter_4(); + MOCKPP_TESTMETHOD_DECL void test_outbound(); + MOCKPP_TESTMETHOD_DECL void test_parameter_4(); }; Index: InvocationMockerBuilder_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/InvocationMockerBuilder_test.cpp,v retrieving revision 1.36 retrieving revision 1.37 diff -u -d -r1.36 -r1.37 --- InvocationMockerBuilder_test.cpp 1 Jan 2006 16:28:36 -0000 1.36 +++ InvocationMockerBuilder_test.cpp 1 Jan 2006 16:34:47 -0000 1.37 @@ -86,10 +86,10 @@ public: - MOCKPP_TEST_DECL void test_instance0(); - MOCKPP_TEST_DECL void test_instance5(); - MOCKPP_TEST_DECL void test_instancev0(); - MOCKPP_TEST_DECL void test_instancev5(); + MOCKPP_TESTMETHOD_DECL void test_instance0(); + MOCKPP_TESTMETHOD_DECL void test_instance5(); + MOCKPP_TESTMETHOD_DECL void test_instancev0(); + MOCKPP_TESTMETHOD_DECL void test_instancev5(); }; Index: StringContains_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/StringContains_test.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- StringContains_test.cpp 1 Jan 2006 16:28:36 -0000 1.18 +++ StringContains_test.cpp 1 Jan 2006 16:34:48 -0000 1.19 @@ -57,8 +57,8 @@ public: - MOCKPP_TEST_DECL void test_invoke(); - MOCKPP_TEST_DECL void test_describe(); + MOCKPP_TESTMETHOD_DECL void test_invoke(); + MOCKPP_TESTMETHOD_DECL void test_describe(); }; Index: InvokeAtLeastOnceMatcher_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/InvokeAtLeastOnceMatcher_test.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- InvokeAtLeastOnceMatcher_test.cpp 1 Jan 2006 16:28:36 -0000 1.15 +++ InvokeAtLeastOnceMatcher_test.cpp 1 Jan 2006 16:34:48 -0000 1.16 @@ -54,7 +54,7 @@ public: - MOCKPP_TEST_DECL void test_invoke(); + MOCKPP_TESTMETHOD_DECL void test_invoke(); }; Index: ExpectationSet_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ExpectationSet_test.cpp,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- ExpectationSet_test.cpp 1 Jan 2006 16:28:36 -0000 1.22 +++ ExpectationSet_test.cpp 1 Jan 2006 16:34:47 -0000 1.23 @@ -72,26 +72,26 @@ #endif public: - MOCKPP_TEST_DECL void test_expectNothing(); - MOCKPP_TEST_DECL void test_expectNothing_revoked(); - MOCKPP_TEST_DECL void fail_expectNothing(); + MOCKPP_TESTMETHOD_DECL void test_expectNothing(); + MOCKPP_TESTMETHOD_DECL void test_expectNothing_revoked(); + MOCKPP_TESTMETHOD_DECL void fail_expectNothing(); - MOCKPP_TEST_DECL void test_expectActualImmediate(); - MOCKPP_TEST_DECL void fail_expectActualImmediate(); + MOCKPP_TESTMETHOD_DECL void test_expectActualImmediate(); + MOCKPP_TESTMETHOD_DECL void fail_expectActualImmediate(); - MOCKPP_TEST_DECL void test_expectActualVerify(); - MOCKPP_TEST_DECL void fail_expectActualVerify(); + MOCKPP_TESTMETHOD_DECL void test_expectActualVerify(); + MOCKPP_TESTMETHOD_DECL void fail_expectActualVerify(); - MOCKPP_TEST_DECL void fail_many(); - MOCKPP_TEST_DECL void test_name(); - MOCKPP_TEST_DECL void test_clear(); - MOCKPP_TEST_DECL void fail_clearActual(); - MOCKPP_TEST_DECL void test_hasExpectations(); - MOCKPP_TEST_DECL void test_ifNoExpected(); + MOCKPP_TESTMETHOD_DECL void fail_many(); + MOCKPP_TESTMETHOD_DECL void test_name(); + MOCKPP_TESTMETHOD_DECL void test_clear(); + MOCKPP_TESTMETHOD_DECL void fail_clearActual(); + MOCKPP_TESTMETHOD_DECL void test_hasExpectations(); + MOCKPP_TESTMETHOD_DECL void test_ifNoExpected(); - MOCKPP_TEST_DECL void test_chain(); - MOCKPP_TEST_DECL void test_many(); - MOCKPP_TEST_DECL void fail_ifNoActual(); + MOCKPP_TESTMETHOD_DECL void test_chain(); + MOCKPP_TESTMETHOD_DECL void test_many(); + MOCKPP_TESTMETHOD_DECL void fail_ifNoActual(); }; #if defined (MOCKPP_USE_CXXTEST) Index: ChainableMockObject_1_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_1_void_test.cpp,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- ChainableMockObject_1_void_test.cpp 1 Jan 2006 16:28:36 -0000 1.22 +++ ChainableMockObject_1_void_test.cpp 1 Jan 2006 16:34:47 -0000 1.23 @@ -69,8 +69,8 @@ public: - MOCKPP_TEST_DECL void test_outbound(); - MOCKPP_TEST_DECL void test_parameter_1(); + MOCKPP_TESTMETHOD_DECL void test_outbound(); + MOCKPP_TESTMETHOD_DECL void test_parameter_1(); }; Index: ChainableMockMethod_2_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockMethod_2_test.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- ChainableMockMethod_2_test.cpp 1 Jan 2006 16:28:36 -0000 1.17 +++ ChainableMockMethod_2_test.cpp 1 Jan 2006 16:34:47 -0000 1.18 @@ -73,8 +73,8 @@ public: - MOCKPP_TEST_DECL void test_parameter_2(); - MOCKPP_TEST_DECL void test_parameter_2v(); + MOCKPP_TESTMETHOD_DECL void test_parameter_2(); + MOCKPP_TESTMETHOD_DECL void test_parameter_2v(); }; Index: InvokedAfterMatcher_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/InvokedAfterMatcher_test.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- InvokedAfterMatcher_test.cpp 1 Jan 2006 16:28:36 -0000 1.15 +++ InvokedAfterMatcher_test.cpp 1 Jan 2006 16:34:48 -0000 1.16 @@ -54,7 +54,7 @@ public: - MOCKPP_TEST_DECL void test_invoke(); + MOCKPP_TESTMETHOD_DECL void test_invoke(); }; Index: InvokeOnceMatcher_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/InvokeOnceMatcher_test.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- InvokeOnceMatcher_test.cpp 1 Jan 2006 16:28:36 -0000 1.15 +++ InvokeOnceMatcher_test.cpp 1 Jan 2006 16:34:48 -0000 1.16 @@ -54,7 +54,7 @@ public: - MOCKPP_TEST_DECL void test_invoke(); + MOCKPP_TESTMETHOD_DECL void test_invoke(); }; Index: ChainableMockObject_3_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_3_void_test.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- ChainableMockObject_3_void_test.cpp 1 Jan 2006 16:28:36 -0000 1.19 +++ ChainableMockObject_3_void_test.cpp 1 Jan 2006 16:34:47 -0000 1.20 @@ -64,8 +64,8 @@ public: - MOCKPP_TEST_DECL void test_outbound(); - MOCKPP_TEST_DECL void test_parameter_3(); + MOCKPP_TESTMETHOD_DECL void test_outbound(); + MOCKPP_TESTMETHOD_DECL void test_parameter_3(); }; Index: VoidStub_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VoidStub_test.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- VoidStub_test.cpp 1 Jan 2006 16:28:36 -0000 1.18 +++ VoidStub_test.cpp 1 Jan 2006 16:34:49 -0000 1.19 @@ -1,5 +1,5 @@ /*************************************************************************** - MOCKPP_TEST_DECL voidStub_test.cpp - unit tests for VoidStub class + MOCKPP_TESTMETHOD_DECL voidStub_test.cpp - unit tests for VoidStub class ------------------- begin : Wed 25 Aug 2004 copyright : (C) 2002-2006 by Ewald Arnold @@ -57,8 +57,8 @@ public: - MOCKPP_TEST_DECL void test_describe(); - MOCKPP_TEST_DECL void test_invoke(); + MOCKPP_TESTMETHOD_DECL void test_describe(); + MOCKPP_TESTMETHOD_DECL void test_invoke(); }; Index: ExpectationCounter_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ExpectationCounter_test.cpp,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- ExpectationCounter_test.cpp 1 Jan 2006 16:28:36 -0000 1.21 +++ ExpectationCounter_test.cpp 1 Jan 2006 16:34:47 -0000 1.22 @@ -70,26 +70,26 @@ #endif public: - MOCKPP_TEST_DECL void test_expectNothing(); - MOCKPP_TEST_DECL void test_expectNothing_revoked(); - MOCKPP_TEST_DECL void fail_expectNothing(); + MOCKPP_TESTMETHOD_DECL void test_expectNothing(); + MOCKPP_TESTMETHOD_DECL void test_expectNothing_revoked(); + MOCKPP_TESTMETHOD_DECL void fail_expectNothing(); - MOCKPP_TEST_DECL void test_expectActualImmediate(); - MOCKPP_TEST_DECL void fail_expectActualImmediate(); + MOCKPP_TESTMETHOD_DECL void test_expectActualImmediate(); + MOCKPP_TESTMETHOD_DECL void fail_expectActualImmediate(); - MOCKPP_TEST_DECL void test_expectActualVerify(); - MOCKPP_TEST_DECL void fail_expectActualVerify(); + MOCKPP_TESTMETHOD_DECL void test_expectActualVerify(); + MOCKPP_TESTMETHOD_DECL void fail_expectActualVerify(); - MOCKPP_TEST_DECL void test_name(); - MOCKPP_TEST_DECL void test_clearActual(); - MOCKPP_TEST_DECL void test_clear(); - MOCKPP_TEST_DECL void test_hasExpectations(); - MOCKPP_TEST_DECL void test_ifNoExpected(); + MOCKPP_TESTMETHOD_DECL void test_name(); + MOCKPP_TESTMETHOD_DECL void test_clearActual(); + MOCKPP_TESTMETHOD_DECL void test_clear(); + MOCKPP_TESTMETHOD_DECL void test_hasExpectations(); + MOCKPP_TESTMETHOD_DECL void test_ifNoExpected(); - MOCKPP_TEST_DECL void fail_ifNoActual(); - MOCKPP_TEST_DECL void doNothing(mockpp::ExpectationCounter &ec); - MOCKPP_TEST_DECL void doActualImmediate(mockpp::ExpectationCounter &ec); - MOCKPP_TEST_DECL void doActualVerify(mockpp::ExpectationCounter &ec); + MOCKPP_TESTMETHOD_DECL void fail_ifNoActual(); + MOCKPP_TESTMETHOD_DECL void doNothing(mockpp::ExpectationCounter &ec); + MOCKPP_TESTMETHOD_DECL void doActualImmediate(mockpp::ExpectationCounter &ec); + MOCKPP_TESTMETHOD_DECL void doActualVerify(mockpp::ExpectationCounter &ec); }; #if defined (MOCKPP_USE_CXXTEST) Index: OutBound_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/OutBound_test.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- OutBound_test.cpp 1 Jan 2006 16:28:36 -0000 1.8 +++ OutBound_test.cpp 1 Jan 2006 16:34:48 -0000 1.9 @@ -55,8 +55,8 @@ public: - MOCKPP_TEST_DECL void test_describe(); - MOCKPP_TEST_DECL void test_invoke(); + MOCKPP_TESTMETHOD_DECL void test_describe(); + MOCKPP_TESTMETHOD_DECL void test_invoke(); }; Index: ResponseVector_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ResponseVector_test.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- ResponseVector_test.cpp 1 Jan 2006 16:28:36 -0000 1.12 +++ ResponseVector_test.cpp 1 Jan 2006 16:34:48 -0000 1.13 @@ -57,8 +57,8 @@ public: - MOCKPP_TEST_DECL void test_value(); - MOCKPP_TEST_DECL void test_thrower(); + MOCKPP_TESTMETHOD_DECL void test_value(); + MOCKPP_TESTMETHOD_DECL void test_thrower(); }; Index: ExpectationConglomeration_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ExpectationConglomeration_test.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- ExpectationConglomeration_test.cpp 1 Jan 2006 16:28:36 -0000 1.20 +++ ExpectationConglomeration_test.cpp 1 Jan 2006 16:34:47 -0000 1.21 @@ -73,27 +73,27 @@ #endif public: - MOCKPP_TEST_DECL void test_expectNothing(); - MOCKPP_TEST_DECL void test_expectNothing_revoked(); - MOCKPP_TEST_DECL void fail_expectNothing(); + MOCKPP_TESTMETHOD_DECL void test_expectNothing(); + MOCKPP_TESTMETHOD_DECL void test_expectNothing_revoked(); + MOCKPP_TESTMETHOD_DECL void fail_expectNothing(); - MOCKPP_TEST_DECL void test_expectActualImmediate(); - MOCKPP_TEST_DECL void fail_expectActualImmediate(); + MOCKPP_TESTMETHOD_DECL void test_expectActualImmediate(); + MOCKPP_TESTMETHOD_DECL void fail_expectActualImmediate(); - MOCKPP_TEST_DECL void test_expectActualVerify(); - MOCKPP_TEST_DECL void fail_expectActualVerify(); + MOCKPP_TESTMETHOD_DECL void test_expectActualVerify(); + MOCKPP_TESTMETHOD_DECL void fail_expectActualVerify(); - MOCKPP_TEST_DECL void test_clear(); - MOCKPP_TEST_DECL void test_chain(); - MOCKPP_TEST_DECL void fail_many(); - MOCKPP_TEST_DECL void test_name(); - MOCKPP_TEST_DECL void fail_clearActual(); - MOCKPP_TEST_DECL void test_hasExpectations(); - MOCKPP_TEST_DECL void test_hasExpectations2(); - MOCKPP_TEST_DECL void test_ifNoExpected(); + MOCKPP_TESTMETHOD_DECL void test_clear(); + MOCKPP_TESTMETHOD_DECL void test_chain(); + MOCKPP_TESTMETHOD_DECL void fail_many(); + MOCKPP_TESTMETHOD_DECL void test_name(); + MOCKPP_TESTMETHOD_DECL void fail_clearActual(); + MOCKPP_TESTMETHOD_DECL void test_hasExpectations(); + MOCKPP_TESTMETHOD_DECL void test_hasExpectations2(); + MOCKPP_TESTMETHOD_DECL void test_ifNoExpected(); - MOCKPP_TEST_DECL void test_many(); - MOCKPP_TEST_DECL void fail_ifNoActual(); + MOCKPP_TESTMETHOD_DECL void test_many(); + MOCKPP_TESTMETHOD_DECL void fail_ifNoActual(); }; #if defined (MOCKPP_USE_CXXTEST) Index: NoArgumentsMatcher_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/NoArgumentsMatcher_test.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- NoArgumentsMatcher_test.cpp 1 Jan 2006 16:28:36 -0000 1.17 +++ NoArgumentsMatcher_test.cpp 1 Jan 2006 16:34:48 -0000 1.18 @@ -58,7 +58,7 @@ public: - MOCKPP_TEST_DECL void test_invoke(); + MOCKPP_TESTMETHOD_DECL void test_invoke(); }; Index: InvokeAtMostMatcher_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/InvokeAtMostMatcher_test.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- InvokeAtMostMatcher_test.cpp 1 Jan 2006 16:28:36 -0000 1.14 +++ InvokeAtMostMatcher_test.cpp 1 Jan 2006 16:34:48 -0000 1.15 @@ -54,7 +54,7 @@ public: - MOCKPP_TEST_DECL void test_invoke(); + MOCKPP_TESTMETHOD_DECL void test_invoke(); }; Index: VisitableMockObject_4_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_4_test.cpp,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- VisitableMockObject_4_test.cpp 1 Jan 2006 16:28:36 -0000 1.27 +++ VisitableMockObject_4_test.cpp 1 Jan 2006 16:34:49 -0000 1.28 @@ -85,29 +85,29 @@ public: - MOCKPP_TEST_DECL void test_controller(); - MOCKPP_TEST_DECL void test_thrower(); - MOCKPP_TEST_DECL void test_parameter(); - MOCKPP_TEST_DECL void test_parameter_ex(); - MOCKPP_TEST_DECL void test_response(); - MOCKPP_TEST_DECL void test_return(); - MOCKPP_TEST_DECL void test_clear(); - MOCKPP_TEST_DECL void test_default_throw(); - MOCKPP_TEST_DECL void test_inline_pre_1_2(); - MOCKPP_TEST_DECL void test_inline_post_1_2(); - MOCKPP_TEST_DECL void test_constraint(); - MOCKPP_TEST_DECL void test_controller_constraint(); + MOCKPP_TESTMETHOD_DECL void test_controller(); + MOCKPP_TESTMETHOD_DECL void test_thrower(); + MOCKPP_TESTMETHOD_DECL void test_parameter(); + MOCKPP_TESTMETHOD_DECL void test_parameter_ex(); + MOCKPP_TESTMETHOD_DECL void test_response(); + MOCKPP_TESTMETHOD_DECL void test_return(); + MOCKPP_TESTMETHOD_DECL void test_clear(); + MOCKPP_TESTMETHOD_DECL void test_default_throw(); + MOCKPP_TESTMETHOD_DECL void test_inline_pre_1_2(); + MOCKPP_TESTMETHOD_DECL void test_inline_post_1_2(); + MOCKPP_TESTMETHOD_DECL void test_constraint(); + MOCKPP_TESTMETHOD_DECL void test_controller_constraint(); - MOCKPP_TEST_DECL void fail_unused_value(); - MOCKPP_TEST_DECL void fail_unused_throwable(); - MOCKPP_TEST_DECL void fail_parameter(); - MOCKPP_TEST_DECL void fail_return(); - MOCKPP_TEST_DECL void fail_add_method_after_active(); - MOCKPP_TEST_DECL void fail_add_throw_val_after_active(); - MOCKPP_TEST_DECL void fail_add_throw_after_active(); - MOCKPP_TEST_DECL void fail_set_throw_after_active(); - MOCKPP_TEST_DECL void fail_add_return_after_active(); - MOCKPP_TEST_DECL void fail_set_return_after_active(); + MOCKPP_TESTMETHOD_DECL void fail_unused_value(); + MOCKPP_TESTMETHOD_DECL void fail_unused_throwable(); + MOCKPP_TESTMETHOD_DECL void fail_parameter(); + MOCKPP_TESTMETHOD_DECL void fail_return(); + MOCKPP_TESTMETHOD_DECL void fail_add_method_after_active(); + MOCKPP_TESTMETHOD_DECL void fail_add_throw_val_after_active(); + MOCKPP_TESTMETHOD_DECL void fail_add_throw_after_active(); + MOCKPP_TESTMETHOD_DECL void fail_set_throw_after_active(); + MOCKPP_TESTMETHOD_DECL void fail_add_return_after_active(); + MOCKPP_TESTMETHOD_DECL void fail_set_return_after_active(); }; Index: VisitableMockObject_3_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_3_void_test.cpp,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- VisitableMockObject_3_void_test.cpp 1 Jan 2006 16:28:36 -0000 1.27 +++ VisitableMockObject_3_void_test.cpp 1 Jan 2006 16:34:49 -0000 1.28 @@ -78,22 +78,22 @@ public: - MOCKPP_TEST_DECL void test_outbound(); - MOCKPP_TEST_DECL void test_controller(); - MOCKPP_TEST_DECL void test_thrower(); - MOCKPP_TEST_DECL void test_clear(); - MOCKPP_TEST_DECL void test_default_throw(); - MOCKPP_TEST_DECL void test_parameter_ex(); - MOCKPP_TEST_DECL void test_parameter(); - MOCKPP_TEST_DECL void test_constraint(); - MOCKPP_TEST_DECL void test_controller_constraint(); + MOCKPP_TESTMETHOD_DECL void test_outbound(); + MOCKPP_TESTMETHOD_DECL void test_controller(); + MOCKPP_TESTMETHOD_DECL void test_thrower(); + MOCKPP_TESTMETHOD_DECL void test_clear(); + MOCKPP_TESTMETHOD_DECL void test_default_throw(); + MOCKPP_TESTMETHOD_DECL void test_parameter_ex(); + MOCKPP_TESTMETHOD_DECL void test_parameter(); + MOCKPP_TESTMETHOD_DECL void test_constraint(); + MOCKPP_TESTMETHOD_DECL void test_controller_constraint(); - MOCKPP_TEST_DECL void fail_unused_throwable(); - MOCKPP_TEST_DECL void fail_add_method_after_active(); - MOCKPP_TEST_DECL void fail_add_throw_val_after_active(); - MOCKPP_TEST_DECL void fail_add_throw_after_active(); - MOCKPP_TEST_DECL void fail_set_throw_after_active(); - MOCKPP_TEST_DECL void fail_parameter(); + MOCKPP_TESTMETHOD_DECL void fail_unused_throwable(); + MOCKPP_TESTMETHOD_DECL void fail_add_method_after_active(); + MOCKPP_TESTMETHOD_DECL void fail_add_throw_val_after_active(); + MOCKPP_TESTMETHOD_DECL void fail_add_throw_after_active(); + MOCKPP_TESTMETHOD_DECL void fail_set_throw_after_active(); + MOCKPP_TESTMETHOD_DECL void fail_parameter(); }; Index: StubSequence_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/StubSequence_test.cpp,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- StubSequence_test.cpp 1 Jan 2006 16:28:36 -0000 1.22 +++ StubSequence_test.cpp 1 Jan 2006 16:34:48 -0000 1.23 @@ -61,8 +61,8 @@ public: - MOCKPP_TEST_DECL void test_describe(); - MOCKPP_TEST_DECL void test_invoke(); + MOCKPP_TESTMETHOD_DECL void test_describe(); + MOCKPP_TESTMETHOD_DECL void test_invoke(); }; Index: MatchBuilder_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/MatchBuilder_test.cpp,v retrieving revision 1.29 retrieving revision 1.30 diff -u -d -r1.29 -r1.30 --- MatchBuilder_test.cpp 1 Jan 2006 16:28:36 -0000 1.29 +++ MatchBuilder_test.cpp 1 Jan 2006 16:34:48 -0000 1.30 @@ -70,8 +70,8 @@ public: - MOCKPP_TEST_DECL void test_order(); - MOCKPP_TEST_DECL void test_order_defered(); + MOCKPP_TESTMETHOD_DECL void test_order(); + MOCKPP_TESTMETHOD_DECL void test_order_defered(); }; Index: ChainableMockObject_2_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_2_void_test.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- ChainableMockObject_2_void_test.cpp 1 Jan 2006 16:28:36 -0000 1.19 +++ ChainableMockObject_2_void_test.cpp 1 Jan 2006 16:34:47 -0000 1.20 @@ -64,8 +64,8 @@ public: - MOCKPP_TEST_DECL void test_outbound(); - MOCKPP_TEST_DECL void test_parameter_2(); + MOCKPP_TESTMETHOD_DECL void test_outbound(); + MOCKPP_TESTMETHOD_DECL void test_parameter_2(); }; Index: ChainableMockObject_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_void_test.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- ChainableMockObject_void_test.cpp 1 Jan 2006 16:28:36 -0000 1.19 +++ ChainableMockObject_void_test.cpp 1 Jan 2006 16:34:47 -0000 1.20 @@ -65,8 +65,8 @@ public: - MOCKPP_TEST_DECL void test_register(); - MOCKPP_TEST_DECL void test_expect_throw(); + MOCKPP_TESTMETHOD_DECL void test_register(); + MOCKPP_TESTMETHOD_DECL void test_expect_throw(); }; Index: Exception_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/Exception_test.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- Exception_test.cpp 1 Jan 2006 16:28:36 -0000 1.20 +++ Exception_test.cpp 1 Jan 2006 16:34:47 -0000 1.21 @@ -55,7 +55,7 @@ public: - MOCKPP_TEST_DECL void test_file_line(); + MOCKPP_TESTMETHOD_DECL void test_file_line(); }; Index: ChainingMockObjectSupport_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainingMockObjectSupport_test.cpp,v retrieving revision 1.40 retrieving revision 1.41 diff -u -d -r1.40 -r1.41 --- ChainingMockObjectSupport_test.cpp 1 Jan 2006 16:28:36 -0000 1.40 +++ ChainingMockObjectSupport_test.cpp 1 Jan 2006 16:34:47 -0000 1.41 @@ -86,30 +86,30 @@ public: - MOCKPP_TEST_DECL void test_string_contains(); - MOCKPP_TEST_DECL void test_string_ends(); - MOCKPP_TEST_DECL void test_string_starts(); - MOCKPP_TEST_DECL void test_actor(); - MOCKPP_TEST_DECL void test_counts(); - MOCKPP_TEST_DECL void test_consecutive_typeless(); - MOCKPP_TEST_DECL void test_consecutive_custom(); + MOCKPP_TESTMETHOD_DECL void test_string_contains(); + MOCKPP_TESTMETHOD_DECL void test_string_ends(); + MOCKPP_TESTMETHOD_DECL void test_string_starts(); + MOCKPP_TESTMETHOD_DECL void test_actor(); + MOCKPP_TESTMETHOD_DECL void test_counts(); + MOCKPP_TESTMETHOD_DECL void test_consecutive_typeless(); + MOCKPP_TESTMETHOD_DECL void test_consecutive_custom(); - MOCKPP_TEST_DECL void test_invoke_and(); - MOCKPP_TEST_DECL void test_invoke_or(); - MOCKPP_TEST_DECL void test_invoke_not(); + MOCKPP_TESTMETHOD_DECL void test_invoke_and(); + MOCKPP_TESTMETHOD_DECL void test_invoke_or(); + MOCKPP_TESTMETHOD_DECL void test_invoke_not(); #ifndef MOCKPP_NO_RTTI - MOCKPP_TEST_DECL void test_instance(); + MOCKPP_TESTMETHOD_DECL void test_instance(); #endif - MOCKPP_TEST_DECL void test_same_func(); - MOCKPP_TEST_DECL void test_less_equal_func(); - MOCKPP_TEST_DECL void test_less_func(); - MOCKPP_TEST_DECL void test_greater_equal_func(); - MOCKPP_TEST_DECL void test_greater_func(); - MOCKPP_TEST_DECL void test_equal_func(); - MOCKPP_TEST_DECL void test_not_equal_func(); - MOCKPP_TEST_DECL void test_nothing_func(); - MOCKPP_TEST_DECL void test_any_func(); - MOCKPP_TEST_DECL void test_closeto_func(); + MOCKPP_TESTMETHOD_DECL void test_same_func(); + MOCKPP_TESTMETHOD_DECL void test_less_equal_func(); + MOCKPP_TESTMETHOD_DECL void test_less_func(); + MOCKPP_TESTMETHOD_DECL void test_greater_equal_func(); + MOCKPP_TESTMETHOD_DECL void test_greater_func(); + MOCKPP_TESTMETHOD_DECL void test_equal_func(); + MOCKPP_TESTMETHOD_DECL void test_not_equal_func(); + MOCKPP_TESTMETHOD_DECL void test_nothing_func(); + MOCKPP_TESTMETHOD_DECL void test_any_func(); + MOCKPP_TESTMETHOD_DECL void test_closeto_func(); }; Index: LIFOInvocationDispatcher_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/LIFOInvocationDispatcher_test.cpp,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- LIFOInvocationDispatcher_test.cpp 1 Jan 2006 16:28:36 -0000 1.25 +++ LIFOInvocationDispatcher_test.cpp 1 Jan 2006 16:34:48 -0000 1.26 @@ -74,8 +74,8 @@ public: - MOCKPP_TEST_DECL void test_dispatch(); - MOCKPP_TEST_DECL void test_void_dispatch(); + MOCKPP_TESTMETHOD_DECL void test_dispatch(); + MOCKPP_TESTMETHOD_DECL void test_void_dispatch(); }; Index: VisitableMockObject_template_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_template_test.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- VisitableMockObject_template_test.cpp 1 Jan 2006 16:28:36 -0000 1.16 +++ VisitableMockObject_template_test.cpp 1 Jan 2006 16:34:49 -0000 1.17 @@ -64,16 +64,16 @@ #endif public: - MOCKPP_TEST_DECL void test_value_1(); - MOCKPP_TEST_DECL void test_value_2(); - MOCKPP_TEST_DECL void test_value_3(); - MOCKPP_TEST_DECL void test_value_4(); - MOCKPP_TEST_DECL void test_value_5(); - MOCKPP_TEST_DECL void test_throw_1(); - MOCKPP_TEST_DECL void test_throw_2(); - MOCKPP_TEST_DECL void test_throw_3(); - MOCKPP_TEST_DECL void test_throw_4(); - MOCKPP_TEST_DECL void test_throw_5(); + MOCKPP_TESTMETHOD_DECL void test_value_1(); + MOCKPP_TESTMETHOD_DECL void test_value_2(); + MOCKPP_TESTMETHOD_DECL void test_value_3(); + MOCKPP_TESTMETHOD_DECL void test_value_4(); + MOCKPP_TESTMETHOD_DECL void test_value_5(); + MOCKPP_TESTMETHOD_DECL void test_throw_1(); + MOCKPP_TESTMETHOD_DECL void test_throw_2(); + MOCKPP_TESTMETHOD_DECL void test_throw_3(); + MOCKPP_TESTMETHOD_DECL void test_throw_4(); + MOCKPP_TESTMETHOD_DECL void test_throw_5(); }; Index: VisitableMockMethod_1_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockMethod_1_test.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- VisitableMockMethod_1_test.cpp 1 Jan 2006 16:28:36 -0000 1.13 +++ VisitableMockMethod_1_test.cpp 1 Jan 2006 16:34:48 -0000 1.14 @@ -63,8 +63,8 @@ public: - MOCKPP_TEST_DECL void test_parameter_1(); - MOCKPP_TEST_DECL void test_parameter_1v(); + MOCKPP_TESTMETHOD_DECL void test_parameter_1(); + MOCKPP_TESTMETHOD_DECL void test_parameter_1v(); }; Index: VisitableMockObject_4_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_4_void_test.cpp,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- VisitableMockObject_4_void_test.cpp 1 Jan 2006 16:28:36 -0000 1.27 +++ VisitableMockObject_4_void_test.cpp 1 Jan 2006 16:34:49 -0000 1.28 @@ -78,22 +78,22 @@ public: - MOCKPP_TEST_DECL void test_outbound(); - MOCKPP_TEST_DECL void test_controller(); - MOCKPP_TEST_DECL void test_thrower(); - MOCKPP_TEST_DECL void test_clear(); - MOCKPP_TEST_DECL void test_default_throw(); - MOCKPP_TEST_DECL void test_parameter_ex(); - MOCKPP_TEST_DECL void test_parameter(); - MOCKPP_TEST_DECL void test_constraint(); - MOCKPP_TEST_DECL void test_controller_constraint(); + MOCKPP_TESTMETHOD_DECL void test_outbound(); + MOCKPP_TESTMETHOD_DECL void test_controller(); + MOCKPP_TESTMETHOD_DECL void test_thrower(); + MOCKPP_TESTMETHOD_DECL void test_clear(); + MOCKPP_TESTMETHOD_DECL void test_default_throw(); + MOCKPP_TESTMETHOD_DECL void test_parameter_ex(); + MOCKPP_TESTMETHOD_DECL void test_parameter(); + MOCKPP_TESTMETHOD_DECL void test_constraint(); + MOCKPP_TESTMETHOD_DECL void test_controller_constraint(); - MOCKPP_TEST_DECL void fail_unused_throwable(); - MOCKPP_TEST_DECL void fail_add_method_after_active(); - MOCKPP_TEST_DECL void fail_add_throw_val_after_active(); - MOCKPP_TEST_DECL void fail_add_throw_after_active(); - MOCKPP_TEST_DECL void fail_set_throw_after_active(); - MOCKPP_TEST_DECL void fail_parameter(); + MOCKPP_TESTMETHOD_DECL void fail_unused_throwable(); + MOCKPP_TESTMETHOD_DECL void fail_add_method_after_active(); + MOCKPP_TESTMETHOD_DECL void fail_add_throw_val_after_active(); + MOCKPP_TESTMETHOD_DECL void fail_add_throw_after_active(); + MOCKPP_TESTMETHOD_DECL void fail_set_throw_after_active(); + MOCKPP_TESTMETHOD_DECL void fail_parameter(); }; Index: ReturnObjectList_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ReturnObjectList_test.cpp,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- ReturnObjectList_test.cpp 1 Jan 2006 16:28:36 -0000 1.23 +++ ReturnObjectList_test.cpp 1 Jan 2006 16:34:48 -0000 1.24 @@ -59,12 +59,12 @@ public: - MOCKPP_TEST_DECL void test_get_object(); - MOCKPP_TEST_DECL void test_default(); - MOCKPP_TEST_DECL void test_tostring(); + MOCKPP_TESTMETHOD_DECL void test_get_object(); + MOCKPP_TESTMETHOD_DECL void test_default(); + MOCKPP_TESTMETHOD_DECL void test_tostring(); - MOCKPP_TEST_DECL void fail_get_object(); - MOCKPP_TEST_DECL void fail_not_empty(); + MOCKPP_TESTMETHOD_DECL void fail_get_object(); + MOCKPP_TESTMETHOD_DECL void fail_not_empty(); }; Index: StringStartsWith_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/StringStartsWith_test.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- StringStartsWith_test.cpp 1 Jan 2006 16:28:36 -0000 1.11 +++ StringStartsWith_test.cpp 1 Jan 2006 16:34:48 -0000 1.12 @@ -57,8 +57,8 @@ public: - MOCKPP_TEST_DECL void test_invoke(); - MOCKPP_TEST_DECL void test_describe(); + MOCKPP_TESTMETHOD_DECL void test_invoke(); + MOCKPP_TESTMETHOD_DECL void test_describe(); }; Index: VisitableMockObject_3_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_3_test.cpp,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- VisitableMockObject_3_test.cpp 1 Jan 2006 16:28:36 -0000 1.27 +++ VisitableMockObject_3_test.cpp 1 Jan 2006 16:34:49 -0000 1.28 @@ -85,29 +85,29 @@ public: - MOCKPP_TEST_DECL void test_controller(); - MOCKPP_TEST_DECL void test_thrower(); - MOCKPP_TEST_DECL void test_parameter(); - MOCKPP_TEST_DECL void test_parameter_ex(); - MOCKPP_TEST_DECL void test_response(); - MOCKPP_TEST_DECL void test_return(); - MOCKPP_TEST_DECL void test_clear(); - MOCKPP_TEST_DECL void test_default_throw(); - MOCKPP_TEST_DECL void test_inline_pre_1_2(); - MOCKPP_TEST_DECL void test_inline_post_1_2(); - MOCKPP_TEST_DECL void test_constraint(); - MOCKPP_TEST_DECL void test_controller_constraint(); + MOCKPP_TESTMETHOD_DECL void test_controller(); + MOCKPP_TESTMETHOD_DECL void test_thrower(); + MOCKPP_TESTMETHOD_DECL void test_parameter(); + MOCKPP_TESTMETHOD_DECL void test_parameter_ex(); + MOCKPP_TESTMETHOD_DECL void test_response(); + MOCKPP_TESTMETHOD_DECL void test_return(); + MOCKPP_TESTMETHOD_DECL void test_clear(); + MOCKPP_TESTMETHOD_DECL void test_default_throw(); + MOCKPP_TESTMETHOD_DECL void test_inline_pre_1_2(); + MOCKPP_TESTMETHOD_DECL void test_inline_post_1_2(); + MOCKPP_TESTMETHOD_DECL void test_constraint(); + MOCKPP_TESTMETHOD_DECL void test_controller_constraint(); - MOCKPP_TEST_DECL void fail_unused_value(); - MOCKPP_TEST_DECL void fail_unused_throwable(); - MOCKPP_TEST_DECL void fail_parameter(); - MOCKPP_TEST_DECL void fail_return(); - MOCKPP_TEST_DECL void fail_add_method_after_active(); - MOCKPP_TEST_DECL void fail_add_throw_val_after_active(); - MOCKPP_TEST_DECL void fail_add_throw_after_active(); - MOCKPP_TEST_DECL void fail_set_throw_after_active(); - MOCKPP_TEST_DECL void fail_add_return_after_active(); - MOCKPP_TEST_DECL void fail_set_return_after_active(); + MOCKPP_TESTMETHOD_DECL void fail_unused_value(); + MOCKPP_TESTMETHOD_DECL void fail_unused_throwable(); + MOCKPP_TESTMETHOD_DECL void fail_parameter(); + MOCKPP_TESTMETHOD_DECL void fail_return(); + MOCKPP_TESTMETHOD_DECL void fail_add_method_after_active(); + MOCKPP_TESTMETHOD_DECL void fail_add_throw_val_after_active(); + MOCKPP_TESTMETHOD_DECL void fail_add_throw_after_active(); + MOCKPP_TESTMETHOD_DECL void fail_set_throw_after_active(); + MOCKPP_TESTMETHOD_DECL void fail_add_return_after_active(); + MOCKPP_TESTMETHOD_DECL void fail_set_return_after_active(); }; Index: ChainableMockObjectPolymorphism_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObjectPolymorphism_test.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- ChainableMockObjectPolymorphism_test.cpp 1 Jan 2006 16:28:36 -0000 1.13 +++ ChainableMockObjectPolymorphism_test.cpp 1 Jan 2006 16:34:47 -0000 1.14 @@ -65,8 +65,8 @@ public: - MOCKPP_TEST_DECL void test_visitor_retrieves_mock_parameter(); - MOCKPP_TEST_DECL void test_visitor_retrieves_parameter(); + MOCKPP_TESTMETHOD_DECL void test_visitor_retrieves_mock_parameter(); + MOCKPP_TESTMETHOD_DECL void test_visitor_retrieves_parameter(); }; Index: IsGreaterOrEqual_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/IsGreaterOrEqual_test.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- IsGreaterOrEqual_test.cpp 1 Jan 2006 16:28:36 -0000 1.14 +++ IsGreaterOrEqual_test.cpp 1 Jan 2006 16:34:48 -0000 1.15 @@ -57,8 +57,8 @@ public: - MOCKPP_TEST_DECL void test_describe(); - MOCKPP_TEST_DECL void test_invoke(); + MOCKPP_TESTMETHOD_DECL void test_describe(); + MOCKPP_TESTMETHOD_DECL void test_invoke(); }; Index: mockpp_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/mockpp_test.cpp,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- mockpp_test.cpp 1 Jan 2006 16:28:36 -0000 1.21 +++ mockpp_test.cpp 1 Jan 2006 16:34:49 -0000 1.22 @@ -58,7 +58,7 @@ public: #ifdef MOCKPP_UNICODE - MOCKPP_TEST_DECL void test_unicode_latin1_conv(); + MOCKPP_TESTMETHOD_DECL void test_unicode_latin1_conv(); #endif }; Index: Throwable_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/Throwable_test.cpp,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- Throwable_test.cpp 1 Jan 2006 16:28:36 -0000 1.22 +++ Throwable_test.cpp 1 Jan 2006 16:34:48 -0000 1.23 @@ -60,11 +60,11 @@ public: - MOCKPP_TEST_DECL void test_copy(); - MOCKPP_TEST_DECL void test_getter(); - MOCKPP_TEST_DECL void test_used(); - MOCKPP_TEST_DECL void test_throw(); - MOCKPP_TEST_DECL void test_clear(); + MOCKPP_TESTMETHOD_DECL void test_copy(); + MOCKPP_TESTMETHOD_DECL void test_getter(); + MOCKPP_TESTMETHOD_DECL void test_used(); + MOCKPP_TESTMETHOD_DECL void test_throw(); + MOCKPP_TESTMETHOD_DECL void test_clear(); }; Index: ChainableMockObject_2_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_2_test.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- ChainableMockObject_2_test.cpp 1 Jan 2006 16:28:36 -0000 1.18 +++ ChainableMockObject_2_test.cpp 1 Jan 2006 16:34:47 -0000 1.19 @@ -62,8 +62,8 @@ public: - MOCKPP_TEST_DECL void test_outbound(); - MOCKPP_TEST_DECL void test_parameter_2(); + MOCKPP_TESTMETHOD_DECL void test_outbound(); + MOCKPP_TESTMETHOD_DECL void test_parameter_2(); }; Index: UnlimitedMatcher_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/UnlimitedMatcher_test.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- UnlimitedMatcher_test.cpp 1 Jan 2006 16:28:36 -0000 1.10 +++ UnlimitedMatcher_test.cpp 1 Jan 2006 16:34:48 -0000 1.11 @@ -51,7 +51,7 @@ public: - MOCKPP_TEST_DECL void test_invoke(); + MOCKPP_TESTMETHOD_DECL void test_invoke(); }; Index: CoreMock_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/CoreMock_test.cpp,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- CoreMock_test.cpp 1 Jan 2006 16:28:36 -0000 1.30 +++ CoreMock_test.cpp 1 Jan 2006 16:34:47 -0000 1.31 @@ -75,8 +75,8 @@ public: - MOCKPP_TEST_DECL void test_void_invocation(); - MOCKPP_TEST_DECL void test_invocation(); + MOCKPP_TESTMETHOD_DECL void test_void_invocation(); + MOCKPP_TESTMETHOD_DECL void test_invocation(); }; Index: ChainableMockObject_4_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_4_test.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- ChainableMockObject_4_test.cpp 1 Jan 2006 16:28:36 -0000 1.18 +++ ChainableMockObject_4_test.cpp 1 Jan 2006 16:34:47 -0000 1.19 @@ -63,8 +63,8 @@ public: - MOCKPP_TEST_DECL void test_outbound(); - MOCKPP_TEST_DECL void test_parameter_4(); + MOCKPP_TESTMETHOD_DECL void test_outbound(); + MOCKPP_TESTMETHOD_DECL void test_parameter_4(); }; Index: ChainableMockObject_3_test.cpp =================================================================== RCS fil... [truncated message content] |
