mockpp-commits Mailing List for Mock Objects for C++ (Page 8)
Brought to you by:
ewald-arnold
Menu
▾
▴
mockpp-commits
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
(17) |
Mar
(178) |
Apr
(119) |
May
(60) |
Jun
(3) |
Jul
(60) |
Aug
(16) |
Sep
(55) |
Oct
(156) |
Nov
(136) |
Dec
(255) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(98) |
Feb
(8) |
Mar
(57) |
Apr
(43) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Ewald A. <ewa...@us...> - 2006-01-03 15:12:51
|
Update of /cvsroot/mockpp/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4137 Modified Files: mockpp.doxygen.in Log Message: fix docs Index: mockpp.doxygen.in =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp.doxygen.in,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- mockpp.doxygen.in 29 Dec 2005 19:29:49 -0000 1.20 +++ mockpp.doxygen.in 3 Jan 2006 15:12:34 -0000 1.21 @@ -211,7 +211,7 @@ # Private class members and static file members will be hidden unless # the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES -EXTRACT_ALL = YES +EXTRACT_ALL = NO # If the EXTRACT_PRIVATE tag is set to YES all private members of a class # will be included in the documentation. @@ -249,7 +249,7 @@ # If set to NO (the default) these classes will be included in the various # overviews. This option has no effect if EXTRACT_ALL is enabled. -HIDE_UNDOC_CLASSES = YES +HIDE_UNDOC_CLASSES = NO # If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all # friend (class|struct|union) declarations. @@ -401,7 +401,7 @@ # for undocumented members. If EXTRACT_ALL is set to YES then this flag will # automatically be disabled. -WARN_IF_UNDOCUMENTED = NO +WARN_IF_UNDOCUMENTED = YES # If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for # potential errors in the documentation, such as not documenting some @@ -1005,9 +1005,11 @@ PREDEFINED = \ DOXYGEN \ MOCKPP_USE_INVOCATION_EQUALS \ + MOCKPP_USE_CXXTEST \ + MOCKPP_USE_CPPUNIT \ + MOCKPP_USE_BOOSTTEST \ HAVE_ICONV_H \ HAVE_LIMITS \ - HAVE_CPPUNIT \ MOCKPP_BOUNDARY_DELTA \ DOXYGEN_SHOULD_SKIP_THIS \ DOXYGEN_SHOULD_SKIP_THIS \ |
|
From: Ewald A. <ewa...@us...> - 2006-01-03 15:12:51
|
Update of /cvsroot/mockpp/mockpp/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4137/mockpp Modified Files: mockpp.h Log Message: fix docs Index: mockpp.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/mockpp.h,v retrieving revision 1.71 retrieving revision 1.72 diff -u -d -r1.71 -r1.72 --- mockpp.h 30 Dec 2005 12:43:17 -0000 1.71 +++ mockpp.h 3 Jan 2006 15:12:34 -0000 1.72 @@ -27,6 +27,9 @@ **/ +/** @defgroup grp_config Configuration elements. + */ + /** @defgroup grp_helper General helper classes */ @@ -75,7 +78,9 @@ - \ref grp_constraint - \ref grp_constraint_abbrev - \ref grp_helper + - \ref grp_framework - \ref grp_production + - \ref grp_config */ @@ -486,6 +491,7 @@ * Actually it is invoked instead of throwing exceptions. * @param fwd pointer to function. * @return previous pointer + * @ingroup grp_config */ AssertionFailedForwarder_t setAssertionFailedForwarder(AssertionFailedForwarder_t fwd); @@ -508,12 +514,35 @@ # define MOCKPP_MEMBER_RESTRICTOR_PROTECTED protected #endif +#ifdef DOXYGEN +#define MOCKPP_UNICODE +#define CXXTEST_USE_MINI_STL +#define MOCKPP_USE_MINI_STL +#endif + +/** @def MOCKPP_UNICODE + * @ingroup grp_config + * Defined if \c Unicode strings are used. + */ + +/** @def CXXTEST_USE_MINI_STL + * @ingroup grp_config + * Defined if CxxTest uses the alternative STL implementation below + * 3party/ministl instead of the regular STL. + */ + +/** @def MOCKPP_USE_MINI_STL + * @ingroup grp_config + * Defined if mockpp uses the alternative STL implementation below + * 3party/ministl instead of the regular STL. + */ + /** @def MOCKPP_MEMBER_RESTRICTOR_PRIVATE - * Make member public for Borland BCB5. + * Makes member public for Borland BCB5 otherwise private. */ /** @def MOCKPP_MEMBER_RESTRICTOR_PROTECTED - * Make member public for Borland BCB5. + * Makes member public for Borland BCB5 otherwise protected. */ #endif // MOCKPP_H |
|
From: Ewald A. <ewa...@us...> - 2006-01-03 15:12:49
|
Update of /cvsroot/mockpp/mockpp/mockpp/framework In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4137/mockpp/framework Modified Files: CxxTestRunner.h CxxTestSupport.h SelectUnittestFramework.h VerifyingTestCaller.h VerifyingTestCase.h Log Message: fix docs Index: CxxTestRunner.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/framework/CxxTestRunner.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- CxxTestRunner.h 30 Dec 2005 14:18:30 -0000 1.4 +++ CxxTestRunner.h 3 Jan 2006 15:12:34 -0000 1.5 @@ -43,6 +43,7 @@ /** Helper class to run tests with CxxTest framework. + * @ingroup grp_framework */ class CxxTestRunner : public CxxTest::TestRunner { Index: VerifyingTestCaller.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/framework/VerifyingTestCaller.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- VerifyingTestCaller.h 29 Dec 2005 19:29:51 -0000 1.4 +++ VerifyingTestCaller.h 3 Jan 2006 15:12:34 -0000 1.5 @@ -47,6 +47,7 @@ /** VerifyingTestCaller that verifies Verifiable * fields and registered Verifiable objects after the test has run and before the fixture * has been torn down. + * @ingroup grp_framework * @ingroup grp_basic_mo * @ingroup grp_advanced_mo */ Index: VerifyingTestCase.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/framework/VerifyingTestCase.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- VerifyingTestCase.h 29 Dec 2005 19:29:51 -0000 1.4 +++ VerifyingTestCase.h 3 Jan 2006 15:12:34 -0000 1.5 @@ -51,6 +51,7 @@ /** TestCase that verifies Verifiable * fields and registered Verifiable objects after the test has run and before the fixture * has been torn down. + * @ingroup grp_framework * @ingroup grp_basic_mo * @ingroup grp_advanced_mo */ Index: SelectUnittestFramework.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/framework/SelectUnittestFramework.h,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- SelectUnittestFramework.h 1 Jan 2006 19:40:36 -0000 1.10 +++ SelectUnittestFramework.h 3 Jan 2006 15:12:34 -0000 1.11 @@ -30,6 +30,51 @@ #ifndef MOCKPP_SELECTUNITTESTFRAMEWORK_H #define MOCKPP_SELECTUNITTESTFRAMEWORK_H +/** @defgroup grp_framework Support for test frameworks. + * Mockpp as no test framework of its own. For that reason + * there is support for various existing test frameworks. + */ + +/** @def MOCKPP_DERIVE_PUBLIC_UNITFRAMEWORK + * @ingroup grp_framework + * Contains a code fragment to create a test suite that contains + * one or more test cases which are arranged as class methods. + * This is done by publicly deriving from an according class of + * the test framework. + * For frameworks that don't support this, the macro is empty. + */ + +/** @def MOCKPP_TESTMETHOD_DECL + * @ingroup grp_framework + * Depending on the test framework the test methods are + * regular class methods or rather static to react like free + * functions. So this macro is used to declare the methods accordingly. + */ + +#ifdef DOXYGEN +#define MOCKPP_USE_CXXTEST +#define MOCKPP_USE_CPPUNIT +#define MOCKPP_USE_BOOSTTEST +#endif + +/** @def MOCKPP_USE_CXXTEST + * @ingroup grp_framework + * @ingroup grp_config + * Defined if CxxTest is used as framework. + */ + +/** @def MOCKPP_USE_CPPUNIT + * @ingroup grp_framework + * @ingroup grp_config + * Defined if CppUnit is used as framework. + */ + +/** @def MOCKPP_USE_BOOSTTEST + * @ingroup grp_framework + * @ingroup grp_config + * Defined if Boost.Test is used as framework. + */ + //================================================= #if defined(MOCKPP_USE_CXXTEST) //================================================= @@ -75,7 +120,12 @@ # define MOCKPP_DERIVE_PUBLIC_UNITFRAMEWORK /* : public boost::test_case */ -// this is a part of boost macro BOOST_AUTO_UNIT_TEST +/** Register a method as test. + * The content of this macro is a part of boost macro + * BOOST_AUTO_UNIT_TEST + * @ingroup grp_framework + * @param funcname name of the free function or static class method. + */ # define MOCKPP_BOOST_TEST(func_name) \ static boost::unit_test_framework::detail::auto_unit_test_registrar \ BOOST_JOIN( test_registrar, __LINE__) \ Index: CxxTestSupport.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/framework/CxxTestSupport.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- CxxTestSupport.h 29 Dec 2005 19:29:51 -0000 1.2 +++ CxxTestSupport.h 3 Jan 2006 15:12:34 -0000 1.3 @@ -33,6 +33,10 @@ //////////////////////////////////////////////////////////////////////////// // +/** Register a class with methods as a test suite. + * @ingroup grp_framework + * @param classname name of the class + */ #define MOCKPP_CXXTEST_SUITE_REGISTRATION(classname) \ static classname suite_ ## classname; \ \ @@ -47,6 +51,11 @@ //////////////////////////////////////////////////////////////////////////// // +/** Register a method as test. + * @ingroup grp_framework + * @param classname name of the class + * @param meth name of the method + */ #define MOCKPP_CXXTEST(classname, meth) \ static class TestDescription_ ## classname ## _ ## meth \ : public CxxTest::RealTestDescription { \ |
|
From: Ewald A. <ewa...@us...> - 2006-01-03 15:12:49
|
Update of /cvsroot/mockpp/mockpp/mockpp/visiting In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4137/mockpp/visiting Modified Files: VisitableMockObject.cpp VisitableMockObject.h Log Message: fix docs Index: VisitableMockObject.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/visiting/VisitableMockObject.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- VisitableMockObject.cpp 29 Dec 2005 19:29:52 -0000 1.3 +++ VisitableMockObject.cpp 3 Jan 2006 15:12:35 -0000 1.4 @@ -150,7 +150,7 @@ ///////////////////////////////////////////////////////////////// -MOCKPP_EXPORT VisitableMockObject::Controller::~Controller() +MOCKPP_EXPORT VisitableMockObjectBase::Controller::~Controller() { } Index: VisitableMockObject.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/visiting/VisitableMockObject.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- VisitableMockObject.h 29 Dec 2005 19:29:52 -0000 1.3 +++ VisitableMockObject.h 3 Jan 2006 15:12:35 -0000 1.4 @@ -181,7 +181,7 @@ public: /** Destructs a controller for the according method. - * Basically unregisters the ccontroller with it's mock object. + * Basically unregisters the controller with it's mock object. * @internal */ virtual ~Controller() = 0; |
|
From: Ewald A. <ewa...@us...> - 2006-01-03 15:12:46
|
Update of /cvsroot/mockpp/mockpp/mockpp/docs/en In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4137/mockpp/docs/en Modified Files: dev_test_framework.docbook index.docbook Log Message: fix docs Index: index.docbook =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/docs/en/index.docbook,v retrieving revision 1.37 retrieving revision 1.38 diff -u -d -r1.37 -r1.38 --- index.docbook 29 Dec 2005 19:29:51 -0000 1.37 +++ index.docbook 3 Jan 2006 15:12:34 -0000 1.38 @@ -9,12 +9,12 @@ <!ENTITY mockpp '<application>mockpp</application>' > <!ENTITY cppunit '<application>CppUnit</application>' > <!ENTITY cxxtest '<application>CxxTest</application>' > - <!ENTITY boosttest '<application>Boost.Test</application>' > + <!ENTITY boost.test '<application>Boost.Test</application>' > <!ENTITY cygwin '<application>Cygwin</application>' > <!ENTITY copyyears '2002-2006' > <!ENTITY mockpp_email 'mockpp at ewald-arnold dot de' > <!ENTITY release_date '<pubdate>Published: <?dbtimestamp format="Y-m-d"?></pubdate>' > - <!ENTITY release_info '<releaseinfo>1.11.00</releaseinfo>' > + <!ENTITY release_info '<releaseinfo>1.11.01</releaseinfo>' > <!ENTITY chap_bookinfo SYSTEM 'bookinfo.docbook' > <!ENTITY chap_intro SYSTEM 'intro.docbook' > Index: dev_test_framework.docbook =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/docs/en/dev_test_framework.docbook,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- dev_test_framework.docbook 28 Dec 2005 09:23:30 -0000 1.4 +++ dev_test_framework.docbook 3 Jan 2006 15:12:34 -0000 1.5 @@ -8,8 +8,9 @@ leaks since the compiler adds code to destruct automatic variables.</para> <para>The following section lists frameworks which have actually been used to -verify the correctness of &mockpp;. Or at least they are known to work -properly.</para> +verify the correctness of &mockpp;. Each of the frameworks supports the automatic +registration of tests. +Additionally &mockpp; contains some specialised macros for better integration.</para> <sect2 id="framework-cppunit"> <title>CppUnit</title> @@ -43,6 +44,8 @@ ... } +CPPUNIT_TEST_SUITE_REGISTRATION (AssertMo_test); + </programlisting> </sect2> @@ -81,30 +84,89 @@ void test_A_includes(); }; +void AssertMo_test::test_A_includes() +{ + ... +} + MOCKPP_CXXTEST_SUITE_REGISTRATION( AssertMo_test ); MOCKPP_CXXTEST(AssertMo_test, test_A_includes); +</programlisting> + +</sect2> + +<sect2 id="framework-boost"> +<title>Boost.Test</title> + +<para>Boost.Test does not need test methods which reside in classes. It is also +possible to use free functions. On the other hand there is no mechanism +with <function>setup()</function>/<function>teardown()</function> like in +&cppunit; or &cxxtest;. Another advantage of &boost.test; is the possibility +to catch system exceptions or limit execution time with timeouts.</para> + +<programlisting> + +void test_freeFunction() +{ + ... +} + +class AssertMo_test +{ + public: + + static void test_A_includes(); +}; + void AssertMo_test::test_A_includes() { ... } +void test_freeFunction() +{ + ... +} + +MOCKPP_BOOST_TEST(test_freeFunction); +MOCKPP_BOOST_TEST(AssertMo_test::test_A_includes); + </programlisting> </sect2> -<sect2 id="framework-boost"> -<title>Boost.Test</title> +<sect2 id="framework-select"> +<title>Selecting a Framework at Compile Time</title> -<para>TBD</para> +<para>Since each of the frameworks has its special advantage it may be necessary to +switch at compile time under different environments. On a desktop computer +&boost.test; may be appropriate but for special tests on embedded platforms you +may prefer &cxxtest;.</para> -<!-- -As opposed to the previous frameworks &boosttest; does not use +<para>&mockpp; uses some compiler switches and conditional macros to support the +formerly mentioned frameworks. The tests itself remain unchanged. Only the method +to register the tests and the invocation within <function>main()</function> +differs. Please see the various tests files <filename>*_tests.cpp</filename> and +<filename>mock_test.cpp</filename> in the <filename>tests</filename> directory. +Depending on the definition in the configuration file one of the following macros +is used to generate the according code. +<filename>SelectUnittestFramework.h</filename> contains all the definitions and +includes the needed header files.</para> <programlisting> -</programlisting> ---> +#include <mockpp/SelectUnittestFramework.h> + +#if defined (MOCKPP_USE_CXXTEST) + +#elif defined(MOCKPP_USE_BOOSTTEST) + +#elif defined(MOCKPP_USE_CXXTEST) + +#endif + +</programlisting> </sect2> |
|
From: Ewald A. <ewa...@us...> - 2006-01-02 21:20:05
|
Update of /cvsroot/mockpp/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6309 Modified Files: TODO Log Message: update Index: TODO =================================================================== RCS file: /cvsroot/mockpp/mockpp/TODO,v retrieving revision 1.54 retrieving revision 1.55 diff -u -d -r1.54 -r1.55 --- TODO 30 Dec 2005 14:18:46 -0000 1.54 +++ TODO 2 Jan 2006 21:19:54 -0000 1.55 @@ -7,15 +7,17 @@ ThreadedTest -Boost.Test - check sprintf_s check qt check x11 +PDF aufbereiten + DOC: ---- +Boost.Test + explain options in config files Problem Exception-Transformation?? |
|
From: Ewald A. <ewa...@us...> - 2006-01-02 21:19:50
|
Update of /cvsroot/mockpp/mockpp/mockpp/docs/en In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6275/mockpp/docs/en Modified Files: Makefile.am Added Files: customize-pdf.xsl Log Message: customize pdf --- NEW FILE: customize-pdf.xsl --- <?xml version='1.0'?> <!-- Customisation for pdf-files $Id: customize-pdf.xsl,v 1.1 2006/01/02 21:19:41 ewald-arnold Exp $ --> <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"> <xsl:import href="http://docbook.sourceforge.net/release/xsl/current/fo/docbook.xsl"/> <xsl:param name="admon.graphics" select="1"/> <xsl:param name="linenumbering.extension" select="1"/> <xsl:param name="chapter.autolabel" select="1"/> <xsl:param name="appendix.autolabel" select="1"/> <xsl:param name="section.autolabel" select="1"/> <xsl:param name="section.label.includes.component.label" select="1"/> <xsl:param name="section.autolabel.max.depth" select="2"/> <xsl:param name="callout.graphics.number.limit" select="'15'"/> <xsl:param name="callout.unicode" select="'1'"/> <xsl:param name="callout.graphics" select="'0'"/> <!-- xsl:param name="callout.graphics.path" select="images/callouts-pdf/"/ --> <xsl:param name="use.id.as.filename" select="'1'"/> <xsl:param name="use.extensions" select="'0'"/> </xsl:stylesheet> Index: Makefile.am =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/docs/en/Makefile.am,v retrieving revision 1.42 retrieving revision 1.43 diff -u -d -r1.42 -r1.43 --- Makefile.am 28 Dec 2005 19:40:58 -0000 1.42 +++ Makefile.am 2 Jan 2006 21:19:41 -0000 1.43 @@ -63,7 +63,7 @@ -rm -rf ./var/*.pdf cp -R $(srcdir)/common var cp -R $(srcdir)/images var - xsltproc --nonet --output var/mockpp.fo http://docbook.sourceforge.net/release/xsl/current/fo/docbook.xsl $(srcdir)/index.docbook + xsltproc --nonet --output var/mockpp.fo $(srcdir)/customize-pdf.xsl $(srcdir)/index.docbook fop var/mockpp.fo var/mockpp.pdf && cp -v var/mockpp.pdf $(top_builddir)/mockpp-$(VERSION)-handbook.pdf svg-files: |
|
From: Ewald A. <ewa...@us...> - 2006-01-02 20:33:14
|
Update of /cvsroot/mockpp/mockpp/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27607/mockpp Modified Files: Makefile.am Log Message: update Index: Makefile.am =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/Makefile.am,v retrieving revision 1.107 retrieving revision 1.108 diff -u -d -r1.107 -r1.108 --- Makefile.am 30 Dec 2005 12:43:17 -0000 1.107 +++ Makefile.am 2 Jan 2006 20:33:03 -0000 1.108 @@ -78,6 +78,7 @@ grep MOCKPP_USE_MINI_STL ../config.h >>$@ grep MOCKPP_USE_CXXTEST ../config.h >>$@ grep MOCKPP_USE_CPPUNIT ../config.h >>$@ + grep MOCKPP_USE_BOOSTTEST ../config.h >>$@ grep MOCKPP_NO_RTTI ../config.h >>$@ grep MOCKPP_NO_EXCEPTIONS ../config.h >>$@ -test $@ -ef $(srcdir) || cp $@ $(srcdir) |
|
From: Ewald A. <ewa...@us...> - 2006-01-02 20:29:59
|
Update of /cvsroot/mockpp/mockpp/bcb5 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26964/bcb5 Modified Files: Makefile.am Log Message: update project files Index: Makefile.am =================================================================== RCS file: /cvsroot/mockpp/mockpp/bcb5/Makefile.am,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- Makefile.am 29 Dec 2005 12:08:35 -0000 1.15 +++ Makefile.am 2 Jan 2006 20:29:50 -0000 1.16 @@ -38,13 +38,7 @@ mock_test.bpf \ mock_test.bpr \ mock_test_win32.bpf \ - mock_test_win32.bpr \ - jmock_test.bpf \ - jmock_test.bpr - -jmock_test_count: - grep cpp $(srcdir)/jmock_test.bpf | sort >jmock_test.files - cat jmock_test.files | wc -l ; echo "Dateien in jmock_test"; + mock_test_win32.bpr mock_test_count: grep cpp $(srcdir)/mock_test.bpf | sort >mock_test.files |
|
From: Ewald A. <ewa...@us...> - 2006-01-02 20:28:44
|
Update of /cvsroot/mockpp/mockpp/3party/cxxtest/cxxtest In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26733/3party/cxxtest/cxxtest Modified Files: Descriptions.cpp Log Message: update Index: Descriptions.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/3party/cxxtest/cxxtest/Descriptions.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Descriptions.cpp 10 Dec 2005 15:13:16 -0000 1.3 +++ Descriptions.cpp 2 Jan 2006 20:28:33 -0000 1.4 @@ -57,3 +57,4 @@ } #endif // __cxxtest__Descriptions_cpp__ + |
|
From: Ewald A. <ewa...@us...> - 2006-01-02 20:28:09
|
Update of /cvsroot/mockpp/mockpp/mockpp/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26634/mockpp/tests Modified Files: mock_test.cpp Log Message: fix dependency Index: mock_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/mock_test.cpp,v retrieving revision 1.39 retrieving revision 1.40 diff -u -d -r1.39 -r1.40 --- mock_test.cpp 2 Jan 2006 15:40:22 -0000 1.39 +++ mock_test.cpp 2 Jan 2006 20:27:57 -0000 1.40 @@ -61,10 +61,10 @@ #elif defined(GUI_WIN32) # include <cxxtest/StdioPrinter.h> # include <cxxtest/Win32Gui.h> -#else -# include <cxxtest/ErrorPrinter.h> #endif +#include <cxxtest/ErrorPrinter.h> + #elif defined(MOCKPP_USE_BOOSTTEST) #include <boost/test/auto_unit_test.hpp> |
|
From: Ewald A. <ewa...@us...> - 2006-01-02 20:25:23
|
Update of /cvsroot/mockpp/mockpp/msvc2005/mockpp/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26135/msvc2005/mockpp/tests Modified Files: mock_test_win32.vcproj Log Message: update project files Index: mock_test_win32.vcproj =================================================================== RCS file: /cvsroot/mockpp/mockpp/msvc2005/mockpp/tests/mock_test_win32.vcproj,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- mock_test_win32.vcproj 28 Dec 2005 19:43:09 -0000 1.2 +++ mock_test_win32.vcproj 2 Jan 2006 20:25:15 -0000 1.3 @@ -135,7 +135,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\..;..\..\..\3party\cxxtest;..\..\..\3party;"G:\data\src\cppunit-1.10.2\include";"$(CPPUNIT_ROOT)/include"" + AdditionalIncludeDirectories=""C:\Programme\Microsoft Platform SDK\Include";..\..\..;..\..\..\3party\cxxtest;..\..\..\3party;"G:\data\src\cppunit-1.10.2\include";"$(CPPUNIT_ROOT)/include"" PreprocessorDefinitions="WIN32" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -162,11 +162,11 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="mockpp.lib mockpp_cxxtest.lib" + AdditionalDependencies="mockpp.lib mockpp_cxxtest.lib user32.lib mockpp_production.lib" OutputFile="$(TEMP)\compile\mockpp\tests\Debug/mock_test_win32.exe" LinkIncremental="2" SuppressStartupBanner="true" - AdditionalLibraryDirectories="../../lib,$(CPPUNIT_ROOT)/lib" + AdditionalLibraryDirectories=""C:\Programme\Microsoft Platform SDK\Lib";../../lib;"$(CPPUNIT_ROOT)/lib"" GenerateDebugInformation="true" ProgramDatabaseFile="$(TEMP)\compile\mockpp\tests\Debug/mock_test_win32.pdb" SubSystem="1" |
Update of /cvsroot/mockpp/mockpp/bcb5 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26025/bcb5 Modified Files: basicmock.bpf basicmock.bpr chainmock.bpf chainmock.bpr chainmock2.bpf chainmock2.bpr cppunit.bpf cppunit.bpr gen-mak.bat jmock_test.bpf jmock_test.bpr mock_greeter.bpf mock_greeter.bpr mock_test.bpf mock_test.bpr mock_test_win32.bpf mock_test_win32.bpr mockpp.bpf mockpp.bpg mockpp.bpr mockpp_cxxtest.bpr mockpp_production.bpr poormock-se.bpf poormock-se.bpr poormock.bpf poormock.bpr readability.bpf readability.bpr verifying.bpf verifying.bpr visitmock.bpf visitmock.bpr visitmock2.bpf visitmock2.bpr Log Message: update project files Index: visitmock2.bpr =================================================================== RCS file: /cvsroot/mockpp/mockpp/bcb5/visitmock2.bpr,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- visitmock2.bpr 28 Dec 2005 19:43:08 -0000 1.5 +++ visitmock2.bpr 2 Jan 2006 20:24:56 -0000 1.6 @@ -3,13 +3,13 @@ <PROJECT> <MACROS> <VERSION value="BCB.05.03"/> - <PROJECT value="h:\tmp\compile\visitmock2_34.exe"/> - <OBJFILES value="h:\tmp\compile\mockpp_34\\visitmock2.obj - h:\tmp\compile\mockpp_34\\consumer.obj"/> + <PROJECT value="c:\tmp\compile\visitmock2_34.exe"/> + <OBJFILES value="c:\tmp\compile\mockpp_34\\visitmock2.obj + c:\tmp\compile\mockpp_34\\consumer.obj"/> <RESFILES value=""/> <DEFFILE value=""/> <RESDEPEN value="$(RESFILES)"/> - <LIBFILES value="h:\tmp\compile\mockpp_34.lib"/> + <LIBFILES value="c:\tmp\compile\mockpp_34.lib"/> <LIBRARIES value=""/> <SPARELIBS value=""/> <PACKAGES value="VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi @@ -32,11 +32,11 @@ </MACROS> <OPTIONS> <CFLAG1 value="-vGc -vGt -vGd -Od -Vx -Ve -X- -r- -a8 -b- -k -y -v -vi- -tWC -tWM -c"/> - <PFLAGS value="-N2"h:\tmp\compile\mockpp_34\" -N0"h:\tmp\compile\mockpp_34\" -$YD -$W + <PFLAGS value="-N2"c:\tmp\compile\mockpp_34\" -N0"c:\tmp\compile\mockpp_34\" -$YD -$W -$O- -v -JPHNE -M"/> <RFLAGS value=""/> <AFLAGS value="/mx /w2 /zd"/> - <LFLAGS value="-l"h:\tmp\compile\" -I"h:\tmp\compile\mockpp_34\" -D"" -ap -Tpe -x -Gn -v"/> + <LFLAGS value="-l"c:\tmp\compile\" -I"c:\tmp\compile\mockpp_34\" -D"" -ap -Tpe -x -Gn -v"/> </OPTIONS> <LINKER> <ALLOBJ value="c0x32.obj $(PACKAGES) $(OBJFILES)"/> @@ -73,36 +73,36 @@ [HistoryLists\hlIncludePath] Count=30 -Item0=..\3party;..;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include\ -Item1=..\mockpp\examples\tutorial;..;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include\ -Item2=..\.;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include -Item3=..\mockpp\examples\tutorial;..\mockpp_34\examples\tutorial;..\mockpp_34\examples;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include -Item4=..\mockpp\examples\tutorial;..\mockpp_34\examples\tutorial;..\mockpp_34\examples;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include -Item5=..\mockpp_34\examples\tutorial;..\mockpp_34\examples;..;$(BCB)\include;..\..\..\cppunit.ups\include -Item6=..\mockpp_34\examples\tutorial;..\mockpp_34\examples;..\mockpp_34\tests;..;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include -Item7=..\mockpp_34\examples;..\mockpp_34\tests;..\..\mockpp;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include -Item8=..\mockpp_34\tests;..;$(BCB)\include;..\..\cppunit\include;X:\src\cppunit-1.8.0\include -Item9=..\mockpp_34\tests;..;$(BCB)\include;..\..\cppunit\include -Item10=..\mockpp_34\tests;..;$(BCB)\include;B:\cvs\ups\src\3party\cppunit\include -Item11=..\mockpp_34\tests;..;$(BCB)\include;..\..\..\cppunit-1.8.0\include -Item12=..;$(BCB)\include;..\..\..\cppunit-1.8.0\include -Item13=..\mockpp_34\tests;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp_34\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.8.0\include -Item14=..;$(BCB)\include;X:\src\cppunit-1.8.0\include -Item15=\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp_34\tests;..\..\mockpp;..\mockpp_34\tests;..\mockpp;..\expat;$(BCB)\include -Item16=..;..\mockpp_34\tests;..\mockpp;..\expat;$(BCB)\include -Item17=..\..\mockpp;..\mockpp_34\tests;..\mockpp;..\expat;$(BCB)\include -Item18=..\..\mockpp;..\mockpp_34\tests;..\mockpp;..\expat;$(BCB)\include;$(BCB)\include\vcl;h:\wx2\include\ -Item19=.. ;..\mockpp_34\tests;..\mockpp;..\expat;$(BCB)\include;$(BCB)\include\vcl;h:\wx2\include\ -Item20=.. ;..\mockpp_34\tests;..\expat;..\mockpp;$(BCB)\include;$(BCB)\include\vcl;h:\wx2\include -Item21=..\mockpp_34\tests;..\expat;..\mockpp;$(BCB)\include;$(BCB)\include\vcl -Item22=..\mockpp_34\tests;..\mockpp;$(BCB)\include;$(BCB)\include\vcl;expat -Item23=..\mockpp;$(BCB)\include;$(BCB)\include\vcl;expat -Item24=..\mockpp_34\tests;..\mockpp;$(BCB)\include;$(BCB)\include\vcl -Item25=..\mockpp_34\tests;..\mockpp;$(BCB)\include -Item26=..\mockpp_34\tests;..\mockpp;$(BCB)/include -Item27=..\mockpp_34\tests;..\mockpp -Item28=..\mockpp -Item29=..\mockpp_34\tests;..\mockpp_34\mockpp +Item0=..\mockpp\examples\tutorial;..\3party;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include +Item1=..\3party;..;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include\ +Item2=..\mockpp\examples\tutorial;..;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include\ +Item3=..\.;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include +Item4=..\mockpp\examples\tutorial;..\mockpp_34\examples\tutorial;..\mockpp_34\examples;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include +Item5=..\mockpp\examples\tutorial;..\mockpp_34\examples\tutorial;..\mockpp_34\examples;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include +Item6=..\mockpp_34\examples\tutorial;..\mockpp_34\examples;..;$(BCB)\include;..\..\..\cppunit.ups\include +Item7=..\mockpp_34\examples\tutorial;..\mockpp_34\examples;..\mockpp_34\tests;..;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include +Item8=..\mockpp_34\examples;..\mockpp_34\tests;..\..\mockpp;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include +Item9=..\mockpp_34\tests;..;$(BCB)\include;..\..\cppunit\include;X:\src\cppunit-1.8.0\include +Item10=..\mockpp_34\tests;..;$(BCB)\include;..\..\cppunit\include +Item11=..\mockpp_34\tests;..;$(BCB)\include;B:\cvs\ups\src\3party\cppunit\include +Item12=..\mockpp_34\tests;..;$(BCB)\include;..\..\..\cppunit-1.8.0\include +Item13=..;$(BCB)\include;..\..\..\cppunit-1.8.0\include +Item14=..\mockpp_34\tests;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp_34\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.8.0\include +Item15=..;$(BCB)\include;X:\src\cppunit-1.8.0\include +Item16=\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp_34\tests;..\..\mockpp;..\mockpp_34\tests;..\mockpp;..\expat;$(BCB)\include +Item17=..;..\mockpp_34\tests;..\mockpp;..\expat;$(BCB)\include +Item18=..\..\mockpp;..\mockpp_34\tests;..\mockpp;..\expat;$(BCB)\include +Item19=..\..\mockpp;..\mockpp_34\tests;..\mockpp;..\expat;$(BCB)\include;$(BCB)\include\vcl;h:\wx2\include\ +Item20=.. ;..\mockpp_34\tests;..\mockpp;..\expat;$(BCB)\include;$(BCB)\include\vcl;h:\wx2\include\ +Item21=.. ;..\mockpp_34\tests;..\expat;..\mockpp;$(BCB)\include;$(BCB)\include\vcl;h:\wx2\include +Item22=..\mockpp_34\tests;..\expat;..\mockpp;$(BCB)\include;$(BCB)\include\vcl +Item23=..\mockpp_34\tests;..\mockpp;$(BCB)\include;$(BCB)\include\vcl;expat +Item24=..\mockpp;$(BCB)\include;$(BCB)\include\vcl;expat +Item25=..\mockpp_34\tests;..\mockpp;$(BCB)\include;$(BCB)\include\vcl +Item26=..\mockpp_34\tests;..\mockpp;$(BCB)\include +Item27=..\mockpp_34\tests;..\mockpp;$(BCB)/include +Item28=..\mockpp_34\tests;..\mockpp +Item29=..\mockpp [HistoryLists\hlLibraryPath] Count=19 @@ -138,8 +138,8 @@ [HistoryLists\hlIntOutputDir] Count=7 -Item0=h:\tmp\compile\mockpp_34\ -Item1=h:\tmp\compile\mockpp_34\ulxr_bcb5\ +Item0=c:\tmp\compile\mockpp_34\ +Item1=c:\tmp\compile\mockpp_34\ulxr_bcb5\ Item2=h:\temp Item3=output Item4=E:\Eigene Dateien\c++\mockpp_34\bcb5\output\ @@ -148,9 +148,9 @@ [HistoryLists\hlFinalOutputDir] Count=8 -Item0=h:\tmp\compile\ -Item1=h:\tmp\compile -Item2=h:\tmp\compile\mockpp_34\ +Item0=c:\tmp\compile\ +Item1=c:\tmp\compile +Item2=c:\tmp\compile\mockpp_34\ Item3=h:\temp Item4=output\ Item5=E:\Eigene Dateien\c++\mockpp_34\bcb5\output\ @@ -159,10 +159,10 @@ [HistoryLists\hIBPIOutputDir] Count=10 -Item0=h:\tmp\compile\ -Item1=h:\tmp\compile -Item2=h:\tmp\compile\mockpp_34\ -Item3=h:\tmp\compile\mockpp_34\ulxr_bcb5\ +Item0=c:\tmp\compile\ +Item1=c:\tmp\compile +Item2=c:\tmp\compile\mockpp_34\ +Item3=c:\tmp\compile\mockpp_34\ulxr_bcb5\ Item4=h:\temp Item5=e:\Eigene Dateien\c++\mockpp_34\bcb5\output\ Item6=output\ @@ -183,5 +183,11 @@ [Compiler] ShowInfoMsgs=0 LinkDebugVcl=0 +LinkCGLIB=1 + +[Language] +ActiveLang= +ProjectLang= +RootDir= </IDEOPTIONS> </PROJECT> \ No newline at end of file Index: mock_test.bpf =================================================================== RCS file: /cvsroot/mockpp/mockpp/bcb5/mock_test.bpf,v retrieving revision 1.42 retrieving revision 1.43 diff -u -d -r1.42 -r1.43 --- mock_test.bpf 17 Dec 2005 18:38:45 -0000 1.42 +++ mock_test.bpf 2 Jan 2006 20:24:56 -0000 1.43 @@ -2,9 +2,10 @@ This file is used by the project manager only and should be treated like the project file main //--------------------------------------------------------------------------- -USELIB("h:\tmp\compile\mockpp_34.lib"); -USELIB("h:\tmp\compile\mockpp_production_34.lib"); -USELIB("h:\tmp\compile\mockpp_cxxtest_34.lib"); +USELIB("c:\tmp\compile\mockpp_34.lib"); +USELIB("c:\tmp\compile\mockpp_production_34.lib"); +USELIB("c:\tmp\compile\mockpp_cxxtest_34.lib"); +//--------------------------------------------------------------------------- USEUNIT("..\mockpp\tests\AssertMo_test.cpp"); USEUNIT("..\mockpp\tests\ExpectationCounter_test.cpp"); USEUNIT("..\mockpp\tests\ExpectationCounterRange_test.cpp"); @@ -48,5 +49,76 @@ USEUNIT("..\mockpp\tests\VisitableMockMethod_2_test.cpp"); USEUNIT("..\mockpp\tests\ResponseVector_test.cpp"); USEUNIT("..\mockpp\tests\NoException_test.cpp"); -//--------------------------------------------------------------------------- +USEUNIT("..\tests\AbstractDynamicChainingMock_test.cpp"); +USEUNIT("..\tests\AbstractInvocationDispatcher_test.cpp"); +USEUNIT("..\tests\And_test.cpp"); +USEUNIT("..\tests\AnyArgumentsMatcher_test.cpp"); +USEUNIT("..\tests\ArgumentsMatchBuilder_test.cpp"); +USEUNIT("..\tests\ArgumentsMatcher_test.cpp"); +USEUNIT("..\tests\ChainableMockMethod_1_test.cpp"); +USEUNIT("..\tests\ChainableMockMethod_2_test.cpp"); +USEUNIT("..\tests\ChainableMockMethod_test.cpp"); +USEUNIT("..\tests\ChainableMockObject_1_test.cpp"); +USEUNIT("..\tests\ChainableMockObject_1_void_test.cpp"); +USEUNIT("..\tests\ChainableMockObject_2_test.cpp"); +USEUNIT("..\tests\ChainableMockObject_2_void_test.cpp"); +USEUNIT("..\tests\ChainableMockObject_3_test.cpp"); +USEUNIT("..\tests\ChainableMockObject_3_void_test.cpp"); +USEUNIT("..\tests\ChainableMockObject_4_test.cpp"); +USEUNIT("..\tests\ChainableMockObject_4_void_test.cpp"); +USEUNIT("..\tests\ChainableMockObject_5_test.cpp"); +USEUNIT("..\tests\ChainableMockObject_5_void_test.cpp"); +USEUNIT("..\tests\ChainableMockObject_test.cpp"); +USEUNIT("..\tests\ChainableMockObject_void_test.cpp"); +USEUNIT("..\tests\ChainableMockObjectPolymorphism_test.cpp"); +USEUNIT("..\tests\ChainingMockBuilder_test.cpp"); +USEUNIT("..\tests\ChainingMockObjectSupport_test.cpp"); +USEUNIT("..\tests\ConstraintList_test.cpp"); +USEUNIT("..\tests\ConstraintSet_test.cpp"); +USEUNIT("..\tests\CoreMock_test.cpp"); +USEUNIT("..\tests\CustomStub_test.cpp"); +USEUNIT("..\tests\DefaultResultStub_test.cpp"); +USEUNIT("..\tests\DynamicChainingMockError_test.cpp"); +USEUNIT("..\tests\FIFOInvocationDispatcher_test.cpp"); +USEUNIT("..\tests\Invocation_test.cpp"); +USEUNIT("..\tests\InvocationMocker_test.cpp"); +USEUNIT("..\tests\InvocationMockerBuilder_test.cpp"); +USEUNIT("..\tests\InvokeAtLeastMatcher_test.cpp"); +USEUNIT("..\tests\InvokeAtLeastOnceMatcher_test.cpp"); +USEUNIT("..\tests\InvokeAtMostMatcher_test.cpp"); +USEUNIT("..\tests\InvokeCountMatcher_test.cpp"); +USEUNIT("..\tests\InvokedAfterMatcher_test.cpp"); +USEUNIT("..\tests\InvokedBeforeMatcher_test.cpp"); +USEUNIT("..\tests\InvokedRecorder_test.cpp"); +USEUNIT("..\tests\InvokeOnceMatcher_test.cpp"); +USEUNIT("..\tests\IsAnything_test.cpp"); +USEUNIT("..\tests\IsCloseTo_test.cpp"); +USEUNIT("..\tests\IsEqual_test.cpp"); +USEUNIT("..\tests\IsGreaterOrEqual_test.cpp"); +USEUNIT("..\tests\IsGreaterThan_test.cpp"); +USEUNIT("..\tests\IsInstanceOf_test.cpp"); +USEUNIT("..\tests\IsLessOrEqual_test.cpp"); +USEUNIT("..\tests\IsLessThan_test.cpp"); +USEUNIT("..\tests\IsNot_test.cpp"); +USEUNIT("..\tests\IsNothing_test.cpp"); +USEUNIT("..\tests\IsSame_test.cpp"); +USEUNIT("..\tests\LIFOInvocationDispatcher_test.cpp"); +USEUNIT("..\tests\MatchBuilder_test.cpp"); +USEUNIT("..\tests\mockpp_pti_test.cpp"); +USEUNIT("..\tests\NoArgumentsMatcher_test.cpp"); +USEUNIT("..\tests\Or_test.cpp"); +USEUNIT("..\tests\OutBound_test.cpp"); +USEUNIT("..\tests\ReturnStub_test.cpp"); +USEUNIT("..\tests\StringContains_test.cpp"); +USEUNIT("..\tests\StringEndsWith_test.cpp"); +USEUNIT("..\tests\StringStartsWith_test.cpp"); +USEUNIT("..\tests\StubBuilder_test.cpp"); +USEUNIT("..\tests\StubSequence_test.cpp"); +USEUNIT("..\tests\TestFailureMatcher_test.cpp"); +USEUNIT("..\tests\TestFailureStub_test.cpp"); +USEUNIT("..\tests\ThrowStub_test.cpp"); +USEUNIT("..\tests\TypelessStubSequence_test.cpp"); +USEUNIT("..\tests\UnlimitedMatcher_test.cpp"); +USEUNIT("..\tests\VerifyingTestCaller_test.cpp"); +USEUNIT("..\tests\VoidStub_test.cpp"); Index: mockpp_cxxtest.bpr =================================================================== RCS file: /cvsroot/mockpp/mockpp/bcb5/mockpp_cxxtest.bpr,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- mockpp_cxxtest.bpr 28 Dec 2005 19:43:08 -0000 1.5 +++ mockpp_cxxtest.bpr 2 Jan 2006 20:24:56 -0000 1.6 @@ -3,15 +3,15 @@ <PROJECT> <MACROS> <VERSION value="BCB.05.03"/> - <PROJECT value="h:\tmp\compile\mockpp_cxxtest_34.dll"/> - <OBJFILES value="h:\tmp\compile\mockpp_34\\Descriptions.obj - h:\tmp\compile\mockpp_34\\DummyDescriptions.obj - h:\tmp\compile\mockpp_34\\GlobalFixture.obj - h:\tmp\compile\mockpp_34\\LinkedList.obj - h:\tmp\compile\mockpp_34\\RealDescriptions.obj - h:\tmp\compile\mockpp_34\\TestSuite.obj - h:\tmp\compile\mockpp_34\\TestTracker.obj - h:\tmp\compile\mockpp_34\\ValueTraits.obj"/> + <PROJECT value="c:\tmp\compile\mockpp_cxxtest_34.dll"/> + <OBJFILES value="c:\tmp\compile\mockpp_34\\Descriptions.obj + c:\tmp\compile\mockpp_34\\DummyDescriptions.obj + c:\tmp\compile\mockpp_34\\GlobalFixture.obj + c:\tmp\compile\mockpp_34\\LinkedList.obj + c:\tmp\compile\mockpp_34\\RealDescriptions.obj + c:\tmp\compile\mockpp_34\\TestSuite.obj + c:\tmp\compile\mockpp_34\\TestTracker.obj + c:\tmp\compile\mockpp_34\\ValueTraits.obj"/> <RESFILES value=""/> <DEFFILE value=""/> <RESDEPEN value="$(RESFILES)"/> @@ -39,11 +39,11 @@ </MACROS> <OPTIONS> <CFLAG1 value="-WD -vGc -vGt -vGd -Od -Vx -Ve -X- -r- -a8 -b- -k -y -v -vi- -tWD -tWM -c"/> - <PFLAGS value="-N2"h:\tmp\compile\mockpp_34\" -N0"h:\tmp\compile\mockpp_34\" -$YD -$W + <PFLAGS value="-N2"c:\tmp\compile\mockpp_34\" -N0"c:\tmp\compile\mockpp_34\" -$YD -$W -$O- -v -JPHNE -M"/> <RFLAGS value=""/> <AFLAGS value="/mx /w2 /zi"/> - <LFLAGS value="-l"h:\tmp\compile\" -I"h:\tmp\compile\mockpp_34\" -D"" -aa -Tpd -x -Gn -Gi + <LFLAGS value="-l"c:\tmp\compile\" -I"c:\tmp\compile\mockpp_34\" -D"" -aa -Tpd -x -Gn -Gi -v"/> </OPTIONS> <LINKER> @@ -81,36 +81,36 @@ [HistoryLists\hlIncludePath] Count=30 -Item0=..\mockpp\production;..;$(BCB)\include;..\3party\cxxtest;..\3party -Item1=\\sonne\ewald\Documents\src\mockpp\mockpp\3party\cxxtest\cxxtest;..\mockpp\production;..;$(BCB)\include;..\3party\cxxtest -Item2=..\mockpp\production;..\..\mockpp;$(BCB)\include;..\3party\cxxtest -Item3=\\sonne\ewald\Documents\src\mockpp\mockpp\3party\cxxtest\cxxtest;..\mockpp\production;..\..\mockpp;$(BCB)\include -Item4=..\mockpp\production;..;$(BCB)\include -Item5=..\mockpp\production;..\..\mockpp;$(BCB)\include -Item6=..\mockpp\production;..;..\..\mockpp;$(BCB)\include -Item7=..\mockpp\production;.\..;$(BCB)\include -Item8=..\mockpp\production;..\..\mockpp-1.8.0;$(BCB)\include -Item9=..\..\mockpp-1.8.0;$(BCB)\include -Item10=..\mockpp\production;..mockpp\builder;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\constraint;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\..\mockpp-1.8.0;$(BCB)\include;X:\cppunit-1.10.2\include\;..\..\cppunit-1.10\include -Item11=..\mockpp\production;..mockpp\builder;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\constraint;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include -Item12=..mockpp\builder;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\constraint;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include -Item13=..mockpp\builder;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\constraint;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include -Item14=..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include -Item15=..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include -Item16=..;$(BCB)\include;..\..\..\cppunit-1.10.2\include -Item17=..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\..\cppunit-1.10\include -Item18=..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\..\cppunit-1.10\include -Item19=..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\mockpp_34\matcher;..\mockpp_34\constraint;..\mockpp_34\builder;..\mockpp;..\mockpp_34\chaining;..\mockpp_34\compat;..\mockpp_34\util;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include -Item20=..\..\mockpp;$(BCB)\include;..\..\..\cppunit.ups\include -Item21=..\mockpp_34\matcher;..\mockpp_34\constraint;..\mockpp_34\builder;..\mockpp_34\chaining;..\mockpp_34\compat;..\mockpp_34\util;..\mockpp;..\..\mockpp;$(BCB)\include;..\..\..\cppunit.ups\include -Item22=..\mockpp;..;$(BCB)\include;..\..\..\cppunit.ups\include -Item23=..\mockpp_34\builder;..\mockpp_34\matcher;..\mockpp_34\constraint;..\builder;\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp_34\matcher;\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp_34\constraint;\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp_34\builder;..\mockpp_34\chaining;\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp;\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp_34\chaining;mockpp;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp;..\mockpp_34\compat;..\mockpp_34\util;..\mockpp;..;$(BCB)\include;..\..\..\cppunit-1.8.0\include -Item24=..\mockpp_34\builder;..\mockpp_34\matcher;..\mockpp_34\constraint;..\builder;\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp_34\matcher;\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp_34\constraint;\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp_34\builder;..\mockpp_34\chaining;\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp;\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp_34\chaining;mockpp;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp;..\mockpp_34\compat;..\mockpp_34\util;..\mockpp;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.8.0\include -Item25=mockpp;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp;..\mockpp_34\compat;..\mockpp_34\util;..\mockpp;..\..\mockpp;$(BCB)\include;X:\Documents\src\cppunit-1.8.0\include -Item26=mockpp;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp;..\mockpp_34\compat;..\mockpp_34\util;..\mockpp;..\..\mockpp;$(BCB)\include -Item27=mockpp;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp;..\mockpp_34\compat;..\mockpp_34\util;..\mockpp;..;$(BCB)\include -Item28=..;$(BCB)\include -Item29=..\mockpp_34\compat;..\mockpp_34\util;..\mockpp;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp_34\compat;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp_34\util;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp;..\ulxmlrpcpp;..\..\mockpp;$(BCB)\include;$(BCB)\include\vcl +Item0=\\sonne\ewald\Documents\src\mockpp\mockpp\3party\cxxtest\cxxtest;..\mockpp\production;..;$(BCB)\include;..\3party\cxxtest;..\3party +Item1=..\mockpp\production;..;$(BCB)\include;..\3party\cxxtest;..\3party +Item2=\\sonne\ewald\Documents\src\mockpp\mockpp\3party\cxxtest\cxxtest;..\mockpp\production;..;$(BCB)\include;..\3party\cxxtest +Item3=..\mockpp\production;..\..\mockpp;$(BCB)\include;..\3party\cxxtest +Item4=\\sonne\ewald\Documents\src\mockpp\mockpp\3party\cxxtest\cxxtest;..\mockpp\production;..\..\mockpp;$(BCB)\include +Item5=..\mockpp\production;..;$(BCB)\include +Item6=..\mockpp\production;..\..\mockpp;$(BCB)\include +Item7=..\mockpp\production;..;..\..\mockpp;$(BCB)\include +Item8=..\mockpp\production;.\..;$(BCB)\include +Item9=..\mockpp\production;..\..\mockpp-1.8.0;$(BCB)\include +Item10=..\..\mockpp-1.8.0;$(BCB)\include +Item11=..\mockpp\production;..mockpp\builder;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\constraint;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\..\mockpp-1.8.0;$(BCB)\include;X:\cppunit-1.10.2\include\;..\..\cppunit-1.10\include +Item12=..\mockpp\production;..mockpp\builder;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\constraint;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include +Item13=..mockpp\builder;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\constraint;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include +Item14=..mockpp\builder;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\constraint;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include +Item15=..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include +Item16=..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include +Item17=..;$(BCB)\include;..\..\..\cppunit-1.10.2\include +Item18=..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\..\cppunit-1.10\include +Item19=..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\..\cppunit-1.10\include +Item20=..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\mockpp_34\matcher;..\mockpp_34\constraint;..\mockpp_34\builder;..\mockpp;..\mockpp_34\chaining;..\mockpp_34\compat;..\mockpp_34\util;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include +Item21=..\..\mockpp;$(BCB)\include;..\..\..\cppunit.ups\include +Item22=..\mockpp_34\matcher;..\mockpp_34\constraint;..\mockpp_34\builder;..\mockpp_34\chaining;..\mockpp_34\compat;..\mockpp_34\util;..\mockpp;..\..\mockpp;$(BCB)\include;..\..\..\cppunit.ups\include +Item23=..\mockpp;..;$(BCB)\include;..\..\..\cppunit.ups\include +Item24=..\mockpp_34\builder;..\mockpp_34\matcher;..\mockpp_34\constraint;..\builder;\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp_34\matcher;\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp_34\constraint;\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp_34\builder;..\mockpp_34\chaining;\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp;\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp_34\chaining;mockpp;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp;..\mockpp_34\compat;..\mockpp_34\util;..\mockpp;..;$(BCB)\include;..\..\..\cppunit-1.8.0\include +Item25=..\mockpp_34\builder;..\mockpp_34\matcher;..\mockpp_34\constraint;..\builder;\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp_34\matcher;\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp_34\constraint;\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp_34\builder;..\mockpp_34\chaining;\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp;\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp_34\chaining;mockpp;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp;..\mockpp_34\compat;..\mockpp_34\util;..\mockpp;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.8.0\include +Item26=mockpp;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp;..\mockpp_34\compat;..\mockpp_34\util;..\mockpp;..\..\mockpp;$(BCB)\include;X:\Documents\src\cppunit-1.8.0\include +Item27=mockpp;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp;..\mockpp_34\compat;..\mockpp_34\util;..\mockpp;..\..\mockpp;$(BCB)\include +Item28=mockpp;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp;..\mockpp_34\compat;..\mockpp_34\util;..\mockpp;..;$(BCB)\include +Item29=..;$(BCB)\include [HistoryLists\hlLibraryPath] Count=19 @@ -124,11 +124,11 @@ Item7=..;$(BCB)\lib\obj;$(BCB)\lib Item8=..\mockpp_34\matcher;..\mockpp_34\constraint;..\mockpp_34\builder;..\mockpp;..\mockpp_34\chaining;..\mockpp_34\compat;..\mockpp_34\util;..;$(BCB)\lib\obj;$(BCB)\lib Item9=..\mockpp_34\matcher;..\mockpp_34\constraint;..\mockpp_34\builder;..\mockpp;..\mockpp_34\chaining;..\mockpp_34\compat;..\mockpp_34\util;..\..\mockpp;$(BCB)\lib\obj;$(BCB)\lib -Item10=..\mockpp_34\builder;..\mockpp_34\matcher;..\mockpp_34\constraint;..\builder;\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp_34\matcher;\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp_34\constraint;\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp_34\builder;..\mockpp_34\chaining;\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp;\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp_34\chaining;mockpp;..\mockpp_34\compat;..\mockpp_34\util;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp_34\compat;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp_34\util;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp;..\ulxmlrpcpp;h:\Programme\Borland\CBuilder5\Projects\;\\SONNE\HOMES\src\ulxr\mockpp_34\mockpp;..\mockpp;..\expat;$(BCB)\lib\obj;$(BCB)\lib;h:\tmp\compile\mockpp_34\ -Item11=mockpp;..\mockpp_34\compat;..\mockpp_34\util;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp_34\compat;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp_34\util;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp;..\ulxmlrpcpp;h:\Programme\Borland\CBuilder5\Projects\;\\SONNE\HOMES\src\ulxr\mockpp_34\mockpp;..\mockpp;..\expat;$(BCB)\lib\obj;$(BCB)\lib;h:\tmp\compile\mockpp_34\ -Item12=..\mockpp_34\compat;..\mockpp_34\util;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp_34\compat;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp_34\util;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp;..\ulxmlrpcpp;h:\Programme\Borland\CBuilder5\Projects\;\\SONNE\HOMES\src\ulxr\mockpp_34\mockpp;..\mockpp;..\expat;$(BCB)\lib\obj;$(BCB)\lib;h:\tmp\compile\mockpp_34\ -Item13=..\ulxmlrpcpp;h:\Programme\Borland\CBuilder5\Projects;\\SONNE\HOMES\src\ulxr\mockpp_34\mockpp;..\mockpp;..\expat;$(BCB)\lib\obj;$(BCB)\lib;h:\tmp\compile\mockpp_34\ -Item14=..\mockpp;..\expat;$(BCB)\lib\obj;$(BCB)\lib;h:\tmp\compile\mockpp_34\ +Item10=..\mockpp_34\builder;..\mockpp_34\matcher;..\mockpp_34\constraint;..\builder;\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp_34\matcher;\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp_34\constraint;\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp_34\builder;..\mockpp_34\chaining;\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp;\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp_34\chaining;mockpp;..\mockpp_34\compat;..\mockpp_34\util;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp_34\compat;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp_34\util;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp;..\ulxmlrpcpp;h:\Programme\Borland\CBuilder5\Projects\;\\SONNE\HOMES\src\ulxr\mockpp_34\mockpp;..\mockpp;..\expat;$(BCB)\lib\obj;$(BCB)\lib;c:\tmp\compile\mockpp_34\ +Item11=mockpp;..\mockpp_34\compat;..\mockpp_34\util;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp_34\compat;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp_34\util;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp;..\ulxmlrpcpp;h:\Programme\Borland\CBuilder5\Projects\;\\SONNE\HOMES\src\ulxr\mockpp_34\mockpp;..\mockpp;..\expat;$(BCB)\lib\obj;$(BCB)\lib;c:\tmp\compile\mockpp_34\ +Item12=..\mockpp_34\compat;..\mockpp_34\util;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp_34\compat;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp_34\util;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp;..\ulxmlrpcpp;h:\Programme\Borland\CBuilder5\Projects\;\\SONNE\HOMES\src\ulxr\mockpp_34\mockpp;..\mockpp;..\expat;$(BCB)\lib\obj;$(BCB)\lib;c:\tmp\compile\mockpp_34\ +Item13=..\ulxmlrpcpp;h:\Programme\Borland\CBuilder5\Projects;\\SONNE\HOMES\src\ulxr\mockpp_34\mockpp;..\mockpp;..\expat;$(BCB)\lib\obj;$(BCB)\lib;c:\tmp\compile\mockpp_34\ +Item14=..\mockpp;..\expat;$(BCB)\lib\obj;$(BCB)\lib;c:\tmp\compile\mockpp_34\ Item15=..\mockpp;..\expat;$(BCB)\lib\obj;$(BCB)\lib;h:\temp Item16=..\mockpp;..\expat;$(BCB)\lib\obj;$(BCB)\lib Item17=..\expat;$(BCB)\lib\obj;$(BCB)\lib @@ -149,25 +149,25 @@ [HistoryLists\hlIntOutputDir] Count=4 -Item0=h:\tmp\compile\mockpp_34\ -Item1=h:\tmp\compile\mockpp_34\ +Item0=c:\tmp\compile\mockpp_34\ +Item1=c:\tmp\compile\mockpp_34\ Item2=h:\temp Item3=output [HistoryLists\hlFinalOutputDir] Count=6 -Item0=h:\tmp\compile\ -Item1=h:\tmp\compile\ -Item2=h:\tmp\compile\mockpp_34\ +Item0=c:\tmp\compile\ +Item1=c:\tmp\compile\ +Item2=c:\tmp\compile\mockpp_34\ Item3=h:\temp Item4=output\ Item5=output [HistoryLists\hIBPIOutputDir] Count=6 -Item0=h:\tmp\compile\ -Item1=h:\tmp\compile\ -Item2=h:\tmp\compile\mockpp_34\ +Item0=c:\tmp\compile\ +Item1=c:\tmp\compile\ +Item2=c:\tmp\compile\mockpp_34\ Item3=h:\temp Item4=E:\Eigene Dateien\c++\mockpp_34\bcb5\output\ Item5=output @@ -177,7 +177,7 @@ [Parameters] RunParams= -HostApplication=h:\tmp\compile\mock_test.exe +HostApplication=c:\tmp\compile\mock_test.exe RemoteHost= RemotePath= RemoteDebug=0 @@ -185,5 +185,11 @@ [Compiler] ShowInfoMsgs=0 LinkDebugVcl=0 +LinkCGLIB=1 + +[Language] +ActiveLang= +ProjectLang= +RootDir= </IDEOPTIONS> </PROJECT> \ No newline at end of file Index: visitmock2.bpf =================================================================== RCS file: /cvsroot/mockpp/mockpp/bcb5/visitmock2.bpf,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- visitmock2.bpf 17 Dec 2005 18:38:46 -0000 1.4 +++ visitmock2.bpf 2 Jan 2006 20:24:56 -0000 1.5 @@ -1,4 +1,4 @@ -USELIB("h:\tmp\compile\mockpp_34.lib"); +USELIB("c:\tmp\compile\mockpp_34.lib"); USEUNIT("..\mockpp\examples\tutorial\visitmock2.cpp"); USEUNIT("..\mockpp\examples\tutorial\consumer.cpp"); //--------------------------------------------------------------------------- Index: mock_test.bpr =================================================================== RCS file: /cvsroot/mockpp/mockpp/bcb5/mock_test.bpr,v retrieving revision 1.47 retrieving revision 1.48 diff -u -d -r1.47 -r1.48 --- mock_test.bpr 17 Dec 2005 18:38:45 -0000 1.47 +++ mock_test.bpr 2 Jan 2006 20:24:56 -0000 1.48 @@ -3,55 +3,127 @@ <PROJECT> <MACROS> <VERSION value="BCB.05.03"/> - <PROJECT value="h:\tmp\compile\mock_test_34.exe"/> - <OBJFILES value="h:\tmp\compile\mockpp_34\\AssertMo_test.obj - h:\tmp\compile\mockpp_34\\ExpectationCounter_test.obj - h:\tmp\compile\mockpp_34\\ExpectationCounterRange_test.obj - h:\tmp\compile\mockpp_34\\ExpectationList_test.obj - h:\tmp\compile\mockpp_34\\ExpectationMap_test.obj - h:\tmp\compile\mockpp_34\\ExpectationSegment_test.obj - h:\tmp\compile\mockpp_34\\ExpectationSet_test.obj - h:\tmp\compile\mockpp_34\\ExpectationValue_test.obj - h:\tmp\compile\mockpp_34\\Formatter_test.obj - h:\tmp\compile\mockpp_34\\mock_test.obj - h:\tmp\compile\mockpp_34\\VerifyingTestCase_test.obj - h:\tmp\compile\mockpp_34\\Assert_test.obj - h:\tmp\compile\mockpp_34\\MockObject_test.obj - h:\tmp\compile\mockpp_34\\mockpp_test.obj - h:\tmp\compile\mockpp_34\\ReturnObjectList_test.obj - h:\tmp\compile\mockpp_34\\Verifiable_test.obj - h:\tmp\compile\mockpp_34\\TrackingCounter_test.obj - h:\tmp\compile\mockpp_34\\VisitableMockObject_void_test.obj - h:\tmp\compile\mockpp_34\\Exception_test.obj - h:\tmp\compile\mockpp_34\\ExpectationBoundary_test.obj - h:\tmp\compile\mockpp_34\\Throwable_test.obj - h:\tmp\compile\mockpp_34\\ThrowableList_test.obj - h:\tmp\compile\mockpp_34\\VisitableMockObject_1_test.obj - h:\tmp\compile\mockpp_34\\VisitableMockObject_1_void_test.obj - h:\tmp\compile\mockpp_34\\VisitableMockObject_2_test.obj - h:\tmp\compile\mockpp_34\\VisitableMockObject_2_void_test.obj - h:\tmp\compile\mockpp_34\\VisitableMockObject_3_test.obj - h:\tmp\compile\mockpp_34\\VisitableMockObject_3_void_test.obj - h:\tmp\compile\mockpp_34\\VisitableMockObject_4_test.obj - h:\tmp\compile\mockpp_34\\VisitableMockObject_4_void_test.obj - h:\tmp\compile\mockpp_34\\VisitableMockObject_5_test.obj - h:\tmp\compile\mockpp_34\\VisitableMockObject_5_void_test.obj - h:\tmp\compile\mockpp_34\\MixedMockObject_5_test.obj - h:\tmp\compile\mockpp_34\\VisitableMockObject_template_test.obj - h:\tmp\compile\mockpp_34\\VisitableMockObject_test.obj - h:\tmp\compile\mockpp_34\\ExpectationConglomeration_test.obj - h:\tmp\compile\mockpp_34\\TimeServer_test.obj - h:\tmp\compile\mockpp_34\\classes_ABCDE.obj - h:\tmp\compile\mockpp_34\\VisitableMockMethod_test.obj - h:\tmp\compile\mockpp_34\\VisitableMockMethod_1_test.obj - h:\tmp\compile\mockpp_34\\VisitableMockMethod_2_test.obj - h:\tmp\compile\mockpp_34\\ResponseVector_test.obj - h:\tmp\compile\mockpp_34\\NoException_test.obj"/> + <PROJECT value="c:\tmp\compile\mock_test_34.exe"/> + <OBJFILES value="c:\tmp\compile\mockpp_34\\AssertMo_test.obj + c:\tmp\compile\mockpp_34\\ExpectationCounter_test.obj + c:\tmp\compile\mockpp_34\\ExpectationCounterRange_test.obj + c:\tmp\compile\mockpp_34\\ExpectationList_test.obj + c:\tmp\compile\mockpp_34\\ExpectationMap_test.obj + c:\tmp\compile\mockpp_34\\ExpectationSegment_test.obj + c:\tmp\compile\mockpp_34\\ExpectationSet_test.obj + c:\tmp\compile\mockpp_34\\ExpectationValue_test.obj + c:\tmp\compile\mockpp_34\\Formatter_test.obj + c:\tmp\compile\mockpp_34\\mock_test.obj + c:\tmp\compile\mockpp_34\\VerifyingTestCase_test.obj + c:\tmp\compile\mockpp_34\\Assert_test.obj + c:\tmp\compile\mockpp_34\\MockObject_test.obj + c:\tmp\compile\mockpp_34\\mockpp_test.obj + c:\tmp\compile\mockpp_34\\ReturnObjectList_test.obj + c:\tmp\compile\mockpp_34\\Verifiable_test.obj + c:\tmp\compile\mockpp_34\\TrackingCounter_test.obj + c:\tmp\compile\mockpp_34\\VisitableMockObject_void_test.obj + c:\tmp\compile\mockpp_34\\Exception_test.obj + c:\tmp\compile\mockpp_34\\ExpectationBoundary_test.obj + c:\tmp\compile\mockpp_34\\Throwable_test.obj + c:\tmp\compile\mockpp_34\\ThrowableList_test.obj + c:\tmp\compile\mockpp_34\\VisitableMockObject_1_test.obj + c:\tmp\compile\mockpp_34\\VisitableMockObject_1_void_test.obj + c:\tmp\compile\mockpp_34\\VisitableMockObject_2_test.obj + c:\tmp\compile\mockpp_34\\VisitableMockObject_2_void_test.obj + c:\tmp\compile\mockpp_34\\VisitableMockObject_3_test.obj + c:\tmp\compile\mockpp_34\\VisitableMockObject_3_void_test.obj + c:\tmp\compile\mockpp_34\\VisitableMockObject_4_test.obj + c:\tmp\compile\mockpp_34\\VisitableMockObject_4_void_test.obj + c:\tmp\compile\mockpp_34\\VisitableMockObject_5_test.obj + c:\tmp\compile\mockpp_34\\VisitableMockObject_5_void_test.obj + c:\tmp\compile\mockpp_34\\MixedMockObject_5_test.obj + c:\tmp\compile\mockpp_34\\VisitableMockObject_template_test.obj + c:\tmp\compile\mockpp_34\\VisitableMockObject_test.obj + c:\tmp\compile\mockpp_34\\ExpectationConglomeration_test.obj + c:\tmp\compile\mockpp_34\\TimeServer_test.obj + c:\tmp\compile\mockpp_34\\classes_ABCDE.obj + c:\tmp\compile\mockpp_34\\VisitableMockMethod_test.obj + c:\tmp\compile\mockpp_34\\VisitableMockMethod_1_test.obj + c:\tmp\compile\mockpp_34\\VisitableMockMethod_2_test.obj + c:\tmp\compile\mockpp_34\\ResponseVector_test.obj + c:\tmp\compile\mockpp_34\\NoException_test.obj + c:\tmp\compile\mockpp_34\\AbstractDynamicChainingMock_test.obj + c:\tmp\compile\mockpp_34\\AbstractInvocationDispatcher_test.obj + c:\tmp\compile\mockpp_34\\And_test.obj + c:\tmp\compile\mockpp_34\\AnyArgumentsMatcher_test.obj + c:\tmp\compile\mockpp_34\\ArgumentsMatchBuilder_test.obj + c:\tmp\compile\mockpp_34\\ArgumentsMatcher_test.obj + c:\tmp\compile\mockpp_34\\ChainableMockMethod_1_test.obj + c:\tmp\compile\mockpp_34\\ChainableMockMethod_2_test.obj + c:\tmp\compile\mockpp_34\\ChainableMockMethod_test.obj + c:\tmp\compile\mockpp_34\\ChainableMockObject_1_test.obj + c:\tmp\compile\mockpp_34\\ChainableMockObject_1_void_test.obj + c:\tmp\compile\mockpp_34\\ChainableMockObject_2_test.obj + c:\tmp\compile\mockpp_34\\ChainableMockObject_2_void_test.obj + c:\tmp\compile\mockpp_34\\ChainableMockObject_3_test.obj + c:\tmp\compile\mockpp_34\\ChainableMockObject_3_void_test.obj + c:\tmp\compile\mockpp_34\\ChainableMockObject_4_test.obj + c:\tmp\compile\mockpp_34\\ChainableMockObject_4_void_test.obj + c:\tmp\compile\mockpp_34\\ChainableMockObject_5_test.obj + c:\tmp\compile\mockpp_34\\ChainableMockObject_5_void_test.obj + c:\tmp\compile\mockpp_34\\ChainableMockObject_test.obj + c:\tmp\compile\mockpp_34\\ChainableMockObject_void_test.obj + c:\tmp\compile\mockpp_34\\ChainableMockObjectPolymorphism_test.obj + c:\tmp\compile\mockpp_34\\ChainingMockBuilder_test.obj + c:\tmp\compile\mockpp_34\\ChainingMockObjectSupport_test.obj + c:\tmp\compile\mockpp_34\\ConstraintList_test.obj + c:\tmp\compile\mockpp_34\\ConstraintSet_test.obj + c:\tmp\compile\mockpp_34\\CoreMock_test.obj + c:\tmp\compile\mockpp_34\\CustomStub_test.obj + c:\tmp\compile\mockpp_34\\DefaultResultStub_test.obj + c:\tmp\compile\mockpp_34\\DynamicChainingMockError_test.obj + c:\tmp\compile\mockpp_34\\FIFOInvocationDispatcher_test.obj + c:\tmp\compile\mockpp_34\\Invocation_test.obj + c:\tmp\compile\mockpp_34\\InvocationMocker_test.obj + c:\tmp\compile\mockpp_34\\InvocationMockerBuilder_test.obj + c:\tmp\compile\mockpp_34\\InvokeAtLeastMatcher_test.obj + c:\tmp\compile\mockpp_34\\InvokeAtLeastOnceMatcher_test.obj + c:\tmp\compile\mockpp_34\\InvokeAtMostMatcher_test.obj + c:\tmp\compile\mockpp_34\\InvokeCountMatcher_test.obj + c:\tmp\compile\mockpp_34\\InvokedAfterMatcher_test.obj + c:\tmp\compile\mockpp_34\\InvokedBeforeMatcher_test.obj + c:\tmp\compile\mockpp_34\\InvokedRecorder_test.obj + c:\tmp\compile\mockpp_34\\InvokeOnceMatcher_test.obj + c:\tmp\compile\mockpp_34\\IsAnything_test.obj + c:\tmp\compile\mockpp_34\\IsCloseTo_test.obj + c:\tmp\compile\mockpp_34\\IsEqual_test.obj + c:\tmp\compile\mockpp_34\\IsGreaterOrEqual_test.obj + c:\tmp\compile\mockpp_34\\IsGreaterThan_test.obj + c:\tmp\compile\mockpp_34\\IsInstanceOf_test.obj + c:\tmp\compile\mockpp_34\\IsLessOrEqual_test.obj + c:\tmp\compile\mockpp_34\\IsLessThan_test.obj + c:\tmp\compile\mockpp_34\\IsNot_test.obj + c:\tmp\compile\mockpp_34\\IsNothing_test.obj + c:\tmp\compile\mockpp_34\\IsSame_test.obj + c:\tmp\compile\mockpp_34\\LIFOInvocationDispatcher_test.obj + c:\tmp\compile\mockpp_34\\MatchBuilder_test.obj + c:\tmp\compile\mockpp_34\\mockpp_pti_test.obj + c:\tmp\compile\mockpp_34\\NoArgumentsMatcher_test.obj + c:\tmp\compile\mockpp_34\\Or_test.obj + c:\tmp\compile\mockpp_34\\OutBound_test.obj + c:\tmp\compile\mockpp_34\\ReturnStub_test.obj + c:\tmp\compile\mockpp_34\\StringContains_test.obj + c:\tmp\compile\mockpp_34\\StringEndsWith_test.obj + c:\tmp\compile\mockpp_34\\StringStartsWith_test.obj + c:\tmp\compile\mockpp_34\\StubBuilder_test.obj + c:\tmp\compile\mockpp_34\\StubSequence_test.obj + c:\tmp\compile\mockpp_34\\TestFailureMatcher_test.obj + c:\tmp\compile\mockpp_34\\TestFailureStub_test.obj + c:\tmp\compile\mockpp_34\\ThrowStub_test.obj + c:\tmp\compile\mockpp_34\\TypelessStubSequence_test.obj + c:\tmp\compile\mockpp_34\\UnlimitedMatcher_test.obj + c:\tmp\compile\mockpp_34\\VerifyingTestCaller_test.obj + c:\tmp\compile\mockpp_34\\VoidStub_test.obj"/> <RESFILES value=""/> <DEFFILE value=""/> <RESDEPEN value="$(RESFILES)"/> - <LIBFILES value="h:\tmp\compile\mockpp_34.lib h:\tmp\compile\mockpp_production_34.lib - h:\tmp\compile\mockpp_cxxtest_34.lib"/> + <LIBFILES value="c:\tmp\compile\mockpp_34.lib c:\tmp\compile\mockpp_production_34.lib + c:\tmp\compile\mockpp_cxxtest_34.lib"/> <LIBRARIES value=""/> <SPARELIBS value=""/> <PACKAGES value="VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi @@ -68,18 +140,18 @@ <USERDEFINES value="__DLL___"/> <SYSDEFINES value="NO_STRICT;_NO_VCL;_RTLDLL;USEPACKAGES"/> <MAINSOURCE value="mock_test.bpf"/> - <INCLUDEPATH value="..\mockpp\tests;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10.2\include;g:\data\src\cppunit-1.10.2\include\;..\3party;..\3party\cxxtest;.."/> - <LIBPATH value="\\192.168.2.1\ewald\Documents\src\mockpp\mockpp\mockpp\tests;..\mockpp\tests;..\mockpp_34\tests;$(BCB)\lib\obj;$(BCB)\lib"/> + <INCLUDEPATH value="..\tests;..\mockpp\tests;$(BCB)\include;..\3party;..\3party\cxxtest;..;"g:\data\src\cppunit-1.10.2\include\""/> + <LIBPATH value="..\tests;..\mockpp\tests;$(BCB)\lib\obj;$(BCB)\lib"/> <WARNINGS value="-w8092 -w8091 -w8090 -w8089 -w8087 -wprc -wuse -wucp -wstv -wstu -wpin -wnod -wnak -wdef -wcln -wbbf -wasm -wamp -wamb"/> </MACROS> <OPTIONS> <CFLAG1 value="-vGc -vGt -vGd -Od -Vx -Ve -X- -r- -a8 -b- -k -y -v -vi- -tWC -tWM -c"/> - <PFLAGS value="-N2"h:\tmp\compile\mockpp_34\" -N0"h:\tmp\compile\mockpp_34\" -$YD -$W + <PFLAGS value="-N2"c:\tmp\compile\mockpp_34\" -N0"c:\tmp\compile\mockpp_34\" -$YD -$W -$O- -v -JPHNE -M"/> <RFLAGS value=""/> <AFLAGS value="/mx /w2 /zd"/> - <LFLAGS value="-l"h:\tmp\compile\" -I"h:\tmp\compile\mockpp_34\" -D"" -ap -Tpe -x -Gn -v"/> + <LFLAGS value="-l"c:\tmp\compile\" -I"c:\tmp\compile\mockpp_34\" -D"" -ap -Tpe -x -Gn -v"/> </OPTIONS> <LINKER> <ALLOBJ value="c0x32.obj $(PACKAGES) $(OBJFILES)"/> @@ -116,57 +188,58 @@ [HistoryLists\hlIncludePath] Count=30 -Item0=..\mockpp\tests;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10.2\include;g:\data\src\cppunit-1.10.2\include\;..\3party;..\3party\cxxtest;.. -Item1=..\mockpp\tests;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10.2\include;g:\data\src\cppunit-1.10.2\include\;..\3party;..\3party\cxxtest;..\..\.. -Item2=$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10.2\include;g:\data\src\cppunit-1.10.2\include\;..\3party;..\3party\cxxtest;..\..\.. -Item3=..\mockpp\tests;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10.2\include;g:\data\src\cppunit-1.10.2\include\;..\3party;..\3party\cxxtest;..\.. -Item4=..\mockpp\tests;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10.2\include;g:\data\src\cppunit-1.10.2\include\;..\3party;..\3party\cxxtest -Item5=..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10.2\include;g:\data\src\cppunit-1.10.2\include\;..\3party;..\3party\cxxtest -Item6=\\192.168.2.1\ewald\Documents\src\mockpp\mockpp\mockpp\tests;..\mockpp\tests;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10.2\include;g:\data\src\cppunit-1.10.2\include\ -Item7=\\192.168.2.1\ewald\Documents\src\mockpp\mockpp\mockpp\tests;..\mockpp\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10.2\include;g:\data\src\cppunit-1.10.2\include -Item8=\\192.168.2.1\ewald\Documents\src\mockpp\mockpp\mockpp\tests;..\mockpp\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10.2\include;g:\data\src\ -Item9=..\mockpp\tests;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10.2\include;g:\data\src -Item10=..\mockpp\tests;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10.2\include -Item11=..\mockpp\tests;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;h:\home\arnold\cppunit-1.10.2\include -Item12=..\mockpp\tests;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include -Item13=..\mockpp\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include -Item14=..\mockpp\tests;.\..;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include\ -Item15=..\mockpp\tests;..\..\mockpp-1.8.0;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include\ -Item16=..;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include -Item17=..\mockpp\tests;..\mockpp_34\tests;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include -Item18=..\mockpp\tests;..\mockpp_34\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include -Item19=..\mockpp\tests;..\mockpp_34\tests;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include -Item20=..\..\mockpp;$(BCB)\include;..\..\..\cppunit.ups\include -Item21=..\tests;tests;\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp_34\tests;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp_34\tests;..\mockpp_34\tests;..;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include -Item22=..;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include -Item23=..\mockpp_34\tests;..\..\mockpp;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include;.. -Item24=..\mockpp_34\tests;..\..\mockpp;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include -Item25=..\mockpp_34\tests;..;$(BCB)\include;..\..\cppunit\include;X:\src\cppunit-1.8.0\include -Item26=..\mockpp_34\tests;..;$(BCB)\include;..\..\cppunit\include -Item27=..\mockpp_34\tests;..;$(BCB)\include;B:\cvs\ups\src\3party\cppunit\include -Item28=..\mockpp_34\tests;..;$(BCB)\include;..\..\..\cppunit-1.8.0\include -Item29=..;$(BCB)\include;..\..\..\cppunit-1.8.0\include +Item0=$(BCB)\include;..\3party;..\3party\cxxtest;..;g:\data\src\cppunit-1.10.2\include\ +Item1=..\tests;..\mockpp\tests;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10.2\include;g:\data\src\cppunit-1.10.2\include\;..\3party;..\3party\cxxtest;.. +Item2=..\mockpp\tests;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10.2\include;g:\data\src\cppunit-1.10.2\include\;..\3party;..\3party\cxxtest;.. +Item3=..\mockpp\tests;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10.2\include;g:\data\src\cppunit-1.10.2\include\;..\3party;..\3party\cxxtest;..\..\.. +Item4=$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10.2\include;g:\data\src\cppunit-1.10.2\include\;..\3party;..\3party\cxxtest;..\..\.. +Item5=..\mockpp\tests;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10.2\include;g:\data\src\cppunit-1.10.2\include\;..\3party;..\3party\cxxtest;..\.. +Item6=..\mockpp\tests;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10.2\include;g:\data\src\cppunit-1.10.2\include\;..\3party;..\3party\cxxtest +Item7=..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10.2\include;g:\data\src\cppunit-1.10.2\include\;..\3party;..\3party\cxxtest +Item8=\\192.168.2.1\ewald\Documents\src\mockpp\mockpp\mockpp\tests;..\mockpp\tests;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10.2\include;g:\data\src\cppunit-1.10.2\include\ +Item9=\\192.168.2.1\ewald\Documents\src\mockpp\mockpp\mockpp\tests;..\mockpp\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10.2\include;g:\data\src\cppunit-1.10.2\include +Item10=\\192.168.2.1\ewald\Documents\src\mockpp\mockpp\mockpp\tests;..\mockpp\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10.2\include;g:\data\src\ +Item11=..\mockpp\tests;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10.2\include;g:\data\src +Item12=..\mockpp\tests;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10.2\include +Item13=..\mockpp\tests;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;h:\home\arnold\cppunit-1.10.2\include +Item14=..\mockpp\tests;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include +Item15=..\mockpp\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include +Item16=..\mockpp\tests;.\..;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include\ +Item17=..\mockpp\tests;..\..\mockpp-1.8.0;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include\ +Item18=..;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include +Item19=..\mockpp\tests;..\mockpp_34\tests;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include +Item20=..\mockpp\tests;..\mockpp_34\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include +Item21=..\mockpp\tests;..\mockpp_34\tests;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include +Item22=..\..\mockpp;$(BCB)\include;..\..\..\cppunit.ups\include +Item23=..\tests;tests;\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp_34\tests;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp_34\tests;..\mockpp_34\tests;..;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include +Item24=..;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include +Item25=..\mockpp_34\tests;..\..\mockpp;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include;.. +Item26=..\mockpp_34\tests;..\..\mockpp;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include +Item27=..\mockpp_34\tests;..;$(BCB)\include;..\..\cppunit\include;X:\src\cppunit-1.8.0\include +Item28=..\mockpp_34\tests;..;$(BCB)\include;..\..\cppunit\include +Item29=..\mockpp_34\tests;..;$(BCB)\include;B:\cvs\ups\src\3party\cppunit\include [HistoryLists\hlLibraryPath] -Count=18 -Item0=\\192.168.2.1\ewald\Documents\src\mockpp\mockpp\mockpp\tests;..\mockpp\tests;..\mockpp_34\tests;$(BCB)\lib\obj;$(BCB)\lib -Item1=..\mockpp\tests;..\mockpp_34\tests;$(BCB)\lib\obj;$(BCB)\lib -Item2=$(BCB)\lib\obj;$(BCB)\lib -Item3=..\tests;tests;\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp_34\tests;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp_34\tests;..\mockpp_34\tests;..\expat;$(BCB)\lib\obj;$(BCB)\lib -Item4=\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp_34\tests;..\mockpp_34\tests;..\expat;$(BCB)\lib\obj;$(BCB)\lib -Item5=..\mockpp_34\tests;..\expat;$(BCB)\lib\obj;$(BCB)\lib -Item6=..\mockpp_34\tests;$(BCB)\lib\obj;$(BCB)\lib;output;expat -Item7=..\mockpp_34\tests;$(BCB)\lib\obj;$(BCB)\lib;output;bin -Item8=..\mockpp_34\apps;$(BCB)\lib\obj;$(BCB)\lib;output;bin -Item9=..\mockpp_34\apps;$(BCB)\lib\obj;$(BCB)\lib;output -Item10=..\mockpp_34\apps;$(BCB)\lib\obj;$(BCB)\lib;E:\Eigene Dateien\c++\mockpp_34\bcb5\output -Item11=..\mockpp_34\apps;$(BCB)\lib\obj;$(BCB)\lib;..\output -Item12=..\mockpp_34\apps;$(BCB)\lib\obj;$(BCB)\lib -Item13=..\mockpp_34\apps;D:\CBuilder5\mockpp_34\;$(BCB)\lib\obj;$(BCB)\lib -Item14=e:\Eigene Dateien\c++\mockpp_34\mockpp\apps\;..\mockpp;$(BCB)\lib\obj;$(BCB)\lib -Item15=e:\Eigene Dateien\c++\mockpp_34\mockpp\apps;..\mockpp;$(BCB)\lib\obj;$(BCB)\lib -Item16=..\mockpp;$(BCB)\lib\obj;$(BCB)\lib -Item17=e:\Eigene Dateien\c++\mockpp_34\mockpp\apps;$(BCB)\lib\obj;$(BCB)\lib +Count=19 +Item0=$(BCB)\lib\obj;$(BCB)\lib +Item1=..\tests;\\192.168.2.1\ewald\Documents\src\mockpp\mockpp\mockpp\tests;..\mockpp\tests;..\mockpp_34\tests;$(BCB)\lib\obj;$(BCB)\lib +Item2=\\192.168.2.1\ewald\Documents\src\mockpp\mockpp\mockpp\tests;..\mockpp\tests;..\mockpp_34\tests;$(BCB)\lib\obj;$(BCB)\lib +Item3=..\mockpp\tests;..\mockpp_34\tests;$(BCB)\lib\obj;$(BCB)\lib +Item4=..\tests;tests;\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp_34\tests;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp_34\tests;..\mockpp_34\tests;..\expat;$(BCB)\lib\obj;$(BCB)\lib +Item5=\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp_34\tests;..\mockpp_34\tests;..\expat;$(BCB)\lib\obj;$(BCB)\lib +Item6=..\mockpp_34\tests;..\expat;$(BCB)\lib\obj;$(BCB)\lib +Item7=..\mockpp_34\tests;$(BCB)\lib\obj;$(BCB)\lib;output;expat +Item8=..\mockpp_34\tests;$(BCB)\lib\obj;$(BCB)\lib;output;bin +Item9=..\mockpp_34\apps;$(BCB)\lib\obj;$(BCB)\lib;output;bin +Item10=..\mockpp_34\apps;$(BCB)\lib\obj;$(BCB)\lib;output +Item11=..\mockpp_34\apps;$(BCB)\lib\obj;$(BCB)\lib;E:\Eigene Dateien\c++\mockpp_34\bcb5\output +Item12=..\mockpp_34\apps;$(BCB)\lib\obj;$(BCB)\lib;..\output +Item13=..\mockpp_34\apps;$(BCB)\lib\obj;$(BCB)\lib +Item14=..\mockpp_34\apps;D:\CBuilder5\mockpp_34\;$(BCB)\lib\obj;$(BCB)\lib +Item15=e:\Eigene Dateien\c++\mockpp_34\mockpp\apps\;..\mockpp;$(BCB)\lib\obj;$(BCB)\lib +Item16=e:\Eigene Dateien\c++\mockpp_34\mockpp\apps;..\mockpp;$(BCB)\lib\obj;$(BCB)\lib +Item17=..\mockpp;$(BCB)\lib\obj;$(BCB)\lib +Item18=e:\Eigene Dateien\c++\mockpp_34\mockpp\apps;$(BCB)\lib\obj;$(BCB)\lib [HistoryLists\hlDebugSourcePath] Count=1 @@ -180,8 +253,8 @@ [HistoryLists\hlIntOutputDir] Count=7 -Item0=h:\tmp\compile\mockpp_34\ -Item1=h:\tmp\compile\mockpp_34\ulxr_bcb5\ +Item0=c:\tmp\compile\mockpp_34\ +Item1=c:\tmp\compile\mockpp_34\ulxr_bcb5\ Item2=h:\temp Item3=output Item4=E:\Eigene Dateien\c++\mockpp_34\bcb5\output\ @@ -190,9 +263,9 @@ [HistoryLists\hlFinalOutputDir] Count=8 -Item0=h:\tmp\compile\ -Item1=h:\tmp\compile -Item2=h:\tmp\compile\mockpp_34\ +Item0=c:\tmp\compile\ +Item1=c:\tmp\compile +Item2=c:\tmp\compile\mockpp_34\ Item3=h:\temp Item4=output\ Item5=E:\Eigene Dateien\c++\mockpp_34\bcb5\output\ @@ -201,10 +274,10 @@ [HistoryLists\hIBPIOutputDir] Count=10 -Item0=h:\tmp\compile\ -Item1=h:\tmp\compile -Item2=h:\tmp\compile\mockpp_34\ -Item3=h:\tmp\compile\mockpp_34\ulxr_bcb5\ +Item0=c:\tmp\compile\ +Item1=c:\tmp\compile +Item2=c:\tmp\compile\mockpp_34\ +Item3=c:\tmp\compile\mockpp_34\ulxr_bcb5\ Item4=h:\temp Item5=e:\Eigene Dateien\c++\mockpp_34\bcb5\output\ Item6=output\ @@ -225,5 +298,11 @@ [Compiler] ShowInfoMsgs=0 LinkDebugVcl=0 +LinkCGLIB=1 + +[Language] +ActiveLang= +ProjectLang= +RootDir= </IDEOPTIONS> </PROJECT> \ No newline at end of file Index: visitmock.bpf =================================================================== RCS file: /cvsroot/mockpp/mockpp/bcb5/visitmock.bpf,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- visitmock.bpf 17 Dec 2005 18:38:46 -0000 1.20 +++ visitmock.bpf 2 Jan 2006 20:24:56 -0000 1.21 @@ -1,4 +1,4 @@ -USELIB("h:\tmp\compile\mockpp_34.lib"); +USELIB("c:\tmp\compile\mockpp_34.lib"); USEUNIT("..\mockpp\examples\tutorial\visitmock.cpp"); USEUNIT("..\mockpp\examples\tutorial\consumer.cpp"); //--------------------------------------------------------------------------- Index: mock_greeter.bpf =================================================================== RCS file: /cvsroot/mockpp/mockpp/bcb5/mock_greeter.bpf,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- mock_greeter.bpf 17 Dec 2005 18:38:45 -0000 1.23 +++ mock_greeter.bpf 2 Jan 2006 20:24:56 -0000 1.24 @@ -1,5 +1,5 @@ -USELIB("h:\tmp\compile\mockpp_34.lib"); -USELIB("h:\tmp\compile\mockpp_cxxtest_34.lib"); +USELIB("c:\tmp\compile\mockpp_34.lib"); +USELIB("c:\tmp\compile\mockpp_cxxtest_34.lib"); USEUNIT("..\mockpp\examples\mock_greeter.cpp"); //--------------------------------------------------------------------------- This file is used by the project manager only and should be treated like the project file Index: visitmock.bpr =================================================================== RCS file: /cvsroot/mockpp/mockpp/bcb5/visitmock.bpr,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- visitmock.bpr 28 Dec 2005 19:43:08 -0000 1.24 +++ visitmock.bpr 2 Jan 2006 20:24:56 -0000 1.25 @@ -3,13 +3,13 @@ <PROJECT> <MACROS> <VERSION value="BCB.05.03"/> - <PROJECT value="h:\tmp\compile\visitmock_34.exe"/> - <OBJFILES value="h:\tmp\compile\mockpp_34\\visitmock.obj - h:\tmp\compile\mockpp_34\\consumer.obj"/> + <PROJECT value="c:\tmp\compile\visitmock_34.exe"/> + <OBJFILES value="c:\tmp\compile\mockpp_34\\visitmock.obj + c:\tmp\compile\mockpp_34\\consumer.obj"/> <RESFILES value=""/> <DEFFILE value=""/> <RESDEPEN value="$(RESFILES)"/> - <LIBFILES value="h:\tmp\compile\mockpp_34.lib"/> + <LIBFILES value="c:\tmp\compile\mockpp_34.lib"/> <LIBRARIES value=""/> <SPARELIBS value=""/> <PACKAGES value="VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi @@ -32,11 +32,11 @@ </MACROS> <OPTIONS> <CFLAG1 value="-vGc -vGt -vGd -Od -Vx -Ve -X- -r- -a8 -b- -k -y -v -vi- -tWC -tWM -c"/> - <PFLAGS value="-N2"h:\tmp\compile\mockpp_34\" -N0"h:\tmp\compile\mockpp_34\" -$YD -$W + <PFLAGS value="-N2"c:\tmp\compile\mockpp_34\" -N0"c:\tmp\compile\mockpp_34\" -$YD -$W -$O- -v -JPHNE -M"/> <RFLAGS value=""/> <AFLAGS value="/mx /w2 /zd"/> - <LFLAGS value="-l"h:\tmp\compile\" -I"h:\tmp\compile\mockpp_34\" -D"" -ap -Tpe -x -Gn -v"/> + <LFLAGS value="-l"c:\tmp\compile\" -I"c:\tmp\compile\mockpp_34\" -D"" -ap -Tpe -x -Gn -v"/> </OPTIONS> <LINKER> <ALLOBJ value="c0x32.obj $(PACKAGES) $(OBJFILES)"/> @@ -73,36 +73,36 @@ [HistoryLists\hlIncludePath] Count=30 -Item0=..\mockpp\examples\tutorial;..;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include\;..\3party -Item1=..\mockpp\examples\tutorial;..;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include\ -Item2=..\.;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include -Item3=..\mockpp\examples\tutorial;..\mockpp_34\examples\tutorial;..\mockpp_34\examples;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include -Item4=..\mockpp\examples\tutorial;..\mockpp_34\examples\tutorial;..\mockpp_34\examples;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include -Item5=..\mockpp_34\examples\tutorial;..\mockpp_34\examples;..;$(BCB)\include;..\..\..\cppunit.ups\include -Item6=..\mockpp_34\examples\tutorial;..\mockpp_34\examples;..\mockpp_34\tests;..;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include -Item7=..\mockpp_34\examples;..\mock... [truncated message content] |
|
From: Ewald A. <ewa...@us...> - 2006-01-02 15:40:32
|
Update of /cvsroot/mockpp/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21152 Modified Files: run-configure-ascii.sh run-configure-unicode.sh Log Message: update Index: run-configure-unicode.sh =================================================================== RCS file: /cvsroot/mockpp/mockpp/run-configure-unicode.sh,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- run-configure-unicode.sh 1 Jan 2006 19:40:35 -0000 1.16 +++ run-configure-unicode.sh 2 Jan 2006 15:40:21 -0000 1.17 @@ -2,17 +2,22 @@ MYFLAGS="-O0 -g3 -Wall -Werror" #-pedantic -if which "gcc-4.0"; then - MYCC="ccache g++-4.0"; +if which "gcc-4.0" 2>/dev/null >/dev/null; then + MYCC="g++-4.0"; else - MYCC="ccache g++"; + MYCC="g++"; fi -echo mycc: $MYCC +if which "ccache" 2>/dev/null >/dev/null; then + MYCC="ccache $MYCC"; +fi + +echo MYCC: $MYCC #OPTS="--enable-doxygen --enable-docbook" -#OPTS="$OPTS --enable-builtin-stl" # --disable-exceptions --disable-rtti +OPTS="$OPTS --enable-builtin-stl" # --disable-exceptions --disable-rtti OPTS="$OPTS --enable-debug=full" #OPTS="$OPTS --disable-builtin-cxxtest --enable-cppunit" -OPTS="$OPTS --disable-builtin-cxxtest --enable-boosttest" +#OPTS="$OPTS --disable-builtin-cxxtest --enable-boosttest" + CFLAGS="$MYFLAGS" CXXFLAGS="$MYFLAGS" CXX=$MYCC CC=$MYCC ${0%/*}/configure --enable-unicode $OPTS --prefix=/tmp/mockpp-install Index: run-configure-ascii.sh =================================================================== RCS file: /cvsroot/mockpp/mockpp/run-configure-ascii.sh,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- run-configure-ascii.sh 1 Dec 2005 18:15:08 -0000 1.4 +++ run-configure-ascii.sh 2 Jan 2006 15:40:21 -0000 1.5 @@ -1,16 +1,23 @@ #!/bin/sh MYFLAGS="-O0 -g3 -Wall -Werror" +#-pedantic -if which "gcc-4.0"; then - MYCC="ccache g++-4.0"; +if which "gcc-4.0" 2>/dev/null >/dev/null; then + MYCC="g++-4.0"; else - MYCC="ccache g++"; + MYCC="g++"; fi -echo mycc: $MYCC +if which "ccache" 2>/dev/null >/dev/null; then + MYCC="ccache $MYCC"; +fi + +echo MYCC: $MYCC #OPTS="--enable-doxygen --enable-docbook" -#OPTS="$OPTS --enable-builtin-stl --disable-rtti --disable-exceptions" -#OPTS="$OPTS --enable-debug=full" +OPTS="$OPTS --enable-builtin-stl" # --disable-exceptions --disable-rtti +OPTS="$OPTS --enable-debug=full" +#OPTS="$OPTS --disable-builtin-cxxtest --enable-cppunit" +#OPTS="$OPTS --disable-builtin-cxxtest --enable-boosttest" CFLAGS="$MYFLAGS" CXXFLAGS="$MYFLAGS" CXX=$MYCC CC=$MYCC ${0%/*}/configure $OPTS --prefix=/tmp/mockpp-install |
|
From: Ewald A. <ewa...@us...> - 2006-01-02 15:40:31
|
Update of /cvsroot/mockpp/mockpp/mockpp/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21152/mockpp/tests Modified Files: mock_test.cpp mockpp_test.cpp Log Message: update Index: mock_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/mock_test.cpp,v retrieving revision 1.38 retrieving revision 1.39 diff -u -d -r1.38 -r1.39 --- mock_test.cpp 2 Jan 2006 11:37:17 -0000 1.38 +++ mock_test.cpp 2 Jan 2006 15:40:22 -0000 1.39 @@ -29,6 +29,7 @@ // Expected number of tests: // 8 cppunit specific +// 9 unicode specific // mock_test : 511 // jmock_test: 199 @@ -68,6 +69,8 @@ #include <boost/test/auto_unit_test.hpp> #include <boost/test/unit_test.hpp> +#include <boost/test/unit_test_result.hpp> + using namespace boost::unit_test_framework; #elif defined(MOCKPP_USE_CPPUNIT) @@ -223,10 +226,10 @@ std::cout << " - size of <char> is " << sizeof(MOCKPP_CHAR('x')) << std::endl; std::cout << "\n"; - +/* std::cout << "Options\n"; std::cout << " --show-name show method names before calling\n"; - +*/ test_suite* test = boost::unit_test_framework::detail::auto_unit_test_suite(); /* @@ -244,7 +247,7 @@ */ unit_test_log::instance().set_log_threshold_level(log_messages); - +// unit_test_result::instance().detailed_report(std::cout); return test; } Index: mockpp_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/mockpp_test.cpp,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- mockpp_test.cpp 1 Jan 2006 19:40:37 -0000 1.23 +++ mockpp_test.cpp 2 Jan 2006 15:40:22 -0000 1.24 @@ -34,7 +34,6 @@ #include <mockpp/compat/Asserter.h> - class mockpp_test MOCKPP_DERIVE_PUBLIC_UNITFRAMEWORK { public: @@ -67,11 +66,15 @@ #if defined (MOCKPP_USE_CXXTEST) MOCKPP_CXXTEST_SUITE_REGISTRATION( mockpp_test ); +#ifdef MOCKPP_UNICODE MOCKPP_CXXTEST(mockpp_test, test_unicode_latin1_conv); +#endif #elif defined(MOCKPP_USE_BOOSTTEST) +#ifdef MOCKPP_UNICODE MOCKPP_BOOST_TEST(mockpp_test::test_unicode_latin1_conv); +#endif #elif defined(MOCKPP_USE_CPPUNIT) |
|
From: Ewald A. <ewa...@us...> - 2006-01-02 11:37:25
|
Update of /cvsroot/mockpp/mockpp/mockpp/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4987/mockpp/tests Modified Files: NoException_test.cpp ThrowableList_test.cpp Verifiable_test.cpp VisitableMockMethod_test.cpp mock_test.cpp Log Message: cleanup mssing tests Index: Verifiable_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/Verifiable_test.cpp,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- Verifiable_test.cpp 1 Jan 2006 16:34:48 -0000 1.30 +++ Verifiable_test.cpp 2 Jan 2006 11:37:17 -0000 1.31 @@ -76,6 +76,7 @@ #elif defined(MOCKPP_USE_BOOSTTEST) +MOCKPP_BOOST_TEST(Verifiable_test::test_parent); MOCKPP_BOOST_TEST(Verifiable_test::test_add); MOCKPP_BOOST_TEST(Verifiable_test::test_add_remove); MOCKPP_BOOST_TEST(Verifiable_test::test_clear); Index: VisitableMockMethod_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockMethod_test.cpp,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- VisitableMockMethod_test.cpp 1 Jan 2006 16:34:48 -0000 1.27 +++ VisitableMockMethod_test.cpp 2 Jan 2006 11:37:17 -0000 1.28 @@ -101,6 +101,7 @@ #elif defined(MOCKPP_USE_BOOSTTEST) +MOCKPP_BOOST_TEST(VisitableMockMethod_test:: test_parameter_0 ); MOCKPP_BOOST_TEST(VisitableMockMethod_test:: test_parameter_0v ); MOCKPP_BOOST_TEST(VisitableMockMethod_test:: test_base ); MOCKPP_BOOST_TEST(VisitableMockMethod_test:: test_inst ); Index: ThrowableList_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ThrowableList_test.cpp,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- ThrowableList_test.cpp 1 Jan 2006 16:34:48 -0000 1.24 +++ ThrowableList_test.cpp 2 Jan 2006 11:37:17 -0000 1.25 @@ -79,6 +79,7 @@ #elif defined(MOCKPP_USE_BOOSTTEST) +MOCKPP_BOOST_TEST(ThrowableList_test::test_throw); MOCKPP_BOOST_TEST(ThrowableList_test::test_at); MOCKPP_BOOST_TEST(ThrowableList_test::test_reset); MOCKPP_BOOST_TEST(ThrowableList_test::test_setter); Index: mock_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/mock_test.cpp,v retrieving revision 1.37 retrieving revision 1.38 diff -u -d -r1.37 -r1.38 --- mock_test.cpp 1 Jan 2006 19:40:37 -0000 1.37 +++ mock_test.cpp 2 Jan 2006 11:37:17 -0000 1.38 @@ -224,6 +224,9 @@ std::cout << " - size of <char> is " << sizeof(MOCKPP_CHAR('x')) << std::endl; std::cout << "\n"; + std::cout << "Options\n"; + std::cout << " --show-name show method names before calling\n"; + test_suite* test = boost::unit_test_framework::detail::auto_unit_test_suite(); /* @@ -240,7 +243,7 @@ log_nothing = 9 */ - unit_test_log::instance().set_log_threshold_level(log_successful_tests); + unit_test_log::instance().set_log_threshold_level(log_messages); return test; } Index: NoException_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/NoException_test.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- NoException_test.cpp 1 Jan 2006 16:34:48 -0000 1.13 +++ NoException_test.cpp 2 Jan 2006 11:37:17 -0000 1.14 @@ -78,7 +78,7 @@ public: - MOCKPP_TESTMETHOD_DECL void test_invoke(); + MOCKPP_TESTMETHOD_DECL void test_invoke(); virtual void setUp(); virtual void tearDown(); @@ -92,6 +92,8 @@ #elif defined(MOCKPP_USE_BOOSTTEST) +MOCKPP_BOOST_TEST(NoException_test::test_invoke); + #elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (NoException_test); @@ -122,6 +124,7 @@ int val; }; + struct OtherStruct {}; @@ -160,6 +163,8 @@ void NoException_test::test_invoke() { + mockpp::setAssertionFailedForwarder(storeMalfunctionData<mockpp::AssertionFailedError>); + mockpp::ThrowableItem it; it.take(MyStruct()); it.get()->throw_me(); |
|
From: Ewald A. <ewa...@us...> - 2006-01-01 19:40:54
|
Update of /cvsroot/mockpp/mockpp/config In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13401/config Modified Files: ac_cxx_boosttest.m4 Log Message: fix framework dependencies Index: ac_cxx_boosttest.m4 =================================================================== RCS file: /cvsroot/mockpp/mockpp/config/ac_cxx_boosttest.m4,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- ac_cxx_boosttest.m4 1 Jan 2006 10:27:22 -0000 1.1 +++ ac_cxx_boosttest.m4 1 Jan 2006 19:40:36 -0000 1.2 @@ -2,7 +2,7 @@ AC_DEFUN([EA_CHECK_BOOSTTEST], [ -AC_ARG_ENABLE(boostdir, [ --boost-dir directory where the root of the Boost headers is located], [boostdir=NO]) +AC_ARG_ENABLE(boostdir, [ --boost-dir directory where the root of the Boost headers is located], [boostdir=NO]) boost_inc_dirs="/usr/include/boost-* /usr/local/include/boost-*" if test x$boostdir != xNO; then @@ -17,7 +17,6 @@ echo "*******************************************************" echo "found boost at $boost_inc" echo "*******************************************************" - EA_EXTRA_INC="$EA_EXTRA_INC -I$boost_inc" AC_DEFINE(HAVE_BOOSTTEST, 1, [Define if you have boost installed.]) else echo "*******************************************************" @@ -33,11 +32,6 @@ echo "*******************************************************" echo "found boost test library as $boost_name at $boost_lib" echo "*******************************************************" - x=${boost_name#lib} - echo "x $x" - LIBBOOST="-l${x%.so}" - echo "LIBBOOST $LIBBOOST" - EA_EXTRA_LIB="$EA_EXTRA_LIB -L$boost_lib" else echo "*******************************************************" echo "*** boost unit test framework not found." @@ -48,13 +42,17 @@ if test x$boosttest_inc != xNO; then if test x$enable_boosttest = xyes; then + x=${boost_name#lib} + LIBBOOST="-l${x%.so}" + EA_EXTRA_INC="$EA_EXTRA_INC -I$boost_inc" + EA_EXTRA_LIB="$EA_EXTRA_LIB -L$boost_lib" echo "*******************************************************" - echo "** using boosttest framework" + echo "** using Boost.Test framework" echo "*******************************************************" AC_DEFINE(MOCKPP_USE_BOOSTTEST, 1, [Define to use Boost.Test as framework.]) else echo "*******************************************************" - echo "** NOT using boosttest framework" + echo "** NOT using Boost.Test framework" echo "*******************************************************" AH_TEMPLATE(MOCKPP_USE_BOOSTTEST, [Define to use Boost.Test as framework.]) fi |
|
From: Ewald A. <ewa...@us...> - 2006-01-01 19:40:47
|
Update of /cvsroot/mockpp/mockpp/mockpp/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13401/mockpp/tests Modified Files: ExpectationMap_test.cpp mock_test.cpp mockpp_pti_test.cpp mockpp_test.cpp Log Message: fix framework dependencies Index: ExpectationMap_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ExpectationMap_test.cpp,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- ExpectationMap_test.cpp 1 Jan 2006 16:34:47 -0000 1.25 +++ ExpectationMap_test.cpp 1 Jan 2006 19:40:37 -0000 1.26 @@ -29,6 +29,8 @@ #include <mockpp/mockpp.h> // always first +#include MOCKPP_VECTOR_H + #include "SelectFramework.h" #include <mockpp/ExpectationMap.h> Index: mockpp_pti_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/mockpp_pti_test.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- mockpp_pti_test.cpp 1 Jan 2006 16:34:49 -0000 1.16 +++ mockpp_pti_test.cpp 1 Jan 2006 19:40:37 -0000 1.17 @@ -95,21 +95,22 @@ #if defined (MOCKPP_USE_CXXTEST) - MOCKPP_CXXTEST(mockpp_pti_test, test_coremock); - MOCKPP_CXXTEST(mockpp_pti_test, test_typeless); - MOCKPP_CXXTEST(mockpp_pti_test, test_lifo); - MOCKPP_CXXTEST(mockpp_pti_test, test_fifo); - MOCKPP_CXXTEST(mockpp_pti_test, test_invocation); - MOCKPP_CXXTEST(mockpp_pti_test, test_abstract); +MOCKPP_CXXTEST_SUITE_REGISTRATION( mockpp_pti_test ); +MOCKPP_CXXTEST(mockpp_pti_test, test_coremock); +MOCKPP_CXXTEST(mockpp_pti_test, test_typeless); +MOCKPP_CXXTEST(mockpp_pti_test, test_lifo); +MOCKPP_CXXTEST(mockpp_pti_test, test_fifo); +MOCKPP_CXXTEST(mockpp_pti_test, test_invocation); +MOCKPP_CXXTEST(mockpp_pti_test, test_abstract); #elif defined(MOCKPP_USE_BOOSTTEST) - MOCKPP_BOOST_TEST(mockpp_pti_test::test_coremock); - MOCKPP_BOOST_TEST(mockpp_pti_test::test_typeless); - MOCKPP_BOOST_TEST(mockpp_pti_test::test_lifo); - MOCKPP_BOOST_TEST(mockpp_pti_test::test_fifo); - MOCKPP_BOOST_TEST(mockpp_pti_test::test_invocation); - MOCKPP_BOOST_TEST(mockpp_pti_test::test_abstract); +MOCKPP_BOOST_TEST(mockpp_pti_test::test_coremock); +MOCKPP_BOOST_TEST(mockpp_pti_test::test_typeless); +MOCKPP_BOOST_TEST(mockpp_pti_test::test_lifo); +MOCKPP_BOOST_TEST(mockpp_pti_test::test_fifo); +MOCKPP_BOOST_TEST(mockpp_pti_test::test_invocation); +MOCKPP_BOOST_TEST(mockpp_pti_test::test_abstract); #elif defined(MOCKPP_USE_CPPUNIT) Index: mock_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/mock_test.cpp,v retrieving revision 1.36 retrieving revision 1.37 diff -u -d -r1.36 -r1.37 --- mock_test.cpp 1 Jan 2006 16:34:49 -0000 1.36 +++ mock_test.cpp 1 Jan 2006 19:40:37 -0000 1.37 @@ -90,8 +90,34 @@ #if defined(MOCKPP_USE_CXXTEST) +class MyErrorPrinter : public CxxTest::ErrorPrinter +{ + public: + + MyErrorPrinter(bool showit) + : show(showit) + {} + + void enterTest( const CxxTest::TestDescription &td ) + { + if (show) + std::cout << td.suiteName() << "::" << td.testName() << std::endl; + + CxxTest::ErrorPrinter::enterTest(td); + } + + private: + + bool show; +}; + int run_cxxtest(int argc, char **argv) { + bool show = false; + for (int i1 = 1; i1 < argc; ++i1) + if (strcmp (argv[1], "--show-name") == 0) + show = true; + #if defined(GUI_QT) return CxxTest::GuiTuiRunner<CxxTest::QtGui, CxxTest::StdioPrinter>( argc, argv ).run(); #elif defined(GUI_X11) @@ -99,7 +125,7 @@ #elif defined(GUI_WIN32) return CxxTest::GuiTuiRunner<CxxTest::Win32Gui, CxxTest::StdioPrinter>( argc, argv ).run(); #else - CxxTest::ErrorPrinter ep; + MyErrorPrinter ep(show); mockpp::CxxTestRunner::runAllTests(ep); return CxxTest::tracker().failedTests(); //return CxxTest::ErrorPrinter().run(); @@ -214,7 +240,7 @@ log_nothing = 9 */ - unit_test_log::instance().set_log_threshold_level(log_messages); + unit_test_log::instance().set_log_threshold_level(log_successful_tests); return test; } Index: mockpp_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/mockpp_test.cpp,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- mockpp_test.cpp 1 Jan 2006 16:34:49 -0000 1.22 +++ mockpp_test.cpp 1 Jan 2006 19:40:37 -0000 1.23 @@ -66,8 +66,9 @@ #if defined (MOCKPP_USE_CXXTEST) +MOCKPP_CXXTEST_SUITE_REGISTRATION( mockpp_test ); MOCKPP_CXXTEST(mockpp_test, test_unicode_latin1_conv); - + #elif defined(MOCKPP_USE_BOOSTTEST) MOCKPP_BOOST_TEST(mockpp_test::test_unicode_latin1_conv); |
|
From: Ewald A. <ewa...@us...> - 2006-01-01 19:40:45
|
Update of /cvsroot/mockpp/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13401 Modified Files: ChangeLog configure.in run-configure-unicode.sh Log Message: fix framework dependencies Index: run-configure-unicode.sh =================================================================== RCS file: /cvsroot/mockpp/mockpp/run-configure-unicode.sh,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- run-configure-unicode.sh 1 Jan 2006 10:27:21 -0000 1.15 +++ run-configure-unicode.sh 1 Jan 2006 19:40:35 -0000 1.16 @@ -11,7 +11,7 @@ #OPTS="--enable-doxygen --enable-docbook" -OPTS="$OPTS --enable-builtin-stl" # --disable-exceptions --disable-rtti +#OPTS="$OPTS --enable-builtin-stl" # --disable-exceptions --disable-rtti OPTS="$OPTS --enable-debug=full" #OPTS="$OPTS --disable-builtin-cxxtest --enable-cppunit" OPTS="$OPTS --disable-builtin-cxxtest --enable-boosttest" Index: ChangeLog =================================================================== RCS file: /cvsroot/mockpp/mockpp/ChangeLog,v retrieving revision 1.90 retrieving revision 1.91 diff -u -d -r1.90 -r1.91 --- ChangeLog 30 Dec 2005 14:18:46 -0000 1.90 +++ ChangeLog 1 Jan 2006 19:40:35 -0000 1.91 @@ -9,6 +9,8 @@ - update handbook, apidoc - sprinf_s only for msvc2005 - do not create cxxtest library when usage disabled + - support for Boost.Test and optionally use it as framework for the internal + unit tests 2005-11-29 1.11.0-beta1 Index: configure.in =================================================================== RCS file: /cvsroot/mockpp/mockpp/configure.in,v retrieving revision 1.109 retrieving revision 1.110 diff -u -d -r1.109 -r1.110 --- configure.in 1 Jan 2006 10:27:20 -0000 1.109 +++ configure.in 1 Jan 2006 19:40:35 -0000 1.110 @@ -90,7 +90,6 @@ EA_FIND_FILE(cppunit/TestCase.h, $cppunit_inc_dirs, cppunit_inc, dummy) if test x$cppunit_inc != xNO; then echo "found cppunit/TestCase.h at $cppunit_inc" - EA_EXTRA_INC="$EA_EXTRA_INC -I$cppunit_inc" AC_DEFINE(HAVE_CPPUNIT, 1, [Define if you have CppUnit installed.]) else echo "*******************************************************" @@ -104,8 +103,6 @@ EA_FIND_FILE(cppunit.la *cppunit.so* *cppunit*.a *cppunit*.dll*, $cppunit_lib_dirs, cppunit_lib, cppunit_name) if test x$cppunit_lib != xNO; then echo "found cppunit as $cppunit_name at $cppunit_lib" - LIBCPPUNIT="-lcppunit" - EA_EXTRA_LIB="$EA_EXTRA_LIB -L$cppunit_lib" else echo "*******************************************************" echo "*** *cppunit.{la,so,a,dll}* not found." @@ -116,6 +113,9 @@ if test x$cppunit_inc != xNO; then if test x$enable_cppunit = xyes; then + EA_EXTRA_INC="$EA_EXTRA_INC -I$cppunit_inc" + LIBCPPUNIT="-lcppunit" + EA_EXTRA_LIB="$EA_EXTRA_LIB -L$cppunit_lib" echo "*******************************************************" echo "** using cppunit framework" echo "*******************************************************" @@ -124,7 +124,7 @@ echo "*******************************************************" echo "** NOT using cppunit framework" echo "*******************************************************" - AH_TEMPLATE(MOCKPP_USE_CPPUNIT, [Define if you have cppunit installed.]) + AH_TEMPLATE(MOCKPP_USE_CPPUNIT, [Define to use cppunit as framework.]) fi fi |
|
From: Ewald A. <ewa...@us...> - 2006-01-01 19:40:45
|
Update of /cvsroot/mockpp/mockpp/mockpp/framework In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13401/mockpp/framework Modified Files: SelectUnittestFramework.h Log Message: fix framework dependencies Index: SelectUnittestFramework.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/framework/SelectUnittestFramework.h,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- SelectUnittestFramework.h 1 Jan 2006 16:34:47 -0000 1.9 +++ SelectUnittestFramework.h 1 Jan 2006 19:40:36 -0000 1.10 @@ -79,7 +79,7 @@ # define MOCKPP_BOOST_TEST(func_name) \ static boost::unit_test_framework::detail::auto_unit_test_registrar \ BOOST_JOIN( test_registrar, __LINE__) \ - ( BOOST_TEST_CASE( func_name ) ); \ + ( BOOST_TEST_CASE( func_name ) ); //================================================= #else |
|
From: Ewald A. <ewa...@us...> - 2006-01-01 16:51:55
|
Update of /cvsroot/mockpp/mockpp/mockpp/docs/en In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2194/mockpp/docs/en Modified Files: appendix.docbook Log Message: boost test Index: appendix.docbook =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/docs/en/appendix.docbook,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- appendix.docbook 30 Dec 2005 14:18:17 -0000 1.17 +++ appendix.docbook 1 Jan 2006 16:51:46 -0000 1.18 @@ -102,6 +102,21 @@ </listitem> </varlistentry> + <varlistentry> + <term>--enable-boosttest</term> + <listitem>This option enables Boost.Test as test framework. + </listitem> + </varlistentry> + + <varlistentry> + <term>--boost-dir</term> + <listitem>Normaly configure searches <filename>/usr/include</filename> and + <filename>/usr/local/include</filename>. In case there are multiple version + the first directory is taken. If you have a non-standard include directory or + need as special version you will want to use this option. + </listitem> + </varlistentry> + </variablelist> |
Update of /cvsroot/mockpp/mockpp/mockpp/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30752/mockpp/tests Modified Files: AbstractDynamicChainingMock_test.cpp AbstractInvocationDispatcher_test.cpp And_test.cpp AnyArgumentsMatcher_test.cpp ArgumentsMatchBuilder_test.cpp ArgumentsMatcher_test.cpp AssertMo_test.cpp Assert_test.cpp ChainableMockMethod_1_test.cpp ChainableMockMethod_2_test.cpp ChainableMockMethod_test.cpp ChainableMockObjectPolymorphism_test.cpp ChainableMockObject_1_test.cpp ChainableMockObject_1_void_test.cpp ChainableMockObject_2_test.cpp ChainableMockObject_2_void_test.cpp ChainableMockObject_3_test.cpp ChainableMockObject_3_void_test.cpp ChainableMockObject_4_test.cpp ChainableMockObject_4_void_test.cpp ChainableMockObject_5_test.cpp ChainableMockObject_5_void_test.cpp ChainableMockObject_test.cpp ChainableMockObject_void_test.cpp ChainingMockBuilder_test.cpp ChainingMockObjectSupport_test.cpp ConstraintList_test.cpp ConstraintSet_test.cpp CoreMock_test.cpp CustomStub_test.cpp DefaultResultStub_test.cpp DynamicChainingMockError_test.cpp Exception_test.cpp ExpectationBoundary_test.cpp ExpectationConglomeration_test.cpp ExpectationCounterRange_test.cpp ExpectationCounter_test.cpp ExpectationList_test.cpp ExpectationMap_test.cpp ExpectationSegment_test.cpp ExpectationSet_test.cpp ExpectationValue_test.cpp FIFOInvocationDispatcher_test.cpp Formatter_test.cpp InvocationMockerBuilder_test.cpp InvocationMocker_test.cpp Invocation_test.cpp InvokeAtLeastMatcher_test.cpp InvokeAtLeastOnceMatcher_test.cpp InvokeAtMostMatcher_test.cpp InvokeCountMatcher_test.cpp InvokeOnceMatcher_test.cpp InvokedAfterMatcher_test.cpp InvokedBeforeMatcher_test.cpp InvokedRecorder_test.cpp IsAnything_test.cpp IsCloseTo_test.cpp IsEqual_test.cpp IsGreaterOrEqual_test.cpp IsGreaterThan_test.cpp IsInstanceOf_test.cpp IsLessOrEqual_test.cpp IsLessThan_test.cpp IsNot_test.cpp IsNothing_test.cpp IsSame_test.cpp LIFOInvocationDispatcher_test.cpp MatchBuilder_test.cpp MixedMockObject_5_test.cpp MockObject_test.cpp NoArgumentsMatcher_test.cpp NoException_test.cpp Or_test.cpp OutBound_test.cpp ResponseVector_test.cpp ReturnObjectList_test.cpp ReturnStub_test.cpp StringContains_test.cpp StringEndsWith_test.cpp StringStartsWith_test.cpp StubBuilder_test.cpp StubSequence_test.cpp TestFailureMatcher_test.cpp TestFailureStub_test.cpp ThrowStub_test.cpp ThrowableList_test.cpp Throwable_test.cpp TimeServer_test.cpp TrackingCounter_test.cpp TypelessStubSequence_test.cpp UnlimitedMatcher_test.cpp Verifiable_test.cpp VerifyingTestCaller_test.cpp VerifyingTestCase_test.cpp VisitableMockMethod_1_test.cpp VisitableMockMethod_2_test.cpp VisitableMockMethod_test.cpp VisitableMockObject_1_test.cpp VisitableMockObject_1_void_test.cpp VisitableMockObject_2_test.cpp VisitableMockObject_2_void_test.cpp VisitableMockObject_3_test.cpp VisitableMockObject_3_void_test.cpp VisitableMockObject_4_test.cpp VisitableMockObject_4_void_test.cpp VisitableMockObject_5_test.cpp VisitableMockObject_5_void_test.cpp VisitableMockObject_template_test.cpp VisitableMockObject_test.cpp VisitableMockObject_void_test.cpp VoidStub_test.cpp mock_test.cpp mockpp_pti_test.cpp mockpp_test.cpp Log Message: more descriptive name Index: Or_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/Or_test.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- Or_test.cpp 1 Jan 2006 16:28:36 -0000 1.18 +++ Or_test.cpp 1 Jan 2006 16:34:48 -0000 1.19 @@ -60,8 +60,8 @@ public: - MOCKPP_TEST_DECL void test_invoke(); - MOCKPP_TEST_DECL void test_describe(); + MOCKPP_TESTMETHOD_DECL void test_invoke(); + MOCKPP_TESTMETHOD_DECL void test_describe(); }; Index: TestFailureMatcher_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/TestFailureMatcher_test.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- TestFailureMatcher_test.cpp 1 Jan 2006 16:28:36 -0000 1.16 +++ TestFailureMatcher_test.cpp 1 Jan 2006 16:34:48 -0000 1.17 @@ -55,7 +55,7 @@ public: - MOCKPP_TEST_DECL void test_invoke(); + MOCKPP_TESTMETHOD_DECL void test_invoke(); }; Index: DynamicChainingMockError_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/DynamicChainingMockError_test.cpp,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- DynamicChainingMockError_test.cpp 1 Jan 2006 16:28:36 -0000 1.21 +++ DynamicChainingMockError_test.cpp 1 Jan 2006 16:34:47 -0000 1.22 @@ -63,7 +63,7 @@ public: - MOCKPP_TEST_DECL void test_describe(); + MOCKPP_TESTMETHOD_DECL void test_describe(); }; Index: AbstractDynamicChainingMock_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/AbstractDynamicChainingMock_test.cpp,v retrieving revision 1.40 retrieving revision 1.41 diff -u -d -r1.40 -r1.41 --- AbstractDynamicChainingMock_test.cpp 1 Jan 2006 11:17:28 -0000 1.40 +++ AbstractDynamicChainingMock_test.cpp 1 Jan 2006 16:34:47 -0000 1.41 @@ -80,12 +80,12 @@ public: - MOCKPP_TEST_DECL void test_void_invocation(); - MOCKPP_TEST_DECL void test_invocation(); - MOCKPP_TEST_DECL void test_describer(); - MOCKPP_TEST_DECL void test_describe(); - MOCKPP_TEST_DECL void test_void_describe(); - MOCKPP_TEST_DECL void test_verify(); + MOCKPP_TESTMETHOD_DECL void test_void_invocation(); + MOCKPP_TESTMETHOD_DECL void test_invocation(); + MOCKPP_TESTMETHOD_DECL void test_describer(); + MOCKPP_TESTMETHOD_DECL void test_describe(); + MOCKPP_TESTMETHOD_DECL void test_void_describe(); + MOCKPP_TESTMETHOD_DECL void test_verify(); }; Index: IsInstanceOf_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/IsInstanceOf_test.cpp,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- IsInstanceOf_test.cpp 1 Jan 2006 16:28:36 -0000 1.22 +++ IsInstanceOf_test.cpp 1 Jan 2006 16:34:48 -0000 1.23 @@ -58,8 +58,8 @@ public: - MOCKPP_TEST_DECL void test_describe(); - MOCKPP_TEST_DECL void test_invoke(); + MOCKPP_TESTMETHOD_DECL void test_describe(); + MOCKPP_TESTMETHOD_DECL void test_invoke(); }; Index: ExpectationList_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ExpectationList_test.cpp,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- ExpectationList_test.cpp 1 Jan 2006 16:28:36 -0000 1.24 +++ ExpectationList_test.cpp 1 Jan 2006 16:34:47 -0000 1.25 @@ -73,27 +73,27 @@ #endif public: - MOCKPP_TEST_DECL void test_expectNothing(); - MOCKPP_TEST_DECL void test_expectNothing_revoked(); - MOCKPP_TEST_DECL void fail_expectNothing(); + MOCKPP_TESTMETHOD_DECL void test_expectNothing(); + MOCKPP_TESTMETHOD_DECL void test_expectNothing_revoked(); + MOCKPP_TESTMETHOD_DECL void fail_expectNothing(); - MOCKPP_TEST_DECL void test_expectActualImmediate(); - MOCKPP_TEST_DECL void fail_expectActualImmediate(); + MOCKPP_TESTMETHOD_DECL void test_expectActualImmediate(); + MOCKPP_TESTMETHOD_DECL void fail_expectActualImmediate(); - MOCKPP_TEST_DECL void test_expectActualVerify(); - MOCKPP_TEST_DECL void fail_expectActualVerify(); + MOCKPP_TESTMETHOD_DECL void test_expectActualVerify(); + MOCKPP_TESTMETHOD_DECL void fail_expectActualVerify(); - MOCKPP_TEST_DECL void test_clear(); - MOCKPP_TEST_DECL void fail_many(); - MOCKPP_TEST_DECL void test_name(); - MOCKPP_TEST_DECL void fail_clearActual(); - MOCKPP_TEST_DECL void test_hasExpectations(); - MOCKPP_TEST_DECL void test_ifNoExpected(); + MOCKPP_TESTMETHOD_DECL void test_clear(); + MOCKPP_TESTMETHOD_DECL void fail_many(); + MOCKPP_TESTMETHOD_DECL void test_name(); + MOCKPP_TESTMETHOD_DECL void fail_clearActual(); + MOCKPP_TESTMETHOD_DECL void test_hasExpectations(); + MOCKPP_TESTMETHOD_DECL void test_ifNoExpected(); - MOCKPP_TEST_DECL void test_chain(); - MOCKPP_TEST_DECL void test_balance(); - MOCKPP_TEST_DECL void test_many(); - MOCKPP_TEST_DECL void fail_ifNoActual(); + MOCKPP_TESTMETHOD_DECL void test_chain(); + MOCKPP_TESTMETHOD_DECL void test_balance(); + MOCKPP_TESTMETHOD_DECL void test_many(); + MOCKPP_TESTMETHOD_DECL void fail_ifNoActual(); }; #if defined (MOCKPP_USE_CXXTEST) Index: IsLessThan_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/IsLessThan_test.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- IsLessThan_test.cpp 1 Jan 2006 16:28:36 -0000 1.14 +++ IsLessThan_test.cpp 1 Jan 2006 16:34:48 -0000 1.15 @@ -57,8 +57,8 @@ public: - MOCKPP_TEST_DECL void test_invoke(); - MOCKPP_TEST_DECL void test_describe(); + MOCKPP_TESTMETHOD_DECL void test_invoke(); + MOCKPP_TESTMETHOD_DECL void test_describe(); }; Index: ExpectationMap_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ExpectationMap_test.cpp,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- ExpectationMap_test.cpp 1 Jan 2006 16:28:36 -0000 1.24 +++ ExpectationMap_test.cpp 1 Jan 2006 16:34:47 -0000 1.25 @@ -76,30 +76,30 @@ #endif public: - MOCKPP_TEST_DECL void test_expectNothing_revoked(); - MOCKPP_TEST_DECL void test_expectNothing(); - MOCKPP_TEST_DECL void fail_expectNothing(); + MOCKPP_TESTMETHOD_DECL void test_expectNothing_revoked(); + MOCKPP_TESTMETHOD_DECL void test_expectNothing(); + MOCKPP_TESTMETHOD_DECL void fail_expectNothing(); - MOCKPP_TEST_DECL void test_expectActualImmediate(); - MOCKPP_TEST_DECL void fail_expectActualImmediate(); + MOCKPP_TESTMETHOD_DECL void test_expectActualImmediate(); + MOCKPP_TESTMETHOD_DECL void fail_expectActualImmediate(); - MOCKPP_TEST_DECL void test_expectActualVerify(); - MOCKPP_TEST_DECL void fail_expectActualVerify(); + MOCKPP_TESTMETHOD_DECL void test_expectActualVerify(); + MOCKPP_TESTMETHOD_DECL void fail_expectActualVerify(); - MOCKPP_TEST_DECL void test_chain(); - MOCKPP_TEST_DECL void fail_many(); - MOCKPP_TEST_DECL void fail_clearActual(); - MOCKPP_TEST_DECL void test_name(); - MOCKPP_TEST_DECL void test_missing(); - MOCKPP_TEST_DECL void test_get(); - MOCKPP_TEST_DECL void test_pair_get(); - MOCKPP_TEST_DECL void test_pair_getmany(); - MOCKPP_TEST_DECL void test_clear(); - MOCKPP_TEST_DECL void test_hasExpectations(); - MOCKPP_TEST_DECL void test_ifNoExpected(); + MOCKPP_TESTMETHOD_DECL void test_chain(); + MOCKPP_TESTMETHOD_DECL void fail_many(); + MOCKPP_TESTMETHOD_DECL void fail_clearActual(); + MOCKPP_TESTMETHOD_DECL void test_name(); + MOCKPP_TESTMETHOD_DECL void test_missing(); + MOCKPP_TESTMETHOD_DECL void test_get(); + MOCKPP_TESTMETHOD_DECL void test_pair_get(); + MOCKPP_TESTMETHOD_DECL void test_pair_getmany(); + MOCKPP_TESTMETHOD_DECL void test_clear(); + MOCKPP_TESTMETHOD_DECL void test_hasExpectations(); + MOCKPP_TESTMETHOD_DECL void test_ifNoExpected(); - MOCKPP_TEST_DECL void test_many(); - MOCKPP_TEST_DECL void fail_ifNoActual(); + MOCKPP_TESTMETHOD_DECL void test_many(); + MOCKPP_TESTMETHOD_DECL void fail_ifNoActual(); }; #if defined (MOCKPP_USE_CXXTEST) Index: CustomStub_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/CustomStub_test.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- CustomStub_test.cpp 1 Jan 2006 16:28:36 -0000 1.18 +++ CustomStub_test.cpp 1 Jan 2006 16:34:47 -0000 1.19 @@ -56,7 +56,7 @@ public: - MOCKPP_TEST_DECL void test_invoke(); + MOCKPP_TESTMETHOD_DECL void test_invoke(); }; Index: VisitableMockObject_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_test.cpp,v retrieving revision 1.32 retrieving revision 1.33 diff -u -d -r1.32 -r1.33 --- VisitableMockObject_test.cpp 1 Jan 2006 10:27:23 -0000 1.32 +++ VisitableMockObject_test.cpp 1 Jan 2006 16:34:49 -0000 1.33 @@ -75,25 +75,25 @@ public: - MOCKPP_TEST_DECL void test_controller(); - MOCKPP_TEST_DECL void test_thrower(); - MOCKPP_TEST_DECL void test_return(); - MOCKPP_TEST_DECL void test_clear(); - MOCKPP_TEST_DECL void test_parameter_ex(); - MOCKPP_TEST_DECL void test_inline_pre_1_2(); - MOCKPP_TEST_DECL void test_inline_post_1_2(); - MOCKPP_TEST_DECL void test_method_unused(); + MOCKPP_TESTMETHOD_DECL void test_controller(); + MOCKPP_TESTMETHOD_DECL void test_thrower(); + MOCKPP_TESTMETHOD_DECL void test_return(); + MOCKPP_TESTMETHOD_DECL void test_clear(); + MOCKPP_TESTMETHOD_DECL void test_parameter_ex(); + MOCKPP_TESTMETHOD_DECL void test_inline_pre_1_2(); + MOCKPP_TESTMETHOD_DECL void test_inline_post_1_2(); + MOCKPP_TESTMETHOD_DECL void test_method_unused(); - MOCKPP_TEST_DECL void fail_unused_value(); - MOCKPP_TEST_DECL void fail_unused_throwable(); - MOCKPP_TEST_DECL void fail_return(); - MOCKPP_TEST_DECL void fail_add_method_after_active(); - MOCKPP_TEST_DECL void fail_add_throw_val_after_active(); - MOCKPP_TEST_DECL void fail_add_throw_after_active(); - MOCKPP_TEST_DECL void fail_set_throw_after_active(); - MOCKPP_TEST_DECL void fail_add_return_after_active(); - MOCKPP_TEST_DECL void fail_set_return_after_active(); - MOCKPP_TEST_DECL void test_stub_return_const_ref(); + MOCKPP_TESTMETHOD_DECL void fail_unused_value(); + MOCKPP_TESTMETHOD_DECL void fail_unused_throwable(); + MOCKPP_TESTMETHOD_DECL void fail_return(); + MOCKPP_TESTMETHOD_DECL void fail_add_method_after_active(); + MOCKPP_TESTMETHOD_DECL void fail_add_throw_val_after_active(); + MOCKPP_TESTMETHOD_DECL void fail_add_throw_after_active(); + MOCKPP_TESTMETHOD_DECL void fail_set_throw_after_active(); + MOCKPP_TESTMETHOD_DECL void fail_add_return_after_active(); + MOCKPP_TESTMETHOD_DECL void fail_set_return_after_active(); + MOCKPP_TESTMETHOD_DECL void test_stub_return_const_ref(); }; Index: Assert_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/Assert_test.cpp,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- Assert_test.cpp 1 Jan 2006 16:28:36 -0000 1.26 +++ Assert_test.cpp 1 Jan 2006 16:34:47 -0000 1.27 @@ -74,27 +74,27 @@ #endif public: - MOCKPP_TEST_DECL void fail_fail(); - MOCKPP_TEST_DECL void fail_failmsg(); + MOCKPP_TESTMETHOD_DECL void fail_fail(); + MOCKPP_TESTMETHOD_DECL void fail_failmsg(); - MOCKPP_TEST_DECL void test_FalseTrue(); - MOCKPP_TEST_DECL void test_boundary(); + MOCKPP_TESTMETHOD_DECL void test_FalseTrue(); + MOCKPP_TESTMETHOD_DECL void test_boundary(); - MOCKPP_TEST_DECL void test_equalsPChar(); - MOCKPP_TEST_DECL void test_equalsAString(); + MOCKPP_TESTMETHOD_DECL void test_equalsPChar(); + MOCKPP_TESTMETHOD_DECL void test_equalsAString(); #ifdef MOCKPP_UNICODE - MOCKPP_TEST_DECL void test_equalsPWChar(); - MOCKPP_TEST_DECL void test_equalsWString(); + MOCKPP_TESTMETHOD_DECL void test_equalsPWChar(); + MOCKPP_TESTMETHOD_DECL void test_equalsWString(); #endif - MOCKPP_TEST_DECL void test_equalsDouble(); - MOCKPP_TEST_DECL void test_equalsFloat(); - MOCKPP_TEST_DECL void test_equalsLong(); - MOCKPP_TEST_DECL void test_equalsBool(); - MOCKPP_TEST_DECL void test_equalsChar(); - MOCKPP_TEST_DECL void test_equalsInt(); - MOCKPP_TEST_DECL void test_equalsShort(); - MOCKPP_TEST_DECL void test_macros(); + MOCKPP_TESTMETHOD_DECL void test_equalsDouble(); + MOCKPP_TESTMETHOD_DECL void test_equalsFloat(); + MOCKPP_TESTMETHOD_DECL void test_equalsLong(); + MOCKPP_TESTMETHOD_DECL void test_equalsBool(); + MOCKPP_TESTMETHOD_DECL void test_equalsChar(); + MOCKPP_TESTMETHOD_DECL void test_equalsInt(); + MOCKPP_TESTMETHOD_DECL void test_equalsShort(); + MOCKPP_TESTMETHOD_DECL void test_macros(); }; Index: IsLessOrEqual_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/IsLessOrEqual_test.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- IsLessOrEqual_test.cpp 1 Jan 2006 16:28:36 -0000 1.14 +++ IsLessOrEqual_test.cpp 1 Jan 2006 16:34:48 -0000 1.15 @@ -57,8 +57,8 @@ public: - MOCKPP_TEST_DECL void test_invoke(); - MOCKPP_TEST_DECL void test_describe(); + MOCKPP_TESTMETHOD_DECL void test_invoke(); + MOCKPP_TESTMETHOD_DECL void test_describe(); }; Index: MixedMockObject_5_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/MixedMockObject_5_test.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- MixedMockObject_5_test.cpp 1 Jan 2006 16:28:36 -0000 1.13 +++ MixedMockObject_5_test.cpp 1 Jan 2006 16:34:48 -0000 1.14 @@ -72,9 +72,9 @@ public: - MOCKPP_TEST_DECL void test_controller(); - MOCKPP_TEST_DECL void test_chainer(); - MOCKPP_TEST_DECL void test_return(); + MOCKPP_TESTMETHOD_DECL void test_controller(); + MOCKPP_TESTMETHOD_DECL void test_chainer(); + MOCKPP_TESTMETHOD_DECL void test_return(); }; Index: ChainableMockObject_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_test.cpp,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- ChainableMockObject_test.cpp 1 Jan 2006 16:28:36 -0000 1.31 +++ ChainableMockObject_test.cpp 1 Jan 2006 16:34:47 -0000 1.32 @@ -74,18 +74,18 @@ public: - MOCKPP_TEST_DECL void test_after_1(); - MOCKPP_TEST_DECL void test_after_2(); - MOCKPP_TEST_DECL void test_bad_after(); - MOCKPP_TEST_DECL void test_before_1(); - MOCKPP_TEST_DECL void test_before_2(); - MOCKPP_TEST_DECL void test_bad_before(); - MOCKPP_TEST_DECL void test_register(); - MOCKPP_TEST_DECL void test_pending(); - MOCKPP_TEST_DECL void test_expect_return(); - MOCKPP_TEST_DECL void test_expect_throw(); - MOCKPP_TEST_DECL void test_stub_return(); - MOCKPP_TEST_DECL void test_stub_return_const_ref(); + MOCKPP_TESTMETHOD_DECL void test_after_1(); + MOCKPP_TESTMETHOD_DECL void test_after_2(); + MOCKPP_TESTMETHOD_DECL void test_bad_after(); + MOCKPP_TESTMETHOD_DECL void test_before_1(); + MOCKPP_TESTMETHOD_DECL void test_before_2(); + MOCKPP_TESTMETHOD_DECL void test_bad_before(); + MOCKPP_TESTMETHOD_DECL void test_register(); + MOCKPP_TESTMETHOD_DECL void test_pending(); + MOCKPP_TESTMETHOD_DECL void test_expect_return(); + MOCKPP_TESTMETHOD_DECL void test_expect_throw(); + MOCKPP_TESTMETHOD_DECL void test_stub_return(); + MOCKPP_TESTMETHOD_DECL void test_stub_return_const_ref(); }; Index: Invocation_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/Invocation_test.cpp,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- Invocation_test.cpp 1 Jan 2006 16:28:36 -0000 1.27 +++ Invocation_test.cpp 1 Jan 2006 16:34:47 -0000 1.28 @@ -69,18 +69,18 @@ public: - MOCKPP_TEST_DECL void test_equals0(); - MOCKPP_TEST_DECL void test_equals1(); - MOCKPP_TEST_DECL void test_equals2(); - MOCKPP_TEST_DECL void test_equals3(); - MOCKPP_TEST_DECL void test_equals4(); - MOCKPP_TEST_DECL void test_equals5(); - MOCKPP_TEST_DECL void test_get1(); - MOCKPP_TEST_DECL void test_get2(); - MOCKPP_TEST_DECL void test_get3(); - MOCKPP_TEST_DECL void test_get4(); - MOCKPP_TEST_DECL void test_get5(); - MOCKPP_TEST_DECL void test_invoked(); + MOCKPP_TESTMETHOD_DECL void test_equals0(); + MOCKPP_TESTMETHOD_DECL void test_equals1(); + MOCKPP_TESTMETHOD_DECL void test_equals2(); + MOCKPP_TESTMETHOD_DECL void test_equals3(); + MOCKPP_TESTMETHOD_DECL void test_equals4(); + MOCKPP_TESTMETHOD_DECL void test_equals5(); + MOCKPP_TESTMETHOD_DECL void test_get1(); + MOCKPP_TESTMETHOD_DECL void test_get2(); + MOCKPP_TESTMETHOD_DECL void test_get3(); + MOCKPP_TESTMETHOD_DECL void test_get4(); + MOCKPP_TESTMETHOD_DECL void test_get5(); + MOCKPP_TESTMETHOD_DECL void test_invoked(); }; Index: IsGreaterThan_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/IsGreaterThan_test.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- IsGreaterThan_test.cpp 1 Jan 2006 16:28:36 -0000 1.14 +++ IsGreaterThan_test.cpp 1 Jan 2006 16:34:48 -0000 1.15 @@ -57,8 +57,8 @@ public: - MOCKPP_TEST_DECL void test_describe(); - MOCKPP_TEST_DECL void test_invoke(); + MOCKPP_TESTMETHOD_DECL void test_describe(); + MOCKPP_TESTMETHOD_DECL void test_invoke(); }; Index: NoException_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/NoException_test.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- NoException_test.cpp 1 Jan 2006 10:27:23 -0000 1.12 +++ NoException_test.cpp 1 Jan 2006 16:34:48 -0000 1.13 @@ -78,7 +78,7 @@ public: - MOCKPP_TEST_DECL void test_invoke(); + MOCKPP_TESTMETHOD_DECL void test_invoke(); virtual void setUp(); virtual void tearDown(); Index: ChainableMockObject_4_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_4_void_test.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- ChainableMockObject_4_void_test.cpp 1 Jan 2006 16:28:36 -0000 1.19 +++ ChainableMockObject_4_void_test.cpp 1 Jan 2006 16:34:47 -0000 1.20 @@ -64,8 +64,8 @@ public: - MOCKPP_TEST_DECL void test_outbound(); - MOCKPP_TEST_DECL void test_parameter_4(); + MOCKPP_TESTMETHOD_DECL void test_outbound(); + MOCKPP_TESTMETHOD_DECL void test_parameter_4(); }; Index: InvocationMockerBuilder_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/InvocationMockerBuilder_test.cpp,v retrieving revision 1.36 retrieving revision 1.37 diff -u -d -r1.36 -r1.37 --- InvocationMockerBuilder_test.cpp 1 Jan 2006 16:28:36 -0000 1.36 +++ InvocationMockerBuilder_test.cpp 1 Jan 2006 16:34:47 -0000 1.37 @@ -86,10 +86,10 @@ public: - MOCKPP_TEST_DECL void test_instance0(); - MOCKPP_TEST_DECL void test_instance5(); - MOCKPP_TEST_DECL void test_instancev0(); - MOCKPP_TEST_DECL void test_instancev5(); + MOCKPP_TESTMETHOD_DECL void test_instance0(); + MOCKPP_TESTMETHOD_DECL void test_instance5(); + MOCKPP_TESTMETHOD_DECL void test_instancev0(); + MOCKPP_TESTMETHOD_DECL void test_instancev5(); }; Index: StringContains_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/StringContains_test.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- StringContains_test.cpp 1 Jan 2006 16:28:36 -0000 1.18 +++ StringContains_test.cpp 1 Jan 2006 16:34:48 -0000 1.19 @@ -57,8 +57,8 @@ public: - MOCKPP_TEST_DECL void test_invoke(); - MOCKPP_TEST_DECL void test_describe(); + MOCKPP_TESTMETHOD_DECL void test_invoke(); + MOCKPP_TESTMETHOD_DECL void test_describe(); }; Index: InvokeAtLeastOnceMatcher_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/InvokeAtLeastOnceMatcher_test.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- InvokeAtLeastOnceMatcher_test.cpp 1 Jan 2006 16:28:36 -0000 1.15 +++ InvokeAtLeastOnceMatcher_test.cpp 1 Jan 2006 16:34:48 -0000 1.16 @@ -54,7 +54,7 @@ public: - MOCKPP_TEST_DECL void test_invoke(); + MOCKPP_TESTMETHOD_DECL void test_invoke(); }; Index: ExpectationSet_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ExpectationSet_test.cpp,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- ExpectationSet_test.cpp 1 Jan 2006 16:28:36 -0000 1.22 +++ ExpectationSet_test.cpp 1 Jan 2006 16:34:47 -0000 1.23 @@ -72,26 +72,26 @@ #endif public: - MOCKPP_TEST_DECL void test_expectNothing(); - MOCKPP_TEST_DECL void test_expectNothing_revoked(); - MOCKPP_TEST_DECL void fail_expectNothing(); + MOCKPP_TESTMETHOD_DECL void test_expectNothing(); + MOCKPP_TESTMETHOD_DECL void test_expectNothing_revoked(); + MOCKPP_TESTMETHOD_DECL void fail_expectNothing(); - MOCKPP_TEST_DECL void test_expectActualImmediate(); - MOCKPP_TEST_DECL void fail_expectActualImmediate(); + MOCKPP_TESTMETHOD_DECL void test_expectActualImmediate(); + MOCKPP_TESTMETHOD_DECL void fail_expectActualImmediate(); - MOCKPP_TEST_DECL void test_expectActualVerify(); - MOCKPP_TEST_DECL void fail_expectActualVerify(); + MOCKPP_TESTMETHOD_DECL void test_expectActualVerify(); + MOCKPP_TESTMETHOD_DECL void fail_expectActualVerify(); - MOCKPP_TEST_DECL void fail_many(); - MOCKPP_TEST_DECL void test_name(); - MOCKPP_TEST_DECL void test_clear(); - MOCKPP_TEST_DECL void fail_clearActual(); - MOCKPP_TEST_DECL void test_hasExpectations(); - MOCKPP_TEST_DECL void test_ifNoExpected(); + MOCKPP_TESTMETHOD_DECL void fail_many(); + MOCKPP_TESTMETHOD_DECL void test_name(); + MOCKPP_TESTMETHOD_DECL void test_clear(); + MOCKPP_TESTMETHOD_DECL void fail_clearActual(); + MOCKPP_TESTMETHOD_DECL void test_hasExpectations(); + MOCKPP_TESTMETHOD_DECL void test_ifNoExpected(); - MOCKPP_TEST_DECL void test_chain(); - MOCKPP_TEST_DECL void test_many(); - MOCKPP_TEST_DECL void fail_ifNoActual(); + MOCKPP_TESTMETHOD_DECL void test_chain(); + MOCKPP_TESTMETHOD_DECL void test_many(); + MOCKPP_TESTMETHOD_DECL void fail_ifNoActual(); }; #if defined (MOCKPP_USE_CXXTEST) Index: ChainableMockObject_1_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_1_void_test.cpp,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- ChainableMockObject_1_void_test.cpp 1 Jan 2006 16:28:36 -0000 1.22 +++ ChainableMockObject_1_void_test.cpp 1 Jan 2006 16:34:47 -0000 1.23 @@ -69,8 +69,8 @@ public: - MOCKPP_TEST_DECL void test_outbound(); - MOCKPP_TEST_DECL void test_parameter_1(); + MOCKPP_TESTMETHOD_DECL void test_outbound(); + MOCKPP_TESTMETHOD_DECL void test_parameter_1(); }; Index: ChainableMockMethod_2_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockMethod_2_test.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- ChainableMockMethod_2_test.cpp 1 Jan 2006 16:28:36 -0000 1.17 +++ ChainableMockMethod_2_test.cpp 1 Jan 2006 16:34:47 -0000 1.18 @@ -73,8 +73,8 @@ public: - MOCKPP_TEST_DECL void test_parameter_2(); - MOCKPP_TEST_DECL void test_parameter_2v(); + MOCKPP_TESTMETHOD_DECL void test_parameter_2(); + MOCKPP_TESTMETHOD_DECL void test_parameter_2v(); }; Index: InvokedAfterMatcher_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/InvokedAfterMatcher_test.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- InvokedAfterMatcher_test.cpp 1 Jan 2006 16:28:36 -0000 1.15 +++ InvokedAfterMatcher_test.cpp 1 Jan 2006 16:34:48 -0000 1.16 @@ -54,7 +54,7 @@ public: - MOCKPP_TEST_DECL void test_invoke(); + MOCKPP_TESTMETHOD_DECL void test_invoke(); }; Index: InvokeOnceMatcher_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/InvokeOnceMatcher_test.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- InvokeOnceMatcher_test.cpp 1 Jan 2006 16:28:36 -0000 1.15 +++ InvokeOnceMatcher_test.cpp 1 Jan 2006 16:34:48 -0000 1.16 @@ -54,7 +54,7 @@ public: - MOCKPP_TEST_DECL void test_invoke(); + MOCKPP_TESTMETHOD_DECL void test_invoke(); }; Index: ChainableMockObject_3_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_3_void_test.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- ChainableMockObject_3_void_test.cpp 1 Jan 2006 16:28:36 -0000 1.19 +++ ChainableMockObject_3_void_test.cpp 1 Jan 2006 16:34:47 -0000 1.20 @@ -64,8 +64,8 @@ public: - MOCKPP_TEST_DECL void test_outbound(); - MOCKPP_TEST_DECL void test_parameter_3(); + MOCKPP_TESTMETHOD_DECL void test_outbound(); + MOCKPP_TESTMETHOD_DECL void test_parameter_3(); }; Index: VoidStub_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VoidStub_test.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- VoidStub_test.cpp 1 Jan 2006 16:28:36 -0000 1.18 +++ VoidStub_test.cpp 1 Jan 2006 16:34:49 -0000 1.19 @@ -1,5 +1,5 @@ /*************************************************************************** - MOCKPP_TEST_DECL voidStub_test.cpp - unit tests for VoidStub class + MOCKPP_TESTMETHOD_DECL voidStub_test.cpp - unit tests for VoidStub class ------------------- begin : Wed 25 Aug 2004 copyright : (C) 2002-2006 by Ewald Arnold @@ -57,8 +57,8 @@ public: - MOCKPP_TEST_DECL void test_describe(); - MOCKPP_TEST_DECL void test_invoke(); + MOCKPP_TESTMETHOD_DECL void test_describe(); + MOCKPP_TESTMETHOD_DECL void test_invoke(); }; Index: ExpectationCounter_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ExpectationCounter_test.cpp,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- ExpectationCounter_test.cpp 1 Jan 2006 16:28:36 -0000 1.21 +++ ExpectationCounter_test.cpp 1 Jan 2006 16:34:47 -0000 1.22 @@ -70,26 +70,26 @@ #endif public: - MOCKPP_TEST_DECL void test_expectNothing(); - MOCKPP_TEST_DECL void test_expectNothing_revoked(); - MOCKPP_TEST_DECL void fail_expectNothing(); + MOCKPP_TESTMETHOD_DECL void test_expectNothing(); + MOCKPP_TESTMETHOD_DECL void test_expectNothing_revoked(); + MOCKPP_TESTMETHOD_DECL void fail_expectNothing(); - MOCKPP_TEST_DECL void test_expectActualImmediate(); - MOCKPP_TEST_DECL void fail_expectActualImmediate(); + MOCKPP_TESTMETHOD_DECL void test_expectActualImmediate(); + MOCKPP_TESTMETHOD_DECL void fail_expectActualImmediate(); - MOCKPP_TEST_DECL void test_expectActualVerify(); - MOCKPP_TEST_DECL void fail_expectActualVerify(); + MOCKPP_TESTMETHOD_DECL void test_expectActualVerify(); + MOCKPP_TESTMETHOD_DECL void fail_expectActualVerify(); - MOCKPP_TEST_DECL void test_name(); - MOCKPP_TEST_DECL void test_clearActual(); - MOCKPP_TEST_DECL void test_clear(); - MOCKPP_TEST_DECL void test_hasExpectations(); - MOCKPP_TEST_DECL void test_ifNoExpected(); + MOCKPP_TESTMETHOD_DECL void test_name(); + MOCKPP_TESTMETHOD_DECL void test_clearActual(); + MOCKPP_TESTMETHOD_DECL void test_clear(); + MOCKPP_TESTMETHOD_DECL void test_hasExpectations(); + MOCKPP_TESTMETHOD_DECL void test_ifNoExpected(); - MOCKPP_TEST_DECL void fail_ifNoActual(); - MOCKPP_TEST_DECL void doNothing(mockpp::ExpectationCounter &ec); - MOCKPP_TEST_DECL void doActualImmediate(mockpp::ExpectationCounter &ec); - MOCKPP_TEST_DECL void doActualVerify(mockpp::ExpectationCounter &ec); + MOCKPP_TESTMETHOD_DECL void fail_ifNoActual(); + MOCKPP_TESTMETHOD_DECL void doNothing(mockpp::ExpectationCounter &ec); + MOCKPP_TESTMETHOD_DECL void doActualImmediate(mockpp::ExpectationCounter &ec); + MOCKPP_TESTMETHOD_DECL void doActualVerify(mockpp::ExpectationCounter &ec); }; #if defined (MOCKPP_USE_CXXTEST) Index: OutBound_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/OutBound_test.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- OutBound_test.cpp 1 Jan 2006 16:28:36 -0000 1.8 +++ OutBound_test.cpp 1 Jan 2006 16:34:48 -0000 1.9 @@ -55,8 +55,8 @@ public: - MOCKPP_TEST_DECL void test_describe(); - MOCKPP_TEST_DECL void test_invoke(); + MOCKPP_TESTMETHOD_DECL void test_describe(); + MOCKPP_TESTMETHOD_DECL void test_invoke(); }; Index: ResponseVector_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ResponseVector_test.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- ResponseVector_test.cpp 1 Jan 2006 16:28:36 -0000 1.12 +++ ResponseVector_test.cpp 1 Jan 2006 16:34:48 -0000 1.13 @@ -57,8 +57,8 @@ public: - MOCKPP_TEST_DECL void test_value(); - MOCKPP_TEST_DECL void test_thrower(); + MOCKPP_TESTMETHOD_DECL void test_value(); + MOCKPP_TESTMETHOD_DECL void test_thrower(); }; Index: ExpectationConglomeration_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ExpectationConglomeration_test.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- ExpectationConglomeration_test.cpp 1 Jan 2006 16:28:36 -0000 1.20 +++ ExpectationConglomeration_test.cpp 1 Jan 2006 16:34:47 -0000 1.21 @@ -73,27 +73,27 @@ #endif public: - MOCKPP_TEST_DECL void test_expectNothing(); - MOCKPP_TEST_DECL void test_expectNothing_revoked(); - MOCKPP_TEST_DECL void fail_expectNothing(); + MOCKPP_TESTMETHOD_DECL void test_expectNothing(); + MOCKPP_TESTMETHOD_DECL void test_expectNothing_revoked(); + MOCKPP_TESTMETHOD_DECL void fail_expectNothing(); - MOCKPP_TEST_DECL void test_expectActualImmediate(); - MOCKPP_TEST_DECL void fail_expectActualImmediate(); + MOCKPP_TESTMETHOD_DECL void test_expectActualImmediate(); + MOCKPP_TESTMETHOD_DECL void fail_expectActualImmediate(); - MOCKPP_TEST_DECL void test_expectActualVerify(); - MOCKPP_TEST_DECL void fail_expectActualVerify(); + MOCKPP_TESTMETHOD_DECL void test_expectActualVerify(); + MOCKPP_TESTMETHOD_DECL void fail_expectActualVerify(); - MOCKPP_TEST_DECL void test_clear(); - MOCKPP_TEST_DECL void test_chain(); - MOCKPP_TEST_DECL void fail_many(); - MOCKPP_TEST_DECL void test_name(); - MOCKPP_TEST_DECL void fail_clearActual(); - MOCKPP_TEST_DECL void test_hasExpectations(); - MOCKPP_TEST_DECL void test_hasExpectations2(); - MOCKPP_TEST_DECL void test_ifNoExpected(); + MOCKPP_TESTMETHOD_DECL void test_clear(); + MOCKPP_TESTMETHOD_DECL void test_chain(); + MOCKPP_TESTMETHOD_DECL void fail_many(); + MOCKPP_TESTMETHOD_DECL void test_name(); + MOCKPP_TESTMETHOD_DECL void fail_clearActual(); + MOCKPP_TESTMETHOD_DECL void test_hasExpectations(); + MOCKPP_TESTMETHOD_DECL void test_hasExpectations2(); + MOCKPP_TESTMETHOD_DECL void test_ifNoExpected(); - MOCKPP_TEST_DECL void test_many(); - MOCKPP_TEST_DECL void fail_ifNoActual(); + MOCKPP_TESTMETHOD_DECL void test_many(); + MOCKPP_TESTMETHOD_DECL void fail_ifNoActual(); }; #if defined (MOCKPP_USE_CXXTEST) Index: NoArgumentsMatcher_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/NoArgumentsMatcher_test.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- NoArgumentsMatcher_test.cpp 1 Jan 2006 16:28:36 -0000 1.17 +++ NoArgumentsMatcher_test.cpp 1 Jan 2006 16:34:48 -0000 1.18 @@ -58,7 +58,7 @@ public: - MOCKPP_TEST_DECL void test_invoke(); + MOCKPP_TESTMETHOD_DECL void test_invoke(); }; Index: InvokeAtMostMatcher_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/InvokeAtMostMatcher_test.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- InvokeAtMostMatcher_test.cpp 1 Jan 2006 16:28:36 -0000 1.14 +++ InvokeAtMostMatcher_test.cpp 1 Jan 2006 16:34:48 -0000 1.15 @@ -54,7 +54,7 @@ public: - MOCKPP_TEST_DECL void test_invoke(); + MOCKPP_TESTMETHOD_DECL void test_invoke(); }; Index: VisitableMockObject_4_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_4_test.cpp,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- VisitableMockObject_4_test.cpp 1 Jan 2006 16:28:36 -0000 1.27 +++ VisitableMockObject_4_test.cpp 1 Jan 2006 16:34:49 -0000 1.28 @@ -85,29 +85,29 @@ public: - MOCKPP_TEST_DECL void test_controller(); - MOCKPP_TEST_DECL void test_thrower(); - MOCKPP_TEST_DECL void test_parameter(); - MOCKPP_TEST_DECL void test_parameter_ex(); - MOCKPP_TEST_DECL void test_response(); - MOCKPP_TEST_DECL void test_return(); - MOCKPP_TEST_DECL void test_clear(); - MOCKPP_TEST_DECL void test_default_throw(); - MOCKPP_TEST_DECL void test_inline_pre_1_2(); - MOCKPP_TEST_DECL void test_inline_post_1_2(); - MOCKPP_TEST_DECL void test_constraint(); - MOCKPP_TEST_DECL void test_controller_constraint(); + MOCKPP_TESTMETHOD_DECL void test_controller(); + MOCKPP_TESTMETHOD_DECL void test_thrower(); + MOCKPP_TESTMETHOD_DECL void test_parameter(); + MOCKPP_TESTMETHOD_DECL void test_parameter_ex(); + MOCKPP_TESTMETHOD_DECL void test_response(); + MOCKPP_TESTMETHOD_DECL void test_return(); + MOCKPP_TESTMETHOD_DECL void test_clear(); + MOCKPP_TESTMETHOD_DECL void test_default_throw(); + MOCKPP_TESTMETHOD_DECL void test_inline_pre_1_2(); + MOCKPP_TESTMETHOD_DECL void test_inline_post_1_2(); + MOCKPP_TESTMETHOD_DECL void test_constraint(); + MOCKPP_TESTMETHOD_DECL void test_controller_constraint(); - MOCKPP_TEST_DECL void fail_unused_value(); - MOCKPP_TEST_DECL void fail_unused_throwable(); - MOCKPP_TEST_DECL void fail_parameter(); - MOCKPP_TEST_DECL void fail_return(); - MOCKPP_TEST_DECL void fail_add_method_after_active(); - MOCKPP_TEST_DECL void fail_add_throw_val_after_active(); - MOCKPP_TEST_DECL void fail_add_throw_after_active(); - MOCKPP_TEST_DECL void fail_set_throw_after_active(); - MOCKPP_TEST_DECL void fail_add_return_after_active(); - MOCKPP_TEST_DECL void fail_set_return_after_active(); + MOCKPP_TESTMETHOD_DECL void fail_unused_value(); + MOCKPP_TESTMETHOD_DECL void fail_unused_throwable(); + MOCKPP_TESTMETHOD_DECL void fail_parameter(); + MOCKPP_TESTMETHOD_DECL void fail_return(); + MOCKPP_TESTMETHOD_DECL void fail_add_method_after_active(); + MOCKPP_TESTMETHOD_DECL void fail_add_throw_val_after_active(); + MOCKPP_TESTMETHOD_DECL void fail_add_throw_after_active(); + MOCKPP_TESTMETHOD_DECL void fail_set_throw_after_active(); + MOCKPP_TESTMETHOD_DECL void fail_add_return_after_active(); + MOCKPP_TESTMETHOD_DECL void fail_set_return_after_active(); }; Index: VisitableMockObject_3_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_3_void_test.cpp,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- VisitableMockObject_3_void_test.cpp 1 Jan 2006 16:28:36 -0000 1.27 +++ VisitableMockObject_3_void_test.cpp 1 Jan 2006 16:34:49 -0000 1.28 @@ -78,22 +78,22 @@ public: - MOCKPP_TEST_DECL void test_outbound(); - MOCKPP_TEST_DECL void test_controller(); - MOCKPP_TEST_DECL void test_thrower(); - MOCKPP_TEST_DECL void test_clear(); - MOCKPP_TEST_DECL void test_default_throw(); - MOCKPP_TEST_DECL void test_parameter_ex(); - MOCKPP_TEST_DECL void test_parameter(); - MOCKPP_TEST_DECL void test_constraint(); - MOCKPP_TEST_DECL void test_controller_constraint(); + MOCKPP_TESTMETHOD_DECL void test_outbound(); + MOCKPP_TESTMETHOD_DECL void test_controller(); + MOCKPP_TESTMETHOD_DECL void test_thrower(); + MOCKPP_TESTMETHOD_DECL void test_clear(); + MOCKPP_TESTMETHOD_DECL void test_default_throw(); + MOCKPP_TESTMETHOD_DECL void test_parameter_ex(); + MOCKPP_TESTMETHOD_DECL void test_parameter(); + MOCKPP_TESTMETHOD_DECL void test_constraint(); + MOCKPP_TESTMETHOD_DECL void test_controller_constraint(); - MOCKPP_TEST_DECL void fail_unused_throwable(); - MOCKPP_TEST_DECL void fail_add_method_after_active(); - MOCKPP_TEST_DECL void fail_add_throw_val_after_active(); - MOCKPP_TEST_DECL void fail_add_throw_after_active(); - MOCKPP_TEST_DECL void fail_set_throw_after_active(); - MOCKPP_TEST_DECL void fail_parameter(); + MOCKPP_TESTMETHOD_DECL void fail_unused_throwable(); + MOCKPP_TESTMETHOD_DECL void fail_add_method_after_active(); + MOCKPP_TESTMETHOD_DECL void fail_add_throw_val_after_active(); + MOCKPP_TESTMETHOD_DECL void fail_add_throw_after_active(); + MOCKPP_TESTMETHOD_DECL void fail_set_throw_after_active(); + MOCKPP_TESTMETHOD_DECL void fail_parameter(); }; Index: StubSequence_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/StubSequence_test.cpp,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- StubSequence_test.cpp 1 Jan 2006 16:28:36 -0000 1.22 +++ StubSequence_test.cpp 1 Jan 2006 16:34:48 -0000 1.23 @@ -61,8 +61,8 @@ public: - MOCKPP_TEST_DECL void test_describe(); - MOCKPP_TEST_DECL void test_invoke(); + MOCKPP_TESTMETHOD_DECL void test_describe(); + MOCKPP_TESTMETHOD_DECL void test_invoke(); }; Index: MatchBuilder_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/MatchBuilder_test.cpp,v retrieving revision 1.29 retrieving revision 1.30 diff -u -d -r1.29 -r1.30 --- MatchBuilder_test.cpp 1 Jan 2006 16:28:36 -0000 1.29 +++ MatchBuilder_test.cpp 1 Jan 2006 16:34:48 -0000 1.30 @@ -70,8 +70,8 @@ public: - MOCKPP_TEST_DECL void test_order(); - MOCKPP_TEST_DECL void test_order_defered(); + MOCKPP_TESTMETHOD_DECL void test_order(); + MOCKPP_TESTMETHOD_DECL void test_order_defered(); }; Index: ChainableMockObject_2_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_2_void_test.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- ChainableMockObject_2_void_test.cpp 1 Jan 2006 16:28:36 -0000 1.19 +++ ChainableMockObject_2_void_test.cpp 1 Jan 2006 16:34:47 -0000 1.20 @@ -64,8 +64,8 @@ public: - MOCKPP_TEST_DECL void test_outbound(); - MOCKPP_TEST_DECL void test_parameter_2(); + MOCKPP_TESTMETHOD_DECL void test_outbound(); + MOCKPP_TESTMETHOD_DECL void test_parameter_2(); }; Index: ChainableMockObject_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_void_test.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- ChainableMockObject_void_test.cpp 1 Jan 2006 16:28:36 -0000 1.19 +++ ChainableMockObject_void_test.cpp 1 Jan 2006 16:34:47 -0000 1.20 @@ -65,8 +65,8 @@ public: - MOCKPP_TEST_DECL void test_register(); - MOCKPP_TEST_DECL void test_expect_throw(); + MOCKPP_TESTMETHOD_DECL void test_register(); + MOCKPP_TESTMETHOD_DECL void test_expect_throw(); }; Index: Exception_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/Exception_test.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- Exception_test.cpp 1 Jan 2006 16:28:36 -0000 1.20 +++ Exception_test.cpp 1 Jan 2006 16:34:47 -0000 1.21 @@ -55,7 +55,7 @@ public: - MOCKPP_TEST_DECL void test_file_line(); + MOCKPP_TESTMETHOD_DECL void test_file_line(); }; Index: ChainingMockObjectSupport_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainingMockObjectSupport_test.cpp,v retrieving revision 1.40 retrieving revision 1.41 diff -u -d -r1.40 -r1.41 --- ChainingMockObjectSupport_test.cpp 1 Jan 2006 16:28:36 -0000 1.40 +++ ChainingMockObjectSupport_test.cpp 1 Jan 2006 16:34:47 -0000 1.41 @@ -86,30 +86,30 @@ public: - MOCKPP_TEST_DECL void test_string_contains(); - MOCKPP_TEST_DECL void test_string_ends(); - MOCKPP_TEST_DECL void test_string_starts(); - MOCKPP_TEST_DECL void test_actor(); - MOCKPP_TEST_DECL void test_counts(); - MOCKPP_TEST_DECL void test_consecutive_typeless(); - MOCKPP_TEST_DECL void test_consecutive_custom(); + MOCKPP_TESTMETHOD_DECL void test_string_contains(); + MOCKPP_TESTMETHOD_DECL void test_string_ends(); + MOCKPP_TESTMETHOD_DECL void test_string_starts(); + MOCKPP_TESTMETHOD_DECL void test_actor(); + MOCKPP_TESTMETHOD_DECL void test_counts(); + MOCKPP_TESTMETHOD_DECL void test_consecutive_typeless(); + MOCKPP_TESTMETHOD_DECL void test_consecutive_custom(); - MOCKPP_TEST_DECL void test_invoke_and(); - MOCKPP_TEST_DECL void test_invoke_or(); - MOCKPP_TEST_DECL void test_invoke_not(); + MOCKPP_TESTMETHOD_DECL void test_invoke_and(); + MOCKPP_TESTMETHOD_DECL void test_invoke_or(); + MOCKPP_TESTMETHOD_DECL void test_invoke_not(); #ifndef MOCKPP_NO_RTTI - MOCKPP_TEST_DECL void test_instance(); + MOCKPP_TESTMETHOD_DECL void test_instance(); #endif - MOCKPP_TEST_DECL void test_same_func(); - MOCKPP_TEST_DECL void test_less_equal_func(); - MOCKPP_TEST_DECL void test_less_func(); - MOCKPP_TEST_DECL void test_greater_equal_func(); - MOCKPP_TEST_DECL void test_greater_func(); - MOCKPP_TEST_DECL void test_equal_func(); - MOCKPP_TEST_DECL void test_not_equal_func(); - MOCKPP_TEST_DECL void test_nothing_func(); - MOCKPP_TEST_DECL void test_any_func(); - MOCKPP_TEST_DECL void test_closeto_func(); + MOCKPP_TESTMETHOD_DECL void test_same_func(); + MOCKPP_TESTMETHOD_DECL void test_less_equal_func(); + MOCKPP_TESTMETHOD_DECL void test_less_func(); + MOCKPP_TESTMETHOD_DECL void test_greater_equal_func(); + MOCKPP_TESTMETHOD_DECL void test_greater_func(); + MOCKPP_TESTMETHOD_DECL void test_equal_func(); + MOCKPP_TESTMETHOD_DECL void test_not_equal_func(); + MOCKPP_TESTMETHOD_DECL void test_nothing_func(); + MOCKPP_TESTMETHOD_DECL void test_any_func(); + MOCKPP_TESTMETHOD_DECL void test_closeto_func(); }; Index: LIFOInvocationDispatcher_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/LIFOInvocationDispatcher_test.cpp,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- LIFOInvocationDispatcher_test.cpp 1 Jan 2006 16:28:36 -0000 1.25 +++ LIFOInvocationDispatcher_test.cpp 1 Jan 2006 16:34:48 -0000 1.26 @@ -74,8 +74,8 @@ public: - MOCKPP_TEST_DECL void test_dispatch(); - MOCKPP_TEST_DECL void test_void_dispatch(); + MOCKPP_TESTMETHOD_DECL void test_dispatch(); + MOCKPP_TESTMETHOD_DECL void test_void_dispatch(); }; Index: VisitableMockObject_template_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_template_test.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- VisitableMockObject_template_test.cpp 1 Jan 2006 16:28:36 -0000 1.16 +++ VisitableMockObject_template_test.cpp 1 Jan 2006 16:34:49 -0000 1.17 @@ -64,16 +64,16 @@ #endif public: - MOCKPP_TEST_DECL void test_value_1(); - MOCKPP_TEST_DECL void test_value_2(); - MOCKPP_TEST_DECL void test_value_3(); - MOCKPP_TEST_DECL void test_value_4(); - MOCKPP_TEST_DECL void test_value_5(); - MOCKPP_TEST_DECL void test_throw_1(); - MOCKPP_TEST_DECL void test_throw_2(); - MOCKPP_TEST_DECL void test_throw_3(); - MOCKPP_TEST_DECL void test_throw_4(); - MOCKPP_TEST_DECL void test_throw_5(); + MOCKPP_TESTMETHOD_DECL void test_value_1(); + MOCKPP_TESTMETHOD_DECL void test_value_2(); + MOCKPP_TESTMETHOD_DECL void test_value_3(); + MOCKPP_TESTMETHOD_DECL void test_value_4(); + MOCKPP_TESTMETHOD_DECL void test_value_5(); + MOCKPP_TESTMETHOD_DECL void test_throw_1(); + MOCKPP_TESTMETHOD_DECL void test_throw_2(); + MOCKPP_TESTMETHOD_DECL void test_throw_3(); + MOCKPP_TESTMETHOD_DECL void test_throw_4(); + MOCKPP_TESTMETHOD_DECL void test_throw_5(); }; Index: VisitableMockMethod_1_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockMethod_1_test.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- VisitableMockMethod_1_test.cpp 1 Jan 2006 16:28:36 -0000 1.13 +++ VisitableMockMethod_1_test.cpp 1 Jan 2006 16:34:48 -0000 1.14 @@ -63,8 +63,8 @@ public: - MOCKPP_TEST_DECL void test_parameter_1(); - MOCKPP_TEST_DECL void test_parameter_1v(); + MOCKPP_TESTMETHOD_DECL void test_parameter_1(); + MOCKPP_TESTMETHOD_DECL void test_parameter_1v(); }; Index: VisitableMockObject_4_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_4_void_test.cpp,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- VisitableMockObject_4_void_test.cpp 1 Jan 2006 16:28:36 -0000 1.27 +++ VisitableMockObject_4_void_test.cpp 1 Jan 2006 16:34:49 -0000 1.28 @@ -78,22 +78,22 @@ public: - MOCKPP_TEST_DECL void test_outbound(); - MOCKPP_TEST_DECL void test_controller(); - MOCKPP_TEST_DECL void test_thrower(); - MOCKPP_TEST_DECL void test_clear(); - MOCKPP_TEST_DECL void test_default_throw(); - MOCKPP_TEST_DECL void test_parameter_ex(); - MOCKPP_TEST_DECL void test_parameter(); - MOCKPP_TEST_DECL void test_constraint(); - MOCKPP_TEST_DECL void test_controller_constraint(); + MOCKPP_TESTMETHOD_DECL void test_outbound(); + MOCKPP_TESTMETHOD_DECL void test_controller(); + MOCKPP_TESTMETHOD_DECL void test_thrower(); + MOCKPP_TESTMETHOD_DECL void test_clear(); + MOCKPP_TESTMETHOD_DECL void test_default_throw(); + MOCKPP_TESTMETHOD_DECL void test_parameter_ex(); + MOCKPP_TESTMETHOD_DECL void test_parameter(); + MOCKPP_TESTMETHOD_DECL void test_constraint(); + MOCKPP_TESTMETHOD_DECL void test_controller_constraint(); - MOCKPP_TEST_DECL void fail_unused_throwable(); - MOCKPP_TEST_DECL void fail_add_method_after_active(); - MOCKPP_TEST_DECL void fail_add_throw_val_after_active(); - MOCKPP_TEST_DECL void fail_add_throw_after_active(); - MOCKPP_TEST_DECL void fail_set_throw_after_active(); - MOCKPP_TEST_DECL void fail_parameter(); + MOCKPP_TESTMETHOD_DECL void fail_unused_throwable(); + MOCKPP_TESTMETHOD_DECL void fail_add_method_after_active(); + MOCKPP_TESTMETHOD_DECL void fail_add_throw_val_after_active(); + MOCKPP_TESTMETHOD_DECL void fail_add_throw_after_active(); + MOCKPP_TESTMETHOD_DECL void fail_set_throw_after_active(); + MOCKPP_TESTMETHOD_DECL void fail_parameter(); }; Index: ReturnObjectList_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ReturnObjectList_test.cpp,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- ReturnObjectList_test.cpp 1 Jan 2006 16:28:36 -0000 1.23 +++ ReturnObjectList_test.cpp 1 Jan 2006 16:34:48 -0000 1.24 @@ -59,12 +59,12 @@ public: - MOCKPP_TEST_DECL void test_get_object(); - MOCKPP_TEST_DECL void test_default(); - MOCKPP_TEST_DECL void test_tostring(); + MOCKPP_TESTMETHOD_DECL void test_get_object(); + MOCKPP_TESTMETHOD_DECL void test_default(); + MOCKPP_TESTMETHOD_DECL void test_tostring(); - MOCKPP_TEST_DECL void fail_get_object(); - MOCKPP_TEST_DECL void fail_not_empty(); + MOCKPP_TESTMETHOD_DECL void fail_get_object(); + MOCKPP_TESTMETHOD_DECL void fail_not_empty(); }; Index: StringStartsWith_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/StringStartsWith_test.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- StringStartsWith_test.cpp 1 Jan 2006 16:28:36 -0000 1.11 +++ StringStartsWith_test.cpp 1 Jan 2006 16:34:48 -0000 1.12 @@ -57,8 +57,8 @@ public: - MOCKPP_TEST_DECL void test_invoke(); - MOCKPP_TEST_DECL void test_describe(); + MOCKPP_TESTMETHOD_DECL void test_invoke(); + MOCKPP_TESTMETHOD_DECL void test_describe(); }; Index: VisitableMockObject_3_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_3_test.cpp,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- VisitableMockObject_3_test.cpp 1 Jan 2006 16:28:36 -0000 1.27 +++ VisitableMockObject_3_test.cpp 1 Jan 2006 16:34:49 -0000 1.28 @@ -85,29 +85,29 @@ public: - MOCKPP_TEST_DECL void test_controller(); - MOCKPP_TEST_DECL void test_thrower(); - MOCKPP_TEST_DECL void test_parameter(); - MOCKPP_TEST_DECL void test_parameter_ex(); - MOCKPP_TEST_DECL void test_response(); - MOCKPP_TEST_DECL void test_return(); - MOCKPP_TEST_DECL void test_clear(); - MOCKPP_TEST_DECL void test_default_throw(); - MOCKPP_TEST_DECL void test_inline_pre_1_2(); - MOCKPP_TEST_DECL void test_inline_post_1_2(); - MOCKPP_TEST_DECL void test_constraint(); - MOCKPP_TEST_DECL void test_controller_constraint(); + MOCKPP_TESTMETHOD_DECL void test_controller(); + MOCKPP_TESTMETHOD_DECL void test_thrower(); + MOCKPP_TESTMETHOD_DECL void test_parameter(); + MOCKPP_TESTMETHOD_DECL void test_parameter_ex(); + MOCKPP_TESTMETHOD_DECL void test_response(); + MOCKPP_TESTMETHOD_DECL void test_return(); + MOCKPP_TESTMETHOD_DECL void test_clear(); + MOCKPP_TESTMETHOD_DECL void test_default_throw(); + MOCKPP_TESTMETHOD_DECL void test_inline_pre_1_2(); + MOCKPP_TESTMETHOD_DECL void test_inline_post_1_2(); + MOCKPP_TESTMETHOD_DECL void test_constraint(); + MOCKPP_TESTMETHOD_DECL void test_controller_constraint(); - MOCKPP_TEST_DECL void fail_unused_value(); - MOCKPP_TEST_DECL void fail_unused_throwable(); - MOCKPP_TEST_DECL void fail_parameter(); - MOCKPP_TEST_DECL void fail_return(); - MOCKPP_TEST_DECL void fail_add_method_after_active(); - MOCKPP_TEST_DECL void fail_add_throw_val_after_active(); - MOCKPP_TEST_DECL void fail_add_throw_after_active(); - MOCKPP_TEST_DECL void fail_set_throw_after_active(); - MOCKPP_TEST_DECL void fail_add_return_after_active(); - MOCKPP_TEST_DECL void fail_set_return_after_active(); + MOCKPP_TESTMETHOD_DECL void fail_unused_value(); + MOCKPP_TESTMETHOD_DECL void fail_unused_throwable(); + MOCKPP_TESTMETHOD_DECL void fail_parameter(); + MOCKPP_TESTMETHOD_DECL void fail_return(); + MOCKPP_TESTMETHOD_DECL void fail_add_method_after_active(); + MOCKPP_TESTMETHOD_DECL void fail_add_throw_val_after_active(); + MOCKPP_TESTMETHOD_DECL void fail_add_throw_after_active(); + MOCKPP_TESTMETHOD_DECL void fail_set_throw_after_active(); + MOCKPP_TESTMETHOD_DECL void fail_add_return_after_active(); + MOCKPP_TESTMETHOD_DECL void fail_set_return_after_active(); }; Index: ChainableMockObjectPolymorphism_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObjectPolymorphism_test.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- ChainableMockObjectPolymorphism_test.cpp 1 Jan 2006 16:28:36 -0000 1.13 +++ ChainableMockObjectPolymorphism_test.cpp 1 Jan 2006 16:34:47 -0000 1.14 @@ -65,8 +65,8 @@ public: - MOCKPP_TEST_DECL void test_visitor_retrieves_mock_parameter(); - MOCKPP_TEST_DECL void test_visitor_retrieves_parameter(); + MOCKPP_TESTMETHOD_DECL void test_visitor_retrieves_mock_parameter(); + MOCKPP_TESTMETHOD_DECL void test_visitor_retrieves_parameter(); }; Index: IsGreaterOrEqual_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/IsGreaterOrEqual_test.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- IsGreaterOrEqual_test.cpp 1 Jan 2006 16:28:36 -0000 1.14 +++ IsGreaterOrEqual_test.cpp 1 Jan 2006 16:34:48 -0000 1.15 @@ -57,8 +57,8 @@ public: - MOCKPP_TEST_DECL void test_describe(); - MOCKPP_TEST_DECL void test_invoke(); + MOCKPP_TESTMETHOD_DECL void test_describe(); + MOCKPP_TESTMETHOD_DECL void test_invoke(); }; Index: mockpp_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/mockpp_test.cpp,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- mockpp_test.cpp 1 Jan 2006 16:28:36 -0000 1.21 +++ mockpp_test.cpp 1 Jan 2006 16:34:49 -0000 1.22 @@ -58,7 +58,7 @@ public: #ifdef MOCKPP_UNICODE - MOCKPP_TEST_DECL void test_unicode_latin1_conv(); + MOCKPP_TESTMETHOD_DECL void test_unicode_latin1_conv(); #endif }; Index: Throwable_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/Throwable_test.cpp,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- Throwable_test.cpp 1 Jan 2006 16:28:36 -0000 1.22 +++ Throwable_test.cpp 1 Jan 2006 16:34:48 -0000 1.23 @@ -60,11 +60,11 @@ public: - MOCKPP_TEST_DECL void test_copy(); - MOCKPP_TEST_DECL void test_getter(); - MOCKPP_TEST_DECL void test_used(); - MOCKPP_TEST_DECL void test_throw(); - MOCKPP_TEST_DECL void test_clear(); + MOCKPP_TESTMETHOD_DECL void test_copy(); + MOCKPP_TESTMETHOD_DECL void test_getter(); + MOCKPP_TESTMETHOD_DECL void test_used(); + MOCKPP_TESTMETHOD_DECL void test_throw(); + MOCKPP_TESTMETHOD_DECL void test_clear(); }; Index: ChainableMockObject_2_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_2_test.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- ChainableMockObject_2_test.cpp 1 Jan 2006 16:28:36 -0000 1.18 +++ ChainableMockObject_2_test.cpp 1 Jan 2006 16:34:47 -0000 1.19 @@ -62,8 +62,8 @@ public: - MOCKPP_TEST_DECL void test_outbound(); - MOCKPP_TEST_DECL void test_parameter_2(); + MOCKPP_TESTMETHOD_DECL void test_outbound(); + MOCKPP_TESTMETHOD_DECL void test_parameter_2(); }; Index: UnlimitedMatcher_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/UnlimitedMatcher_test.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- UnlimitedMatcher_test.cpp 1 Jan 2006 16:28:36 -0000 1.10 +++ UnlimitedMatcher_test.cpp 1 Jan 2006 16:34:48 -0000 1.11 @@ -51,7 +51,7 @@ public: - MOCKPP_TEST_DECL void test_invoke(); + MOCKPP_TESTMETHOD_DECL void test_invoke(); }; Index: CoreMock_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/CoreMock_test.cpp,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- CoreMock_test.cpp 1 Jan 2006 16:28:36 -0000 1.30 +++ CoreMock_test.cpp 1 Jan 2006 16:34:47 -0000 1.31 @@ -75,8 +75,8 @@ public: - MOCKPP_TEST_DECL void test_void_invocation(); - MOCKPP_TEST_DECL void test_invocation(); + MOCKPP_TESTMETHOD_DECL void test_void_invocation(); + MOCKPP_TESTMETHOD_DECL void test_invocation(); }; Index: ChainableMockObject_4_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_4_test.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- ChainableMockObject_4_test.cpp 1 Jan 2006 16:28:36 -0000 1.18 +++ ChainableMockObject_4_test.cpp 1 Jan 2006 16:34:47 -0000 1.19 @@ -63,8 +63,8 @@ public: - MOCKPP_TEST_DECL void test_outbound(); - MOCKPP_TEST_DECL void test_parameter_4(); + MOCKPP_TESTMETHOD_DECL void test_outbound(); + MOCKPP_TESTMETHOD_DECL void test_parameter_4(); }; Index: ChainableMockObject_3_test.cpp =================================================================== RCS fil... [truncated message content] |
|
From: Ewald A. <ewa...@us...> - 2006-01-01 16:35:08
|
Update of /cvsroot/mockpp/mockpp/mockpp/framework In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30752/mockpp/framework Modified Files: SelectUnittestFramework.h Log Message: more descriptive name Index: SelectUnittestFramework.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/framework/SelectUnittestFramework.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- SelectUnittestFramework.h 1 Jan 2006 11:17:27 -0000 1.8 +++ SelectUnittestFramework.h 1 Jan 2006 16:34:47 -0000 1.9 @@ -36,7 +36,7 @@ # define MOCKPP_DERIVE_PUBLIC_UNITFRAMEWORK : public CxxTest::TestSuite -#define MOCKPP_TEST_DECL /* static or not */ +#define MOCKPP_TESTMETHOD_DECL /* static or not */ #define CXXTEST_HAVE_STD #ifndef CXXTEST_RUNNING @@ -60,7 +60,7 @@ #elif defined(MOCKPP_USE_CPPUNIT) //================================================= -#define MOCKPP_TEST_DECL /* not static */ +#define MOCKPP_TESTMETHOD_DECL /* not static */ # include <cppunit/extensions/HelperMacros.h> # define MOCKPP_DERIVE_PUBLIC_UNITFRAMEWORK : public CppUnit::TestFixture @@ -69,7 +69,7 @@ #elif defined(MOCKPP_USE_BOOSTTEST) //================================================= -# define MOCKPP_TEST_DECL static +# define MOCKPP_TESTMETHOD_DECL static # include <boost/test/auto_unit_test.hpp> |
Update of /cvsroot/mockpp/mockpp/mockpp/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28770/mockpp/tests Modified Files: 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 Exception_test.cpp ExpectationBoundary_test.cpp ExpectationConglomeration_test.cpp ExpectationCounterRange_test.cpp ExpectationCounter_test.cpp ExpectationList_test.cpp ExpectationMap_test.cpp ExpectationSegment_test.cpp ExpectationSet_test.cpp ExpectationValue_test.cpp FIFOInvocationDispatcher_test.cpp Formatter_test.cpp InvocationMockerBuilder_test.cpp InvocationMocker_test.cpp Invocation_test.cpp InvokeAtLeastMatcher_test.cpp InvokeAtLeastOnceMatcher_test.cpp InvokeAtMostMatcher_test.cpp InvokeCountMatcher_test.cpp InvokeOnceMatcher_test.cpp InvokedAfterMatcher_test.cpp InvokedBeforeMatcher_test.cpp InvokedRecorder_test.cpp IsAnything_test.cpp IsCloseTo_test.cpp IsEqual_test.cpp IsGreaterOrEqual_test.cpp IsGreaterThan_test.cpp IsInstanceOf_test.cpp IsLessOrEqual_test.cpp IsLessThan_test.cpp IsNot_test.cpp IsNothing_test.cpp IsSame_test.cpp LIFOInvocationDispatcher_test.cpp MatchBuilder_test.cpp MixedMockObject_5_test.cpp MockObject_test.cpp NoArgumentsMatcher_test.cpp 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_void_test.cpp VoidStub_test.cpp mockpp_pti_test.cpp mockpp_test.cpp Log Message: register boost tests Index: Or_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/Or_test.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- Or_test.cpp 30 Dec 2005 15:31:59 -0000 1.17 +++ Or_test.cpp 1 Jan 2006 16:28:36 -0000 1.18 @@ -73,6 +73,9 @@ #elif defined(MOCKPP_USE_BOOSTTEST) +MOCKPP_BOOST_TEST(Or_test::test_describe); +MOCKPP_BOOST_TEST(Or_test::test_invoke); + #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.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- TestFailureMatcher_test.cpp 30 Dec 2005 15:31:59 -0000 1.15 +++ TestFailureMatcher_test.cpp 1 Jan 2006 16:28:36 -0000 1.16 @@ -66,6 +66,8 @@ #elif defined(MOCKPP_USE_BOOSTTEST) +MOCKPP_BOOST_TEST(TestFailureMatcher_test::test_invoke); + #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.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- DynamicChainingMockError_test.cpp 30 Dec 2005 15:31:59 -0000 1.20 +++ DynamicChainingMockError_test.cpp 1 Jan 2006 16:28:36 -0000 1.21 @@ -74,6 +74,8 @@ #elif defined(MOCKPP_USE_BOOSTTEST) +MOCKPP_BOOST_TEST(DynamicChainingMockError_test::test_describe); + #elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (DynamicChainingMockError_test); Index: IsInstanceOf_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/IsInstanceOf_test.cpp,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- IsInstanceOf_test.cpp 30 Dec 2005 15:31:59 -0000 1.21 +++ IsInstanceOf_test.cpp 1 Jan 2006 16:28:36 -0000 1.22 @@ -71,6 +71,9 @@ #elif defined(MOCKPP_USE_BOOSTTEST) +MOCKPP_BOOST_TEST(IsInstanceOf_test::test_describe); +MOCKPP_BOOST_TEST(IsInstanceOf_test::test_invoke); + #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.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- ExpectationList_test.cpp 30 Dec 2005 15:31:59 -0000 1.23 +++ ExpectationList_test.cpp 1 Jan 2006 16:28:36 -0000 1.24 @@ -123,6 +123,27 @@ #elif defined(MOCKPP_USE_BOOSTTEST) +MOCKPP_BOOST_TEST(ExpectationList_test::test_chain); +MOCKPP_BOOST_TEST(ExpectationList_test::test_hasExpectations); +MOCKPP_BOOST_TEST(ExpectationList_test::test_name); +MOCKPP_BOOST_TEST(ExpectationList_test::test_many); +MOCKPP_BOOST_TEST(ExpectationList_test::test_balance); +MOCKPP_BOOST_TEST(ExpectationList_test::test_clear); + +MOCKPP_BOOST_TEST(ExpectationList_test::test_expectNothing); +MOCKPP_BOOST_TEST(ExpectationList_test::test_expectNothing_revoked); +MOCKPP_BOOST_TEST(ExpectationList_test::test_expectActualImmediate); +MOCKPP_BOOST_TEST(ExpectationList_test::test_expectActualVerify); +MOCKPP_BOOST_TEST(ExpectationList_test::test_ifNoExpected); + +MOCKPP_BOOST_TEST(ExpectationList_test::fail_clearActual); +MOCKPP_BOOST_TEST(ExpectationList_test::fail_expectActualImmediate); +MOCKPP_BOOST_TEST(ExpectationList_test::fail_expectActualVerify); +MOCKPP_BOOST_TEST(ExpectationList_test::fail_expectNothing); +MOCKPP_BOOST_TEST(ExpectationList_test::fail_many); + +MOCKPP_BOOST_TEST(ExpectationList_test::fail_ifNoActual); + #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.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- IsLessThan_test.cpp 30 Dec 2005 15:31:59 -0000 1.13 +++ IsLessThan_test.cpp 1 Jan 2006 16:28:36 -0000 1.14 @@ -70,6 +70,9 @@ #elif defined(MOCKPP_USE_BOOSTTEST) +MOCKPP_BOOST_TEST(IsLessThan_test::test_describe); +MOCKPP_BOOST_TEST(IsLessThan_test::test_invoke); + #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.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- ExpectationMap_test.cpp 30 Dec 2005 15:31:59 -0000 1.23 +++ ExpectationMap_test.cpp 1 Jan 2006 16:28:36 -0000 1.24 @@ -132,6 +132,30 @@ #elif defined(MOCKPP_USE_BOOSTTEST) +MOCKPP_BOOST_TEST(ExpectationMap_test::test_chain); +MOCKPP_BOOST_TEST(ExpectationMap_test::test_hasExpectations); +MOCKPP_BOOST_TEST(ExpectationMap_test::test_name); +MOCKPP_BOOST_TEST(ExpectationMap_test::test_clear); +MOCKPP_BOOST_TEST(ExpectationMap_test::test_many); +MOCKPP_BOOST_TEST(ExpectationMap_test::test_get); +MOCKPP_BOOST_TEST(ExpectationMap_test::test_missing); +MOCKPP_BOOST_TEST(ExpectationMap_test::test_pair_get); +MOCKPP_BOOST_TEST(ExpectationMap_test::test_pair_getmany); + +MOCKPP_BOOST_TEST(ExpectationMap_test::test_expectNothing); +MOCKPP_BOOST_TEST(ExpectationMap_test::test_expectNothing_revoked); +MOCKPP_BOOST_TEST(ExpectationMap_test::test_expectActualImmediate); +MOCKPP_BOOST_TEST(ExpectationMap_test::test_expectActualVerify); +MOCKPP_BOOST_TEST(ExpectationMap_test::test_ifNoExpected); + +MOCKPP_BOOST_TEST(ExpectationMap_test::fail_expectActualImmediate); +MOCKPP_BOOST_TEST(ExpectationMap_test::fail_expectActualVerify); +MOCKPP_BOOST_TEST(ExpectationMap_test::fail_expectNothing); +MOCKPP_BOOST_TEST(ExpectationMap_test::fail_many); + +MOCKPP_BOOST_TEST(ExpectationMap_test::fail_ifNoActual); +MOCKPP_BOOST_TEST(ExpectationMap_test::fail_clearActual); + #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.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- CustomStub_test.cpp 30 Dec 2005 15:31:59 -0000 1.17 +++ CustomStub_test.cpp 1 Jan 2006 16:28:36 -0000 1.18 @@ -67,6 +67,8 @@ #elif defined(MOCKPP_USE_BOOSTTEST) +MOCKPP_BOOST_TEST(CustomStub_test::test_invoke); + #elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (CustomStub_test); Index: Assert_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/Assert_test.cpp,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- Assert_test.cpp 30 Dec 2005 15:31:58 -0000 1.25 +++ Assert_test.cpp 1 Jan 2006 16:28:36 -0000 1.26 @@ -127,6 +127,29 @@ #elif defined(MOCKPP_USE_BOOSTTEST) +MOCKPP_BOOST_TEST(Assert_test::test_FalseTrue); +MOCKPP_BOOST_TEST(Assert_test::test_boundary); + +MOCKPP_BOOST_TEST(Assert_test::test_equalsDouble); +MOCKPP_BOOST_TEST(Assert_test::test_equalsFloat); +MOCKPP_BOOST_TEST(Assert_test::test_equalsLong); +MOCKPP_BOOST_TEST(Assert_test::test_equalsBool); +MOCKPP_BOOST_TEST(Assert_test::test_equalsChar); +MOCKPP_BOOST_TEST(Assert_test::test_equalsInt); +MOCKPP_BOOST_TEST(Assert_test::test_equalsShort); +MOCKPP_BOOST_TEST(Assert_test::test_equalsAString); + +#ifdef MOCKPP_UNICODE +MOCKPP_BOOST_TEST(Assert_test::test_equalsWString); +MOCKPP_BOOST_TEST(Assert_test::test_equalsPWChar); +#endif + +MOCKPP_BOOST_TEST(Assert_test::test_equalsPChar); +MOCKPP_BOOST_TEST(Assert_test::test_macros); + +MOCKPP_BOOST_TEST(Assert_test:: fail_fail); +MOCKPP_BOOST_TEST(Assert_test:: fail_failmsg); + #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.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- IsLessOrEqual_test.cpp 30 Dec 2005 15:31:59 -0000 1.13 +++ IsLessOrEqual_test.cpp 1 Jan 2006 16:28:36 -0000 1.14 @@ -70,6 +70,9 @@ #elif defined(MOCKPP_USE_BOOSTTEST) +MOCKPP_BOOST_TEST(IsLessOrEqual_test::test_describe); +MOCKPP_BOOST_TEST(IsLessOrEqual_test::test_invoke); + #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.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- MixedMockObject_5_test.cpp 30 Dec 2005 15:31:59 -0000 1.12 +++ MixedMockObject_5_test.cpp 1 Jan 2006 16:28:36 -0000 1.13 @@ -87,6 +87,10 @@ #elif defined(MOCKPP_USE_BOOSTTEST) +MOCKPP_BOOST_TEST(MixedMockObject_5_test::test_controller); +MOCKPP_BOOST_TEST(MixedMockObject_5_test::test_chainer); +MOCKPP_BOOST_TEST(MixedMockObject_5_test::test_return); + #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.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- ChainableMockObject_test.cpp 30 Dec 2005 15:31:58 -0000 1.30 +++ ChainableMockObject_test.cpp 1 Jan 2006 16:28:36 -0000 1.31 @@ -107,6 +107,19 @@ #elif defined(MOCKPP_USE_BOOSTTEST) +MOCKPP_BOOST_TEST(ChainableMockObject_test::test_register); +MOCKPP_BOOST_TEST(ChainableMockObject_test::test_after_1); +MOCKPP_BOOST_TEST(ChainableMockObject_test::test_after_2); +MOCKPP_BOOST_TEST(ChainableMockObject_test::test_bad_after); +MOCKPP_BOOST_TEST(ChainableMockObject_test::test_before_1); +MOCKPP_BOOST_TEST(ChainableMockObject_test::test_before_2); +MOCKPP_BOOST_TEST(ChainableMockObject_test::test_bad_before); +MOCKPP_BOOST_TEST(ChainableMockObject_test::test_pending); +MOCKPP_BOOST_TEST(ChainableMockObject_test::test_expect_return); +MOCKPP_BOOST_TEST(ChainableMockObject_test::test_expect_throw); +MOCKPP_BOOST_TEST(ChainableMockObject_test::test_stub_return); +MOCKPP_BOOST_TEST(ChainableMockObject_test::test_stub_return_const_ref); + #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.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- Invocation_test.cpp 30 Dec 2005 15:31:59 -0000 1.26 +++ Invocation_test.cpp 1 Jan 2006 16:28:36 -0000 1.27 @@ -103,6 +103,19 @@ #elif defined(MOCKPP_USE_BOOSTTEST) +MOCKPP_BOOST_TEST(Invocation_test::test_equals0); +MOCKPP_BOOST_TEST(Invocation_test::test_equals1); +MOCKPP_BOOST_TEST(Invocation_test::test_equals2); +MOCKPP_BOOST_TEST(Invocation_test::test_equals3); +MOCKPP_BOOST_TEST(Invocation_test::test_equals4); +MOCKPP_BOOST_TEST(Invocation_test::test_equals5); +MOCKPP_BOOST_TEST(Invocation_test::test_get1); +MOCKPP_BOOST_TEST(Invocation_test::test_get2); +MOCKPP_BOOST_TEST(Invocation_test::test_get3); +MOCKPP_BOOST_TEST(Invocation_test::test_get4); +MOCKPP_BOOST_TEST(Invocation_test::test_get5); +MOCKPP_BOOST_TEST(Invocation_test::test_invoked); + #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.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- IsGreaterThan_test.cpp 30 Dec 2005 15:31:59 -0000 1.13 +++ IsGreaterThan_test.cpp 1 Jan 2006 16:28:36 -0000 1.14 @@ -70,6 +70,9 @@ #elif defined(MOCKPP_USE_BOOSTTEST) +MOCKPP_BOOST_TEST(IsGreaterThan_test::test_describe); +MOCKPP_BOOST_TEST(IsGreaterThan_test::test_invoke); + #elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (IsGreaterThan_test); Index: ChainableMockObject_3_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_3_test.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- ChainableMockObject_3_test.cpp 30 Dec 2005 15:31:58 -0000 1.15 +++ ChainableMockObject_3_test.cpp 1 Jan 2006 16:28:36 -0000 1.16 @@ -76,6 +76,9 @@ #elif defined(MOCKPP_USE_BOOSTTEST) +MOCKPP_BOOST_TEST(ChainableMockObject_3_test::test_outbound); +MOCKPP_BOOST_TEST(ChainableMockObject_3_test:: test_parameter_3 ); + #elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (ChainableMockObject_3_test); Index: ChainableMockObject_4_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_4_void_test.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- ChainableMockObject_4_void_test.cpp 30 Dec 2005 15:31:58 -0000 1.18 +++ ChainableMockObject_4_void_test.cpp 1 Jan 2006 16:28:36 -0000 1.19 @@ -77,6 +77,9 @@ #elif defined(MOCKPP_USE_BOOSTTEST) +MOCKPP_BOOST_TEST(ChainableMockObject_4_void_test::test_outbound); +MOCKPP_BOOST_TEST(ChainableMockObject_4_void_test:: test_parameter_4 ); + #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.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- InvocationMockerBuilder_test.cpp 30 Dec 2005 15:31:59 -0000 1.35 +++ InvocationMockerBuilder_test.cpp 1 Jan 2006 16:28:36 -0000 1.36 @@ -103,6 +103,11 @@ #elif defined(MOCKPP_USE_BOOSTTEST) +MOCKPP_BOOST_TEST(InvocationMockerBuilder_test:: test_instance0 ); +MOCKPP_BOOST_TEST(InvocationMockerBuilder_test:: test_instance5 ); +MOCKPP_BOOST_TEST(InvocationMockerBuilder_test:: test_instancev0 ); +MOCKPP_BOOST_TEST(InvocationMockerBuilder_test:: test_instancev5 ); + #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.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- StringContains_test.cpp 30 Dec 2005 15:31:59 -0000 1.17 +++ StringContains_test.cpp 1 Jan 2006 16:28:36 -0000 1.18 @@ -70,6 +70,9 @@ #elif defined(MOCKPP_USE_BOOSTTEST) +MOCKPP_BOOST_TEST(StringContains_test::test_describe); +MOCKPP_BOOST_TEST(StringContains_test::test_invoke); + #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.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- InvokeAtLeastOnceMatcher_test.cpp 30 Dec 2005 15:31:59 -0000 1.14 +++ InvokeAtLeastOnceMatcher_test.cpp 1 Jan 2006 16:28:36 -0000 1.15 @@ -65,6 +65,8 @@ #elif defined(MOCKPP_USE_BOOSTTEST) +MOCKPP_BOOST_TEST(InvokeAtLeastOnceMatcher_test::test_invoke); + #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.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- ExpectationSet_test.cpp 30 Dec 2005 15:31:59 -0000 1.21 +++ ExpectationSet_test.cpp 1 Jan 2006 16:28:36 -0000 1.22 @@ -120,6 +120,26 @@ #elif defined(MOCKPP_USE_BOOSTTEST) +MOCKPP_BOOST_TEST(ExpectationSet_test::test_hasExpectations); +MOCKPP_BOOST_TEST(ExpectationSet_test::test_name); +MOCKPP_BOOST_TEST(ExpectationSet_test::test_many); +MOCKPP_BOOST_TEST(ExpectationSet_test::test_chain); +MOCKPP_BOOST_TEST(ExpectationSet_test::test_clear); + +MOCKPP_BOOST_TEST(ExpectationSet_test::test_expectNothing); +MOCKPP_BOOST_TEST(ExpectationSet_test::test_expectNothing_revoked); +MOCKPP_BOOST_TEST(ExpectationSet_test::test_expectActualImmediate); +MOCKPP_BOOST_TEST(ExpectationSet_test::test_expectActualVerify); +MOCKPP_BOOST_TEST(ExpectationSet_test::test_ifNoExpected); + +MOCKPP_BOOST_TEST(ExpectationSet_test::fail_clearActual); +MOCKPP_BOOST_TEST(ExpectationSet_test::fail_expectActualImmediate); +MOCKPP_BOOST_TEST(ExpectationSet_test::fail_expectActualVerify); +MOCKPP_BOOST_TEST(ExpectationSet_test::fail_expectNothing); +MOCKPP_BOOST_TEST(ExpectationSet_test::fail_many); + +MOCKPP_BOOST_TEST(ExpectationSet_test::fail_ifNoActual); + #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.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- ChainableMockObject_1_void_test.cpp 30 Dec 2005 15:31:58 -0000 1.21 +++ ChainableMockObject_1_void_test.cpp 1 Jan 2006 16:28:36 -0000 1.22 @@ -83,6 +83,9 @@ #elif defined(MOCKPP_USE_BOOSTTEST) +MOCKPP_BOOST_TEST(ChainableMockObject_1_void_test::test_outbound); +MOCKPP_BOOST_TEST(ChainableMockObject_1_void_test:: test_parameter_1 ); + #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.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- ChainableMockMethod_2_test.cpp 1 Jan 2006 10:27:22 -0000 1.16 +++ ChainableMockMethod_2_test.cpp 1 Jan 2006 16:28:36 -0000 1.17 @@ -86,6 +86,9 @@ #elif defined(MOCKPP_USE_BOOSTTEST) +MOCKPP_BOOST_TEST(ChainableMockMethod_2_test:: test_parameter_2 ); +MOCKPP_BOOST_TEST(ChainableMockMethod_2_test:: test_parameter_2v ); + #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.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- InvokedAfterMatcher_test.cpp 30 Dec 2005 15:31:59 -0000 1.14 +++ InvokedAfterMatcher_test.cpp 1 Jan 2006 16:28:36 -0000 1.15 @@ -65,6 +65,8 @@ #elif defined(MOCKPP_USE_BOOSTTEST) +MOCKPP_BOOST_TEST(InvokedAfterMatcher_test::test_invoke); + #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.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- InvokeOnceMatcher_test.cpp 30 Dec 2005 15:31:59 -0000 1.14 +++ InvokeOnceMatcher_test.cpp 1 Jan 2006 16:28:36 -0000 1.15 @@ -65,6 +65,8 @@ #elif defined(MOCKPP_USE_BOOSTTEST) +MOCKPP_BOOST_TEST(InvokeOnceMatcher_test::test_invoke); + #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.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- ChainableMockObject_3_void_test.cpp 30 Dec 2005 15:31:58 -0000 1.18 +++ ChainableMockObject_3_void_test.cpp 1 Jan 2006 16:28:36 -0000 1.19 @@ -77,6 +77,9 @@ #elif defined(MOCKPP_USE_BOOSTTEST) +MOCKPP_BOOST_TEST(ChainableMockObject_3_void_test::test_outbound); +MOCKPP_BOOST_TEST(ChainableMockObject_3_void_test:: test_parameter_3 ); + #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.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- VoidStub_test.cpp 30 Dec 2005 15:31:59 -0000 1.17 +++ VoidStub_test.cpp 1 Jan 2006 16:28:36 -0000 1.18 @@ -70,6 +70,9 @@ #elif defined(MOCKPP_USE_BOOSTTEST) +MOCKPP_BOOST_TEST(VoidStub_test::test_describe); +MOCKPP_BOOST_TEST(VoidStub_test::test_invoke); + #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.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- ExpectationCounter_test.cpp 30 Dec 2005 15:31:59 -0000 1.20 +++ ExpectationCounter_test.cpp 1 Jan 2006 16:28:36 -0000 1.21 @@ -115,6 +115,23 @@ #elif defined(MOCKPP_USE_BOOSTTEST) +MOCKPP_BOOST_TEST(ExpectationCounter_test::test_hasExpectations); +MOCKPP_BOOST_TEST(ExpectationCounter_test::test_name); +MOCKPP_BOOST_TEST(ExpectationCounter_test::test_clearActual); +MOCKPP_BOOST_TEST(ExpectationCounter_test::test_clear); + +MOCKPP_BOOST_TEST(ExpectationCounter_test::test_expectNothing); +MOCKPP_BOOST_TEST(ExpectationCounter_test::test_expectNothing_revoked); +MOCKPP_BOOST_TEST(ExpectationCounter_test::test_expectActualImmediate); +MOCKPP_BOOST_TEST(ExpectationCounter_test::test_expectActualVerify); +MOCKPP_BOOST_TEST(ExpectationCounter_test::test_ifNoExpected); + +MOCKPP_BOOST_TEST(ExpectationCounter_test::fail_expectActualImmediate); +MOCKPP_BOOST_TEST(ExpectationCounter_test::fail_expectActualVerify); +MOCKPP_BOOST_TEST(ExpectationCounter_test::fail_expectNothing); + +MOCKPP_BOOST_TEST(ExpectationCounter_test::fail_ifNoActual); + #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.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- OutBound_test.cpp 30 Dec 2005 15:31:59 -0000 1.7 +++ OutBound_test.cpp 1 Jan 2006 16:28:36 -0000 1.8 @@ -68,6 +68,9 @@ #elif defined(MOCKPP_USE_BOOSTTEST) +MOCKPP_BOOST_TEST(OutBound_test::test_describe); +MOCKPP_BOOST_TEST(OutBound_test::test_invoke); + #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.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- ResponseVector_test.cpp 30 Dec 2005 15:31:59 -0000 1.11 +++ ResponseVector_test.cpp 1 Jan 2006 16:28:36 -0000 1.12 @@ -70,6 +70,9 @@ #elif defined(MOCKPP_USE_BOOSTTEST) +MOCKPP_BOOST_TEST(ResponseVector_Test::test_value); +MOCKPP_BOOST_TEST(ResponseVector_Test::test_thrower); + #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.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- ExpectationConglomeration_test.cpp 30 Dec 2005 15:31:59 -0000 1.19 +++ ExpectationConglomeration_test.cpp 1 Jan 2006 16:28:36 -0000 1.20 @@ -123,6 +123,27 @@ #elif defined(MOCKPP_USE_BOOSTTEST) +MOCKPP_BOOST_TEST(ExpectationConglomeration_test::test_hasExpectations); +MOCKPP_BOOST_TEST(ExpectationConglomeration_test::test_hasExpectations2); +MOCKPP_BOOST_TEST(ExpectationConglomeration_test::test_name); +MOCKPP_BOOST_TEST(ExpectationConglomeration_test::test_many); +MOCKPP_BOOST_TEST(ExpectationConglomeration_test::test_chain); +MOCKPP_BOOST_TEST(ExpectationConglomeration_test::test_clear); + +MOCKPP_BOOST_TEST(ExpectationConglomeration_test::test_expectNothing); +MOCKPP_BOOST_TEST(ExpectationConglomeration_test::test_expectNothing_revoked); +MOCKPP_BOOST_TEST(ExpectationConglomeration_test::test_expectActualImmediate); +MOCKPP_BOOST_TEST(ExpectationConglomeration_test::test_expectActualVerify); +MOCKPP_BOOST_TEST(ExpectationConglomeration_test::test_ifNoExpected); + +MOCKPP_BOOST_TEST(ExpectationConglomeration_test::fail_clearActual); +MOCKPP_BOOST_TEST(ExpectationConglomeration_test::fail_expectActualImmediate); +MOCKPP_BOOST_TEST(ExpectationConglomeration_test::fail_expectActualVerify); +MOCKPP_BOOST_TEST(ExpectationConglomeration_test::fail_expectNothing); +MOCKPP_BOOST_TEST(ExpectationConglomeration_test::fail_many); + +MOCKPP_BOOST_TEST(ExpectationConglomeration_test::fail_ifNoActual); + #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.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- NoArgumentsMatcher_test.cpp 30 Dec 2005 15:31:59 -0000 1.16 +++ NoArgumentsMatcher_test.cpp 1 Jan 2006 16:28:36 -0000 1.17 @@ -69,6 +69,8 @@ #elif defined(MOCKPP_USE_BOOSTTEST) +MOCKPP_BOOST_TEST(NoArgumentsMatcher_test::test_invoke); + #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.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- InvokeAtMostMatcher_test.cpp 30 Dec 2005 15:31:59 -0000 1.13 +++ InvokeAtMostMatcher_test.cpp 1 Jan 2006 16:28:36 -0000 1.14 @@ -65,6 +65,8 @@ #elif defined(MOCKPP_USE_BOOSTTEST) +MOCKPP_BOOST_TEST(InvokeAtMostMatcher_test::test_invoke); + #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.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- VisitableMockObject_4_test.cpp 30 Dec 2005 15:31:59 -0000 1.26 +++ VisitableMockObject_4_test.cpp 1 Jan 2006 16:28:36 -0000 1.27 @@ -141,6 +141,30 @@ #elif defined(MOCKPP_USE_BOOSTTEST) +MOCKPP_BOOST_TEST(VisitableMockObject_4_test::test_controller); +MOCKPP_BOOST_TEST(VisitableMockObject_4_test::test_thrower); +MOCKPP_BOOST_TEST(VisitableMockObject_4_test::test_parameter); +MOCKPP_BOOST_TEST(VisitableMockObject_4_test::test_parameter_ex); +MOCKPP_BOOST_TEST(VisitableMockObject_4_test::test_response); +MOCKPP_BOOST_TEST(VisitableMockObject_4_test::test_return); +MOCKPP_BOOST_TEST(VisitableMockObject_4_test::test_clear); +MOCKPP_BOOST_TEST(VisitableMockObject_4_test::test_default_throw); +MOCKPP_BOOST_TEST(VisitableMockObject_4_test::test_inline_pre_1_2); +MOCKPP_BOOST_TEST(VisitableMockObject_4_test::test_inline_post_1_2); +MOCKPP_BOOST_TEST(VisitableMockObject_4_test::test_constraint); +MOCKPP_BOOST_TEST(VisitableMockObject_4_test::test_controller_constraint); + +MOCKPP_BOOST_TEST(VisitableMockObject_4_test::fail_add_throw_after_active); +MOCKPP_BOOST_TEST(VisitableMockObject_4_test::fail_add_throw_val_after_active); +MOCKPP_BOOST_TEST(VisitableMockObject_4_test::fail_set_throw_after_active); +MOCKPP_BOOST_TEST(VisitableMockObject_4_test::fail_add_method_after_active); +MOCKPP_BOOST_TEST(VisitableMockObject_4_test::fail_add_return_after_active); +MOCKPP_BOOST_TEST(VisitableMockObject_4_test::fail_set_return_after_active); +MOCKPP_BOOST_TEST(VisitableMockObject_4_test::fail_parameter); +MOCKPP_BOOST_TEST(VisitableMockObject_4_test::fail_return); +MOCKPP_BOOST_TEST(VisitableMockObject_4_test::fail_unused_throwable); +MOCKPP_BOOST_TEST(VisitableMockObject_4_test::fail_unused_value); + #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.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- VisitableMockObject_3_void_test.cpp 30 Dec 2005 15:31:59 -0000 1.26 +++ VisitableMockObject_3_void_test.cpp 1 Jan 2006 16:28:36 -0000 1.27 @@ -120,6 +120,23 @@ #elif defined(MOCKPP_USE_BOOSTTEST) +MOCKPP_BOOST_TEST(VisitableMockObject_3_void_test::test_outbound); +MOCKPP_BOOST_TEST(VisitableMockObject_3_void_test::test_controller); +MOCKPP_BOOST_TEST(VisitableMockObject_3_void_test::test_parameter); +MOCKPP_BOOST_TEST(VisitableMockObject_3_void_test::test_parameter_ex); +MOCKPP_BOOST_TEST(VisitableMockObject_3_void_test::test_thrower); +MOCKPP_BOOST_TEST(VisitableMockObject_3_void_test::test_clear); +MOCKPP_BOOST_TEST(VisitableMockObject_3_void_test::test_default_throw); +MOCKPP_BOOST_TEST(VisitableMockObject_3_void_test::test_constraint); +MOCKPP_BOOST_TEST(VisitableMockObject_3_void_test::test_controller_constraint); + +MOCKPP_BOOST_TEST(VisitableMockObject_3_void_test::fail_add_throw_after_active); +MOCKPP_BOOST_TEST(VisitableMockObject_3_void_test::fail_add_throw_val_after_active); +MOCKPP_BOOST_TEST(VisitableMockObject_3_void_test::fail_set_throw_after_active); +MOCKPP_BOOST_TEST(VisitableMockObject_3_void_test::fail_add_method_after_active); +MOCKPP_BOOST_TEST(VisitableMockObject_3_void_test::fail_parameter); +MOCKPP_BOOST_TEST(VisitableMockObject_3_void_test::fail_unused_throwable); + #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.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- StubSequence_test.cpp 30 Dec 2005 15:31:59 -0000 1.21 +++ StubSequence_test.cpp 1 Jan 2006 16:28:36 -0000 1.22 @@ -74,6 +74,9 @@ #elif defined(MOCKPP_USE_BOOSTTEST) +MOCKPP_BOOST_TEST(StubSequence_test::test_describe); +MOCKPP_BOOST_TEST(StubSequence_test::test_invoke); + #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.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- MatchBuilder_test.cpp 30 Dec 2005 15:31:59 -0000 1.28 +++ MatchBuilder_test.cpp 1 Jan 2006 16:28:36 -0000 1.29 @@ -83,6 +83,9 @@ #elif defined(MOCKPP_USE_BOOSTTEST) +MOCKPP_BOOST_TEST(MatchBuilder_test:: test_order ); +MOCKPP_BOOST_TEST(MatchBuilder_test:: test_order_defered ); + #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.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- ChainableMockObject_2_void_test.cpp 30 Dec 2005 15:31:58 -0000 1.18 +++ ChainableMockObject_2_void_test.cpp 1 Jan 2006 16:28:36 -0000 1.19 @@ -77,6 +77,9 @@ #elif defined(MOCKPP_USE_BOOSTTEST) +MOCKPP_BOOST_TEST(ChainableMockObject_2_void_test::test_outbound); +MOCKPP_BOOST_TEST(ChainableMockObject_2_void_test:: test_parameter_2 ); + #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.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- ChainableMockObject_void_test.cpp 30 Dec 2005 15:31:58 -0000 1.18 +++ ChainableMockObject_void_test.cpp 1 Jan 2006 16:28:36 -0000 1.19 @@ -78,6 +78,9 @@ #elif defined(MOCKPP_USE_BOOSTTEST) +MOCKPP_BOOST_TEST(ChainableMockObject_void_test::test_register); +MOCKPP_BOOST_TEST(ChainableMockObject_void_test::test_expect_throw); + #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.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- Exception_test.cpp 30 Dec 2005 15:31:59 -0000 1.19 +++ Exception_test.cpp 1 Jan 2006 16:28:36 -0000 1.20 @@ -66,6 +66,8 @@ #elif defined(MOCKPP_USE_BOOSTTEST) +MOCKPP_BOOST_TEST(Exception_test::test_file_line); + #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.39 retrieving revision 1.40 diff -u -d -r1.39 -r1.40 --- ChainingMockObjectSupport_test.cpp 30 Dec 2005 15:31:58 -0000 1.39 +++ ChainingMockObjectSupport_test.cpp 1 Jan 2006 16:28:36 -0000 1.40 @@ -142,6 +142,30 @@ #elif defined(MOCKPP_USE_BOOSTTEST) +MOCKPP_BOOST_TEST(ChainingMockObjectSupport_test:: test_closeto_func ); +MOCKPP_BOOST_TEST(ChainingMockObjectSupport_test:: test_any_func ); +MOCKPP_BOOST_TEST(ChainingMockObjectSupport_test:: test_nothing_func ); +MOCKPP_BOOST_TEST(ChainingMockObjectSupport_test:: test_equal_func ); +MOCKPP_BOOST_TEST(ChainingMockObjectSupport_test:: test_not_equal_func ); +MOCKPP_BOOST_TEST(ChainingMockObjectSupport_test:: test_greater_func ); +MOCKPP_BOOST_TEST(ChainingMockObjectSupport_test:: test_greater_equal_func ); +MOCKPP_BOOST_TEST(ChainingMockObjectSupport_test:: test_less_func ); +MOCKPP_BOOST_TEST(ChainingMockObjectSupport_test:: test_same_func ); +MOCKPP_BOOST_TEST(ChainingMockObjectSupport_test:: test_less_equal_func ); +#ifndef MOCKPP_NO_RTTI +MOCKPP_BOOST_TEST(ChainingMockObjectSupport_test:: test_instance ); +#endif +MOCKPP_BOOST_TEST(ChainingMockObjectSupport_test:: test_invoke_not ); +MOCKPP_BOOST_TEST(ChainingMockObjectSupport_test:: test_invoke_or ); +MOCKPP_BOOST_TEST(ChainingMockObjectSupport_test:: test_invoke_and ); +MOCKPP_BOOST_TEST(ChainingMockObjectSupport_test:: test_actor ); +MOCKPP_BOOST_TEST(ChainingMockObjectSupport_test:: test_counts ); +MOCKPP_BOOST_TEST(ChainingMockObjectSupport_test:: test_string_contains ); +MOCKPP_BOOST_TEST(ChainingMockObjectSupport_test:: test_string_ends ); +MOCKPP_BOOST_TEST(ChainingMockObjectSupport_test:: test_string_starts ); +MOCKPP_BOOST_TEST(ChainingMockObjectSupport_test:: test_consecutive_typeless ); +MOCKPP_BOOST_TEST(ChainingMockObjectSupport_test:: test_consecutive_custom ); + #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.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- LIFOInvocationDispatcher_test.cpp 30 Dec 2005 15:31:59 -0000 1.24 +++ LIFOInvocationDispatcher_test.cpp 1 Jan 2006 16:28:36 -0000 1.25 @@ -87,6 +87,9 @@ #elif defined(MOCKPP_USE_BOOSTTEST) +MOCKPP_BOOST_TEST(LIFOInvocationDispatcher_test::test_dispatch); +MOCKPP_BOOST_TEST(LIFOInvocationDispatcher_test::test_void_dispatch); + #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.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- VisitableMockObject_template_test.cpp 30 Dec 2005 15:31:59 -0000 1.15 +++ VisitableMockObject_template_test.cpp 1 Jan 2006 16:28:36 -0000 1.16 @@ -94,6 +94,17 @@ #elif defined(MOCKPP_USE_BOOSTTEST) +MOCKPP_BOOST_TEST(VisitableMockObject_template_test::test_value_1); +MOCKPP_BOOST_TEST(VisitableMockObject_template_test::test_value_2); +MOCKPP_BOOST_TEST(VisitableMockObject_template_test::test_value_3); +MOCKPP_BOOST_TEST(VisitableMockObject_template_test::test_value_4); +MOCKPP_BOOST_TEST(VisitableMockObject_template_test::test_value_5); +MOCKPP_BOOST_TEST(VisitableMockObject_template_test::test_throw_1); +MOCKPP_BOOST_TEST(VisitableMockObject_template_test::test_throw_2); +MOCKPP_BOOST_TEST(VisitableMockObject_template_test::test_throw_3); +MOCKPP_BOOST_TEST(VisitableMockObject_template_test::test_throw_4); +MOCKPP_BOOST_TEST(VisitableMockObject_template_test::test_throw_5); + #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.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- VisitableMockMethod_1_test.cpp 1 Jan 2006 10:27:23 -0000 1.12 +++ VisitableMockMethod_1_test.cpp 1 Jan 2006 16:28:36 -0000 1.13 @@ -76,6 +76,9 @@ #elif defined(MOCKPP_USE_BOOSTTEST) +MOCKPP_BOOST_TEST(VisitableMockMethod_1_test:: test_parameter_1 ); +MOCKPP_BOOST_TEST(VisitableMockMethod_1_test:: test_parameter_1v ); + #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.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- VisitableMockObject_4_void_test.cpp 30 Dec 2005 15:31:59 -0000 1.26 +++ VisitableMockObject_4_void_test.cpp 1 Jan 2006 16:28:36 -0000 1.27 @@ -120,6 +120,23 @@ #elif defined(MOCKPP_USE_BOOSTTEST) +MOCKPP_BOOST_TEST(VisitableMockObject_4_void_test::test_outbound); +MOCKPP_BOOST_TEST(VisitableMockObject_4_void_test::test_controller); +MOCKPP_BOOST_TEST(VisitableMockObject_4_void_test::test_parameter); +MOCKPP_BOOST_TEST(VisitableMockObject_4_void_test::test_parameter_ex); +MOCKPP_BOOST_TEST(VisitableMockObject_4_void_test::test_thrower); +MOCKPP_BOOST_TEST(VisitableMockObject_4_void_test::test_clear); +MOCKPP_BOOST_TEST(VisitableMockObject_4_void_test::test_default_throw); +MOCKPP_BOOST_TEST(VisitableMockObject_4_void_test::test_constraint); +MOCKPP_BOOST_TEST(VisitableMockObject_4_void_test::test_controller_constraint); + +MOCKPP_BOOST_TEST(VisitableMockObject_4_void_test::fail_add_throw_after_active); +MOCKPP_BOOST_TEST(VisitableMockObject_4_void_test::fail_add_throw_val_after_active); +MOCKPP_BOOST_TEST(VisitableMockObject_4_void_test::fail_set_throw_after_active); +MOCKPP_BOOST_TEST(VisitableMockObject_4_void_test::fail_add_method_after_active); +MOCKPP_BOOST_TEST(VisitableMockObject_4_void_test::fail_parameter); +MOCKPP_BOOST_TEST(VisitableMockObject_4_void_test::fail_unused_throwable); + #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.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- ReturnObjectList_test.cpp 30 Dec 2005 15:31:59 -0000 1.22 +++ ReturnObjectList_test.cpp 1 Jan 2006 16:28:36 -0000 1.23 @@ -81,6 +81,13 @@ #elif defined(MOCKPP_USE_BOOSTTEST) +MOCKPP_BOOST_TEST(ReturnObjectList_test::test_get_object); +MOCKPP_BOOST_TEST(ReturnObjectList_test::test_default); +MOCKPP_BOOST_TEST(ReturnObjectList_test::test_tostring); + +MOCKPP_BOOST_TEST(ReturnObjectList_test::fail_get_object); +MOCKPP_BOOST_TEST(ReturnObjectList_test::fail_not_empty); + #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.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- StringStartsWith_test.cpp 30 Dec 2005 15:31:59 -0000 1.10 +++ StringStartsWith_test.cpp 1 Jan 2006 16:28:36 -0000 1.11 @@ -70,6 +70,9 @@ #elif defined(MOCKPP_USE_BOOSTTEST) +MOCKPP_BOOST_TEST(StringStartsWith_test::test_describe); +MOCKPP_BOOST_TEST(StringStartsWith_test::test_invoke); + #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.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- VisitableMockObject_3_test.cpp 30 Dec 2005 15:31:59 -0000 1.26 +++ VisitableMockObject_3_test.cpp 1 Jan 2006 16:28:36 -0000 1.27 @@ -141,6 +141,30 @@ #elif defined(MOCKPP_USE_BOOSTTEST) +MOCKPP_BOOST_TEST(VisitableMockObject_3_test::test_controller); +MOCKPP_BOOST_TEST(VisitableMockObject_3_test::test_thrower); +MOCKPP_BOOST_TEST(VisitableMockObject_3_test::test_parameter); +MOCKPP_BOOST_TEST(VisitableMockObject_3_test::test_parameter_ex); +MOCKPP_BOOST_TEST(VisitableMockObject_3_test::test_response); +MOCKPP_BOOST_TEST(VisitableMockObject_3_test::test_return); +MOCKPP_BOOST_TEST(VisitableMockObject_3_test::test_clear); +MOCKPP_BOOST_TEST(VisitableMockObject_3_test::test_default_throw); +MOCKPP_BOOST_TEST(VisitableMockObject_3_test::test_inline_pre_1_2); +MOCKPP_BOOST_TEST(VisitableMockObject_3_test::test_inline_post_1_2); +MOCKPP_BOOST_TEST(VisitableMockObject_3_test::test_constraint); +MOCKPP_BOOST_TEST(VisitableMockObject_3_test::test_controller_constraint); + +MOCKPP_BOOST_TEST(VisitableMockObject_3_test::fail_add_throw_after_active); +MOCKPP_BOOST_TEST(VisitableMockObject_3_test::fail_add_throw_val_after_active); +MOCKPP_BOOST_TEST(VisitableMockObject_3_test::fail_set_throw_after_active); +MOCKPP_BOOST_TEST(VisitableMockObject_3_test::fail_add_method_after_active); +MOCKPP_BOOST_TEST(VisitableMockObject_3_test::fail_add_return_after_active); +MOCKPP_BOOST_TEST(VisitableMockObject_3_test::fail_set_return_after_active); +MOCKPP_BOOST_TEST(VisitableMockObject_3_test::fail_parameter); +MOCKPP_BOOST_TEST(VisitableMockObject_3_test::fail_return); +MOCKPP_BOOST_TEST(VisitableMockObject_3_test::fail_unused_throwable); +MOCKPP_BOOST_TEST(VisitableMockObject_3_test::fail_unused_value); + #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.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- ChainableMockObjectPolymorphism_test.cpp 1 Jan 2006 10:27:22 -0000 1.12 +++ ChainableMockObjectPolymorphism_test.cpp 1 Jan 2006 16:28:36 -0000 1.13 @@ -78,6 +78,9 @@ #elif defined(MOCKPP_USE_BOOSTTEST) +MOCKPP_BOOST_TEST(MockVisitorPolymorphism_test::test_visitor_retrieves_parameter); +MOCKPP_BOOST_TEST(MockVisitorPolymorphism_test::test_visitor_retrieves_mock_parameter); + #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.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- IsGreaterOrEqual_test.cpp 30 Dec 2005 15:31:59 -0000 1.13 +++ IsGreaterOrEqual_test.cpp 1 Jan 2006 16:28:36 -0000 1.14 @@ -70,6 +70,9 @@ #elif defined(MOCKPP_USE_BOOSTTEST) +MOCKPP_BOOST_TEST(IsGreaterOrEqual_test::test_describe); +MOCKPP_BOOST_TEST(IsGreaterOrEqual_test::test_invoke); + #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.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- mockpp_test.cpp 30 Dec 2005 15:32:00 -0000 1.20 +++ mockpp_test.cpp 1 Jan 2006 16:28:36 -0000 1.21 @@ -66,8 +66,12 @@ #if defined (MOCKPP_USE_CXXTEST) +MOCKPP_CXXTEST(mockpp_test, test_unicode_latin1_conv); + #elif defined(MOCKPP_USE_BOOSTTEST) +MOCKPP_BOOST_TEST(mockpp_test::test_unicode_latin1_conv); + #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.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- Throwable_test.cpp 30 Dec 2005 15:31:59 -0000 1.21 +++ Throwable_test.cpp 1 Jan 2006 16:28:36 -0000 1.22 @@ -80,6 +80,12 @@ #elif defined(MOCKPP_USE_BOOSTTEST) +MOCKPP_BOOST_TEST(Throwable_test::test_getter); +MOCKPP_BOOST_TEST(Throwable_test::test_used); +MOCKPP_BOOST_TEST(Throwable_test::test_throw); +MOCKPP_BOOST_TEST(Throwable_test::test_clear); +MOCKPP_BOOST_TEST(Throwable_test::test_copy); + #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.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- ChainableMockObject_2_test.cpp 30 Dec 2005 15:31:58 -0000 1.17 +++ ChainableMockObject_2_test.cpp 1 Jan 2006 16:28:36 -0000 1.18 @@ -75,6 +75,9 @@ #elif defined(MOCKPP_USE_BOOSTTEST) +MOCKPP_BOOST_TEST(ChainableMockObject_2_test::test_outbound); +MOCKPP_BOOST_TEST(ChainableMockObject_2_test:: test_parameter_2 ); + #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.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- UnlimitedMatcher_test.cpp 30 Dec 2005 15:31:59 -0000 1.9 +++ UnlimitedMatcher_test.cpp 1 Jan 2006 16:28:36 -0000 1.10 @@ -62,6 +62,8 @@ #elif defined(MOCKPP_USE_BOOSTTEST) +MOCKPP_BOOST_TEST(UnlimitedMatcher_test::test_invoke); + #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.29 retrieving revision 1.30 diff -u -d -r1.29 -r1.30 --- CoreMock_test.cpp 1 Jan 2006 10:27:22 -0000 1.29 +++ CoreMock_test.cpp 1 Jan 2006 16:28:36 -0000 1.30 @@ -88,6 +88,9 @@ #elif defined(MOCKPP_USE_BOOSTTEST) +MOCKPP_BOOST_TEST(CoreMock_test:: test_void_invocation ); +MOCKPP_BOOST_TEST(CoreMock_test:: test_invocation ); + #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.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- ChainableMockObject_4_test.cpp 30 Dec 2005 15:31:58 -0000 1.17 +++ ChainableMockObject_4_test.cpp 1 Jan 2006 16:28:36 -0000 1.18 @@ -76,6 +76,9 @@ #elif defined(MOCKPP_USE_BOOSTTEST) +MOCKPP_BOOST_TEST(ChainableMockObject_4_test::test_outbound); +MOCKPP_BOOST_TEST(ChainableMockObject_4_test:: test_parameter_4 ); + #elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (ChainableMockObject_4_test); Index: mockpp_pti_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/mockpp_pti_test.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- mockpp_pti_test.cpp 1 Jan 2006 10:27:23 -0000 1.14 +++ mockpp_pti_test.cpp 1 Jan 2006 16:28:36 -0000 1.15 @@ -95,8 +95,22 @@ #if defined (MOCKPP_USE_CXXTEST) + MOCKPP_CXXTEST(mockpp_pti_test, test_coremock); + MOCKPP_CXXTEST(mockpp_pti_test, test_typeless); + MOCKPP_CXXTEST(mockpp_pti_test, test_lifo); + MOCKPP_CXXTEST(mockpp_pti_test, test_fifo); + MOCKPP_CXXTEST(mockpp_pti_test, test_invocation); + MOCKPP_CXXTEST(mockpp_pti_test, test_abstract); + #elif defined(MOCKPP_USE_BOOSTTEST) + MOCKPP_BOOST_TEST(mockpp_pti_test::test_coremock); + MOCKPP_BOOST_TEST(mockpp_pti_test::test_typeless); + MOCKPP_BOOST_TEST(mockpp_pti_test::test_lifo); + MOCKPP_BOOST_TEST(mockpp_pti_test::test_fifo); + MOCKPP_BOOST_TEST(mockpp_pti_test::test_invocation); + MOCKPP_BOOST_TEST(mockpp_pti_test::test_abstract); + #elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (mockpp_pti_test); Index: DefaultResultStub_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/DefaultResultStub_test.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- DefaultResultStub_test.cpp 30 Dec 2005 15:31:59 -0000 1.16 +++ DefaultResultStub_test.cpp 1 Jan 2006 16:28:36 -0000 1.17 @@ -70,6 +70,9 @@ #elif defined(MOCKPP_USE_BOOSTTEST) +MOCKPP_BOOST_TEST(DefaultResultStub_test::test_invoke); +MOCKPP_BOOST_TEST(DefaultResultStub_test::test_describe); + #elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (DefaultResultStub_test); Index: ExpectationSegment_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ExpectationSegment_test.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- ExpectationSegment_test.cpp 30 Dec 2005 15:31:59 -0000 1.20 +++ ExpectationSegment_test.cpp 1 Jan 2006 16:28:36 -0000 1.21 @@ -111,6 +111,23 @@ #elif defined(MOCKPP_USE_BOOSTTEST) +MOCKPP_BOOST_TEST(ExpectationSegment_test::test_hasExpectations); +MOCKPP_BOOST_TEST(ExpectationSegment_test::test_name); +MOCKPP_BOOST_TEST(ExpectationSegment_test::test_clear); +MOCKPP_BOOST_TEST(ExpectationSegment_test::test_ifNoExpected); + +MOCKPP_BOOST_TEST(ExpectationSegment_test::test_expectNothing); +MOCKPP_BOOST_TEST(ExpectationSegment_test::test_expectNothing_revoked); +MOCKPP_BOOST_TEST(ExpectationSegment_test::test_expectActualImmediate); +MOCKPP_BOOST_TEST(ExpectationSegment_test::test_expectActualVerify); + +MOCKPP_BOOST_TEST(ExpectationSegment_test::fail_clearActual); +MOCKPP_BOOST_TEST(ExpectationSegment_test::fail_expectActualImmediate); +MOCKPP_BOOST_TEST(ExpectationSegment_test::fail_expectActualVerify); +MOCKPP_BOOST_TEST(ExpectationSegment_test::fail_expectNothing); + +MOCKPP_BOOST_TEST(ExpectationSegment_test::fail_ifNoActual); + #elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (ExpectationSegment_test); Index: VisitableMockObject_5_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_5_test.cpp,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- VisitableMockObject_5_test.cpp 30 Dec 2005 15:31:59 -0000 1.35 +++ VisitableMockObject_5_test.cpp 1 Jan 2006 16:28:36 -0000 1.36 @@ -147,6 +147,31 @@ #elif defined(MOCKPP_USE_BOOSTTEST) +MOCKPP_BOOST_TEST(VisitableMockObject_5_test::test_controller); +MOCKPP_BOOST_TEST(VisitableMockObject_5_test::test_thrower); +MOCKPP_BOOST_TEST(VisitableMockObject_5_test::test_parameter); +MOCKPP_BOOST_TEST(VisitableMockObject_5_test::test_parameter_ex); +MOCKPP_BOOST_TEST(VisitableMockObject_5_test::test_response); +MOCKPP_BOOST_TEST(VisitableMockObject_5_test::test_return); +MOCKPP_BOOST_TEST(VisitableMockObject_5_test::test_clear); +MOCKPP_BOOST_TEST(VisitableMockObject_5_test::test_default_throw); +MOCKPP_BOOST_TEST(VisitableMockObject_5_test::test_inline_pre_1_2); +MOCKPP_BOOST_TEST(VisitableMockObject_5_test::test_inline_post_1_2); +MOCKPP_BOOST_TEST(VisitableMockObject_5_test::test_constraint); +MOCKPP_BOOST_TEST(VisitableMockObject_5_test::test_controller_constraint); +MOCKPP_BOOST_TEST(VisitableMockObject_5_test::test_controller_constraint_ext); + +MOCKPP_BOOST_TEST(VisitableMockObject_5_test::fail_add_throw_after_active); +MOCKPP_BOOST_TEST(VisitableMockObject_5_test::fail_add_throw_val_after_active); +MOCKPP_BOOST_TEST(VisitableMockObject_5_test::fail_set_throw_after_active); +MOCKPP_BOOST_TEST(VisitableMockObject_5_test::fail_add_method_after_active); +MOCKPP_BOOST_TEST(VisitableMockObject_5_test::fail_add_return_after_active); +MOCKPP_BOOST_TEST(VisitableMockObject_5_test::fail_set_return_after_active); +MOCKPP_BOOST_TEST(VisitableMockObject_5_test::fail_parameter); +MOCKPP_BOOST_TEST(VisitableMockObject_5_test::fail_return); +MOCKPP_BOOST_TEST(VisitableMockObject_5_test::fail_unused_throwable); +MOCKPP_BOOST_TEST(VisitableMockObject_5_test::fail_unused_value); + #elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (VisitableMockObject_5_test); Index: VisitableMockObject_1_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_1_test.cpp,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- VisitableMockObject_1_test.cpp 30 Dec 2005 15:31:59 -0000 1.28 +++ VisitableMockObject_1_test.cpp 1 Jan 2006 16:28:36 -0000 1.29 @@ -141,6 +141,30 @@ #elif defined(MOCKPP_USE_BOOSTTEST) +MOCKPP_BOOST_TEST(VisitableMockObject_1_test::test_controller); +MOCKPP_BOOST_TEST(VisitableMockObject_1_test::test_thrower); +MOCKPP_BOOST_TEST(VisitableMockObject_1_test::test_parameter_ex); +MOCKPP_BOOST_TEST(VisitableMockObject_1_test::test_parameter); +MOCKPP_BOOST_TEST(VisitableMockObject_1_test::test_response); +MOCKPP_BOOST_TEST(VisitableMockObject_1_test::test_return); +MOCKPP_BOOST_TEST(VisitableMockObject_1_test::test_clear); +MOCKPP_BOOST_TEST(VisitableMockObject_1_test::test_default_throw); +MOCKPP_BOOST_TEST(VisitableMockObject_1_test::test_inline_pre_1_2); +MOCKPP_BOOST_TEST(VisitableMockObject_1_test::test_inline_post_1_2); +MOCKPP_BOOST_TEST(VisitableMockObject_1_test::test_constraint); +MOCKPP_BOOST_TEST(VisitableMockObject_1_test::test_controller_constraint); + +MOCKPP_BOOST_TEST(VisitableMockObject_1_test::fail_add_throw_after_active); +MOCKPP_BOOST_TEST(VisitableMockObject_1_test::fail_add_throw_val_after_active); +MOCKPP_BOOST_TEST(VisitableMockObject_1_test::fail_set_throw_after_active); +MOCKPP_BOOST_TEST(VisitableMockObject_1_test::fail_add_method_after_active); +MOCKPP_BOOST_TEST(VisitableMockObject_1_test::fail_add_return_after_active); +MOCKPP_BOOST_TEST(VisitableMockObject_1_test::fail_set_return_after_active); +MOCKPP_BOOST_TEST(VisitableMockObject_1_test::fail_parameter); +MOCKPP_BOOST_TEST(VisitableMockObject_1_test::fail_return); +MOCKPP_BOOST_TEST(VisitableMockObject_1_test::fail_unused_throwable); +MOCKPP_BOOST_TEST(VisitableMockObject_1_test::fail_unused_value); + #elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (VisitableMockObject_1_test); Index: VisitableMockObject_1_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_1_void_test.cpp,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- VisitableMockObject_1_void_test.cpp 30 Dec 2005 15:31:59 -0000 1.28 +++ VisitableMockObject_1_void_test.cpp 1 Jan 2006 16:28:36 -0000 1.29 @@ -120,6 +120,23 @@ #elif defined(MOCKPP_USE_BOOSTTEST) +MOCKPP_BOOST_TEST(VisitableMockObject_1_void_test::test_controller);... [truncated message content] |
|
From: Ewald A. <ewa...@us...> - 2006-01-01 11:17:37
|
Update of /cvsroot/mockpp/mockpp/mockpp/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6171/mockpp/tests Modified Files: AbstractDynamicChainingMock_test.cpp mock_test.cpp Log Message: register boost tests Index: AbstractDynamicChainingMock_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/AbstractDynamicChainingMock_test.cpp,v retrieving revision 1.39 retrieving revision 1.40 diff -u -d -r1.39 -r1.40 --- AbstractDynamicChainingMock_test.cpp 1 Jan 2006 10:27:22 -0000 1.39 +++ AbstractDynamicChainingMock_test.cpp 1 Jan 2006 11:17:28 -0000 1.40 @@ -101,6 +101,13 @@ #elif defined(MOCKPP_USE_BOOSTTEST) +MOCKPP_BOOST_TEST(AbstractDynamicChainingMock_test::test_void_invocation ); +MOCKPP_BOOST_TEST(AbstractDynamicChainingMock_test::test_invocation ); +MOCKPP_BOOST_TEST(AbstractDynamicChainingMock_test::test_describer ); +MOCKPP_BOOST_TEST(AbstractDynamicChainingMock_test::test_describe ); +MOCKPP_BOOST_TEST(AbstractDynamicChainingMock_test::test_void_describe ); +MOCKPP_BOOST_TEST(AbstractDynamicChainingMock_test::test_verify ); + #elif defined(MOCKPP_USE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION ( AbstractDynamicChainingMock_test ); Index: mock_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/mock_test.cpp,v retrieving revision 1.34 retrieving revision 1.35 diff -u -d -r1.34 -r1.35 --- mock_test.cpp 1 Jan 2006 10:27:23 -0000 1.34 +++ mock_test.cpp 1 Jan 2006 11:17:28 -0000 1.35 @@ -34,6 +34,12 @@ #include <mockpp/mockpp.h> // always first +/* +#if defined(MOCKPP_USE_BOOSTTEST) +# define BOOST_AUTO_TEST_MAIN // before first Boost header +#endif +*/ + #include <iostream> #include <ctime> @@ -60,7 +66,6 @@ #elif defined(MOCKPP_USE_BOOSTTEST) -#define BOOST_AUTO_TEST_MAIN #include <boost/test/auto_unit_test.hpp> #include <boost/test/unit_test.hpp> using namespace boost::unit_test_framework; @@ -176,6 +181,9 @@ #if defined(MOCKPP_USE_BOOSTTEST) +// alternatively use #define BOOST_AUTO_TEST_MAIN to +// have the the default main created automatically + test_suite* init_unit_test_suite( int argc, char* argv[] ) { @@ -190,7 +198,23 @@ std::cout << " - size of <char> is " << sizeof(MOCKPP_CHAR('x')) << std::endl; std::cout << "\n"; - test_suite* test= BOOST_TEST_SUITE( "const_string test" ); + test_suite* test = boost::unit_test_framework::detail::auto_unit_test_suite(); + + /* + log_successful_tests = 0, + log_test_suites = 1, + log_messages = 2, + log_warnings = 3, + log_all_errors = 4, // reported by unit test macros + log_cpp_exception_errors = 5, // uncaught C++ exceptions + log_system_errors = 6, // including timeouts, signals, traps + log_fatal_errors = 7, // including unit test macros or + // fatal system errors + log_progress_only = 8, // only unit test progress to be reported + log_nothing = 9 + */ + + unit_test_log::instance().set_log_threshold_level(log_messages); return test; } |
