mockpp-commits Mailing List for Mock Objects for C++ (Page 7)
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-07 12:15:11
|
Update of /cvsroot/mockpp/mockpp/msvc71 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19994/msvc71 Added Files: gen-proj.sh Log Message: new --- NEW FILE: gen-proj.sh --- #!/bin/sh sed -e 's/Version 9.00/Version 8.00/g' <../msvc2005/mockpp/mockpp.sln >mockpp/mockpp.sln sed -e 's/Version="8.00"/Version="7.10"/g' <../msvc2005/mockpp/tests/mock_test.vcproj >mockpp/tests/mock_test.vcproj sed -e 's/Version="8.00"/Version="7.10"/g' <../msvc2005/mockpp/tests/mock_test_win32.vcproj >mockpp/tests/mock_test_win32.vcproj sed -e 's/Version="8.00"/Version="7.10"/g' <../msvc2005/mockpp/mockpp.vcproj >mockpp/mockpp.vcproj sed -e 's/Version="8.00"/Version="7.10"/g' <../msvc2005/mockpp/examples/examples.vcproj >mockpp/examples/examples.vcproj sed -e 's/Version="8.00"/Version="7.10"/g' <../msvc2005/mockpp/examples/tutorial/visitmock.vcproj >mockpp/examples/tutorial/visitmock.vcproj sed -e 's/Version="8.00"/Version="7.10"/g' <../msvc2005/mockpp/examples/tutorial/visitmock2.vcproj >mockpp/examples/tutorial/visitmock2.vcproj sed -e 's/Version="8.00"/Version="7.10"/g' <../msvc2005/mockpp/examples/tutorial/chainmock2.vcproj >mockpp/examples/tutorial/chainmock2.vcproj sed -e 's/Version="8.00"/Version="7.10"/g' <../msvc2005/mockpp/examples/tutorial/poormock.vcproj >mockpp/examples/tutorial/poormock.vcproj sed -e 's/Version="8.00"/Version="7.10"/g' <../msvc2005/mockpp/examples/tutorial/poormock_se.vcproj >mockpp/examples/tutorial/poormock_se.vcproj sed -e 's/Version="8.00"/Version="7.10"/g' <../msvc2005/mockpp/examples/tutorial/chainmock.vcproj >mockpp/examples/tutorial/chainmock.vcproj sed -e 's/Version="8.00"/Version="7.10"/g' <../msvc2005/mockpp/examples/tutorial/basicmock.vcproj >mockpp/examples/tutorial/basicmock.vcproj sed -e 's/Version="8.00"/Version="7.10"/g' <../msvc2005/mockpp/examples/tutorial/cppunit.vcproj >mockpp/examples/tutorial/cppunit.vcproj sed -e 's/Version="8.00"/Version="7.10"/g' <../msvc2005/mockpp/mockpp_production.vcproj >mockpp/mockpp_production.vcproj sed -e 's/Version="8.00"/Version="7.10"/g' <../msvc2005/mockpp/mockpp_cxxtest.vcproj >mockpp/mockpp_cxxtest.vcproj |
|
From: Ewald A. <ewa...@us...> - 2006-01-07 11:40:20
|
Update of /cvsroot/mockpp/mockpp/mockpp/docs/en In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14196/mockpp/docs/en Modified Files: appendix.docbook dev_advanced_intro.docbook dev_advanced_jmock.docbook dev_basic.docbook dev_embedded.docbook dev_helper.docbook dev_intro.docbook Log Message: update docs Index: appendix.docbook =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/docs/en/appendix.docbook,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- appendix.docbook 6 Jan 2006 12:17:34 -0000 1.21 +++ appendix.docbook 7 Jan 2006 11:39:50 -0000 1.22 @@ -14,16 +14,11 @@ <ulink url="http://mockpp.sf.net">http://mockpp.sf.net</ulink></para> </sect1> -<sect1 id="requirements"> -<title>Requirements</title> - -</sect1> - <sect1 id="compilation"> <title>Compilation and Installation</title> <sect2 id="installing-autoconf"> -<title>Installing on systems using autoconf and friends</title> +<title>Installing on systems using <application>autoconf</application> and friends</title> <para>In order to compile and install mockpp on your system, type the following in the base directory of the &mockpp; distribution: @@ -35,7 +30,7 @@ </screen> </para> -There are some options for <userinput>configure</userinput> you might be interested in: +There are some options for <application>configure</application> you might be interested in: <variablelist> @@ -104,7 +99,7 @@ <varlistentry> <term>--enable-boosttest</term> - <listitem><para>This option enables Boost.Test as test framework.</para> + <listitem><para>This option enables &boost.test; as test framework.</para> </listitem> </varlistentry> @@ -120,11 +115,12 @@ </variablelist> -<para>Since mockpp uses autoconf and automake you should have no trouble compiling it. +<para>Since mockpp uses <application>autoconf</application> and +<application>automake</application> you should have no trouble compiling it. Should you run into problems please report them to the <ulink url="http://sourceforge.net/bugs/?group_id=69135">Bug Tracker</ulink>.</para> -<para>Once you have compiled the sources you should run the built in checks +<para>Once you have compiled the sources you should run the built-in checks to verify the correct behaviour on your platform: <screen width="40"> @@ -138,7 +134,7 @@ <!-- ===================================== --> <sect2 id="installing-cygwin"> -<title>Installing on systems using Cygwin</title> +<title>Installing on systems using &cygwin;</title> <para>There have been reports about problems to compile and link with &cppunit; on Windows system under &cygwin;. A solution might be to be to link @@ -193,9 +189,8 @@ <sect2 id="installing-others"> <title>Installing on other systems</title> -<para> -If you are using a compiler on a platform not directly supported you must setup you -own project files for your compiler. All adjustments are done in +<para>If you are using a compiler on a platform not directly supported you must +setup your own project files for your compiler. All adjustments are done in <filename class='headerfile'>mockpp.h</filename>. To benefit from updates it is of course better to move your own settings to a configuration file and include it. <para> @@ -213,7 +208,7 @@ <term><literal>MOCKPP_UNICODE</literal></term> <listitem><para>Enable unicode characters (based on <token>wchar_t</token>) instead of ascii characters.There are some related macros. <literal>MOCKPP_PCHAR</literal> - <literal>MOCKPP_CHAR</literal> are used to mark literal character strings + and <literal>MOCKPP_CHAR</literal> are used to mark literal character strings either with or without leading "L". <literal>MOCKPP_STRING</literal> and <literal>MOCKPP_PCSTRING</literal> are used to create a <token>String</token> variable. @@ -238,7 +233,8 @@ <para>If you want to use another STL you have to extend the according section in <filename>mockpp.h</filename>. Search for <literal>MOCKPP_USE_MINI_STL</literal> and add an appropriate section similar to the one for - <literal>ministl</literal>.</para> + <literal>ministl</literal>. Do the same for &cxxtest; in + <filename>3party/cxxtest/cxxtest/Flags.h</filename></para> </listitem> </varlistentry> @@ -278,14 +274,14 @@ <varlistentry> <term><literal>MOCKPP_BOUNDARY_DELTA</literal></term> <listitem><para>Include source code for - <function>ExpectationBoundary::setExpectedDelta()</function></para>. + <function>ExpectationBoundary::setExpectedDelta()</function></para> </listitem> </varlistentry> <varlistentry> <term><literal>MOCKPP_USE_STD_EXCEPTION</literal></term> <listitem><para>Derive <classname>mockpp::Exception</classname> - from <classname>std::exception</classname></para>. + from <classname>std::exception</classname></para> </listitem> </varlistentry> Index: dev_embedded.docbook =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/docs/en/dev_embedded.docbook,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- dev_embedded.docbook 5 Jan 2006 20:17:11 -0000 1.11 +++ dev_embedded.docbook 7 Jan 2006 11:39:50 -0000 1.12 @@ -16,22 +16,22 @@ <varlistentry> <term>Standard Template Library (STL)</term> - <listitem>Templates and other inline code may increase the resulting footprint - of the binary.</listitem> + <listitem><para>Templates and other inline code may increase the resulting footprint + of the binary.</para></listitem> </varlistentry> <varlistentry> <term>Exceptions</term> - <listitem>After throwing an exception the complier must cleanup and + <listitem><para>After throwing an exception the complier must cleanup and destroy all automatic objects in the previous scopes. This bookkeeping - consumes space as well.</listitem> + consumes space as well.</para></listitem> </varlistentry> <varlistentry> <term>Runtime Type Information (RTTI)</term> - <listitem>To provide information about an object at runtime the + <listitem><para>To provide information about an object at runtime the compiler includes data like the class name or the inheritance tree - in the binary. </listitem> + in the binary.</para></listitem> </varlistentry> </variablelist> Index: dev_intro.docbook =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/docs/en/dev_intro.docbook,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- dev_intro.docbook 5 Jan 2006 19:13:55 -0000 1.9 +++ dev_intro.docbook 7 Jan 2006 11:39:50 -0000 1.10 @@ -43,7 +43,7 @@ </itemizedlist> -<para>See <xref linkend="configuration" /> for more option how to adjust +<para>See <xref linkend="configuration" /> for more options how to adjust this library.</para> </para> Index: dev_basic.docbook =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/docs/en/dev_basic.docbook,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- dev_basic.docbook 6 Jan 2006 12:17:34 -0000 1.15 +++ dev_basic.docbook 7 Jan 2006 11:39:50 -0000 1.16 @@ -62,7 +62,7 @@ which does an exact comparison. Your own data types should implement a meaningful <methodname>operator==()</methodname> to be usable with &mockpp;. Depending on your type <methodname>operator<()</methodname> -can replace the formar operator by supplying a template which does the following +can replace the former operator by supplying a template which does the following computation: <code>!(x < y) && !(y < x)</code>.</para> <para>The following example creates an expectation value for <token>int</token> Index: dev_advanced_jmock.docbook =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/docs/en/dev_advanced_jmock.docbook,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- dev_advanced_jmock.docbook 27 Dec 2005 18:01:44 -0000 1.18 +++ dev_advanced_jmock.docbook 7 Jan 2006 11:39:50 -0000 1.19 @@ -9,16 +9,6 @@ <sect3> <title>Overview</title> -<para>When a method is invoked on a mock object, the mock object searches -through its expectations from first to last to find one that matches the -invocation. An expectation matches an invocation if all of its -matching rules match the invocation. After the invocation, the matching expectation -might stop matching -further invocations. For example, an <methodname>expects(once())</methodname> -expectation only matches once and will be ignored on future invocations while an -<methodname>expects(atLeastOnce())</methodname> -expectation will always be matched against invocations.</para> - <para>Specifying some behaviour with chainable mock objects is similar to describing it in words. You may say for example: @@ -53,12 +43,22 @@ <methodname>will()</methodname> to explicitly express this fact.</para> +<para>When a method is invoked on a chainable mock object, the mock object searches +through its expectations from first to last to find one that matches the +invocation. An expectation matches an invocation if all of its +matching rules match the invocation. After the invocation, the matching expectation +might stop matching +further invocations. For example, an <methodname>expects(once())</methodname> +expectation only matches once and will be ignored on future invocations while an +<methodname>expects(atLeastOnce())</methodname> +expectation will always be matched against invocations.</para> + <para>The original java implementation contained an additional method called <methodname>method()</methodname> which passed the desired method name. This is completely missing in my C++ implementation. The reason is simple: C++ does not support reflection and therefor an application can't look into itself or create methods at runtime or do some other weird things. So I had to apply a handful of -macro-magic instead. This led to the +macro-magic and templates instead. This led to the fact that you have to set up a different helper object for <emphasis>each method</emphasis> whereas jMock would use the same object for all calls of a mock object.</para> @@ -134,18 +134,16 @@ on an invocation to a totally different mock object. And it is also possible to add more than one call to <methodname>before()</methodname> or <methodname>after()</methodname> if you want to -have it match to more than one invocation in the same expectation chain.</para> - -<para>For that purpose you use the methods -<methodname>before()</methodname> or <methodname>after()</methodname>.</para> +have it match against more than one invocation in the same expectation chain.</para> </sect3> <sect3 id="parameter-constraint"> <title>Parameter Constraints</title> -<para>When working with a <classname>VisitableMockObject</classname> you specify exactly -which parameter value you expect. A <classname>ChainableMockObject</classname> +<para>When working with a <classname>VisitableMockObject</classname> +you normally specify exactly which parameter value you expect. A +<classname>ChainableMockObject</classname> on the other hand can work less strict. Specifying an exact match is common but you may as well allow a set of values or even any value. Or you demand that each value must be higher than the one in the @@ -153,7 +151,8 @@ <para>The distribution already contains a set of classes for common constraints. For convenience reasons and to enhance readability most of these -classes have a counterpart in the form of a method.The most important ones are:</para> +classes have a counterpart in the form of a wrapper function. The most important +ones are:</para> <itemizedlist> <listitem><classname>IsEqual</classname> = <methodname>eq()</methodname> tests equality</listitem> Index: dev_advanced_intro.docbook =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/docs/en/dev_advanced_intro.docbook,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- dev_advanced_intro.docbook 27 Dec 2005 18:01:44 -0000 1.10 +++ dev_advanced_intro.docbook 7 Jan 2006 11:39:50 -0000 1.11 @@ -239,7 +239,7 @@ <token>MOCKPP_ENABLE_DEFAULT_FORMATTER</token> before including the first &mockpp; header file.</para> <para>It is also possible to re-use an existing - <methodname>operator<<(std::ostream & const T &val)</methodname>. + <methodname>operator<<(std::ostream &, const T &val)</methodname>. In this case you supply depending on the string type one of the macros <token>MOCKPP_OWSTREAMABLE</token> or <token>MOCKPP_OSTREAMABLE</token>. This implements a simple string translator function. Index: dev_helper.docbook =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/docs/en/dev_helper.docbook,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- dev_helper.docbook 28 Dec 2005 21:35:12 -0000 1.12 +++ dev_helper.docbook 7 Jan 2006 11:39:50 -0000 1.13 @@ -76,7 +76,7 @@ documentation for <filename class='headerfile'>Asserter.h</filename> and <filename class='headerfile'>AssertMo.h</filename> -for a complete list. There you find also a detailed description of +for a complete list. There you will also find a detailed description of the above macros and the functions behind them. </para> @@ -99,9 +99,9 @@ translations when the positions of the substituted parameters are swapped for grammatical reasons.</para> -<para>So I decided to implement a typesafe approach which also takes into account -the position of the substituted values: each inserted value is converted into -its string representation and substitutes the placeholder +<para>So I decided to implement a typesafe approach which also takes the +position of the substituted values into account: each inserted value is converted +into its string representation and substitutes the placeholder with the lowest number. Since such a placeholder consists of a percent sign and a single digit there are up to ten substitutions possible.</para> |
|
From: Ewald A. <ewa...@us...> - 2006-01-07 11:40:20
|
Update of /cvsroot/mockpp/mockpp/mockpp/docs/en/common In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14196/mockpp/docs/en/common Modified Files: mockpp.css Log Message: update docs Index: mockpp.css =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/docs/en/common/mockpp.css,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- mockpp.css 23 Sep 2005 20:53:09 -0000 1.9 +++ mockpp.css 7 Jan 2006 11:39:50 -0000 1.10 @@ -18,11 +18,12 @@ tt { color: #007000; } -.keysym { color: #707000; font-family: Courier, monospace; } -.methodname { color: #707000; } -.classname { color: #707000; } -.token { color: #707000; } -.function { color: #707000; } +.keysym { color: #707000; font-family: Courier, monospace; } +.methodname { color: #707000; } +.classname { color: #707000; } +.token { color: #707000; } +.function { color: #707000; } +.application { font-family: Courier, monospace; } .NAVHEADER { display: yes } .NAVFOOTER { display: yes } |
|
From: Ewald A. <ewa...@us...> - 2006-01-06 21:25:59
|
Update of /cvsroot/mockpp/mockpp/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27159/mockpp Added Files: mockpp_config-bcb5.h mockpp_config-msvc_71.h Log Message: new --- NEW FILE: mockpp_config-bcb5.h --- // #define's for Borland BCB5 // derived from automatically generated config.h. See Makefile.am. /* Generated: 2006-01-06 */ #pragma warn -8030 // temporary variables /* Define to use partial specialisation instead of meta programming. */ #define MOCKPP_COUNTED_WEAKNESS /* Define to turn debugging globally on. */ #undef DEBUG /* Version number of package */ #define MOCKPP_VERSION "1.11.1" /* Name of package */ #define MOCKPP_PACKAGE "mockpp" /* Define to use Boost.Test as framework. */ #undef MOCKPP_USE_BOOSTTEST /* Define to use CppUnit as framework. */ #undef MOCKPP_USE_CPPUNIT /* Define to 1 if you have the <cppunit/Message.h> header file. */ #undef HAVE_CPPUNIT_MESSAGE_H /* Define if you have CxxTest installed. */ #define MOCKPP_USE_CXXTEST /* Define to 1 if you have the <limits> header file. */ #define HAVE_LIMITS /* Define to compile for unicode environment. */ #undef MOCKPP_UNICODE /* Define if you have the cwchar header. */ #define HAVE_CWCHAR /* Define if you have the std::wstring type. */ #define HAVE_WSTRING /* Define if you have the wcscmp function. */ #define HAVE_WCSCMP /* Define if you have the std::wcscmp function. */ #define HAVE_STD_WCSCMP /* Define to supress compiler warnings about unused variables. */ #define MOCKPP_UNUSED(x) x; /* Define to enable built-in mini-stl. */ /* #undef MOCKPP_USE_MINI_STL */ /* #undef CXXTEST_USE_MINI_STL */ /* Define to disable runtime type information. */ /* #undef MOCKPP_NO_RTTI */ /* Define to disable exceptions. */ /* #undef MOCKPP_NO_EXCEPTIONS */ --- NEW FILE: mockpp_config-msvc_71.h --- // #define's for MS Visual C++ 7.1 and later (NOT 6.0/7.0) // derived from automatically generated config.h. See Makefile.am. /* Generated: 2006-01-06 */ /* Define to use sprintf_s instead of sprintf. */ #if _MSC_VER >= 1400 # define HAVE_SPRINTF_S #endif /* Define to turn debugging globally on. */ #undef DEBUG /* Version number of package */ #define MOCKPP_VERSION "1.11.1" /* Name of package */ #define MOCKPP_PACKAGE "mockpp" /* Define to use Boost.Test as framework. */ #undef MOCKPP_USE_BOOSTTEST /* Define to use CppUnit as framework. */ #undef MOCKPP_USE_CPPUNIT /* Define to 1 if you have the <cppunit/Message.h> header file. */ #undef HAVE_CPPUNIT_MESSAGE_H /* Define if you have CxxTest installed. */ #define MOCKPP_USE_CXXTEST /* Define to 1 if you have the <limits> header file. */ #define HAVE_LIMITS /* Define to compile for unicode environment. */ #undef MOCKPP_UNICODE /* Define if you have the cwchar header. */ #define HAVE_CWCHAR /* Define if you have the std::wstring type. */ #define HAVE_WSTRING /* Define if you have the wcscmp function. */ #define HAVE_WCSCMP /* Define if you have the std::wcscmp function. */ #define HAVE_STD_WCSCMP /* Define to supress compiler warnings about unused variables. */ #define MOCKPP_UNUSED(x) x; /* Define to enable built-in mini-stl. */ /* #undef MOCKPP_USE_MINI_STL */ /* #undef CXXTEST_USE_MINI_STL */ /* Define to disable runtime type information. */ /* #undef MOCKPP_NO_RTTI */ /* Define to disable exceptions. */ /* #undef MOCKPP_NO_EXCEPTIONS */ |
|
From: Ewald A. <ewa...@us...> - 2006-01-06 20:54:04
|
Update of /cvsroot/mockpp/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19191 Modified Files: ChangeLog mockpp.kdevelop Log Message: fix endless recursion Index: mockpp.kdevelop =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp.kdevelop,v retrieving revision 1.82 retrieving revision 1.83 diff -u -d -r1.82 -r1.83 --- mockpp.kdevelop 30 Nov 2005 21:47:31 -0000 1.82 +++ mockpp.kdevelop 6 Jan 2006 20:53:51 -0000 1.83 @@ -9,7 +9,7 @@ <ignoreparts/> <projectdirectory>.</projectdirectory> <absoluteprojectpath>false</absoluteprojectpath> - <description/> + <description></description> <secondaryLanguages> <language>Perl</language> <language>Bash</language> @@ -24,8 +24,8 @@ <useconfiguration>unicode</useconfiguration> </general> <run> - <mainprogram>mockpp/tests/mock_test</mainprogram> - <programargs/> + <mainprogram>mockpp/tests/jmock_test</mainprogram> + <programargs></programargs> <terminal>false</terminal> <envvars/> <directoryradio>executable</directoryradio> @@ -141,14 +141,14 @@ <kdevdebugger> <general> <dbgshell>libtool</dbgshell> - <programargs/> - <gdbpath/> + <programargs></programargs> + <gdbpath></gdbpath> <breakonloadinglibs>true</breakonloadinglibs> <separatetty>false</separatetty> <floatingtoolbar>true</floatingtoolbar> - <configGdbScript/> - <runShellScript/> - <runGdbScript/> + <configGdbScript></configGdbScript> + <runShellScript></runShellScript> + <runGdbScript></runGdbScript> </general> <display> <staticmembers>true</staticmembers> @@ -242,7 +242,7 @@ <headerCompletionDelay>250</headerCompletionDelay> </codecompletion> <creategettersetter> - <prefixGet/> + <prefixGet></prefixGet> <prefixSet>set</prefixSet> <prefixVariable>m_,_</prefixVariable> <parameterName>theValue</parameterName> Index: ChangeLog =================================================================== RCS file: /cvsroot/mockpp/mockpp/ChangeLog,v retrieving revision 1.91 retrieving revision 1.92 diff -u -d -r1.91 -r1.92 --- ChangeLog 1 Jan 2006 19:40:35 -0000 1.91 +++ ChangeLog 6 Jan 2006 20:53:51 -0000 1.92 @@ -5,12 +5,13 @@ 2006-01-01 1.11.1 - - add all directories in doxy file - - update handbook, apidoc + - add all directories to doxy file + - update/fix 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 + - add support for Boost.Test and optionally use it as framework for the + internal unit tests + - fix endless recursion when resetting chainable objects. 2005-11-29 1.11.0-beta1 |
|
From: Ewald A. <ewa...@us...> - 2006-01-06 20:54:03
|
Update of /cvsroot/mockpp/mockpp/mockpp/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19191/mockpp/tests Modified Files: ChainableMockMethod_1_test.cpp ChainableMockObject_1_test.cpp ChainingMockBuilder_test.cpp Log Message: fix endless recursion Index: ChainingMockBuilder_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainingMockBuilder_test.cpp,v retrieving revision 1.29 retrieving revision 1.30 diff -u -d -r1.29 -r1.30 --- ChainingMockBuilder_test.cpp 1 Jan 2006 16:34:47 -0000 1.29 +++ ChainingMockBuilder_test.cpp 6 Jan 2006 20:53:51 -0000 1.30 @@ -208,7 +208,7 @@ MyBuilderNamespace bns; ChainingMockDummy<int, Getter5Invocation> cmd; - mockpp::ChainingMockBuilder<ArgMatchBuilder> cm ( &cmd, &bns, MOCKPP_PCHAR( "ChainingMockBuilder??" ), 0 ); + mockpp::ChainingMockBuilder<ArgMatchBuilder> cm ( &cmd, &bns, MOCKPP_PCHAR( "ChainingMockBuilder??" )); cmd.verified = false; cm.verify(); @@ -233,7 +233,7 @@ MyBuilderNamespace bns; ChainingMockDummy<int, Getter5Invocation> cmd; - mockpp::ChainingMockBuilder<ArgMatchBuilder> cm ( &cmd, &bns, MOCKPP_PCHAR( "ChainingMockBuilder??" ), 0 ); + mockpp::ChainingMockBuilder<ArgMatchBuilder> cm ( &cmd, &bns, MOCKPP_PCHAR( "ChainingMockBuilder??" )); InvokableDummy<int, Getter5Invocation> *id = new InvokableDummy<int, Getter5Invocation>; @@ -272,7 +272,7 @@ MyBuilderNamespace bns; ChainingMockDummy<int, Getter5Invocation> cmd; - mockpp::ChainingMockBuilder<ArgMatchBuilder> cm ( &cmd, &bns, MOCKPP_PCHAR( "ChainingMockBuilder??" ), 0 ); + mockpp::ChainingMockBuilder<ArgMatchBuilder> cm ( &cmd, &bns, MOCKPP_PCHAR( "ChainingMockBuilder??" )); MyMatchBuilder<void, int> mbd1; MyMatchBuilder<void, int> mbd2; Index: ChainableMockObject_1_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_1_test.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- ChainableMockObject_1_test.cpp 1 Jan 2006 16:34:47 -0000 1.20 +++ ChainableMockObject_1_test.cpp 6 Jan 2006 20:53:51 -0000 1.21 @@ -40,6 +40,8 @@ #include <mockpp/constraint/OutBound.h> +namespace { + class ChainableMockObject_1_test MOCKPP_DERIVE_PUBLIC_UNITFRAMEWORK { @@ -54,7 +56,8 @@ CPPUNIT_TEST_SUITE( ChainableMockObject_1_test ); CPPUNIT_TEST(test_outbound); - CPPUNIT_TEST( test_parameter_1 ); + CPPUNIT_TEST(test_parameter_1); + CPPUNIT_TEST(test_resolver); CPPUNIT_TEST_SUITE_END(); @@ -64,6 +67,7 @@ MOCKPP_TESTMETHOD_DECL void test_outbound(); MOCKPP_TESTMETHOD_DECL void test_parameter_1(); + MOCKPP_TESTMETHOD_DECL void test_resolver(); }; @@ -72,11 +76,13 @@ MOCKPP_CXXTEST_SUITE_REGISTRATION( ChainableMockObject_1_test ); MOCKPP_CXXTEST(ChainableMockObject_1_test, test_outbound); MOCKPP_CXXTEST(ChainableMockObject_1_test, test_parameter_1 ); +MOCKPP_CXXTEST(ChainableMockObject_1_test, test_resolver); #elif defined(MOCKPP_USE_BOOSTTEST) MOCKPP_BOOST_TEST(ChainableMockObject_1_test::test_outbound); -MOCKPP_BOOST_TEST(ChainableMockObject_1_test:: test_parameter_1 ); +MOCKPP_BOOST_TEST(ChainableMockObject_1_test::test_parameter_1 ); +MOCKPP_BOOST_TEST(ChainableMockObject_1_test::test_resolver); #elif defined(MOCKPP_USE_CPPUNIT) @@ -171,4 +177,31 @@ } +class MockUnitResolver : public mockpp::ChainableMockObject +{ + +public: + + MockUnitResolver() + : mockpp::ChainableMockObject( MOCKPP_PCHAR("MockUnitResolver"), 0 ) + , MOCKPP_CONSTRUCT_MEMBERS_FOR_CHAINABLE_EXT1( Find, _ ) + {} + + MOCKPP_CONST_CHAINABLE_EXT1( MockUnitResolver, int*, Find, const mockpp::String&, + int*, _ , mockpp::String ); +}; + + +void ChainableMockObject_1_test::test_resolver() +{ + MockUnitResolver resolver; + MOCKPP_CHAINER_FOR_EXT( MockUnitResolver, Find, _) resolverChainer( &resolver ); + resolverChainer.stubs( mockpp::once() ).will( new mockpp::ReturnStub< int* >( 0 ) ); + resolverChainer.reset(); + resolver.reset(); +} + + +} + Index: ChainableMockMethod_1_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockMethod_1_test.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- ChainableMockMethod_1_test.cpp 1 Jan 2006 16:34:47 -0000 1.19 +++ ChainableMockMethod_1_test.cpp 6 Jan 2006 20:53:51 -0000 1.20 @@ -87,8 +87,8 @@ #elif defined(MOCKPP_USE_BOOSTTEST) -MOCKPP_BOOST_TEST(ChainableMockMethod_1_test:: test_parameter_1 ); -MOCKPP_BOOST_TEST(ChainableMockMethod_1_test:: test_parameter_1v ); +MOCKPP_BOOST_TEST(ChainableMockMethod_1_test::test_parameter_1 ); +MOCKPP_BOOST_TEST(ChainableMockMethod_1_test::test_parameter_1v ); #elif defined(MOCKPP_USE_CPPUNIT) @@ -191,6 +191,8 @@ #endif mcm.verify(); + mcm.reset(); +// chain.reset(); } |
|
From: Ewald A. <ewa...@us...> - 2006-01-06 20:54:03
|
Update of /cvsroot/mockpp/mockpp/mockpp/chaining In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19191/mockpp/chaining Modified Files: ChainableMockMethod0.h ChainableMockMethod1.h ChainableMockMethod2.h ChainableMockMethod3.h ChainableMockMethod4.h ChainableMockMethod5.h ChainableMockMethod6.h ChainableMockObject_macro.h ChainingMockBuilder.h gen_chainablemethod_N.pl Log Message: fix endless recursion Index: ChainingMockBuilder.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/ChainingMockBuilder.h,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- ChainingMockBuilder.h 29 Dec 2005 19:29:50 -0000 1.27 +++ ChainingMockBuilder.h 6 Jan 2006 20:53:51 -0000 1.28 @@ -65,8 +65,8 @@ ChainingMockBuilder( DynamicChainingMock<R, I> *in_coreMock, BuilderNamespace *in_buildernamespace, - const String &name, VerifiableList *parent = 0 ) - : DynamicChainingMock<R, I>(name, parent) + const String &name /*, VerifiableList *parent = 0*/ ) + : DynamicChainingMock<R, I>(name /*, parent*/) , coreMock( in_coreMock ) , buildernamespace(in_buildernamespace) {} Index: ChainableMockObject_macro.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/ChainableMockObject_macro.h,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- ChainableMockObject_macro.h 29 Dec 2005 19:29:50 -0000 1.15 +++ ChainableMockObject_macro.h 6 Jan 2006 20:53:51 -0000 1.16 @@ -54,7 +54,7 @@ public: \ \ ChainerFor ## methname(classname *cls) \ - : mockpp::ChainingMockBuilder<mockpp::ArgumentsMatchBuilder ## ArgCount< ReturnType, InvocationType > >(&cls->methname ## CoreMock, cls, MOCKPP_PCHAR("ChainerFor") MOCKPP_PCHAR(# methname), cls) \ + : mockpp::ChainingMockBuilder<mockpp::ArgumentsMatchBuilder ## ArgCount< ReturnType, InvocationType > >(&cls->methname ## CoreMock, cls, MOCKPP_PCHAR("ChainerFor") MOCKPP_PCHAR(# methname)) \ { \ } \ \ Index: gen_chainablemethod_N.pl =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/gen_chainablemethod_N.pl,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- gen_chainablemethod_N.pl 29 Dec 2005 19:29:50 -0000 1.9 +++ gen_chainablemethod_N.pl 6 Jan 2006 20:53:51 -0000 1.10 @@ -54,7 +54,7 @@ #include <mockpp/mockpp.h> -#include <mockpp/ChainableMockObject.h> +#include <mockpp/chaining/ChainableMockObject.h> #include <mockpp/chaining/ChainableMockMethod.h> |
|
From: Ewald A. <ewa...@us...> - 2006-01-06 17:06:46
|
Update of /cvsroot/mockpp/mockpp/msvc2005/mockpp/examples/tutorial In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16785/msvc2005/mockpp/examples/tutorial Modified Files: Makefile.am Log Message: new files Index: Makefile.am =================================================================== RCS file: /cvsroot/mockpp/mockpp/msvc2005/mockpp/examples/tutorial/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Makefile.am 29 Dec 2005 08:04:41 -0000 1.2 +++ Makefile.am 6 Jan 2006 17:06:23 -0000 1.3 @@ -3,7 +3,9 @@ EXTRA_DIST = \ basicmock.vcproj \ visitmock.vcproj \ + visitmock2.vcproj \ chainmock.vcproj \ + chainmock2.vcproj \ poormock.vcproj \ poormock_se.vcproj \ cppunit.vcproj |
|
From: Ewald A. <ewa...@us...> - 2006-01-06 17:06:46
|
Update of /cvsroot/mockpp/mockpp/msvc71/mockpp/examples/tutorial In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16706/msvc71/mockpp/examples/tutorial Modified Files: Makefile.am Added Files: chainmock2.vcproj visitmock2.vcproj Log Message: new files --- NEW FILE: visitmock2.vcproj --- <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" Version="7.10" Name="visitmock2" SccProjectName="" SccLocalPath=""> <Platforms> <Platform Name="Win32"/> </Platforms> <Configurations> <Configuration Name="Debug|Win32" OutputDirectory="C:\tmp\compile\mockpp\examples\tutorial\Debug" IntermediateDirectory="C:\tmp\compile\mockpp\examples\tutorial\Debug" ConfigurationType="1" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" CharacterSet="2"> <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="../../../.." PreprocessorDefinitions="WIN32,_CONSOLE" BasicRuntimeChecks="3" RuntimeLibrary="3" RuntimeTypeInfo="TRUE" PrecompiledHeaderFile="C:\tmp\compile\mockpp\examples\tutorial\Debug/visitmock2.pch" AssemblerListingLocation="C:\tmp\compile\mockpp\examples\tutorial\Debug/" ObjectFile="C:\tmp\compile\mockpp\examples\tutorial\Debug/" ProgramDataBaseFileName="C:\tmp\compile\mockpp\examples\tutorial\Debug/" WarningLevel="4" SuppressStartupBanner="TRUE" DebugInformationFormat="4" CompileAs="0"/> <Tool Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" AdditionalDependencies="mockppd.lib" OutputFile="C:\tmp\compile\mockpp\examples\tutorial\Debug/visitmock2.exe" LinkIncremental="2" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="../../../lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="C:\tmp\compile\mockpp\examples\tutorial\Debug/visitmock2.pdb" SubSystem="1" TargetMachine="1"/> <Tool Name="VCMIDLTool" TypeLibraryName="C:\tmp\compile\mockpp\examples\tutorial\Debug/visitmock2.tlb" HeaderFileName=""/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPreLinkEventTool"/> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG,_DEBUG" Culture="1041"/> <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool Name="VCXMLDataGeneratorTool"/> <Tool Name="VCWebDeploymentTool"/> <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> </Configuration> <Configuration Name="Release|Win32" OutputDirectory="C:\tmp\compile\mockpp\examples\tutorial\Release" IntermediateDirectory="C:\tmp\compile\mockpp\examples\tutorial\Release" ConfigurationType="1" ATLMinimizesCRunTimeLibraryUsage="FALSE"> <Tool Name="VCCLCompilerTool" Optimization="4" AdditionalIncludeDirectories="../../../.." PreprocessorDefinitions="NDEBUG,WIN32,_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" RuntimeTypeInfo="TRUE" PrecompiledHeaderFile="./visitmock2.pch" AssemblerListingLocation="C:\tmp\compile\mockpp\examples\tutorial\Release/" ObjectFile="C:\tmp\compile\mockpp\examples\tutorial\Release/" ProgramDataBaseFileName="C:\tmp\compile\mockpp\examples\tutorial\Release/" WarningLevel="4"/> <Tool Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" AdditionalDependencies="mockpp.lib" OutputFile="C:\tmp\compile\mockpp\examples\tutorial\Release/visitmock2.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="../../../lib" ProgramDatabaseFile="./visitmock2.pdb"/> <Tool Name="VCMIDLTool" TypeLibraryName="./visitmock2.tlb" HeaderFileName=""/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPreLinkEventTool"/> <Tool Name="VCResourceCompilerTool" Culture="1036"/> <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool Name="VCXMLDataGeneratorTool"/> <Tool Name="VCWebDeploymentTool"/> <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> </Configuration> </Configurations> <References> </References> <Files> <Filter Name="Source Files" Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"> <File RelativePath="..\..\..\..\mockpp\examples\tutorial\consumer.cpp"> </File> <File RelativePath="..\..\..\..\mockpp\examples\tutorial\visitmock2.cpp"> <FileConfiguration Name="Debug|Win32"> <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3"/> </FileConfiguration> </File> </Filter> <Filter Name="Header Files" Filter=""> <File RelativePath="..\..\..\..\mockpp\examples\tutorial\consumer.h"> </File> <File RelativePath="..\..\..\..\mockpp\examples\tutorial\interface.h"> </File> </Filter> </Files> <Globals> </Globals> </VisualStudioProject> Index: Makefile.am =================================================================== RCS file: /cvsroot/mockpp/mockpp/msvc71/mockpp/examples/tutorial/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Makefile.am 9 Apr 2005 20:15:19 -0000 1.2 +++ Makefile.am 6 Jan 2006 17:06:04 -0000 1.3 @@ -1,6 +1,14 @@ all: -EXTRA_DIST = basicmock.vcproj visitmock.vcproj chainmock.vcproj poormock.vcproj poormock_se.vcproj cppunit.vcproj +EXTRA_DIST = \ + basicmock.vcproj \ + visitmock.vcproj \ + visitmock2.vcproj \ + chainmock.vcproj \ + chainmock2.vcproj \ + poormock.vcproj \ + poormock_se.vcproj \ + cppunit.vcproj CLEAN_FILES = *.plg *.opt *.ncb *.dep *.~* *.~~* *~ *SD*.EA --- NEW FILE: chainmock2.vcproj --- <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" Version="7.10" Name="chainmock2" SccProjectName="" SccLocalPath=""> <Platforms> <Platform Name="Win32"/> </Platforms> <Configurations> <Configuration Name="Debug|Win32" OutputDirectory="C:\tmp\compile\mockpp\examples\tutorial\Debug" IntermediateDirectory="C:\tmp\compile\mockpp\examples\tutorial\Debug" ConfigurationType="1" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" CharacterSet="2"> <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="../../../.." PreprocessorDefinitions="WIN32,_CONSOLE" BasicRuntimeChecks="3" RuntimeLibrary="3" RuntimeTypeInfo="TRUE" PrecompiledHeaderFile="C:\tmp\compile\mockpp\examples\tutorial\Debug/chainmock2.pch" AssemblerListingLocation="C:\tmp\compile\mockpp\examples\tutorial\Debug/" ObjectFile="C:\tmp\compile\mockpp\examples\tutorial\Debug/" ProgramDataBaseFileName="C:\tmp\compile\mockpp\examples\tutorial\Debug/" WarningLevel="4" SuppressStartupBanner="TRUE" DebugInformationFormat="4" CompileAs="0"/> <Tool Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" AdditionalDependencies="mockppd.lib" OutputFile="C:\tmp\compile\mockpp\examples\tutorial\Debug/chainmock2.exe" LinkIncremental="2" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="../../../lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="C:\tmp\compile\mockpp\examples\tutorial\Debug/chainmock2.pdb" SubSystem="1" TargetMachine="1"/> <Tool Name="VCMIDLTool" TypeLibraryName="C:\tmp\compile\mockpp\examples\tutorial\Debug/chainmock2.tlb" HeaderFileName=""/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPreLinkEventTool"/> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG,_DEBUG" Culture="1041"/> <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool Name="VCXMLDataGeneratorTool"/> <Tool Name="VCWebDeploymentTool"/> <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> </Configuration> <Configuration Name="Release|Win32" OutputDirectory="C:\tmp\compile\mockpp\examples\tutorial\Release" IntermediateDirectory="C:\tmp\compile\mockpp\examples\tutorial\Release" ConfigurationType="1" ATLMinimizesCRunTimeLibraryUsage="FALSE"> <Tool Name="VCCLCompilerTool" Optimization="4" AdditionalIncludeDirectories="../../../.." PreprocessorDefinitions="NDEBUG,WIN32,_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" RuntimeTypeInfo="TRUE" PrecompiledHeaderFile="./chainmock2.pch" AssemblerListingLocation="C:\tmp\compile\mockpp\examples\tutorial\Release/" ObjectFile="C:\tmp\compile\mockpp\examples\tutorial\Release/" ProgramDataBaseFileName="C:\tmp\compile\mockpp\examples\tutorial\Release/" WarningLevel="4"/> <Tool Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" AdditionalDependencies="mockpp.lib" OutputFile="C:\tmp\compile\mockpp\examples\tutorial\Release/chainmock2.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="../../../lib" ProgramDatabaseFile="./chainmock2.pdb"/> <Tool Name="VCMIDLTool" TypeLibraryName="./chainmock2.tlb" HeaderFileName=""/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPreLinkEventTool"/> <Tool Name="VCResourceCompilerTool" Culture="1036"/> <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool Name="VCXMLDataGeneratorTool"/> <Tool Name="VCWebDeploymentTool"/> <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> </Configuration> </Configurations> <References> </References> <Files> <Filter Name="Source Files" Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"> <File RelativePath="..\..\..\..\mockpp\examples\tutorial\chainmock2.cpp"> <FileConfiguration Name="Debug|Win32"> <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3"/> </FileConfiguration> </File> <File RelativePath="..\..\..\..\mockpp\examples\tutorial\consumer.cpp"> </File> </Filter> <Filter Name="Header Files" Filter="h;hpp;hxx;hm;inl"> <File RelativePath="..\..\..\..\mockpp\examples\tutorial\consumer.h"> </File> <File RelativePath="..\..\..\..\mockpp\examples\tutorial\interface.h"> </File> </Filter> </Files> <Globals> </Globals> </VisualStudioProject> |
|
From: Ewald A. <ewa...@us...> - 2006-01-06 16:03:07
|
Update of /cvsroot/mockpp/mockpp/msvc2005/mockpp/examples/tutorial In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31436/msvc2005/mockpp/examples/tutorial Added Files: chainmock2.vcproj visitmock2.vcproj Log Message: ew --- NEW FILE: visitmock2.vcproj --- <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" Version="8,00" Name="visitmock2" ProjectGUID="{C5CF5EDD-DCFA-4793-A348-CF1DEECE3702}" > <Platforms> <Platform Name="Win32" /> </Platforms> <ToolFiles> </ToolFiles> <Configurations> <Configuration Name="Debug|Win32" OutputDirectory="$(TEMP)\compile\mockpp\examples\tutorial\Debug" IntermediateDirectory="$(TEMP)\compile\mockpp\examples\tutorial\Debug" ConfigurationType="1" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="2" > <Tool Name="VCPreBuildEventTool" /> <Tool Name="VCCustomBuildTool" /> <Tool Name="VCXMLDataGeneratorTool" /> <Tool Name="VCWebServiceProxyGeneratorTool" /> <Tool Name="VCMIDLTool" TypeLibraryName="$(TEMP)\compile\mockpp\examples\tutorial\Debug/visitmock2.tlb" HeaderFileName="" /> <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\..;..\..\..\../3party;..\..\..\..\3party\cxxtest" PreprocessorDefinitions="WIN32,_CONSOLE" BasicRuntimeChecks="3" RuntimeLibrary="3" RuntimeTypeInfo="true" PrecompiledHeaderFile="$(TEMP)\compile\mockpp\examples\tutorial\Debug/visitmock2.pch" AssemblerListingLocation="$(TEMP)\compile\mockpp\examples\tutorial\Debug/" ObjectFile="$(TEMP)\compile\mockpp\examples\tutorial\Debug/" ProgramDataBaseFileName="$(TEMP)\compile\mockpp\examples\tutorial\Debug/" WarningLevel="4" SuppressStartupBanner="true" DebugInformationFormat="4" CompileAs="0" /> <Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG,_DEBUG" Culture="1041" /> <Tool Name="VCPreLinkEventTool" /> <Tool Name="VCLinkerTool" AdditionalDependencies="mockpp.lib" OutputFile="$(TEMP)\compile\mockpp\examples\tutorial\Debug/visitmock2.exe" LinkIncremental="2" SuppressStartupBanner="true" AdditionalLibraryDirectories="../../../lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(TEMP)\compile\mockpp\examples\tutorial\Debug/visitmock2.pdb" SubSystem="1" TargetMachine="1" /> <Tool Name="VCALinkTool" /> <Tool Name="VCManifestTool" /> <Tool Name="VCXDCMakeTool" /> <Tool Name="VCBscMakeTool" /> <Tool Name="VCFxCopTool" /> <Tool Name="VCAppVerifierTool" /> <Tool Name="VCWebDeploymentTool" /> <Tool Name="VCPostBuildEventTool" /> </Configuration> <Configuration Name="Release|Win32" OutputDirectory="$(TEMP)\compile\mockpp\examples\tutorial\Release" IntermediateDirectory="$(TEMP)\compile\mockpp\examples\tutorial\Release" ConfigurationType="1" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" ATLMinimizesCRunTimeLibraryUsage="false" > <Tool Name="VCPreBuildEventTool" /> <Tool Name="VCCustomBuildTool" /> <Tool Name="VCXMLDataGeneratorTool" /> <Tool Name="VCWebServiceProxyGeneratorTool" /> <Tool Name="VCMIDLTool" TypeLibraryName="./visitmock2.tlb" HeaderFileName="" /> <Tool Name="VCCLCompilerTool" Optimization="4" AdditionalIncludeDirectories="../../../.." PreprocessorDefinitions="NDEBUG,WIN32,_CONSOLE" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" RuntimeTypeInfo="true" PrecompiledHeaderFile="./visitmock2.pch" AssemblerListingLocation="$(TEMP)\compile\mockpp\examples\tutorial\Release/" ObjectFile="$(TEMP)\compile\mockpp\examples\tutorial\Release/" ProgramDataBaseFileName="$(TEMP)\compile\mockpp\examples\tutorial\Release/" WarningLevel="4" /> <Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCResourceCompilerTool" Culture="1036" /> <Tool Name="VCPreLinkEventTool" /> <Tool Name="VCLinkerTool" AdditionalDependencies="mockpp.lib" OutputFile="$(TEMP)\compile\mockpp\examples\tutorial\Release/visitmock2.exe" LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories="../../../lib" ProgramDatabaseFile="./visitmock2.pdb" /> <Tool Name="VCALinkTool" /> <Tool Name="VCManifestTool" /> <Tool Name="VCXDCMakeTool" /> <Tool Name="VCBscMakeTool" /> <Tool Name="VCFxCopTool" /> <Tool Name="VCAppVerifierTool" /> <Tool Name="VCWebDeploymentTool" /> <Tool Name="VCPostBuildEventTool" /> </Configuration> </Configurations> <References> </References> <Files> <Filter Name="Source Files" Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" > <File RelativePath="..\..\..\..\mockpp\examples\tutorial\consumer.cpp" > </File> <File RelativePath="..\..\..\..\mockpp\examples\tutorial\visitmock2.cpp" > <FileConfiguration Name="Debug|Win32" > <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> </FileConfiguration> </File> </Filter> <Filter Name="Header Files" > <File RelativePath="..\..\..\..\mockpp\examples\tutorial\consumer.h" > </File> <File RelativePath="..\..\..\..\mockpp\examples\tutorial\interface.h" > </File> </Filter> </Files> <Globals> </Globals> </VisualStudioProject> --- NEW FILE: chainmock2.vcproj --- <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" Version="8,00" Name="chainmock2" ProjectGUID="{D8749C05-4004-42BC-B42D-24BD6F83A86E}" > <Platforms> <Platform Name="Win32" /> </Platforms> <ToolFiles> </ToolFiles> <Configurations> <Configuration Name="Debug|Win32" OutputDirectory="$(TEMP)\compile\mockpp\examples\tutorial\Debug" IntermediateDirectory="$(TEMP)\compile\mockpp\examples\tutorial\Debug" ConfigurationType="1" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="2" > <Tool Name="VCPreBuildEventTool" /> <Tool Name="VCCustomBuildTool" /> <Tool Name="VCXMLDataGeneratorTool" /> <Tool Name="VCWebServiceProxyGeneratorTool" /> <Tool Name="VCMIDLTool" TypeLibraryName="$(TEMP)\compile\mockpp\examples\tutorial\Debug/chainmock2.tlb" HeaderFileName="" /> <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\..;..\..\..\../3party;..\..\..\..\3party\cxxtest" PreprocessorDefinitions="WIN32,_CONSOLE" BasicRuntimeChecks="3" RuntimeLibrary="3" RuntimeTypeInfo="true" PrecompiledHeaderFile="$(TEMP)\compile\mockpp\examples\tutorial\Debug/chainmock2.pch" AssemblerListingLocation="$(TEMP)\compile\mockpp\examples\tutorial\Debug/" ObjectFile="$(TEMP)\compile\mockpp\examples\tutorial\Debug/" ProgramDataBaseFileName="$(TEMP)\compile\mockpp\examples\tutorial\Debug/" WarningLevel="4" SuppressStartupBanner="true" DebugInformationFormat="4" CompileAs="0" /> <Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG,_DEBUG" Culture="1041" /> <Tool Name="VCPreLinkEventTool" /> <Tool Name="VCLinkerTool" AdditionalDependencies="mockpp.lib" OutputFile="$(TEMP)\compile\mockpp\examples\tutorial\Debug/chainmock2.exe" LinkIncremental="2" SuppressStartupBanner="true" AdditionalLibraryDirectories="../../../lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(TEMP)\compile\mockpp\examples\tutorial\Debug/chainmock2.pdb" SubSystem="1" TargetMachine="1" /> <Tool Name="VCALinkTool" /> <Tool Name="VCManifestTool" /> <Tool Name="VCXDCMakeTool" /> <Tool Name="VCBscMakeTool" /> <Tool Name="VCFxCopTool" /> <Tool Name="VCAppVerifierTool" /> <Tool Name="VCWebDeploymentTool" /> <Tool Name="VCPostBuildEventTool" /> </Configuration> <Configuration Name="Release|Win32" OutputDirectory="$(TEMP)\compile\mockpp\examples\tutorial\Release" IntermediateDirectory="$(TEMP)\compile\mockpp\examples\tutorial\Release" ConfigurationType="1" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" ATLMinimizesCRunTimeLibraryUsage="false" > <Tool Name="VCPreBuildEventTool" /> <Tool Name="VCCustomBuildTool" /> <Tool Name="VCXMLDataGeneratorTool" /> <Tool Name="VCWebServiceProxyGeneratorTool" /> <Tool Name="VCMIDLTool" TypeLibraryName="./chainmock2.tlb" HeaderFileName="" /> <Tool Name="VCCLCompilerTool" Optimization="4" AdditionalIncludeDirectories="../../../.." PreprocessorDefinitions="NDEBUG,WIN32,_CONSOLE" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" RuntimeTypeInfo="true" PrecompiledHeaderFile="./chainmock2.pch" AssemblerListingLocation="$(TEMP)\compile\mockpp\examples\tutorial\Release/" ObjectFile="$(TEMP)\compile\mockpp\examples\tutorial\Release/" ProgramDataBaseFileName="$(TEMP)\compile\mockpp\examples\tutorial\Release/" WarningLevel="4" /> <Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCResourceCompilerTool" Culture="1036" /> <Tool Name="VCPreLinkEventTool" /> <Tool Name="VCLinkerTool" AdditionalDependencies="mockpp.lib" OutputFile="$(TEMP)\compile\mockpp\examples\tutorial\Release/chainmock2.exe" LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories="../../../lib" ProgramDatabaseFile="./chainmock2.pdb" /> <Tool Name="VCALinkTool" /> <Tool Name="VCManifestTool" /> <Tool Name="VCXDCMakeTool" /> <Tool Name="VCBscMakeTool" /> <Tool Name="VCFxCopTool" /> <Tool Name="VCAppVerifierTool" /> <Tool Name="VCWebDeploymentTool" /> <Tool Name="VCPostBuildEventTool" /> </Configuration> </Configurations> <References> </References> <Files> <Filter Name="Source Files" Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" > <File RelativePath="..\..\..\..\mockpp\examples\tutorial\chainmock2.cpp" > <FileConfiguration Name="Debug|Win32" > <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" /> </FileConfiguration> </File> <File RelativePath="..\..\..\..\mockpp\examples\tutorial\consumer.cpp" > </File> </Filter> <Filter Name="Header Files" Filter="h;hpp;hxx;hm;inl" > <File RelativePath="..\..\..\..\mockpp\examples\tutorial\consumer.h" > </File> <File RelativePath="..\..\..\..\mockpp\examples\tutorial\interface.h" > </File> </Filter> </Files> <Globals> </Globals> </VisualStudioProject> |
|
From: Ewald A. <ewa...@us...> - 2006-01-06 16:02:42
|
Update of /cvsroot/mockpp/mockpp/mockpp/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31235/mockpp/tests Modified Files: Formatter_test.cpp Log Message: fixes msvc2005 Index: Formatter_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/Formatter_test.cpp,v retrieving revision 1.39 retrieving revision 1.40 diff -u -d -r1.39 -r1.40 --- Formatter_test.cpp 1 Jan 2006 16:34:47 -0000 1.39 +++ Formatter_test.cpp 6 Jan 2006 16:02:34 -0000 1.40 @@ -360,7 +360,7 @@ mockpp::String str = mockpp::number(ul); // base 10 char buff[100]; #ifdef HAVE_SPRINTF_S - sprintf_s(buff, "%ld", ul ); + sprintf_s(buff, "%lu", ul ); #else std::sprintf(buff, "%lu", ul ); #endif |
|
From: Ewald A. <ewa...@us...> - 2006-01-06 16:02:42
|
Update of /cvsroot/mockpp/mockpp/msvc2005/mockpp/examples In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31235/msvc2005/mockpp/examples Modified Files: examples.vcproj Log Message: fixes msvc2005 Index: examples.vcproj =================================================================== RCS file: /cvsroot/mockpp/mockpp/msvc2005/mockpp/examples/examples.vcproj,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- examples.vcproj 28 Dec 2005 19:43:09 -0000 1.3 +++ examples.vcproj 6 Jan 2006 16:02:34 -0000 1.4 @@ -71,7 +71,7 @@ <Tool Name="VCLinkerTool" AdditionalDependencies="mockpp.lib mockpp_cxxtest.lib" - OutputFile="$(TEMP)\compile\mockpp\examples\Debug/examples.exe" + OutputFile="$(TEMP)\compile\mockpp\examples\Debug/mock_greeter.exe" LinkIncremental="2" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib;"$(CPPUNIT_ROOT)/lib"" |
|
From: Ewald A. <ewa...@us...> - 2006-01-06 16:02:42
|
Update of /cvsroot/mockpp/mockpp/msvc2005/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31235/msvc2005/mockpp Modified Files: mockpp.sln Log Message: fixes msvc2005 Index: mockpp.sln =================================================================== RCS file: /cvsroot/mockpp/mockpp/msvc2005/mockpp/mockpp.sln,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- mockpp.sln 14 Dec 2005 17:23:24 -0000 1.3 +++ mockpp.sln 6 Jan 2006 16:02:34 -0000 1.4 @@ -46,6 +46,10 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mock_test_win32", "tests\mock_test_win32.vcproj", "{1C69D31D-8356-406B-85B3-84F892000D53}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "visitmock2", "examples\tutorial\visitmock2.vcproj", "{C5CF5EDD-DCFA-4793-A348-CF1DEECE3702}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "chainmock2", "examples\tutorial\chainmock2.vcproj", "{D8749C05-4004-42BC-B42D-24BD6F83A86E}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -100,6 +104,14 @@ {1C69D31D-8356-406B-85B3-84F892000D53}.Debug|Win32.Build.0 = Debug|Win32 {1C69D31D-8356-406B-85B3-84F892000D53}.Release|Win32.ActiveCfg = Release|Win32 {1C69D31D-8356-406B-85B3-84F892000D53}.Release|Win32.Build.0 = Release|Win32 + {C5CF5EDD-DCFA-4793-A348-CF1DEECE3702}.Debug|Win32.ActiveCfg = Debug|Win32 + {C5CF5EDD-DCFA-4793-A348-CF1DEECE3702}.Debug|Win32.Build.0 = Debug|Win32 + {C5CF5EDD-DCFA-4793-A348-CF1DEECE3702}.Release|Win32.ActiveCfg = Release|Win32 + {C5CF5EDD-DCFA-4793-A348-CF1DEECE3702}.Release|Win32.Build.0 = Release|Win32 + {D8749C05-4004-42BC-B42D-24BD6F83A86E}.Debug|Win32.ActiveCfg = Debug|Win32 + {D8749C05-4004-42BC-B42D-24BD6F83A86E}.Debug|Win32.Build.0 = Debug|Win32 + {D8749C05-4004-42BC-B42D-24BD6F83A86E}.Release|Win32.ActiveCfg = Release|Win32 + {D8749C05-4004-42BC-B42D-24BD6F83A86E}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE |
|
From: Ewald A. <ewa...@us...> - 2006-01-06 12:18:28
|
Update of /cvsroot/mockpp/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13005 Modified Files: mockpp.doxygen.in Log Message: update docs Index: mockpp.doxygen.in =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp.doxygen.in,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- mockpp.doxygen.in 5 Jan 2006 19:13:55 -0000 1.22 +++ mockpp.doxygen.in 6 Jan 2006 12:17:34 -0000 1.23 @@ -1003,7 +1003,8 @@ # instead of the = operator. PREDEFINED = \ - DOXYGEN \ + DOXYGEN_SHOULD_INCLUDE_THIS \ + DOXYGEN_SHOULD_SKIP_THIS \ MOCKPP_USE_INVOCATION_EQUALS \ MOCKPP_USE_CXXTEST \ MOCKPP_USE_CPPUNIT \ @@ -1011,7 +1012,6 @@ HAVE_ICONV_H \ HAVE_LIMITS \ MOCKPP_BOUNDARY_DELTA \ - DOXYGEN_SHOULD_SKIP_THIS \ "MOCKPP_MEMBER_RESTRICTOR_PROTECTED = protected " \ "MOCKPP_PRE(a) = /*! \pre a */" \ "MOCKPP_PRE_MSG(a,b) = /*! \pre a \code b \endcode */" \ |
|
From: Ewald A. <ewa...@us...> - 2006-01-06 12:18:28
|
Update of /cvsroot/mockpp/mockpp/mockpp/framework In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13005/mockpp/framework Modified Files: SelectUnittestFramework.h Log Message: update docs Index: SelectUnittestFramework.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/framework/SelectUnittestFramework.h,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- SelectUnittestFramework.h 5 Jan 2006 19:13:55 -0000 1.12 +++ SelectUnittestFramework.h 6 Jan 2006 12:17:35 -0000 1.13 @@ -51,7 +51,7 @@ * functions. So this macro is used to declare the methods accordingly. */ -#ifdef DOXYGEN // make doxygen happily include docs +#ifdef DOXYGEN_SHOULD_INCLUDE_THIS // make doxygen happily include docs #define MOCKPP_USE_CXXTEST #define MOCKPP_USE_CPPUNIT #define MOCKPP_USE_BOOSTTEST |
|
From: Ewald A. <ewa...@us...> - 2006-01-06 12:18:28
|
Update of /cvsroot/mockpp/mockpp/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13005/mockpp Modified Files: mockpp.h Log Message: update docs Index: mockpp.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/mockpp.h,v retrieving revision 1.73 retrieving revision 1.74 diff -u -d -r1.73 -r1.74 --- mockpp.h 5 Jan 2006 20:17:10 -0000 1.73 +++ mockpp.h 6 Jan 2006 12:17:34 -0000 1.74 @@ -514,7 +514,7 @@ # define MOCKPP_MEMBER_RESTRICTOR_PROTECTED protected #endif -#ifdef DOXYGEN // make doxygen include comments +#ifdef DOXYGEN_SHOULD_INCLUDE_THIS // make doxygen happily include docs #define MOCKPP_UNICODE #define CXXTEST_USE_MINI_STL #define MOCKPP_USE_MINI_STL |
|
From: Ewald A. <ewa...@us...> - 2006-01-06 12:18:23
|
Update of /cvsroot/mockpp/mockpp/mockpp/docs/en In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13005/mockpp/docs/en Modified Files: appendix.docbook dev_basic.docbook Log Message: update docs Index: dev_basic.docbook =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/docs/en/dev_basic.docbook,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- dev_basic.docbook 27 Dec 2005 18:01:44 -0000 1.14 +++ dev_basic.docbook 6 Jan 2006 12:17:34 -0000 1.15 @@ -27,15 +27,15 @@ <varlistentry> <term><methodname>setFailOnVerify()</methodname></term> - <listitem>Usually the actual value is immediately compared + <listitem><para>Usually the actual value is immediately compared when set. Sometimes you want to defer this until all the work is done. After invoking this method you must call <methodname>verify()</methodname> - manually at the end to verify all pending expectations.</listitem> + manually at the end to verify all pending expectations.</para></listitem> </varlistentry> <varlistentry> <term><methodname>setExpectNothing()</methodname></term> - <listitem>If you want to prevent the occurrence of any actual values + <listitem><para>If you want to prevent the occurrence of any actual values you should invoke this method at the beginning. <note><title>Attention</title> @@ -46,7 +46,7 @@ to compare with. </para> </note> - </listitem> + </para></listitem> </varlistentry> </variablelist> Index: appendix.docbook =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/docs/en/appendix.docbook,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- appendix.docbook 5 Jan 2006 20:17:11 -0000 1.20 +++ appendix.docbook 6 Jan 2006 12:17:34 -0000 1.21 @@ -41,79 +41,79 @@ <varlistentry> <term>--enable-unicode</term> - <listitem>By default &mockpp; uses standard 8bit wide strings (<token>std::string</token> + <listitem><para>By default &mockpp; uses standard 8bit wide strings (<token>std::string</token> and <token>const char*</token> to be more precise). If you need basic support for <ulink url="http://www.unicode.org">Unicode</ulink> and it's 16bit or 32bit wide characters you must add this parameter when invoking <userinput>configure</userinput>. - </listitem> + </para></listitem> </varlistentry> <varlistentry> <term>--enable-doxygen</term> - <listitem>This option generates and installs the api documentation. + <listitem><para>This option generates and installs the api documentation. <application>doxygen</application> must be installed in this case. - </listitem> + </para></listitem> </varlistentry> <varlistentry> <term>--enable-docbook</term> - <listitem>If you what to generate and install the handbook, you must + <listitem><para>If you what to generate and install the handbook, you must provide this parameter. - <application>docbook</application> must be installed in this case. + <application>docbook</application> must be installed in this case.</para> </listitem> </varlistentry> <varlistentry> <term>--disable-RTTI</term> - <listitem>Some environments don't use runtime type information + <listitem><para>Some environments don't use runtime type information to reduce the size of the footprint of the binaries. In this case - the according debugging information is omitted. + the according debugging information is omitted.</para> </listitem> </varlistentry> <varlistentry> <term>--disable-exceptions</term> - <listitem>Some environments don't use exceptions for similar reasons. + <listitem><para>Some environments don't use exceptions for similar reasons. All features based on try and catch statements don't work in this case - and you must provide your own way to collect the test results. + and you must provide your own way to collect the test results.</para> </listitem> </varlistentry> <varlistentry> <term>--enable-builtin-stl</term> - <listitem>By default &mockpp; is compiled with the C++ Standard Template Libray that + <listitem><para>By default &mockpp; is compiled with the C++ Standard Template Libray that comes with your compiler. Unfortunately the current implementations consume - rather much resources. For that reason a built-in minimalistic STL can be used. + rather much resources. For that reason a built-in minimalistic STL can be used.</para> </listitem> </varlistentry> <varlistentry> <term>--disable-builtin-cxxtest</term> - <listitem>By default &mockpp; uses a built-in version of &cxxtest; as test + <listitem><para>By default &mockpp; uses a built-in version of &cxxtest; as test framework. If you want to use another framework you should disable it to remove all internal dependencies. Please understand that in this case the unit tests - won't run if you don't enable another supported framework instead. + won't run if you don't enable another supported framework instead.</para> </listitem> </varlistentry> <varlistentry> <term>--enable-cppunit</term> - <listitem>This option enables &cppunit; as test framework. + <listitem><para>This option enables &cppunit; as test framework.</para> </listitem> </varlistentry> <varlistentry> <term>--enable-boosttest</term> - <listitem>This option enables Boost.Test as test framework. + <listitem><para>This option enables Boost.Test as test framework.</para> </listitem> </varlistentry> <varlistentry> <term>--boost-dir</term> - <listitem>Normaly configure searches <filename>/usr/include</filename> and + <listitem><para>Normaly configure searches <filename>/usr/include</filename> and <filename>/usr/local/include</filename>. In case there are multiple versions 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. + need as special version you will want to use this option.</para> </listitem> </varlistentry> @@ -231,9 +231,10 @@ <varlistentry> <term><literal>MOCKPP_USE_MINI_STL</literal></term> <listitem><para>Use the built-in alternative STL implementation instead of the - STL that come with the C++ compiler to try to save memory resources. - In this case <literal>CXXTEST_USE_MINI_STL</literal> should also be defined - if you use &cxxtest;.</para> + STL that comes with the C++ compiler to try to save memory resources. + If you use &cxxtest; <literal>CXXTEST_USE_MINI_STL</literal> should also be + defined.</para> + <para>If you want to use another STL you have to extend the according section in <filename>mockpp.h</filename>. Search for <literal>MOCKPP_USE_MINI_STL</literal> and add an appropriate section similar to the one for |
|
From: Ewald A. <ewa...@us...> - 2006-01-05 20:17:19
|
Update of /cvsroot/mockpp/mockpp/mockpp/docs/en In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22489/mockpp/docs/en Modified Files: appendix.docbook dev_embedded.docbook Log Message: update docs Index: appendix.docbook =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/docs/en/appendix.docbook,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- appendix.docbook 5 Jan 2006 19:13:55 -0000 1.19 +++ appendix.docbook 5 Jan 2006 20:17:11 -0000 1.20 @@ -137,6 +137,32 @@ <!-- ===================================== --> +<sect2 id="installing-cygwin"> +<title>Installing on systems using Cygwin</title> + +<para>There have been reports about problems to compile and link +with &cppunit; on Windows system under &cygwin;. A solution might be to be to link +statically. First compile &cppunit; (and possibly force installation with -k): +</para> + +<screen width="40"> + <prompt>%</prompt> <userinput>./configure --disable-shared</userinput> + <prompt>%</prompt> <userinput>make check</userinput> + <prompt>%</prompt> <userinput>make -k install</userinput> +</screen> + +<para>Then install &mockpp;:</para> + +<screen width="40"> + <prompt>%</prompt> <userinput>./configure --disable-shared</userinput> + <prompt>%</prompt> <userinput>make check</userinput> + <prompt>%</prompt> <userinput>make install</userinput> +</screen> + +</sect2> + +<!-- ===================================== --> + <sect2 id="creating-rpms"> <title>Creating and Installing an RPM</title> @@ -185,52 +211,92 @@ <varlistentry> <term><literal>MOCKPP_UNICODE</literal></term> - <listitem>Enable unicode characters (based on <token>wchar_t</token>) instead + <listitem><para>Enable unicode characters (based on <token>wchar_t</token>) instead of ascii characters.There are some related macros. <literal>MOCKPP_PCHAR</literal> - is used to mark literal character strings either with or without leading "L". - <literal>MOCPP_STRING</literal> is used to create a <token>String</token> variable. - </listitem> + <literal>MOCKPP_CHAR</literal> are used to mark literal character strings + either with or without leading "L". + <literal>MOCKPP_STRING</literal> and <literal>MOCKPP_PCSTRING</literal> are + used to create a <token>String</token> variable. + </para></listitem> </varlistentry> <varlistentry> <term><literal>MOCKPP_EXPORT</literal></term> - <listitem>Some platforms export only explicitly tagged elements in dynamic + <listitem><para>Some platforms export only explicitly tagged elements in dynamic libraries. Other elements can't be linked from other binaries. This macro - hides such an export declaration. + hides such an export declaration.</para> </listitem> </varlistentry> + <varlistentry> + <term><literal>MOCKPP_USE_MINI_STL</literal></term> + <listitem><para>Use the built-in alternative STL implementation instead of the + STL that come with the C++ compiler to try to save memory resources. + In this case <literal>CXXTEST_USE_MINI_STL</literal> should also be defined + if you use &cxxtest;.</para> + <para>If you want to use another STL you have to extend the according section + in <filename>mockpp.h</filename>. Search for <literal>MOCKPP_USE_MINI_STL</literal> + and add an appropriate section similar to the one for + <literal>ministl</literal>.</para> + </listitem> + </varlistentry> -</variablelist> + <varlistentry> + <term><literal>MOCKPP_NO_RTTI</literal></term> + <listitem><para>Disable all features that are based on runtime type information + to reduce the library size.</para> + </listitem> + </varlistentry> -MOCKPP_BOUNDARY_DELTA + <varlistentry> + <term><literal>MOCKPP_NO_EXCEPTIONS</literal></term> + <listitem><para>Disable exception handling to reduce the library size. If you do not + use the built-in &cxxtest; you probably need to adjust the handling of failures. + See <xref linkend="no-exceptions" /> for a list of the according macros.</para> + </listitem> + </varlistentry> -MOCKPP_USE_MINI_STL -CXXTEST_USE_MINI_STL -MOCKPP_STL -MOCKPP_STRING_H -MOCKPP_VECTOR_H -MOCKPP_MAP_H -MOCKPP_SET_H -MOCKPP_FUNCTION_H -MOCKPP_ALGORITHM_H + <varlistentry> + <term><literal>MOCKPP_USE_CPPUNIT</literal></term> + <listitem><para>Use &cppunit; as framework for fow control.</para> + </listitem> + </varlistentry> -MOCKPP_ALTERNATIVE_STL + <varlistentry> + <term><literal>MOCKPP_USE_CXXTEST</literal></term> + <listitem><para>Use &cxxtest; as framework for fow control.</para> + </listitem> + </varlistentry> -MOCKPP_USE_CPPUNIT -MOCKPP_USE_CXXTEST -MOCKPP_USE_BOOSTTEST + <varlistentry> + <term><literal>MOCKPP_USE_BOOSTTEST</literal></term> + <listitem><para>Use &boost.test; as framework for fow control.</para> + </listitem> + </varlistentry> -MOCKPP_NO_RTTI + <varlistentry> + <term><literal>MOCKPP_BOUNDARY_DELTA</literal></term> + <listitem><para>Include source code for + <function>ExpectationBoundary::setExpectedDelta()</function></para>. + </listitem> + </varlistentry> -MOCKPP_NO_EXCEPTIONS -MOCKPP_THROW(x) -MOCKPP_RETHROW -MOCKPP_TRY -MOCKPP_CATCH(x) -MOCKPP_CATCH_ALL + <varlistentry> + <term><literal>MOCKPP_USE_STD_EXCEPTION</literal></term> + <listitem><para>Derive <classname>mockpp::Exception</classname> + from <classname>std::exception</classname></para>. + </listitem> + </varlistentry> + + <varlistentry> + <term><literal>MOCKPP_MAKE_CHAR_READABLE</literal></term> + <listitem><para>Display non-printable characters in a more readable form.</para> + </listitem> + </varlistentry> +</variablelist> +There are more predefined options of less interest in <filename>mockpp.h</filename>. </para> @@ -242,30 +308,6 @@ </sect2> -<sect2 id="installing-cygwin"> -<title>Installing on systems using Cygwin</title> - -<para>There have been reports about problems to compile and link -with &cppunit; on Windows system under &cygwin;. A solution might be to be to link -statically. First compile &cppunit; (and possibly force installation with -k): -</para> - -<screen width="40"> - <prompt>%</prompt> <userinput>./configure --disable-shared</userinput> - <prompt>%</prompt> <userinput>make check</userinput> - <prompt>%</prompt> <userinput>make -k install</userinput> -</screen> - -<para>Then install &mockpp;:</para> - -<screen width="40"> - <prompt>%</prompt> <userinput>./configure --disable-shared</userinput> - <prompt>%</prompt> <userinput>make check</userinput> - <prompt>%</prompt> <userinput>make install</userinput> -</screen> - -</sect2> - </sect1> </appendix> Index: dev_embedded.docbook =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/docs/en/dev_embedded.docbook,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- dev_embedded.docbook 28 Dec 2005 09:23:30 -0000 1.10 +++ dev_embedded.docbook 5 Jan 2006 20:17:11 -0000 1.11 @@ -105,7 +105,7 @@ machine with high speed very often whereas the complete tests are run on the target device only if appropriate.</para> -<para>Without exceptions you have to provide a way to forward the messages +<para id="no-exceptions">Without exceptions you have to provide a way to forward the messages about the malfunction. &mockpp; uses some macros to run the built-in tests with or without exceptions using the same source files. When exceptions are enabled theses macros contain what you probably expect: |
|
From: Ewald A. <ewa...@us...> - 2006-01-05 20:17:18
|
Update of /cvsroot/mockpp/mockpp/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22489/mockpp Modified Files: mockpp.h Log Message: update docs Index: mockpp.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/mockpp.h,v retrieving revision 1.72 retrieving revision 1.73 diff -u -d -r1.72 -r1.73 --- mockpp.h 3 Jan 2006 15:12:34 -0000 1.72 +++ mockpp.h 5 Jan 2006 20:17:10 -0000 1.73 @@ -298,9 +298,9 @@ #undef HAVE_MULTITHREAD // obsolete and error prone -//! ExpectationBoundary.setExpectedDelta() is activated. - //! This method is only ativated upon reqest as it might cause problems - //! with user's data type if there are no operator+() and operator-(). +//! ExpectationBoundary::setExpectedDelta() is activated. +//! This method is only ativated upon reqest as it might cause problems +//! with user's data type if there are no operator+() and operator-(). #define MOCKPP_BOUNDARY_DELTA 0 ////////////////////////////////////////////////// @@ -514,7 +514,7 @@ # define MOCKPP_MEMBER_RESTRICTOR_PROTECTED protected #endif -#ifdef DOXYGEN +#ifdef DOXYGEN // make doxygen include comments #define MOCKPP_UNICODE #define CXXTEST_USE_MINI_STL #define MOCKPP_USE_MINI_STL |
|
From: Ewald A. <ewa...@us...> - 2006-01-05 19:14:06
|
Update of /cvsroot/mockpp/mockpp/mockpp/framework In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8544/mockpp/framework Modified Files: SelectUnittestFramework.h Log Message: update docs Index: SelectUnittestFramework.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/framework/SelectUnittestFramework.h,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- SelectUnittestFramework.h 3 Jan 2006 15:12:34 -0000 1.11 +++ SelectUnittestFramework.h 5 Jan 2006 19:13:55 -0000 1.12 @@ -51,7 +51,7 @@ * functions. So this macro is used to declare the methods accordingly. */ -#ifdef DOXYGEN +#ifdef DOXYGEN // make doxygen happily include docs #define MOCKPP_USE_CXXTEST #define MOCKPP_USE_CPPUNIT #define MOCKPP_USE_BOOSTTEST |
|
From: Ewald A. <ewa...@us...> - 2006-01-05 19:14:06
|
Update of /cvsroot/mockpp/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8544 Modified Files: TODO mockpp.doxygen.in Log Message: update docs Index: mockpp.doxygen.in =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp.doxygen.in,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- mockpp.doxygen.in 3 Jan 2006 15:12:34 -0000 1.21 +++ mockpp.doxygen.in 5 Jan 2006 19:13:55 -0000 1.22 @@ -1012,7 +1012,6 @@ HAVE_LIMITS \ MOCKPP_BOUNDARY_DELTA \ DOXYGEN_SHOULD_SKIP_THIS \ - DOXYGEN_SHOULD_SKIP_THIS \ "MOCKPP_MEMBER_RESTRICTOR_PROTECTED = protected " \ "MOCKPP_PRE(a) = /*! \pre a */" \ "MOCKPP_PRE_MSG(a,b) = /*! \pre a \code b \endcode */" \ Index: TODO =================================================================== RCS file: /cvsroot/mockpp/mockpp/TODO,v retrieving revision 1.55 retrieving revision 1.56 diff -u -d -r1.55 -r1.56 --- TODO 2 Jan 2006 21:19:54 -0000 1.55 +++ TODO 5 Jan 2006 19:13:55 -0000 1.56 @@ -16,10 +16,6 @@ DOC: ---- -Boost.Test - -explain options in config files - Problem Exception-Transformation?? Tests |
|
From: Ewald A. <ewa...@us...> - 2006-01-05 19:14:05
|
Update of /cvsroot/mockpp/mockpp/mockpp/docs/en In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8544/mockpp/docs/en Modified Files: appendix.docbook dev_intro.docbook dev_test_framework.docbook Log Message: update docs Index: appendix.docbook =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/docs/en/appendix.docbook,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- appendix.docbook 1 Jan 2006 16:51:46 -0000 1.18 +++ appendix.docbook 5 Jan 2006 19:13:55 -0000 1.19 @@ -80,7 +80,7 @@ </varlistentry> <varlistentry> - <term>--enable-builtin-STL</term> + <term>--enable-builtin-stl</term> <listitem>By default &mockpp; is compiled with the C++ Standard Template Libray that comes with your compiler. Unfortunately the current implementations consume rather much resources. For that reason a built-in minimalistic STL can be used. @@ -111,7 +111,7 @@ <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 + <filename>/usr/local/include</filename>. In case there are multiple versions 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> @@ -179,6 +179,61 @@ CBuilder. </para> +<para id="configuration">The following options are used to manually tweak the library: + +<variablelist> + + <varlistentry> + <term><literal>MOCKPP_UNICODE</literal></term> + <listitem>Enable unicode characters (based on <token>wchar_t</token>) instead + of ascii characters.There are some related macros. <literal>MOCKPP_PCHAR</literal> + is used to mark literal character strings either with or without leading "L". + <literal>MOCPP_STRING</literal> is used to create a <token>String</token> variable. + </listitem> + </varlistentry> + + <varlistentry> + <term><literal>MOCKPP_EXPORT</literal></term> + <listitem>Some platforms export only explicitly tagged elements in dynamic + libraries. Other elements can't be linked from other binaries. This macro + hides such an export declaration. + </listitem> + </varlistentry> + + +</variablelist> + +MOCKPP_BOUNDARY_DELTA + +MOCKPP_USE_MINI_STL +CXXTEST_USE_MINI_STL +MOCKPP_STL +MOCKPP_STRING_H +MOCKPP_VECTOR_H +MOCKPP_MAP_H +MOCKPP_SET_H +MOCKPP_FUNCTION_H +MOCKPP_ALGORITHM_H + +MOCKPP_ALTERNATIVE_STL + +MOCKPP_USE_CPPUNIT +MOCKPP_USE_CXXTEST +MOCKPP_USE_BOOSTTEST + +MOCKPP_NO_RTTI + +MOCKPP_NO_EXCEPTIONS +MOCKPP_THROW(x) +MOCKPP_RETHROW +MOCKPP_TRY +MOCKPP_CATCH(x) +MOCKPP_CATCH_ALL + + + +</para> + <note> <title>Once you have ported &mockpp; to a new platform:</title> <para>Please send me your files for inclusion in the next distribution. Index: dev_intro.docbook =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/docs/en/dev_intro.docbook,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- dev_intro.docbook 28 Dec 2005 09:23:30 -0000 1.8 +++ dev_intro.docbook 5 Jan 2006 19:13:55 -0000 1.9 @@ -5,12 +5,13 @@ give you a quick overview over the features of &mockpp;. For a complete list of all functions please refer to the api documentation.</para> -<para>There are a few things that are not obvious but might become interesting: +<para>There are a few things that are not obvious but might become important +to get started: <itemizedlist> <listitem><para>&mockpp; uses a data type <token>String</token> which is no data type of it's own but is a typedef to std::string or std::wstring depending on your choice. - It also provides a mminimumfunctionality for unicode if you compile for + It also provides a minimum functionality for unicode if you compile for a unicode environment. See <xref linkend="compilation" /> how to do that.</para> @@ -32,13 +33,19 @@ </listitem> - <listitem>&mockpp; has no testing framework of it's own so it is recommended - to use <ulink url="http://cppunit.sf.net">&cppunit;</ulink> for that purpose. + <listitem>&mockpp; has no testing framework of it's own. But it includes a + slightly modified version of <ulink url="http://cxxtest.sf.net">&cxxtest;</ulink>. + It is also possible to use <ulink url="http://cppunit.sf.net">&cppunit;</ulink> + or <ulink url="http://www.boost.org">&boost.test;</ulink> or others for + that purpose. See the test and example files how to do it. </listitem> </itemizedlist> +<para>See <xref linkend="configuration" /> for more option how to adjust +this library.</para> + </para> </sect1> Index: dev_test_framework.docbook =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/docs/en/dev_test_framework.docbook,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- dev_test_framework.docbook 3 Jan 2006 15:12:34 -0000 1.5 +++ dev_test_framework.docbook 5 Jan 2006 19:13:55 -0000 1.6 @@ -99,7 +99,8 @@ <sect2 id="framework-boost"> <title>Boost.Test</title> -<para>Boost.Test does not need test methods which reside in classes. It is also +<para><ulink url="http://www.boost.org">&boost.test;</ulink> 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 |
|
From: Ewald A. <ewa...@us...> - 2006-01-04 19:56:40
|
Update of /cvsroot/mockpp/mockpp/mockpp/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22979/mockpp/tests Modified Files: mock_test.cpp mock_test_win32.cpp Log Message: workarounds bcb5 Index: mock_test_win32.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/mock_test_win32.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- mock_test_win32.cpp 11 Dec 2005 20:05:03 -0000 1.1 +++ mock_test_win32.cpp 4 Jan 2006 19:56:22 -0000 1.2 @@ -1,2 +1,20 @@ #define GUI_WIN32 #include "mock_test.cpp" + +/* Borland BCB5 Settings + + <OPTIONS> + <CFLAG1 value="-vGc -vGt -vGd -Od -Vx -Ve -X- -r- -a8 -b- -k -y -v -vi- -tWC -tWM -c"/> + <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"c:\tmp\compile\" -I"c:\tmp\compile\mockpp_34\" -D"" -ap -Tpe -x -Gn -v"/> + </OPTIONS> + <LINKER> + <ALLOBJ value="c0x32.obj $(PACKAGES) $(OBJFILES)"/> + <ALLRES value="$(RESFILES)"/> + <ALLLIB value="cg32.lib $(LIBFILES) $(LIBRARIES) import32.lib cw32mti.lib"/> + </LINKER> + +*/ Index: mock_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/mock_test.cpp,v retrieving revision 1.40 retrieving revision 1.41 diff -u -d -r1.40 -r1.41 --- mock_test.cpp 2 Jan 2006 20:27:57 -0000 1.40 +++ mock_test.cpp 4 Jan 2006 19:56:22 -0000 1.41 @@ -116,11 +116,6 @@ 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) @@ -128,10 +123,15 @@ #elif defined(GUI_WIN32) return CxxTest::GuiTuiRunner<CxxTest::Win32Gui, CxxTest::StdioPrinter>( argc, argv ).run(); #else - MyErrorPrinter ep(show); - mockpp::CxxTestRunner::runAllTests(ep); - return CxxTest::tracker().failedTests(); - //return CxxTest::ErrorPrinter().run(); + bool show = false; + for (int i1 = 1; i1 < argc; ++i1) + if (strcmp (argv[1], "--show-name") == 0) + show = true; + + MyErrorPrinter ep(show); + mockpp::CxxTestRunner::runAllTests(ep); + return CxxTest::tracker().failedTests(); + //return CxxTest::ErrorPrinter().run(); #endif } |
|
From: Ewald A. <ewa...@us...> - 2006-01-04 19:56:30
|
Update of /cvsroot/mockpp/mockpp/bcb5 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22979/bcb5 Modified Files: mock_test.bpf mock_test_win32.bpf mock_test_win32.bpr Log Message: workarounds bcb5 Index: mock_test_win32.bpr =================================================================== RCS file: /cvsroot/mockpp/mockpp/bcb5/mock_test_win32.bpr,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- mock_test_win32.bpr 2 Jan 2006 20:24:56 -0000 1.4 +++ mock_test_win32.bpr 4 Jan 2006 19:56:21 -0000 1.5 @@ -146,7 +146,7 @@ -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- -tW -tWM -c"/> + <CFLAG1 value="-vGc -vGt -vGd -Od -Vx -Ve -X- -r- -a8 -b- -k -y -v -vi- -tWC -tWM -c"/> <PFLAGS value="-N2"c:\tmp\compile\mockpp_34\" -N0"c:\tmp\compile\mockpp_34\" -$YD -$W -$O- -v -JPHNE -M"/> <RFLAGS value=""/> @@ -154,7 +154,7 @@ <LFLAGS value="-l"c:\tmp\compile\" -I"c:\tmp\compile\mockpp_34\" -D"" -aa -Tpe -x -Gn -v"/> </OPTIONS> <LINKER> - <ALLOBJ value="c0w32.obj $(PACKAGES) $(OBJFILES)"/> + <ALLOBJ value="c0x32.obj $(PACKAGES) $(OBJFILES)"/> <ALLRES value="$(RESFILES)"/> <ALLLIB value="cg32.lib $(LIBFILES) $(LIBRARIES) import32.lib cw32mti.lib"/> </LINKER> Index: mock_test.bpf =================================================================== RCS file: /cvsroot/mockpp/mockpp/bcb5/mock_test.bpf,v retrieving revision 1.43 retrieving revision 1.44 diff -u -d -r1.43 -r1.44 --- mock_test.bpf 2 Jan 2006 20:24:56 -0000 1.43 +++ mock_test.bpf 4 Jan 2006 19:56:21 -0000 1.44 @@ -49,76 +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"); +USEUNIT("..\mockpp\tests\AbstractDynamicChainingMock_test.cpp"); +USEUNIT("..\mockpp\tests\AbstractInvocationDispatcher_test.cpp"); +USEUNIT("..\mockpp\tests\And_test.cpp"); +USEUNIT("..\mockpp\tests\AnyArgumentsMatcher_test.cpp"); +USEUNIT("..\mockpp\tests\ArgumentsMatchBuilder_test.cpp"); +USEUNIT("..\mockpp\tests\ArgumentsMatcher_test.cpp"); +USEUNIT("..\mockpp\tests\ChainableMockMethod_1_test.cpp"); +USEUNIT("..\mockpp\tests\ChainableMockMethod_2_test.cpp"); +USEUNIT("..\mockpp\tests\ChainableMockMethod_test.cpp"); +USEUNIT("..\mockpp\tests\ChainableMockObject_1_test.cpp"); +USEUNIT("..\mockpp\tests\ChainableMockObject_1_void_test.cpp"); +USEUNIT("..\mockpp\tests\ChainableMockObject_2_test.cpp"); +USEUNIT("..\mockpp\tests\ChainableMockObject_2_void_test.cpp"); +USEUNIT("..\mockpp\tests\ChainableMockObject_3_test.cpp"); +USEUNIT("..\mockpp\tests\ChainableMockObject_3_void_test.cpp"); +USEUNIT("..\mockpp\tests\ChainableMockObject_4_test.cpp"); +USEUNIT("..\mockpp\tests\ChainableMockObject_4_void_test.cpp"); +USEUNIT("..\mockpp\tests\ChainableMockObject_5_test.cpp"); +USEUNIT("..\mockpp\tests\ChainableMockObject_5_void_test.cpp"); +USEUNIT("..\mockpp\tests\ChainableMockObject_test.cpp"); +USEUNIT("..\mockpp\tests\ChainableMockObject_void_test.cpp"); +USEUNIT("..\mockpp\tests\ChainableMockObjectPolymorphism_test.cpp"); +USEUNIT("..\mockpp\tests\ChainingMockBuilder_test.cpp"); +USEUNIT("..\mockpp\tests\ChainingMockObjectSupport_test.cpp"); +USEUNIT("..\mockpp\tests\ConstraintList_test.cpp"); +USEUNIT("..\mockpp\tests\ConstraintSet_test.cpp"); +USEUNIT("..\mockpp\tests\CoreMock_test.cpp"); +USEUNIT("..\mockpp\tests\CustomStub_test.cpp"); +USEUNIT("..\mockpp\tests\DefaultResultStub_test.cpp"); +USEUNIT("..\mockpp\tests\DynamicChainingMockError_test.cpp"); +USEUNIT("..\mockpp\tests\FIFOInvocationDispatcher_test.cpp"); +USEUNIT("..\mockpp\tests\Invocation_test.cpp"); +USEUNIT("..\mockpp\tests\InvocationMocker_test.cpp"); +USEUNIT("..\mockpp\tests\InvocationMockerBuilder_test.cpp"); +USEUNIT("..\mockpp\tests\InvokeAtLeastMatcher_test.cpp"); +USEUNIT("..\mockpp\tests\InvokeAtLeastOnceMatcher_test.cpp"); +USEUNIT("..\mockpp\tests\InvokeAtMostMatcher_test.cpp"); +USEUNIT("..\mockpp\tests\InvokeCountMatcher_test.cpp"); +USEUNIT("..\mockpp\tests\InvokedAfterMatcher_test.cpp"); +USEUNIT("..\mockpp\tests\InvokedBeforeMatcher_test.cpp"); +USEUNIT("..\mockpp\tests\InvokedRecorder_test.cpp"); +USEUNIT("..\mockpp\tests\InvokeOnceMatcher_test.cpp"); +USEUNIT("..\mockpp\tests\IsAnything_test.cpp"); +USEUNIT("..\mockpp\tests\IsCloseTo_test.cpp"); +USEUNIT("..\mockpp\tests\IsEqual_test.cpp"); +USEUNIT("..\mockpp\tests\IsGreaterOrEqual_test.cpp"); +USEUNIT("..\mockpp\tests\IsGreaterThan_test.cpp"); +USEUNIT("..\mockpp\tests\IsInstanceOf_test.cpp"); +USEUNIT("..\mockpp\tests\IsLessOrEqual_test.cpp"); +USEUNIT("..\mockpp\tests\IsLessThan_test.cpp"); +USEUNIT("..\mockpp\tests\IsNot_test.cpp"); +USEUNIT("..\mockpp\tests\IsNothing_test.cpp"); +USEUNIT("..\mockpp\tests\IsSame_test.cpp"); +USEUNIT("..\mockpp\tests\LIFOInvocationDispatcher_test.cpp"); +USEUNIT("..\mockpp\tests\MatchBuilder_test.cpp"); +USEUNIT("..\mockpp\tests\mockpp_pti_test.cpp"); +USEUNIT("..\mockpp\tests\NoArgumentsMatcher_test.cpp"); +USEUNIT("..\mockpp\tests\Or_test.cpp"); +USEUNIT("..\mockpp\tests\OutBound_test.cpp"); +USEUNIT("..\mockpp\tests\ReturnStub_test.cpp"); +USEUNIT("..\mockpp\tests\StringContains_test.cpp"); +USEUNIT("..\mockpp\tests\StringEndsWith_test.cpp"); +USEUNIT("..\mockpp\tests\StringStartsWith_test.cpp"); +USEUNIT("..\mockpp\tests\StubBuilder_test.cpp"); +USEUNIT("..\mockpp\tests\StubSequence_test.cpp"); +USEUNIT("..\mockpp\tests\TestFailureMatcher_test.cpp"); +USEUNIT("..\mockpp\tests\TestFailureStub_test.cpp"); +USEUNIT("..\mockpp\tests\ThrowStub_test.cpp"); +USEUNIT("..\mockpp\tests\TypelessStubSequence_test.cpp"); +USEUNIT("..\mockpp\tests\UnlimitedMatcher_test.cpp"); +USEUNIT("..\mockpp\tests\VerifyingTestCaller_test.cpp"); +USEUNIT("..\mockpp\tests\VoidStub_test.cpp"); Index: mock_test_win32.bpf =================================================================== RCS file: /cvsroot/mockpp/mockpp/bcb5/mock_test_win32.bpf,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- mock_test_win32.bpf 2 Jan 2006 20:24:56 -0000 1.4 +++ mock_test_win32.bpf 4 Jan 2006 19:56:21 -0000 1.5 @@ -49,76 +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"); +USEUNIT("..\mockpp\tests\AbstractDynamicChainingMock_test.cpp"); +USEUNIT("..\mockpp\tests\AbstractInvocationDispatcher_test.cpp"); +USEUNIT("..\mockpp\tests\And_test.cpp"); +USEUNIT("..\mockpp\tests\AnyArgumentsMatcher_test.cpp"); +USEUNIT("..\mockpp\tests\ArgumentsMatchBuilder_test.cpp"); +USEUNIT("..\mockpp\tests\ArgumentsMatcher_test.cpp"); +USEUNIT("..\mockpp\tests\ChainableMockMethod_1_test.cpp"); +USEUNIT("..\mockpp\tests\ChainableMockMethod_2_test.cpp"); +USEUNIT("..\mockpp\tests\ChainableMockMethod_test.cpp"); +USEUNIT("..\mockpp\tests\ChainableMockObject_1_test.cpp"); +USEUNIT("..\mockpp\tests\ChainableMockObject_1_void_test.cpp"); +USEUNIT("..\mockpp\tests\ChainableMockObject_2_test.cpp"); +USEUNIT("..\mockpp\tests\ChainableMockObject_2_void_test.cpp"); +USEUNIT("..\mockpp\tests\ChainableMockObject_3_test.cpp"); +USEUNIT("..\mockpp\tests\ChainableMockObject_3_void_test.cpp"); +USEUNIT("..\mockpp\tests\ChainableMockObject_4_test.cpp"); +USEUNIT("..\mockpp\tests\ChainableMockObject_4_void_test.cpp"); +USEUNIT("..\mockpp\tests\ChainableMockObject_5_test.cpp"); +USEUNIT("..\mockpp\tests\ChainableMockObject_5_void_test.cpp"); +USEUNIT("..\mockpp\tests\ChainableMockObject_test.cpp"); +USEUNIT("..\mockpp\tests\ChainableMockObject_void_test.cpp"); +USEUNIT("..\mockpp\tests\ChainableMockObjectPolymorphism_test.cpp"); +USEUNIT("..\mockpp\tests\ChainingMockBuilder_test.cpp"); +USEUNIT("..\mockpp\tests\ChainingMockObjectSupport_test.cpp"); +USEUNIT("..\mockpp\tests\ConstraintList_test.cpp"); +USEUNIT("..\mockpp\tests\ConstraintSet_test.cpp"); +USEUNIT("..\mockpp\tests\CoreMock_test.cpp"); +USEUNIT("..\mockpp\tests\CustomStub_test.cpp"); +USEUNIT("..\mockpp\tests\DefaultResultStub_test.cpp"); +USEUNIT("..\mockpp\tests\DynamicChainingMockError_test.cpp"); +USEUNIT("..\mockpp\tests\FIFOInvocationDispatcher_test.cpp"); +USEUNIT("..\mockpp\tests\Invocation_test.cpp"); +USEUNIT("..\mockpp\tests\InvocationMocker_test.cpp"); +USEUNIT("..\mockpp\tests\InvocationMockerBuilder_test.cpp"); +USEUNIT("..\mockpp\tests\InvokeAtLeastMatcher_test.cpp"); +USEUNIT("..\mockpp\tests\InvokeAtLeastOnceMatcher_test.cpp"); +USEUNIT("..\mockpp\tests\InvokeAtMostMatcher_test.cpp"); +USEUNIT("..\mockpp\tests\InvokeCountMatcher_test.cpp"); +USEUNIT("..\mockpp\tests\InvokedAfterMatcher_test.cpp"); +USEUNIT("..\mockpp\tests\InvokedBeforeMatcher_test.cpp"); +USEUNIT("..\mockpp\tests\InvokedRecorder_test.cpp"); +USEUNIT("..\mockpp\tests\InvokeOnceMatcher_test.cpp"); +USEUNIT("..\mockpp\tests\IsAnything_test.cpp"); +USEUNIT("..\mockpp\tests\IsCloseTo_test.cpp"); +USEUNIT("..\mockpp\tests\IsEqual_test.cpp"); +USEUNIT("..\mockpp\tests\IsGreaterOrEqual_test.cpp"); +USEUNIT("..\mockpp\tests\IsGreaterThan_test.cpp"); +USEUNIT("..\mockpp\tests\IsInstanceOf_test.cpp"); +USEUNIT("..\mockpp\tests\IsLessOrEqual_test.cpp"); +USEUNIT("..\mockpp\tests\IsLessThan_test.cpp"); +USEUNIT("..\mockpp\tests\IsNot_test.cpp"); +USEUNIT("..\mockpp\tests\IsNothing_test.cpp"); +USEUNIT("..\mockpp\tests\IsSame_test.cpp"); +USEUNIT("..\mockpp\tests\LIFOInvocationDispatcher_test.cpp"); +USEUNIT("..\mockpp\tests\MatchBuilder_test.cpp"); +USEUNIT("..\mockpp\tests\mockpp_pti_test.cpp"); +USEUNIT("..\mockpp\tests\NoArgumentsMatcher_test.cpp"); +USEUNIT("..\mockpp\tests\Or_test.cpp"); +USEUNIT("..\mockpp\tests\OutBound_test.cpp"); +USEUNIT("..\mockpp\tests\ReturnStub_test.cpp"); +USEUNIT("..\mockpp\tests\StringContains_test.cpp"); +USEUNIT("..\mockpp\tests\StringEndsWith_test.cpp"); +USEUNIT("..\mockpp\tests\StringStartsWith_test.cpp"); +USEUNIT("..\mockpp\tests\StubBuilder_test.cpp"); +USEUNIT("..\mockpp\tests\StubSequence_test.cpp"); +USEUNIT("..\mockpp\tests\TestFailureMatcher_test.cpp"); +USEUNIT("..\mockpp\tests\TestFailureStub_test.cpp"); +USEUNIT("..\mockpp\tests\ThrowStub_test.cpp"); +USEUNIT("..\mockpp\tests\TypelessStubSequence_test.cpp"); +USEUNIT("..\mockpp\tests\UnlimitedMatcher_test.cpp"); +USEUNIT("..\mockpp\tests\VerifyingTestCaller_test.cpp"); +USEUNIT("..\mockpp\tests\VoidStub_test.cpp"); |
|
From: Ewald A. <ewa...@us...> - 2006-01-04 19:56:29
|
Update of /cvsroot/mockpp/mockpp/3party/cxxtest/cxxtest In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22979/3party/cxxtest/cxxtest Modified Files: Win32Gui.h Log Message: workarounds bcb5 Index: Win32Gui.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/3party/cxxtest/cxxtest/Win32Gui.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Win32Gui.h 17 Dec 2005 18:38:44 -0000 1.3 +++ Win32Gui.h 4 Jan 2006 19:56:21 -0000 1.4 @@ -19,7 +19,7 @@ #include <cxxtest/Gui.h> -#include <windows.h> +#include <windows.h> #include <commctrl.h> namespace CxxTest @@ -106,7 +106,8 @@ void parseCommandLine( int argc, char **argv ) { _startMinimized = _keep = false; - _title = argv[0]; + if (argc != 0) + _title = argv[0]; for ( int i = 1; i < argc; ++ i ) { @@ -326,7 +327,7 @@ setUp( window, (LPCREATESTRUCT)lParam ); Win32Gui *that = (Win32Gui *)GetWindowLong( window, GWL_USERDATA ); - return that->handle( window, message, wParam, lParam ); + return handle_s(that, window, message, wParam, lParam ); } static void setUp( HWND window, LPCREATESTRUCT create ) @@ -334,20 +335,33 @@ SetWindowLong( window, GWL_USERDATA, (LONG)create->lpCreateParams ); } + static LRESULT handle_s(Win32Gui *self, HWND window, UINT message, WPARAM wParam, LPARAM lParam ) + { + if (self == 0) + return DefWindowProc( window, message, wParam, lParam ); + + return self->handle( window, message, wParam, lParam ); + } + LRESULT handle( HWND window, UINT message, WPARAM wParam, LPARAM lParam ) { switch ( message ) { - case WM_SIZE: resizeControls(); break; + case WM_SIZE: + resizeControls(); + break; - case WM_TIMER: updateTime(); break; + case WM_TIMER: + updateTime(); + break; case WM_CLOSE: case WM_DESTROY: case WM_QUIT: ExitProcess( 0 ); - default: return DefWindowProc( window, message, wParam, lParam ); + default: + return DefWindowProc( window, message, wParam, lParam ); } return 0; } |
