[Mockpp-commits] mockpp/mockpp/tests AbstractDynamicChainingMock_test.cpp,1.34,1.35 AbstractInvocati
Brought to you by:
ewald-arnold
Menu
▾
▴
[Mockpp-commits] mockpp/mockpp/tests AbstractDynamicChainingMock_test.cpp,1.34,1.35 AbstractInvocationDispatcher_test.cpp,1.24,1.25 AnyArgumentsMatcher_test.cpp,1.8,1.9 ArgumentsMatchBuilder_test.cpp,1.26,1.27 ArgumentsMatcher_test.cpp,1.13,1.14 AssertMo_test.cpp,1.28,1.29 Assert_test.cpp,1.20,1.21 ChainableMockMethod_1_test.cpp,1.12,1.13 ChainableMockMethod_2_test.cpp,1.11,1.12 ChainableMockMethod_test.cpp,1.14,1.15 ChainableMockObjectPolymorphism_test.cpp,1.7,1.8 ChainableMockObject_1_test.cpp,1.14,1.15 ChainableMockObject_1_void_test.cpp,1.17,1.18 ChainableMockObject_2_test.cpp,1.13,1.14 ChainableMockObject_2_void_test.cpp,1.14,1.15 ChainableMockObject_3_test.cpp,1.12,1.13 ChainableMockObject_3_void_test.cpp,1.14,1.15 ChainableMockObject_4_test.cpp,1.13,1.14 ChainableMockObject_4_void_test.cpp,1.14,1.15 ChainableMockObject_5_test.cpp,1.14,1.15 ChainableMockObject_5_void_test.cpp,1.16,1.17 ChainableMockObject_test.cpp,1.26,1.27 ChainableMockObject_void_test.cpp,1.14,1.15 ChainingMockBuilder_test.cpp,1.22,1.23 ChainingMockObjectSupport_test.cpp,1.35,1.36 ConstraintList_test.cpp,1.4,1.5 ConstraintSet_test.cpp,1.16,1.17 CoreMock_test.cpp,1.24,1.25 CustomStub_test.cpp,1.12,1.13 DefaultResultStub_test.cpp,1.11,1.12 DynamicChainingMockError_test.cpp,1.16,1.17 ExpectationBoundary_test.cpp,1.14,1.15 ExpectationConglomeration_test.cpp,1.14,1.15 ExpectationCounterRange_test.cpp,1.14,1.15 ExpectationCounter_test.cpp,1.15,1.16 ExpectationList_test.cpp,1.18,1.19 ExpectationMap_test.cpp,1.18,1.19 ExpectationSegment_test.cpp,1.15,1.16 ExpectationSet_test.cpp,1.16,1.17 ExpectationValue_test.cpp,1.15,1.16 FIFOInvocationDispatcher_test.cpp,1.21,1.22 Formatter_test.cpp,1.31,1.32 IncCounter.h,1.2,1.3 InvocationMockerBuilder_test.cpp,1.31,1.32 InvocationMocker_test.cpp,1.38,1.39 Invocation_test.cpp,1.21,1.22 InvokeAtLeastMatcher_test.cpp,1.7,1.8 InvokeAtLeastOnceMatcher_test.cpp,1.10,1.11 InvokeAtMostMatcher_test.cpp,1.9,1.10 InvokeCountMatcher_test.cpp,1.11,1.12 InvokeOnceMatcher_test.cpp,1.10,1.11 InvokedAfterMatcher_test.cpp,1.10,1.11 InvokedBeforeMatcher_test.cpp,1.7,1.8 InvokedRecorder_test.cpp,1.11,1.12 IsAnything_test.cpp,1.13,1.14 IsCloseTo_test.cpp,1.10,1.11 IsEqual_test.cpp,1.9,1.10 IsGreaterOrEqual_test.cpp,1.8,1.9 IsGreaterThan_test.cpp,1.8,1.9 IsInstanceOf_test.cpp,1.15,1.16 IsLessOrEqual_test.cpp,1.8,1.9 IsLessThan_test.cpp,1.8,1.9 IsNot_test.cpp,1.14,1.15 IsNothing_test.cpp,1.11,1.12 IsSame_test.cpp,1.11,1.12 LIFOInvocationDispatcher_test.cpp,1.20,1.21 Makefile.am,1.93,1.94 MatchBuilder_test.cpp,1.23,1.24 MixedMockObject_5_test.cpp,1.8,1.9 MockObject_test.cpp,1.19,1.20 NoArgumentsMatcher_test.cpp,1.11,1.12 NoException_test.cpp,1.2,1.3 Or_test.cpp,1.12,1.13 OutBound_test.cpp,1.3,1.4 ResponseVector_test.cpp,1.7,1.8 ReturnObjectList_test.cpp,1.18,1.19 ReturnStub_test.cpp,1.12,1.13 StringContains_test.cpp,1.12,1.13 StringEndsWith_test.cpp,1.5,1.6 StringStartsWith_test.cpp,1.5,1.6 StubBuilder_test.cpp,1.17,1.18 StubSequence_test.cpp,1.17,1.18 TestFailureMatcher_test.cpp,1.10,1.11 TestFailureStub_test.cpp,1.8,1.9 ThrowStub_test.cpp,1.14,1.15 ThrowableList_test.cpp,1.17,1.18 Throwable_test.cpp,1.16,1.17 TimeServer_test.cpp,1.3,1.4 TrackingCounter_test.cpp,1.10,1.11 TypelessStubSequence_test.cpp,1.7,1.8 UnlimitedMatcher_test.cpp,1.5,1.6 Verifiable_test.cpp,1.23,1.24 VerifyingTestCaller_test.cpp,1.12,1.13 VerifyingTestCase_test.cpp,1.19,1.20 VisitableMockMethod_1_test.cpp,1.7,1.8 VisitableMockMethod_2_test.cpp,1.12,1.13 VisitableMockMethod_test.cpp,1.19,1.20 VisitableMockObject_1_test.cpp,1.24,1.25 VisitableMockObject_1_void_test.cpp,1.24,1.25 VisitableMockObject_2_test.cpp,1.23,1.24 VisitableMockObject_2_void_test.cpp,1.23,1.24 VisitableMockObject_3_test.cpp,1.22,1.23 VisitableMockObject_3_void_test.cpp,1.22,1.23 VisitableMockObject_4_test.cpp,1.22,1.23 VisitableMockObject_4_void_test.cpp,1.22,1.23 VisitableMockObject_5_test.cpp,1.31,1.32 VisitableMockObject_5_void_test.cpp,1.27,1.28 VisitableMockObject_template_test.cpp,1.11,1.12 VisitableMockObject_test.cpp,1.27,1.28 VisitableMockObject_void_test.cpp,1.20,1.21 VoidStub_test.cpp,1.12,1.13 mock_test.cpp,1.27,1.28 mock_test_qt.cpp,1.7,1.8 mockpp_pti_test.cpp,1.9,1.10
Update of /cvsroot/mockpp/mockpp/mockpp/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv926/mockpp/tests Modified Files: AbstractDynamicChainingMock_test.cpp AbstractInvocationDispatcher_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 ExpectationBoundary_test.cpp ExpectationConglomeration_test.cpp ExpectationCounterRange_test.cpp ExpectationCounter_test.cpp ExpectationList_test.cpp ExpectationMap_test.cpp ExpectationSegment_test.cpp ExpectationSet_test.cpp ExpectationValue_test.cpp FIFOInvocationDispatcher_test.cpp Formatter_test.cpp IncCounter.h InvocationMockerBuilder_test.cpp InvocationMocker_test.cpp Invocation_test.cpp InvokeAtLeastMatcher_test.cpp InvokeAtLeastOnceMatcher_test.cpp InvokeAtMostMatcher_test.cpp InvokeCountMatcher_test.cpp InvokeOnceMatcher_test.cpp InvokedAfterMatcher_test.cpp InvokedBeforeMatcher_test.cpp InvokedRecorder_test.cpp IsAnything_test.cpp IsCloseTo_test.cpp IsEqual_test.cpp IsGreaterOrEqual_test.cpp IsGreaterThan_test.cpp IsInstanceOf_test.cpp IsLessOrEqual_test.cpp IsLessThan_test.cpp IsNot_test.cpp IsNothing_test.cpp IsSame_test.cpp LIFOInvocationDispatcher_test.cpp 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 mock_test_qt.cpp mockpp_pti_test.cpp Log Message: migrate to cxxtest Index: Or_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/Or_test.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- Or_test.cpp 9 Dec 2005 18:56:20 -0000 1.12 +++ Or_test.cpp 11 Dec 2005 20:03:44 -0000 1.13 @@ -65,6 +65,10 @@ #if defined (HAVE_CXXTEST) +MOCKPP_CXXTEST_SUITE_REGISTRATION( Or_test ); +MOCKPP_CXXTEST(Or_test, test_describe); +MOCKPP_CXXTEST(Or_test, test_invoke); + #elif defined(HAVE_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.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- TestFailureMatcher_test.cpp 9 Dec 2005 18:56:20 -0000 1.10 +++ TestFailureMatcher_test.cpp 11 Dec 2005 20:03:44 -0000 1.11 @@ -59,6 +59,9 @@ #if defined (HAVE_CXXTEST) +MOCKPP_CXXTEST_SUITE_REGISTRATION( TestFailureMatcher_test ); +MOCKPP_CXXTEST(TestFailureMatcher_test, test_invoke); + #elif defined(HAVE_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.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- DynamicChainingMockError_test.cpp 9 Dec 2005 18:56:20 -0000 1.16 +++ DynamicChainingMockError_test.cpp 11 Dec 2005 20:03:44 -0000 1.17 @@ -67,6 +67,9 @@ #if defined (HAVE_CXXTEST) +MOCKPP_CXXTEST_SUITE_REGISTRATION( DynamicChainingMockError_test ); +MOCKPP_CXXTEST(DynamicChainingMockError_test, test_describe); + #elif defined(HAVE_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.34 retrieving revision 1.35 diff -u -d -r1.34 -r1.35 --- AbstractDynamicChainingMock_test.cpp 9 Dec 2005 18:56:20 -0000 1.34 +++ AbstractDynamicChainingMock_test.cpp 11 Dec 2005 20:03:44 -0000 1.35 @@ -65,14 +65,14 @@ CPPUNIT_TEST_SUITE( AbstractDynamicChainingMock_test ); - CPPUNIT_TEST( test_void_invocation ); - CPPUNIT_TEST( test_invocation ); - CPPUNIT_TEST( test_describer ); - CPPUNIT_TEST( test_describe ); - CPPUNIT_TEST( test_void_describe ); - CPPUNIT_TEST( test_verify ); + CPPUNIT_TEST( test_void_invocation ); + CPPUNIT_TEST( test_invocation ); + CPPUNIT_TEST( test_describer ); + CPPUNIT_TEST( test_describe ); + CPPUNIT_TEST( test_void_describe ); + CPPUNIT_TEST( test_verify ); - CPPUNIT_TEST_SUITE_END(); +CPPUNIT_TEST_SUITE_END(); #endif @@ -89,6 +89,14 @@ #if defined (HAVE_CXXTEST) +MOCKPP_CXXTEST_SUITE_REGISTRATION(AbstractDynamicChainingMock_test); +MOCKPP_CXXTEST(AbstractDynamicChainingMock_test, test_void_invocation ); +MOCKPP_CXXTEST(AbstractDynamicChainingMock_test, test_invocation ); +MOCKPP_CXXTEST(AbstractDynamicChainingMock_test, test_describer ); +MOCKPP_CXXTEST(AbstractDynamicChainingMock_test, test_describe ); +MOCKPP_CXXTEST(AbstractDynamicChainingMock_test, test_void_describe ); +MOCKPP_CXXTEST(AbstractDynamicChainingMock_test, test_verify ); + #elif defined(HAVE_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.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- IsInstanceOf_test.cpp 9 Dec 2005 18:56:20 -0000 1.15 +++ IsInstanceOf_test.cpp 11 Dec 2005 20:03:44 -0000 1.16 @@ -66,6 +66,10 @@ #if defined (HAVE_CXXTEST) +MOCKPP_CXXTEST_SUITE_REGISTRATION( IsInstanceOf_test ); +MOCKPP_CXXTEST(IsInstanceOf_test, test_describe); +MOCKPP_CXXTEST(IsInstanceOf_test, test_invoke); + #elif defined(HAVE_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.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- ExpectationList_test.cpp 9 Dec 2005 18:56:20 -0000 1.18 +++ ExpectationList_test.cpp 11 Dec 2005 20:03:44 -0000 1.19 @@ -58,13 +58,13 @@ CPPUNIT_TEST(test_expectActualVerify); CPPUNIT_TEST(test_ifNoExpected); - CPPUNIT_TEST_EXCEPTION(fail_clearActual, mockpp::AssertionFailedError); - CPPUNIT_TEST_EXCEPTION(fail_expectActualImmediate, mockpp::AssertionFailedError); - CPPUNIT_TEST_EXCEPTION(fail_expectActualVerify, mockpp::AssertionFailedError); - CPPUNIT_TEST_EXCEPTION(fail_expectNothing, mockpp::AssertionFailedError); - CPPUNIT_TEST_EXCEPTION(fail_many, mockpp::AssertionFailedError); + CPPUNIT_TEST(fail_clearActual); + CPPUNIT_TEST(fail_expectActualImmediate); + CPPUNIT_TEST(fail_expectActualVerify); + CPPUNIT_TEST(fail_expectNothing); + CPPUNIT_TEST(fail_many); - CPPUNIT_TEST_EXCEPTION(fail_ifNoActual, mockpp::AssertionFailedError); + CPPUNIT_TEST(fail_ifNoActual); CPPUNIT_TEST_SUITE_END(); @@ -96,6 +96,29 @@ #if defined (HAVE_CXXTEST) +MOCKPP_CXXTEST_SUITE_REGISTRATION( ExpectationList_test ); + +MOCKPP_CXXTEST(ExpectationList_test, test_chain); +MOCKPP_CXXTEST(ExpectationList_test, test_hasExpectations); +MOCKPP_CXXTEST(ExpectationList_test, test_name); +MOCKPP_CXXTEST(ExpectationList_test, test_many); +MOCKPP_CXXTEST(ExpectationList_test, test_balance); +MOCKPP_CXXTEST(ExpectationList_test, test_clear); + +MOCKPP_CXXTEST(ExpectationList_test, test_expectNothing); +MOCKPP_CXXTEST(ExpectationList_test, test_expectNothing_revoked); +MOCKPP_CXXTEST(ExpectationList_test, test_expectActualImmediate); +MOCKPP_CXXTEST(ExpectationList_test, test_expectActualVerify); +MOCKPP_CXXTEST(ExpectationList_test, test_ifNoExpected); + +MOCKPP_CXXTEST(ExpectationList_test, fail_clearActual); +MOCKPP_CXXTEST(ExpectationList_test, fail_expectActualImmediate); +MOCKPP_CXXTEST(ExpectationList_test, fail_expectActualVerify); +MOCKPP_CXXTEST(ExpectationList_test, fail_expectNothing); +MOCKPP_CXXTEST(ExpectationList_test, fail_many); + +MOCKPP_CXXTEST(ExpectationList_test, fail_ifNoActual); + #elif defined(HAVE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (ExpectationList_test); @@ -160,7 +183,18 @@ ec.addExpected(3); ec.addActual(3); ec.clearActual(); - ec.verify(); + bool thrown = false; + MOCKPP_TRY + { + ec.verify(); + } +#ifndef MOCKPP_NO_EXCEPTIONS + catch(mockpp::AssertionFailedError &) + { + thrown = true; + } +#endif + MOCKPP_ASSERT_TRUE(thrown == true); } @@ -175,7 +209,18 @@ { mockpp::ExpectationList<int> ec (MOCKPP_PCHAR("nothingList"), 0); ec.addExpected(3); - ec.verify(); // fails because no value + bool thrown = false; + MOCKPP_TRY + { + ec.verify(); // fails because no value + } +#ifndef MOCKPP_NO_EXCEPTIONS + catch(mockpp::AssertionFailedError &) + { + thrown = true; + } +#endif + MOCKPP_ASSERT_TRUE(thrown == true); } @@ -208,7 +253,18 @@ { mockpp::ExpectationList<int> ec (MOCKPP_PCHAR("nothingList"), 0); doNothing(ec); - ec.addActual(3); // fails even if equal + bool thrown = false; + MOCKPP_TRY + { + ec.addActual(3); // fails even if equal + } +#ifndef MOCKPP_NO_EXCEPTIONS + catch(mockpp::AssertionFailedError &) + { + thrown = true; + } +#endif + MOCKPP_ASSERT_TRUE(thrown == true); } @@ -251,7 +307,18 @@ int prep[10] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 }; ec.addExpected(prep+0, prep+10); - ec.addActual(prep+2, prep+10); + bool thrown = false; + MOCKPP_TRY + { + ec.addActual(prep+2, prep+10); + } +#ifndef MOCKPP_NO_EXCEPTIONS + catch(mockpp::AssertionFailedError &) + { + thrown = true; + } +#endif + MOCKPP_ASSERT_TRUE(thrown == true); } @@ -259,7 +326,18 @@ { mockpp::ExpectationList<int> ec (MOCKPP_PCHAR("actualList"), 0); doActualImmediate(ec); - ec.addActual(4321); // fails + bool thrown = false; + MOCKPP_TRY + { + ec.addActual(4321); // fails + } +#ifndef MOCKPP_NO_EXCEPTIONS + catch(mockpp::AssertionFailedError &) + { + thrown = true; + } +#endif + MOCKPP_ASSERT_TRUE(thrown == true); } @@ -282,7 +360,18 @@ { mockpp::ExpectationList<int> ec (MOCKPP_PCHAR("verifyList"), 0); doActualVerify(ec); // no fail - ec.verify(); // fails + bool thrown = false; + MOCKPP_TRY + { + ec.verify(); // fails + } +#ifndef MOCKPP_NO_EXCEPTIONS + catch(mockpp::AssertionFailedError &) + { + thrown = true; + } +#endif + MOCKPP_ASSERT_TRUE(thrown == true); } Index: IsLessThan_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/IsLessThan_test.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- IsLessThan_test.cpp 9 Dec 2005 18:56:20 -0000 1.8 +++ IsLessThan_test.cpp 11 Dec 2005 20:03:44 -0000 1.9 @@ -62,6 +62,10 @@ #if defined (HAVE_CXXTEST) +MOCKPP_CXXTEST_SUITE_REGISTRATION( IsLessThan_test ); +MOCKPP_CXXTEST(IsLessThan_test, test_describe); +MOCKPP_CXXTEST(IsLessThan_test, test_invoke); + #elif defined(HAVE_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.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- ExpectationMap_test.cpp 9 Dec 2005 18:56:20 -0000 1.18 +++ ExpectationMap_test.cpp 11 Dec 2005 20:03:44 -0000 1.19 @@ -61,13 +61,13 @@ CPPUNIT_TEST(test_expectActualVerify); CPPUNIT_TEST(test_ifNoExpected); - CPPUNIT_TEST_EXCEPTION(fail_expectActualImmediate, mockpp::AssertionFailedError); - CPPUNIT_TEST_EXCEPTION(fail_expectActualVerify, mockpp::AssertionFailedError); - CPPUNIT_TEST_EXCEPTION(fail_expectNothing, mockpp::AssertionFailedError); - CPPUNIT_TEST_EXCEPTION(fail_many, mockpp::AssertionFailedError); + CPPUNIT_TEST(fail_expectActualImmediate); + CPPUNIT_TEST(fail_expectActualVerify); + CPPUNIT_TEST(fail_expectNothing); + CPPUNIT_TEST(fail_many); - CPPUNIT_TEST_EXCEPTION(fail_ifNoActual, mockpp::AssertionFailedError); - CPPUNIT_TEST_EXCEPTION(fail_clearActual, mockpp::AssertionFailedError); + CPPUNIT_TEST(fail_ifNoActual); + CPPUNIT_TEST(fail_clearActual); CPPUNIT_TEST_SUITE_END(); @@ -102,6 +102,32 @@ #if defined (HAVE_CXXTEST) +MOCKPP_CXXTEST_SUITE_REGISTRATION( ExpectationMap_test ); + +MOCKPP_CXXTEST(ExpectationMap_test, test_chain); +MOCKPP_CXXTEST(ExpectationMap_test, test_hasExpectations); +MOCKPP_CXXTEST(ExpectationMap_test, test_name); +MOCKPP_CXXTEST(ExpectationMap_test, test_clear); +MOCKPP_CXXTEST(ExpectationMap_test, test_many); +MOCKPP_CXXTEST(ExpectationMap_test, test_get); +MOCKPP_CXXTEST(ExpectationMap_test, test_missing); +MOCKPP_CXXTEST(ExpectationMap_test, test_pair_get); +MOCKPP_CXXTEST(ExpectationMap_test, test_pair_getmany); + +MOCKPP_CXXTEST(ExpectationMap_test, test_expectNothing); +MOCKPP_CXXTEST(ExpectationMap_test, test_expectNothing_revoked); +MOCKPP_CXXTEST(ExpectationMap_test, test_expectActualImmediate); +MOCKPP_CXXTEST(ExpectationMap_test, test_expectActualVerify); +MOCKPP_CXXTEST(ExpectationMap_test, test_ifNoExpected); + +MOCKPP_CXXTEST(ExpectationMap_test, fail_expectActualImmediate); +MOCKPP_CXXTEST(ExpectationMap_test, fail_expectActualVerify); +MOCKPP_CXXTEST(ExpectationMap_test, fail_expectNothing); +MOCKPP_CXXTEST(ExpectationMap_test, fail_many); + +MOCKPP_CXXTEST(ExpectationMap_test, fail_ifNoActual); +MOCKPP_CXXTEST(ExpectationMap_test, fail_clearActual); + #elif defined(HAVE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (ExpectationMap_test); @@ -173,7 +199,18 @@ mockpp::ExpectationMap<int, MOCKPP_STL::string> ec (MOCKPP_PCHAR("testMap"), 0); ec.addExpected(3, "three"); ec.clearActual(); - ec.verify(); + bool thrown = false; + MOCKPP_TRY + { + ec.verify(); + } +#ifndef MOCKPP_NO_EXCEPTIONS + catch(mockpp::AssertionFailedError &) + { + thrown = true; + } +#endif + MOCKPP_ASSERT_TRUE(thrown == true); } @@ -188,7 +225,18 @@ { mockpp::ExpectationMap<int, MOCKPP_STL::string> ec (MOCKPP_PCHAR("nothingMap"), 0); ec.addExpected(3, "three"); - ec.verify(); // fails because no value + bool thrown = false; + MOCKPP_TRY + { + ec.verify(); // fails because no value + } +#ifndef MOCKPP_NO_EXCEPTIONS + catch(mockpp::AssertionFailedError &) + { + thrown = true; + } +#endif + MOCKPP_ASSERT_TRUE(thrown == true); } @@ -221,7 +269,18 @@ { mockpp::ExpectationMap<int, MOCKPP_STL::string> ec (MOCKPP_PCHAR("nothingMap"), 0); doNothing(ec); - ec.addActual(3); // fails even if equal + bool thrown = false; + MOCKPP_TRY + { + ec.addActual(3); // fails even if equal + } +#ifndef MOCKPP_NO_EXCEPTIONS + catch(mockpp::AssertionFailedError &) + { + thrown = true; + } +#endif + MOCKPP_ASSERT_TRUE(thrown == true); } @@ -291,7 +350,18 @@ ec.addExpected(MOCKPP_STL::pair<int, MOCKPP_STL::string>(2, "four")); ec.addExpected(MOCKPP_STL::pair<int, MOCKPP_STL::string>(1, "five")); - ec.addActual(10); + bool thrown = false; + MOCKPP_TRY + { + ec.addActual(10); + } +#ifndef MOCKPP_NO_EXCEPTIONS + catch(mockpp::AssertionFailedError &) + { + thrown = true; + } +#endif + MOCKPP_ASSERT_TRUE(thrown == true); } @@ -321,7 +391,18 @@ { mockpp::ExpectationMap<int, MOCKPP_STL::string> ec (MOCKPP_PCHAR("actualMap"), 0); doActualImmediate(ec); - ec.addActual(1111); // fails + bool thrown = false; + MOCKPP_TRY + { + ec.addActual(1111); // fails + } +#ifndef MOCKPP_NO_EXCEPTIONS + catch(mockpp::AssertionFailedError &) + { + thrown = true; + } +#endif + MOCKPP_ASSERT_TRUE(thrown == true); } @@ -360,7 +441,18 @@ { mockpp::ExpectationMap<int, MOCKPP_STL::string> ec (MOCKPP_PCHAR("verifyMap"), 0); doActualVerify(ec); // no fail - ec.verify(); // fails + bool thrown = false; + MOCKPP_TRY + { + ec.verify(); // fails + } +#ifndef MOCKPP_NO_EXCEPTIONS + catch(mockpp::AssertionFailedError &) + { + thrown = true; + } +#endif + MOCKPP_ASSERT_TRUE(thrown == true); } Index: CustomStub_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/CustomStub_test.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- CustomStub_test.cpp 9 Dec 2005 18:56:20 -0000 1.12 +++ CustomStub_test.cpp 11 Dec 2005 20:03:44 -0000 1.13 @@ -60,6 +60,9 @@ #if defined (HAVE_CXXTEST) +MOCKPP_CXXTEST_SUITE_REGISTRATION( CustomStub_test ); +MOCKPP_CXXTEST(CustomStub_test, test_invoke); + #elif defined(HAVE_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.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- VisitableMockObject_2_void_test.cpp 10 Dec 2005 20:07:22 -0000 1.23 +++ VisitableMockObject_2_void_test.cpp 11 Dec 2005 20:03:44 -0000 1.24 @@ -63,12 +63,12 @@ CPPUNIT_TEST(test_constraint); CPPUNIT_TEST(test_controller_constraint); - CPPUNIT_TEST_EXCEPTION(fail_add_throw_after_active, mockpp::AssertionFailedError); - CPPUNIT_TEST_EXCEPTION(fail_add_throw_val_after_active, mockpp::AssertionFailedError); - CPPUNIT_TEST_EXCEPTION(fail_set_throw_after_active, mockpp::AssertionFailedError); - CPPUNIT_TEST_EXCEPTION(fail_add_method_after_active, mockpp::AssertionFailedError); - CPPUNIT_TEST_EXCEPTION(fail_parameter, mockpp::AssertionFailedError); - CPPUNIT_TEST_EXCEPTION(fail_unused_throwable, mockpp::AssertionFailedError); + CPPUNIT_TEST(fail_add_throw_after_active); + CPPUNIT_TEST(fail_add_throw_val_after_active); + CPPUNIT_TEST(fail_set_throw_after_active); + CPPUNIT_TEST(fail_add_method_after_active); + CPPUNIT_TEST(fail_parameter); + CPPUNIT_TEST(fail_unused_throwable); CPPUNIT_TEST_SUITE_END(); @@ -97,6 +97,25 @@ #if defined (HAVE_CXXTEST) +MOCKPP_CXXTEST_SUITE_REGISTRATION( VisitableMockObject_2_void_test ); + +MOCKPP_CXXTEST(VisitableMockObject_2_void_test, test_outbound); +MOCKPP_CXXTEST(VisitableMockObject_2_void_test, test_controller); +MOCKPP_CXXTEST(VisitableMockObject_2_void_test, test_parameter); +MOCKPP_CXXTEST(VisitableMockObject_2_void_test, test_parameter_ex); +MOCKPP_CXXTEST(VisitableMockObject_2_void_test, test_thrower); +MOCKPP_CXXTEST(VisitableMockObject_2_void_test, test_clear); +MOCKPP_CXXTEST(VisitableMockObject_2_void_test, test_default_throw); +MOCKPP_CXXTEST(VisitableMockObject_2_void_test, test_constraint); +MOCKPP_CXXTEST(VisitableMockObject_2_void_test, test_controller_constraint); + +MOCKPP_CXXTEST(VisitableMockObject_2_void_test, fail_add_throw_after_active); +MOCKPP_CXXTEST(VisitableMockObject_2_void_test, fail_add_throw_val_after_active); +MOCKPP_CXXTEST(VisitableMockObject_2_void_test, fail_set_throw_after_active); +MOCKPP_CXXTEST(VisitableMockObject_2_void_test, fail_add_method_after_active); +MOCKPP_CXXTEST(VisitableMockObject_2_void_test, fail_parameter); +MOCKPP_CXXTEST(VisitableMockObject_2_void_test, fail_unused_throwable); + #elif defined(HAVE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (VisitableMockObject_2_void_test); @@ -215,7 +234,18 @@ mvo.visitable(1, 2); mvo.activate(); mvo.visitable(1, 2); - mvo.visitable(1, 2); + bool thrown = false; + MOCKPP_TRY + { + mvo.visitable(1, 2); + } +#ifndef MOCKPP_NO_EXCEPTIONS + catch(mockpp::AssertionFailedError &) + { + thrown = true; + } +#endif + MOCKPP_ASSERT_TRUE(thrown == true); } @@ -224,7 +254,18 @@ MyVisitableMockObject_2_void mvo(MOCKPP_PCHAR("mvo")); MOCKPP_CONTROLLER_FOR(MyVisitableMockObject_2_void, visitable) ctr (&mvo); mvo.activate(); - ctr.addThrowable(mockpp::make_throwable(MOCKPP_STL::string("exceptional string"))); + bool thrown = false; + MOCKPP_TRY + { + ctr.addThrowable(mockpp::make_throwable(MOCKPP_STL::string("exceptional string"))); + } +#ifndef MOCKPP_NO_EXCEPTIONS + catch(mockpp::AssertionFailedError &) + { + thrown = true; + } +#endif + MOCKPP_ASSERT_TRUE(thrown == true); } @@ -233,7 +274,18 @@ MyVisitableMockObject_2_void mvo(MOCKPP_PCHAR("mvo")); MOCKPP_CONTROLLER_FOR(MyVisitableMockObject_2_void, visitable) ctr (&mvo); mvo.activate(); - ctr.addThrowable(MOCKPP_STL::string("exceptional string"), 1); + bool thrown = false; + MOCKPP_TRY + { + ctr.addThrowable(MOCKPP_STL::string("exceptional string"), 1); + } +#ifndef MOCKPP_NO_EXCEPTIONS + catch(mockpp::AssertionFailedError &) + { + thrown = true; + } +#endif + MOCKPP_ASSERT_TRUE(thrown == true); } @@ -242,7 +294,18 @@ MyVisitableMockObject_2_void mvo(MOCKPP_PCHAR("mvo")); MOCKPP_CONTROLLER_FOR(MyVisitableMockObject_2_void, visitable) ctr (&mvo); mvo.activate(); - ctr.setDefaultThrowable(mockpp::make_throwable(MOCKPP_STL::string("exceptional string"))); + bool thrown = false; + MOCKPP_TRY + { + ctr.setDefaultThrowable(mockpp::make_throwable(MOCKPP_STL::string("exceptional string"))); + } +#ifndef MOCKPP_NO_EXCEPTIONS + catch(mockpp::AssertionFailedError &) + { + thrown = true; + } +#endif + MOCKPP_ASSERT_TRUE(thrown == true); } @@ -256,7 +319,18 @@ mvo.activate(); mvo.visitable(1, 2); mvo.visitable(11, 2); - mvo.visitable(222, 2); + bool thrown = false; + MOCKPP_TRY + { + mvo.visitable(222, 2); + } +#ifndef MOCKPP_NO_EXCEPTIONS + catch(mockpp::AssertionFailedError &) + { + thrown = true; + } +#endif + MOCKPP_ASSERT_TRUE(thrown == true); } @@ -355,7 +429,18 @@ MOCKPP_CONTROLLER_FOR(MyVisitableMockObject_2_void, visitable) ctr (&mvo); ctr.setDefaultThrowable(mockpp::make_throwable(MOCKPP_STL::string("throw default"))); mvo.activate(); - mvo.verify(); + bool thrown = false; + MOCKPP_TRY + { + mvo.verify(); + } +#ifndef MOCKPP_NO_EXCEPTIONS + catch(mockpp::AssertionFailedError &) + { + thrown = true; + } +#endif + MOCKPP_ASSERT_TRUE(thrown == true); } Index: VisitableMockObject_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_test.cpp,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- VisitableMockObject_test.cpp 10 Dec 2005 20:07:22 -0000 1.27 +++ VisitableMockObject_test.cpp 11 Dec 2005 20:03:44 -0000 1.28 @@ -56,15 +56,15 @@ CPPUNIT_TEST(test_inline_post_1_2); CPPUNIT_TEST(test_method_unused); - CPPUNIT_TEST_EXCEPTION(fail_add_throw_after_active, mockpp::AssertionFailedError); - CPPUNIT_TEST_EXCEPTION(fail_add_throw_val_after_active, mockpp::AssertionFailedError); - CPPUNIT_TEST_EXCEPTION(fail_set_throw_after_active, mockpp::AssertionFailedError); - CPPUNIT_TEST_EXCEPTION(fail_add_method_after_active, mockpp::AssertionFailedError); - CPPUNIT_TEST_EXCEPTION(fail_add_return_after_active, mockpp::AssertionFailedError); - CPPUNIT_TEST_EXCEPTION(fail_set_return_after_active, mockpp::AssertionFailedError); - CPPUNIT_TEST_EXCEPTION(fail_return, mockpp::AssertionFailedError); - CPPUNIT_TEST_EXCEPTION(fail_unused_throwable, mockpp::AssertionFailedError); - CPPUNIT_TEST_EXCEPTION(fail_unused_value, mockpp::AssertionFailedError); + CPPUNIT_TEST(fail_add_throw_after_active); + CPPUNIT_TEST(fail_add_throw_val_after_active); + CPPUNIT_TEST(fail_set_throw_after_active); + CPPUNIT_TEST(fail_add_method_after_active); + CPPUNIT_TEST(fail_add_return_after_active); + CPPUNIT_TEST(fail_set_return_after_active); + CPPUNIT_TEST(fail_return); + CPPUNIT_TEST(fail_unused_throwable); + CPPUNIT_TEST(fail_unused_value); CPPUNIT_TEST(test_stub_return_const_ref); CPPUNIT_TEST_SUITE_END(); @@ -97,6 +97,28 @@ #if defined (HAVE_CXXTEST) +MOCKPP_CXXTEST_SUITE_REGISTRATION( VisitableMockObject_test ); + +MOCKPP_CXXTEST(VisitableMockObject_test, test_controller); +MOCKPP_CXXTEST(VisitableMockObject_test, test_thrower); +MOCKPP_CXXTEST(VisitableMockObject_test, test_return); +MOCKPP_CXXTEST(VisitableMockObject_test, test_clear); +MOCKPP_CXXTEST(VisitableMockObject_test, test_parameter_ex); +MOCKPP_CXXTEST(VisitableMockObject_test, test_inline_pre_1_2); +MOCKPP_CXXTEST(VisitableMockObject_test, test_inline_post_1_2); +MOCKPP_CXXTEST(VisitableMockObject_test, test_method_unused); + +MOCKPP_CXXTEST(VisitableMockObject_test, fail_add_throw_after_active); +MOCKPP_CXXTEST(VisitableMockObject_test, fail_add_throw_val_after_active); +MOCKPP_CXXTEST(VisitableMockObject_test, fail_set_throw_after_active); +MOCKPP_CXXTEST(VisitableMockObject_test, fail_add_method_after_active); +MOCKPP_CXXTEST(VisitableMockObject_test, fail_add_return_after_active); +MOCKPP_CXXTEST(VisitableMockObject_test, fail_set_return_after_active); +MOCKPP_CXXTEST(VisitableMockObject_test, fail_return); +MOCKPP_CXXTEST(VisitableMockObject_test, fail_unused_throwable); +MOCKPP_CXXTEST(VisitableMockObject_test, fail_unused_value); +MOCKPP_CXXTEST(VisitableMockObject_test, test_stub_return_const_ref); + #elif defined(HAVE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (VisitableMockObject_test); @@ -232,8 +254,18 @@ MOCKPP_CONTROLLER_FOR(MyVisitableMockObject, visitable) ctr (&mvo); mvo.visitable(); mvo.activate(); - mvo.visitable(); - mvo.visitable(); + bool thrown = false; + MOCKPP_TRY + { + mvo.visitable(); + } +#ifndef MOCKPP_NO_EXCEPTIONS + catch(mockpp::AssertionFailedError &) + { + thrown = true; + } +#endif + MOCKPP_ASSERT_TRUE(thrown == true); } @@ -262,7 +294,18 @@ MyVisitableMockObject mvo(MOCKPP_PCHAR("mvo")); MOCKPP_CONTROLLER_FOR(MyVisitableMockObject, visitable) ctr (&mvo); mvo.activate(); - ctr.addThrowable(mockpp::make_throwable(MOCKPP_STL::string("exceptional string"))); + bool thrown = false; + MOCKPP_TRY + { + ctr.addThrowable(mockpp::make_throwable(MOCKPP_STL::string("exceptional string"))); + } +#ifndef MOCKPP_NO_EXCEPTIONS + catch(mockpp::AssertionFailedError &) + { + thrown = true; + } +#endif + MOCKPP_ASSERT_TRUE(thrown == true); } @@ -271,7 +314,18 @@ MyVisitableMockObject mvo(MOCKPP_PCHAR("mvo")); MOCKPP_CONTROLLER_FOR(MyVisitableMockObject, visitable) ctr (&mvo); mvo.activate(); - ctr.addThrowable(MOCKPP_STL::string("exceptional string"), 1); + bool thrown = false; + MOCKPP_TRY + { + ctr.addThrowable(MOCKPP_STL::string("exceptional string"), 1); + } +#ifndef MOCKPP_NO_EXCEPTIONS + catch(mockpp::AssertionFailedError &) + { + thrown = true; + } +#endif + MOCKPP_ASSERT_TRUE(thrown == true); } @@ -280,7 +334,18 @@ MyVisitableMockObject mvo(MOCKPP_PCHAR("mvo")); MOCKPP_CONTROLLER_FOR(MyVisitableMockObject, visitable) ctr (&mvo); mvo.activate(); - ctr.setDefaultThrowable(mockpp::make_throwable(MOCKPP_STL::string("exceptional string"))); + bool thrown = false; + MOCKPP_TRY + { + ctr.setDefaultThrowable(mockpp::make_throwable(MOCKPP_STL::string("exceptional string"))); + } +#ifndef MOCKPP_NO_EXCEPTIONS + catch(mockpp::AssertionFailedError &) + { + thrown = true; + } +#endif + MOCKPP_ASSERT_TRUE(thrown == true); } @@ -289,7 +354,18 @@ MyVisitableMockObject mvo(MOCKPP_PCHAR("mvo")); MOCKPP_CONTROLLER_FOR(MyVisitableMockObject, visitable) ctr (&mvo); mvo.activate(); - ctr.addReturnValue(1); + bool thrown = false; + MOCKPP_TRY + { + ctr.addReturnValue(1); + } +#ifndef MOCKPP_NO_EXCEPTIONS + catch(mockpp::AssertionFailedError &) + { + thrown = true; + } +#endif + MOCKPP_ASSERT_TRUE(thrown == true); } @@ -298,7 +374,18 @@ MyVisitableMockObject mvo(MOCKPP_PCHAR("mvo")); MOCKPP_CONTROLLER_FOR(MyVisitableMockObject, visitable) ctr (&mvo); mvo.activate(); - ctr.setDefaultReturnValue(1); + bool thrown = false; + MOCKPP_TRY + { + ctr.setDefaultReturnValue(1); + } +#ifndef MOCKPP_NO_EXCEPTIONS + catch(mockpp::AssertionFailedError &) + { + thrown = true; + } +#endif + MOCKPP_ASSERT_TRUE(thrown == true); } @@ -318,7 +405,18 @@ MOCKPP_ASSERT_TRUE(1 == mvo.visitable()); MOCKPP_ASSERT_TRUE(11 == mvo.visitable()); - mvo.visitable(); // no more return objects + bool thrown = false; + MOCKPP_TRY + { + mvo.visitable(); // no more return objects + } +#ifndef MOCKPP_NO_EXCEPTIONS + catch(mockpp::AssertionFailedError &) + { + thrown = true; + } +#endif + MOCKPP_ASSERT_TRUE(thrown == true); } @@ -371,7 +469,18 @@ MOCKPP_CONTROLLER_FOR(MyVisitableMockObject, visitable) ctr (&mvo); ctr.setDefaultThrowable(mockpp::make_throwable(MOCKPP_STL::string("throw default"))); mvo.activate(); - mvo.verify(); + bool thrown = false; + MOCKPP_TRY + { + mvo.verify(); + } +#ifndef MOCKPP_NO_EXCEPTIONS + catch(mockpp::AssertionFailedError &) + { + thrown = true; + } +#endif + MOCKPP_ASSERT_TRUE(thrown == true); } @@ -381,7 +490,18 @@ MOCKPP_CONTROLLER_FOR(MyVisitableMockObject, visitable) ctr (&mvo); ctr.setDefaultReturnValue(111); mvo.activate(); - mvo.verify(); + bool thrown = false; + MOCKPP_TRY + { + mvo.verify(); + } +#ifndef MOCKPP_NO_EXCEPTIONS + catch(mockpp::AssertionFailedError &) + { + thrown = true; + } +#endif + MOCKPP_ASSERT_TRUE(thrown == true); } Index: Assert_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/Assert_test.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- Assert_test.cpp 9 Dec 2005 18:56:20 -0000 1.20 +++ Assert_test.cpp 11 Dec 2005 20:03:44 -0000 1.21 @@ -64,8 +64,8 @@ CPPUNIT_TEST(test_equalsPChar); CPPUNIT_TEST(test_macros); - CPPUNIT_TEST_EXCEPTION( fail_fail, mockpp::AssertionFailedError); - CPPUNIT_TEST_EXCEPTION( fail_failmsg, mockpp::AssertionFailedError); + CPPUNIT_TEST( fail_fail); + CPPUNIT_TEST( fail_failmsg); CPPUNIT_TEST_SUITE_END(); @@ -98,6 +98,31 @@ #if defined (HAVE_CXXTEST) +MOCKPP_CXXTEST_SUITE_REGISTRATION( Assert_test ); + +MOCKPP_CXXTEST(Assert_test, test_FalseTrue); +MOCKPP_CXXTEST(Assert_test, test_boundary); + +MOCKPP_CXXTEST(Assert_test, test_equalsDouble); +MOCKPP_CXXTEST(Assert_test, test_equalsFloat); +MOCKPP_CXXTEST(Assert_test, test_equalsLong); +MOCKPP_CXXTEST(Assert_test, test_equalsBool); +MOCKPP_CXXTEST(Assert_test, test_equalsChar); +MOCKPP_CXXTEST(Assert_test, test_equalsInt); +MOCKPP_CXXTEST(Assert_test, test_equalsShort); +MOCKPP_CXXTEST(Assert_test, test_equalsAString); + +#ifdef MOCKPP_UNICODE +MOCKPP_CXXTEST(Assert_test, test_equalsWString); +MOCKPP_CXXTEST(Assert_test, test_equalsPWChar); +#endif + +MOCKPP_CXXTEST(Assert_test, test_equalsPChar); +MOCKPP_CXXTEST(Assert_test, test_macros); + +MOCKPP_CXXTEST(Assert_test, fail_fail); +MOCKPP_CXXTEST(Assert_test, fail_failmsg); + #elif defined(HAVE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (Assert_test); @@ -775,13 +800,35 @@ void Assert_test::fail_fail() { - MOCKPP_FAIL(MOCKPP_PCHAR("")); + bool thrown = false; + MOCKPP_TRY + { + MOCKPP_FAIL(MOCKPP_PCHAR("")); + } +#ifndef MOCKPP_NO_EXCEPTIONS + catch(mockpp::AssertionFailedError &) + { + thrown = true; + } +#endif + MOCKPP_ASSERT_TRUE(thrown == true); } void Assert_test::fail_failmsg() { - MOCKPP_FAIL(MOCKPP_PCHAR("fail with msg")); + bool thrown = false; + MOCKPP_TRY + { + MOCKPP_FAIL(MOCKPP_PCHAR("fail with msg")); + } +#ifndef MOCKPP_NO_EXCEPTIONS + catch(mockpp::AssertionFailedError &) + { + thrown = true; + } +#endif + MOCKPP_ASSERT_TRUE(thrown == true); } Index: IsLessOrEqual_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/IsLessOrEqual_test.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- IsLessOrEqual_test.cpp 9 Dec 2005 18:56:20 -0000 1.8 +++ IsLessOrEqual_test.cpp 11 Dec 2005 20:03:44 -0000 1.9 @@ -62,6 +62,10 @@ #if defined (HAVE_CXXTEST) +MOCKPP_CXXTEST_SUITE_REGISTRATION( IsLessOrEqual_test ); +MOCKPP_CXXTEST(IsLessOrEqual_test, test_describe); +MOCKPP_CXXTEST(IsLessOrEqual_test, test_invoke); + #elif defined(HAVE_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.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- MixedMockObject_5_test.cpp 9 Dec 2005 18:56:20 -0000 1.8 +++ MixedMockObject_5_test.cpp 11 Dec 2005 20:03:44 -0000 1.9 @@ -54,17 +54,17 @@ { public: - #if defined (HAVE_CXXTEST) +#if defined (HAVE_CXXTEST) #elif defined(HAVE_CPPUNIT) CPPUNIT_TEST_SUITE( MixedMockObject_5_test ); - CPPUNIT_TEST(test_controller); - CPPUNIT_TEST(test_chainer); - CPPUNIT_TEST(test_return); + CPPUNIT_TEST(test_controller); + CPPUNIT_TEST(test_chainer); + CPPUNIT_TEST(test_return); - CPPUNIT_TEST_SUITE_END(); +CPPUNIT_TEST_SUITE_END(); #endif @@ -78,6 +78,11 @@ #if defined (HAVE_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) 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.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- ChainableMockObject_test.cpp 10 Dec 2005 20:07:22 -0000 1.26 +++ ChainableMockObject_test.cpp 11 Dec 2005 20:03:44 -0000 1.27 @@ -47,26 +47,26 @@ { public: - #if defined (HAVE_CXXTEST) +#if defined (HAVE_CXXTEST) #elif defined(HAVE_CPPUNIT) CPPUNIT_TEST_SUITE( ChainableMockObject_test ); - CPPUNIT_TEST(test_register); - CPPUNIT_TEST(test_after_1); - CPPUNIT_TEST(test_after_2); - CPPUNIT_TEST(test_bad_after); - CPPUNIT_TEST(test_before_1); - CPPUNIT_TEST(test_before_2); - CPPUNIT_TEST(test_bad_before); - CPPUNIT_TEST(test_pending); - CPPUNIT_TEST(test_expect_return); - CPPUNIT_TEST(test_expect_throw); - CPPUNIT_TEST(test_stub_return); - CPPUNIT_TEST(test_stub_return_const_ref); + CPPUNIT_TEST(test_register); + CPPUNIT_TEST(test_after_1); + CPPUNIT_TEST(test_after_2); + CPPUNIT_TEST(test_bad_after); + CPPUNIT_TEST(test_before_1); + CPPUNIT_TEST(test_before_2); + CPPUNIT_TEST(test_bad_before); + CPPUNIT_TEST(test_pending); + CPPUNIT_TEST(test_expect_return); + CPPUNIT_TEST(test_expect_throw); + CPPUNIT_TEST(test_stub_return); + CPPUNIT_TEST(test_stub_return_const_ref); - CPPUNIT_TEST_SUITE_END(); +CPPUNIT_TEST_SUITE_END(); #endif @@ -89,6 +89,20 @@ #if defined (HAVE_CXXTEST) +MOCKPP_CXXTEST_SUITE_REGISTRATION( ChainableMockObject_test ); +MOCKPP_CXXTEST(ChainableMockObject_test, test_register); +MOCKPP_CXXTEST(ChainableMockObject_test, test_after_1); +MOCKPP_CXXTEST(ChainableMockObject_test, test_after_2); +MOCKPP_CXXTEST(ChainableMockObject_test, test_bad_after); +MOCKPP_CXXTEST(ChainableMockObject_test, test_before_1); +MOCKPP_CXXTEST(ChainableMockObject_test, test_before_2); +MOCKPP_CXXTEST(ChainableMockObject_test, test_bad_before); +MOCKPP_CXXTEST(ChainableMockObject_test, test_pending); +MOCKPP_CXXTEST(ChainableMockObject_test, test_expect_return); +MOCKPP_CXXTEST(ChainableMockObject_test, test_expect_throw); +MOCKPP_CXXTEST(ChainableMockObject_test, test_stub_return); +MOCKPP_CXXTEST(ChainableMockObject_test, test_stub_return_const_ref); + #elif defined(HAVE_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.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- Invocation_test.cpp 9 Dec 2005 18:56:20 -0000 1.21 +++ Invocation_test.cpp 11 Dec 2005 20:03:44 -0000 1.22 @@ -84,6 +84,21 @@ #if defined (HAVE_CXXTEST) +MOCKPP_CXXTEST_SUITE_REGISTRATION( Invocation_test ); + +MOCKPP_CXXTEST(Invocation_test, test_equals0); +MOCKPP_CXXTEST(Invocation_test, test_equals1); +MOCKPP_CXXTEST(Invocation_test, test_equals2); +MOCKPP_CXXTEST(Invocation_test, test_equals3); +MOCKPP_CXXTEST(Invocation_test, test_equals4); +MOCKPP_CXXTEST(Invocation_test, test_equals5); +MOCKPP_CXXTEST(Invocation_test, test_get1); +MOCKPP_CXXTEST(Invocation_test, test_get2); +MOCKPP_CXXTEST(Invocation_test, test_get3); +MOCKPP_CXXTEST(Invocation_test, test_get4); +MOCKPP_CXXTEST(Invocation_test, test_get5); +MOCKPP_CXXTEST(Invocation_test, test_invoked); + #elif defined(HAVE_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.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- IsGreaterThan_test.cpp 9 Dec 2005 18:56:20 -0000 1.8 +++ IsGreaterThan_test.cpp 11 Dec 2005 20:03:44 -0000 1.9 @@ -62,6 +62,10 @@ #if defined (HAVE_CXXTEST) +MOCKPP_CXXTEST_SUITE_REGISTRATION( IsGreaterThan_test ); +MOCKPP_CXXTEST(IsGreaterThan_test, test_describe); +MOCKPP_CXXTEST(IsGreaterThan_test, test_invoke); + #elif defined(HAVE_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.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- NoException_test.cpp 9 Dec 2005 18:56:20 -0000 1.2 +++ NoException_test.cpp 11 Dec 2005 20:03:44 -0000 1.3 @@ -57,6 +57,9 @@ #if defined (HAVE_CXXTEST) +MOCKPP_CXXTEST_SUITE_REGISTRATION( NoException_test ); +MOCKPP_CXXTEST(NoException_test, test_invoke); + #elif defined(HAVE_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.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- ChainableMockObject_4_void_test.cpp 10 Dec 2005 20:07:22 -0000 1.14 +++ ChainableMockObject_4_void_test.cpp 11 Dec 2005 20:03:44 -0000 1.15 @@ -47,16 +47,16 @@ { public: - #if defined (HAVE_CXXTEST) +#if defined (HAVE_CXXTEST) #elif defined(HAVE_CPPUNIT) CPPUNIT_TEST_SUITE( ChainableMockObject_4_void_test ); - CPPUNIT_TEST(test_outbound); - CPPUNIT_TEST( test_parameter_4 ); + CPPUNIT_TEST(test_outbound); + CPPUNIT_TEST( test_parameter_4 ); - CPPUNIT_TEST_SUITE_END(); +CPPUNIT_TEST_SUITE_END(); #endif @@ -69,6 +69,10 @@ #if defined (HAVE_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) 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.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- InvocationMockerBuilder_test.cpp 9 Dec 2005 18:56:20 -0000 1.31 +++ InvocationMockerBuilder_test.cpp 11 Dec 2005 20:03:44 -0000 1.32 @@ -67,18 +67,18 @@ { public: - #if defined (HAVE_CXXTEST) +#if defined (HAVE_CXXTEST) #elif defined(HAVE_CPPUNIT) CPPUNIT_TEST_SUITE( InvocationMockerBuilder_test ); - CPPUNIT_TEST( test_instance0 ); - CPPUNIT_TEST( test_instance5 ); - CPPUNIT_TEST( test_instancev0 ); - CPPUNIT_TEST( test_instancev5 ); + CPPUNIT_TEST( test_instance0 ); + CPPUNIT_TEST( test_instance5 ); + CPPUNIT_TEST( test_instancev0 ); + CPPUNIT_TEST( test_instancev5 ); - CPPUNIT_TEST_SUITE_END(); +CPPUNIT_TEST_SUITE_END(); #endif @@ -93,6 +93,12 @@ #if defined (HAVE_CXXTEST) +MOCKPP_CXXTEST_SUITE_REGISTRATION( InvocationMockerBuilder_test ); +MOCKPP_CXXTEST(InvocationMockerBuilder_test, test_instance0 ); +MOCKPP_CXXTEST(InvocationMockerBuilder_test, test_instance5 ); +MOCKPP_CXXTEST(InvocationMockerBuilder_test, test_instancev0 ); +MOCKPP_CXXTEST(InvocationMockerBuilder_test, test_instancev5 ); + #elif defined(HAVE_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.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- StringContains_test.cpp 9 Dec 2005 18:56:20 -0000 1.12 +++ StringContains_test.cpp 11 Dec 2005 20:03:44 -0000 1.13 @@ -62,6 +62,10 @@ #if defined (HAVE_CXXTEST) +MOCKPP_CXXTEST_SUITE_REGISTRATION( StringContains_test ); +MOCKPP_CXXTEST(StringContains_test, test_describe); +MOCKPP_CXXTEST(StringContains_test, test_invoke); + #elif defined(HAVE_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.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- InvokeAtLeastOnceMatcher_test.cpp 9 Dec 2005 18:56:20 -0000 1.10 +++ InvokeAtLeastOnceMatcher_test.cpp 11 Dec 2005 20:03:44 -0000 1.11 @@ -58,6 +58,9 @@ #if defined (HAVE_CXXTEST) +MOCKPP_CXXTEST_SUITE_REGISTRATION( InvokeAtLeastOnceMatcher_test ); +MOCKPP_CXXTEST(InvokeAtLeastOnceMatcher_test, test_invoke); + #elif defined(HAVE_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.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- ExpectationSet_test.cpp 9 Dec 2005 18:56:20 -0000 1.16 +++ ExpectationSet_test.cpp 11 Dec 2005 20:03:44 -0000 1.17 @@ -57,13 +57,13 @@ CPPUNIT_TEST(test_expectActualVerify); CPPUNIT_TEST(test_ifNoExpected); - CPPUNIT_TEST_EXCEPTION(fail_clearActual, mockpp::AssertionFailedError); - CPPUNIT_TEST_EXCEPTION(fail_expectActualImmediate, mockpp::AssertionFailedError); - CPPUNIT_TEST_EXCEPTION(fail_expectActualVerify, mockpp::AssertionFailedError); - CPPUNIT_TEST_EXCEPTION(fail_expectNothing, mockpp::AssertionFailedError); - CPPUNIT_TEST_EXCEPTION(fail_many, mockpp::AssertionFailedError); + CPPUNIT_TEST(fail_clearActual); + CPPUNIT_TEST(fail_expectActualImmediate); + CPPUNIT_TEST(fail_expectActualVerify); + CPPUNIT_TEST(fail_expectNothing); + CPPUNIT_TEST(fail_many); - CPPUNIT_TEST_EXCEPTION(fail_ifNoActual, mockpp::AssertionFailedError); + CPPUNIT_TEST(fail_ifNoActual); CPPUNIT_TEST_SUITE_END(); @@ -94,6 +94,28 @@ #if defined (HAVE_CXXTEST) +MOCKPP_CXXTEST_SUITE_REGISTRATION( ExpectationSet_test ); + +MOCKPP_CXXTEST(ExpectationSet_test, test_hasExpectations); +MOCKPP_CXXTEST(ExpectationSet_test, test_name); +MOCKPP_CXXTEST(ExpectationSet_test, test_many); +MOCKPP_CXXTEST(ExpectationSet_test, test_chain); +MOCKPP_CXXTEST(ExpectationSet_test, test_clear); + +MOCKPP_CXXTEST(ExpectationSet_test, test_expectNothing); +MOCKPP_CXXTEST(ExpectationSet_test, test_expectNothing_revoked); +MOCKPP_CXXTEST(ExpectationSet_test, test_expectActualImmediate); +MOCKPP_CXXTEST(ExpectationSet_test, test_expectActualVerify); +MOCKPP_CXXTEST(ExpectationSet_test, test_ifNoExpected); + +MOCKPP_CXXTEST(ExpectationSet_test, fail_clearActual); +MOCKPP_CXXTEST(ExpectationSet_test, fail_expectActualImmediate); +MOCKPP_CXXTEST(ExpectationSet_test, fail_expectActualVerify); +MOCKPP_CXXTEST(ExpectationSet_test, fail_expectNothing); +MOCKPP_CXXTEST(ExpectationSet_test, fail_many); + +MOCKPP_CXXTEST(ExpectationSet_test, fail_ifNoActual); + #elif defined(HAVE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (ExpectationSet_test); @@ -162,7 +184,18 @@ ec.addExpected(3); ec.addActual(3); ec.clearActual(); - ec.verify(); + bool thrown = false; + MOCKPP_TRY + { + ec.verify(); + } +#ifndef MOCKPP_NO_EXCEPTIONS + catch(mockpp::AssertionFailedError &) + { + thrown = true; + } +#endif + MOCKPP_ASSERT_TRUE(thrown == true); } @@ -177,7 +210,18 @@ { mockpp::ExpectationSet<int> ec (MOCKPP_PCHAR("nothingSet"), 0); ec.addExpected(3); - ec.verify(); // fails because no value + bool thrown = false; + MOCKPP_TRY + { + ec.verify(); // fails because no value + } +#ifndef MOCKPP_NO_EXCEPTIONS + catch(mockpp::AssertionFailedError &) + { + thrown = true; + } +#endif + MOCKPP_ASSERT_TRUE(thrown == true); } @@ -210,7 +254,18 @@ { mockpp::ExpectationSet<int> ec (MOCKPP_PCHAR("nothingSet"), 0); doNothing(ec); - ec.addActual(3); // fails even if equal + bool thrown = false; + MOCKPP_TRY + { + ec.addActual(3); // fails even if equal + } +#ifndef MOCKPP_NO_EXCEPTIONS + catch(mockpp::AssertionFailedError &) + { + thrown = true; + } +#endif + MOCKPP_ASSERT_TRUE(thrown == true); } @@ -233,7 +288,18 @@ int act_prep[10] = { 10, 11, 12, 13, 14, 15, 16, 17, 18, 19 }; ec.addExpected(exp_prep+0, exp_prep+10); - ec.addActual(act_prep+2, act_prep+10); + bool thrown = false; + MOCKPP_TRY + { + ec.addActual(act_prep+2, act_prep+10); + } +#ifndef MOCKPP_NO_EXCEPTIONS + catch(mockpp::AssertionFailedError &) + { + thrown = true; + } +#endif + MOCKPP_ASSERT_TRUE(thrown == true); } @@ -263,7 +329,18 @@ { mockpp::ExpectationSet<int> ec (MOCKPP_PCHAR("actualSet"), 0); doActualImmediate(ec); - ec.addActual(1111); // fails + bool thrown = false; + MOCKPP_TRY + { + ec.addActual(1111); // fails + } +#ifndef MOCKPP_NO_EXCEPTIONS + catch(mockpp::AssertionFailedError &) + { + thrown = true; + } +#endif + MOCKPP_ASSERT_TRUE(thrown == true); } @@ -286,7 +363,18 @@ { mockpp::ExpectationSet<int> ec (MOCKPP_PCHAR("verifySet"), 0); doActualVerify(ec); // no fail - ec.verify(); // fails + bool thrown = false; + MOCKPP_TRY + { + ec.verify(); // fails + } +#ifndef MOCKPP_NO_EXCEPTIONS + catch(mockpp::AssertionFailedError &) + { + thrown = true; + } +#endif + MOCKPP_ASSERT_TRUE(thrown == true); } Index: ChainableMockObject_1_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_1_void_test.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- ChainableMockObject_1_void_test.cpp 10 Dec 2005 20:07:22 -0000 1.17 +++ ChainableMockObject_1_void_test.cpp 11 Dec 2005 20:03:44 -0000 1.18 @@ -52,16 +52,16 @@ { public: - #if defined (HAVE_CXXTEST) +#if defined (HAVE_CXXTEST) #elif defined(HAVE_CPPUNIT) CPPUNIT_TEST_SUITE( ChainableMockObject_1_void_test ); - CPPUNIT_TEST(test_outbound); - CPPUNIT_TEST( test_parameter_1 ); + CPPUNIT_TEST(test_outbound); + CPPUNIT_TEST( test_parameter_1 ); - CPPUNIT_TEST_SUITE_END(); +CPPUNIT_TEST_SUITE_END(); #endif @@ -75,6 +75,10 @@ #if defined (HAVE_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) 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.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- ChainableMockMethod_2_test.cpp 9 Dec 2005 18:56:20 -0000 1.11 +++ ChainableMockMethod_2_test.cpp 11 Dec 2005 20:03:44 -0000 1.12 @@ -56,16 +56,16 @@ { public: - #if defined (HAVE_CXXTEST) +#if defined (HAVE_CXXTEST) #elif defined(HAVE_CPPUNIT) CPPUNIT_TEST_SUITE( ChainableMockMethod_2_test ); - CPPUNIT_TEST( test_parameter_2 ); - CPPUNIT_TEST( test_parameter_2v ); + CPPUNIT_TEST( test_parameter_2 ); + CPPUNIT_TEST( test_parameter_2v ); - CPPUNIT_TEST_SUITE_END(); +CPPUNIT_TEST_SUITE_END(); #endif @@ -78,6 +78,10 @@ #if defined (HAVE_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) 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.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- InvokedAfterMatcher_test.cpp 9 Dec 2005 18:56:20 -0000 1.10 +++ InvokedAfterMatcher_test.cpp 11 Dec 2005 20:03:44 -0000 1.11 @@ -58,6 +58,9 @@ #if defined (HAVE_CXXTEST) +MOCKPP_CXXTEST_SUITE_REGISTRATION( InvokedAfterMatcher_test ); +MOCKPP_CXXTEST(InvokedAfterMatcher_test, test_invoke); + #elif defined(HAVE_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.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- InvokeOnceMatcher_test.cpp 9 Dec 2005 18:56:20 -0000 1.10 +++ InvokeOnceMatcher_test.cpp 11 Dec 2005 20:03:44 -0000 1.11 @@ -58,6 +58,9 @@ #if defined (HAVE_CXXTEST) +MOCKPP_CXXTEST_SUITE_REGISTRATION( InvokeOnceMatcher_test ); +MOCKPP_CXXTEST(InvokeOnceMatcher_test, test_invoke); + #elif defined(HAVE_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.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- ChainableMockObject_3_void_test.cpp 10 Dec 2005 20:07:22 -0000 1.14 +++ ChainableMockObject_3_void_test.cpp 11 Dec 2005 20:03:44 -0000 1.15 @@ -47,16 +47,16 @@ { public: - #if defined (HAVE_CXXTEST) +#if defined (HAVE_CXXTEST) #elif defined(HAVE_CPPUNIT) CPPUNIT_TEST_SUITE( ChainableMockObject_3_void_test ); - CPPUNIT_TEST(test_outbound); - CPPUNIT_TEST( test_parameter_3 ); + CPPUNIT_TEST(test_outbound); + CPPUNIT_TEST( test_parameter_3 ); - CPPUNIT_TEST_SUITE_END(); +CPPUNIT_TEST_SUITE_END(); #endif @@ -69,6 +69,10 @@ #if defined (HAVE_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) 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.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- VoidStub_test.cpp 9 Dec 2005 18:56:20 -0000 1.12 +++ VoidStub_test.cpp 11 Dec 2005 20:03:44 -0000 1.13 @@ -62,6 +62,10 @@ #if defined (HAVE_CXXTEST) +MOCKPP_CXXTEST_SUITE_REGISTRATION( VoidStub_test ); +MOCKPP_CXXTEST(VoidStub_test, test_describe); +MOCKPP_CXXTEST(VoidStub_test, test_invoke); + #elif defined(HAVE_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.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- ExpectationCounter_test.cpp 9 Dec 2005 18:56:20 -0000 1.15 +++ ExpectationCounter_test.cpp 11 Dec 2005 20:03:44 -0000 1.16 @@ -57,11 +57,11 @@ CPPUNIT_TEST(test_expectActualVerify); CPPUNIT_TEST(test_ifNoExpected); - CPPUNIT_TEST_EXCEPTION(fail_expectActualImmediate, mockpp::AssertionFailedError); - CPPUNIT_TEST_EXCEPTION(fail_expectActualVerify, mockpp::AssertionFailedError); - CPPUNIT_TEST_EXCEPTION(fail_expectNothing, mockpp::AssertionFailedError); + CPPUNIT_TEST(fail_expectActualImmediate); + CPPUNIT_TEST(fail_expectActualVerify); + CPPUNIT_TEST(fail_expectNothing); - CPPUNIT_TEST_EXCEPTION(fail_ifNoActual, mockpp::AssertionFailedError); + CPPUNIT_TEST(fail_ifNoActual); CPPUNIT_TEST_SUITE_END(); @@ -92,6 +92,25 @@ #if defined (HAVE_CXXTEST) +MOCKPP_CXXTEST_SUITE_REGISTRATION( ExpectationCounter_test ); + +MOCKPP_CXXTEST(ExpectationCounter_test, test_hasExpectations); +MOCKPP_CXXTEST(ExpectationCounter_test, test_name); +MOCKPP_CXXTEST(ExpectationCounter_test, test_clearActual); +MOCKPP_CXXTEST(ExpectationCounter_test, test_clear); + +MOCKPP_CXXTEST(ExpectationCounter_test, test_expectNothing); +MOCKPP_CXXTEST(ExpectationCounter_test, test_expectNothing_revoked); +MOCKPP_CXXTEST(ExpectationCounter_test, test_expectActualImmediate); +MOCKPP_CXXTEST(ExpectationCounter_test, test_expectActualVerify); +MOCKPP_CXXTEST(ExpectationCounter_test, test_ifNoExpected); + +MOCKPP_CXXTEST(ExpectationCounter_test, fail_expectActualImmediate); +MOCKPP_CXXTEST(ExpectationCounter_test, fail_expectActualVerify); +MOCKPP_CXXTEST(ExpectationCounter_test, fail_expectNothing); + +MOCKPP_CXXTEST(ExpectationCounter_test, fail_ifNoActual); + #elif defined(HAVE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (ExpectationCounter_test); @@ -161,7 +180,18 @@ { mockpp::ExpectationCounter ec (MOCKPP_PCHAR("nothingcounter"), 0); ec.setExpected(2); - ec.verify(); // fails because no value + bool thrown = false; + MOCKPP_TRY + { + ec.verify(); // fails because no value + } +#ifndef MOCKPP_NO_EXCEPTIONS + catch(mockpp::AssertionFailedError &) + { + thrown = true; + } +#endif + MOCKPP_ASSERT_TRUE(thrown == true); } @@ -196,7 +226,18 @@ { mockpp::ExpectationCounter ec (MOCKPP_PCHAR("nothingcounter"), 0); doNothing(ec); - ec.inc(); // fails + bool thrown = false; + MOCKPP_TRY + { + ec.inc(); // fails + } +#ifndef MOCKPP_NO_EXCEPTIONS + catch(mockpp::AssertionFailedError &) + { + thrown = true; + } +#endif + MOCKPP_ASSERT_TRUE(thrown == true); } @@ -220,7 +261,18 @@ { mockpp::ExpectationCounter ec (MOCKPP_PCHAR("actualcounter"), 0); doActualImmediate(ec); - ec.inc(); // fails + bool thrown = false; + MOCKPP_TRY + { + ec.inc(); // fails + } +#ifndef MOCKPP_NO_EXCEPTIONS + catch(mockpp::AssertionFailedError &) + { + thrown = true; + } +#endif + MOCKPP_ASSERT_TRUE(thrown == true); } @@ -246,7 +298,18 @@ { mockpp::ExpectationCounter ec (MOCKPP_PCHAR("verifycounter"), 0); doActualVerify(ec); // no fail - ec.verify(); // fails + bool thrown = false; + MOCKPP_TRY + { + ec.verify(); // fails + } +#ifndef MOCKPP_NO_EXCEPTIONS + catch(mockpp::AssertionFailedError &) + { + thrown = true; + } +#endif + MOCKPP_ASSERT_TRUE(thrown == true); } Index: OutBound_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/OutBound_test.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- OutBound_test.cpp 9 Dec 2005 18:56:20 -0000 1.3 +++ OutBound_test.cpp 11 Dec 2005 20:03:44 -0000 1.4 @@ -60,6 +60,10 @@ #if defined (HAVE_CXXTEST) +MOCKPP_CXXTEST_SUITE_REGISTRATION( OutBound_test ); +MOCKPP_CXXTEST(OutBound_test, test_describe); +MOCKPP_CXXTEST(OutBound_test, test_invoke); + #elif defined(HAVE_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.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- ResponseVector_test.cpp 10 Dec 2005 20:07:22 -0000 1.7 +++ ResponseVector_test.cpp 11 Dec 2005 20:03:44 -0000 1.8 @@ -62,6 +62,10 @@ #if defined (HAVE_CXXTEST) +MOCKPP_CXXTEST_SUITE_REGISTRATION( ResponseVector_Test ); +MOCKPP_CXXTEST(ResponseVector_Test, test_value); +MOCKPP_CXXTEST(ResponseVector_Test, test_thrower); + #elif defined(HAVE_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.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- ExpectationConglomeration_test.cpp 9 Dec 2005 18:56:20 -0000 1.14 +++ ExpectationConglomeration_test.cpp 11 Dec 2005 20:03:44 -0000 1.15 @@ -58,13 +58,13 @@ CPPUNIT_TEST(test_expectActualVerify); CPPUNIT_TEST(test_ifNoExpected); - CPPUNIT_TEST_EXCEPTION(fail_clearActual, mockpp::AssertionFailedError); - CPPUNIT_TEST_EXCEPTION(fail_expectActualImmediate, mockpp::AssertionFailedError); - CPPUNIT_TEST_EXCEPTION(fail_expectActualVerify, mockpp::AssertionFailedError); - CPPUNIT_TEST_EXCEPTION(fail_expectNothing, mockpp::AssertionFailedError); - CPPUNIT_TEST_EXCEPTION(fail_many, mockpp::AssertionFailedError); + CPPUNIT_TEST(fail_clearActual); + CPPUNIT_TEST(fail_expectActualImmediate); + CPPUNIT_TEST(fail_expectActualVerify); + CPPUNIT_TEST(fail_expectNothing); + CPPUNIT_TEST(fail_many); - CPPUNIT_TEST_EXCEPTION(fail_ifNoActual, mockpp::AssertionFailedError); + CPPUNIT_TEST(fail_ifNoActual); CPPUNIT_TEST_SUITE_END(); @@ -96,6 +96,29 @@ #if defined (HAVE_CXXTEST) +MOCKPP_CXXTEST_SUITE_REGISTRATION( ExpectationConglomeration_test ); + +MOCKPP_CXXTEST(ExpectationConglomeration_test, test_hasExpectations); +MOCKPP_CXXTEST(ExpectationConglomeration_test, test_hasExpectations2); +MOCKPP_CXXTEST(ExpectationConglomeration_test, test_name); +MOCKPP_CXXTEST(ExpectationConglomeration_test, test_many); +MOCKPP_CXXTEST(ExpectationConglomeration_test, test_chain); +MOCKPP_CXXTEST(ExpectationConglomeration_test, test_clear); + +MOCKPP_CXXTEST(ExpectationConglomeration_test, test_expectNothing); +MOCKPP_CXXTEST(ExpectationConglomeration_test, test_expectNothing_revoked); +MOCKPP_CXXTEST(ExpectationConglomeration_test, test_expectActualImmediate); +MOCKPP_CXXTEST(ExpectationConglomeration_test, test_expectActualVerify);... [truncated message content] |
