[Mockpp-commits] mockpp/mockpp/tests AbstractDynamicChainingMock_test.cpp,1.35,1.36 AbstractInvocati
Brought to you by:
ewald-arnold
Menu
▾
▴
[Mockpp-commits] mockpp/mockpp/tests AbstractDynamicChainingMock_test.cpp,1.35,1.36 AbstractInvocationDispatcher_test.cpp,1.25,1.26 And_test.cpp,1.14,1.15 AnyArgumentsMatcher_test.cpp,1.9,1.10 ArgumentsMatchBuilder_test.cpp,1.27,1.28 ArgumentsMatcher_test.cpp,1.14,1.15 AssertMo_test.cpp,1.30,1.31 Assert_test.cpp,1.21,1.22 ChainableMockMethod_1_test.cpp,1.13,1.14 ChainableMockMethod_2_test.cpp,1.12,1.13 ChainableMockMethod_test.cpp,1.15,1.16 ChainableMockObjectPolymorphism_test.cpp,1.8,1.9 ChainableMockObject_1_test.cpp,1.15,1.16 ChainableMockObject_1_void_test.cpp,1.18,1.19 ChainableMockObject_2_test.cpp,1.14,1.15 ChainableMockObject_2_void_test.cpp,1.15,1.16 ChainableMockObject_3_test.cpp,1.13,1.14 ChainableMockObject_3_void_test.cpp,1.15,1.16 ChainableMockObject_4_test.cpp,1.14,1.15 ChainableMockObject_4_void_test.cpp,1.15,1.16 ChainableMockObject_5_test.cpp,1.15,1.16 ChainableMockObject_5_void_test.cpp,1.17,1.18 ChainableMockObject_test.cpp,1.27,1.28 ChainableMockObject_void_test.cpp,1.15,1.16 ChainingMockBuilder_test.cpp,1.23,1.24 ChainingMockObjectSupport_test.cpp,1.36,1.37 ConstraintList_test.cpp,1.5,1.6 ConstraintSet_test.cpp,1.17,1.18 CoreMock_test.cpp,1.25,1.26 CustomStub_test.cpp,1.13,1.14 DefaultResultStub_test.cpp,1.12,1.13 DynamicChainingMockError_test.cpp,1.17,1.18 Exception_test.cpp,1.15,1.16 ExpectationBoundary_test.cpp,1.15,1.16 ExpectationConglomeration_test.cpp,1.15,1.16 ExpectationCounterRange_test.cpp,1.15,1.16 ExpectationCounter_test.cpp,1.16,1.17 ExpectationList_test.cpp,1.19,1.20 ExpectationMap_test.cpp,1.19,1.20 ExpectationSegment_test.cpp,1.16,1.17 ExpectationSet_test.cpp,1.17,1.18 ExpectationValue_test.cpp,1.16,1.17 FIFOInvocationDispatcher_test.cpp,1.22,1.23 Formatter_test.cpp,1.32,1.33 InvocationMockerBuilder_test.cpp,1.32,1.33 InvocationMocker_test.cpp,1.39,1.40 Invocation_test.cpp,1.22,1.23 InvokeAtLeastMatcher_test.cpp,1.8,1.9 InvokeAtLeastOnceMatcher_test.cpp,1.11,1.12 InvokeAtMostMatcher_test.cpp,1.10,1.11 InvokeCountMatcher_test.cpp,1.12,1.13 InvokeOnceMatcher_test.cpp,1.11,1.12 InvokedAfterMatcher_test.cpp,1.11,1.12 InvokedBeforeMatcher_test.cpp,1.8,1.9 InvokedRecorder_test.cpp,1.12,1.13 IsAnything_test.cpp,1.14,1.15 IsCloseTo_test.cpp,1.11,1.12 IsEqual_test.cpp,1.10,1.11 IsGreaterOrEqual_test.cpp,1.9,1.10 IsGreaterThan_test.cpp,1.9,1.10 IsInstanceOf_test.cpp,1.17,1.18 IsLessOrEqual_test.cpp,1.9,1.10 IsLessThan_test.cpp,1.9,1.10 IsNot_test.cpp,1.15,1.16 IsNothing_test.cpp,1.12,1.13 IsSame_test.cpp,1.12,1.13 LIFOInvocationDispatcher_test.cpp,1.21,1.22 Makefile.am,1.97,1.98 MatchBuilder_test.cpp,1.24,1.25 MixedMockObject_5_test.cpp,1.9,1.10 MockObject_test.cpp,1.20,1.21 NoArgumentsMatcher_test.cpp,1.12,1.13 NoException_test.cpp,1.6,1.7 Or_test.cpp,1.13,1.14 OutBound_test.cpp,1.4,1.5 ResponseVector_test.cpp,1.8,1.9 ReturnObjectList_test.cpp,1.19,1.20 ReturnStub_test.cpp,1.13,1.14 StringContains_test.cpp,1.13,1.14 StringEndsWith_test.cpp,1.6,1.7 StringStartsWith_test.cpp,1.6,1.7 StubBuilder_test.cpp,1.18,1.19 StubSequence_test.cpp,1.18,1.19 TestFailureMatcher_test.cpp,1.11,1.12 TestFailureStub_test.cpp,1.9,1.10 ThrowStub_test.cpp,1.15,1.16 ThrowableList_test.cpp,1.18,1.19 Throwable_test.cpp,1.17,1.18 TimeServer_test.cpp,1.4,1.5 TrackingCounter_test.cpp,1.11,1.12 TypelessStubSequence_test.cpp,1.8,1.9 UnlimitedMatcher_test.cpp,1.6,1.7 Verifiable_test.cpp,1.24,1.25 VerifyingTestCaller_test.cpp,1.14,1.15 VerifyingTestCase_test.cpp,1.21,1.22 VisitableMockMethod_1_test.cpp,1.8,1.9 VisitableMockMethod_2_test.cpp,1.13,1.14 VisitableMockMethod_test.cpp,1.20,1.21 VisitableMockObject_1_test.cpp,1.25,1.26 VisitableMockObject_1_void_test.cpp,1.25,1.26 VisitableMockObject_2_test.cpp,1.24,1.25 VisitableMockObject_2_void_test.cpp,1.24,1.25 VisitableMockObject_3_test.cpp,1.23,1.24 VisitableMockObject_3_void_test.cpp,1.23,1.24 VisitableMockObject_4_test.cpp,1.23,1.24 VisitableMockObject_4_void_test.cpp,1.23,1.24 VisitableMockObject_5_test.cpp,1.32,1.33 VisitableMockObject_5_void_test.cpp,1.28,1.29 VisitableMockObject_template_test.cpp,1.12,1.13 VisitableMockObject_test.cpp,1.28,1.29 VisitableMockObject_void_test.cpp,1.21,1.22 VoidStub_test.cpp,1.13,1.14 mock_test.cpp,1.30,1.31 mockpp_pti_test.cpp,1.10,1.11 mockpp_test.cpp,1.16,1.17
Update of /cvsroot/mockpp/mockpp/mockpp/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28468/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 Makefile.am 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: select test framework Index: Or_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/Or_test.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- Or_test.cpp 11 Dec 2005 20:03:44 -0000 1.13 +++ Or_test.cpp 28 Dec 2005 09:23:31 -0000 1.14 @@ -43,9 +43,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( Or_test ); @@ -63,13 +63,13 @@ }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( Or_test ); MOCKPP_CXXTEST(Or_test, test_describe); MOCKPP_CXXTEST(Or_test, test_invoke); -#elif defined(HAVE_CPPUNIT) +#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.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- TestFailureMatcher_test.cpp 11 Dec 2005 20:03:44 -0000 1.11 +++ TestFailureMatcher_test.cpp 28 Dec 2005 09:23:31 -0000 1.12 @@ -39,9 +39,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( TestFailureMatcher_test ); @@ -57,12 +57,12 @@ }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( TestFailureMatcher_test ); MOCKPP_CXXTEST(TestFailureMatcher_test, test_invoke); -#elif defined(HAVE_CPPUNIT) +#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.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- DynamicChainingMockError_test.cpp 11 Dec 2005 20:03:44 -0000 1.17 +++ DynamicChainingMockError_test.cpp 28 Dec 2005 09:23:30 -0000 1.18 @@ -47,9 +47,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( DynamicChainingMockError_test ); @@ -65,12 +65,12 @@ }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( DynamicChainingMockError_test ); MOCKPP_CXXTEST(DynamicChainingMockError_test, test_describe); -#elif defined(HAVE_CPPUNIT) +#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.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- AbstractDynamicChainingMock_test.cpp 11 Dec 2005 20:03:44 -0000 1.35 +++ AbstractDynamicChainingMock_test.cpp 28 Dec 2005 09:23:30 -0000 1.36 @@ -59,9 +59,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( AbstractDynamicChainingMock_test ); @@ -87,7 +87,7 @@ }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION(AbstractDynamicChainingMock_test); MOCKPP_CXXTEST(AbstractDynamicChainingMock_test, test_void_invocation ); @@ -97,7 +97,7 @@ MOCKPP_CXXTEST(AbstractDynamicChainingMock_test, test_void_describe ); MOCKPP_CXXTEST(AbstractDynamicChainingMock_test, test_verify ); -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION ( AbstractDynamicChainingMock_test ); Index: IsInstanceOf_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/IsInstanceOf_test.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- IsInstanceOf_test.cpp 17 Dec 2005 18:38:48 -0000 1.17 +++ IsInstanceOf_test.cpp 28 Dec 2005 09:23:31 -0000 1.18 @@ -41,9 +41,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( IsInstanceOf_test ); @@ -61,13 +61,13 @@ }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( IsInstanceOf_test ); MOCKPP_CXXTEST(IsInstanceOf_test, test_describe); MOCKPP_CXXTEST(IsInstanceOf_test, test_invoke); -#elif defined(HAVE_CPPUNIT) +#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.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- ExpectationList_test.cpp 11 Dec 2005 20:03:44 -0000 1.19 +++ ExpectationList_test.cpp 28 Dec 2005 09:23:31 -0000 1.20 @@ -39,9 +39,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( ExpectationList_test ); @@ -94,7 +94,7 @@ void fail_ifNoActual(); }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( ExpectationList_test ); @@ -119,7 +119,7 @@ MOCKPP_CXXTEST(ExpectationList_test, fail_ifNoActual); -#elif defined(HAVE_CPPUNIT) +#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.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- IsLessThan_test.cpp 11 Dec 2005 20:03:44 -0000 1.9 +++ IsLessThan_test.cpp 28 Dec 2005 09:23:31 -0000 1.10 @@ -40,9 +40,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( IsLessThan_test ); @@ -60,13 +60,13 @@ }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( IsLessThan_test ); MOCKPP_CXXTEST(IsLessThan_test, test_describe); MOCKPP_CXXTEST(IsLessThan_test, test_invoke); -#elif defined(HAVE_CPPUNIT) +#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.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- ExpectationMap_test.cpp 11 Dec 2005 20:03:44 -0000 1.19 +++ ExpectationMap_test.cpp 28 Dec 2005 09:23:31 -0000 1.20 @@ -39,9 +39,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( ExpectationMap_test ); @@ -100,7 +100,7 @@ void fail_ifNoActual(); }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( ExpectationMap_test ); @@ -128,7 +128,7 @@ MOCKPP_CXXTEST(ExpectationMap_test, fail_ifNoActual); MOCKPP_CXXTEST(ExpectationMap_test, fail_clearActual); -#elif defined(HAVE_CPPUNIT) +#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.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- CustomStub_test.cpp 11 Dec 2005 20:03:44 -0000 1.13 +++ CustomStub_test.cpp 28 Dec 2005 09:23:30 -0000 1.14 @@ -40,9 +40,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( CustomStub_test ); @@ -58,12 +58,12 @@ }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( CustomStub_test ); MOCKPP_CXXTEST(CustomStub_test, test_invoke); -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (CustomStub_test); Index: VisitableMockObject_2_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_2_void_test.cpp,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- VisitableMockObject_2_void_test.cpp 11 Dec 2005 20:03:44 -0000 1.24 +++ VisitableMockObject_2_void_test.cpp 28 Dec 2005 09:23:31 -0000 1.25 @@ -47,9 +47,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( VisitableMockObject_2_void_test ); @@ -95,7 +95,7 @@ }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( VisitableMockObject_2_void_test ); @@ -116,7 +116,7 @@ MOCKPP_CXXTEST(VisitableMockObject_2_void_test, fail_parameter); MOCKPP_CXXTEST(VisitableMockObject_2_void_test, fail_unused_throwable); -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (VisitableMockObject_2_void_test); Index: VisitableMockObject_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_test.cpp,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- VisitableMockObject_test.cpp 11 Dec 2005 20:03:44 -0000 1.28 +++ VisitableMockObject_test.cpp 28 Dec 2005 09:23:31 -0000 1.29 @@ -41,9 +41,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( VisitableMockObject_test ); @@ -95,7 +95,7 @@ }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( VisitableMockObject_test ); @@ -119,7 +119,7 @@ MOCKPP_CXXTEST(VisitableMockObject_test, fail_unused_value); MOCKPP_CXXTEST(VisitableMockObject_test, test_stub_return_const_ref); -#elif defined(HAVE_CPPUNIT) +#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.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- Assert_test.cpp 11 Dec 2005 20:03:44 -0000 1.21 +++ Assert_test.cpp 28 Dec 2005 09:23:30 -0000 1.22 @@ -38,9 +38,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( Assert_test ); @@ -96,7 +96,7 @@ }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( Assert_test ); @@ -123,7 +123,7 @@ MOCKPP_CXXTEST(Assert_test, fail_fail); MOCKPP_CXXTEST(Assert_test, fail_failmsg); -#elif defined(HAVE_CPPUNIT) +#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.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- IsLessOrEqual_test.cpp 11 Dec 2005 20:03:44 -0000 1.9 +++ IsLessOrEqual_test.cpp 28 Dec 2005 09:23:31 -0000 1.10 @@ -40,9 +40,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( IsLessOrEqual_test ); @@ -60,13 +60,13 @@ }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( IsLessOrEqual_test ); MOCKPP_CXXTEST(IsLessOrEqual_test, test_describe); MOCKPP_CXXTEST(IsLessOrEqual_test, test_invoke); -#elif defined(HAVE_CPPUNIT) +#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.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- MixedMockObject_5_test.cpp 11 Dec 2005 20:03:44 -0000 1.9 +++ MixedMockObject_5_test.cpp 28 Dec 2005 09:23:31 -0000 1.10 @@ -54,9 +54,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( MixedMockObject_5_test ); @@ -76,14 +76,14 @@ }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( MixedMockObject_5_test ); MOCKPP_CXXTEST(MixedMockObject_5_test, test_controller); MOCKPP_CXXTEST(MixedMockObject_5_test, test_chainer); MOCKPP_CXXTEST(MixedMockObject_5_test, test_return); -#elif defined(HAVE_CPPUNIT) +#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.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- ChainableMockObject_test.cpp 11 Dec 2005 20:03:44 -0000 1.27 +++ ChainableMockObject_test.cpp 28 Dec 2005 09:23:30 -0000 1.28 @@ -47,9 +47,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( ChainableMockObject_test ); @@ -87,7 +87,7 @@ }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( ChainableMockObject_test ); MOCKPP_CXXTEST(ChainableMockObject_test, test_register); @@ -103,7 +103,7 @@ MOCKPP_CXXTEST(ChainableMockObject_test, test_stub_return); MOCKPP_CXXTEST(ChainableMockObject_test, test_stub_return_const_ref); -#elif defined(HAVE_CPPUNIT) +#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.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- Invocation_test.cpp 11 Dec 2005 20:03:44 -0000 1.22 +++ Invocation_test.cpp 28 Dec 2005 09:23:31 -0000 1.23 @@ -42,9 +42,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( Invocation_test ); @@ -82,7 +82,7 @@ }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( Invocation_test ); @@ -99,7 +99,7 @@ MOCKPP_CXXTEST(Invocation_test, test_get5); MOCKPP_CXXTEST(Invocation_test, test_invoked); -#elif defined(HAVE_CPPUNIT) +#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.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- IsGreaterThan_test.cpp 11 Dec 2005 20:03:44 -0000 1.9 +++ IsGreaterThan_test.cpp 28 Dec 2005 09:23:31 -0000 1.10 @@ -40,9 +40,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( IsGreaterThan_test ); @@ -60,13 +60,13 @@ }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( IsGreaterThan_test ); MOCKPP_CXXTEST(IsGreaterThan_test, test_describe); MOCKPP_CXXTEST(IsGreaterThan_test, test_invoke); -#elif defined(HAVE_CPPUNIT) +#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.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- NoException_test.cpp 27 Dec 2005 18:12:28 -0000 1.6 +++ NoException_test.cpp 28 Dec 2005 09:23:31 -0000 1.7 @@ -59,9 +59,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( NoException_test ); @@ -80,12 +80,12 @@ }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( NoException_test ); MOCKPP_CXXTEST(NoException_test, test_invoke); -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (NoException_test); @@ -97,12 +97,15 @@ mockpp::String bad_data3; -struct MyStruct { +struct MyStruct +{ MyStruct(int v) - : val(v){} + : val(v) + {} MyStruct() - : val(0){} + : val(0) + {} bool operator==(const MyStruct &o) const { Index: ChainableMockObject_4_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_4_void_test.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- ChainableMockObject_4_void_test.cpp 11 Dec 2005 20:03:44 -0000 1.15 +++ ChainableMockObject_4_void_test.cpp 28 Dec 2005 09:23:30 -0000 1.16 @@ -47,9 +47,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( ChainableMockObject_4_void_test ); @@ -67,13 +67,13 @@ }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( ChainableMockObject_4_void_test ); MOCKPP_CXXTEST(ChainableMockObject_4_void_test, test_outbound); MOCKPP_CXXTEST(ChainableMockObject_4_void_test, test_parameter_4 ); -#elif defined(HAVE_CPPUNIT) +#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.32 retrieving revision 1.33 diff -u -d -r1.32 -r1.33 --- InvocationMockerBuilder_test.cpp 11 Dec 2005 20:03:44 -0000 1.32 +++ InvocationMockerBuilder_test.cpp 28 Dec 2005 09:23:31 -0000 1.33 @@ -67,9 +67,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( InvocationMockerBuilder_test ); @@ -91,7 +91,7 @@ }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( InvocationMockerBuilder_test ); MOCKPP_CXXTEST(InvocationMockerBuilder_test, test_instance0 ); @@ -99,7 +99,7 @@ MOCKPP_CXXTEST(InvocationMockerBuilder_test, test_instancev0 ); MOCKPP_CXXTEST(InvocationMockerBuilder_test, test_instancev5 ); -#elif defined(HAVE_CPPUNIT) +#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.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- StringContains_test.cpp 11 Dec 2005 20:03:44 -0000 1.13 +++ StringContains_test.cpp 28 Dec 2005 09:23:31 -0000 1.14 @@ -40,9 +40,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( StringContains_test ); @@ -60,13 +60,13 @@ }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( StringContains_test ); MOCKPP_CXXTEST(StringContains_test, test_describe); MOCKPP_CXXTEST(StringContains_test, test_invoke); -#elif defined(HAVE_CPPUNIT) +#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.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- InvokeAtLeastOnceMatcher_test.cpp 11 Dec 2005 20:03:44 -0000 1.11 +++ InvokeAtLeastOnceMatcher_test.cpp 28 Dec 2005 09:23:31 -0000 1.12 @@ -38,9 +38,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( InvokeAtLeastOnceMatcher_test ); @@ -56,12 +56,12 @@ }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( InvokeAtLeastOnceMatcher_test ); MOCKPP_CXXTEST(InvokeAtLeastOnceMatcher_test, test_invoke); -#elif defined(HAVE_CPPUNIT) +#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.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- ExpectationSet_test.cpp 11 Dec 2005 20:03:44 -0000 1.17 +++ ExpectationSet_test.cpp 28 Dec 2005 09:23:31 -0000 1.18 @@ -39,9 +39,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( ExpectationSet_test ); @@ -92,7 +92,7 @@ void fail_ifNoActual(); }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( ExpectationSet_test ); @@ -116,7 +116,7 @@ MOCKPP_CXXTEST(ExpectationSet_test, fail_ifNoActual); -#elif defined(HAVE_CPPUNIT) +#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.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- ChainableMockObject_1_void_test.cpp 11 Dec 2005 20:03:44 -0000 1.18 +++ ChainableMockObject_1_void_test.cpp 28 Dec 2005 09:23:30 -0000 1.19 @@ -52,9 +52,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( ChainableMockObject_1_void_test ); @@ -73,13 +73,13 @@ -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( ChainableMockObject_1_void_test ); MOCKPP_CXXTEST(ChainableMockObject_1_void_test, test_outbound); MOCKPP_CXXTEST(ChainableMockObject_1_void_test, test_parameter_1 ); -#elif defined(HAVE_CPPUNIT) +#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.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- ChainableMockMethod_2_test.cpp 11 Dec 2005 20:03:44 -0000 1.12 +++ ChainableMockMethod_2_test.cpp 28 Dec 2005 09:23:30 -0000 1.13 @@ -56,9 +56,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( ChainableMockMethod_2_test ); @@ -76,13 +76,13 @@ }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( ChainableMockMethod_2_test ); MOCKPP_CXXTEST(ChainableMockMethod_2_test, test_parameter_2 ); MOCKPP_CXXTEST(ChainableMockMethod_2_test, test_parameter_2v ); -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (ChainableMockMethod_2_test); Index: InvokedAfterMatcher_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/InvokedAfterMatcher_test.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- InvokedAfterMatcher_test.cpp 11 Dec 2005 20:03:44 -0000 1.11 +++ InvokedAfterMatcher_test.cpp 28 Dec 2005 09:23:31 -0000 1.12 @@ -38,9 +38,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( InvokedAfterMatcher_test ); @@ -56,12 +56,12 @@ }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( InvokedAfterMatcher_test ); MOCKPP_CXXTEST(InvokedAfterMatcher_test, test_invoke); -#elif defined(HAVE_CPPUNIT) +#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.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- InvokeOnceMatcher_test.cpp 11 Dec 2005 20:03:44 -0000 1.11 +++ InvokeOnceMatcher_test.cpp 28 Dec 2005 09:23:31 -0000 1.12 @@ -38,9 +38,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( InvokeOnceMatcher_test ); @@ -56,12 +56,12 @@ }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( InvokeOnceMatcher_test ); MOCKPP_CXXTEST(InvokeOnceMatcher_test, test_invoke); -#elif defined(HAVE_CPPUNIT) +#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.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- ChainableMockObject_3_void_test.cpp 11 Dec 2005 20:03:44 -0000 1.15 +++ ChainableMockObject_3_void_test.cpp 28 Dec 2005 09:23:30 -0000 1.16 @@ -47,9 +47,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( ChainableMockObject_3_void_test ); @@ -67,13 +67,13 @@ }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( ChainableMockObject_3_void_test ); MOCKPP_CXXTEST(ChainableMockObject_3_void_test, test_outbound); MOCKPP_CXXTEST(ChainableMockObject_3_void_test, test_parameter_3 ); -#elif defined(HAVE_CPPUNIT) +#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.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- VoidStub_test.cpp 11 Dec 2005 20:03:44 -0000 1.13 +++ VoidStub_test.cpp 28 Dec 2005 09:23:31 -0000 1.14 @@ -40,9 +40,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( VoidStub_test ); @@ -60,13 +60,13 @@ }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( VoidStub_test ); MOCKPP_CXXTEST(VoidStub_test, test_describe); MOCKPP_CXXTEST(VoidStub_test, test_invoke); -#elif defined(HAVE_CPPUNIT) +#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.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- ExpectationCounter_test.cpp 11 Dec 2005 20:03:44 -0000 1.16 +++ ExpectationCounter_test.cpp 28 Dec 2005 09:23:31 -0000 1.17 @@ -40,9 +40,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( ExpectationCounter_test ); @@ -90,7 +90,7 @@ void doActualVerify(mockpp::ExpectationCounter &ec); }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( ExpectationCounter_test ); @@ -111,7 +111,7 @@ MOCKPP_CXXTEST(ExpectationCounter_test, fail_ifNoActual); -#elif defined(HAVE_CPPUNIT) +#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.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- OutBound_test.cpp 11 Dec 2005 20:03:44 -0000 1.4 +++ OutBound_test.cpp 28 Dec 2005 09:23:31 -0000 1.5 @@ -38,9 +38,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( OutBound_test ); @@ -58,13 +58,13 @@ }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( OutBound_test ); MOCKPP_CXXTEST(OutBound_test, test_describe); MOCKPP_CXXTEST(OutBound_test, test_invoke); -#elif defined(HAVE_CPPUNIT) +#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.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- ResponseVector_test.cpp 11 Dec 2005 20:03:44 -0000 1.8 +++ ResponseVector_test.cpp 28 Dec 2005 09:23:31 -0000 1.9 @@ -40,9 +40,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( ResponseVector_Test ); @@ -60,13 +60,13 @@ }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( ResponseVector_Test ); MOCKPP_CXXTEST(ResponseVector_Test, test_value); MOCKPP_CXXTEST(ResponseVector_Test, test_thrower); -#elif defined(HAVE_CPPUNIT) +#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.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- ExpectationConglomeration_test.cpp 11 Dec 2005 20:03:44 -0000 1.15 +++ ExpectationConglomeration_test.cpp 28 Dec 2005 09:23:31 -0000 1.16 @@ -39,9 +39,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( ExpectationConglomeration_test ); @@ -94,7 +94,7 @@ void fail_ifNoActual(); }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( ExpectationConglomeration_test ); @@ -119,7 +119,7 @@ MOCKPP_CXXTEST(ExpectationConglomeration_test, fail_ifNoActual); -#elif defined(HAVE_CPPUNIT) +#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.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- NoArgumentsMatcher_test.cpp 11 Dec 2005 20:03:44 -0000 1.12 +++ NoArgumentsMatcher_test.cpp 28 Dec 2005 09:23:31 -0000 1.13 @@ -42,9 +42,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE(NoArgumentsMatcher_test ); @@ -60,12 +60,12 @@ }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( NoArgumentsMatcher_test ); MOCKPP_CXXTEST(NoArgumentsMatcher_test, test_invoke); -#elif defined(HAVE_CPPUNIT) +#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.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- InvokeAtMostMatcher_test.cpp 11 Dec 2005 20:03:44 -0000 1.10 +++ InvokeAtMostMatcher_test.cpp 28 Dec 2005 09:23:31 -0000 1.11 @@ -38,9 +38,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( InvokeAtMostMatcher_test ); @@ -56,12 +56,12 @@ }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( InvokeAtMostMatcher_test ); MOCKPP_CXXTEST(InvokeAtMostMatcher_test, test_invoke); -#elif defined(HAVE_CPPUNIT) +#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.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- VisitableMockObject_4_test.cpp 11 Dec 2005 20:03:44 -0000 1.23 +++ VisitableMockObject_4_test.cpp 28 Dec 2005 09:23:31 -0000 1.24 @@ -47,9 +47,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( VisitableMockObject_4_test ); @@ -109,7 +109,7 @@ }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( VisitableMockObject_4_test ); @@ -137,7 +137,7 @@ MOCKPP_CXXTEST(VisitableMockObject_4_test, fail_unused_throwable); MOCKPP_CXXTEST(VisitableMockObject_4_test, fail_unused_value); -#elif defined(HAVE_CPPUNIT) +#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.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- VisitableMockObject_3_void_test.cpp 11 Dec 2005 20:03:44 -0000 1.23 +++ VisitableMockObject_3_void_test.cpp 28 Dec 2005 09:23:31 -0000 1.24 @@ -47,9 +47,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( VisitableMockObject_3_void_test ); @@ -95,7 +95,7 @@ }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( VisitableMockObject_3_void_test ); @@ -116,7 +116,7 @@ MOCKPP_CXXTEST(VisitableMockObject_3_void_test, fail_parameter); MOCKPP_CXXTEST(VisitableMockObject_3_void_test, fail_unused_throwable); -#elif defined(HAVE_CPPUNIT) +#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.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- StubSequence_test.cpp 11 Dec 2005 20:03:44 -0000 1.18 +++ StubSequence_test.cpp 28 Dec 2005 09:23:31 -0000 1.19 @@ -44,9 +44,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( StubSequence_test ); @@ -64,13 +64,13 @@ }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( StubSequence_test ); MOCKPP_CXXTEST(StubSequence_test, test_describe); MOCKPP_CXXTEST(StubSequence_test, test_invoke); -#elif defined(HAVE_CPPUNIT) +#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.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- MatchBuilder_test.cpp 11 Dec 2005 20:03:44 -0000 1.24 +++ MatchBuilder_test.cpp 28 Dec 2005 09:23:31 -0000 1.25 @@ -53,9 +53,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( MatchBuilder_test ); @@ -73,13 +73,13 @@ }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( MatchBuilder_test ); MOCKPP_CXXTEST(MatchBuilder_test, test_order ); MOCKPP_CXXTEST(MatchBuilder_test, test_order_defered ); -#elif defined(HAVE_CPPUNIT) +#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.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- ChainableMockObject_2_void_test.cpp 11 Dec 2005 20:03:44 -0000 1.15 +++ ChainableMockObject_2_void_test.cpp 28 Dec 2005 09:23:30 -0000 1.16 @@ -47,9 +47,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( ChainableMockObject_2_void_test ); @@ -67,13 +67,13 @@ }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( ChainableMockObject_2_void_test ); MOCKPP_CXXTEST(ChainableMockObject_2_void_test, test_outbound); MOCKPP_CXXTEST(ChainableMockObject_2_void_test, test_parameter_2 ); -#elif defined(HAVE_CPPUNIT) +#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.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- ChainableMockObject_void_test.cpp 11 Dec 2005 20:03:44 -0000 1.15 +++ ChainableMockObject_void_test.cpp 28 Dec 2005 09:23:30 -0000 1.16 @@ -48,9 +48,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( ChainableMockObject_void_test ); @@ -68,13 +68,13 @@ }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( ChainableMockObject_void_test ); MOCKPP_CXXTEST(ChainableMockObject_void_test, test_register); MOCKPP_CXXTEST(ChainableMockObject_void_test, test_expect_throw); -#elif defined(HAVE_CPPUNIT) +#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.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- Exception_test.cpp 10 Dec 2005 15:18:34 -0000 1.15 +++ Exception_test.cpp 28 Dec 2005 09:23:30 -0000 1.16 @@ -39,9 +39,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( Exception_test ); @@ -57,12 +57,12 @@ }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( Exception_test ); MOCKPP_CXXTEST(Exception_test, test_file_line); -#elif defined(HAVE_CPPUNIT) +#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.36 retrieving revision 1.37 diff -u -d -r1.36 -r1.37 --- ChainingMockObjectSupport_test.cpp 11 Dec 2005 20:03:44 -0000 1.36 +++ ChainingMockObjectSupport_test.cpp 28 Dec 2005 09:23:30 -0000 1.37 @@ -48,9 +48,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( ChainingMockObjectSupport_test ); @@ -111,7 +111,7 @@ }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( ChainingMockObjectSupport_test ); MOCKPP_CXXTEST(ChainingMockObjectSupport_test, test_closeto_func ); @@ -138,7 +138,7 @@ MOCKPP_CXXTEST(ChainingMockObjectSupport_test, test_consecutive_typeless ); MOCKPP_CXXTEST(ChainingMockObjectSupport_test, test_consecutive_custom ); -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION ( ChainingMockObjectSupport_test ); Index: LIFOInvocationDispatcher_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/LIFOInvocationDispatcher_test.cpp,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- LIFOInvocationDispatcher_test.cpp 11 Dec 2005 20:03:44 -0000 1.21 +++ LIFOInvocationDispatcher_test.cpp 28 Dec 2005 09:23:31 -0000 1.22 @@ -57,9 +57,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( LIFOInvocationDispatcher_test ); @@ -77,13 +77,13 @@ }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( LIFOInvocationDispatcher_test ); MOCKPP_CXXTEST(LIFOInvocationDispatcher_test, test_dispatch); MOCKPP_CXXTEST(LIFOInvocationDispatcher_test, test_void_dispatch); -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (LIFOInvocationDispatcher_test); Index: VisitableMockObject_template_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_template_test.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- VisitableMockObject_template_test.cpp 11 Dec 2005 20:03:44 -0000 1.12 +++ VisitableMockObject_template_test.cpp 28 Dec 2005 09:23:31 -0000 1.13 @@ -40,9 +40,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( VisitableMockObject_template_test ); @@ -75,7 +75,7 @@ }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( VisitableMockObject_template_test ); @@ -90,7 +90,7 @@ MOCKPP_CXXTEST(VisitableMockObject_template_test, test_throw_4); MOCKPP_CXXTEST(VisitableMockObject_template_test, test_throw_5); -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (VisitableMockObject_template_test); Index: VisitableMockMethod_1_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockMethod_1_test.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- VisitableMockMethod_1_test.cpp 11 Dec 2005 20:03:44 -0000 1.8 +++ VisitableMockMethod_1_test.cpp 28 Dec 2005 09:23:31 -0000 1.9 @@ -46,9 +46,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( VisitableMockMethod_1_test ); @@ -66,13 +66,13 @@ }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( VisitableMockMethod_1_test ); MOCKPP_CXXTEST(VisitableMockMethod_1_test, test_parameter_1 ); MOCKPP_CXXTEST(VisitableMockMethod_1_test, test_parameter_1v ); -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (VisitableMockMethod_1_test); Index: VisitableMockObject_4_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_4_void_test.cpp,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- VisitableMockObject_4_void_test.cpp 11 Dec 2005 20:03:44 -0000 1.23 +++ VisitableMockObject_4_void_test.cpp 28 Dec 2005 09:23:31 -0000 1.24 @@ -47,9 +47,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( VisitableMockObject_4_void_test ); @@ -95,7 +95,7 @@ }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( VisitableMockObject_4_void_test ); @@ -116,7 +116,7 @@ MOCKPP_CXXTEST(VisitableMockObject_4_void_test, fail_parameter); MOCKPP_CXXTEST(VisitableMockObject_4_void_test, fail_unused_throwable); -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (VisitableMockObject_4_void_test); Index: ReturnObjectList_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ReturnObjectList_test.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- ReturnObjectList_test.cpp 11 Dec 2005 20:03:44 -0000 1.19 +++ ReturnObjectList_test.cpp 28 Dec 2005 09:23:31 -0000 1.20 @@ -38,9 +38,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( ReturnObjectList_test ); @@ -66,7 +66,7 @@ }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( ReturnObjectList_test ); @@ -77,7 +77,7 @@ MOCKPP_CXXTEST(ReturnObjectList_test, fail_get_object); MOCKPP_CXXTEST(ReturnObjectList_test, fail_not_empty); -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (ReturnObjectList_test); Index: StringStartsWith_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/StringStartsWith_test.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- StringStartsWith_test.cpp 11 Dec 2005 20:03:44 -0000 1.6 +++ StringStartsWith_test.cpp 28 Dec 2005 09:23:31 -0000 1.7 @@ -40,9 +40,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( StringStartsWith_test ); @@ -60,13 +60,13 @@ }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( StringStartsWith_test ); MOCKPP_CXXTEST(StringStartsWith_test, test_describe); MOCKPP_CXXTEST(StringStartsWith_test, test_invoke); -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (StringStartsWith_test); Index: VisitableMockObject_3_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_3_test.cpp,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- VisitableMockObject_3_test.cpp 11 Dec 2005 20:03:44 -0000 1.23 +++ VisitableMockObject_3_test.cpp 28 Dec 2005 09:23:31 -0000 1.24 @@ -47,9 +47,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( VisitableMockObject_3_test ); @@ -109,7 +109,7 @@ }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( VisitableMockObject_3_test ); @@ -137,7 +137,7 @@ MOCKPP_CXXTEST(VisitableMockObject_3_test, fail_unused_throwable); MOCKPP_CXXTEST(VisitableMockObject_3_test, fail_unused_value); -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (VisitableMockObject_3_test); Index: ChainableMockObjectPolymorphism_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObjectPolymorphism_test.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- ChainableMockObjectPolymorphism_test.cpp 11 Dec 2005 20:03:44 -0000 1.8 +++ ChainableMockObjectPolymorphism_test.cpp 28 Dec 2005 09:23:30 -0000 1.9 @@ -48,9 +48,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( MockVisitorPolymorphism_test ); @@ -68,13 +68,13 @@ }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( MockVisitorPolymorphism_test ); MOCKPP_CXXTEST(MockVisitorPolymorphism_test, test_visitor_retrieves_parameter); MOCKPP_CXXTEST(MockVisitorPolymorphism_test, test_visitor_retrieves_mock_parameter); -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (MockVisitorPolymorphism_test); Index: IsGreaterOrEqual_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/IsGreaterOrEqual_test.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- IsGreaterOrEqual_test.cpp 11 Dec 2005 20:03:44 -0000 1.9 +++ IsGreaterOrEqual_test.cpp 28 Dec 2005 09:23:31 -0000 1.10 @@ -40,9 +40,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( IsGreaterOrEqual_test ); @@ -60,13 +60,13 @@ }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( IsGreaterOrEqual_test ); MOCKPP_CXXTEST(IsGreaterOrEqual_test, test_describe); MOCKPP_CXXTEST(IsGreaterOrEqual_test, test_invoke); -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (IsGreaterOrEqual_test); Index: mockpp_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/mockpp_test.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- mockpp_test.cpp 9 Dec 2005 18:56:21 -0000 1.16 +++ mockpp_test.cpp 28 Dec 2005 09:23:31 -0000 1.17 @@ -39,9 +39,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( mockpp_test ); @@ -62,9 +62,9 @@ }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (mockpp_test); Index: Throwable_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/Throwable_test.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- Throwable_test.cpp 11 Dec 2005 20:03:44 -0000 1.17 +++ Throwable_test.cpp 28 Dec 2005 09:23:31 -0000 1.18 @@ -40,9 +40,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( Throwable_test ); @@ -66,7 +66,7 @@ }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( Throwable_test ); @@ -76,7 +76,7 @@ MOCKPP_CXXTEST(Throwable_test, test_clear); MOCKPP_CXXTEST(Throwable_test, test_copy); -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (Throwable_test); Index: ChainableMockObject_2_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_2_test.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- ChainableMockObject_2_test.cpp 11 Dec 2005 20:03:44 -0000 1.14 +++ ChainableMockObject_2_test.cpp 28 Dec 2005 09:23:30 -0000 1.15 @@ -45,9 +45,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( ChainableMockObject_2_test ); @@ -65,13 +65,13 @@ }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( ChainableMockObject_2_test ); MOCKPP_CXXTEST(ChainableMockObject_2_test, test_outbound); MOCKPP_CXXTEST(ChainableMockObject_2_test, test_parameter_2 ); -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (ChainableMockObject_2_test); Index: UnlimitedMatcher_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/UnlimitedMatcher_test.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- UnlimitedMatcher_test.cpp 11 Dec 2005 20:03:44 -0000 1.6 +++ UnlimitedMatcher_test.cpp 28 Dec 2005 09:23:31 -0000 1.7 @@ -37,9 +37,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( UnlimitedMatcher_test ); CPPUNIT_TEST(test_invoke); @@ -53,12 +53,12 @@ }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( UnlimitedMatcher_test ); MOCKPP_CXXTEST(UnlimitedMatcher_test, test_invoke); -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION(UnlimitedMatcher_test); Index: CoreMock_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/CoreMock_test.cpp,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- CoreMock_test.cpp 11 Dec 2005 20:03:44 -0000 1.25 +++ CoreMock_test.cpp 28 Dec 2005 09:23:30 -0000 1.26 @@ -58,9 +58,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( CoreMock_test ); @@ -78,13 +78,13 @@ }; -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( CoreMock_test ); MOCKPP_CXXTEST(CoreMock_test, test_void_invocation ); MOCKPP_CXXTEST(CoreMock_test, test_invocation ); -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION ( CoreMock_test ); Index: ChainableMockObject_4_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_4_test.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- ChainableMockObject_4_test.cpp 11 Dec 2005 20:03:44 -0000 1.14 +++ ChainableMockObject_4_test.cpp 28 Dec 2005 09:23:30 -0000 1.15 @@ -46,9 +46,9 @@ { public: -#if defined (HAVE_CXXTEST) +#if defined (MOCKPP_USE_CXXTEST) -#elif defined(HAVE_CPPUNIT) +#elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE( ChainableMo... [truncated message content] |
