[Mockpp-commits] mockpp/mockpp/tests ChainableMockObject_1_void_test.cpp,1.5,1.6 ChainableMockObject
Brought to you by:
ewald-arnold
Menu
▾
▴
[Mockpp-commits] mockpp/mockpp/tests ChainableMockObject_1_void_test.cpp,1.5,1.6 ChainableMockObject_2_void_test.cpp,1.5,1.6 ChainableMockObject_3_void_test.cpp,1.5,1.6 ChainableMockObject_4_void_test.cpp,1.5,1.6 ChainableMockObject_5_void_test.cpp,1.7,1.8 Makefile.am,1.68,1.69
|
From: Ewald A. <ewa...@us...> - 2005-03-25 16:30:58
|
Update of /cvsroot/mockpp/mockpp/mockpp/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11523/mockpp/tests Modified Files: ChainableMockObject_1_void_test.cpp ChainableMockObject_2_void_test.cpp ChainableMockObject_3_void_test.cpp ChainableMockObject_4_void_test.cpp ChainableMockObject_5_void_test.cpp Makefile.am Log Message: work on support for weak compilers Index: ChainableMockObject_5_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_5_void_test.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- ChainableMockObject_5_void_test.cpp 24 Mar 2005 21:43:07 -0000 1.7 +++ ChainableMockObject_5_void_test.cpp 25 Mar 2005 16:30:31 -0000 1.8 @@ -37,6 +37,10 @@ #else +#ifdef MOCKPP_PTI_WEAKNESS +#include <mockpp/chaining/mockpp_pti.h> +#endif + #include <mockpp/ChainableMockObject.h> #include "classes_ABCDE.h" @@ -70,6 +74,11 @@ CPPUNIT_TEST_SUITE_REGISTRATION(ChainableMockObject_5_void_test); +typedef mockpp::Invocation5<unsigned, unsigned, unsigned, unsigned, unsigned> mockpp_Invocation5_unsigned_unsigned_unsigned_unsigned_unsigned; + +MOCKPP_PTI_DECLARE(mockpp_Invocation5_unsigned_unsigned_unsigned_unsigned_unsigned) + + class MyChainableMockObject_5_void_Interface { public: @@ -363,4 +372,7 @@ } +MOCKPP_PTI_IMPLEMENT(mockpp_Invocation5_unsigned_unsigned_unsigned_unsigned_unsigned) + + #endif // HAVE_CPPUNIT Index: Makefile.am =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/Makefile.am,v retrieving revision 1.68 retrieving revision 1.69 diff -u -d -r1.68 -r1.69 --- Makefile.am 25 Mar 2005 10:13:18 -0000 1.68 +++ Makefile.am 25 Mar 2005 16:30:31 -0000 1.69 @@ -1,4 +1,4 @@ -INCLUDES = -I. -I$(top_srcdir) $(all_includes) $(EA_EXTRA_INC) +INCLUDES = -I. -I$(top_srcdir) -I$(top_builddir) $(all_includes) $(EA_EXTRA_INC) CLEANFILES = *.~* *.~~* *~ @@ -17,7 +17,7 @@ TESTS = $(SINGLE_TESTS) raw-gen: - cpp -DHAVE_CPPUNIT $(srcdir)/ChainableMockObject_5_test.cpp $(INCLUDES) >x.cpp + cpp -DHAVE_CPPUNIT -DHAVE_CONFIG_H $(srcdir)/InvocationMocker_test.cpp $(INCLUDES) >x.cpp sed -e s,^#,//,g x.cpp >xx.cpp raw-comp: raw-gen @@ -100,8 +100,6 @@ done; echo "Store all the suppression block to $(srcdir)/$(VG_SUPPRESS)" -applnkAnwendungdir = $(kde_appsdir)/Anwendung - #compilecheck_LDADD = $(top_builddir)/mockpp/libmockpp.la $(EA_EXTRA_LIB) \ # $(LIBCPPUNIT) Index: ChainableMockObject_2_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_2_void_test.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- ChainableMockObject_2_void_test.cpp 30 Dec 2004 20:54:05 -0000 1.5 +++ ChainableMockObject_2_void_test.cpp 25 Mar 2005 16:30:30 -0000 1.6 @@ -37,6 +37,10 @@ #else +#ifdef MOCKPP_PTI_WEAKNESS +#include <mockpp/chaining/mockpp_pti.h> +#endif + #include <mockpp/ChainableMockObject.h> #include <cppunit/extensions/HelperMacros.h> @@ -64,6 +68,11 @@ CPPUNIT_TEST_SUITE_REGISTRATION(ChainableMockObject_2_void_test); +typedef mockpp::Invocation2<unsigned, unsigned> mockpp_Invocation2_unsigned_unsigned; + +MOCKPP_PTI_DECLARE(mockpp_Invocation2_unsigned_unsigned) + + class MyChainableMockObject_2_void : public mockpp::ChainableMockObject { public: @@ -104,41 +113,43 @@ chain.stubs(mockpp::once()) .with(mockpp::eq( (unsigned int) 32), - mockpp::eq( (unsigned int) 21)) + mockpp::eq( (unsigned int) 21)) .will(mockpp::throwException<void, int>(21)); - + try { - mcm.chainable(12, 23); + mcm.chainable(12, 23); CPPUNIT_ASSERT_MESSAGE("should have thrown", false); } catch(int i) { CPPUNIT_ASSERT(i == 12); } - + try { - mcm.chainable(32, 21); + mcm.chainable(32, 21); CPPUNIT_ASSERT_MESSAGE("should have thrown", false); } catch(int i) { CPPUNIT_ASSERT(i == 21); } - + try { - mcm.chainable(1, 2); + mcm.chainable(1, 2); CPPUNIT_ASSERT_MESSAGE("should have thrown", false); } catch(mockpp::AssertionFailedError &ex) { CPPUNIT_ASSERT(ex.getMessage().find(MOCKPP_PCHAR("unexpected invocation")) != mockpp::String::npos); } - - mcm.verify(); + + mcm.verify(); } +MOCKPP_PTI_IMPLEMENT(mockpp_Invocation2_unsigned_unsigned) + #endif // HAVE_CPPUNIT Index: ChainableMockObject_1_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_1_void_test.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- ChainableMockObject_1_void_test.cpp 30 Dec 2004 20:54:05 -0000 1.5 +++ ChainableMockObject_1_void_test.cpp 25 Mar 2005 16:30:30 -0000 1.6 @@ -37,6 +37,10 @@ #else +#ifdef MOCKPP_PTI_WEAKNESS +#include <mockpp/chaining/mockpp_pti.h> +#endif + #include <mockpp/ChainableMockObject.h> #include <cppunit/extensions/HelperMacros.h> @@ -64,6 +68,9 @@ CPPUNIT_TEST_SUITE_REGISTRATION(ChainableMockObject_1_void_test); +MOCKPP_PTI_DECLARE(mockpp::Invocation1<unsigned>) + + class MyChainableMockObject_1_void : public mockpp::ChainableMockObject { public: @@ -102,41 +109,44 @@ .will(mockpp::throwException<void, int>( 21 )); chain.stubs(mockpp::once()) - .with(mockpp::eq( (unsigned int) 21)) + .with(mockpp::eq( (unsigned int) 21)) .will(mockpp::throwException<void, int>(12)); - + try { - mcm.chainable(12); + mcm.chainable(12); CPPUNIT_ASSERT_MESSAGE("should have thrown", false); } catch(int i) { CPPUNIT_ASSERT(i == 21); } - + try { - mcm.chainable(21); + mcm.chainable(21); CPPUNIT_ASSERT_MESSAGE("should have thrown", false); } catch(int i) { CPPUNIT_ASSERT(i == 12); } - + try { - mcm.chainable(9); + mcm.chainable(9); CPPUNIT_ASSERT_MESSAGE("should have thrown", false); } catch(mockpp::AssertionFailedError &ex) { CPPUNIT_ASSERT(ex.getMessage().find(MOCKPP_PCHAR("unexpected invocation")) != mockpp::String::npos); } - - mcm.verify(); + + mcm.verify(); } +MOCKPP_PTI_IMPLEMENT(mockpp::Invocation1<unsigned>) + + #endif // HAVE_CPPUNIT Index: ChainableMockObject_4_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_4_void_test.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- ChainableMockObject_4_void_test.cpp 30 Dec 2004 20:54:05 -0000 1.5 +++ ChainableMockObject_4_void_test.cpp 25 Mar 2005 16:30:31 -0000 1.6 @@ -37,6 +37,10 @@ #else +#ifdef MOCKPP_PTI_WEAKNESS +#include <mockpp/chaining/mockpp_pti.h> +#endif + #include <mockpp/ChainableMockObject.h> #include <cppunit/extensions/HelperMacros.h> @@ -64,6 +68,11 @@ CPPUNIT_TEST_SUITE_REGISTRATION(ChainableMockObject_4_void_test); +typedef mockpp::Invocation4<unsigned, unsigned, unsigned, unsigned> mockpp_Invocation4_unsigned_unsigned_unsigned_unsigned; + +MOCKPP_PTI_DECLARE(mockpp_Invocation4_unsigned_unsigned_unsigned_unsigned) + + class MyChainableMockObject_4_void : public mockpp::ChainableMockObject { public: @@ -108,41 +117,44 @@ .with(mockpp::eq( (unsigned int) 54), mockpp::eq( (unsigned int) 43), mockpp::eq( (unsigned int) 32), - mockpp::eq( (unsigned int) 21)) + mockpp::eq( (unsigned int) 21)) .will(mockpp::throwException<void, int>(4321)); - + try { - mcm.chainable(12, 23, 34, 45); + mcm.chainable(12, 23, 34, 45); CPPUNIT_ASSERT_MESSAGE("should have thrown", false); } catch(int i) { CPPUNIT_ASSERT(i == 1234); } - + try { - mcm.chainable(54, 43, 32, 21); + mcm.chainable(54, 43, 32, 21); CPPUNIT_ASSERT_MESSAGE("should have thrown", false); } catch(int i) { CPPUNIT_ASSERT(i == 4321); } - + try { - mcm.chainable(1, 2, 3, 4); + mcm.chainable(1, 2, 3, 4); CPPUNIT_ASSERT_MESSAGE("should have thrown", false); } catch(mockpp::AssertionFailedError &ex) { CPPUNIT_ASSERT(ex.getMessage().find(MOCKPP_PCHAR("unexpected invocation")) != mockpp::String::npos); } - - mcm.verify(); + + mcm.verify(); } +MOCKPP_PTI_IMPLEMENT(mockpp_Invocation4_unsigned_unsigned_unsigned_unsigned) + + #endif // HAVE_CPPUNIT Index: ChainableMockObject_3_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_3_void_test.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- ChainableMockObject_3_void_test.cpp 30 Dec 2004 20:54:05 -0000 1.5 +++ ChainableMockObject_3_void_test.cpp 25 Mar 2005 16:30:30 -0000 1.6 @@ -37,6 +37,10 @@ #else +#ifdef MOCKPP_PTI_WEAKNESS +#include <mockpp/chaining/mockpp_pti.h> +#endif + #include <mockpp/ChainableMockObject.h> #include <cppunit/extensions/HelperMacros.h> @@ -63,6 +67,10 @@ CPPUNIT_TEST_SUITE_REGISTRATION(ChainableMockObject_3_void_test); +typedef mockpp::Invocation3<unsigned, unsigned, unsigned> mockpp_Invocation3_unsigned_unsigned_unsigned; + +MOCKPP_PTI_DECLARE(mockpp_Invocation3_unsigned_unsigned_unsigned) + class MyChainableMockObject_3_void : public mockpp::ChainableMockObject { @@ -106,41 +114,44 @@ chain.stubs(mockpp::once()) .with(mockpp::eq( (unsigned int) 43), mockpp::eq( (unsigned int) 32), - mockpp::eq( (unsigned int) 21)) + mockpp::eq( (unsigned int) 21)) .will(mockpp::throwException<void, int>(321)); - + try { - mcm.chainable(12, 23, 34); + mcm.chainable(12, 23, 34); CPPUNIT_ASSERT_MESSAGE("should have thrown", false); } catch(int i) { CPPUNIT_ASSERT(i == 123); } - + try { - mcm.chainable(43, 32, 21); + mcm.chainable(43, 32, 21); CPPUNIT_ASSERT_MESSAGE("should have thrown", false); } catch(int i) { CPPUNIT_ASSERT(i == 321); } - + try { - mcm.chainable(1, 2, 3); + mcm.chainable(1, 2, 3); CPPUNIT_ASSERT_MESSAGE("should have thrown", false); } catch(mockpp::AssertionFailedError &ex) { CPPUNIT_ASSERT(ex.getMessage().find(MOCKPP_PCHAR("unexpected invocation")) != mockpp::String::npos); } - - mcm.verify(); + + mcm.verify(); } +MOCKPP_PTI_IMPLEMENT(mockpp_Invocation3_unsigned_unsigned_unsigned) + + #endif // HAVE_CPPUNIT |
