[Mockpp-commits] mockpp/mockpp/tests AbstractDynamicChainingMock_test.cpp,1.37,1.38 AbstractInvocati
Brought to you by:
ewald-arnold
Menu
▾
▴
[Mockpp-commits] mockpp/mockpp/tests AbstractDynamicChainingMock_test.cpp,1.37,1.38 AbstractInvocationDispatcher_test.cpp,1.28,1.29 And_test.cpp,1.16,1.17 AnyArgumentsMatcher_test.cpp,1.12,1.13 ArgumentsMatchBuilder_test.cpp,1.29,1.30 ArgumentsMatcher_test.cpp,1.17,1.18 AssertMo_test.cpp,1.32,1.33 Assert_test.cpp,1.24,1.25 ChainableMockMethod_1_test.cpp,1.15,1.16 ChainableMockMethod_2_test.cpp,1.14,1.15 ChainableMockMethod_test.cpp,1.17,1.18 ChainableMockObjectPolymorphism_test.cpp,1.10,1.11 ChainableMockObject_1_test.cpp,1.17,1.18 ChainableMockObject_1_void_test.cpp,1.20,1.21 ChainableMockObject_2_test.cpp,1.16,1.17 ChainableMockObject_2_void_test.cpp,1.17,1.18 ChainableMockObject_3_test.cpp,1.14,1.15 ChainableMockObject_3_void_test.cpp,1.17,1.18 ChainableMockObject_4_test.cpp,1.16,1.17 ChainableMockObject_4_void_test.cpp,1.17,1.18 ChainableMockObject_5_test.cpp,1.17,1.18 ChainableMockObject_5_void_test.cpp,1.19,1.20 ChainableMockObject_test.cpp,1.29,1.30 ChainableMockObject_void_test.cpp,1.17,1.18 ChainingMockBuilder_test.cpp,1.26,1.27 ChainingMockObjectSupport_test.cpp,1.38,1.39 ConstraintList_test.cpp,1.8,1.9 ConstraintSet_test.cpp,1.20,1.21 CoreMock_test.cpp,1.27,1.28 CustomStub_test.cpp,1.16,1.17 DefaultResultStub_test.cpp,1.15,1.16 DynamicChainingMockError_test.cpp,1.19,1.20 Exception_test.cpp,1.18,1.19 ExpectationBoundary_test.cpp,1.18,1.19 ExpectationConglomeration_test.cpp,1.18,1.19 ExpectationCounterRange_test.cpp,1.18,1.19 ExpectationCounter_test.cpp,1.19,1.20 ExpectationList_test.cpp,1.22,1.23 ExpectationMap_test.cpp,1.22,1.23 ExpectationSegment_test.cpp,1.19,1.20 ExpectationSet_test.cpp,1.20,1.21 ExpectationValue_test.cpp,1.19,1.20 FIFOInvocationDispatcher_test.cpp,1.24,1.25 Formatter_test.cpp,1.36,1.37 InvocationMockerBuilder_test.cpp,1.34,1.35 InvocationMocker_test.cpp,1.41,1.42 Invocation_test.cpp,1.25,1.26 InvokeAtLeastMatcher_test.cpp,1.10,1.11 InvokeAtLeastOnceMatcher_test.cpp,1.13,1.14 InvokeAtMostMatcher_test.cpp,1.12,1.13 InvokeCountMatcher_test.cpp,1.14,1.15 InvokeOnceMatcher_test.cpp,1.13,1.14 InvokedAfterMatcher_test.cpp,1.13,1.14 InvokedBeforeMatcher_test.cpp,1.10,1.11 InvokedRecorder_test.cpp,1.14,1.15 IsAnything_test.cpp,1.17,1.18 IsCloseTo_test.cpp,1.14,1.15 IsEqual_test.cpp,1.13,1.14 IsGreaterOrEqual_test.cpp,1.12,1.13 IsGreaterThan_test.cpp,1.12,1.13 IsInstanceOf_test.cpp,1.20,1.21 IsLessOrEqual_test.cpp,1.12,1.13 IsLessThan_test.cpp,1.12,1.13 IsNot_test.cpp,1.18,1.19 IsNothing_test.cpp,1.15,1.16 IsSame_test.cpp,1.15,1.16 LIFOInvocationDispatcher_test.cpp,1.23,1.24 MatchBuilder_test.cpp,1.27,1.28 MixedMockObject_5_test.cpp,1.11,1.12 MockObject_test.cpp,1.22,1.23 NoArgumentsMatcher_test.cpp,1.15,1.16 NoException_test.cpp,1.10,1.11 Or_test.cpp,1.16,1.17 OutBound_test.cpp,1.6,1.7 ResponseVector_test.cpp,1.10,1.11 ReturnObjectList_test.cpp,1.21,1.22 ReturnStub_test.cpp,1.15,1.16 StringContains_test.cpp,1.16,1.17 StringEndsWith_test.cpp,1.9,1.10 StringStartsWith_test.cpp,1.9,1.10 StubBuilder_test.cpp,1.20,1.21 StubSequence_test.cpp,1.20,1.21 TestFailureMatcher_test.cpp,1.14,1.15 TestFailureStub_test.cpp,1.12,1.13 ThrowStub_test.cpp,1.18,1.19 ThrowableList_test.cpp,1.21,1.22 Throwable_test.cpp,1.20,1.21 TimeServer_test.cpp,1.6,1.7 TrackingCounter_test.cpp,1.14,1.15 TypelessStubSequence_test.cpp,1.10,1.11 UnlimitedMatcher_test.cpp,1.8,1.9 Verifiable_test.cpp,1.26,1.27 VerifyingTestCaller_test.cpp,1.18,1.19 VerifyingTestCase_test.cpp,1.24,1.25 VisitableMockMethod_1_test.cpp,1.10,1.11 VisitableMockMethod_2_test.cpp,1.15,1.16 VisitableMockMethod_test.cpp,1.23,1.24 VisitableMockObject_1_test.cpp,1.27,1.28 VisitableMockObject_1_void_test.cpp,1.27,1.28 VisitableMockObject_2_test.cpp,1.26,1.27 VisitableMockObject_2_void_test.cpp,1.26,1.27 VisitableMockObject_3_test.cpp,1.25,1.26 VisitableMockObject_3_void_test.cpp,1.25,1.26 VisitableMockObject_4_test.cpp,1.25,1.26 VisitableMockObject_4_void_test.cpp,1.25,1.26 VisitableMockObject_5_test.cpp,1.34,1.35 VisitableMockObject_5_void_test.cpp,1.30,1.31 VisitableMockObject_template_test.cpp,1.14,1.15 VisitableMockObject_test.cpp,1.30,1.31 VisitableMockObject_void_test.cpp,1.23,1.24 VoidStub_test.cpp,1.16,1.17 mock_test.cpp,1.32,1.33 mockpp_pti_test.cpp,1.12,1.13 mockpp_test.cpp,1.19,1.20
Update of /cvsroot/mockpp/mockpp/mockpp/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9950/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: prepare for Boost.Test Index: Or_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/Or_test.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- Or_test.cpp 29 Dec 2005 19:29:51 -0000 1.16 +++ Or_test.cpp 30 Dec 2005 15:31:59 -0000 1.17 @@ -45,6 +45,8 @@ #if defined (MOCKPP_USE_CXXTEST) +#elif defined(MOCKPP_USE_BOOSTTEST) + #elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( Or_test ); @@ -58,8 +60,8 @@ public: - void test_invoke(); - void test_describe(); + MOCKPP_TEST_DECL void test_invoke(); + MOCKPP_TEST_DECL void test_describe(); }; @@ -69,6 +71,8 @@ MOCKPP_CXXTEST(Or_test, test_describe); MOCKPP_CXXTEST(Or_test, test_invoke); +#elif defined(MOCKPP_USE_BOOSTTEST) + #elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (Or_test); Index: TestFailureMatcher_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/TestFailureMatcher_test.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- TestFailureMatcher_test.cpp 29 Dec 2005 19:29:52 -0000 1.14 +++ TestFailureMatcher_test.cpp 30 Dec 2005 15:31:59 -0000 1.15 @@ -41,6 +41,8 @@ #if defined (MOCKPP_USE_CXXTEST) +#elif defined(MOCKPP_USE_BOOSTTEST) + #elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( TestFailureMatcher_test ); @@ -53,7 +55,7 @@ public: - void test_invoke(); + MOCKPP_TEST_DECL void test_invoke(); }; @@ -62,6 +64,8 @@ MOCKPP_CXXTEST_SUITE_REGISTRATION( TestFailureMatcher_test ); MOCKPP_CXXTEST(TestFailureMatcher_test, test_invoke); +#elif defined(MOCKPP_USE_BOOSTTEST) + #elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (TestFailureMatcher_test); Index: DynamicChainingMockError_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/DynamicChainingMockError_test.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- DynamicChainingMockError_test.cpp 29 Dec 2005 19:29:51 -0000 1.19 +++ DynamicChainingMockError_test.cpp 30 Dec 2005 15:31:59 -0000 1.20 @@ -49,6 +49,8 @@ #if defined (MOCKPP_USE_CXXTEST) +#elif defined(MOCKPP_USE_BOOSTTEST) + #elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( DynamicChainingMockError_test ); @@ -61,7 +63,7 @@ public: - void test_describe(); + MOCKPP_TEST_DECL void test_describe(); }; @@ -70,6 +72,8 @@ MOCKPP_CXXTEST_SUITE_REGISTRATION( DynamicChainingMockError_test ); MOCKPP_CXXTEST(DynamicChainingMockError_test, test_describe); +#elif defined(MOCKPP_USE_BOOSTTEST) + #elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (DynamicChainingMockError_test); Index: AbstractDynamicChainingMock_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/AbstractDynamicChainingMock_test.cpp,v retrieving revision 1.37 retrieving revision 1.38 diff -u -d -r1.37 -r1.38 --- AbstractDynamicChainingMock_test.cpp 29 Dec 2005 19:29:51 -0000 1.37 +++ AbstractDynamicChainingMock_test.cpp 30 Dec 2005 15:31:58 -0000 1.38 @@ -61,6 +61,8 @@ #if defined (MOCKPP_USE_CXXTEST) +#elif defined(MOCKPP_USE_BOOSTTEST) + #elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( AbstractDynamicChainingMock_test ); @@ -78,12 +80,12 @@ public: - void test_void_invocation(); - void test_invocation(); - void test_describer(); - void test_describe(); - void test_void_describe(); - void test_verify(); + 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(); }; @@ -97,6 +99,8 @@ MOCKPP_CXXTEST(AbstractDynamicChainingMock_test, test_void_describe ); MOCKPP_CXXTEST(AbstractDynamicChainingMock_test, test_verify ); +#elif defined(MOCKPP_USE_BOOSTTEST) + #elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION ( AbstractDynamicChainingMock_test ); @@ -122,7 +126,7 @@ return mockInvocation(invocation); } - void void_invoke(const I &invocation) + MOCKPP_TEST_DECL void void_invoke(const I &invocation) { mockInvocation(invocation); } @@ -365,7 +369,7 @@ bool invoked; - void invoke( const I &/*invocation*/ ) + MOCKPP_TEST_DECL void invoke( const I &/*invocation*/ ) { invoked = true; } Index: IsInstanceOf_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/IsInstanceOf_test.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- IsInstanceOf_test.cpp 29 Dec 2005 19:29:51 -0000 1.20 +++ IsInstanceOf_test.cpp 30 Dec 2005 15:31:59 -0000 1.21 @@ -43,6 +43,8 @@ #if defined (MOCKPP_USE_CXXTEST) +#elif defined(MOCKPP_USE_BOOSTTEST) + #elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( IsInstanceOf_test ); @@ -56,8 +58,8 @@ public: - void test_describe(); - void test_invoke(); + MOCKPP_TEST_DECL void test_describe(); + MOCKPP_TEST_DECL void test_invoke(); }; @@ -67,6 +69,8 @@ MOCKPP_CXXTEST(IsInstanceOf_test, test_describe); MOCKPP_CXXTEST(IsInstanceOf_test, test_invoke); +#elif defined(MOCKPP_USE_BOOSTTEST) + #elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (IsInstanceOf_test); Index: ExpectationList_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ExpectationList_test.cpp,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- ExpectationList_test.cpp 29 Dec 2005 19:29:51 -0000 1.22 +++ ExpectationList_test.cpp 30 Dec 2005 15:31:59 -0000 1.23 @@ -41,6 +41,8 @@ #if defined (MOCKPP_USE_CXXTEST) +#elif defined(MOCKPP_USE_BOOSTTEST) + #elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( ExpectationList_test ); @@ -71,27 +73,27 @@ #endif public: - void test_expectNothing(); - void test_expectNothing_revoked(); - void fail_expectNothing(); + MOCKPP_TEST_DECL void test_expectNothing(); + MOCKPP_TEST_DECL void test_expectNothing_revoked(); + MOCKPP_TEST_DECL void fail_expectNothing(); - void test_expectActualImmediate(); - void fail_expectActualImmediate(); + MOCKPP_TEST_DECL void test_expectActualImmediate(); + MOCKPP_TEST_DECL void fail_expectActualImmediate(); - void test_expectActualVerify(); - void fail_expectActualVerify(); + MOCKPP_TEST_DECL void test_expectActualVerify(); + MOCKPP_TEST_DECL void fail_expectActualVerify(); - void test_clear(); - void fail_many(); - void test_name(); - void fail_clearActual(); - void test_hasExpectations(); - void test_ifNoExpected(); + 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(); - void test_chain(); - void test_balance(); - void test_many(); - void fail_ifNoActual(); + MOCKPP_TEST_DECL void test_chain(); + MOCKPP_TEST_DECL void test_balance(); + MOCKPP_TEST_DECL void test_many(); + MOCKPP_TEST_DECL void fail_ifNoActual(); }; #if defined (MOCKPP_USE_CXXTEST) @@ -119,6 +121,8 @@ MOCKPP_CXXTEST(ExpectationList_test, fail_ifNoActual); +#elif defined(MOCKPP_USE_BOOSTTEST) + #elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (ExpectationList_test); Index: IsLessThan_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/IsLessThan_test.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- IsLessThan_test.cpp 29 Dec 2005 19:29:51 -0000 1.12 +++ IsLessThan_test.cpp 30 Dec 2005 15:31:59 -0000 1.13 @@ -42,6 +42,8 @@ #if defined (MOCKPP_USE_CXXTEST) +#elif defined(MOCKPP_USE_BOOSTTEST) + #elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( IsLessThan_test ); @@ -55,8 +57,8 @@ public: - void test_invoke(); - void test_describe(); + MOCKPP_TEST_DECL void test_invoke(); + MOCKPP_TEST_DECL void test_describe(); }; @@ -66,6 +68,8 @@ MOCKPP_CXXTEST(IsLessThan_test, test_describe); MOCKPP_CXXTEST(IsLessThan_test, test_invoke); +#elif defined(MOCKPP_USE_BOOSTTEST) + #elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (IsLessThan_test); Index: ExpectationMap_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ExpectationMap_test.cpp,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- ExpectationMap_test.cpp 29 Dec 2005 19:29:51 -0000 1.22 +++ ExpectationMap_test.cpp 30 Dec 2005 15:31:59 -0000 1.23 @@ -41,6 +41,8 @@ #if defined (MOCKPP_USE_CXXTEST) +#elif defined(MOCKPP_USE_BOOSTTEST) + #elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( ExpectationMap_test ); @@ -74,30 +76,30 @@ #endif public: - void test_expectNothing_revoked(); - void test_expectNothing(); - void fail_expectNothing(); + MOCKPP_TEST_DECL void test_expectNothing_revoked(); + MOCKPP_TEST_DECL void test_expectNothing(); + MOCKPP_TEST_DECL void fail_expectNothing(); - void test_expectActualImmediate(); - void fail_expectActualImmediate(); + MOCKPP_TEST_DECL void test_expectActualImmediate(); + MOCKPP_TEST_DECL void fail_expectActualImmediate(); - void test_expectActualVerify(); - void fail_expectActualVerify(); + MOCKPP_TEST_DECL void test_expectActualVerify(); + MOCKPP_TEST_DECL void fail_expectActualVerify(); - void test_chain(); - void fail_many(); - void fail_clearActual(); - void test_name(); - void test_missing(); - void test_get(); - void test_pair_get(); - void test_pair_getmany(); - void test_clear(); - void test_hasExpectations(); - void test_ifNoExpected(); + 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(); - void test_many(); - void fail_ifNoActual(); + MOCKPP_TEST_DECL void test_many(); + MOCKPP_TEST_DECL void fail_ifNoActual(); }; #if defined (MOCKPP_USE_CXXTEST) @@ -128,6 +130,8 @@ MOCKPP_CXXTEST(ExpectationMap_test, fail_ifNoActual); MOCKPP_CXXTEST(ExpectationMap_test, fail_clearActual); +#elif defined(MOCKPP_USE_BOOSTTEST) + #elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (ExpectationMap_test); Index: CustomStub_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/CustomStub_test.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- CustomStub_test.cpp 29 Dec 2005 19:29:51 -0000 1.16 +++ CustomStub_test.cpp 30 Dec 2005 15:31:59 -0000 1.17 @@ -42,6 +42,8 @@ #if defined (MOCKPP_USE_CXXTEST) +#elif defined(MOCKPP_USE_BOOSTTEST) + #elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( CustomStub_test ); @@ -54,7 +56,7 @@ public: - void test_invoke(); + MOCKPP_TEST_DECL void test_invoke(); }; @@ -63,6 +65,8 @@ MOCKPP_CXXTEST_SUITE_REGISTRATION( CustomStub_test ); MOCKPP_CXXTEST(CustomStub_test, test_invoke); +#elif defined(MOCKPP_USE_BOOSTTEST) + #elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (CustomStub_test); Index: VisitableMockObject_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_test.cpp,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- VisitableMockObject_test.cpp 29 Dec 2005 19:29:52 -0000 1.30 +++ VisitableMockObject_test.cpp 30 Dec 2005 15:31:59 -0000 1.31 @@ -43,6 +43,8 @@ #if defined (MOCKPP_USE_CXXTEST) +#elif defined(MOCKPP_USE_BOOSTTEST) + #elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( VisitableMockObject_test ); @@ -73,25 +75,25 @@ public: - void test_controller(); - void test_thrower(); - void test_return(); - void test_clear(); - void test_parameter_ex(); - void test_inline_pre_1_2(); - void test_inline_post_1_2(); - void test_method_unused(); + 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(); - void fail_unused_value(); - void fail_unused_throwable(); - void fail_return(); - void fail_add_method_after_active(); - void fail_add_throw_val_after_active(); - void fail_add_throw_after_active(); - void fail_set_throw_after_active(); - void fail_add_return_after_active(); - void fail_set_return_after_active(); - void test_stub_return_const_ref(); + 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(); }; @@ -119,6 +121,8 @@ MOCKPP_CXXTEST(VisitableMockObject_test, fail_unused_value); MOCKPP_CXXTEST(VisitableMockObject_test, test_stub_return_const_ref); +#elif defined(MOCKPP_USE_BOOSTTEST) + #elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (VisitableMockObject_test); Index: Assert_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/Assert_test.cpp,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- Assert_test.cpp 29 Dec 2005 19:29:51 -0000 1.24 +++ Assert_test.cpp 30 Dec 2005 15:31:58 -0000 1.25 @@ -40,6 +40,8 @@ #if defined (MOCKPP_USE_CXXTEST) +#elif defined(MOCKPP_USE_BOOSTTEST) + #elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( Assert_test ); @@ -72,27 +74,27 @@ #endif public: - void fail_fail(); - void fail_failmsg(); + MOCKPP_TEST_DECL void fail_fail(); + MOCKPP_TEST_DECL void fail_failmsg(); - void test_FalseTrue(); - void test_boundary(); + MOCKPP_TEST_DECL void test_FalseTrue(); + MOCKPP_TEST_DECL void test_boundary(); - void test_equalsPChar(); - void test_equalsAString(); + MOCKPP_TEST_DECL void test_equalsPChar(); + MOCKPP_TEST_DECL void test_equalsAString(); #ifdef MOCKPP_UNICODE - void test_equalsPWChar(); - void test_equalsWString(); + MOCKPP_TEST_DECL void test_equalsPWChar(); + MOCKPP_TEST_DECL void test_equalsWString(); #endif - void test_equalsDouble(); - void test_equalsFloat(); - void test_equalsLong(); - void test_equalsBool(); - void test_equalsChar(); - void test_equalsInt(); - void test_equalsShort(); - void test_macros(); + 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(); }; @@ -123,6 +125,8 @@ MOCKPP_CXXTEST(Assert_test, fail_fail); MOCKPP_CXXTEST(Assert_test, fail_failmsg); +#elif defined(MOCKPP_USE_BOOSTTEST) + #elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (Assert_test); Index: IsLessOrEqual_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/IsLessOrEqual_test.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- IsLessOrEqual_test.cpp 29 Dec 2005 19:29:51 -0000 1.12 +++ IsLessOrEqual_test.cpp 30 Dec 2005 15:31:59 -0000 1.13 @@ -42,6 +42,8 @@ #if defined (MOCKPP_USE_CXXTEST) +#elif defined(MOCKPP_USE_BOOSTTEST) + #elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( IsLessOrEqual_test ); @@ -55,8 +57,8 @@ public: - void test_invoke(); - void test_describe(); + MOCKPP_TEST_DECL void test_invoke(); + MOCKPP_TEST_DECL void test_describe(); }; @@ -66,6 +68,8 @@ MOCKPP_CXXTEST(IsLessOrEqual_test, test_describe); MOCKPP_CXXTEST(IsLessOrEqual_test, test_invoke); +#elif defined(MOCKPP_USE_BOOSTTEST) + #elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (IsLessOrEqual_test); Index: MixedMockObject_5_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/MixedMockObject_5_test.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- MixedMockObject_5_test.cpp 29 Dec 2005 19:29:51 -0000 1.11 +++ MixedMockObject_5_test.cpp 30 Dec 2005 15:31:59 -0000 1.12 @@ -56,6 +56,8 @@ #if defined (MOCKPP_USE_CXXTEST) +#elif defined(MOCKPP_USE_BOOSTTEST) + #elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( MixedMockObject_5_test ); @@ -70,9 +72,9 @@ public: - void test_controller(); - void test_chainer(); - void test_return(); + MOCKPP_TEST_DECL void test_controller(); + MOCKPP_TEST_DECL void test_chainer(); + MOCKPP_TEST_DECL void test_return(); }; @@ -83,6 +85,8 @@ MOCKPP_CXXTEST(MixedMockObject_5_test, test_chainer); MOCKPP_CXXTEST(MixedMockObject_5_test, test_return); +#elif defined(MOCKPP_USE_BOOSTTEST) + #elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (MixedMockObject_5_test); Index: ChainableMockObject_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_test.cpp,v retrieving revision 1.29 retrieving revision 1.30 diff -u -d -r1.29 -r1.30 --- ChainableMockObject_test.cpp 29 Dec 2005 19:29:51 -0000 1.29 +++ ChainableMockObject_test.cpp 30 Dec 2005 15:31:58 -0000 1.30 @@ -49,6 +49,8 @@ #if defined (MOCKPP_USE_CXXTEST) +#elif defined(MOCKPP_USE_BOOSTTEST) + #elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( ChainableMockObject_test ); @@ -72,18 +74,18 @@ public: - void test_after_1(); - void test_after_2(); - void test_bad_after(); - void test_before_1(); - void test_before_2(); - void test_bad_before(); - void test_register(); - void test_pending(); - void test_expect_return(); - void test_expect_throw(); - void test_stub_return(); - void test_stub_return_const_ref(); + 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(); }; @@ -103,6 +105,8 @@ MOCKPP_CXXTEST(ChainableMockObject_test, test_stub_return); MOCKPP_CXXTEST(ChainableMockObject_test, test_stub_return_const_ref); +#elif defined(MOCKPP_USE_BOOSTTEST) + #elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (ChainableMockObject_test); Index: Invocation_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/Invocation_test.cpp,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- Invocation_test.cpp 29 Dec 2005 19:29:51 -0000 1.25 +++ Invocation_test.cpp 30 Dec 2005 15:31:59 -0000 1.26 @@ -44,6 +44,8 @@ #if defined (MOCKPP_USE_CXXTEST) +#elif defined(MOCKPP_USE_BOOSTTEST) + #elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( Invocation_test ); @@ -67,18 +69,18 @@ public: - void test_equals0(); - void test_equals1(); - void test_equals2(); - void test_equals3(); - void test_equals4(); - void test_equals5(); - void test_get1(); - void test_get2(); - void test_get3(); - void test_get4(); - void test_get5(); - void test_invoked(); + 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(); }; @@ -99,6 +101,8 @@ MOCKPP_CXXTEST(Invocation_test, test_get5); MOCKPP_CXXTEST(Invocation_test, test_invoked); +#elif defined(MOCKPP_USE_BOOSTTEST) + #elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (Invocation_test); Index: IsGreaterThan_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/IsGreaterThan_test.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- IsGreaterThan_test.cpp 29 Dec 2005 19:29:51 -0000 1.12 +++ IsGreaterThan_test.cpp 30 Dec 2005 15:31:59 -0000 1.13 @@ -42,6 +42,8 @@ #if defined (MOCKPP_USE_CXXTEST) +#elif defined(MOCKPP_USE_BOOSTTEST) + #elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( IsGreaterThan_test ); @@ -55,8 +57,8 @@ public: - void test_describe(); - void test_invoke(); + MOCKPP_TEST_DECL void test_describe(); + MOCKPP_TEST_DECL void test_invoke(); }; @@ -66,6 +68,8 @@ MOCKPP_CXXTEST(IsGreaterThan_test, test_describe); MOCKPP_CXXTEST(IsGreaterThan_test, test_invoke); +#elif defined(MOCKPP_USE_BOOSTTEST) + #elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (IsGreaterThan_test); Index: NoException_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/NoException_test.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- NoException_test.cpp 29 Dec 2005 19:29:51 -0000 1.10 +++ NoException_test.cpp 30 Dec 2005 15:31:59 -0000 1.11 @@ -61,6 +61,8 @@ #if defined (MOCKPP_USE_CXXTEST) +#elif defined(MOCKPP_USE_BOOSTTEST) + #elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( NoException_test ); @@ -73,7 +75,7 @@ public: - void test_invoke(); + MOCKPP_TEST_DECL void test_invoke(); virtual void setUp(); virtual void tearDown(); @@ -85,6 +87,8 @@ MOCKPP_CXXTEST_SUITE_REGISTRATION( NoException_test ); MOCKPP_CXXTEST(NoException_test, test_invoke); +#elif defined(MOCKPP_USE_BOOSTTEST) + #elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (NoException_test); Index: ChainableMockObject_4_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_4_void_test.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- ChainableMockObject_4_void_test.cpp 29 Dec 2005 19:29:51 -0000 1.17 +++ ChainableMockObject_4_void_test.cpp 30 Dec 2005 15:31:58 -0000 1.18 @@ -49,6 +49,8 @@ #if defined (MOCKPP_USE_CXXTEST) +#elif defined(MOCKPP_USE_BOOSTTEST) + #elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( ChainableMockObject_4_void_test ); @@ -62,8 +64,8 @@ public: - void test_outbound(); - void test_parameter_4(); + MOCKPP_TEST_DECL void test_outbound(); + MOCKPP_TEST_DECL void test_parameter_4(); }; @@ -73,6 +75,8 @@ MOCKPP_CXXTEST(ChainableMockObject_4_void_test, test_outbound); MOCKPP_CXXTEST(ChainableMockObject_4_void_test, test_parameter_4 ); +#elif defined(MOCKPP_USE_BOOSTTEST) + #elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (ChainableMockObject_4_void_test); Index: InvocationMockerBuilder_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/InvocationMockerBuilder_test.cpp,v retrieving revision 1.34 retrieving revision 1.35 diff -u -d -r1.34 -r1.35 --- InvocationMockerBuilder_test.cpp 29 Dec 2005 19:29:51 -0000 1.34 +++ InvocationMockerBuilder_test.cpp 30 Dec 2005 15:31:59 -0000 1.35 @@ -69,6 +69,8 @@ #if defined (MOCKPP_USE_CXXTEST) +#elif defined(MOCKPP_USE_BOOSTTEST) + #elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( InvocationMockerBuilder_test ); @@ -84,10 +86,10 @@ public: - void test_instance0(); - void test_instance5(); - void test_instancev0(); - void test_instancev5(); + MOCKPP_TEST_DECL void test_instance0(); + MOCKPP_TEST_DECL void test_instance5(); + MOCKPP_TEST_DECL void test_instancev0(); + MOCKPP_TEST_DECL void test_instancev5(); }; @@ -99,6 +101,8 @@ MOCKPP_CXXTEST(InvocationMockerBuilder_test, test_instancev0 ); MOCKPP_CXXTEST(InvocationMockerBuilder_test, test_instancev5 ); +#elif defined(MOCKPP_USE_BOOSTTEST) + #elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION ( InvocationMockerBuilder_test ); Index: StringContains_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/StringContains_test.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- StringContains_test.cpp 29 Dec 2005 19:29:51 -0000 1.16 +++ StringContains_test.cpp 30 Dec 2005 15:31:59 -0000 1.17 @@ -42,6 +42,8 @@ #if defined (MOCKPP_USE_CXXTEST) +#elif defined(MOCKPP_USE_BOOSTTEST) + #elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( StringContains_test ); @@ -55,8 +57,8 @@ public: - void test_invoke(); - void test_describe(); + MOCKPP_TEST_DECL void test_invoke(); + MOCKPP_TEST_DECL void test_describe(); }; @@ -66,6 +68,8 @@ MOCKPP_CXXTEST(StringContains_test, test_describe); MOCKPP_CXXTEST(StringContains_test, test_invoke); +#elif defined(MOCKPP_USE_BOOSTTEST) + #elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (StringContains_test); Index: InvokeAtLeastOnceMatcher_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/InvokeAtLeastOnceMatcher_test.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- InvokeAtLeastOnceMatcher_test.cpp 29 Dec 2005 19:29:51 -0000 1.13 +++ InvokeAtLeastOnceMatcher_test.cpp 30 Dec 2005 15:31:59 -0000 1.14 @@ -40,6 +40,8 @@ #if defined (MOCKPP_USE_CXXTEST) +#elif defined(MOCKPP_USE_BOOSTTEST) + #elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( InvokeAtLeastOnceMatcher_test ); @@ -52,7 +54,7 @@ public: - void test_invoke(); + MOCKPP_TEST_DECL void test_invoke(); }; @@ -61,6 +63,8 @@ MOCKPP_CXXTEST_SUITE_REGISTRATION( InvokeAtLeastOnceMatcher_test ); MOCKPP_CXXTEST(InvokeAtLeastOnceMatcher_test, test_invoke); +#elif defined(MOCKPP_USE_BOOSTTEST) + #elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (InvokeAtLeastOnceMatcher_test); Index: ExpectationSet_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ExpectationSet_test.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- ExpectationSet_test.cpp 29 Dec 2005 19:29:51 -0000 1.20 +++ ExpectationSet_test.cpp 30 Dec 2005 15:31:59 -0000 1.21 @@ -41,6 +41,8 @@ #if defined (MOCKPP_USE_CXXTEST) +#elif defined(MOCKPP_USE_BOOSTTEST) + #elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( ExpectationSet_test ); @@ -70,26 +72,26 @@ #endif public: - void test_expectNothing(); - void test_expectNothing_revoked(); - void fail_expectNothing(); + MOCKPP_TEST_DECL void test_expectNothing(); + MOCKPP_TEST_DECL void test_expectNothing_revoked(); + MOCKPP_TEST_DECL void fail_expectNothing(); - void test_expectActualImmediate(); - void fail_expectActualImmediate(); + MOCKPP_TEST_DECL void test_expectActualImmediate(); + MOCKPP_TEST_DECL void fail_expectActualImmediate(); - void test_expectActualVerify(); - void fail_expectActualVerify(); + MOCKPP_TEST_DECL void test_expectActualVerify(); + MOCKPP_TEST_DECL void fail_expectActualVerify(); - void fail_many(); - void test_name(); - void test_clear(); - void fail_clearActual(); - void test_hasExpectations(); - void test_ifNoExpected(); + 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(); - void test_chain(); - void test_many(); - void fail_ifNoActual(); + MOCKPP_TEST_DECL void test_chain(); + MOCKPP_TEST_DECL void test_many(); + MOCKPP_TEST_DECL void fail_ifNoActual(); }; #if defined (MOCKPP_USE_CXXTEST) @@ -116,6 +118,8 @@ MOCKPP_CXXTEST(ExpectationSet_test, fail_ifNoActual); +#elif defined(MOCKPP_USE_BOOSTTEST) + #elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (ExpectationSet_test); Index: ChainableMockObject_1_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_1_void_test.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- ChainableMockObject_1_void_test.cpp 29 Dec 2005 19:29:51 -0000 1.20 +++ ChainableMockObject_1_void_test.cpp 30 Dec 2005 15:31:58 -0000 1.21 @@ -54,6 +54,8 @@ #if defined (MOCKPP_USE_CXXTEST) +#elif defined(MOCKPP_USE_BOOSTTEST) + #elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( ChainableMockObject_1_void_test ); @@ -67,8 +69,8 @@ public: - void test_outbound(); - void test_parameter_1(); + MOCKPP_TEST_DECL void test_outbound(); + MOCKPP_TEST_DECL void test_parameter_1(); }; @@ -79,6 +81,8 @@ MOCKPP_CXXTEST(ChainableMockObject_1_void_test, test_outbound); MOCKPP_CXXTEST(ChainableMockObject_1_void_test, test_parameter_1 ); +#elif defined(MOCKPP_USE_BOOSTTEST) + #elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (ChainableMockObject_1_void_test); Index: ChainableMockMethod_2_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockMethod_2_test.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- ChainableMockMethod_2_test.cpp 29 Dec 2005 19:29:51 -0000 1.14 +++ ChainableMockMethod_2_test.cpp 30 Dec 2005 15:31:58 -0000 1.15 @@ -58,6 +58,8 @@ #if defined (MOCKPP_USE_CXXTEST) +#elif defined(MOCKPP_USE_BOOSTTEST) + #elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( ChainableMockMethod_2_test ); @@ -71,8 +73,8 @@ public: - void test_parameter_2(); - void test_parameter_2v(); + MOCKPP_TEST_DECL void test_parameter_2(); + MOCKPP_TEST_DECL void test_parameter_2v(); }; @@ -82,6 +84,8 @@ MOCKPP_CXXTEST(ChainableMockMethod_2_test, test_parameter_2 ); MOCKPP_CXXTEST(ChainableMockMethod_2_test, test_parameter_2v ); +#elif defined(MOCKPP_USE_BOOSTTEST) + #elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (ChainableMockMethod_2_test); @@ -105,7 +109,7 @@ return chainable_mocker.forward(i, l); } - void chainablev(unsigned i, long l) + MOCKPP_TEST_DECL void chainablev(unsigned i, long l) { chainablev_mocker.forward(i, l); } Index: InvokedAfterMatcher_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/InvokedAfterMatcher_test.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- InvokedAfterMatcher_test.cpp 29 Dec 2005 19:29:51 -0000 1.13 +++ InvokedAfterMatcher_test.cpp 30 Dec 2005 15:31:59 -0000 1.14 @@ -40,6 +40,8 @@ #if defined (MOCKPP_USE_CXXTEST) +#elif defined(MOCKPP_USE_BOOSTTEST) + #elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( InvokedAfterMatcher_test ); @@ -52,7 +54,7 @@ public: - void test_invoke(); + MOCKPP_TEST_DECL void test_invoke(); }; @@ -61,6 +63,8 @@ MOCKPP_CXXTEST_SUITE_REGISTRATION( InvokedAfterMatcher_test ); MOCKPP_CXXTEST(InvokedAfterMatcher_test, test_invoke); +#elif defined(MOCKPP_USE_BOOSTTEST) + #elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (InvokedAfterMatcher_test); Index: InvokeOnceMatcher_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/InvokeOnceMatcher_test.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- InvokeOnceMatcher_test.cpp 29 Dec 2005 19:29:51 -0000 1.13 +++ InvokeOnceMatcher_test.cpp 30 Dec 2005 15:31:59 -0000 1.14 @@ -40,6 +40,8 @@ #if defined (MOCKPP_USE_CXXTEST) +#elif defined(MOCKPP_USE_BOOSTTEST) + #elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( InvokeOnceMatcher_test ); @@ -52,7 +54,7 @@ public: - void test_invoke(); + MOCKPP_TEST_DECL void test_invoke(); }; @@ -61,6 +63,8 @@ MOCKPP_CXXTEST_SUITE_REGISTRATION( InvokeOnceMatcher_test ); MOCKPP_CXXTEST(InvokeOnceMatcher_test, test_invoke); +#elif defined(MOCKPP_USE_BOOSTTEST) + #elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (InvokeOnceMatcher_test); Index: ChainableMockObject_3_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_3_void_test.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- ChainableMockObject_3_void_test.cpp 29 Dec 2005 19:29:51 -0000 1.17 +++ ChainableMockObject_3_void_test.cpp 30 Dec 2005 15:31:58 -0000 1.18 @@ -49,6 +49,8 @@ #if defined (MOCKPP_USE_CXXTEST) +#elif defined(MOCKPP_USE_BOOSTTEST) + #elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( ChainableMockObject_3_void_test ); @@ -62,8 +64,8 @@ public: - void test_outbound(); - void test_parameter_3(); + MOCKPP_TEST_DECL void test_outbound(); + MOCKPP_TEST_DECL void test_parameter_3(); }; @@ -73,6 +75,8 @@ MOCKPP_CXXTEST(ChainableMockObject_3_void_test, test_outbound); MOCKPP_CXXTEST(ChainableMockObject_3_void_test, test_parameter_3 ); +#elif defined(MOCKPP_USE_BOOSTTEST) + #elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (ChainableMockObject_3_void_test); Index: VoidStub_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VoidStub_test.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- VoidStub_test.cpp 29 Dec 2005 19:29:52 -0000 1.16 +++ VoidStub_test.cpp 30 Dec 2005 15:31:59 -0000 1.17 @@ -1,5 +1,5 @@ /*************************************************************************** - VoidStub_test.cpp - unit tests for VoidStub class + MOCKPP_TEST_DECL voidStub_test.cpp - unit tests for VoidStub class ------------------- begin : Wed 25 Aug 2004 copyright : (C) 2002-2006 by Ewald Arnold @@ -42,6 +42,8 @@ #if defined (MOCKPP_USE_CXXTEST) +#elif defined(MOCKPP_USE_BOOSTTEST) + #elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( VoidStub_test ); @@ -55,8 +57,8 @@ public: - void test_describe(); - void test_invoke(); + MOCKPP_TEST_DECL void test_describe(); + MOCKPP_TEST_DECL void test_invoke(); }; @@ -66,6 +68,8 @@ MOCKPP_CXXTEST(VoidStub_test, test_describe); MOCKPP_CXXTEST(VoidStub_test, test_invoke); +#elif defined(MOCKPP_USE_BOOSTTEST) + #elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (VoidStub_test); Index: ExpectationCounter_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ExpectationCounter_test.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- ExpectationCounter_test.cpp 29 Dec 2005 19:29:51 -0000 1.19 +++ ExpectationCounter_test.cpp 30 Dec 2005 15:31:59 -0000 1.20 @@ -42,6 +42,8 @@ #if defined (MOCKPP_USE_CXXTEST) +#elif defined(MOCKPP_USE_BOOSTTEST) + #elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( ExpectationCounter_test ); @@ -68,26 +70,26 @@ #endif public: - void test_expectNothing(); - void test_expectNothing_revoked(); - void fail_expectNothing(); + MOCKPP_TEST_DECL void test_expectNothing(); + MOCKPP_TEST_DECL void test_expectNothing_revoked(); + MOCKPP_TEST_DECL void fail_expectNothing(); - void test_expectActualImmediate(); - void fail_expectActualImmediate(); + MOCKPP_TEST_DECL void test_expectActualImmediate(); + MOCKPP_TEST_DECL void fail_expectActualImmediate(); - void test_expectActualVerify(); - void fail_expectActualVerify(); + MOCKPP_TEST_DECL void test_expectActualVerify(); + MOCKPP_TEST_DECL void fail_expectActualVerify(); - void test_name(); - void test_clearActual(); - void test_clear(); - void test_hasExpectations(); - void test_ifNoExpected(); + 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(); - void fail_ifNoActual(); - void doNothing(mockpp::ExpectationCounter &ec); - void doActualImmediate(mockpp::ExpectationCounter &ec); - void doActualVerify(mockpp::ExpectationCounter &ec); + 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); }; #if defined (MOCKPP_USE_CXXTEST) @@ -111,6 +113,8 @@ MOCKPP_CXXTEST(ExpectationCounter_test, fail_ifNoActual); +#elif defined(MOCKPP_USE_BOOSTTEST) + #elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (ExpectationCounter_test); Index: OutBound_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/OutBound_test.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- OutBound_test.cpp 29 Dec 2005 19:29:51 -0000 1.6 +++ OutBound_test.cpp 30 Dec 2005 15:31:59 -0000 1.7 @@ -40,6 +40,8 @@ #if defined (MOCKPP_USE_CXXTEST) +#elif defined(MOCKPP_USE_BOOSTTEST) + #elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( OutBound_test ); @@ -53,8 +55,8 @@ public: - void test_describe(); - void test_invoke(); + MOCKPP_TEST_DECL void test_describe(); + MOCKPP_TEST_DECL void test_invoke(); }; @@ -64,6 +66,8 @@ MOCKPP_CXXTEST(OutBound_test, test_describe); MOCKPP_CXXTEST(OutBound_test, test_invoke); +#elif defined(MOCKPP_USE_BOOSTTEST) + #elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (OutBound_test); Index: ResponseVector_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ResponseVector_test.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- ResponseVector_test.cpp 29 Dec 2005 19:29:51 -0000 1.10 +++ ResponseVector_test.cpp 30 Dec 2005 15:31:59 -0000 1.11 @@ -42,6 +42,8 @@ #if defined (MOCKPP_USE_CXXTEST) +#elif defined(MOCKPP_USE_BOOSTTEST) + #elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( ResponseVector_Test ); @@ -55,8 +57,8 @@ public: - void test_value(); - void test_thrower(); + MOCKPP_TEST_DECL void test_value(); + MOCKPP_TEST_DECL void test_thrower(); }; @@ -66,6 +68,8 @@ MOCKPP_CXXTEST(ResponseVector_Test, test_value); MOCKPP_CXXTEST(ResponseVector_Test, test_thrower); +#elif defined(MOCKPP_USE_BOOSTTEST) + #elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (ResponseVector_Test); Index: ExpectationConglomeration_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ExpectationConglomeration_test.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- ExpectationConglomeration_test.cpp 29 Dec 2005 19:29:51 -0000 1.18 +++ ExpectationConglomeration_test.cpp 30 Dec 2005 15:31:59 -0000 1.19 @@ -41,6 +41,8 @@ #if defined (MOCKPP_USE_CXXTEST) +#elif defined(MOCKPP_USE_BOOSTTEST) + #elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( ExpectationConglomeration_test ); @@ -71,27 +73,27 @@ #endif public: - void test_expectNothing(); - void test_expectNothing_revoked(); - void fail_expectNothing(); + MOCKPP_TEST_DECL void test_expectNothing(); + MOCKPP_TEST_DECL void test_expectNothing_revoked(); + MOCKPP_TEST_DECL void fail_expectNothing(); - void test_expectActualImmediate(); - void fail_expectActualImmediate(); + MOCKPP_TEST_DECL void test_expectActualImmediate(); + MOCKPP_TEST_DECL void fail_expectActualImmediate(); - void test_expectActualVerify(); - void fail_expectActualVerify(); + MOCKPP_TEST_DECL void test_expectActualVerify(); + MOCKPP_TEST_DECL void fail_expectActualVerify(); - void test_clear(); - void test_chain(); - void fail_many(); - void test_name(); - void fail_clearActual(); - void test_hasExpectations(); - void test_hasExpectations2(); - void test_ifNoExpected(); + 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(); - void test_many(); - void fail_ifNoActual(); + MOCKPP_TEST_DECL void test_many(); + MOCKPP_TEST_DECL void fail_ifNoActual(); }; #if defined (MOCKPP_USE_CXXTEST) @@ -119,6 +121,8 @@ MOCKPP_CXXTEST(ExpectationConglomeration_test, fail_ifNoActual); +#elif defined(MOCKPP_USE_BOOSTTEST) + #elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (ExpectationConglomeration_test); Index: NoArgumentsMatcher_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/NoArgumentsMatcher_test.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- NoArgumentsMatcher_test.cpp 29 Dec 2005 19:29:51 -0000 1.15 +++ NoArgumentsMatcher_test.cpp 30 Dec 2005 15:31:59 -0000 1.16 @@ -44,6 +44,8 @@ #if defined (MOCKPP_USE_CXXTEST) +#elif defined(MOCKPP_USE_BOOSTTEST) + #elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE(NoArgumentsMatcher_test ); @@ -56,7 +58,7 @@ public: - void test_invoke(); + MOCKPP_TEST_DECL void test_invoke(); }; @@ -65,6 +67,8 @@ MOCKPP_CXXTEST_SUITE_REGISTRATION( NoArgumentsMatcher_test ); MOCKPP_CXXTEST(NoArgumentsMatcher_test, test_invoke); +#elif defined(MOCKPP_USE_BOOSTTEST) + #elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (NoArgumentsMatcher_test); Index: InvokeAtMostMatcher_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/InvokeAtMostMatcher_test.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- InvokeAtMostMatcher_test.cpp 29 Dec 2005 19:29:51 -0000 1.12 +++ InvokeAtMostMatcher_test.cpp 30 Dec 2005 15:31:59 -0000 1.13 @@ -40,6 +40,8 @@ #if defined (MOCKPP_USE_CXXTEST) +#elif defined(MOCKPP_USE_BOOSTTEST) + #elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( InvokeAtMostMatcher_test ); @@ -52,7 +54,7 @@ public: - void test_invoke(); + MOCKPP_TEST_DECL void test_invoke(); }; @@ -61,6 +63,8 @@ MOCKPP_CXXTEST_SUITE_REGISTRATION( InvokeAtMostMatcher_test ); MOCKPP_CXXTEST(InvokeAtMostMatcher_test, test_invoke); +#elif defined(MOCKPP_USE_BOOSTTEST) + #elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (InvokeAtMostMatcher_test); Index: VisitableMockObject_4_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_4_test.cpp,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- VisitableMockObject_4_test.cpp 29 Dec 2005 19:29:52 -0000 1.25 +++ VisitableMockObject_4_test.cpp 30 Dec 2005 15:31:59 -0000 1.26 @@ -49,6 +49,8 @@ #if defined (MOCKPP_USE_CXXTEST) +#elif defined(MOCKPP_USE_BOOSTTEST) + #elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( VisitableMockObject_4_test ); @@ -83,29 +85,29 @@ public: - void test_controller(); - void test_thrower(); - void test_parameter(); - void test_parameter_ex(); - void test_response(); - void test_return(); - void test_clear(); - void test_default_throw(); - void test_inline_pre_1_2(); - void test_inline_post_1_2(); - void test_constraint(); - void test_controller_constraint(); + 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(); - void fail_unused_value(); - void fail_unused_throwable(); - void fail_parameter(); - void fail_return(); - void fail_add_method_after_active(); - void fail_add_throw_val_after_active(); - void fail_add_throw_after_active(); - void fail_set_throw_after_active(); - void fail_add_return_after_active(); - void fail_set_return_after_active(); + 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(); }; @@ -137,6 +139,8 @@ MOCKPP_CXXTEST(VisitableMockObject_4_test, fail_unused_throwable); MOCKPP_CXXTEST(VisitableMockObject_4_test, fail_unused_value); +#elif defined(MOCKPP_USE_BOOSTTEST) + #elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (VisitableMockObject_4_test); Index: VisitableMockObject_3_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_3_void_test.cpp,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- VisitableMockObject_3_void_test.cpp 29 Dec 2005 19:29:52 -0000 1.25 +++ VisitableMockObject_3_void_test.cpp 30 Dec 2005 15:31:59 -0000 1.26 @@ -49,6 +49,8 @@ #if defined (MOCKPP_USE_CXXTEST) +#elif defined(MOCKPP_USE_BOOSTTEST) + #elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( VisitableMockObject_3_void_test ); @@ -76,22 +78,22 @@ public: - void test_outbound(); - void test_controller(); - void test_thrower(); - void test_clear(); - void test_default_throw(); - void test_parameter_ex(); - void test_parameter(); - void test_constraint(); - void test_controller_constraint(); + 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(); - void fail_unused_throwable(); - void fail_add_method_after_active(); - void fail_add_throw_val_after_active(); - void fail_add_throw_after_active(); - void fail_set_throw_after_active(); - void fail_parameter(); + 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(); }; @@ -116,6 +118,8 @@ MOCKPP_CXXTEST(VisitableMockObject_3_void_test, fail_parameter); MOCKPP_CXXTEST(VisitableMockObject_3_void_test, fail_unused_throwable); +#elif defined(MOCKPP_USE_BOOSTTEST) + #elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (VisitableMockObject_3_void_test); Index: StubSequence_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/StubSequence_test.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- StubSequence_test.cpp 29 Dec 2005 19:29:52 -0000 1.20 +++ StubSequence_test.cpp 30 Dec 2005 15:31:59 -0000 1.21 @@ -46,6 +46,8 @@ #if defined (MOCKPP_USE_CXXTEST) +#elif defined(MOCKPP_USE_BOOSTTEST) + #elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( StubSequence_test ); @@ -59,8 +61,8 @@ public: - void test_describe(); - void test_invoke(); + MOCKPP_TEST_DECL void test_describe(); + MOCKPP_TEST_DECL void test_invoke(); }; @@ -70,6 +72,8 @@ MOCKPP_CXXTEST(StubSequence_test, test_describe); MOCKPP_CXXTEST(StubSequence_test, test_invoke); +#elif defined(MOCKPP_USE_BOOSTTEST) + #elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (StubSequence_test); Index: MatchBuilder_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/MatchBuilder_test.cpp,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- MatchBuilder_test.cpp 29 Dec 2005 19:29:51 -0000 1.27 +++ MatchBuilder_test.cpp 30 Dec 2005 15:31:59 -0000 1.28 @@ -55,6 +55,8 @@ #if defined (MOCKPP_USE_CXXTEST) +#elif defined(MOCKPP_USE_BOOSTTEST) + #elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( MatchBuilder_test ); @@ -68,8 +70,8 @@ public: - void test_order(); - void test_order_defered(); + MOCKPP_TEST_DECL void test_order(); + MOCKPP_TEST_DECL void test_order_defered(); }; @@ -79,6 +81,8 @@ MOCKPP_CXXTEST(MatchBuilder_test, test_order ); MOCKPP_CXXTEST(MatchBuilder_test, test_order_defered ); +#elif defined(MOCKPP_USE_BOOSTTEST) + #elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION ( MatchBuilder_test ); Index: ChainableMockObject_2_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_2_void_test.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- ChainableMockObject_2_void_test.cpp 29 Dec 2005 19:29:51 -0000 1.17 +++ ChainableMockObject_2_void_test.cpp 30 Dec 2005 15:31:58 -0000 1.18 @@ -49,6 +49,8 @@ #if defined (MOCKPP_USE_CXXTEST) +#elif defined(MOCKPP_USE_BOOSTTEST) + #elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( ChainableMockObject_2_void_test ); @@ -62,8 +64,8 @@ public: - void test_outbound(); - void test_parameter_2(); + MOCKPP_TEST_DECL void test_outbound(); + MOCKPP_TEST_DECL void test_parameter_2(); }; @@ -73,6 +75,8 @@ MOCKPP_CXXTEST(ChainableMockObject_2_void_test, test_outbound); MOCKPP_CXXTEST(ChainableMockObject_2_void_test, test_parameter_2 ); +#elif defined(MOCKPP_USE_BOOSTTEST) + #elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (ChainableMockObject_2_void_test); Index: ChainableMockObject_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_void_test.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- ChainableMockObject_void_test.cpp 29 Dec 2005 19:29:51 -0000 1.17 +++ ChainableMockObject_void_test.cpp 30 Dec 2005 15:31:58 -0000 1.18 @@ -50,6 +50,8 @@ #if defined (MOCKPP_USE_CXXTEST) +#elif defined(MOCKPP_USE_BOOSTTEST) + #elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( ChainableMockObject_void_test ); @@ -63,8 +65,8 @@ public: - void test_register(); - void test_expect_throw(); + MOCKPP_TEST_DECL void test_register(); + MOCKPP_TEST_DECL void test_expect_throw(); }; @@ -74,6 +76,8 @@ MOCKPP_CXXTEST(ChainableMockObject_void_test, test_register); MOCKPP_CXXTEST(ChainableMockObject_void_test, test_expect_throw); +#elif defined(MOCKPP_USE_BOOSTTEST) + #elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (ChainableMockObject_void_test); Index: Exception_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/Exception_test.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- Exception_test.cpp 29 Dec 2005 19:29:51 -0000 1.18 +++ Exception_test.cpp 30 Dec 2005 15:31:59 -0000 1.19 @@ -41,6 +41,8 @@ #if defined (MOCKPP_USE_CXXTEST) +#elif defined(MOCKPP_USE_BOOSTTEST) + #elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( Exception_test ); @@ -53,7 +55,7 @@ public: - void test_file_line(); + MOCKPP_TEST_DECL void test_file_line(); }; @@ -62,6 +64,8 @@ MOCKPP_CXXTEST_SUITE_REGISTRATION( Exception_test ); MOCKPP_CXXTEST(Exception_test, test_file_line); +#elif defined(MOCKPP_USE_BOOSTTEST) + #elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (Exception_test); Index: ChainingMockObjectSupport_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainingMockObjectSupport_test.cpp,v retrieving revision 1.38 retrieving revision 1.39 diff -u -d -r1.38 -r1.39 --- ChainingMockObjectSupport_test.cpp 29 Dec 2005 19:29:51 -0000 1.38 +++ ChainingMockObjectSupport_test.cpp 30 Dec 2005 15:31:58 -0000 1.39 @@ -50,6 +50,8 @@ #if defined (MOCKPP_USE_CXXTEST) +#elif defined(MOCKPP_USE_BOOSTTEST) + #elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( ChainingMockObjectSupport_test ); @@ -84,30 +86,30 @@ public: - void test_string_contains(); - void test_string_ends(); - void test_string_starts(); - void test_actor(); - void test_counts(); - void test_consecutive_typeless(); - void test_consecutive_custom(); + 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(); - void test_invoke_and(); - void test_invoke_or(); - void test_invoke_not(); + MOCKPP_TEST_DECL void test_invoke_and(); + MOCKPP_TEST_DECL void test_invoke_or(); + MOCKPP_TEST_DECL void test_invoke_not(); #ifndef MOCKPP_NO_RTTI - void test_instance(); + MOCKPP_TEST_DECL void test_instance(); #endif - void test_same_func(); - void test_less_equal_func(); - void test_less_func(); - void test_greater_equal_func(); - void test_greater_func(); - void test_equal_func(); - void test_not_equal_func(); - void test_nothing_func(); - void test_any_func(); - void test_closeto_func(); + 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(); }; @@ -138,6 +140,8 @@ MOCKPP_CXXTEST(ChainingMockObjectSupport_test, test_consecutive_typeless ); MOCKPP_CXXTEST(ChainingMockObjectSupport_test, test_consecutive_custom ); +#elif defined(MOCKPP_USE_BOOSTTEST) + #elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION ( ChainingMockObjectSupport_test ); Index: LIFOInvocationDispatcher_test.cpp =================================================================== RCS file: /cvsroot/m... [truncated message content] |
