mockpp-commits Mailing List for Mock Objects for C++ (Page 35)
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...> - 2005-07-24 18:58:50
|
Update of /cvsroot/mockpp/mockpp/mockpp/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21565/mockpp/tests Modified Files: Formatter_test.cpp Log Message: move to mockpp namespace Index: Formatter_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/Formatter_test.cpp,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- Formatter_test.cpp 24 Jul 2005 17:48:34 -0000 1.27 +++ Formatter_test.cpp 24 Jul 2005 18:58:39 -0000 1.28 @@ -534,7 +534,7 @@ { mockpp::String fmt (MOCKPP_PCHAR("1==%0==")); - fmt << owstreamed(fd); + fmt << mockpp::owstreamed(fd); MOCKPP_ASSERT_EQUALS(fmt, MOCKPP_PCSTRING("1==Formatter_Dummy-wchar_t==")); } @@ -548,7 +548,7 @@ { mockpp::String fmt (MOCKPP_PCHAR("1==%0==")); - fmt << ostreamed(fd); + fmt << mockpp::ostreamed(fd); MOCKPP_ASSERT_EQUALS(fmt, MOCKPP_PCSTRING("1==Formatter_Dummy-char==")); } |
|
From: Ewald A. <ewa...@us...> - 2005-07-24 18:08:13
|
Update of /cvsroot/mockpp/mockpp/mockpp/docs/en In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11090/mockpp/docs/en Modified Files: dev_helper.docbook Log Message: better ostream reuse Index: dev_helper.docbook =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/docs/en/dev_helper.docbook,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- dev_helper.docbook 30 Apr 2005 21:14:41 -0000 1.8 +++ dev_helper.docbook 24 Jul 2005 18:08:01 -0000 1.9 @@ -118,6 +118,11 @@ <token>MOCKPP_ENABLE_DEFAULT_FORMATTER</token> before including the first &mockpp; header file.</para> +<para>It is also possible to reuse already existing streaming operators for +<classname>std::basic_ostream</classname>. The macros <token>MOCKPP_OSTREAMABLE</token> +and <token>MOCKPP_OWSTREAMABLE</token> create code for mockpp which uses the +standard streaming functions.</para> + <para>This collection of functions is inspired by the <classname>QString</classname> class which is part of the <productname>Qt</productname> framework by <ulink url="http://www.troll.no">Trolltech</ulink>.</para> @@ -153,9 +158,23 @@ return formatter; } + class AnotherPerson : public Person + { + // .. + }; + + std::ostream & operator<< (std::ostream &os, const AnotherPerson &pers) + { + os << pers.toString(); + return os; + } + + MOCKPP_OSTREAMABLE(AnotherPerson) <co id="std-shift-op-co" linkends="std-shift-op" /> + Person pers("Bob", 6); - String format = "%4 says: %3 plus %2 gives %1"; - format << "three" << "two" << "one" << pers; + AnotherPerson otherpers("Alice", 7); + String format = "%5 and %4 say: %3 plus %2 gives %1"; + format << "three" << "two" << "one" << pers << otherpers; std::cout << format << std::endl; </programlisting> @@ -171,7 +190,11 @@ <callout arearefs="shift-op-co" id="shift-op" > <para>Output the string representation of the object.</para> <para>The resulting output: - <computeroutput>Bob(6) says: one plus two gives three</computeroutput></para> + <computeroutput>Alice(7) and Bob(6) say: one plus two gives three</computeroutput></para> + </callout> + + <callout arearefs="std-shift-op-co" id="std-shift-op" > + <para>Output the string by using an existing standard streaming operator.</para> </callout> </calloutlist> |
|
From: Ewald A. <ewa...@us...> - 2005-07-24 17:48:42
|
Update of /cvsroot/mockpp/mockpp/mockpp/compat In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7185/mockpp/compat Modified Files: Formatter.h Log Message: better ostream reuse Index: Formatter.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/compat/Formatter.h,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- Formatter.h 23 Jul 2005 22:34:32 -0000 1.30 +++ Formatter.h 24 Jul 2005 17:48:33 -0000 1.31 @@ -279,7 +279,7 @@ + MOCKPP_GET_STRING(typeid(o).name()) + MOCKPP_PCHAR("&]"); formatter << s; - MOCKPP_UNUSED(o); + MOCKPP_UNUSED(o); return formatter; } @@ -314,29 +314,53 @@ template <class T> mockpp::String ostreamed(const T& t) -{ - std::basic_ostringstream<char> oss; - oss << t; -#ifdef MOCKPP_UNICODE - return mockpp::getUnicode(oss.str()); -#else - return oss.str(); -#endif -} +{ + std::basic_ostringstream<char> oss; + oss << t; +#ifdef MOCKPP_UNICODE + return mockpp::getUnicode(oss.str()); +#else + return oss.str(); +#endif +} + + +/** Outputter which reuses an existing operator<<(std::basic_ostream<char>&, T). + * @param T data type for output + */ +#define MOCKPP_OSTREAMABLE(T) \ +mockpp::String & MOCKPP_EXPORT operator << (mockpp::String &formatter, const T &o) \ +{ \ + formatter << ostreamed(o); \ + return formatter; \ +} #ifdef MOCKPP_UNICODE template <class T> mockpp::String owstreamed(const T& t) -{ - std::basic_ostringstream<wchar_t> oss; - oss << t; - return oss.str(); -} +{ + std::basic_ostringstream<wchar_t> oss; + oss << t; + return oss.str(); +} + + +/** Outputter which reuses an existing operator<<(std::basic_ostream<wchar_t>&, T). + * @param T data type for output + */ +#define MOCKPP_OWSTREAMABLE(T) \ +mockpp::String & MOCKPP_EXPORT operator << (mockpp::String &formatter, const T &o) \ +{ \ + formatter << owstreamed(o); \ + return formatter; \ +} + #endif // MOCKPP_UNICODE + #endif // MOCKPP_DISABLE_OSTREAMED #endif // MOCKPP_FORMATTER_H |
|
From: Ewald A. <ewa...@us...> - 2005-07-24 17:48:42
|
Update of /cvsroot/mockpp/mockpp/mockpp/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7185/mockpp/tests Modified Files: Formatter_test.cpp Log Message: better ostream reuse Index: Formatter_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/Formatter_test.cpp,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- Formatter_test.cpp 23 Jul 2005 22:34:32 -0000 1.26 +++ Formatter_test.cpp 24 Jul 2005 17:48:34 -0000 1.27 @@ -498,23 +498,28 @@ }; -std::basic_ostream<char> & - operator<< (std::basic_ostream<char> &os, const Formatter_Dummy &/*fd*/) +#ifdef MOCKPP_UNICODE + +std::basic_ostream<wchar_t> & + operator<< (std::basic_ostream<wchar_t> &os, const Formatter_Dummy &/*fd*/) { - os << "Formatter_Dummy-char"; + os << "Formatter_Dummy-wchar_t"; return os; } +MOCKPP_OWSTREAMABLE(Formatter_Dummy) -#ifdef MOCKPP_UNICODE +#else // MOCKPP_UNICODE -std::basic_ostream<wchar_t> & - operator<< (std::basic_ostream<wchar_t> &os, const Formatter_Dummy &/*fd*/) +std::basic_ostream<char> & + operator<< (std::basic_ostream<char> &os, const Formatter_Dummy &/*fd*/) { - os << "Formatter_Dummy-wchar_t"; + os << "Formatter_Dummy-char"; return os; } +MOCKPP_OSTREAMABLE(Formatter_Dummy) + #endif // MOCKPP_UNICODE @@ -524,18 +529,33 @@ #ifndef MOCKPP_DISABLE_OSTREAMED Formatter_Dummy fd; - { - mockpp::String fmt (MOCKPP_PCHAR("==%0==")); - fmt << ostreamed(fd); - MOCKPP_ASSERT_EQUALS(fmt, MOCKPP_PCSTRING("==Formatter_Dummy-char==")); - } #ifdef MOCKPP_UNICODE { - mockpp::String fmt (MOCKPP_PCHAR("==%0==")); + mockpp::String fmt (MOCKPP_PCHAR("1==%0==")); fmt << owstreamed(fd); - MOCKPP_ASSERT_EQUALS(fmt, MOCKPP_PCSTRING("==Formatter_Dummy-wchar_t==")); + MOCKPP_ASSERT_EQUALS(fmt, MOCKPP_PCSTRING("1==Formatter_Dummy-wchar_t==")); + } + + { + mockpp::String fmt (MOCKPP_PCHAR("2==%0==")); + fmt << fd; + MOCKPP_ASSERT_EQUALS(fmt, MOCKPP_PCSTRING("2==Formatter_Dummy-wchar_t==")); + } + +#else // MOCKPP_UNICODE + + { + mockpp::String fmt (MOCKPP_PCHAR("1==%0==")); + fmt << ostreamed(fd); + MOCKPP_ASSERT_EQUALS(fmt, MOCKPP_PCSTRING("1==Formatter_Dummy-char==")); + } + + { + mockpp::String fmt (MOCKPP_PCHAR("2==%0==")); + fmt << fd; + MOCKPP_ASSERT_EQUALS(fmt, MOCKPP_PCSTRING("2==Formatter_Dummy-char==")); } #endif // MOCKPP_UNICODE |
|
From: Ewald A. <ewa...@us...> - 2005-07-24 16:11:27
|
Update of /cvsroot/mockpp/mockpp/mockpp/chaining In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19310/mockpp/chaining Modified Files: Invocation.h Log Message: OutBound for chainable objects Index: Invocation.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/Invocation.h,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- Invocation.h 24 Jul 2005 12:54:00 -0000 1.14 +++ Invocation.h 24 Jul 2005 16:11:14 -0000 1.15 @@ -182,7 +182,7 @@ /** Returns an invocation parameter * @return the invocation parameter */ - T1 getParameter1() const + const T1 & getParameter1() const { return param1; } @@ -257,7 +257,7 @@ /** Returns an invocation parameter * @return the invocation parameter */ - T1 getParameter1() const + const T1 & getParameter1() const { return param1; } @@ -265,7 +265,7 @@ /** Returns an invocation parameter * @return the invocation parameter */ - T2 getParameter2() const + const T2 & getParameter2() const { return param2; } @@ -346,7 +346,7 @@ /** Returns an invocation parameter * @return the invocation parameter */ - T1 getParameter1() const + const T1 & getParameter1() const { return param1; } @@ -354,7 +354,7 @@ /** Returns an invocation parameter * @return the invocation parameter */ - T2 getParameter2() const + const T2 & getParameter2() const { return param2; } @@ -362,7 +362,7 @@ /** Returns an invocation parameter * @return the invocation parameter */ - T3 getParameter3() const + const T3 & getParameter3() const { return param3; } @@ -449,7 +449,7 @@ /** Returns an invocation parameter * @return the invocation parameter */ - T1 getParameter1() const + const T1 & getParameter1() const { return param1; } @@ -457,7 +457,7 @@ /** Returns an invocation parameter * @return the invocation parameter */ - T2 getParameter2() const + const T2 & getParameter2() const { return param2; } @@ -465,7 +465,7 @@ /** Returns an invocation parameter * @return the invocation parameter */ - T3 getParameter3() const + const T3 & getParameter3() const { return param3; } @@ -473,7 +473,7 @@ /** Returns an invocation parameter * @return the invocation parameter */ - T4 getParameter4() const + const T4 & getParameter4() const { return param4; } @@ -566,7 +566,7 @@ /** Returns an invocation parameter * @return the invocation parameter */ - T1 getParameter1() const + const T1 & getParameter1() const { return param1; } @@ -574,7 +574,7 @@ /** Returns an invocation parameter * @return the invocation parameter */ - T2 getParameter2() const + const T2 & getParameter2() const { return param2; } @@ -582,7 +582,7 @@ /** Returns an invocation parameter * @return the invocation parameter */ - T3 getParameter3() const + const T3 & getParameter3() const { return param3; } @@ -590,7 +590,7 @@ /** Returns an invocation parameter * @return the invocation parameter */ - T4 getParameter4() const + const T4 & getParameter4() const { return param4; } @@ -598,7 +598,7 @@ /** Returns an invocation parameter * @return the invocation parameter */ - T5 getParameter5() const + const T5 & getParameter5() const { return param5; } |
|
From: Ewald A. <ewa...@us...> - 2005-07-24 16:11:22
|
Update of /cvsroot/mockpp/mockpp/bcb5 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19310/bcb5 Modified Files: chainmock.bpr cppunit.bpr jmock_test.bpf jmock_test.bpr mock_greeter.bpr mock_test.bpr mockpp.bpr Log Message: OutBound for chainable objects Index: jmock_test.bpf =================================================================== RCS file: /cvsroot/mockpp/mockpp/bcb5/jmock_test.bpf,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- jmock_test.bpf 23 Jul 2005 18:44:02 -0000 1.22 +++ jmock_test.bpf 24 Jul 2005 16:11:13 -0000 1.23 @@ -68,7 +68,7 @@ USEUNIT("..\mockpp\tests\TypelessStubSequence_test.cpp"); USEUNIT("..\mockpp\tests\ChainingMockObjectSupport_test.cpp"); USEUNIT("..\mockpp\tests\mockpp_pti_test.cpp"); -USEUNIT("\\192.168.2.1\ewald\Documents\src\mockpp\mockpp\mockpp\tests\OutBound_test.cpp"); +USEUNIT("..\mockpp\tests\OutBound_test.cpp"); //--------------------------------------------------------------------------- This file is used by the project manager only and should be treated like the project file main Index: chainmock.bpr =================================================================== RCS file: /cvsroot/mockpp/mockpp/bcb5/chainmock.bpr,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- chainmock.bpr 23 Jul 2005 17:37:31 -0000 1.17 +++ chainmock.bpr 24 Jul 2005 16:11:13 -0000 1.18 @@ -26,7 +26,7 @@ <USERDEFINES value="__DLL___"/> <SYSDEFINES value="NO_STRICT;_NO_VCL;_RTLDLL;USEPACKAGES"/> <MAINSOURCE value="chainmock.bpf"/> - <INCLUDEPATH value="..\mockpp\examples\tutorial;..;$(BCB)\include;"X:\cppunit-1.10.2\include\""/> + <INCLUDEPATH value="..\mockpp\examples\tutorial;..;$(BCB)\include;X:\cppunit-1.10.2\include\;..\..\cppunit-1.10.2\include"/> <LIBPATH value="..\mockpp\examples\tutorial;..\mockpp_30\examples\tutorial;$(BCB)\lib\obj;$(BCB)\lib"/> <WARNINGS value="-w-par"/> </MACROS> @@ -73,36 +73,36 @@ [HistoryLists\hlIncludePath] Count=30 -Item0=..\.;$(BCB)\include;..\..\..\cppunit-1.10.2\include -Item1=..\mockpp\examples\tutorial;..\mockpp_30\examples\tutorial;..\mockpp_30\examples;..\mockpp_30\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include -Item2=..\mockpp\examples\tutorial;..\mockpp_30\examples\tutorial;..\mockpp_30\examples;..\mockpp_30\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include -Item3=..\mockpp_30\examples\tutorial;..\mockpp_30\examples;..\mockpp_30\tests;..;$(BCB)\include;..\..\..\cppunit.ups\include -Item4=..\mockpp_30\examples\tutorial;..\mockpp_30\examples;..\mockpp_30\tests;..;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include -Item5=..\mockpp_30\examples;..\mockpp_30\tests;..\..\mockpp;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include -Item6=..\mockpp_30\tests;..;$(BCB)\include;..\..\cppunit\include;X:\src\cppunit-1.8.0\include -Item7=..\mockpp_30\tests;..;$(BCB)\include;..\..\cppunit\include -Item8=..\mockpp_30\tests;..;$(BCB)\include;B:\cvs\ups\src\3party\cppunit\include -Item9=..\mockpp_30\tests;..;$(BCB)\include;..\..\..\cppunit-1.8.0\include -Item10=..;$(BCB)\include;..\..\..\cppunit-1.8.0\include -Item11=..\mockpp_30\tests;\\SONNE\HOMES\src\mockpp_30\mockpp\mockpp_30\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.8.0\include -Item12=..;$(BCB)\include;X:\src\cppunit-1.8.0\include -Item13=\\SONNE\HOMES\src\mockpp_30\mockpp\mockpp_30\tests;..\..\mockpp;..\mockpp_30\tests;..\mockpp;..\expat;$(BCB)\include -Item14=..;..\mockpp_30\tests;..\mockpp;..\expat;$(BCB)\include -Item15=..\..\mockpp;..\mockpp_30\tests;..\mockpp;..\expat;$(BCB)\include -Item16=..\..\mockpp;..\mockpp_30\tests;..\mockpp;..\expat;$(BCB)\include;$(BCB)\include\vcl;C:\wx2\include\ -Item17=.. ;..\mockpp_30\tests;..\mockpp;..\expat;$(BCB)\include;$(BCB)\include\vcl;C:\wx2\include\ -Item18=.. ;..\mockpp_30\tests;..\expat;..\mockpp;$(BCB)\include;$(BCB)\include\vcl;C:\wx2\include -Item19=..\mockpp_30\tests;..\expat;..\mockpp;$(BCB)\include;$(BCB)\include\vcl -Item20=..\mockpp_30\tests;..\mockpp;$(BCB)\include;$(BCB)\include\vcl;expat -Item21=..\mockpp;$(BCB)\include;$(BCB)\include\vcl;expat -Item22=..\mockpp_30\tests;..\mockpp;$(BCB)\include;$(BCB)\include\vcl -Item23=..\mockpp_30\tests;..\mockpp;$(BCB)\include -Item24=..\mockpp_30\tests;..\mockpp;$(BCB)/include -Item25=..\mockpp_30\tests;..\mockpp -Item26=..\mockpp -Item27=..\mockpp_30\tests;..\mockpp_30\mockpp -Item28=..\mockpp_30\mockpp -Item29=..\mockpp_30\tests;..\mockpp_30\mockpp;$(BCB)\include;$(BCB)\include\vcl +Item0=..\mockpp\examples\tutorial;..;$(BCB)\include;X:\cppunit-1.10.2\include\;c:\home\arnold\cppunit-1.10.2\include\ +Item1=..\mockpp\examples\tutorial;..;$(BCB)\include;X:\cppunit-1.10.2\include\ +Item2=..\.;$(BCB)\include;..\..\..\cppunit-1.10.2\include +Item3=..\mockpp\examples\tutorial;..\mockpp_30\examples\tutorial;..\mockpp_30\examples;..\mockpp_30\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include +Item4=..\mockpp\examples\tutorial;..\mockpp_30\examples\tutorial;..\mockpp_30\examples;..\mockpp_30\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include +Item5=..\mockpp_30\examples\tutorial;..\mockpp_30\examples;..\mockpp_30\tests;..;$(BCB)\include;..\..\..\cppunit.ups\include +Item6=..\mockpp_30\examples\tutorial;..\mockpp_30\examples;..\mockpp_30\tests;..;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include +Item7=..\mockpp_30\examples;..\mockpp_30\tests;..\..\mockpp;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include +Item8=..\mockpp_30\tests;..;$(BCB)\include;..\..\cppunit\include;X:\src\cppunit-1.8.0\include +Item9=..\mockpp_30\tests;..;$(BCB)\include;..\..\cppunit\include +Item10=..\mockpp_30\tests;..;$(BCB)\include;B:\cvs\ups\src\3party\cppunit\include +Item11=..\mockpp_30\tests;..;$(BCB)\include;..\..\..\cppunit-1.8.0\include +Item12=..;$(BCB)\include;..\..\..\cppunit-1.8.0\include +Item13=..\mockpp_30\tests;\\SONNE\HOMES\src\mockpp_30\mockpp\mockpp_30\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.8.0\include +Item14=..;$(BCB)\include;X:\src\cppunit-1.8.0\include +Item15=\\SONNE\HOMES\src\mockpp_30\mockpp\mockpp_30\tests;..\..\mockpp;..\mockpp_30\tests;..\mockpp;..\expat;$(BCB)\include +Item16=..;..\mockpp_30\tests;..\mockpp;..\expat;$(BCB)\include +Item17=..\..\mockpp;..\mockpp_30\tests;..\mockpp;..\expat;$(BCB)\include +Item18=..\..\mockpp;..\mockpp_30\tests;..\mockpp;..\expat;$(BCB)\include;$(BCB)\include\vcl;C:\wx2\include\ +Item19=.. ;..\mockpp_30\tests;..\mockpp;..\expat;$(BCB)\include;$(BCB)\include\vcl;C:\wx2\include\ +Item20=.. ;..\mockpp_30\tests;..\expat;..\mockpp;$(BCB)\include;$(BCB)\include\vcl;C:\wx2\include +Item21=..\mockpp_30\tests;..\expat;..\mockpp;$(BCB)\include;$(BCB)\include\vcl +Item22=..\mockpp_30\tests;..\mockpp;$(BCB)\include;$(BCB)\include\vcl;expat +Item23=..\mockpp;$(BCB)\include;$(BCB)\include\vcl;expat +Item24=..\mockpp_30\tests;..\mockpp;$(BCB)\include;$(BCB)\include\vcl +Item25=..\mockpp_30\tests;..\mockpp;$(BCB)\include +Item26=..\mockpp_30\tests;..\mockpp;$(BCB)/include +Item27=..\mockpp_30\tests;..\mockpp +Item28=..\mockpp +Item29=..\mockpp_30\tests;..\mockpp_30\mockpp [HistoryLists\hlLibraryPath] Count=19 Index: jmock_test.bpr =================================================================== RCS file: /cvsroot/mockpp/mockpp/bcb5/jmock_test.bpr,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- jmock_test.bpr 23 Jul 2005 18:44:02 -0000 1.26 +++ jmock_test.bpr 24 Jul 2005 16:11:13 -0000 1.27 @@ -83,7 +83,7 @@ ibsmp50.bpi VCLDBX50.bpi TEEUI50.bpi TEEDB50.bpi TEE50.bpi TEEQR50.bpi VCLIB50.bpi bcbie50.bpi VCLIE50.bpi INETDB50.bpi INET50.bpi NMFAST50.bpi dclocx50.bpi bcb2kaxserver50.bpi"/> - <PATHCPP value=".;..\mockpp\tests;\\192.168.2.1\ewald\Documents\src\mockpp\mockpp\mockpp\tests"/> + <PATHCPP value=".;..\mockpp\tests"/> <PATHPAS value=".;"/> <PATHRC value=".;"/> <PATHASM value=".;"/> @@ -93,8 +93,8 @@ <USERDEFINES value="__DLL___"/> <SYSDEFINES value="NO_STRICT;_NO_VCL;_RTLDLL;USEPACKAGES"/> <MAINSOURCE value="jmock_test.bpf"/> - <INCLUDEPATH value="\\192.168.2.1\ewald\Documents\src\mockpp\mockpp\mockpp\tests;..\mockpp\tests;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include"/> - <LIBPATH value="\\192.168.2.1\ewald\Documents\src\mockpp\mockpp\mockpp\tests;..\mockpp\tests;..\mockpp_30\tests;$(BCB)\lib\obj;$(BCB)\lib"/> + <INCLUDEPATH value="..\tests;tests;C:\tests;\\192.168.2.1\ewald\Documents\src\mockpp\mockpp\mockpp\tests;..\mockpp\tests;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10.2\include"/> + <LIBPATH value="..\tests;tests;C:\tests;\\192.168.2.1\ewald\Documents\src\mockpp\mockpp\mockpp\tests;..\mockpp\tests;..\mockpp_30\tests;$(BCB)\lib\obj;$(BCB)\lib"/> <WARNINGS value="-w8092 -w8091 -w8090 -w8089 -w8087 -wprc -wuse -wucp -wstv -wstu -wsig -wpin -wnod -wnak -wdef -wcln -wbbf -wasm -wamp -wamb"/> </MACROS> @@ -141,56 +141,57 @@ [HistoryLists\hlIncludePath] Count=30 -Item0=..\mockpp\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include -Item1=..\mockpp\tests;.\..;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include\ -Item2=..\mockpp\tests;..\..\mockpp-1.8.0;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include\ -Item3=..;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include -Item4=..\mockpp\tests;..\mockpp_30\tests;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include -Item5=..\mockpp\tests;..\mockpp_30\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include -Item6=..\mockpp\tests;..\mockpp_30\tests;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include -Item7=..\..\mockpp;$(BCB)\include;..\..\..\cppunit.ups\include -Item8=mockpp\tests;mockpp\\tests;..\mockpp_30\Ctests;..\mockpp;\\SONNE\HOMES\Documents\src\mockpp_30\mockpp\mockpp_30\tests;\\SONNE\HOMES\src\mockpp_30\mockpp\mockpp_30\tests;..\mockpp_30\tests;..\..\mockpp;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include -Item9=\\SONNE\HOMES\src\mockpp_30\mockpp\mockpp_30\tests;..\mockpp_30\tests;..;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include -Item10=..;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include -Item11=..\mockpp_30\tests;..\..\mockpp;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include;.. -Item12=..\mockpp_30\tests;..\..\mockpp;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include -Item13=..\mockpp_30\tests;..;$(BCB)\include;..\..\cppunit\include;X:\src\cppunit-1.8.0\include -Item14=..\mockpp_30\tests;..;$(BCB)\include;..\..\cppunit\include -Item15=..\mockpp_30\tests;..;$(BCB)\include;B:\cvs\ups\src\3party\cppunit\include -Item16=..\mockpp_30\tests;..;$(BCB)\include;..\..\..\cppunit-1.8.0\include -Item17=..;$(BCB)\include;..\..\..\cppunit-1.8.0\include -Item18=..\mockpp_30\tests;\\SONNE\HOMES\src\mockpp_30\mockpp\mockpp_30\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.8.0\include -Item19=..;$(BCB)\include;X:\src\cppunit-1.8.0\include -Item20=\\SONNE\HOMES\src\mockpp_30\mockpp\mockpp_30\tests;..\..\mockpp;..\mockpp_30\tests;..\mockpp;..\expat;$(BCB)\include -Item21=..;..\mockpp_30\tests;..\mockpp;..\expat;$(BCB)\include -Item22=..\..\mockpp;..\mockpp_30\tests;..\mockpp;..\expat;$(BCB)\include -Item23=..\..\mockpp;..\mockpp_30\tests;..\mockpp;..\expat;$(BCB)\include;$(BCB)\include\vcl;C:\wx2\include\ -Item24=.. ;..\mockpp_30\tests;..\mockpp;..\expat;$(BCB)\include;$(BCB)\include\vcl;C:\wx2\include\ -Item25=.. ;..\mockpp_30\tests;..\expat;..\mockpp;$(BCB)\include;$(BCB)\include\vcl;C:\wx2\include -Item26=..\mockpp_30\tests;..\expat;..\mockpp;$(BCB)\include;$(BCB)\include\vcl -Item27=..\mockpp_30\tests;..\mockpp;$(BCB)\include;$(BCB)\include\vcl;expat -Item28=..\mockpp;$(BCB)\include;$(BCB)\include\vcl;expat -Item29=..\mockpp_30\tests;..\mockpp;$(BCB)\include;$(BCB)\include\vcl +Item0=..\mockpp\tests;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;c:\home\arnold\cppunit-1.10.2\include +Item1=\\192.168.2.1\ewald\Documents\src\mockpp\mockpp\mockpp\tests;..\mockpp\tests;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include +Item2=..\mockpp\tests;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include +Item3=..\mockpp\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include +Item4=..\mockpp\tests;.\..;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include\ +Item5=..\mockpp\tests;..\..\mockpp-1.8.0;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include\ +Item6=..;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include +Item7=..\mockpp\tests;..\mockpp_30\tests;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include +Item8=..\mockpp\tests;..\mockpp_30\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include +Item9=..\mockpp\tests;..\mockpp_30\tests;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include +Item10=..\..\mockpp;$(BCB)\include;..\..\..\cppunit.ups\include +Item11=mockpp\tests;mockpp\\tests;..\mockpp_30\Ctests;..\mockpp;\\SONNE\HOMES\Documents\src\mockpp_30\mockpp\mockpp_30\tests;\\SONNE\HOMES\src\mockpp_30\mockpp\mockpp_30\tests;..\mockpp_30\tests;..\..\mockpp;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include +Item12=\\SONNE\HOMES\src\mockpp_30\mockpp\mockpp_30\tests;..\mockpp_30\tests;..;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include +Item13=..;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include +Item14=..\mockpp_30\tests;..\..\mockpp;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include;.. +Item15=..\mockpp_30\tests;..\..\mockpp;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include +Item16=..\mockpp_30\tests;..;$(BCB)\include;..\..\cppunit\include;X:\src\cppunit-1.8.0\include +Item17=..\mockpp_30\tests;..;$(BCB)\include;..\..\cppunit\include +Item18=..\mockpp_30\tests;..;$(BCB)\include;B:\cvs\ups\src\3party\cppunit\include +Item19=..\mockpp_30\tests;..;$(BCB)\include;..\..\..\cppunit-1.8.0\include +Item20=..;$(BCB)\include;..\..\..\cppunit-1.8.0\include +Item21=..\mockpp_30\tests;\\SONNE\HOMES\src\mockpp_30\mockpp\mockpp_30\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.8.0\include +Item22=..;$(BCB)\include;X:\src\cppunit-1.8.0\include +Item23=\\SONNE\HOMES\src\mockpp_30\mockpp\mockpp_30\tests;..\..\mockpp;..\mockpp_30\tests;..\mockpp;..\expat;$(BCB)\include +Item24=..;..\mockpp_30\tests;..\mockpp;..\expat;$(BCB)\include +Item25=..\..\mockpp;..\mockpp_30\tests;..\mockpp;..\expat;$(BCB)\include +Item26=..\..\mockpp;..\mockpp_30\tests;..\mockpp;..\expat;$(BCB)\include;$(BCB)\include\vcl;C:\wx2\include\ +Item27=.. ;..\mockpp_30\tests;..\mockpp;..\expat;$(BCB)\include;$(BCB)\include\vcl;C:\wx2\include\ +Item28=.. ;..\mockpp_30\tests;..\expat;..\mockpp;$(BCB)\include;$(BCB)\include\vcl;C:\wx2\include +Item29=..\mockpp_30\tests;..\expat;..\mockpp;$(BCB)\include;$(BCB)\include\vcl [HistoryLists\hlLibraryPath] -Count=17 -Item0=..\mockpp\tests;..\mockpp_30\tests;$(BCB)\lib\obj;$(BCB)\lib -Item1=$(BCB)\lib\obj;$(BCB)\lib -Item2=mockpp\tests;mockpp\\tests;..\mockpp_30\Ctests;..\mockpp;\\SONNE\HOMES\Documents\src\mockpp_30\mockpp\mockpp_30\tests;\\SONNE\HOMES\src\mockpp_30\mockpp\mockpp_30\tests;..\mockpp_30\tests;..\expat;$(BCB)\lib\obj;$(BCB)\lib -Item3=\\SONNE\HOMES\src\mockpp_30\mockpp\mockpp_30\tests;..\mockpp_30\tests;..\expat;$(BCB)\lib\obj;$(BCB)\lib -Item4=..\mockpp_30\tests;..\expat;$(BCB)\lib\obj;$(BCB)\lib -Item5=..\mockpp_30\tests;$(BCB)\lib\obj;$(BCB)\lib;output;expat -Item6=..\mockpp_30\tests;$(BCB)\lib\obj;$(BCB)\lib;output;bin -Item7=..\mockpp_30\apps;$(BCB)\lib\obj;$(BCB)\lib;output;bin -Item8=..\mockpp_30\apps;$(BCB)\lib\obj;$(BCB)\lib;output -Item9=..\mockpp_30\apps;$(BCB)\lib\obj;$(BCB)\lib;E:\Eigene Dateien\c++\mockpp_30\bcb5\output -Item10=..\mockpp_30\apps;$(BCB)\lib\obj;$(BCB)\lib;..\output -Item11=..\mockpp_30\apps;$(BCB)\lib\obj;$(BCB)\lib -Item12=..\mockpp_30\apps;D:\CBuilder5\mockpp_30\;$(BCB)\lib\obj;$(BCB)\lib -Item13=e:\Eigene Dateien\c++\mockpp_30\mockpp\apps\;..\mockpp;$(BCB)\lib\obj;$(BCB)\lib -Item14=e:\Eigene Dateien\c++\mockpp_30\mockpp\apps;..\mockpp;$(BCB)\lib\obj;$(BCB)\lib -Item15=..\mockpp;$(BCB)\lib\obj;$(BCB)\lib -Item16=e:\Eigene Dateien\c++\mockpp_30\mockpp\apps;$(BCB)\lib\obj;$(BCB)\lib +Count=18 +Item0=\\192.168.2.1\ewald\Documents\src\mockpp\mockpp\mockpp\tests;..\mockpp\tests;..\mockpp_30\tests;$(BCB)\lib\obj;$(BCB)\lib +Item1=..\mockpp\tests;..\mockpp_30\tests;$(BCB)\lib\obj;$(BCB)\lib +Item2=$(BCB)\lib\obj;$(BCB)\lib +Item3=mockpp\tests;mockpp\\tests;..\mockpp_30\Ctests;..\mockpp;\\SONNE\HOMES\Documents\src\mockpp_30\mockpp\mockpp_30\tests;\\SONNE\HOMES\src\mockpp_30\mockpp\mockpp_30\tests;..\mockpp_30\tests;..\expat;$(BCB)\lib\obj;$(BCB)\lib +Item4=\\SONNE\HOMES\src\mockpp_30\mockpp\mockpp_30\tests;..\mockpp_30\tests;..\expat;$(BCB)\lib\obj;$(BCB)\lib +Item5=..\mockpp_30\tests;..\expat;$(BCB)\lib\obj;$(BCB)\lib +Item6=..\mockpp_30\tests;$(BCB)\lib\obj;$(BCB)\lib;output;expat +Item7=..\mockpp_30\tests;$(BCB)\lib\obj;$(BCB)\lib;output;bin +Item8=..\mockpp_30\apps;$(BCB)\lib\obj;$(BCB)\lib;output;bin +Item9=..\mockpp_30\apps;$(BCB)\lib\obj;$(BCB)\lib;output +Item10=..\mockpp_30\apps;$(BCB)\lib\obj;$(BCB)\lib;E:\Eigene Dateien\c++\mockpp_30\bcb5\output +Item11=..\mockpp_30\apps;$(BCB)\lib\obj;$(BCB)\lib;..\output +Item12=..\mockpp_30\apps;$(BCB)\lib\obj;$(BCB)\lib +Item13=..\mockpp_30\apps;D:\CBuilder5\mockpp_30\;$(BCB)\lib\obj;$(BCB)\lib +Item14=e:\Eigene Dateien\c++\mockpp_30\mockpp\apps\;..\mockpp;$(BCB)\lib\obj;$(BCB)\lib +Item15=e:\Eigene Dateien\c++\mockpp_30\mockpp\apps;..\mockpp;$(BCB)\lib\obj;$(BCB)\lib +Item16=..\mockpp;$(BCB)\lib\obj;$(BCB)\lib +Item17=e:\Eigene Dateien\c++\mockpp_30\mockpp\apps;$(BCB)\lib\obj;$(BCB)\lib [HistoryLists\hlDebugSourcePath] Count=1 Index: mockpp.bpr =================================================================== RCS file: /cvsroot/mockpp/mockpp/bcb5/mockpp.bpr,v retrieving revision 1.43 retrieving revision 1.44 diff -u -d -r1.43 -r1.44 --- mockpp.bpr 23 Jul 2005 17:37:31 -0000 1.43 +++ mockpp.bpr 24 Jul 2005 16:11:13 -0000 1.44 @@ -62,8 +62,8 @@ <USERDEFINES value="__DLL___;_DEBUG"/> <SYSDEFINES value="NO_STRICT;_NO_VCL;_RTLDLL;USEPACKAGES"/> <MAINSOURCE value="mockpp.bpf"/> - <INCLUDEPATH value="..\mockpp\matcher;..;..\mockpp\constraint;..\mockpp\stub;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..;$(BCB)\include;"X:\Documents\src\cppunit-1.10.2\include\""/> - <LIBPATH value="mockpp;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp;..\mockpp\production;..mockpp\builder;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\constraint;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\mockpp_30\matcher;..\mockpp_30\constraint;..\mockpp_30\builder;..\mockpp;..\mockpp_30\chaining;..\mockpp_30\compat;..\mockpp_30\util;..\..\mockpp;$(BCB)\lib\obj;$(BCB)\lib"/> + <INCLUDEPATH value="..\mockpp\constraint;..\mockpp\stub;..\mockpp\builder;..\mockpp\matcher;..;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include\;..\..\cppunit-1.10.2\include"/> + <LIBPATH value="mockpp;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp;..\mockpp\production;..mockpp\builder;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\constraint;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\mockpp_30\matcher;..\mockpp_30\constraint;..\mockpp_30\builder;..\mockpp;..\mockpp_30\chaining;..\mockpp_30\compat;..\mockpp_30\util;..;$(BCB)\lib\obj;$(BCB)\lib"/> <WARNINGS value="-w8092 -w8091 -w8090 -w8089 -w8087 -wprc -wuse -wucp -wstv -wstu -wpin -wnod -wnak -wdef -wcln -wbbf -wasm -wamp -wamb"/> </MACROS> @@ -111,36 +111,36 @@ [HistoryLists\hlIncludePath] Count=30 -Item0=..\mockpp\matcher;..\mockpp\constraint;..\mockpp\stub;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\..\mockpp-1.8.0;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include\ -Item1=..\mockpp\matcher;..\mockpp\constraint;..\mockpp\stub;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include\ -Item2=..;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include\ -Item3=..\mockpp\matcher;..\mockpp\constraint;..\mockpp\stub;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;$(BCB)\include;..\..\cppunit-1.10\include;X:\Documents\src\cppunit-1.10.2\include\ -Item4=$(BCB)\include;..\..\cppunit-1.10\include;X:\Documents\src\cppunit-1.10.2\include -Item5=..\mockpp\matcher;..\mockpp\constraint;..\mockpp\stub;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\..\mockpp-1.8.0;X:\cppunit-1.10.2\include\;..\..\mockpp;$(BCB)\include;..\..\cppunit-1.10\include -Item6=..;X:\cppunit-1.10.2\include\;..\..\mockpp;$(BCB)\include;..\..\cppunit-1.10\include -Item7=..\mockpp;..\..\mockpp-1.8.0;..\mockpp\production;..mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\..\mockpp;$(BCB)\include;X:\cppunit-1.10.2\include\;..\..\cppunit-1.10\include -Item8=..;..\mockpp\production;..mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\..\mockpp;$(BCB)\include;X:\cppunit-1.10.2\include\;..\..\cppunit-1.10\include -Item9=..\mockpp;..\mockpp\production;..mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\..\mockpp;$(BCB)\include;X:\cppunit-1.10.2\include\;..\..\cppunit-1.10\include -Item10=..\mockpp;..\mockpp\production;..mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include -Item11=mockpp;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp;..\mockpp\production;..mockpp\builder;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\constraint;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include -Item12=..\mockpp\production;..mockpp\builder;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\constraint;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include -Item13=..mockpp\builder;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\constraint;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include -Item14=..mockpp\builder;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\constraint;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include -Item15=..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include -Item16=..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include -Item17=..;$(BCB)\include;..\..\..\cppunit-1.10.2\include -Item18=..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\..\cppunit-1.10\include -Item19=..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\..\cppunit-1.10\include -Item20=..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\mockpp_30\matcher;..\mockpp_30\constraint;..\mockpp_30\builder;..\mockpp;..\mockpp_30\chaining;..\mockpp_30\compat;..\mockpp_30\util;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include -Item21=..\..\mockpp;$(BCB)\include;..\..\..\cppunit.ups\include -Item22=..\mockpp_30\matcher;..\mockpp_30\constraint;..\mockpp_30\builder;..\mockpp_30\chaining;..\mockpp_30\compat;..\mockpp_30\util;..\mockpp;..\..\mockpp;$(BCB)\include;..\..\..\cppunit.ups\include -Item23=..\mockpp;..;$(BCB)\include;..\..\..\cppunit.ups\include -Item24=..\mockpp_30\builder;..\mockpp_30\matcher;..\mockpp_30\constraint;..\builder;\\SONNE\HOMES\Documents\src\mockpp_30\mockpp\mockpp_30\matcher;\\SONNE\HOMES\Documents\src\mockpp_30\mockpp\mockpp_30\constraint;\\SONNE\HOMES\Documents\src\mockpp_30\mockpp\mockpp_30\builder;..\mockpp_30\chaining;\\SONNE\HOMES\Documents\src\mockpp_30\mockpp\mockpp;\\SONNE\HOMES\Documents\src\mockpp_30\mockpp\mockpp_30\chaining;mockpp;\\SONNE\HOMES\src\mockpp_30\mockpp\mockpp;..\mockpp_30\compat;..\mockpp_30\util;..\mockpp;..;$(BCB)\include;..\..\..\cppunit-1.8.0\include -Item25=..\mockpp_30\builder;..\mockpp_30\matcher;..\mockpp_30\constraint;..\builder;\\SONNE\HOMES\Documents\src\mockpp_30\mockpp\mockpp_30\matcher;\\SONNE\HOMES\Documents\src\mockpp_30\mockpp\mockpp_30\constraint;\\SONNE\HOMES\Documents\src\mockpp_30\mockpp\mockpp_30\builder;..\mockpp_30\chaining;\\SONNE\HOMES\Documents\src\mockpp_30\mockpp\mockpp;\\SONNE\HOMES\Documents\src\mockpp_30\mockpp\mockpp_30\chaining;mockpp;\\SONNE\HOMES\src\mockpp_30\mockpp\mockpp;..\mockpp_30\compat;..\mockpp_30\util;..\mockpp;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.8.0\include -Item26=mockpp;\\SONNE\HOMES\src\mockpp_30\mockpp\mockpp;..\mockpp_30\compat;..\mockpp_30\util;..\mockpp;..\..\mockpp;$(BCB)\include;X:\Documents\src\cppunit-1.8.0\include -Item27=mockpp;\\SONNE\HOMES\src\mockpp_30\mockpp\mockpp;..\mockpp_30\compat;..\mockpp_30\util;..\mockpp;..\..\mockpp;$(BCB)\include -Item28=mockpp;\\SONNE\HOMES\src\mockpp_30\mockpp\mockpp;..\mockpp_30\compat;..\mockpp_30\util;..\mockpp;..;$(BCB)\include -Item29=..;$(BCB)\include +Item0=..\mockpp\matcher;..;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include\;c:\home\arnold\cppunit-1.10.2\include\ +Item1=..\mockpp\matcher;..;..\mockpp\constraint;..\mockpp\stub;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include\ +Item2=..\mockpp\matcher;..\mockpp\constraint;..\mockpp\stub;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\..\mockpp-1.8.0;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include\ +Item3=..\mockpp\matcher;..\mockpp\constraint;..\mockpp\stub;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include\ +Item4=..;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include\ +Item5=..\mockpp\matcher;..\mockpp\constraint;..\mockpp\stub;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;$(BCB)\include;..\..\cppunit-1.10\include;X:\Documents\src\cppunit-1.10.2\include\ +Item6=$(BCB)\include;..\..\cppunit-1.10\include;X:\Documents\src\cppunit-1.10.2\include +Item7=..\mockpp\matcher;..\mockpp\constraint;..\mockpp\stub;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\..\mockpp-1.8.0;X:\cppunit-1.10.2\include\;..\..\mockpp;$(BCB)\include;..\..\cppunit-1.10\include +Item8=..;X:\cppunit-1.10.2\include\;..\..\mockpp;$(BCB)\include;..\..\cppunit-1.10\include +Item9=..\mockpp;..\..\mockpp-1.8.0;..\mockpp\production;..mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\..\mockpp;$(BCB)\include;X:\cppunit-1.10.2\include\;..\..\cppunit-1.10\include +Item10=..;..\mockpp\production;..mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\..\mockpp;$(BCB)\include;X:\cppunit-1.10.2\include\;..\..\cppunit-1.10\include +Item11=..\mockpp;..\mockpp\production;..mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\..\mockpp;$(BCB)\include;X:\cppunit-1.10.2\include\;..\..\cppunit-1.10\include +Item12=..\mockpp;..\mockpp\production;..mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include +Item13=mockpp;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp;..\mockpp\production;..mockpp\builder;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\constraint;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include +Item14=..\mockpp\production;..mockpp\builder;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\constraint;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include +Item15=..mockpp\builder;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\constraint;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include +Item16=..mockpp\builder;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\constraint;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include +Item17=..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include +Item18=..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include +Item19=..;$(BCB)\include;..\..\..\cppunit-1.10.2\include +Item20=..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\..\cppunit-1.10\include +Item21=..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\..\cppunit-1.10\include +Item22=..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\mockpp_30\matcher;..\mockpp_30\constraint;..\mockpp_30\builder;..\mockpp;..\mockpp_30\chaining;..\mockpp_30\compat;..\mockpp_30\util;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include +Item23=..\..\mockpp;$(BCB)\include;..\..\..\cppunit.ups\include +Item24=..\mockpp_30\matcher;..\mockpp_30\constraint;..\mockpp_30\builder;..\mockpp_30\chaining;..\mockpp_30\compat;..\mockpp_30\util;..\mockpp;..\..\mockpp;$(BCB)\include;..\..\..\cppunit.ups\include +Item25=..\mockpp;..;$(BCB)\include;..\..\..\cppunit.ups\include +Item26=..\mockpp_30\builder;..\mockpp_30\matcher;..\mockpp_30\constraint;..\builder;\\SONNE\HOMES\Documents\src\mockpp_30\mockpp\mockpp_30\matcher;\\SONNE\HOMES\Documents\src\mockpp_30\mockpp\mockpp_30\constraint;\\SONNE\HOMES\Documents\src\mockpp_30\mockpp\mockpp_30\builder;..\mockpp_30\chaining;\\SONNE\HOMES\Documents\src\mockpp_30\mockpp\mockpp;\\SONNE\HOMES\Documents\src\mockpp_30\mockpp\mockpp_30\chaining;mockpp;\\SONNE\HOMES\src\mockpp_30\mockpp\mockpp;..\mockpp_30\compat;..\mockpp_30\util;..\mockpp;..;$(BCB)\include;..\..\..\cppunit-1.8.0\include +Item27=..\mockpp_30\builder;..\mockpp_30\matcher;..\mockpp_30\constraint;..\builder;\\SONNE\HOMES\Documents\src\mockpp_30\mockpp\mockpp_30\matcher;\\SONNE\HOMES\Documents\src\mockpp_30\mockpp\mockpp_30\constraint;\\SONNE\HOMES\Documents\src\mockpp_30\mockpp\mockpp_30\builder;..\mockpp_30\chaining;\\SONNE\HOMES\Documents\src\mockpp_30\mockpp\mockpp;\\SONNE\HOMES\Documents\src\mockpp_30\mockpp\mockpp_30\chaining;mockpp;\\SONNE\HOMES\src\mockpp_30\mockpp\mockpp;..\mockpp_30\compat;..\mockpp_30\util;..\mockpp;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.8.0\include +Item28=mockpp;\\SONNE\HOMES\src\mockpp_30\mockpp\mockpp;..\mockpp_30\compat;..\mockpp_30\util;..\mockpp;..\..\mockpp;$(BCB)\include;X:\Documents\src\cppunit-1.8.0\include +Item29=mockpp;\\SONNE\HOMES\src\mockpp_30\mockpp\mockpp;..\mockpp_30\compat;..\mockpp_30\util;..\mockpp;..\..\mockpp;$(BCB)\include [HistoryLists\hlLibraryPath] Count=18 Index: cppunit.bpr =================================================================== RCS file: /cvsroot/mockpp/mockpp/bcb5/cppunit.bpr,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- cppunit.bpr 23 Jul 2005 17:37:31 -0000 1.19 +++ cppunit.bpr 24 Jul 2005 16:11:13 -0000 1.20 @@ -25,7 +25,7 @@ <USERDEFINES value="__DLL___"/> <SYSDEFINES value="NO_STRICT;_NO_VCL;_RTLDLL;USEPACKAGES"/> <MAINSOURCE value="cppunit.bpf"/> - <INCLUDEPATH value="..\mockpp\examples\tutorial;..;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include"/> + <INCLUDEPATH value="..\mockpp\examples\tutorial;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10.2\include"/> <LIBPATH value="..\mockpp\examples\tutorial;C:\Programme\Borland\CBuilder5\Projects\;..\mockpp_30\examples\tutorial;$(BCB)\lib\obj;$(BCB)\lib"/> <WARNINGS value="-w-par"/> </MACROS> @@ -72,36 +72,36 @@ [HistoryLists\hlIncludePath] Count=30 -Item0=..\mockpp\examples\tutorial;..;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include\ -Item1=..\mockpp\examples\tutorial;..\..\mockpp-1.8.0;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include\ -Item2=..;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include -Item3=..\mockpp\examples\tutorial;..\mockpp_30\examples\tutorial;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include -Item4=..\mockpp\examples\tutorial;..\mockpp_30\examples\tutorial;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10.2\include -Item5=..\mockpp\examples\tutorial;..\mockpp_30\examples\tutorial;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\..\..\cppunit-1.10.2\include -Item6=..\mockpp\examples\tutorial;..\mockpp_30\examples\tutorial;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include -Item7=..\mockpp\examples\tutorial;..\mockpp_30\examples\tutorial;..;$(BCB)\include;..\..\..\cppunit.ups\include -Item8=..\mockpp_30\examples\tutorial;..\..\mockpp;$(BCB)\include;..\..\..\cppunit.ups\include -Item9=..\mockpp_30\examples\tutorial;..\..\..\..\src;$(BCB)\include;..\..\..\cppunit.ups\include -Item10=..\mockpp_30\examples\tutorial;..\..\..;$(BCB)\include;..\..\..\cppunit.ups\include -Item11=..\mockpp_30\examples\tutorial;..\..\..\mockpp;$(BCB)\include;..\..\..\cppunit.ups\include -Item12=..\..;$(BCB)\include;..\..\..\cppunit.ups\include -Item13=..;$(BCB)\include;..\..\..\cppunit.ups\include -Item14=C:\Programme\Borland\CBuilder5\Projects;..\mockpp_30\examples\tutorial;..\mockpp_30\examples;..;$(BCB)\include;..\..\..\cppunit.ups\include -Item15=..\mockpp_30\examples\tutorial;..\mockpp_30\examples;..\..\mockpp;$(BCB)\include;..\..\..\cppunit.ups\include -Item16=..\mockpp_30\examples\tutorial;..\mockpp_30\examples;..\mockpp_30\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit.ups\include -Item17=..\mockpp_30\examples\tutorial;..\mockpp_30\examples;..\mockpp_30\tests;..;$(BCB)\include;..\..\..\cppunit.ups\include -Item18=..\mockpp_30\examples\tutorial;..\mockpp_30\examples;..\mockpp_30\tests;..;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include -Item19=..\mockpp_30\examples;..\mockpp_30\tests;..\..\mockpp;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include -Item20=..\mockpp_30\tests;..;$(BCB)\include;..\..\cppunit\include;X:\src\cppunit-1.8.0\include -Item21=..\mockpp_30\tests;..;$(BCB)\include;..\..\cppunit\include -Item22=..\mockpp_30\tests;..;$(BCB)\include;B:\cvs\ups\src\3party\cppunit\include -Item23=..\mockpp_30\tests;..;$(BCB)\include;..\..\..\cppunit-1.8.0\include -Item24=..;$(BCB)\include;..\..\..\cppunit-1.8.0\include -Item25=..\mockpp_30\tests;\\SONNE\HOMES\src\mockpp_30\mockpp\mockpp_30\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.8.0\include -Item26=..;$(BCB)\include;X:\src\cppunit-1.8.0\include -Item27=\\SONNE\HOMES\src\mockpp_30\mockpp\mockpp_30\tests;..\..\mockpp;..\mockpp_30\tests;..\mockpp;..\expat;$(BCB)\include -Item28=..;..\mockpp_30\tests;..\mockpp;..\expat;$(BCB)\include -Item29=..\..\mockpp;..\mockpp_30\tests;..\mockpp;..\expat;$(BCB)\include +Item0=..\mockpp\examples\tutorial;..;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include;c:\home\arnold\cppunit-1.10.2\include +Item1=..\mockpp\examples\tutorial;..;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include +Item2=..\mockpp\examples\tutorial;..;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include\ +Item3=..\mockpp\examples\tutorial;..\..\mockpp-1.8.0;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include\ +Item4=..;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include +Item5=..\mockpp\examples\tutorial;..\mockpp_30\examples\tutorial;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include +Item6=..\mockpp\examples\tutorial;..\mockpp_30\examples\tutorial;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10.2\include +Item7=..\mockpp\examples\tutorial;..\mockpp_30\examples\tutorial;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\..\..\cppunit-1.10.2\include +Item8=..\mockpp\examples\tutorial;..\mockpp_30\examples\tutorial;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include +Item9=..\mockpp\examples\tutorial;..\mockpp_30\examples\tutorial;..;$(BCB)\include;..\..\..\cppunit.ups\include +Item10=..\mockpp_30\examples\tutorial;..\..\mockpp;$(BCB)\include;..\..\..\cppunit.ups\include +Item11=..\mockpp_30\examples\tutorial;..\..\..\..\src;$(BCB)\include;..\..\..\cppunit.ups\include +Item12=..\mockpp_30\examples\tutorial;..\..\..;$(BCB)\include;..\..\..\cppunit.ups\include +Item13=..\mockpp_30\examples\tutorial;..\..\..\mockpp;$(BCB)\include;..\..\..\cppunit.ups\include +Item14=..\..;$(BCB)\include;..\..\..\cppunit.ups\include +Item15=..;$(BCB)\include;..\..\..\cppunit.ups\include +Item16=C:\Programme\Borland\CBuilder5\Projects;..\mockpp_30\examples\tutorial;..\mockpp_30\examples;..;$(BCB)\include;..\..\..\cppunit.ups\include +Item17=..\mockpp_30\examples\tutorial;..\mockpp_30\examples;..\..\mockpp;$(BCB)\include;..\..\..\cppunit.ups\include +Item18=..\mockpp_30\examples\tutorial;..\mockpp_30\examples;..\mockpp_30\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit.ups\include +Item19=..\mockpp_30\examples\tutorial;..\mockpp_30\examples;..\mockpp_30\tests;..;$(BCB)\include;..\..\..\cppunit.ups\include +Item20=..\mockpp_30\examples\tutorial;..\mockpp_30\examples;..\mockpp_30\tests;..;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include +Item21=..\mockpp_30\examples;..\mockpp_30\tests;..\..\mockpp;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include +Item22=..\mockpp_30\tests;..;$(BCB)\include;..\..\cppunit\include;X:\src\cppunit-1.8.0\include +Item23=..\mockpp_30\tests;..;$(BCB)\include;..\..\cppunit\include +Item24=..\mockpp_30\tests;..;$(BCB)\include;B:\cvs\ups\src\3party\cppunit\include +Item25=..\mockpp_30\tests;..;$(BCB)\include;..\..\..\cppunit-1.8.0\include +Item26=..;$(BCB)\include;..\..\..\cppunit-1.8.0\include +Item27=..\mockpp_30\tests;\\SONNE\HOMES\src\mockpp_30\mockpp\mockpp_30\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.8.0\include +Item28=..;$(BCB)\include;X:\src\cppunit-1.8.0\include +Item29=\\SONNE\HOMES\src\mockpp_30\mockpp\mockpp_30\tests;..\..\mockpp;..\mockpp_30\tests;..\mockpp;..\expat;$(BCB)\include [HistoryLists\hlLibraryPath] Count=21 Index: mock_test.bpr =================================================================== RCS file: /cvsroot/mockpp/mockpp/bcb5/mock_test.bpr,v retrieving revision 1.37 retrieving revision 1.38 diff -u -d -r1.37 -r1.38 --- mock_test.bpr 23 Jul 2005 17:37:31 -0000 1.37 +++ mock_test.bpr 24 Jul 2005 16:11:13 -0000 1.38 @@ -63,7 +63,7 @@ <USERDEFINES value="__DLL___"/> <SYSDEFINES value="NO_STRICT;_NO_VCL;_RTLDLL;USEPACKAGES"/> <MAINSOURCE value="mock_test.bpf"/> - <INCLUDEPATH value="..\mockpp\tests;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include"/> + <INCLUDEPATH value="..\mockpp\tests;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10.2\include"/> <LIBPATH value="..\mockpp\tests;..\mockpp_30\tests;$(BCB)\lib\obj;$(BCB)\lib"/> <WARNINGS value="-w8092 -w8091 -w8090 -w8089 -w8087 -wprc -wuse -wucp -wstv -wstu -wpin -wnod -wnak -wdef -wcln -wbbf -wasm -wamp -wamb"/> @@ -111,36 +111,36 @@ [HistoryLists\hlIncludePath] Count=30 -Item0=..\mockpp\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include -Item1=..\mockpp\tests;.\..;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include\ -Item2=..\mockpp\tests;..\..\mockpp-1.8.0;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include\ -Item3=..;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include -Item4=..\mockpp\tests;..\mockpp_30\tests;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include -Item5=..\mockpp\tests;..\mockpp_30\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include -Item6=..\mockpp\tests;..\mockpp_30\tests;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include -Item7=..\..\mockpp;$(BCB)\include;..\..\..\cppunit.ups\include -Item8=..\tests;tests;\\SONNE\HOMES\Documents\src\mockpp_30\mockpp\mockpp_30\tests;\\SONNE\HOMES\src\mockpp_30\mockpp\mockpp_30\tests;..\mockpp_30\tests;..;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include -Item9=..;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include -Item10=..\mockpp_30\tests;..\..\mockpp;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include;.. -Item11=..\mockpp_30\tests;..\..\mockpp;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include -Item12=..\mockpp_30\tests;..;$(BCB)\include;..\..\cppunit\include;X:\src\cppunit-1.8.0\include -Item13=..\mockpp_30\tests;..;$(BCB)\include;..\..\cppunit\include -Item14=..\mockpp_30\tests;..;$(BCB)\include;B:\cvs\ups\src\3party\cppunit\include -Item15=..\mockpp_30\tests;..;$(BCB)\include;..\..\..\cppunit-1.8.0\include -Item16=..;$(BCB)\include;..\..\..\cppunit-1.8.0\include -Item17=..\mockpp_30\tests;\\SONNE\HOMES\src\mockpp_30\mockpp\mockpp_30\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.8.0\include -Item18=..;$(BCB)\include;X:\src\cppunit-1.8.0\include -Item19=\\SONNE\HOMES\src\mockpp_30\mockpp\mockpp_30\tests;..\..\mockpp;..\mockpp_30\tests;..\mockpp;..\expat;$(BCB)\include -Item20=..;..\mockpp_30\tests;..\mockpp;..\expat;$(BCB)\include -Item21=..\..\mockpp;..\mockpp_30\tests;..\mockpp;..\expat;$(BCB)\include -Item22=..\..\mockpp;..\mockpp_30\tests;..\mockpp;..\expat;$(BCB)\include;$(BCB)\include\vcl;C:\wx2\include\ -Item23=.. ;..\mockpp_30\tests;..\mockpp;..\expat;$(BCB)\include;$(BCB)\include\vcl;C:\wx2\include\ -Item24=.. ;..\mockpp_30\tests;..\expat;..\mockpp;$(BCB)\include;$(BCB)\include\vcl;C:\wx2\include -Item25=..\mockpp_30\tests;..\expat;..\mockpp;$(BCB)\include;$(BCB)\include\vcl -Item26=..\mockpp_30\tests;..\mockpp;$(BCB)\include;$(BCB)\include\vcl;expat -Item27=..\mockpp;$(BCB)\include;$(BCB)\include\vcl;expat -Item28=..\mockpp_30\tests;..\mockpp;$(BCB)\include;$(BCB)\include\vcl -Item29=..\mockpp_30\tests;..\mockpp;$(BCB)\include +Item0=..\mockpp\tests;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;c:\home\arnold\cppunit-1.10.2\include +Item1=..\mockpp\tests;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include +Item2=..\mockpp\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include +Item3=..\mockpp\tests;.\..;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include\ +Item4=..\mockpp\tests;..\..\mockpp-1.8.0;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include\ +Item5=..;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include +Item6=..\mockpp\tests;..\mockpp_30\tests;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include +Item7=..\mockpp\tests;..\mockpp_30\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include +Item8=..\mockpp\tests;..\mockpp_30\tests;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include +Item9=..\..\mockpp;$(BCB)\include;..\..\..\cppunit.ups\include +Item10=..\tests;tests;\\SONNE\HOMES\Documents\src\mockpp_30\mockpp\mockpp_30\tests;\\SONNE\HOMES\src\mockpp_30\mockpp\mockpp_30\tests;..\mockpp_30\tests;..;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include +Item11=..;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include +Item12=..\mockpp_30\tests;..\..\mockpp;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include;.. +Item13=..\mockpp_30\tests;..\..\mockpp;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include +Item14=..\mockpp_30\tests;..;$(BCB)\include;..\..\cppunit\include;X:\src\cppunit-1.8.0\include +Item15=..\mockpp_30\tests;..;$(BCB)\include;..\..\cppunit\include +Item16=..\mockpp_30\tests;..;$(BCB)\include;B:\cvs\ups\src\3party\cppunit\include +Item17=..\mockpp_30\tests;..;$(BCB)\include;..\..\..\cppunit-1.8.0\include +Item18=..;$(BCB)\include;..\..\..\cppunit-1.8.0\include +Item19=..\mockpp_30\tests;\\SONNE\HOMES\src\mockpp_30\mockpp\mockpp_30\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.8.0\include +Item20=..;$(BCB)\include;X:\src\cppunit-1.8.0\include +Item21=\\SONNE\HOMES\src\mockpp_30\mockpp\mockpp_30\tests;..\..\mockpp;..\mockpp_30\tests;..\mockpp;..\expat;$(BCB)\include +Item22=..;..\mockpp_30\tests;..\mockpp;..\expat;$(BCB)\include +Item23=..\..\mockpp;..\mockpp_30\tests;..\mockpp;..\expat;$(BCB)\include +Item24=..\..\mockpp;..\mockpp_30\tests;..\mockpp;..\expat;$(BCB)\include;$(BCB)\include\vcl;C:\wx2\include\ +Item25=.. ;..\mockpp_30\tests;..\mockpp;..\expat;$(BCB)\include;$(BCB)\include\vcl;C:\wx2\include\ +Item26=.. ;..\mockpp_30\tests;..\expat;..\mockpp;$(BCB)\include;$(BCB)\include\vcl;C:\wx2\include +Item27=..\mockpp_30\tests;..\expat;..\mockpp;$(BCB)\include;$(BCB)\include\vcl +Item28=..\mockpp_30\tests;..\mockpp;$(BCB)\include;$(BCB)\include\vcl;expat +Item29=..\mockpp;$(BCB)\include;$(BCB)\include\vcl;expat [HistoryLists\hlLibraryPath] Count=17 Index: mock_greeter.bpr =================================================================== RCS file: /cvsroot/mockpp/mockpp/bcb5/mock_greeter.bpr,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- mock_greeter.bpr 23 Jul 2005 17:37:31 -0000 1.22 +++ mock_greeter.bpr 24 Jul 2005 16:11:13 -0000 1.23 @@ -25,7 +25,7 @@ <USERDEFINES value="__DLL___"/> <SYSDEFINES value="NO_STRICT;_NO_VCL;_RTLDLL;USEPACKAGES"/> <MAINSOURCE value="mock_greeter.bpf"/> - <INCLUDEPATH value="..\mockpp\examples;..;$(BCB)\include;"X:\Documents\src\cppunit-1.10.2\include\""/> + <INCLUDEPATH value="..\mockpp\examples;..;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include\;..\..\cppunit-1.10.2\include"/> <LIBPATH value="..\mockpp\examples;..\mockpp_30\examples;$(BCB)\lib\obj;$(BCB)\lib"/> <WARNINGS value="-w-par"/> </MACROS> @@ -72,36 +72,36 @@ [HistoryLists\hlIncludePath] Count=30 -Item0=..\.;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include -Item1=..\mockpp\examples;..\mockpp_30\examples;..\mockpp_30\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include -Item2=..\mockpp\examples;..\mockpp_30\examples;..\mockpp_30\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include -Item3=..\mockpp_30\examples;..\mockpp_30\tests;..;$(BCB)\include;..\..\..\cppunit.ups\include -Item4=..\mockpp_30\examples;..\mockpp_30\tests;..;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include -Item5=..\mockpp_30\examples;..\mockpp_30\tests;..\..\mockpp;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include -Item6=..\mockpp_30\tests;..;$(BCB)\include;..\..\cppunit\include;X:\src\cppunit-1.8.0\include -Item7=..\mockpp_30\tests;..;$(BCB)\include;..\..\cppunit\include -Item8=..\mockpp_30\tests;..;$(BCB)\include;B:\cvs\ups\src\3party\cppunit\include -Item9=..\mockpp_30\tests;..;$(BCB)\include;..\..\..\cppunit-1.8.0\include -Item10=..;$(BCB)\include;..\..\..\cppunit-1.8.0\include -Item11=..\mockpp_30\tests;\\SONNE\HOMES\src\mockpp_30\mockpp\mockpp_30\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.8.0\include -Item12=..;$(BCB)\include;X:\src\cppunit-1.8.0\include -Item13=\\SONNE\HOMES\src\mockpp_30\mockpp\mockpp_30\tests;..\..\mockpp;..\mockpp_30\tests;..\mockpp;..\expat;$(BCB)\include -Item14=..;..\mockpp_30\tests;..\mockpp;..\expat;$(BCB)\include -Item15=..\..\mockpp;..\mockpp_30\tests;..\mockpp;..\expat;$(BCB)\include -Item16=..\..\mockpp;..\mockpp_30\tests;..\mockpp;..\expat;$(BCB)\include;$(BCB)\include\vcl;C:\wx2\include\ -Item17=.. ;..\mockpp_30\tests;..\mockpp;..\expat;$(BCB)\include;$(BCB)\include\vcl;C:\wx2\include\ -Item18=.. ;..\mockpp_30\tests;..\expat;..\mockpp;$(BCB)\include;$(BCB)\include\vcl;C:\wx2\include -Item19=..\mockpp_30\tests;..\expat;..\mockpp;$(BCB)\include;$(BCB)\include\vcl -Item20=..\mockpp_30\tests;..\mockpp;$(BCB)\include;$(BCB)\include\vcl;expat -Item21=..\mockpp;$(BCB)\include;$(BCB)\include\vcl;expat -Item22=..\mockpp_30\tests;..\mockpp;$(BCB)\include;$(BCB)\include\vcl -Item23=..\mockpp_30\tests;..\mockpp;$(BCB)\include -Item24=..\mockpp_30\tests;..\mockpp;$(BCB)/include -Item25=..\mockpp_30\tests;..\mockpp -Item26=..\mockpp -Item27=..\mockpp_30\tests;..\mockpp_30\mockpp -Item28=..\mockpp_30\mockpp -Item29=..\mockpp_30\tests;..\mockpp_30\mockpp;$(BCB)\include;$(BCB)\include\vcl +Item0=..\mockpp\examples;..;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include\;c:\home\arnold\cppunit-1.10.2\include\ +Item1=..\mockpp\examples;..;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include\ +Item2=..\.;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include +Item3=..\mockpp\examples;..\mockpp_30\examples;..\mockpp_30\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include +Item4=..\mockpp\examples;..\mockpp_30\examples;..\mockpp_30\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include +Item5=..\mockpp_30\examples;..\mockpp_30\tests;..;$(BCB)\include;..\..\..\cppunit.ups\include +Item6=..\mockpp_30\examples;..\mockpp_30\tests;..;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include +Item7=..\mockpp_30\examples;..\mockpp_30\tests;..\..\mockpp;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include +Item8=..\mockpp_30\tests;..;$(BCB)\include;..\..\cppunit\include;X:\src\cppunit-1.8.0\include +Item9=..\mockpp_30\tests;..;$(BCB)\include;..\..\cppunit\include +Item10=..\mockpp_30\tests;..;$(BCB)\include;B:\cvs\ups\src\3party\cppunit\include +Item11=..\mockpp_30\tests;..;$(BCB)\include;..\..\..\cppunit-1.8.0\include +Item12=..;$(BCB)\include;..\..\..\cppunit-1.8.0\include +Item13=..\mockpp_30\tests;\\SONNE\HOMES\src\mockpp_30\mockpp\mockpp_30\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.8.0\include +Item14=..;$(BCB)\include;X:\src\cppunit-1.8.0\include +Item15=\\SONNE\HOMES\src\mockpp_30\mockpp\mockpp_30\tests;..\..\mockpp;..\mockpp_30\tests;..\mockpp;..\expat;$(BCB)\include +Item16=..;..\mockpp_30\tests;..\mockpp;..\expat;$(BCB)\include +Item17=..\..\mockpp;..\mockpp_30\tests;..\mockpp;..\expat;$(BCB)\include +Item18=..\..\mockpp;..\mockpp_30\tests;..\mockpp;..\expat;$(BCB)\include;$(BCB)\include\vcl;C:\wx2\include\ +Item19=.. ;..\mockpp_30\tests;..\mockpp;..\expat;$(BCB)\include;$(BCB)\include\vcl;C:\wx2\include\ +Item20=.. ;..\mockpp_30\tests;..\expat;..\mockpp;$(BCB)\include;$(BCB)\include\vcl;C:\wx2\include +Item21=..\mockpp_30\tests;..\expat;..\mockpp;$(BCB)\include;$(BCB)\include\vcl +Item22=..\mockpp_30\tests;..\mockpp;$(BCB)\include;$(BCB)\include\vcl;expat +Item23=..\mockpp;$(BCB)\include;$(BCB)\include\vcl;expat +Item24=..\mockpp_30\tests;..\mockpp;$(BCB)\include;$(BCB)\include\vcl +Item25=..\mockpp_30\tests;..\mockpp;$(BCB)\include +Item26=..\mockpp_30\tests;..\mockpp;$(BCB)/include +Item27=..\mockpp_30\tests;..\mockpp +Item28=..\mockpp +Item29=..\mockpp_30\tests;..\mockpp_30\mockpp [HistoryLists\hlLibraryPath] Count=18 |
|
From: Ewald A. <ewa...@us...> - 2005-07-24 16:11:22
|
Update of /cvsroot/mockpp/mockpp/mockpp/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19310/mockpp/tests Modified Files: ChainableMockObject_1_void_test.cpp Log Message: OutBound for chainable objects Index: ChainableMockObject_1_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_1_void_test.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- ChainableMockObject_1_void_test.cpp 24 Jul 2005 12:54:57 -0000 1.10 +++ ChainableMockObject_1_void_test.cpp 24 Jul 2005 16:11:14 -0000 1.11 @@ -166,13 +166,13 @@ chain.stubs(mockpp::once()) .with(mockpp::outBound( (unsigned int) 456)); -/* + unsigned val = 0; mcm.outbound(val); CPPUNIT_ASSERT_EQUAL((unsigned)123, val); mcm.outbound(val); CPPUNIT_ASSERT_EQUAL((unsigned)456, val); -*/ + } |
|
From: Ewald A. <ewa...@us...> - 2005-07-24 16:11:21
|
Update of /cvsroot/mockpp/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19310 Modified Files: TODO Log Message: OutBound for chainable objects Index: TODO =================================================================== RCS file: /cvsroot/mockpp/mockpp/TODO,v retrieving revision 1.47 retrieving revision 1.48 diff -u -d -r1.47 -r1.48 --- TODO 24 Jul 2005 12:56:03 -0000 1.47 +++ TODO 24 Jul 2005 16:11:12 -0000 1.48 @@ -3,6 +3,8 @@ ostreamed + OutBound all Chain/Visit Tests + Problem Exception-Transformation?? Tests |
|
From: Ewald A. <ewa...@us...> - 2005-07-24 12:56:16
|
Update of /cvsroot/mockpp/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16546 Modified Files: mockpp.kdevelop TODO Log Message: update Index: TODO =================================================================== RCS file: /cvsroot/mockpp/mockpp/TODO,v retrieving revision 1.46 retrieving revision 1.47 diff -u -d -r1.46 -r1.47 --- TODO 23 Jul 2005 17:37:31 -0000 1.46 +++ TODO 24 Jul 2005 12:56:03 -0000 1.47 @@ -1,7 +1,6 @@ DOC: ---- - OutBound ostreamed Problem Exception-Transformation?? Index: mockpp.kdevelop =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp.kdevelop,v retrieving revision 1.73 retrieving revision 1.74 diff -u -d -r1.73 -r1.74 --- mockpp.kdevelop 23 Jul 2005 13:31:56 -0000 1.73 +++ mockpp.kdevelop 24 Jul 2005 12:56:03 -0000 1.74 @@ -9,7 +9,7 @@ <ignoreparts/> <projectdirectory>.</projectdirectory> <absoluteprojectpath>false</absoluteprojectpath> - <description></description> + <description/> <secondaryLanguages> <language>Perl</language> <language>Bash</language> @@ -23,8 +23,8 @@ <useconfiguration>unicode</useconfiguration> </general> <run> - <mainprogram>mockpp/tests/mock_test</mainprogram> - <programargs></programargs> + <mainprogram>mockpp/tests/jmock_test</mainprogram> + <programargs/> <terminal>false</terminal> <envvars/> <directoryradio>executable</directoryradio> @@ -140,14 +140,14 @@ <kdevdebugger> <general> <dbgshell>libtool</dbgshell> - <programargs></programargs> - <gdbpath></gdbpath> + <programargs/> + <gdbpath/> <breakonloadinglibs>true</breakonloadinglibs> <separatetty>false</separatetty> <floatingtoolbar>true</floatingtoolbar> - <configGdbScript></configGdbScript> - <runShellScript></runShellScript> - <runGdbScript></runGdbScript> + <configGdbScript/> + <runShellScript/> + <runGdbScript/> </general> <display> <staticmembers>true</staticmembers> @@ -241,7 +241,7 @@ <headerCompletionDelay>250</headerCompletionDelay> </codecompletion> <creategettersetter> - <prefixGet></prefixGet> + <prefixGet/> <prefixSet>set</prefixSet> <prefixVariable>m_,_</prefixVariable> <parameterName>theValue</parameterName> |
|
From: Ewald A. <ewa...@us...> - 2005-07-24 12:55:19
|
Update of /cvsroot/mockpp/mockpp/mockpp/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16296/mockpp/tests Modified Files: ArgumentsMatcher_test.cpp ChainableMockObject_1_void_test.cpp ConstraintSet_test.cpp InvocationMocker_test.cpp Invocation_test.cpp NoArgumentsMatcher_test.cpp StubBuilder_test.cpp mockpp_pti_test.cpp Log Message: OutBound capability for chainables Index: ArgumentsMatcher_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ArgumentsMatcher_test.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- ArgumentsMatcher_test.cpp 30 Dec 2004 20:54:04 -0000 1.10 +++ ArgumentsMatcher_test.cpp 24 Jul 2005 12:54:57 -0000 1.11 @@ -72,8 +72,10 @@ mockpp::ConstraintSet1<int> cs1 (new mockpp::IsEqual<int>(1)); typedef mockpp::Invocation1<int> SetterInvocation1; - SetterInvocation1 sinv (MOCKPP_PCHAR("MyArgumentsMatcherDummy::set_1_Prop"), 1); - SetterInvocation1 sinva (MOCKPP_PCHAR("MyArgumentsMatcherDummy::set_1_Prop"), 0); + int i1 = 1; + int i0 = 0; + SetterInvocation1 sinv (MOCKPP_PCHAR("MyArgumentsMatcherDummy::set_1_Prop"), i1); + SetterInvocation1 sinva (MOCKPP_PCHAR("MyArgumentsMatcherDummy::set_1_Prop"), i0); mockpp::ArgumentsMatcher<SetterInvocation1> am(cs1); CPPUNIT_ASSERT(am.matches(sinv) == true); @@ -87,9 +89,12 @@ new mockpp::IsEqual<int>(2)); typedef mockpp::Invocation2<int, int> SetterInvocation2; - SetterInvocation2 sinv (MOCKPP_PCHAR("MyArgumentsMatcherDummy::set_2_Prop"), 1, 2); - SetterInvocation2 sinva (MOCKPP_PCHAR("MyArgumentsMatcherDummy::set_2_Prop"), 0, 2); - SetterInvocation2 sinvb (MOCKPP_PCHAR("MyArgumentsMatcherDummy::set_2_Prop"), 1, 0); + int i0 = 0; + int i1 = 1; + int i2 = 2; + SetterInvocation2 sinv (MOCKPP_PCHAR("MyArgumentsMatcherDummy::set_2_Prop"), i1, i2); + SetterInvocation2 sinva (MOCKPP_PCHAR("MyArgumentsMatcherDummy::set_2_Prop"), i0, i2); + SetterInvocation2 sinvb (MOCKPP_PCHAR("MyArgumentsMatcherDummy::set_2_Prop"), i1, i0); mockpp::ArgumentsMatcher<SetterInvocation2> am(cs2); CPPUNIT_ASSERT(am.matches(sinv) == true); @@ -104,9 +109,12 @@ new mockpp::IsEqual<int>(2)); typedef mockpp::Invocation2<int, int> SetterInvocation2; - SetterInvocation2 sinv (MOCKPP_PCHAR("MyArgumentsMatcherDummy::set_2_Prop"), 1, 2); - SetterInvocation2 sinva (MOCKPP_PCHAR("MyArgumentsMatcherDummy::set_2_Prop"), 0, 2); - SetterInvocation2 sinvb (MOCKPP_PCHAR("MyArgumentsMatcherDummy::set_2_Prop"), 1, 0); + int i0 = 0; + int i1 = 1; + int i2 = 2; + SetterInvocation2 sinv (MOCKPP_PCHAR("MyArgumentsMatcherDummy::set_2_Prop"), i1, i2); + SetterInvocation2 sinva (MOCKPP_PCHAR("MyArgumentsMatcherDummy::set_2_Prop"), i0, i2); + SetterInvocation2 sinvb (MOCKPP_PCHAR("MyArgumentsMatcherDummy::set_2_Prop"), i1, i0); mockpp::ArgumentsMatcher<SetterInvocation2> am(cs2); mockpp::String s = MOCKPP_PCHAR("cs?"); Index: Invocation_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/Invocation_test.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- Invocation_test.cpp 30 Dec 2004 20:54:06 -0000 1.16 +++ Invocation_test.cpp 24 Jul 2005 12:54:57 -0000 1.17 @@ -109,11 +109,27 @@ CPPUNIT_ASSERT(ginv.toString() == MOCKPP_PCHAR("MyInvocationDummy::getProp()")); SetterInvocation sinva0(MOCKPP_PCHAR("MyInvocationDummy::set_0_Prop")); - Setter1Invocation sinva1(MOCKPP_PCHAR("MyInvocationDummy::set_1_Prop"), 1); - Setter2Invocation sinva2(MOCKPP_PCHAR("MyInvocationDummy::set_2_Prop"), 1, "abc"); - Setter3Invocation sinva3(MOCKPP_PCHAR("MyInvocationDummy::set_3_Prop"), 1, "abc", "xyz"); - Setter4Invocation sinva4(MOCKPP_PCHAR("MyInvocationDummy::set_4_Prop"), 1, "abc", "xyz", 2); - Setter5Invocation sinva5(MOCKPP_PCHAR("MyInvocationDummy::set_5_Prop"), 1, "abc", "xyz", 2, "=="); + + int i1 = 1; + std::string abc = "abc"; + + mockpp::String s1 = MOCKPP_PCHAR("MyInvocationDummy::set_1_Prop"); + Setter1Invocation sinva1(s1, i1); + + mockpp::String s2 = MOCKPP_PCHAR("MyInvocationDummy::set_2_Prop"); + Setter2Invocation sinva2(s2, i1, abc); + + mockpp::String s3 = MOCKPP_PCHAR("MyInvocationDummy::set_3_Prop"); + std::string xyz = "xyz"; + Setter3Invocation sinva3(s3, i1, abc, xyz); + + mockpp::String s4 = MOCKPP_PCHAR("MyInvocationDummy::set_4_Prop"); + int i2 = 2; + Setter4Invocation sinva4(s4, i1, abc, xyz, i2); + + mockpp::String s5 = MOCKPP_PCHAR("MyInvocationDummy::set_5_Prop"); + std::string s__ = "=="; + Setter5Invocation sinva5(s5, i1, abc, xyz, i2, s__); CPPUNIT_ASSERT(sinv.equals(sinva0) == true); CPPUNIT_ASSERT(sinv.equals(sinva1) == false); CPPUNIT_ASSERT(sinv.equals(sinva2) == false); @@ -127,21 +143,27 @@ { typedef mockpp::Invocation1<int> SetterInvocation; - SetterInvocation sinv(MOCKPP_PCHAR("MyInvocationDummy::set_1_Prop"), 1); + int i1 = 1; + SetterInvocation sinv(MOCKPP_PCHAR("MyInvocationDummy::set_1_Prop"), i1); CPPUNIT_ASSERT(sinv.toString() == MOCKPP_PCHAR("MyInvocationDummy::set_1_Prop(1)")); - SetterInvocation sinv1(MOCKPP_PCHAR("MyInvocationDummy::set_1_Prop"), 1); + SetterInvocation sinv1(MOCKPP_PCHAR("MyInvocationDummy::set_1_Prop"), i1); CPPUNIT_ASSERT(sinv.equals(sinv1) == true); - SetterInvocation sinv2(MOCKPP_PCHAR("(MyInvocationDummy::set_1_Prop"), 0); + int i0 = 0; + SetterInvocation sinv2(MOCKPP_PCHAR("(MyInvocationDummy::set_1_Prop"), i0); CPPUNIT_ASSERT(sinv.equals(sinv2) == false); Setter0Invocation sinva0(MOCKPP_PCHAR("MyInvocationDummy::set_0_Prop")); - SetterInvocation sinva1(MOCKPP_PCHAR("MyInvocationDummy::set_1_Prop"), 1); - Setter2Invocation sinva2(MOCKPP_PCHAR("MyInvocationDummy::set_2_Prop"), 1, "abc"); - Setter3Invocation sinva3(MOCKPP_PCHAR("MyInvocationDummy::set_3_Prop"), 1, "abc", "xyz"); - Setter4Invocation sinva4(MOCKPP_PCHAR("MyInvocationDummy::set_4_Prop"), 1, "abc", "xyz", 2); - Setter5Invocation sinva5(MOCKPP_PCHAR("MyInvocationDummy::set_5_Prop"), 1, "abc", "xyz", 2, "=="); + SetterInvocation sinva1(MOCKPP_PCHAR("MyInvocationDummy::set_1_Prop"), i1); + std::string abc = "abc"; + std::string xyz = "xyz"; + int i2 = 2; + std::string s__ = "=="; + Setter2Invocation sinva2(MOCKPP_PCHAR("MyInvocationDummy::set_2_Prop"), i1, abc); + Setter3Invocation sinva3(MOCKPP_PCHAR("MyInvocationDummy::set_3_Prop"), i1, abc, xyz); + Setter4Invocation sinva4(MOCKPP_PCHAR("MyInvocationDummy::set_4_Prop"), i1, abc, xyz, i2); + Setter5Invocation sinva5(MOCKPP_PCHAR("MyInvocationDummy::set_5_Prop"), i1, abc, xyz, i2, s__); CPPUNIT_ASSERT(sinv.equals(sinva0) == false); CPPUNIT_ASSERT(sinv.equals(sinva1) == true); CPPUNIT_ASSERT(sinv.equals(sinva2) == false); @@ -155,24 +177,33 @@ { typedef mockpp::Invocation2<int, std::string> SetterInvocation; - SetterInvocation sinv(MOCKPP_PCHAR("MyInvocationDummy::set_2_Prop"), 1, "abc"); + int i1 = 1; + int i2 = 2; + int i6 = 6; + std::string abc = "abc"; + std::string abC = "abC"; + std::string xyz = "xyz"; + std::string xyZ = "xyZ"; + std::string s__ = "=="; + + SetterInvocation sinv(MOCKPP_PCHAR("MyInvocationDummy::set_2_Prop"), i1, abc); CPPUNIT_ASSERT(sinv.toString() == MOCKPP_PCHAR("MyInvocationDummy::set_2_Prop(1, abc)")); - SetterInvocation sinv1(MOCKPP_PCHAR("MyInvocationDummy::set_2_Prop"), 1, "abc"); + SetterInvocation sinv1(MOCKPP_PCHAR("MyInvocationDummy::set_2_Prop"), i1, abc); CPPUNIT_ASSERT(sinv.equals(sinv1) == true); - SetterInvocation sinv2(MOCKPP_PCHAR("MyInvocationDummy::set_2_Prop"), 1, "abC"); + SetterInvocation sinv2(MOCKPP_PCHAR("MyInvocationDummy::set_2_Prop"), i1, abC); CPPUNIT_ASSERT(sinv.equals(sinv2) == false); - SetterInvocation sinv3(MOCKPP_PCHAR("MyInvocationDummy::set_2_Prop"), 6, "abc"); + SetterInvocation sinv3(MOCKPP_PCHAR("MyInvocationDummy::set_2_Prop"), i6, abc); CPPUNIT_ASSERT(sinv.equals(sinv3) == false); Setter0Invocation sinva0(MOCKPP_PCHAR("MyInvocationDummy::set_0_Prop")); - Setter1Invocation sinva1(MOCKPP_PCHAR("MyInvocationDummy::set_1_Prop"), 1); - SetterInvocation sinva2(MOCKPP_PCHAR("MyInvocationDummy::set_2_Prop"), 1, "abc"); - Setter3Invocation sinva3(MOCKPP_PCHAR("MyInvocationDummy::set_3_Prop"), 1, "abc", "xyz"); - Setter4Invocation sinva4(MOCKPP_PCHAR("MyInvocationDummy::set_4_Prop"), 1, "abc", "xyz", 2); - Setter5Invocation sinva5(MOCKPP_PCHAR("MyInvocationDummy::set_5_Prop"), 1, "abc", "xyz", 2, "=="); + Setter1Invocation sinva1(MOCKPP_PCHAR("MyInvocationDummy::set_1_Prop"), i1); + SetterInvocation sinva2(MOCKPP_PCHAR("MyInvocationDummy::set_2_Prop"), i1, abc); + Setter3Invocation sinva3(MOCKPP_PCHAR("MyInvocationDummy::set_3_Prop"), i1, abc, xyz); + Setter4Invocation sinva4(MOCKPP_PCHAR("MyInvocationDummy::set_4_Prop"), i1, abc, xyz, i2); + Setter5Invocation sinva5(MOCKPP_PCHAR("MyInvocationDummy::set_5_Prop"), i1, abc, xyz, i2, s__); CPPUNIT_ASSERT(sinv.equals(sinva0) == false); CPPUNIT_ASSERT(sinv.equals(sinva1) == false); CPPUNIT_ASSERT(sinv.equals(sinva2) == true); @@ -185,28 +216,36 @@ void Invocation_test::test_equals3() { typedef mockpp::Invocation3<int, std::string, std::string > SetterInvocation; + int i1 = 1; + int i2 = 2; + int i5 = 5; + std::string abc = "abc"; + std::string abC = "abC"; + std::string xyz = "xyz"; + std::string xyZ = "xyZ"; + std::string s__ = "=="; - SetterInvocation sinv(MOCKPP_PCHAR("MyInvocationDummy::set_3_Prop"), 1, "abc", "xyz"); + SetterInvocation sinv(MOCKPP_PCHAR("MyInvocationDummy::set_3_Prop"), i1, abc, xyz); CPPUNIT_ASSERT(sinv.toString() == MOCKPP_PCHAR("MyInvocationDummy::set_3_Prop(1, abc, xyz)")); - SetterInvocation sinv1(MOCKPP_PCHAR("MyInvocationDummy::set_3_Prop"), 1, "abc", "xyz"); + SetterInvocation sinv1(MOCKPP_PCHAR("MyInvocationDummy::set_3_Prop"), i1, abc, xyz); CPPUNIT_ASSERT(sinv.equals(sinv1) == true); - SetterInvocation sinv2(MOCKPP_PCHAR("MyInvocationDummy::set_3_Prop"), 1, "abc", "xyZ"); + SetterInvocation sinv2(MOCKPP_PCHAR("MyInvocationDummy::set_3_Prop"), i1, abc, xyZ); CPPUNIT_ASSERT(sinv.equals(sinv2) == false); - SetterInvocation sinv3(MOCKPP_PCHAR("MyInvocationDummy::set_3_Prop"), 1, "abC", "xyz"); + SetterInvocation sinv3(MOCKPP_PCHAR("MyInvocationDummy::set_3_Prop"), i1, abC, xyz); CPPUNIT_ASSERT(sinv.equals(sinv3) == false); - SetterInvocation sinv4(MOCKPP_PCHAR("MyInvocationDummy::set_3_Prop"), 5, "abc", "xyz"); + SetterInvocation sinv4(MOCKPP_PCHAR("MyInvocationDummy::set_3_Prop"), i5, abc, xyz); CPPUNIT_ASSERT(sinv.equals(sinv4) == false); Setter0Invocation sinva0(MOCKPP_PCHAR("MyInvocationDummy::set_0_Prop")); - Setter1Invocation sinva1(MOCKPP_PCHAR("MyInvocationDummy::set_1_Prop"), 1); - Setter2Invocation sinva2(MOCKPP_PCHAR("MyInvocationDummy::set_2_Prop"), 1, "abc"); - SetterInvocation sinva3(MOCKPP_PCHAR("MyInvocationDummy::set_3_Prop"), 1, "abc", "xyz"); - Setter4Invocation sinva4(MOCKPP_PCHAR("MyInvocationDummy::set_4_Prop"), 1, "abc", "xyz", 2); - Setter5Invocation sinva5(MOCKPP_PCHAR("MyInvocationDummy::set_5_Prop"), 1, "abc", "xyz", 2, "=="); + Setter1Invocation sinva1(MOCKPP_PCHAR("MyInvocationDummy::set_1_Prop"), i1); + Setter2Invocation sinva2(MOCKPP_PCHAR("MyInvocationDummy::set_2_Prop"), i1, abc); + SetterInvocation sinva3(MOCKPP_PCHAR("MyInvocationDummy::set_3_Prop"), i1, abc, xyz); + Setter4Invocation sinva4(MOCKPP_PCHAR("MyInvocationDummy::set_4_Prop"), i1, abc, xyz, i2); + Setter5Invocation sinva5(MOCKPP_PCHAR("MyInvocationDummy::set_5_Prop"), i1, abc, xyz, i2, s__); CPPUNIT_ASSERT(sinv.equals(sinva0) == false); CPPUNIT_ASSERT(sinv.equals(sinva1) == false); CPPUNIT_ASSERT(sinv.equals(sinva2) == false); @@ -220,30 +259,40 @@ { typedef mockpp::Invocation4<int, std::string, std::string, int > SetterInvocation; - SetterInvocation sinv(MOCKPP_PCHAR("MyInvocationDummy::set_4_Prop"), 1, "abc", "xyz", 2); + int i1 = 1; + int i0 = 0; + int i2 = 2; + int i5 = 5; + std::string abc = "abc"; + std::string abC = "abC"; + std::string xyz = "xyz"; + std::string xyZ = "xyZ"; + std::string s__ = "=="; + + SetterInvocation sinv(MOCKPP_PCHAR("MyInvocationDummy::set_4_Prop"), i1, abc, xyz, i2); CPPUNIT_ASSERT(sinv.toString() == MOCKPP_PCHAR("MyInvocationDummy::set_4_Prop(1, abc, xyz, 2)")); - SetterInvocation sinv1(MOCKPP_PCHAR("MyInvocationDummy::set_4_Prop"), 1, "abc", "xyz", 2); + SetterInvocation sinv1(MOCKPP_PCHAR("MyInvocationDummy::set_4_Prop"), i1, abc, xyz, i2); CPPUNIT_ASSERT(sinv.equals(sinv1) == true); - SetterInvocation sinv2(MOCKPP_PCHAR("MyInvocationDummy::set_4_Prop"), 0, "abc", "xyz", 2); + SetterInvocation sinv2(MOCKPP_PCHAR("MyInvocationDummy::set_4_Prop"), i0, abc, xyz, i2); CPPUNIT_ASSERT(sinv.equals(sinv2) == false); - SetterInvocation sinv3(MOCKPP_PCHAR("MyInvocationDummy::set_4_Prop"), 1, "abc", "xyz", 5); + SetterInvocation sinv3(MOCKPP_PCHAR("MyInvocationDummy::set_4_Prop"), i1, abc, xyz, i5); CPPUNIT_ASSERT(sinv.equals(sinv3) == false); - SetterInvocation sinv4(MOCKPP_PCHAR("MyInvocationDummy::set_4_Prop"), 1, "abc", "xyZ", 2); + SetterInvocation sinv4(MOCKPP_PCHAR("MyInvocationDummy::set_4_Prop"), i1, abc, xyZ, i2); CPPUNIT_ASSERT(sinv.equals(sinv4) == false); - SetterInvocation sinv5(MOCKPP_PCHAR("MyInvocationDummy::set_4_Prop"), 1, "abC", "xyz", 2); + SetterInvocation sinv5(MOCKPP_PCHAR("MyInvocationDummy::set_4_Prop"), i1, abC, xyz, i2); CPPUNIT_ASSERT(sinv.equals(sinv5) == false); Setter0Invocation sinva0(MOCKPP_PCHAR("MyInvocationDummy::set_0_Prop")); - Setter1Invocation sinva1(MOCKPP_PCHAR("MyInvocationDummy::set_1_Prop"), 1); - Setter2Invocation sinva2(MOCKPP_PCHAR("MyInvocationDummy::set_2_Prop"), 1, "abc"); - Setter3Invocation sinva3(MOCKPP_PCHAR("MyInvocationDummy::set_3_Prop"), 1, "abc", "xyz"); - SetterInvocation sinva4(MOCKPP_PCHAR("MyInvocationDummy::set_4_Prop"), 1, "abc", "xyz", 2); - Setter5Invocation sinva5(MOCKPP_PCHAR("MyInvocationDummy::set_5_Prop"), 1, "abc", "xyz", 2, "=="); + Setter1Invocation sinva1(MOCKPP_PCHAR("MyInvocationDummy::set_1_Prop"), i1); + Setter2Invocation sinva2(MOCKPP_PCHAR("MyInvocationDummy::set_2_Prop"), i1, abc); + Setter3Invocation sinva3(MOCKPP_PCHAR("MyInvocationDummy::set_3_Prop"), i1, abc, xyz); + SetterInvocation sinva4(MOCKPP_PCHAR("MyInvocationDummy::set_4_Prop"), i1, abc, xyz, i2); + Setter5Invocation sinva5(MOCKPP_PCHAR("MyInvocationDummy::set_5_Prop"), i1, abc, xyz, i2, s__); CPPUNIT_ASSERT(sinv.equals(sinva0) == false); CPPUNIT_ASSERT(sinv.equals(sinva1) == false); CPPUNIT_ASSERT(sinv.equals(sinva2) == false); @@ -257,34 +306,44 @@ { typedef mockpp::Invocation5<int, std::string, std::string, int, std::string > SetterInvocation; - SetterInvocation sinv(MOCKPP_PCHAR("MyInvocationDummy::set_5_Prop"), 1, "abc", "xyz", 2, "=="); + int i1 = 1; + int i2 = 2; + int i0 = 0; + std::string abc = "abc"; + std::string abC = "abC"; + std::string xyz = "xyz"; + std::string xyZ = "xyZ"; + std::string s__ = "=="; + std::string s_I = "=!"; + + SetterInvocation sinv(MOCKPP_PCHAR("MyInvocationDummy::set_5_Prop"), i1, abc, xyz, i2, s__); CPPUNIT_ASSERT(sinv.toString() == MOCKPP_PCHAR("MyInvocationDummy::set_5_Prop(1, abc, xyz, 2, ==)")); - SetterInvocation sinv2(MOCKPP_PCHAR("MyInvocationDummy::set_5_Prop"), 1, "abc", "xyz", 2, "=="); + SetterInvocation sinv2(MOCKPP_PCHAR("MyInvocationDummy::set_5_Prop"), i1, abc, xyz, i2, s__); CPPUNIT_ASSERT(sinv.equals(sinv2) == true); - SetterInvocation sinv3(MOCKPP_PCHAR("MyInvocationDummy::set_5_Prop"), 1, "abc", "xyz", 2, "=!"); + SetterInvocation sinv3(MOCKPP_PCHAR("MyInvocationDummy::set_5_Prop"), i1, abc, xyz, i2, s_I); CPPUNIT_ASSERT(sinv.equals(sinv3) == false); - SetterInvocation sinv4(MOCKPP_PCHAR("MyInvocationDummy::set_5_Prop"), 1, "abc", "xyz", 1, "=="); + SetterInvocation sinv4(MOCKPP_PCHAR("MyInvocationDummy::set_5_Prop"), i1, abc, xyz, i1, s__); CPPUNIT_ASSERT(sinv.equals(sinv4) == false); - SetterInvocation sinv5(MOCKPP_PCHAR("MyInvocationDummy::set_5_Prop"), 1, "abc", "xyZ", 2, "=="); + SetterInvocation sinv5(MOCKPP_PCHAR("MyInvocationDummy::set_5_Prop"), i1, abc, xyZ, i2, s__); CPPUNIT_ASSERT(sinv.equals(sinv5) == false); - SetterInvocation sinv6(MOCKPP_PCHAR("MyInvocationDummy::set_5_Prop"), 1, "abC", "xyz", 2, "=="); + SetterInvocation sinv6(MOCKPP_PCHAR("MyInvocationDummy::set_5_Prop"), i1, abC, xyz, i2, s__); CPPUNIT_ASSERT(sinv.equals(sinv6) == false); - SetterInvocation sinv7(MOCKPP_PCHAR("MyInvocationDummy::set_5_Prop"), 0, "abc", "xyz", 2, "=="); + SetterInvocation sinv7(MOCKPP_PCHAR("MyInvocationDummy::set_5_Prop"), i0, abc, xyz, i2, s__); CPPUNIT_ASSERT(sinv.equals(sinv7) == false); Setter0Invocation sinva0(MOCKPP_PCHAR("MyInvocationDummy::set_0_Prop")); - Setter1Invocation sinva1(MOCKPP_PCHAR("MyInvocationDummy::set_1_Prop"), 1); - Setter2Invocation sinva2(MOCKPP_PCHAR("MyInvocationDummy::set_2_Prop"), 1, "abc"); - Setter3Invocation sinva3(MOCKPP_PCHAR("MyInvocationDummy::set_3_Prop"), 1, "abc", "xyz"); - Setter4Invocation sinva4(MOCKPP_PCHAR("MyInvocationDummy::set_4_Prop"), 1, "abc", "xyz", 2); - SetterInvocation sinva5(MOCKPP_PCHAR("MyInvocationDummy::set_5_Prop"), 1, "abc", "xyz", 2, "=="); + Setter1Invocation sinva1(MOCKPP_PCHAR("MyInvocationDummy::set_1_Prop"), i1); + Setter2Invocation sinva2(MOCKPP_PCHAR("MyInvocationDummy::set_2_Prop"), i1, abc); + Setter3Invocation sinva3(MOCKPP_PCHAR("MyInvocationDummy::set_3_Prop"), i1, abc, xyz); + Setter4Invocation sinva4(MOCKPP_PCHAR("MyInvocationDummy::set_4_Prop"), i1, abc, xyz, i2); + SetterInvocation sinva5(MOCKPP_PCHAR("MyInvocationDummy::set_5_Prop"), i1, abc, xyz, i2, s__); CPPUNIT_ASSERT(sinv.equals(sinva0) == false); CPPUNIT_ASSERT(sinv.equals(sinva1) == false); CPPUNIT_ASSERT(sinv.equals(sinva2) == false); @@ -298,7 +357,8 @@ { typedef mockpp::Invocation1<int> SetterInvocation; - SetterInvocation sinv(MOCKPP_PCHAR("MyInvocationDummy::set_1_Prop"), 1); + int i1 = 1; + SetterInvocation sinv(MOCKPP_PCHAR("MyInvocationDummy::set_1_Prop"), i1); int p1 = sinv.getParameter1(); CPPUNIT_ASSERT(p1 == 1); @@ -311,7 +371,9 @@ { typedef mockpp::Invocation2<int, std::string> SetterInvocation; - SetterInvocation sinv(MOCKPP_PCHAR("MyInvocationDummy::set_2_Prop"), 1, "abc"); + int i = 1; + std::string s = "abc"; + SetterInvocation sinv(MOCKPP_PCHAR("MyInvocationDummy::set_2_Prop"), i, s); int p1 = sinv.getParameter1(); CPPUNIT_ASSERT(p1 == 1); @@ -327,7 +389,10 @@ { typedef mockpp::Invocation3<int, std::string, std::string > SetterInvocation; - SetterInvocation sinv(MOCKPP_PCHAR("MyInvocationDummy::set_3_Prop"), 1, "abc", "xyz"); + int i = 1; + std::string s1 = "abc"; + std::string s2 = "xyz"; + SetterInvocation sinv(MOCKPP_PCHAR("MyInvocationDummy::set_3_Prop"), i, s1, s2); int p1 = sinv.getParameter1(); CPPUNIT_ASSERT(p1 == 1); @@ -346,7 +411,11 @@ { typedef mockpp::Invocation4<int, std::string, std::string, int> SetterInvocation; - SetterInvocation sinv(MOCKPP_PCHAR("MyInvocationDummy::set_4_Prop"), 1, "abc", "xyz", 2); + int i1 = 1; + std::string s1 = "abc"; + std::string s2 = "xyz"; + int i2 = 2; + SetterInvocation sinv(MOCKPP_PCHAR("MyInvocationDummy::set_4_Prop"), i1, s1, s2, i2); int p1 = sinv.getParameter1(); CPPUNIT_ASSERT(p1 == 1); @@ -367,7 +436,12 @@ void Invocation_test::test_get5() { typedef mockpp::Invocation5<int, std::string, std::string, int, std::string > SetterInvocation; - SetterInvocation sinv(MOCKPP_PCHAR("MyInvocationDummy::set_5_Prop"), 1, "abc", "xyz", 2, "=="); + int i1 = 1; + std::string s1 = "abc"; + std::string s2 = "xyz"; + int i2 = 2; + std::string s3 = "=="; + SetterInvocation sinv(MOCKPP_PCHAR("MyInvocationDummy::set_5_Prop"), i1, s1, s2, i2, s3); int p1 = sinv.getParameter1(); CPPUNIT_ASSERT(p1 == 1); Index: InvocationMocker_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/InvocationMocker_test.cpp,v retrieving revision 1.34 retrieving revision 1.35 diff -u -d -r1.34 -r1.35 --- InvocationMocker_test.cpp 6 Apr 2005 19:35:23 -0000 1.34 +++ InvocationMocker_test.cpp 24 Jul 2005 12:54:57 -0000 1.35 @@ -191,7 +191,12 @@ void InvocationMocker_test::test_matches() { mockpp::InvocationMocker<int, GetterInvocation> im; - GetterInvocation ginv(MOCKPP_PCHAR("InvocationDummy::getProp"), CA(), CB(), CC(), CD(), CE()); + CA ca; + CB cb; + CC cc; + CD cd; + CE ce; + GetterInvocation ginv(MOCKPP_PCHAR("InvocationDummy::getProp"), ca, cb, cc, cd, ce); MyInvocationMatcher<GetterInvocation> *ivm1 = new MyInvocationMatcher<GetterInvocation>; MyInvocationMatcher<GetterInvocation> *ivm2 = new MyInvocationMatcher<GetterInvocation>; @@ -229,7 +234,12 @@ { typedef mockpp::Invocation5<CA, CB, CC, CD, CE> GetterInvocation; mockpp::InvocationMocker<int, GetterInvocation> im; - GetterInvocation ginv(MOCKPP_PCHAR("InvocationDummy::getProp"), CA(), CB(), CC(), CD(), CE()); + CA ca; + CB cb; + CC cc; + CD cd; + CE ce; + GetterInvocation ginv(MOCKPP_PCHAR("InvocationDummy::getProp"), ca, cb, cc, cd, ce); MyInvocationMatcher<GetterInvocation> *ivm1 = new MyInvocationMatcher<GetterInvocation>; MyInvocationMatcher<GetterInvocation> *ivm2 = new MyInvocationMatcher<GetterInvocation>; @@ -249,7 +259,12 @@ { typedef mockpp::Invocation5<CA, CB, CC, CD, CE> GetterInvocation; mockpp::InvocationMocker<void, GetterInvocation> im; - GetterInvocation ginv(MOCKPP_PCHAR("InvocationDummy::getProp"), CA(), CB(), CC(), CD(), CE()); + CA ca; + CB cb; + CC cc; + CD cd; + CE ce; + GetterInvocation ginv(MOCKPP_PCHAR("InvocationDummy::getProp"), ca, cb, cc, cd, ce); MyInvocationMatcher<GetterInvocation> *ivm1 = new MyInvocationMatcher<GetterInvocation>; MyInvocationMatcher<GetterInvocation> *ivm2 = new MyInvocationMatcher<GetterInvocation>; @@ -274,7 +289,12 @@ { typedef mockpp::Invocation5<CA, CB, CC, CD, CE> GetterInvocation; mockpp::InvocationMocker<int, GetterInvocation> im; - GetterInvocation ginv(MOCKPP_PCHAR("InvocationDummy::getProp"), CA(), CB(), CC(), CD(), CE()); + CA ca; + CB cb; + CC cc; + CD cd; + CE ce; + GetterInvocation ginv(MOCKPP_PCHAR("InvocationDummy::getProp"), ca, cb, cc, cd, ce); MyInvocationMatcher<GetterInvocation> *ivm1 = new MyInvocationMatcher<GetterInvocation>; MyInvocationMatcher<GetterInvocation> *ivm2 = new MyInvocationMatcher<GetterInvocation>; @@ -304,7 +324,12 @@ CPPUNIT_ASSERT(descr->hasDescription()); mockpp::InvocationMocker<int, GetterInvocation> im(descr); - GetterInvocation ginv(MOCKPP_PCHAR("InvocationDummy::getProp"), CA(), CB(), CC(), CD(), CE()); + CA ca; + CB cb; + CC cc; + CD cd; + CE ce; + GetterInvocation ginv(MOCKPP_PCHAR("InvocationDummy::getProp"), ca, cb, cc, cd, ce); MyInvocationMatcher<GetterInvocation> *ivm1 = new MyInvocationMatcher<GetterInvocation>; MyInvocationMatcher<GetterInvocation> *ivm2 = new MyInvocationMatcher<GetterInvocation>; @@ -328,7 +353,12 @@ CPPUNIT_ASSERT(descr->hasDescription()); mockpp::InvocationMocker<int, GetterInvocation>im(descr); - GetterInvocation ginv(MOCKPP_PCHAR("InvocationDummy::getProp"), CA(), CB(), CC(), CD(), CE()); + CA ca; + CB cb; + CC cc; + CD cd; + CE ce; + GetterInvocation ginv(MOCKPP_PCHAR("InvocationDummy::getProp"), ca, cb, cc, cd, ce); mockpp::ConstraintSet5<CA, CB, CC, CD, CE> cs1 (new mockpp::IsEqual<CA>(CA()), new mockpp::IsEqual<CB>(CB()), Index: ChainableMockObject_1_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_1_void_test.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- ChainableMockObject_1_void_test.cpp 6 Apr 2005 19:33:43 -0000 1.9 +++ ChainableMockObject_1_void_test.cpp 24 Jul 2005 12:54:57 -0000 1.10 @@ -45,29 +45,33 @@ #include <mockpp/chaining/ChainingMockObjectSupport.h> #include <mockpp/chaining/Invocation.h> +#include <mockpp/constraint/OutBound.h> + + +typedef mockpp::Invocation1<unsigned> TheInvocation; + +MOCKPP_PTI_IMPLEMENT(TheInvocation) + -typedef mockpp::Invocation1<unsigned> TheInvocation; - -MOCKPP_PTI_IMPLEMENT(TheInvocation) - - class ChainableMockObject_1_void_test : public CppUnit::TestFixture { public: CPPUNIT_TEST_SUITE( ChainableMockObject_1_void_test ); + CPPUNIT_TEST(test_outbound); CPPUNIT_TEST( test_parameter_1 ); CPPUNIT_TEST_SUITE_END(); public: + void test_outbound(); void test_parameter_1(); }; - - + + CPPUNIT_TEST_SUITE_REGISTRATION(ChainableMockObject_1_void_test); @@ -90,9 +94,13 @@ MyChainableMockObject_1_void_ex(const mockpp::String &name) : mockpp::ChainableMockObject(name, 0) + , MOCKPP_CONSTRUCT_MEMBERS_FOR_VOID_CHAINABLE_EXT1(outbound, Ext) , MOCKPP_CONSTRUCT_MEMBERS_FOR_VOID_CHAINABLE_EXT1(chainable1, Ext) {} + MOCKPP_VOID_CHAINABLE_EXT1(MyChainableMockObject_1_void_ex, outbound, unsigned &, + Ext, unsigned ); + MOCKPP_VOID_CHAINABLE_EXT1(MyChainableMockObject_1_void_ex, chainable1, const std::string &, Ext, std::string); }; @@ -145,5 +153,27 @@ mcm.verify(); } +#include <iostream> + +void ChainableMockObject_1_void_test::test_outbound() +{ + MyChainableMockObject_1_void_ex mcm(MOCKPP_PCHAR("chainable-object")); + + MOCKPP_CHAINER_FOR_EXT(MyChainableMockObject_1_void_ex, outbound, Ext) chain(&mcm); + + chain.stubs(mockpp::once()) + .with(mockpp::outBound( (unsigned int) 123)); + + chain.stubs(mockpp::once()) + .with(mockpp::outBound( (unsigned int) 456)); +/* + unsigned val = 0; + mcm.outbound(val); + CPPUNIT_ASSERT_EQUAL((unsigned)123, val); + mcm.outbound(val); + CPPUNIT_ASSERT_EQUAL((unsigned)456, val); +*/ +} + #endif // HAVE_CPPUNIT Index: NoArgumentsMatcher_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/NoArgumentsMatcher_test.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- NoArgumentsMatcher_test.cpp 30 Dec 2004 20:54:06 -0000 1.8 +++ NoArgumentsMatcher_test.cpp 24 Jul 2005 12:54:58 -0000 1.9 @@ -64,8 +64,9 @@ typedef mockpp::Invocation0 SetterInvocation0; typedef mockpp::Invocation1<int> SetterInvocation1; + int i2 = 2; SetterInvocation0 s0inv(MOCKPP_PCHAR("MyNoArgumentsMatcherDummy::set_0_Prop")); - SetterInvocation1 s1inv(MOCKPP_PCHAR("MyNoArgumentsMatcherDummy::set_1_Prop"), 2); + SetterInvocation1 s1inv(MOCKPP_PCHAR("MyNoArgumentsMatcherDummy::set_1_Prop"), i2); mockpp::NoArgumentsMatcher<SetterInvocation0> nam0; mockpp::NoArgumentsMatcher<SetterInvocation1> nam1; Index: mockpp_pti_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/mockpp_pti_test.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- mockpp_pti_test.cpp 6 Apr 2005 19:31:20 -0000 1.4 +++ mockpp_pti_test.cpp 24 Jul 2005 12:54:58 -0000 1.5 @@ -48,17 +48,17 @@ typedef mockpp::Invocation1<int> Setter1Invocation; - + #if 1 -MOCKPP_PTI_IMPLEMENT(Setter1Invocation) -#else +MOCKPP_PTI_IMPLEMENT(Setter1Invocation) +#else MOCKPP_TYPELESSSTUBADAPTER_PTI_IMPL(Setter1Invocation) MOCKPP_FIFOINVOCATIONDISPATCHER_PTI_IMPL(Setter1Invocation) MOCKPP_LIFOINVOCATIONDISPATCHER_PTI_IMPL(Setter1Invocation) MOCKPP_INVOCATIONMOCKER_PTI_IMPL(Setter1Invocation) MOCKPP_ABSTRACTDYNAMICCHAININGMOCK_PTI_IMPL(Setter1Invocation) MOCKPP_COREMOCK_PTI_IMPL(Setter1Invocation) -#endif +#endif namespace { @@ -116,7 +116,8 @@ void mockpp_pti_test::test_coremock() { - Setter1Invocation si(MOCKPP_PCHAR("Setter1Invocation"), 1); + int i1 = 1; + Setter1Invocation si(MOCKPP_PCHAR("Setter1Invocation"), i1); { MyVoidStub *mvs = new MyVoidStub; mockpp::CoreMock<void, Setter1Invocation> cmd(MOCKPP_PCHAR("name"), 0); @@ -138,7 +139,8 @@ void mockpp_pti_test::test_typeless() { - Setter1Invocation si(MOCKPP_PCHAR("Setter1Invocation"), 1); + int i1 = 1; + Setter1Invocation si(MOCKPP_PCHAR("Setter1Invocation"), i1); MyVoidStub *mvs = new MyVoidStub; mockpp::TypelessStubAdapter<void, Setter1Invocation > tsa (mvs); tsa.invoke(si); @@ -198,7 +200,8 @@ void mockpp_pti_test::test_lifo() { - Setter1Invocation si(MOCKPP_PCHAR("Setter1Invocation"), 1); + int i1 = 1; + Setter1Invocation si(MOCKPP_PCHAR("Setter1Invocation"), i1); MyVoidStub *mvs = new MyVoidStub; TestInvokable *ti1 = new TestInvokable; TestInvokable *ti2 = new TestInvokable; @@ -230,7 +233,8 @@ void mockpp_pti_test::test_fifo() { - Setter1Invocation si(MOCKPP_PCHAR("Setter1Invocation"), 1); + int i1 = 1; + Setter1Invocation si(MOCKPP_PCHAR("Setter1Invocation"), i1); MyVoidStub *mvs = new MyVoidStub; TestInvokable *ti1 = new TestInvokable; TestInvokable *ti2 = new TestInvokable; @@ -288,7 +292,8 @@ void mockpp_pti_test::test_invocation() { - Setter1Invocation si(MOCKPP_PCHAR("Setter1Invocation"), 1); + int i1 = 1; + Setter1Invocation si(MOCKPP_PCHAR("Setter1Invocation"), i1); mockpp::InvocationMocker<void, Setter1Invocation> im; MyInvocationMatcher *ivm1 = new MyInvocationMatcher; MyInvocationMatcher *ivm2 = new MyInvocationMatcher; @@ -368,7 +373,8 @@ void mockpp_pti_test::test_abstract() { - Setter1Invocation si(MOCKPP_PCHAR("Setter1Invocation"), 1); + int i1 = 1; + Setter1Invocation si(MOCKPP_PCHAR("Setter1Invocation"), i1); ChainingMockDummy cmd (new mockpp::LIFOInvocationDispatcher<void, Setter1Invocation>, MOCKPP_PCHAR( "adc-name" ), 0 ); MyVoidStub *stub = new MyVoidStub; MyMatcherDummy *mmd = new MyMatcherDummy; Index: ConstraintSet_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ConstraintSet_test.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- ConstraintSet_test.cpp 30 Dec 2004 20:54:06 -0000 1.13 +++ ConstraintSet_test.cpp 24 Jul 2005 12:54:57 -0000 1.14 @@ -120,8 +120,10 @@ mockpp::ConstraintSet1<int> cs (new mockpp::IsEqual<int>(1)); typedef mockpp::Invocation1<int> SetterInvocation; - SetterInvocation sinv (MOCKPP_PCHAR("MyConstraintSetDummy::set_1_Prop"), 1); - SetterInvocation sinva(MOCKPP_PCHAR("MyConstraintSetDummy::set_1_Prop"), 0); + int i0 = 0; + int i1 = 1; + SetterInvocation sinv (MOCKPP_PCHAR("MyConstraintSetDummy::set_1_Prop"), i1); + SetterInvocation sinva(MOCKPP_PCHAR("MyConstraintSetDummy::set_1_Prop"), i0); CPPUNIT_ASSERT(cs.matches(sinv) == true); CPPUNIT_ASSERT(cs.matches(sinva) == false); @@ -134,9 +136,12 @@ new mockpp::IsEqual<int>(2)); typedef mockpp::Invocation2<int, int> SetterInvocation; - SetterInvocation sinv (MOCKPP_PCHAR("MyConstraintSetDummy::set_2_Prop"), 1, 2); - SetterInvocation sinva(MOCKPP_PCHAR("MyConstraintSetDummy::set_2_Prop"), 0, 2); - SetterInvocation sinvb(MOCKPP_PCHAR("MyConstraintSetDummy::set_2_Prop"), 1, 0); + int i0 = 0; + int i1 = 1; + int i2 = 2; + SetterInvocation sinv (MOCKPP_PCHAR("MyConstraintSetDummy::set_2_Prop"), i1, i2); + SetterInvocation sinva(MOCKPP_PCHAR("MyConstraintSetDummy::set_2_Prop"), i0, i2); + SetterInvocation sinvb(MOCKPP_PCHAR("MyConstraintSetDummy::set_2_Prop"), i1, i0); CPPUNIT_ASSERT(cs.matches(sinv) == true); CPPUNIT_ASSERT(cs.matches(sinva) == false); @@ -152,10 +157,14 @@ new mockpp::IsEqual<int>(3)); typedef mockpp::Invocation3<int, int, int> SetterInvocation; - SetterInvocation sinv (MOCKPP_PCHAR("MyConstraintSetDummy::set_3_Prop"), 1, 2, 3); - SetterInvocation sinva(MOCKPP_PCHAR("MyConstraintSetDummy::set_3_Prop"), 0, 2, 3); - SetterInvocation sinvb(MOCKPP_PCHAR("MyConstraintSetDummy::set_3_Prop"), 1, 0, 3); - SetterInvocation sinvc(MOCKPP_PCHAR("MyConstraintSetDummy::set_3_Prop"), 1, 2, 0); + int i0 = 0; + int i1 = 1; + int i2 = 2; + int i3 = 3; + SetterInvocation sinv (MOCKPP_PCHAR("MyConstraintSetDummy::set_3_Prop"), i1, i2, i3); + SetterInvocation sinva(MOCKPP_PCHAR("MyConstraintSetDummy::set_3_Prop"), i0, i2, i3); + SetterInvocation sinvb(MOCKPP_PCHAR("MyConstraintSetDummy::set_3_Prop"), i1, i0, i3); + SetterInvocation sinvc(MOCKPP_PCHAR("MyConstraintSetDummy::set_3_Prop"), i1, i2, i0); CPPUNIT_ASSERT(cs.matches(sinv) == true); CPPUNIT_ASSERT(cs.matches(sinva) == false); @@ -173,11 +182,16 @@ new mockpp::IsEqual<int>(4)); typedef mockpp::Invocation4<int, int, int, int> SetterInvocation; - SetterInvocation sinv (MOCKPP_PCHAR("MyConstraintSetDummy::set_4_Prop"), 1, 2, 3, 4); - SetterInvocation sinva(MOCKPP_PCHAR("MyConstraintSetDummy::set_4_Prop"), 0, 2, 3, 4); - SetterInvocation sinvb(MOCKPP_PCHAR("MyConstraintSetDummy::set_4_Prop"), 1, 0, 3, 4); - SetterInvocation sinvc(MOCKPP_PCHAR("MyConstraintSetDummy::set_4_Prop"), 1, 2, 0, 4); - SetterInvocation sinvd(MOCKPP_PCHAR("MyConstraintSetDummy::set_4_Prop"), 1, 2, 3, 0); + int i0 = 0; + int i1 = 1; + int i2 = 2; + int i3 = 3; + int i4 = 4; + SetterInvocation sinv (MOCKPP_PCHAR("MyConstraintSetDummy::set_4_Prop"), i1, i2, i3, i4); + SetterInvocation sinva(MOCKPP_PCHAR("MyConstraintSetDummy::set_4_Prop"), i0, i2, i3, i4); + SetterInvocation sinvb(MOCKPP_PCHAR("MyConstraintSetDummy::set_4_Prop"), i1, i0, i3, i4); + SetterInvocation sinvc(MOCKPP_PCHAR("MyConstraintSetDummy::set_4_Prop"), i1, i2, i0, i4); + SetterInvocation sinvd(MOCKPP_PCHAR("MyConstraintSetDummy::set_4_Prop"), i1, i2, i3, i0); CPPUNIT_ASSERT(cs.matches(sinv) == true); CPPUNIT_ASSERT(cs.matches(sinva) == false); @@ -197,12 +211,18 @@ new mockpp::IsEqual<int>(5)); typedef mockpp::Invocation5<int, int, int, int, int> SetterInvocation; - SetterInvocation sinv (MOCKPP_PCHAR("MyConstraintSetDummy::set_5_Prop"), 1, 2, 3, 4, 5); - SetterInvocation sinva(MOCKPP_PCHAR("MyConstraintSetDummy::set_5_Prop"), 0, 2, 3, 4, 5); - SetterInvocation sinvb(MOCKPP_PCHAR("MyConstraintSetDummy::set_5_Prop"), 1, 0, 3, 4, 5); - SetterInvocation sinvc(MOCKPP_PCHAR("MyConstraintSetDummy::set_5_Prop"), 1, 2, 0, 4, 5); - SetterInvocation sinvd(MOCKPP_PCHAR("MyConstraintSetDummy::set_5_Prop"), 1, 2, 3, 0, 5); - SetterInvocation sinve(MOCKPP_PCHAR("MyConstraintSetDummy::set_5_Prop"), 1, 2, 3, 4, 0); + int i0 = 0; + int i1 = 1; + int i2 = 2; + int i3 = 3; + int i4 = 4; + int i5 = 5; + SetterInvocation sinv (MOCKPP_PCHAR("MyConstraintSetDummy::set_5_Prop"), i1, i2, i3, i4, i5); + SetterInvocation sinva(MOCKPP_PCHAR("MyConstraintSetDummy::set_5_Prop"), i0, i2, i3, i4, i5); + SetterInvocation sinvb(MOCKPP_PCHAR("MyConstraintSetDummy::set_5_Prop"), i1, i0, i3, i4, i5); + SetterInvocation sinvc(MOCKPP_PCHAR("MyConstraintSetDummy::set_5_Prop"), i1, i2, i0, i4, i5); + SetterInvocation sinvd(MOCKPP_PCHAR("MyConstraintSetDummy::set_5_Prop"), i1, i2, i3, i0, i5); + SetterInvocation sinve(MOCKPP_PCHAR("MyConstraintSetDummy::set_5_Prop"), i1, i2, i3, i4, i0); CPPUNIT_ASSERT(cs.matches(sinv) == true); CPPUNIT_ASSERT(cs.matches(sinva) == false); Index: StubBuilder_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/StubBuilder_test.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- StubBuilder_test.cpp 3 Apr 2005 18:32:54 -0000 1.13 +++ StubBuilder_test.cpp 24 Jul 2005 12:54:58 -0000 1.14 @@ -74,8 +74,8 @@ typedef mockpp::Invocation5<CA, CB, CC, CD, CE> GetterInvocation; typedef mockpp::Invocation5<CA, CB, CC, CD, CE> VoidInvocation; -MOCKPP_TYPELESSSTUBADAPTER_PTI_IMPL(VoidInvocation) - +MOCKPP_TYPELESSSTUBADAPTER_PTI_IMPL(VoidInvocation) + template <typename R, // Returntype typename I> // Invocation @@ -102,7 +102,12 @@ void StubBuilder_test::test_instance() { - GetterInvocation ginv(MOCKPP_PCHAR("InvocationDummy::getProp5"), CA(), CB(), CC(), CD(), CE()); + CA ca; + CB cb; + CC cc; + CD cd; + CE ce; + GetterInvocation ginv(MOCKPP_PCHAR("InvocationDummy::getProp5"), ca, cb, cc, cd, ce); MyStubBuilder<int, GetterInvocation> sbi; sbi.will(new mockpp::ReturnStub<int>(123)); |
|
From: Ewald A. <ewa...@us...> - 2005-07-24 12:54:46
|
Update of /cvsroot/mockpp/mockpp/mockpp/docs/en/common In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16226/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.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- mockpp.css 5 May 2005 21:02:00 -0000 1.7 +++ mockpp.css 24 Jul 2005 12:54:37 -0000 1.8 @@ -20,6 +20,7 @@ .keysym { color: #707000; font-family: Courier, monospace; } .methodname { color: #707000; } +.classname { color: #707000; } .token { color: #707000; } .NAVHEADER { display: yes } |
|
From: Ewald A. <ewa...@us...> - 2005-07-24 12:54:46
|
Update of /cvsroot/mockpp/mockpp/mockpp/docs/en In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16226/mockpp/docs/en Modified Files: bookinfo.docbook dev_advanced_jmock.docbook faq.docbook Log Message: update docs Index: faq.docbook =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/docs/en/faq.docbook,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- faq.docbook 17 Jun 2005 18:58:36 -0000 1.7 +++ faq.docbook 24 Jul 2005 12:54:37 -0000 1.8 @@ -38,6 +38,12 @@ } </programlisting> </para> + + <para>A similar problem arises when you need to pass values back by a + parameter reference. In this case you can use + <link linkend="outbound"><classname>OutBound</classname></link> + to return predefined values.</para> + </answer> </qandaentry> Index: dev_advanced_jmock.docbook =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/docs/en/dev_advanced_jmock.docbook,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- dev_advanced_jmock.docbook 27 Feb 2005 11:48:16 -0000 1.8 +++ dev_advanced_jmock.docbook 24 Jul 2005 12:54:37 -0000 1.9 @@ -170,6 +170,21 @@ <listitem><classname>IsInstanceOf</classname>/<methodname>isA()</methodname> tests if an object is of a type</listitem> </itemizedlist> +<para id="outbound">There is one special constraint which is not actually a real constraint. +<classname>OutBound</classname> does not check for incoming parameter values but +passes values back by a reference. This enables mocked methods like the following: + +<programlisting> + + void getByReference(int &ra) + { + ra = 123; + } + +</programlisting> + +</para> + <para>Creating your own constraints is quite easy. Look at the files in the <filename>constraint</filename> directory to get an idea how this can be done.</para> Index: bookinfo.docbook =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/docs/en/bookinfo.docbook,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- bookinfo.docbook 30 Dec 2004 20:54:04 -0000 1.7 +++ bookinfo.docbook 24 Jul 2005 12:54:37 -0000 1.8 @@ -24,23 +24,6 @@ <holder>Ewald Arnold</holder> </copyright> -<legalnotice> -<para>This library is free software; you can redistribute it and/or -modify it under the terms of the GNU Lesser General Public License -as published by the Free Software Foundation; either version 2 of -the License, or (at your option) any later version.</para> - -<para>This library is distributed in the hope that it will be -useful, but WITHOUT ANY WARRANTY; without even the implied warranty -of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Lesser General Public License for more details.</para> - -<para>You should have received a copy of the GNU Lesser General -Public License along with this library; if not, write to the Free -Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA</para> -</legalnotice> - &release_date; &release_info; |
|
From: Ewald A. <ewa...@us...> - 2005-07-24 12:54:08
|
Update of /cvsroot/mockpp/mockpp/mockpp/chaining In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16110/mockpp/chaining Modified Files: AbstractDynamicChainingMock.h ChainableMockObject_macro.h Invocation.h Log Message: OutBound capability for chainables Index: ChainableMockObject_macro.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/ChainableMockObject_macro.h,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- ChainableMockObject_macro.h 9 Apr 2005 16:43:55 -0000 1.11 +++ ChainableMockObject_macro.h 24 Jul 2005 12:54:00 -0000 1.12 @@ -121,7 +121,7 @@ a_name, v_type1) \ { \ std::string func_name (#m_name); \ - mockpp::Invocation1<v_type1> inv(getVerifiableName() + MOCKPP_PCHAR(".") MOCKPP_PCHAR(#m_name), (v_type1)param1); \ + mockpp::Invocation1<v_type1> inv(getVerifiableName() + MOCKPP_PCHAR(".") MOCKPP_PCHAR(#m_name), (v_type1&)param1); \ m_name ## CoreMock.invoke(inv); \ } \ MOCKPP_MEMBER_RESTRICTOR_PRIVATE: \ @@ -141,7 +141,7 @@ a_name, v_type1, v_type2) \ { \ std::string func_name (#m_name); \ - mockpp::Invocation2<v_type1, v_type2> inv(getVerifiableName() + MOCKPP_PCHAR(".") MOCKPP_PCHAR(#m_name), (v_type1)param1, (v_type2)param2); \ + mockpp::Invocation2<v_type1, v_type2> inv(getVerifiableName() + MOCKPP_PCHAR(".") MOCKPP_PCHAR(#m_name), (v_type1&)param1, (v_type2&)param2); \ m_name ## CoreMock.invoke(inv); \ } \ MOCKPP_MEMBER_RESTRICTOR_PRIVATE: \ @@ -165,7 +165,7 @@ a_name, v_type1, v_type2, v_type3) \ { \ std::string func_name (#m_name); \ - mockpp::Invocation3<v_type1, v_type2, v_type3> inv(getVerifiableName() + MOCKPP_PCHAR(".") MOCKPP_PCHAR(#m_name), (v_type1)param1, (v_type2)param2, (v_type3)param3); \ + mockpp::Invocation3<v_type1, v_type2, v_type3> inv(getVerifiableName() + MOCKPP_PCHAR(".") MOCKPP_PCHAR(#m_name), (v_type1&)param1, (v_type2&)param2, (v_type3&)param3); \ m_name ## CoreMock.invoke(inv); \ } \ MOCKPP_MEMBER_RESTRICTOR_PRIVATE: \ @@ -191,7 +191,7 @@ a_name, v_type1, v_type2, v_type3, v_type4) \ { \ std::string func_name (#m_name); \ - mockpp::Invocation4<v_type1, v_type2, v_type3, v_type4> inv(getVerifiableName() + MOCKPP_PCHAR(".") MOCKPP_PCHAR(#m_name), (v_type1)param1, (v_type2)param2, (v_type3)param3, (v_type4)param4); \ + mockpp::Invocation4<v_type1, v_type2, v_type3, v_type4> inv(getVerifiableName() + MOCKPP_PCHAR(".") MOCKPP_PCHAR(#m_name), (v_type1&)param1, (v_type2&)param2, (v_type3&)param3, (v_type4&)param4); \ m_name ## CoreMock.invoke(inv); \ } \ MOCKPP_MEMBER_RESTRICTOR_PRIVATE: \ @@ -219,7 +219,7 @@ a_name, v_type1, v_type2, v_type3, v_type4, v_type5) \ { \ std::string func_name (#m_name); \ - mockpp::Invocation5<v_type1, v_type2, v_type3, v_type4, v_type5> inv(getVerifiableName() + MOCKPP_PCHAR(".") MOCKPP_PCHAR(#m_name), (v_type1)param1, (v_type2)param2, (v_type3)param3, (v_type4)param4, (v_type5)param5); \ + mockpp::Invocation5<v_type1, v_type2, v_type3, v_type4, v_type5> inv(getVerifiableName() + MOCKPP_PCHAR(".") MOCKPP_PCHAR(#m_name), (v_type1&)param1, (v_type2&)param2, (v_type3&)param3, (v_type4&)param4, (v_type5&)param5); \ m_name ## CoreMock.invoke(inv); \ } \ MOCKPP_MEMBER_RESTRICTOR_PRIVATE: \ @@ -262,7 +262,7 @@ v_ret_type, a_name, v_type1) \ { \ std::string func_name (#m_name); \ - mockpp::Invocation1<v_type1> inv(getVerifiableName() + MOCKPP_PCHAR(".") MOCKPP_PCHAR(#m_name), (v_type1)param1); \ + mockpp::Invocation1<v_type1> inv(getVerifiableName() + MOCKPP_PCHAR(".") MOCKPP_PCHAR(#m_name), (v_type1&)param1); \ return m_name ## CoreMock.invoke(inv); \ } \ MOCKPP_MEMBER_RESTRICTOR_PRIVATE: \ @@ -284,7 +284,7 @@ v_ret_type, a_name, v_type1, v_type2) \ { \ std::string func_name (#m_name); \ - mockpp::Invocation2<v_type1, v_type2> inv(getVerifiableName() + MOCKPP_PCHAR(".") MOCKPP_PCHAR(#m_name), (v_type1)param1, (v_type2)param2); \ + mockpp::Invocation2<v_type1, v_type2> inv(getVerifiableName() + MOCKPP_PCHAR(".") MOCKPP_PCHAR(#m_name), (v_type1&)param1, (v_type2&)param2); \ return m_name ## CoreMock.invoke(inv); \ } \ MOCKPP_MEMBER_RESTRICTOR_PRIVATE: \ @@ -310,7 +310,7 @@ v_ret_type, a_name, v_type1, v_type2, v_type3) \ { \ std::string func_name (#m_name); \ - mockpp::Invocation3<v_type1, v_type2, v_type3> inv(getVerifiableName() + MOCKPP_PCHAR(".") MOCKPP_PCHAR(#m_name), (v_type1)param1, (v_type2)param2, (v_type3)param3); \ + mockpp::Invocation3<v_type1, v_type2, v_type3> inv(getVerifiableName() + MOCKPP_PCHAR(".") MOCKPP_PCHAR(#m_name), (v_type1&)param1, (v_type2&)param2, (v_type3&)param3); \ return m_name ## CoreMock.invoke(inv); \ } \ MOCKPP_MEMBER_RESTRICTOR_PRIVATE: \ @@ -338,7 +338,7 @@ v_ret_type, a_name, v_type1, v_type2, v_type3, v_type4) \ { \ std::string func_name (#m_name); \ - mockpp::Invocation4<v_type1, v_type2, v_type3, v_type4> inv(getVerifiableName() + MOCKPP_PCHAR(".") MOCKPP_PCHAR(#m_name), (v_type1)param1, (v_type2)param2, (v_type3)param3, (v_type4)param4); \ + mockpp::Invocation4<v_type1, v_type2, v_type3, v_type4> inv(getVerifiableName() + MOCKPP_PCHAR(".") MOCKPP_PCHAR(#m_name), (v_type1&)param1, (v_type2&)param2, (v_type3&)param3, (v_type4&)param4); \ return m_name ## CoreMock.invoke(inv); \ } \ MOCKPP_MEMBER_RESTRICTOR_PRIVATE: \ @@ -368,7 +368,7 @@ v_ret_type, a_name, v_type1, v_type2, v_type3, v_type4, v_type5) \ { \ std::string func_name (#m_name); \ - mockpp::Invocation5<v_type1, v_type2, v_type3, v_type4, v_type5> inv(getVerifiableName() + MOCKPP_PCHAR(".") MOCKPP_PCHAR(#m_name), (v_type1)param1, (v_type2)param2, (v_type3)param3, (v_type4)param4, (v_type5)param5); \ + mockpp::Invocation5<v_type1, v_type2, v_type3, v_type4, v_type5> inv(getVerifiableName() + MOCKPP_PCHAR(".") MOCKPP_PCHAR(#m_name), (v_type1&)param1, (v_type2&)param2, (v_type3&)param3, (v_type4&)param4, (v_type5&)param5); \ return m_name ## CoreMock.invoke(inv); \ } \ MOCKPP_MEMBER_RESTRICTOR_PRIVATE: \ Index: Invocation.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/Invocation.h,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- Invocation.h 24 Mar 2005 20:51:28 -0000 1.13 +++ Invocation.h 24 Jul 2005 12:54:00 -0000 1.14 @@ -154,7 +154,7 @@ * @param in_param1 parameter 1 */ Invocation1( const String &name, - const T1 &in_param1 ) + T1 &in_param1 ) : Invocation( name) , param1( in_param1 ) { @@ -199,7 +199,7 @@ private: - T1 param1; + const T1 & param1; }; @@ -226,8 +226,8 @@ * @param in_param2 parameter 2 */ Invocation2( const String &name, - const T1 &in_param1, - const T2 &in_param2 ) + T1 &in_param1, + T2 &in_param2 ) : Invocation( name ) , param1( in_param1 ) , param2( in_param2 ) @@ -282,8 +282,8 @@ private: - T1 param1; - T2 param2; + const T1 & param1; + const T2 & param2; }; @@ -312,9 +312,9 @@ * @param in_param3 parameter 3 */ Invocation3( const String &name, - const T1 &in_param1, - const T2 &in_param2, - const T3 &in_param3) + T1 &in_param1, + T2 &in_param2, + T3 &in_param3) : Invocation( name ) , param1( in_param1 ) , param2( in_param2 ) @@ -379,9 +379,9 @@ private: - T1 param1; - T2 param2; - T3 param3; + const T1 & param1; + const T2 & param2; + const T3 & param3; }; @@ -412,10 +412,10 @@ * @param in_param4 parameter 4 */ Invocation4( const String &name, - const T1 &in_param1, - const T2 &in_param2, - const T3 &in_param3, - const T4 &in_param4) + T1 &in_param1, + T2 &in_param2, + T3 &in_param3, + T4 &in_param4) : Invocation( name ) , param1( in_param1 ) , param2( in_param2 ) @@ -490,10 +490,10 @@ private: - T1 param1; - T2 param2; - T3 param3; - T4 param4; + const T1 & param1; + const T2 & param2; + const T3 & param3; + const T4 & param4; }; @@ -526,11 +526,11 @@ * @param in_param5 parameter 5 */ Invocation5( const String &name, - const T1 &in_param1, - const T2 &in_param2, - const T3 &in_param3, - const T4 &in_param4, - const T5 &in_param5) + T1 &in_param1, + T2 &in_param2, + T3 &in_param3, + T4 &in_param4, + T5 &in_param5) : Invocation( name ) , param1( in_param1 ) , param2( in_param2 ) @@ -615,11 +615,11 @@ private: - T1 param1; - T2 param2; - T3 param3; - T4 param4; - T5 param5; + const T1 & param1; + const T2 & param2; + const T3 & param3; + const T4 & param4; + const T5 & param5; }; Index: AbstractDynamicChainingMock.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/AbstractDynamicChainingMock.h,v retrieving revision 1.32 retrieving revision 1.33 diff -u -d -r1.32 -r1.33 --- AbstractDynamicChainingMock.h 21 Apr 2005 20:35:05 -0000 1.32 +++ AbstractDynamicChainingMock.h 24 Jul 2005 12:54:00 -0000 1.33 @@ -59,7 +59,7 @@ /** Constructs the chaining mock * @param in_invocationDispatcher pointer to invocation dispatcher - * @param name pointer to invocation dispatcher + * @param name objects name * @param parent pointer to parent verifiable */ AbstractDynamicChainingMockImpl( typename InvocationDispatcher<R, I>::AP in_invocationDispatcher, |
|
From: Ewald A. <ewa...@us...> - 2005-07-23 22:34:58
|
Update of /cvsroot/mockpp/mockpp/mockpp/compat In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32090/mockpp/compat Modified Files: Formatter.h Log Message: ascii fix Index: Formatter.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/compat/Formatter.h,v retrieving revision 1.29 retrieving revision 1.30 diff -u -d -r1.29 -r1.30 --- Formatter.h 23 Jul 2005 17:37:33 -0000 1.29 +++ Formatter.h 23 Jul 2005 22:34:32 -0000 1.30 @@ -325,18 +325,18 @@ } +#ifdef MOCKPP_UNICODE + template <class T> mockpp::String owstreamed(const T& t) { std::basic_ostringstream<wchar_t> oss; oss << t; -#ifdef MOCKPP_UNICODE return oss.str(); -#else - return mockpp::getLatin1(oss.str()); -#endif } +#endif // MOCKPP_UNICODE + #endif // MOCKPP_DISABLE_OSTREAMED #endif // MOCKPP_FORMATTER_H |
|
From: Ewald A. <ewa...@us...> - 2005-07-23 22:34:42
|
Update of /cvsroot/mockpp/mockpp/mockpp/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32090/mockpp/tests Modified Files: Formatter_test.cpp Log Message: ascii fix Index: Formatter_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/Formatter_test.cpp,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- Formatter_test.cpp 23 Jul 2005 17:37:33 -0000 1.25 +++ Formatter_test.cpp 23 Jul 2005 22:34:32 -0000 1.26 @@ -499,20 +499,24 @@ std::basic_ostream<char> & - operator<< (std::basic_ostream<char> &os, const Formatter_Dummy &fd) + operator<< (std::basic_ostream<char> &os, const Formatter_Dummy &/*fd*/) { os << "Formatter_Dummy-char"; return os; } +#ifdef MOCKPP_UNICODE + std::basic_ostream<wchar_t> & - operator<< (std::basic_ostream<wchar_t> &os, const Formatter_Dummy &fd) + operator<< (std::basic_ostream<wchar_t> &os, const Formatter_Dummy &/*fd*/) { os << "Formatter_Dummy-wchar_t"; return os; } +#endif // MOCKPP_UNICODE + void Formatter_test::test_ostreamed() { @@ -526,12 +530,16 @@ MOCKPP_ASSERT_EQUALS(fmt, MOCKPP_PCSTRING("==Formatter_Dummy-char==")); } +#ifdef MOCKPP_UNICODE + { mockpp::String fmt (MOCKPP_PCHAR("==%0==")); fmt << owstreamed(fd); MOCKPP_ASSERT_EQUALS(fmt, MOCKPP_PCSTRING("==Formatter_Dummy-wchar_t==")); } +#endif // MOCKPP_UNICODE + #endif // MOCKPP_DISABLE_OSTREAMED } |
|
From: Ewald A. <ewa...@us...> - 2005-07-23 18:44:12
|
Update of /cvsroot/mockpp/mockpp/bcb5 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21276/bcb5 Modified Files: jmock_test.bpf jmock_test.bpr Log Message: update project files Index: jmock_test.bpf =================================================================== RCS file: /cvsroot/mockpp/mockpp/bcb5/jmock_test.bpf,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- jmock_test.bpf 23 Jul 2005 17:37:31 -0000 1.21 +++ jmock_test.bpf 23 Jul 2005 18:44:02 -0000 1.22 @@ -68,6 +68,7 @@ USEUNIT("..\mockpp\tests\TypelessStubSequence_test.cpp"); USEUNIT("..\mockpp\tests\ChainingMockObjectSupport_test.cpp"); USEUNIT("..\mockpp\tests\mockpp_pti_test.cpp"); +USEUNIT("\\192.168.2.1\ewald\Documents\src\mockpp\mockpp\mockpp\tests\OutBound_test.cpp"); //--------------------------------------------------------------------------- This file is used by the project manager only and should be treated like the project file main Index: jmock_test.bpr =================================================================== RCS file: /cvsroot/mockpp/mockpp/bcb5/jmock_test.bpr,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- jmock_test.bpr 23 Jul 2005 17:37:31 -0000 1.25 +++ jmock_test.bpr 23 Jul 2005 18:44:02 -0000 1.26 @@ -71,7 +71,8 @@ c:\tmp\compile\mockpp_30\\StubBuilder_test.obj c:\tmp\compile\mockpp_30\\TypelessStubSequence_test.obj c:\tmp\compile\mockpp_30\\ChainingMockObjectSupport_test.obj - c:\tmp\compile\mockpp_30\\mockpp_pti_test.obj"/> + c:\tmp\compile\mockpp_30\\mockpp_pti_test.obj + c:\tmp\compile\mockpp_30\\OutBound_test.obj"/> <RESFILES value=""/> <DEFFILE value=""/> <RESDEPEN value="$(RESFILES)"/> @@ -82,7 +83,7 @@ ibsmp50.bpi VCLDBX50.bpi TEEUI50.bpi TEEDB50.bpi TEE50.bpi TEEQR50.bpi VCLIB50.bpi bcbie50.bpi VCLIE50.bpi INETDB50.bpi INET50.bpi NMFAST50.bpi dclocx50.bpi bcb2kaxserver50.bpi"/> - <PATHCPP value=".;..\mockpp\tests"/> + <PATHCPP value=".;..\mockpp\tests;\\192.168.2.1\ewald\Documents\src\mockpp\mockpp\mockpp\tests"/> <PATHPAS value=".;"/> <PATHRC value=".;"/> <PATHASM value=".;"/> @@ -92,8 +93,8 @@ <USERDEFINES value="__DLL___"/> <SYSDEFINES value="NO_STRICT;_NO_VCL;_RTLDLL;USEPACKAGES"/> <MAINSOURCE value="jmock_test.bpf"/> - <INCLUDEPATH value="..\mockpp\tests;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include"/> - <LIBPATH value="..\mockpp\tests;..\mockpp_30\tests;$(BCB)\lib\obj;$(BCB)\lib"/> + <INCLUDEPATH value="\\192.168.2.1\ewald\Documents\src\mockpp\mockpp\mockpp\tests;..\mockpp\tests;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include"/> + <LIBPATH value="\\192.168.2.1\ewald\Documents\src\mockpp\mockpp\mockpp\tests;..\mockpp\tests;..\mockpp_30\tests;$(BCB)\lib\obj;$(BCB)\lib"/> <WARNINGS value="-w8092 -w8091 -w8090 -w8089 -w8087 -wprc -wuse -wucp -wstv -wstu -wsig -wpin -wnod -wnak -wdef -wcln -wbbf -wasm -wamp -wamb"/> </MACROS> |
|
From: Ewald A. <ewa...@us...> - 2005-07-23 18:44:12
|
Update of /cvsroot/mockpp/mockpp/msvc71/mockpp/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21276/msvc71/mockpp/tests Modified Files: mock_test.vcproj Log Message: update project files Index: mock_test.vcproj =================================================================== RCS file: /cvsroot/mockpp/mockpp/msvc71/mockpp/tests/mock_test.vcproj,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- mock_test.vcproj 23 May 2005 21:16:01 -0000 1.6 +++ mock_test.vcproj 23 Jul 2005 18:44:02 -0000 1.7 @@ -83,7 +83,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories=""X:\Documents\src\cppunit-1.10.2\include";../../..;"$(CPPUNIT_ROOT)/include"" + AdditionalIncludeDirectories="X:\Documents\src\mockpp\mockpp;"X:\Documents\src\cppunit-1.10.2\include";../..;../../..;"$(CPPUNIT_ROOT)/include"" PreprocessorDefinitions="WIN32,_CONSOLE,CPPUNIT_DLL" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -355,6 +355,9 @@ RelativePath="..\..\..\mockpp\tests\Or_test.cpp"> </File> <File + RelativePath="..\..\..\mockpp\tests\OutBound_test.cpp"> + </File> + <File RelativePath="..\..\..\mockpp\tests\ReturnObjectList_test.cpp"> </File> <File |
|
From: Ewald A. <ewa...@us...> - 2005-07-23 17:42:00
|
Update of /cvsroot/mockpp/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9973 Added Files: release-check Log Message: new --- NEW FILE: release-check --- #!/bin/sh # $1 package name+version # $2 path to tar ball cd /tmp BUILD=/tmp/build.$$ rm -rf $BUILD mkdir -p $BUILD rm -rf /tmp/$1 tar xzf $2/$1.tar.gz cd $1 ./configure --prefix=$BUILD/_inst1 --enable-unicode || exit 1 make install || exit 1 make check || exit 1 make dist || exit 1 make doc-dist || exit 1 make distclean cd $BUILD ../$1/configure --prefix=$BUILD/_inst2 || exit 1 make install || exit 1 make check || exit 1 make dist || exit 1 make doc-dist || exit 1 echo $BUILD generated successfully |
|
From: Ewald A. <ewa...@us...> - 2005-07-23 17:38:09
|
Update of /cvsroot/mockpp/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9329 Modified Files: ChangeLog TODO configure.in Log Message: Formatter uses operator<<(ostream) Index: ChangeLog =================================================================== RCS file: /cvsroot/mockpp/mockpp/ChangeLog,v retrieving revision 1.55 retrieving revision 1.56 diff -u -d -r1.55 -r1.56 --- ChangeLog 23 Jul 2005 13:31:56 -0000 1.55 +++ ChangeLog 23 Jul 2005 17:37:30 -0000 1.56 @@ -5,6 +5,7 @@ 2005-07-23 1.9.0: - class OutBound enables outbound parameter references + - Formatter can reuse existing operator<<(ostream, X) 2005-05-28 1.8.2: Index: TODO =================================================================== RCS file: /cvsroot/mockpp/mockpp/TODO,v retrieving revision 1.45 retrieving revision 1.46 diff -u -d -r1.45 -r1.46 --- TODO 23 Jul 2005 13:31:56 -0000 1.45 +++ TODO 23 Jul 2005 17:37:31 -0000 1.46 @@ -2,6 +2,7 @@ ---- OutBound + ostreamed Problem Exception-Transformation?? Index: configure.in =================================================================== RCS file: /cvsroot/mockpp/mockpp/configure.in,v retrieving revision 1.82 retrieving revision 1.83 diff -u -d -r1.82 -r1.83 --- configure.in 13 Jun 2005 20:33:25 -0000 1.82 +++ configure.in 23 Jul 2005 17:37:31 -0000 1.83 @@ -16,11 +16,11 @@ # if backwards compatibility has been broken, set MOCKPP_BINARY_AGE and MOCKPP_INTERFACE_AGE to 0. # MOCKPP_MAJOR_VERSION=1 -MOCKPP_MINOR_VERSION=8 -MOCKPP_PATCH_VERSION=2 +MOCKPP_MINOR_VERSION=9 +MOCKPP_PATCH_VERSION=0 -MOCKPP_MICRO_VERSION=29 -MOCKPP_INTERFACE_AGE=1 +MOCKPP_MICRO_VERSION=30 +MOCKPP_INTERFACE_AGE=0 MOCKPP_BINARY_AGE=7 MOCKPP_VERSION=$MOCKPP_MAJOR_VERSION.$MOCKPP_MINOR_VERSION.$MOCKPP_PATCH_VERSION |
Update of /cvsroot/mockpp/mockpp/bcb5 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9329/bcb5 Modified Files: basicmock.bpf basicmock.bpr chainmock.bpf chainmock.bpr cppunit.bpf cppunit.bpr gen-mak.bat jmock_test.bpf jmock_test.bpr mock_greeter.bpf mock_greeter.bpr mock_test.bpf mock_test.bpr mockpp.bpf mockpp.bpg mockpp.bpr mockpp_production.bpr poormock-se.bpf poormock-se.bpr poormock.bpf poormock.bpr readability.bpf readability.bpr verifying.bpf verifying.bpr visitmock.bpf visitmock.bpr Log Message: Formatter uses operator<<(ostream) Index: poormock.bpr =================================================================== RCS file: /cvsroot/mockpp/mockpp/bcb5/poormock.bpr,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- poormock.bpr 6 May 2005 20:12:27 -0000 1.17 +++ poormock.bpr 23 Jul 2005 17:37:32 -0000 1.18 @@ -3,13 +3,13 @@ <PROJECT> <MACROS> <VERSION value="BCB.05.03"/> - <PROJECT value="c:\tmp\compile\poormock_28.exe"/> - <OBJFILES value="c:\tmp\compile\mockpp_28\\poormock.obj - c:\tmp\compile\mockpp_28\\consumer.obj"/> + <PROJECT value="c:\tmp\compile\poormock_30.exe"/> + <OBJFILES value="c:\tmp\compile\mockpp_30\\poormock.obj + c:\tmp\compile\mockpp_30\\consumer.obj"/> <RESFILES value=""/> <DEFFILE value=""/> <RESDEPEN value="$(RESFILES)"/> - <LIBFILES value="c:\tmp\compile\mockpp_28.lib c:\tmp\compile\cppunit_1_10.lib"/> + <LIBFILES value="c:\tmp\compile\mockpp_30.lib c:\tmp\compile\cppunit_1_10.lib"/> <LIBRARIES value=""/> <SPARELIBS value=""/> <PACKAGES value="VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi @@ -27,16 +27,16 @@ <SYSDEFINES value="NO_STRICT;_NO_VCL;_RTLDLL;USEPACKAGES"/> <MAINSOURCE value="poormock.bpf"/> <INCLUDEPATH value="..\mockpp\examples\tutorial;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include"/> - <LIBPATH value="..\mockpp\examples\tutorial;..\mockpp_28\examples\tutorial;$(BCB)\lib\obj;$(BCB)\lib"/> + <LIBPATH value="..\mockpp\examples\tutorial;..\mockpp_30\examples\tutorial;$(BCB)\lib\obj;$(BCB)\lib"/> <WARNINGS value="-w-par"/> </MACROS> <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_28\" -N0"c:\tmp\compile\mockpp_28\" -$YD -$W + <PFLAGS value="-N2"c:\tmp\compile\mockpp_30\" -N0"c:\tmp\compile\mockpp_30\" -$YD -$W -$O- -v -JPHNE -M"/> <RFLAGS value=""/> <AFLAGS value="/mx /w2 /zd"/> - <LFLAGS value="-l"c:\tmp\compile\" -I"c:\tmp\compile\mockpp_28\" -D"" -ap -Tpe -x -Gn -v"/> + <LFLAGS value="-l"c:\tmp\compile\" -I"c:\tmp\compile\mockpp_30\" -D"" -ap -Tpe -x -Gn -v"/> </OPTIONS> <LINKER> <ALLOBJ value="c0x32.obj $(PACKAGES) $(OBJFILES)"/> @@ -79,52 +79,52 @@ Item3=..\mockpp\examples\tutorial;..\;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include\ Item4=..\mockpp\examples\tutorial;..\..\mockpp;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include\ Item5=..\..\mockpp;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include -Item6=..\mockpp\examples\tutorial;..\mockpp_28\examples\tutorial;..\mockpp_28\examples;..\mockpp_28\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include -Item7=..\mockpp\examples\tutorial;..\mockpp_28\examples\tutorial;..\mockpp_28\examples;..\mockpp_28\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include -Item8=..\mockpp_28\examples\tutorial;..\mockpp_28\examples;..\mockpp_28\tests;..;$(BCB)\include;..\..\..\cppunit.ups\include -Item9=\\SONNE\HOMES\Documents\src\mockpp_28\mockpp\mockpp_28\examples\tutorial;..\mockpp_28\examples\tutorial;..\mockpp_28\examples;..\mockpp_28\tests;..;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include -Item10=..\mockpp_28\examples;..\mockpp_28\tests;..\..\mockpp;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include -Item11=..\mockpp_28\tests;..;$(BCB)\include;..\..\cppunit\include;X:\src\cppunit-1.8.0\include -Item12=..\mockpp_28\tests;..;$(BCB)\include;..\..\cppunit\include -Item13=..\mockpp_28\tests;..;$(BCB)\include;B:\cvs\ups\src\3party\cppunit\include -Item14=..\mockpp_28\tests;..;$(BCB)\include;..\..\..\cppunit-1.8.0\include +Item6=..\mockpp\examples\tutorial;..\mockpp_30\examples\tutorial;..\mockpp_30\examples;..\mockpp_30\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include +Item7=..\mockpp\examples\tutorial;..\mockpp_30\examples\tutorial;..\mockpp_30\examples;..\mockpp_30\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include +Item8=..\mockpp_30\examples\tutorial;..\mockpp_30\examples;..\mockpp_30\tests;..;$(BCB)\include;..\..\..\cppunit.ups\include +Item9=\\SONNE\HOMES\Documents\src\mockpp_30\mockpp\mockpp_30\examples\tutorial;..\mockpp_30\examples\tutorial;..\mockpp_30\examples;..\mockpp_30\tests;..;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include +Item10=..\mockpp_30\examples;..\mockpp_30\tests;..\..\mockpp;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include +Item11=..\mockpp_30\tests;..;$(BCB)\include;..\..\cppunit\include;X:\src\cppunit-1.8.0\include +Item12=..\mockpp_30\tests;..;$(BCB)\include;..\..\cppunit\include +Item13=..\mockpp_30\tests;..;$(BCB)\include;B:\cvs\ups\src\3party\cppunit\include +Item14=..\mockpp_30\tests;..;$(BCB)\include;..\..\..\cppunit-1.8.0\include Item15=..;$(BCB)\include;..\..\..\cppunit-1.8.0\include -Item16=..\mockpp_28\tests;\\SONNE\HOMES\src\mockpp_28\mockpp\mockpp_28\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.8.0\include +Item16=..\mockpp_30\tests;\\SONNE\HOMES\src\mockpp_30\mockpp\mockpp_30\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.8.0\include Item17=..;$(BCB)\include;X:\src\cppunit-1.8.0\include -Item18=\\SONNE\HOMES\src\mockpp_28\mockpp\mockpp_28\tests;..\..\mockpp;..\mockpp_28\tests;..\mockpp;..\expat;$(BCB)\include -Item19=..;..\mockpp_28\tests;..\mockpp;..\expat;$(BCB)\include -Item20=..\..\mockpp;..\mockpp_28\tests;..\mockpp;..\expat;$(BCB)\include -Item21=..\..\mockpp;..\mockpp_28\tests;..\mockpp;..\expat;$(BCB)\include;$(BCB)\include\vcl;C:\wx2\include\ -Item22=.. ;..\mockpp_28\tests;..\mockpp;..\expat;$(BCB)\include;$(BCB)\include\vcl;C:\wx2\include\ -Item23=.. ;..\mockpp_28\tests;..\expat;..\mockpp;$(BCB)\include;$(BCB)\include\vcl;C:\wx2\include -Item24=..\mockpp_28\tests;..\expat;..\mockpp;$(BCB)\include;$(BCB)\include\vcl -Item25=..\mockpp_28\tests;..\mockpp;$(BCB)\include;$(BCB)\include\vcl;expat +Item18=\\SONNE\HOMES\src\mockpp_30\mockpp\mockpp_30\tests;..\..\mockpp;..\mockpp_30\tests;..\mockpp;..\expat;$(BCB)\include +Item19=..;..\mockpp_30\tests;..\mockpp;..\expat;$(BCB)\include +Item20=..\..\mockpp;..\mockpp_30\tests;..\mockpp;..\expat;$(BCB)\include +Item21=..\..\mockpp;..\mockpp_30\tests;..\mockpp;..\expat;$(BCB)\include;$(BCB)\include\vcl;C:\wx2\include\ +Item22=.. ;..\mockpp_30\tests;..\mockpp;..\expat;$(BCB)\include;$(BCB)\include\vcl;C:\wx2\include\ +Item23=.. ;..\mockpp_30\tests;..\expat;..\mockpp;$(BCB)\include;$(BCB)\include\vcl;C:\wx2\include +Item24=..\mockpp_30\tests;..\expat;..\mockpp;$(BCB)\include;$(BCB)\include\vcl +Item25=..\mockpp_30\tests;..\mockpp;$(BCB)\include;$(BCB)\include\vcl;expat Item26=..\mockpp;$(BCB)\include;$(BCB)\include\vcl;expat -Item27=..\mockpp_28\tests;..\mockpp;$(BCB)\include;$(BCB)\include\vcl -Item28=..\mockpp_28\tests;..\mockpp;$(BCB)\include -Item29=..\mockpp_28\tests;..\mockpp;$(BCB)/include +Item27=..\mockpp_30\tests;..\mockpp;$(BCB)\include;$(BCB)\include\vcl +Item28=..\mockpp_30\tests;..\mockpp;$(BCB)\include +Item29=..\mockpp_30\tests;..\mockpp;$(BCB)/include [HistoryLists\hlLibraryPath] Count=19 -Item0=..\mockpp\examples\tutorial;..\mockpp_28\examples\tutorial;$(BCB)\lib\obj;$(BCB)\lib +Item0=..\mockpp\examples\tutorial;..\mockpp_30\examples\tutorial;$(BCB)\lib\obj;$(BCB)\lib Item1=$(BCB)\lib\obj;$(BCB)\lib -Item2=\\SONNE\HOMES\Documents\src\mockpp_28\mockpp\mockpp_28\examples\tutorial;..\mockpp_28\examples\tutorial;..\mockpp_28\examples;..\mockpp_28\tests;..\expat;$(BCB)\lib\obj;$(BCB)\lib -Item3=..\mockpp_28\examples;..\mockpp_28\tests;..\expat;$(BCB)\lib\obj;$(BCB)\lib -Item4=..\mockpp_28\examples;\\SONNE\HOMES\src\mockpp_28\mockpp\mockpp_28\tests;..\mockpp_28\tests;..\expat;$(BCB)\lib\obj;$(BCB)\lib -Item5=\\SONNE\HOMES\src\mockpp_28\mockpp\mockpp_28\tests;..\mockpp_28\tests;..\expat;$(BCB)\lib\obj;$(BCB)\lib -Item6=..\mockpp_28\tests;..\expat;$(BCB)\lib\obj;$(BCB)\lib -Item7=..\mockpp_28\tests;$(BCB)\lib\obj;$(BCB)\lib;output;expat -Item8=..\mockpp_28\tests;$(BCB)\lib\obj;$(BCB)\lib;output;bin -Item9=..\mockpp_28\apps;$(BCB)\lib\obj;$(BCB)\lib;output;bin -Item10=..\mockpp_28\apps;$(BCB)\lib\obj;$(BCB)\lib;output -Item11=..\mockpp_28\apps;$(BCB)\lib\obj;$(BCB)\lib;E:\Eigene Dateien\c++\mockpp_28\bcb5\output -Item12=..\mockpp_28\apps;$(BCB)\lib\obj;$(BCB)\lib;..\output -Item13=..\mockpp_28\apps;$(BCB)\lib\obj;$(BCB)\lib -Item14=..\mockpp_28\apps;D:\CBuilder5\mockpp_28\;$(BCB)\lib\obj;$(BCB)\lib -Item15=e:\Eigene Dateien\c++\mockpp_28\mockpp\apps\;..\mockpp;$(BCB)\lib\obj;$(BCB)\lib -Item16=e:\Eigene Dateien\c++\mockpp_28\mockpp\apps;..\mockpp;$(BCB)\lib\obj;$(BCB)\lib +Item2=\\SONNE\HOMES\Documents\src\mockpp_30\mockpp\mockpp_30\examples\tutorial;..\mockpp_30\examples\tutorial;..\mockpp_30\examples;..\mockpp_30\tests;..\expat;$(BCB)\lib\obj;$(BCB)\lib +Item3=..\mockpp_30\examples;..\mockpp_30\tests;..\expat;$(BCB)\lib\obj;$(BCB)\lib +Item4=..\mockpp_30\examples;\\SONNE\HOMES\src\mockpp_30\mockpp\mockpp_30\tests;..\mockpp_30\tests;..\expat;$(BCB)\lib\obj;$(BCB)\lib +Item5=\\SONNE\HOMES\src\mockpp_30\mockpp\mockpp_30\tests;..\mockpp_30\tests;..\expat;$(BCB)\lib\obj;$(BCB)\lib +Item6=..\mockpp_30\tests;..\expat;$(BCB)\lib\obj;$(BCB)\lib +Item7=..\mockpp_30\tests;$(BCB)\lib\obj;$(BCB)\lib;output;expat +Item8=..\mockpp_30\tests;$(BCB)\lib\obj;$(BCB)\lib;output;bin +Item9=..\mockpp_30\apps;$(BCB)\lib\obj;$(BCB)\lib;output;bin +Item10=..\mockpp_30\apps;$(BCB)\lib\obj;$(BCB)\lib;output +Item11=..\mockpp_30\apps;$(BCB)\lib\obj;$(BCB)\lib;E:\Eigene Dateien\c++\mockpp_30\bcb5\output +Item12=..\mockpp_30\apps;$(BCB)\lib\obj;$(BCB)\lib;..\output +Item13=..\mockpp_30\apps;$(BCB)\lib\obj;$(BCB)\lib +Item14=..\mockpp_30\apps;D:\CBuilder5\mockpp_30\;$(BCB)\lib\obj;$(BCB)\lib +Item15=e:\Eigene Dateien\c++\mockpp_30\mockpp\apps\;..\mockpp;$(BCB)\lib\obj;$(BCB)\lib +Item16=e:\Eigene Dateien\c++\mockpp_30\mockpp\apps;..\mockpp;$(BCB)\lib\obj;$(BCB)\lib Item17=..\mockpp;$(BCB)\lib\obj;$(BCB)\lib -Item18=e:\Eigene Dateien\c++\mockpp_28\mockpp\apps;$(BCB)\lib\obj;$(BCB)\lib +Item18=e:\Eigene Dateien\c++\mockpp_30\mockpp\apps;$(BCB)\lib\obj;$(BCB)\lib [HistoryLists\hlDebugSourcePath] Count=1 @@ -138,35 +138,35 @@ [HistoryLists\hlIntOutputDir] Count=7 -Item0=c:\tmp\compile\mockpp_28\ -Item1=c:\tmp\compile\mockpp_28\ulxr_bcb5\ +Item0=c:\tmp\compile\mockpp_30\ +Item1=c:\tmp\compile\mockpp_30\ulxr_bcb5\ Item2=c:\temp Item3=output -Item4=E:\Eigene Dateien\c++\mockpp_28\bcb5\output\ -Item5=E:\Eigene Dateien\c++\mockpp_28\bcb5\output +Item4=E:\Eigene Dateien\c++\mockpp_30\bcb5\output\ +Item5=E:\Eigene Dateien\c++\mockpp_30\bcb5\output Item6=D:\CBuilder5\Projects\output\ [HistoryLists\hlFinalOutputDir] Count=8 Item0=c:\tmp\compile\ Item1=c:\tmp\compile -Item2=c:\tmp\compile\mockpp_28\ +Item2=c:\tmp\compile\mockpp_30\ Item3=c:\temp Item4=output\ -Item5=E:\Eigene Dateien\c++\mockpp_28\bcb5\output\ -Item6=E:\Eigene Dateien\c++\mockpp_28\bcb5\output +Item5=E:\Eigene Dateien\c++\mockpp_30\bcb5\output\ +Item6=E:\Eigene Dateien\c++\mockpp_30\bcb5\output Item7=output [HistoryLists\hIBPIOutputDir] Count=10 Item0=c:\tmp\compile\ Item1=c:\tmp\compile -Item2=c:\tmp\compile\mockpp_28\ -Item3=c:\tmp\compile\mockpp_28\ulxr_bcb5\ +Item2=c:\tmp\compile\mockpp_30\ +Item3=c:\tmp\compile\mockpp_30\ulxr_bcb5\ Item4=c:\temp -Item5=e:\Eigene Dateien\c++\mockpp_28\bcb5\output\ +Item5=e:\Eigene Dateien\c++\mockpp_30\bcb5\output\ Item6=output\ -Item7=E:\Eigene Dateien\c++\mockpp_28\bcb5\output +Item7=E:\Eigene Dateien\c++\mockpp_30\bcb5\output Item8=D:\CBuilder5\Projects\output\ Item9=output Index: verifying.bpr =================================================================== RCS file: /cvsroot/mockpp/mockpp/bcb5/verifying.bpr,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- verifying.bpr 6 May 2005 20:12:27 -0000 1.14 +++ verifying.bpr 23 Jul 2005 17:37:32 -0000 1.15 @@ -3,12 +3,12 @@ <PROJECT> <MACROS> <VERSION value="BCB.05.03"/> - <PROJECT value="c:\tmp\compile\verifying_28.exe"/> - <OBJFILES value="c:\tmp\compile\mockpp_28\\verifying.obj"/> + <PROJECT value="c:\tmp\compile\verifying_30.exe"/> + <OBJFILES value="c:\tmp\compile\mockpp_30\\verifying.obj"/> <RESFILES value=""/> <DEFFILE value=""/> <RESDEPEN value="$(RESFILES)"/> - <LIBFILES value="c:\tmp\compile\mockpp_28.lib c:\tmp\compile\cppunit_1_10.lib"/> + <LIBFILES value="c:\tmp\compile\mockpp_30.lib c:\tmp\compile\cppunit_1_10.lib"/> <LIBRARIES value=""/> <SPARELIBS value=""/> <PACKAGES value="VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi @@ -26,16 +26,16 @@ <SYSDEFINES value="NO_STRICT;_NO_VCL;_RTLDLL;USEPACKAGES"/> <MAINSOURCE value="verifying.bpf"/> <INCLUDEPATH value="..\mockpp\examples\tutorial;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include"/> - <LIBPATH value="..\mockpp\examples\tutorial;..\mockpp_28\examples\tutorial;..\examples\tutorial;$(BCB)\lib\obj;$(BCB)\lib"/> + <LIBPATH value="..\mockpp\examples\tutorial;..\mockpp_30\examples\tutorial;..\examples\tutorial;$(BCB)\lib\obj;$(BCB)\lib"/> <WARNINGS value="-w-par"/> </MACROS> <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_28\" -N0"c:\tmp\compile\mockpp_28\" -$YD -$W + <PFLAGS value="-N2"c:\tmp\compile\mockpp_30\" -N0"c:\tmp\compile\mockpp_30\" -$YD -$W -$O- -v -JPHNE -M"/> <RFLAGS value=""/> <AFLAGS value="/mx /w2 /zi"/> - <LFLAGS value="-l"c:\tmp\compile\" -I"c:\tmp\compile\mockpp_28\" -D"" -ap -Tpe -x -Gn -v"/> + <LFLAGS value="-l"c:\tmp\compile\" -I"c:\tmp\compile\mockpp_30\" -D"" -ap -Tpe -x -Gn -v"/> </OPTIONS> <LINKER> <ALLOBJ value="c0x32.obj $(PACKAGES) $(OBJFILES)"/> @@ -75,56 +75,56 @@ Item0=..\mockpp\examples\tutorial;..;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include\ Item1=..\mockpp\examples\tutorial;..\..\mockpp-1.8.0;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include\ Item2=..;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include -Item3=..\mockpp\examples\tutorial;..\mockpp_28\examples\tutorial;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include -Item4=..\mockpp\examples\tutorial;..\mockpp_28\examples\tutorial;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include -Item5=..\mockpp_28\examples\tutorial;..\..\mockpp;$(BCB)\include;..\..\..\cppunit.ups\include -Item6=..\mockpp_28\examples\tutorial;..\..\..\..\src;$(BCB)\include;..\..\..\cppunit.ups\include -Item7=..\mockpp_28\examples\tutorial;..\..\..;$(BCB)\include;..\..\..\cppunit.ups\include -Item8=..\mockpp_28\examples\tutorial;..\..\..\mockpp;$(BCB)\include;..\..\..\cppunit.ups\include +Item3=..\mockpp\examples\tutorial;..\mockpp_30\examples\tutorial;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include +Item4=..\mockpp\examples\tutorial;..\mockpp_30\examples\tutorial;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include +Item5=..\mockpp_30\examples\tutorial;..\..\mockpp;$(BCB)\include;..\..\..\cppunit.ups\include +Item6=..\mockpp_30\examples\tutorial;..\..\..\..\src;$(BCB)\include;..\..\..\cppunit.ups\include +Item7=..\mockpp_30\examples\tutorial;..\..\..;$(BCB)\include;..\..\..\cppunit.ups\include +Item8=..\mockpp_30\examples\tutorial;..\..\..\mockpp;$(BCB)\include;..\..\..\cppunit.ups\include Item9=..\..;$(BCB)\include;..\..\..\cppunit.ups\include -Item10=..\mockpp_28\examples\tutorial;..\..\mockpp;$(BCB)\include;..\..\..\..\cppunit.ups\include +Item10=..\mockpp_30\examples\tutorial;..\..\mockpp;$(BCB)\include;..\..\..\..\cppunit.ups\include Item11=..;$(BCB)\include;..\..\..\..\cppunit.ups\include -Item12=..\mockpp_28\examples\tutorial;..\examples\tutorial;..\examples;..\..\..\mockpp;$(BCB)\include;..\..\..\..\cppunit.ups\include -Item13=..\mockpp_28\examples\tutorial;..\mockpp_28\examples;..\..\mockpp;$(BCB)\include;..\..\..\cppunit.ups\include -Item14=..\mockpp_28\examples\tutorial;..\mockpp_28\examples;..\mockpp_28\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit.ups\include -Item15=..\mockpp_28\examples\tutorial;..\mockpp_28\examples;..\mockpp_28\tests;..;$(BCB)\include;..\..\..\cppunit.ups\include -Item16=..\mockpp_28\examples\tutorial;..\mockpp_28\examples;..\mockpp_28\tests;..;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include -Item17=..\mockpp_28\examples;..\mockpp_28\tests;..\..\mockpp;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include -Item18=..\mockpp_28\tests;..;$(BCB)\include;..\..\cppunit\include;X:\src\cppunit-1.8.0\include -Item19=..\mockpp_28\tests;..;$(BCB)\include;..\..\cppunit\include -Item20=..\mockpp_28\tests;..;$(BCB)\include;B:\cvs\ups\src\3party\cppunit\include -Item21=..\mockpp_28\tests;..;$(BCB)\include;..\..\..\cppunit-1.8.0\include +Item12=..\mockpp_30\examples\tutorial;..\examples\tutorial;..\examples;..\..\..\mockpp;$(BCB)\include;..\..\..\..\cppunit.ups\include +Item13=..\mockpp_30\examples\tutorial;..\mockpp_30\examples;..\..\mockpp;$(BCB)\include;..\..\..\cppunit.ups\include +Item14=..\mockpp_30\examples\tutorial;..\mockpp_30\examples;..\mockpp_30\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit.ups\include +Item15=..\mockpp_30\examples\tutorial;..\mockpp_30\examples;..\mockpp_30\tests;..;$(BCB)\include;..\..\..\cppunit.ups\include +Item16=..\mockpp_30\examples\tutorial;..\mockpp_30\examples;..\mockpp_30\tests;..;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include +Item17=..\mockpp_30\examples;..\mockpp_30\tests;..\..\mockpp;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include +Item18=..\mockpp_30\tests;..;$(BCB)\include;..\..\cppunit\include;X:\src\cppunit-1.8.0\include +Item19=..\mockpp_30\tests;..;$(BCB)\include;..\..\cppunit\include +Item20=..\mockpp_30\tests;..;$(BCB)\include;B:\cvs\ups\src\3party\cppunit\include +Item21=..\mockpp_30\tests;..;$(BCB)\include;..\..\..\cppunit-1.8.0\include Item22=..;$(BCB)\include;..\..\..\cppunit-1.8.0\include -Item23=..\mockpp_28\tests;\\SONNE\HOMES\src\mockpp_28\mockpp\mockpp_28\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.8.0\include +Item23=..\mockpp_30\tests;\\SONNE\HOMES\src\mockpp_30\mockpp\mockpp_30\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.8.0\include Item24=..;$(BCB)\include;X:\src\cppunit-1.8.0\include -Item25=\\SONNE\HOMES\src\mockpp_28\mockpp\mockpp_28\tests;..\..\mockpp;..\mockpp_28\tests;..\mockpp;..\expat;$(BCB)\include -Item26=..;..\mockpp_28\tests;..\mockpp;..\expat;$(BCB)\include -Item27=..\..\mockpp;..\mockpp_28\tests;..\mockpp;..\expat;$(BCB)\include -Item28=..\..\mockpp;..\mockpp_28\tests;..\mockpp;..\expat;$(BCB)\include;$(BCB)\include\vcl;C:\wx2\include\ -Item29=.. ;..\mockpp_28\tests;..\mockpp;..\expat;$(BCB)\include;$(BCB)\include\vcl;C:\wx2\include\ +Item25=\\SONNE\HOMES\src\mockpp_30\mockpp\mockpp_30\tests;..\..\mockpp;..\mockpp_30\tests;..\mockpp;..\expat;$(BCB)\include +Item26=..;..\mockpp_30\tests;..\mockpp;..\expat;$(BCB)\include +Item27=..\..\mockpp;..\mockpp_30\tests;..\mockpp;..\expat;$(BCB)\include +Item28=..\..\mockpp;..\mockpp_30\tests;..\mockpp;..\expat;$(BCB)\include;$(BCB)\include\vcl;C:\wx2\include\ +Item29=.. ;..\mockpp_30\tests;..\mockpp;..\expat;$(BCB)\include;$(BCB)\include\vcl;C:\wx2\include\ [HistoryLists\hlLibraryPath] Count=20 -Item0=..\mockpp\examples\tutorial;..\mockpp_28\examples\tutorial;..\examples\tutorial;$(BCB)\lib\obj;$(BCB)\lib -Item1=..\mockpp_28\examples\tutorial;..\examples\tutorial;$(BCB)\lib\obj;$(BCB)\lib +Item0=..\mockpp\examples\tutorial;..\mockpp_30\examples\tutorial;..\examples\tutorial;$(BCB)\lib\obj;$(BCB)\lib +Item1=..\mockpp_30\examples\tutorial;..\examples\tutorial;$(BCB)\lib\obj;$(BCB)\lib Item2=$(BCB)\lib\obj;$(BCB)\lib -Item3=..\mockpp_28\examples\tutorial;..\mockpp_28\examples;..\mockpp_28\tests;..\expat;$(BCB)\lib\obj;$(BCB)\lib -Item4=..\mockpp_28\examples;..\mockpp_28\tests;..\expat;$(BCB)\lib\obj;$(BCB)\lib -Item5=..\mockpp_28\examples;\\SONNE\HOMES\src\mockpp_28\mockpp\mockpp_28\tests;..\mockpp_28\tests;..\expat;$(BCB)\lib\obj;$(BCB)\lib -Item6=\\SONNE\HOMES\src\mockpp_28\mockpp\mockpp_28\tests;..\mockpp_28\tests;..\expat;$(BCB)\lib\obj;$(BCB)\lib -Item7=..\mockpp_28\tests;..\expat;$(BCB)\lib\obj;$(BCB)\lib -Item8=..\mockpp_28\tests;$(BCB)\lib\obj;$(BCB)\lib;output;expat -Item9=..\mockpp_28\tests;$(BCB)\lib\obj;$(BCB)\lib;output;bin -Item10=..\mockpp_28\apps;$(BCB)\lib\obj;$(BCB)\lib;output;bin -Item11=..\mockpp_28\apps;$(BCB)\lib\obj;$(BCB)\lib;output -Item12=..\mockpp_28\apps;$(BCB)\lib\obj;$(BCB)\lib;E:\Eigene Dateien\c++\mockpp_28\bcb5\output -Item13=..\mockpp_28\apps;$(BCB)\lib\obj;$(BCB)\lib;..\output -Item14=..\mockpp_28\apps;$(BCB)\lib\obj;$(BCB)\lib -Item15=..\mockpp_28\apps;D:\CBuilder5\mockpp_28\;$(BCB)\lib\obj;$(BCB)\lib -Item16=e:\Eigene Dateien\c++\mockpp_28\mockpp\apps\;..\mockpp;$(BCB)\lib\obj;$(BCB)\lib -Item17=e:\Eigene Dateien\c++\mockpp_28\mockpp\apps;..\mockpp;$(BCB)\lib\obj;$(BCB)\lib +Item3=..\mockpp_30\examples\tutorial;..\mockpp_30\examples;..\mockpp_30\tests;..\expat;$(BCB)\lib\obj;$(BCB)\lib +Item4=..\mockpp_30\examples;..\mockpp_30\tests;..\expat;$(BCB)\lib\obj;$(BCB)\lib +Item5=..\mockpp_30\examples;\\SONNE\HOMES\src\mockpp_30\mockpp\mockpp_30\tests;..\mockpp_30\tests;..\expat;$(BCB)\lib\obj;$(BCB)\lib +Item6=\\SONNE\HOMES\src\mockpp_30\mockpp\mockpp_30\tests;..\mockpp_30\tests;..\expat;$(BCB)\lib\obj;$(BCB)\lib +Item7=..\mockpp_30\tests;..\expat;$(BCB)\lib\obj;$(BCB)\lib +Item8=..\mockpp_30\tests;$(BCB)\lib\obj;$(BCB)\lib;output;expat +Item9=..\mockpp_30\tests;$(BCB)\lib\obj;$(BCB)\lib;output;bin +Item10=..\mockpp_30\apps;$(BCB)\lib\obj;$(BCB)\lib;output;bin +Item11=..\mockpp_30\apps;$(BCB)\lib\obj;$(BCB)\lib;output +Item12=..\mockpp_30\apps;$(BCB)\lib\obj;$(BCB)\lib;E:\Eigene Dateien\c++\mockpp_30\bcb5\output +Item13=..\mockpp_30\apps;$(BCB)\lib\obj;$(BCB)\lib;..\output +Item14=..\mockpp_30\apps;$(BCB)\lib\obj;$(BCB)\lib +Item15=..\mockpp_30\apps;D:\CBuilder5\mockpp_30\;$(BCB)\lib\obj;$(BCB)\lib +Item16=e:\Eigene Dateien\c++\mockpp_30\mockpp\apps\;..\mockpp;$(BCB)\lib\obj;$(BCB)\lib +Item17=e:\Eigene Dateien\c++\mockpp_30\mockpp\apps;..\mockpp;$(BCB)\lib\obj;$(BCB)\lib Item18=..\mockpp;$(BCB)\lib\obj;$(BCB)\lib -Item19=e:\Eigene Dateien\c++\mockpp_28\mockpp\apps;$(BCB)\lib\obj;$(BCB)\lib +Item19=e:\Eigene Dateien\c++\mockpp_30\mockpp\apps;$(BCB)\lib\obj;$(BCB)\lib [HistoryLists\hlDebugSourcePath] Count=1 @@ -139,35 +139,35 @@ [HistoryLists\hlIntOutputDir] Count=7 -Item0=c:\tmp\compile\mockpp_28\ -Item1=c:\tmp\compile\mockpp_28\ulxr_bcb5\ +Item0=c:\tmp\compile\mockpp_30\ +Item1=c:\tmp\compile\mockpp_30\ulxr_bcb5\ Item2=c:\temp Item3=output -Item4=E:\Eigene Dateien\c++\mockpp_28\bcb5\output\ -Item5=E:\Eigene Dateien\c++\mockpp_28\bcb5\output +Item4=E:\Eigene Dateien\c++\mockpp_30\bcb5\output\ +Item5=E:\Eigene Dateien\c++\mockpp_30\bcb5\output Item6=D:\CBuilder5\Projects\output\ [HistoryLists\hlFinalOutputDir] Count=8 Item0=c:\tmp\compile\ Item1=c:\tmp\compile -Item2=c:\tmp\compile\mockpp_28\ +Item2=c:\tmp\compile\mockpp_30\ Item3=c:\temp Item4=output\ -Item5=E:\Eigene Dateien\c++\mockpp_28\bcb5\output\ -Item6=E:\Eigene Dateien\c++\mockpp_28\bcb5\output +Item5=E:\Eigene Dateien\c++\mockpp_30\bcb5\output\ +Item6=E:\Eigene Dateien\c++\mockpp_30\bcb5\output Item7=output [HistoryLists\hIBPIOutputDir] Count=10 Item0=c:\tmp\compile\ Item1=c:\tmp\compile -Item2=c:\tmp\compile\mockpp_28\ -Item3=c:\tmp\compile\mockpp_28\ulxr_bcb5\ +Item2=c:\tmp\compile\mockpp_30\ +Item3=c:\tmp\compile\mockpp_30\ulxr_bcb5\ Item4=c:\temp -Item5=e:\Eigene Dateien\c++\mockpp_28\bcb5\output\ +Item5=e:\Eigene Dateien\c++\mockpp_30\bcb5\output\ Item6=output\ -Item7=E:\Eigene Dateien\c++\mockpp_28\bcb5\output +Item7=E:\Eigene Dateien\c++\mockpp_30\bcb5\output Item8=D:\CBuilder5\Projects\output\ Item9=output Index: mock_test.bpf =================================================================== RCS file: /cvsroot/mockpp/mockpp/bcb5/mock_test.bpf,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- mock_test.bpf 6 May 2005 14:30:35 -0000 1.30 +++ mock_test.bpf 23 Jul 2005 17:37:31 -0000 1.31 @@ -2,8 +2,8 @@ This file is used by the project manager only and should be treated like the project file main //--------------------------------------------------------------------------- -USELIB("c:\tmp\compile\mockpp_28.lib"); -USELIB("c:\tmp\compile\mockpp_production_28.lib"); +USELIB("c:\tmp\compile\mockpp_30.lib"); +USELIB("c:\tmp\compile\mockpp_production_30.lib"); USELIB("c:\tmp\compile\cppunit_1_10.lib"); //--------------------------------------------------------------------------- USEUNIT("..\mockpp\tests\AssertMo_test.cpp"); Index: mockpp_production.bpr =================================================================== RCS file: /cvsroot/mockpp/mockpp/bcb5/mockpp_production.bpr,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- mockpp_production.bpr 13 May 2005 21:24:26 -0000 1.7 +++ mockpp_production.bpr 23 Jul 2005 17:37:32 -0000 1.8 @@ -3,8 +3,8 @@ <PROJECT> <MACROS> <VERSION value="BCB.05.03"/> - <PROJECT value="c:\tmp\compile\mockpp_production_28.dll"/> - <OBJFILES value="c:\tmp\compile\mockpp_28\\TimeServer.obj"/> + <PROJECT value="c:\tmp\compile\mockpp_production_30.dll"/> + <OBJFILES value="c:\tmp\compile\mockpp_30\\TimeServer.obj"/> <RESFILES value=""/> <DEFFILE value=""/> <RESDEPEN value="$(RESFILES)"/> @@ -25,18 +25,18 @@ <USERDEFINES value="__DLL___;_DEBUG"/> <SYSDEFINES value="NO_STRICT;_NO_VCL;_RTLDLL;USEPACKAGES"/> <MAINSOURCE value="mockpp_production.bpf"/> - <INCLUDEPATH value="..\mockpp\production;..;..\..\mockpp;$(BCB)\include"/> - <LIBPATH value="..\mockpp\production;..mockpp\builder;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\constraint;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\mockpp_28\matcher;..\mockpp_28\constraint;..\mockpp_28\builder;..\mockpp;..\mockpp_28\chaining;..\mockpp_28\compat;..\mockpp_28\util;..\..\mockpp-1.8.0;$(BCB)\lib\obj;$(BCB)\lib"/> + <INCLUDEPATH value="..\mockpp\production;..;$(BCB)\include"/> + <LIBPATH value="..\mockpp\production;..mockpp\builder;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\constraint;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\mockpp_30\matcher;..\mockpp_30\constraint;..\mockpp_30\builder;..\mockpp;..\mockpp_30\chaining;..\mockpp_30\compat;..\mockpp_30\util;..\..\mockpp-1.8.0;$(BCB)\lib\obj;$(BCB)\lib"/> <WARNINGS value="-w8092 -w8091 -w8090 -w8089 -w8087 -wprc -wuse -wucp -wstv -wstu -wpin -wnod -wnak -wdef -wcln -wbbf -wasm -wamp -wamb"/> </MACROS> <OPTIONS> <CFLAG1 value="-WD -vGc -vGt -vGd -Od -Vx -Ve -X- -r- -a8 -b- -k -y -v -vi- -tWD -tWM -c"/> - <PFLAGS value="-N2"c:\tmp\compile\mockpp_28\" -N0"c:\tmp\compile\mockpp_28\" -$YD -$W + <PFLAGS value="-N2"c:\tmp\compile\mockpp_30\" -N0"c:\tmp\compile\mockpp_30\" -$YD -$W -$O- -v -JPHNE -M"/> <RFLAGS value=""/> <AFLAGS value="/mx /w2 /zi"/> - <LFLAGS value="-l"c:\tmp\compile\" -I"c:\tmp\compile\mockpp_28\" -D"" -aa -Tpd -x -Gn -Gi + <LFLAGS value="-l"c:\tmp\compile\" -I"c:\tmp\compile\mockpp_30\" -D"" -aa -Tpd -x -Gn -Gi -v"/> </OPTIONS> <LINKER> @@ -74,53 +74,53 @@ [HistoryLists\hlIncludePath] Count=30 -Item0=..\mockpp\production;..;$(BCB)\include -Item1=..\mockpp\production;..\..\mockpp;$(BCB)\include -Item2=..\mockpp\production;.\..;$(BCB)\include -Item3=..\mockpp\production;..\..\mockpp-1.8.0;$(BCB)\include -Item4=..\..\mockpp-1.8.0;$(BCB)\include -Item5=..\mockpp\production;..mockpp\builder;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\constraint;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\..\mockpp-1.8.0;$(BCB)\include;X:\cppunit-1.10.2\include\;..\..\cppunit-1.10\include -Item6=..\mockpp\production;..mockpp\builder;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\constraint;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include -Item7=..mockpp\builder;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\constraint;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include -Item8=..mockpp\builder;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\constraint;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include -Item9=..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include -Item10=..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include -Item11=..;$(BCB)\include;..\..\..\cppunit-1.10.2\include -Item12=..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\..\cppunit-1.10\include -Item13=..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\..\cppunit-1.10\include -Item14=..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\mockpp_28\matcher;..\mockpp_28\constraint;..\mockpp_28\builder;..\mockpp;..\mockpp_28\chaining;..\mockpp_28\compat;..\mockpp_28\util;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include -Item15=..\..\mockpp;$(BCB)\include;..\..\..\cppunit.ups\include -Item16=..\mockpp_28\matcher;..\mockpp_28\constraint;..\mockpp_28\builder;..\mockpp_28\chaining;..\mockpp_28\compat;..\mockpp_28\util;..\mockpp;..\..\mockpp;$(BCB)\include;..\..\..\cppunit.ups\include -Item17=..\mockpp;..;$(BCB)\include;..\..\..\cppunit.ups\include -Item18=..\mockpp_28\builder;..\mockpp_28\matcher;..\mockpp_28\constraint;..\builder;\\SONNE\HOMES\Documents\src\mockpp_28\mockpp\mockpp_28\matcher;\\SONNE\HOMES\Documents\src\mockpp_28\mockpp\mockpp_28\constraint;\\SONNE\HOMES\Documents\src\mockpp_28\mockpp\mockpp_28\builder;..\mockpp_28\chaining;\\SONNE\HOMES\Documents\src\mockpp_28\mockpp\mockpp;\\SONNE\HOMES\Documents\src\mockpp_28\mockpp\mockpp_28\chaining;mockpp;\\SONNE\HOMES\src\mockpp_28\mockpp\mockpp;..\mockpp_28\compat;..\mockpp_28\util;..\mockpp;..;$(BCB)\include;..\..\..\cppunit-1.8.0\include -Item19=..\mockpp_28\builder;..\mockpp_28\matcher;..\mockpp_28\constraint;..\builder;\\SONNE\HOMES\Documents\src\mockpp_28\mockpp\mockpp_28\matcher;\\SONNE\HOMES\Documents\src\mockpp_28\mockpp\mockpp_28\constraint;\\SONNE\HOMES\Documents\src\mockpp_28\mockpp\mockpp_28\builder;..\mockpp_28\chaining;\\SONNE\HOMES\Documents\src\mockpp_28\mockpp\mockpp;\\SONNE\HOMES\Documents\src\mockpp_28\mockpp\mockpp_28\chaining;mockpp;\\SONNE\HOMES\src\mockpp_28\mockpp\mockpp;..\mockpp_28\compat;..\mockpp_28\util;..\mockpp;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.8.0\include -Item20=mockpp;\\SONNE\HOMES\src\mockpp_28\mockpp\mockpp;..\mockpp_28\compat;..\mockpp_28\util;..\mockpp;..\..\mockpp;$(BCB)\include;X:\Documents\src\cppunit-1.8.0\include -Item21=mockpp;\\SONNE\HOMES\src\mockpp_28\mockpp\mockpp;..\mockpp_28\compat;..\mockpp_28\util;..\mockpp;..\..\mockpp;$(BCB)\include -Item22=mockpp;\\SONNE\HOMES\src\mockpp_28\mockpp\mockpp;..\mockpp_28\compat;..\mockpp_28\util;..\mockpp;..;$(BCB)\include -Item23=..;$(BCB)\include -Item24=..\mockpp_28\compat;..\mockpp_28\util;..\mockpp;\\SONNE\HOMES\src\mockpp_28\mockpp\mockpp_28\compat;\\SONNE\HOMES\src\mockpp_28\mockpp\mockpp_28\util;\\SONNE\HOMES\src\mockpp_28\mockpp\mockpp;..\ulxmlrpcpp;..\..\mockpp;$(BCB)\include;$(BCB)\include\vcl -Item25=..;$(BCB)\include;$(BCB)\include\vcl -Item26=..\ulxmlrpcpp;C:\Programme\Borland\CBuilder5\Projects;\\SONNE\HOMES\src\ulxr\mockpp_28\mockpp;..;..\mockpp;..\expat;$(BCB)\include;$(BCB)\include\vcl;C:\wx2\include\ -Item27=..\..\mockpp;..\mockpp;..\expat;$(BCB)\include;$(BCB)\include\vcl;C:\wx2\include\ -Item28=..;..\mockpp;..\expat;$(BCB)\include;$(BCB)\include\vcl;C:\wx2\include\ -Item29=..\..\mockpp;..\mockpp;..\expat;..;$(BCB)\include;$(BCB)\include\vcl;C:\wx2\include\ +Item0=..\mockpp\production;..;..\..\mockpp;$(BCB)\include +Item1=..\mockpp\production;..;$(BCB)\include +Item2=..\mockpp\production;..\..\mockpp;$(BCB)\include +Item3=..\mockpp\production;.\..;$(BCB)\include +Item4=..\mockpp\production;..\..\mockpp-1.8.0;$(BCB)\include +Item5=..\..\mockpp-1.8.0;$(BCB)\include +Item6=..\mockpp\production;..mockpp\builder;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\constraint;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\..\mockpp-1.8.0;$(BCB)\include;X:\cppunit-1.10.2\include\;..\..\cppunit-1.10\include +Item7=..\mockpp\production;..mockpp\builder;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\constraint;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include +Item8=..mockpp\builder;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\constraint;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include +Item9=..mockpp\builder;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\constraint;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include +Item10=..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include +Item11=..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include +Item12=..;$(BCB)\include;..\..\..\cppunit-1.10.2\include +Item13=..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\..\cppunit-1.10\include +Item14=..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\..\cppunit-1.10\include +Item15=..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\mockpp_30\matcher;..\mockpp_30\constraint;..\mockpp_30\builder;..\mockpp;..\mockpp_30\chaining;..\mockpp_30\compat;..\mockpp_30\util;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include +Item16=..\..\mockpp;$(BCB)\include;..\..\..\cppunit.ups\include +Item17=..\mockpp_30\matcher;..\mockpp_30\constraint;..\mockpp_30\builder;..\mockpp_30\chaining;..\mockpp_30\compat;..\mockpp_30\util;..\mockpp;..\..\mockpp;$(BCB)\include;..\..\..\cppunit.ups\include +Item18=..\mockpp;..;$(BCB)\include;..\..\..\cppunit.ups\include +Item19=..\mockpp_30\builder;..\mockpp_30\matcher;..\mockpp_30\constraint;..\builder;\\SONNE\HOMES\Documents\src\mockpp_30\mockpp\mockpp_30\matcher;\\SONNE\HOMES\Documents\src\mockpp_30\mockpp\mockpp_30\constraint;\\SONNE\HOMES\Documents\src\mockpp_30\mockpp\mockpp_30\builder;..\mockpp_30\chaining;\\SONNE\HOMES\Documents\src\mockpp_30\mockpp\mockpp;\\SONNE\HOMES\Documents\src\mockpp_30\mockpp\mockpp_30\chaining;mockpp;\\SONNE\HOMES\src\mockpp_30\mockpp\mockpp;..\mockpp_30\compat;..\mockpp_30\util;..\mockpp;..;$(BCB)\include;..\..\..\cppunit-1.8.0\include +Item20=..\mockpp_30\builder;..\mockpp_30\matcher;..\mockpp_30\constraint;..\builder;\\SONNE\HOMES\Documents\src\mockpp_30\mockpp\mockpp_30\matcher;\\SONNE\HOMES\Documents\src\mockpp_30\mockpp\mockpp_30\constraint;\\SONNE\HOMES\Documents\src\mockpp_30\mockpp\mockpp_30\builder;..\mockpp_30\chaining;\\SONNE\HOMES\Documents\src\mockpp_30\mockpp\mockpp;\\SONNE\HOMES\Documents\src\mockpp_30\mockpp\mockpp_30\chaining;mockpp;\\SONNE\HOMES\src\mockpp_30\mockpp\mockpp;..\mockpp_30\compat;..\mockpp_30\util;..\mockpp;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.8.0\include +Item21=mockpp;\\SONNE\HOMES\src\mockpp_30\mockpp\mockpp;..\mockpp_30\compat;..\mockpp_30\util;..\mockpp;..\..\mockpp;$(BCB)\include;X:\Documents\src\cppunit-1.8.0\include +Item22=mockpp;\\SONNE\HOMES\src\mockpp_30\mockpp\mockpp;..\mockpp_30\compat;..\mockpp_30\util;..\mockpp;..\..\mockpp;$(BCB)\include +Item23=mockpp;\\SONNE\HOMES\src\mockpp_30\mockpp\mockpp;..\mockpp_30\compat;..\mockpp_30\util;..\mockpp;..;$(BCB)\include +Item24=..;$(BCB)\include +Item25=..\mockpp_30\compat;..\mockpp_30\util;..\mockpp;\\SONNE\HOMES\src\mockpp_30\mockpp\mockpp_30\compat;\\SONNE\HOMES\src\mockpp_30\mockpp\mockpp_30\util;\\SONNE\HOMES\src\mockpp_30\mockpp\mockpp;..\ulxmlrpcpp;..\..\mockpp;$(BCB)\include;$(BCB)\include\vcl +Item26=..;$(BCB)\include;$(BCB)\include\vcl +Item27=..\ulxmlrpcpp;C:\Programme\Borland\CBuilder5\Projects;\\SONNE\HOMES\src\ulxr\mockpp_30\mockpp;..;..\mockpp;..\expat;$(BCB)\include;$(BCB)\include\vcl;C:\wx2\include\ +Item28=..\..\mockpp;..\mockpp;..\expat;$(BCB)\include;$(BCB)\include\vcl;C:\wx2\include\ +Item29=..;..\mockpp;..\expat;$(BCB)\include;$(BCB)\include\vcl;C:\wx2\include\ [HistoryLists\hlLibraryPath] Count=18 -Item0=..\mockpp\production;..mockpp\builder;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\constraint;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\mockpp_28\matcher;..\mockpp_28\constraint;..\mockpp_28\builder;..\mockpp;..\mockpp_28\chaining;..\mockpp_28\compat;..\mockpp_28\util;..\..\mockpp-1.8.0;$(BCB)\lib\obj;$(BCB)\lib -Item1=..\mockpp\production;..mockpp\builder;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\constraint;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\mockpp_28\matcher;..\mockpp_28\constraint;..\mockpp_28\builder;..\mockpp;..\mockpp_28\chaining;..\mockpp_28\compat;..\mockpp_28\util;..;$(BCB)\lib\obj;$(BCB)\lib -Item2=..mockpp\builder;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\constraint;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\mockpp_28\matcher;..\mockpp_28\constraint;..\mockpp_28\builder;..\mockpp;..\mockpp_28\chaining;..\mockpp_28\compat;..\mockpp_28\util;..;$(BCB)\lib\obj;$(BCB)\lib -Item3=..mockpp\builder;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\constraint;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\mockpp_28\matcher;..\mockpp_28\constraint;..\mockpp_28\builder;..\mockpp;..\mockpp_28\chaining;..\mockpp_28\compat;..\mockpp_28\util;..\..\mockpp;$(BCB)\lib\obj;$(BCB)\lib -Item4=..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\mockpp_28\matcher;..\mockpp_28\constraint;..\mockpp_28\builder;..\mockpp;..\mockpp_28\chaining;..\mockpp_28\compat;..\mockpp_28\util;..;$(BCB)\lib\obj;$(BCB)\lib -Item5=..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\mockpp_28\matcher;..\mockpp_28\constraint;..\mockpp_28\builder;..\mockpp;..\mockpp_28\chaining;..\mockpp_28\compat;..\mockpp_28\util;..\..\mockpp;$(BCB)\lib\obj;$(BCB)\lib +Item0=..\mockpp\production;..mockpp\builder;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\constraint;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\mockpp_30\matcher;..\mockpp_30\constraint;..\mockpp_30\builder;..\mockpp;..\mockpp_30\chaining;..\mockpp_30\compat;..\mockpp_30\util;..\..\mockpp-1.8.0;$(BCB)\lib\obj;$(BCB)\lib +Item1=..\mockpp\production;..mockpp\builder;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\constraint;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\mockpp_30\matcher;..\mockpp_30\constraint;..\mockpp_30\builder;..\mockpp;..\mockpp_30\chaining;..\mockpp_30\compat;..\mockpp_30\util;..;$(BCB)\lib\obj;$(BCB)\lib +Item2=..mockpp\builder;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\constraint;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\mockpp_30\matcher;..\mockpp_30\constraint;..\mockpp_30\builder;..\mockpp;..\mockpp_30\chaining;..\mockpp_30\compat;..\mockpp_30\util;..;$(BCB)\lib\obj;$(BCB)\lib +Item3=..mockpp\builder;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\constraint;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\mockpp_30\matcher;..\mockpp_30\constraint;..\mockpp_30\builder;..\mockpp;..\mockpp_30\chaining;..\mockpp_30\compat;..\mockpp_30\util;..\..\mockpp;$(BCB)\lib\obj;$(BCB)\lib +Item4=..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\mockpp_30\matcher;..\mockpp_30\constraint;..\mockpp_30\builder;..\mockpp;..\mockpp_30\chaining;..\mockpp_30\compat;..\mockpp_30\util;..;$(BCB)\lib\obj;$(BCB)\lib +Item5=..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\mockpp_30\matcher;..\mockpp_30\constraint;..\mockpp_30\builder;..\mockpp;..\mockpp_30\chaining;..\mockpp_30\compat;..\mockpp_30\util;..\..\mockpp;$(BCB)\lib\obj;$(BCB)\lib Item6=..;$(BCB)\lib\obj;$(BCB)\lib -Item7=..\mockpp_28\matcher;..\mockpp_28\constraint;..\mockpp_28\builder;..\mockpp;..\mockpp_28\chaining;..\mockpp_28\compat;..\mockpp_28\util;..;$(BCB)\lib\obj;$(BCB)\lib -Item8=..\mockpp_28\matcher;..\mockpp_28\constraint;..\mockpp_28\builder;..\mockpp;..\mockpp_28\chaining;..\mockpp_28\compat;..\mockpp_28\util;..\..\mockpp;$(BCB)\lib\obj;$(BCB)\lib -Item9=..\mockpp_28\builder;..\mockpp_28\matcher;..\mockpp_28\constraint;..\builder;\\SONNE\HOMES\Documents\src\mockpp_28\mockpp\mockpp_28\matcher;\\SONNE\HOMES\Documents\src\mockpp_28\mockpp\mockpp_28\constraint;\\SONNE\HOMES\Documents\src\mockpp_28\mockpp\mockpp_28\builder;..\mockpp_28\chaining;\\SONNE\HOMES\Documents\src\mockpp_28\mockpp\mockpp;\\SONNE\HOMES\Documents\src\mockpp_28\mockpp\mockpp_28\chaining;mockpp;..\mockpp_28\compat;..\mockpp_28\util;\\SONNE\HOMES\src\mockpp_28\mockpp\mockpp_28\compat;\\SONNE\HOMES\src\mockpp_28\mockpp\mockpp_28\util;\\SONNE\HOMES\src\mockpp_28\mockpp\mockpp;..\ulxmlrpcpp;C:\Programme\Borland\CBuilder5\Projects\;\\SONNE\HOMES\src\ulxr\mockpp_28\mockpp;..\mockpp;..\expat;$(BCB)\lib\obj;$(BCB)\lib;c:\tmp\compile\mockpp_28\ -Item10=mockpp;..\mockpp_28\compat;..\mockpp_28\util;\\SONNE\HOMES\src\mockpp_28\mockpp\mockpp_28\compat;\\SONNE\HOMES\src\mockpp_28\mockpp\mockpp_28\util;\\SONNE\HOMES\src\mockpp_28\mockpp\mockpp;..\ulxmlrpcpp;C:\Programme\Borland\CBuilder5\Projects\;\\SONNE\HOMES\src\ulxr\mockpp_28\mockpp;..\mockpp;..\expat;$(BCB)\lib\obj;$(BCB)\lib;c:\tmp\compile\mockpp_28\ -Item11=..\mockpp_28\compat;..\mockpp_28\util;\\SONNE\HOMES\src\mockpp_28\mockpp\mockpp_28\compat;\\SONNE\HOMES\src\mockpp_28\mockpp\mockpp_28\util;\\SONNE\HOMES\src\mockpp_28\mockpp\mockpp;..\ulxmlrpcpp;C:\Programme\Borland\CBuilder5\Projects\;\\SONNE\HOMES\src\ulxr\mockpp_28\mockpp;..\mockpp;..\expat;$(BCB)\lib\obj;$(BCB)\lib;c:\tmp\compile\mockpp_28\ -Item12=..\ulxmlrpcpp;C:\Programme\Borland\CBuilder5\Projects;\\SONNE\HOMES\src\ulxr\mockpp_28\mockpp;..\mockpp;..\expat;$(BCB)\lib\obj;$(BCB)\lib;c:\tmp\compile\mockpp_28\ -Item13=..\mockpp;..\expat;$(BCB)\lib\obj;$(BCB)\lib;c:\tmp\compile\mockpp_28\ +Item7=..\mockpp_30\matcher;..\mockpp_30\constraint;..\mockpp_30\builder;..\mockpp;..\mockpp_30\chaining;..\mockpp_30\compat;..\mockpp_30\util;..;$(BCB)\lib\obj;$(BCB)\lib +Item8=..\mockpp_30\matcher;..\mockpp_30\constraint;..\mockpp_30\builder;..\mockpp;..\mockpp_30\chaining;..\mockpp_30\compat;..\mockpp_30\util;..\..\mockpp;$(BCB)\lib\obj;$(BCB)\lib +Item9=..\mockpp_30\builder;..\mockpp_30\matcher;..\mockpp_30\constraint;..\builder;\\SONNE\HOMES\Documents\src\mockpp_30\mockpp\mockpp_30\matcher;\\SONNE\HOMES\Documents\src\mockpp_30\mockpp\mockpp_30\constraint;\\SONNE\HOMES\Documents\src\mockpp_30\mockpp\mockpp_30\builder;..\mockpp_30\chaining;\\SONNE\HOMES\Documents\src\mockpp_30\mockpp\mockpp;\\SONNE\HOMES\Documents\src\mockpp_30\mockpp\mockpp_30\chaining;mockpp;..\mockpp_30\compat;..\mockpp_30\util;\\SONNE\HOMES\src\mockpp_30\mockpp\mockpp_30\compat;\\SONNE\HOMES\src\mockpp_30\mockpp\mockpp_30\util;\\SONNE\HOMES\src\mockpp_30\mockpp\mockpp;..\ulxmlrpcpp;C:\Programme\Borland\CBuilder5\Projects\;\\SONNE\HOMES\src\ulxr\mockpp_30\mockpp;..\mockpp;..\expat;$(BCB)\lib\obj;$(BCB)\lib;c:\tmp\compile\mockpp_30\ +Item10=mockpp;..\mockpp_30\compat;..\mockpp_30\util;\\SONNE\HOMES\src\mockpp_30\mockpp\mockpp_30\compat;\\SONNE\HOMES\src\mockpp_30\mockpp\mockpp_30\util;\\SONNE\HOMES\src\mockpp_30\mockpp\mockpp;..\ulxmlrpcpp;C:\Programme\Borland\CBuilder5\Projects\;\\SONNE\HOMES\src\ulxr\mockpp_30\mockpp;..\mockpp;..\expat;$(BCB)\lib\obj;$(BCB)\lib;c:\tmp\compile\mockpp_30\ +Item11=..\mockpp_30\compat;..\mockpp_30\util;\\SONNE\HOMES\src\mockpp_30\mockpp\mockpp_30\compat;\\SONNE\HOMES\src\mockpp_30\mockpp\mockpp_30\util;\\SONNE\HOMES\src\mockpp_30\mockpp\mockpp;..\ulxmlrpcpp;C:\Programme\Borland\CBuilder5\Projects\;\\SONNE\HOMES\src\ulxr\mockpp_30\mockpp;..\mockpp;..\expat;$(BCB)\lib\obj;$(BCB)\lib;c:\tmp\compile\mockpp_30\ +Item12=..\ulxmlrpcpp;C:\Programme\Borland\CBuilder5\Projects;\\SONNE\HOMES\src\ulxr\mockpp_30\mockpp;..\mockpp;..\expat;$(BCB)\lib\obj;$(BCB)\lib;c:\tmp\compile\mockpp_30\ +Item13=..\mockpp;..\expat;$(BCB)\lib\obj;$(BCB)\lib;c:\tmp\compile\mockpp_30\ Item14=..\mockpp;..\expat;$(BCB)\lib\obj;$(BCB)\lib;c:\temp Item15=..\mockpp;..\expat;$(BCB)\lib\obj;$(BCB)\lib Item16=..\expat;$(BCB)\lib\obj;$(BCB)\lib @@ -141,14 +141,14 @@ [HistoryLists\hlIntOutputDir] Count=3 -Item0=c:\tmp\compile\mockpp_28\ +Item0=c:\tmp\compile\mockpp_30\ Item1=c:\temp Item2=output [HistoryLists\hlFinalOutputDir] Count=5 Item0=c:\tmp\compile\ -Item1=c:\tmp\compile\mockpp_28\ +Item1=c:\tmp\compile\mockpp_30\ Item2=c:\temp Item3=output\ Item4=output @@ -156,9 +156,9 @@ [HistoryLists\hIBPIOutputDir] Count=5 Item0=c:\tmp\compile\ -Item1=c:\tmp\compile\mockpp_28\ +Item1=c:\tmp\compile\mockpp_30\ Item2=c:\temp -Item3=E:\Eigene Dateien\c++\mockpp_28\bcb5\output\ +Item3=E:\Eigene Dateien\c++\mockpp_30\bcb5\output\ Item4=output [Debugging] Index: poormock.bpf =================================================================== RCS file: /cvsroot/mockpp/mockpp/bcb5/poormock.bpf,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- poormock.bpf 6 May 2005 14:23:02 -0000 1.13 +++ poormock.bpf 23 Jul 2005 17:37:32 -0000 1.14 @@ -1,4 +1,4 @@ -USELIB("c:\tmp\compile\mockpp_28.lib"); +USELIB("c:\tmp\compile\mockpp_30.lib"); USELIB("c:\tmp\compile\cppunit_1_10.lib"); USEUNIT("..\mockpp\examples\tutorial\poormock.cpp"); USEUNIT("..\mockpp\examples\tutorial\consumer.cpp"); Index: verifying.bpf =================================================================== RCS file: /cvsroot/mockpp/mockpp/bcb5/verifying.bpf,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- verifying.bpf 6 May 2005 14:23:02 -0000 1.11 +++ verifying.bpf 23 Jul 2005 17:37:32 -0000 1.12 @@ -1,4 +1,4 @@ -USELIB("c:\tmp\compile\mockpp_28.lib"); +USELIB("c:\tmp\compile\mockpp_30.lib"); USELIB("c:\tmp\compile\cppunit_1_10.lib"); USEUNIT("..\mockpp\examples\tutorial\verifying.cpp"); T//--------------------------------------------------------------------------- Index: mock_greeter.bpf =================================================================== RCS file: /cvsroot/mockpp/mockpp/bcb5/mock_greeter.bpf,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- mock_greeter.bpf 6 May 2005 14:23:01 -0000 1.16 +++ mock_greeter.bpf 23 Jul 2005 17:37:31 -0000 1.17 @@ -1,4 +1,4 @@ -USELIB("c:\tmp\compile\mockpp_28.lib"); +USELIB("c:\tmp\compile\mockpp_30.lib"); USELIB("c:\tmp\compile\cppunit_1_10.lib"); USEUNIT("..\mockpp\examples\mock_greeter.cpp"); //--------------------------------------------------------------------------- Index: mock_test.bpr =================================================================== RCS file: /cvsroot/mockpp/mockpp/bcb5/mock_test.bpr,v retrieving revision 1.36 retrieving revision 1.37 diff -u -d -r1.36 -r1.37 --- mock_test.bpr 6 May 2005 20:12:25 -0000 1.36 +++ mock_test.bpr 23 Jul 2005 17:37:31 -0000 1.37 @@ -3,49 +3,49 @@ <PROJECT> <MACROS> <VERSION value="BCB.05.03"/> - <PROJECT value="c:\tmp\compile\mock_test_28.exe"/> - <OBJFILES value="c:\tmp\compile\mockpp_28\\AssertMo_test.obj - c:\tmp\compile\mockpp_28\\ExpectationCounter_test.obj - c:\tmp\compile\mockpp_28\\ExpectationCounterRange_test.obj - c:\tmp\compile\mockpp_28\\ExpectationList_test.obj - c:\tmp\compile\mockpp_28\\ExpectationMap_test.obj - c:\tmp\compile\mockpp_28\\ExpectationSegment_test.obj - c:\tmp\compile\mockpp_28\\ExpectationSet_test.obj - c:\tmp\compile\mockpp_28\\ExpectationValue_test.obj - c:\tmp\compile\mockpp_28\\Formatter_test.obj - c:\tmp\compile\mockpp_28\\mock_test.obj - c:\tmp\compile\mockpp_28\\VerifyingTestCase_test.obj - c:\tmp\compile\mockpp_28\\Assert_test.obj - c:\tmp\compile\mockpp_28\\MockObject_test.obj - c:\tmp\compile\mockpp_28\\mockpp_test.obj - c:\tmp\compile\mockpp_28\\ReturnObjectList_test.obj - c:\tmp\compile\mockpp_28\\Verifiable_test.obj - c:\tmp\compile\mockpp_28\\TrackingCounter_test.obj - c:\tmp\compile\mockpp_28\\VisitableMockObject_void_test.obj - c:\tmp\compile\mockpp_28\\Exception_test.obj - c:\tmp\compile\mockpp_28\\ExpectationBoundary_test.obj - c:\tmp\compile\mockpp_28\\Throwable_test.obj - c:\tmp\compile\mockpp_28\\ThrowableList_test.obj - c:\tmp\compile\mockpp_28\\VisitableMockObject_1_test.obj - c:\tmp\compile\mockpp_28\\VisitableMockObject_1_void_test.obj - c:\tmp\compile\mockpp_28\\VisitableMockObject_2_test.obj - c:\tmp\compile\mockpp_28\\VisitableMockObject_2_void_test.obj - c:\tmp\compile\mockpp_28\\VisitableMockObject_3_test.obj - c:\tmp\compile\mockpp_28\\VisitableMockObject_3_void_test.obj - c:\tmp\compile\mockpp_28\\VisitableMockObject_4_test.obj - c:\tmp\compile\mockpp_28\\VisitableMockObject_4_void_test.obj - c:\tmp\compile\mockpp_28\\VisitableMockObject_5_test.obj - c:\tmp\compile\mockpp_28\\VisitableMockObject_5_void_test.obj - c:\tmp\compile\mockpp_28\\MixedMockObject_5_test.obj - c:\tmp\compile\mockpp_28\\VisitableMockObject_template_test.obj - c:\tmp\compile\mockpp_28\\VisitableMockObject_test.obj - c:\tmp\compile\mockpp_28\\ExpectationConglomeration_test.obj - c:\tmp\compile\mockpp_28\\TimeServer_test.obj - c:\tmp\compile\mockpp_28\\classes_ABCDE.obj"/> + <PROJECT value="c:\tmp\compile\mock_test_30.exe"/> + <OBJFILES value="c:\tmp\compile\mockpp_30\\AssertMo_test.obj + c:\tmp\compile\mockpp_30\\ExpectationCounter_test.obj + c:\tmp\compile\mockpp_30\\ExpectationCounterRange_test.obj + c:\tmp\compile\mockpp_30\\ExpectationList_test.obj + c:\tmp\compile\mockpp_30\\ExpectationMap_test.obj + c:\tmp\compile\mockpp_30\\ExpectationSegment_test.obj + c:\tmp\compile\mockpp_30\\ExpectationSet_test.obj + c:\tmp\compile\mockpp_30\\ExpectationValue_test.obj + c:\tmp\compile\mockpp_30\\Formatter_test.obj + c:\tmp\compile\mockpp_30\\mock_test.obj + c:\tmp\compile\mockpp_30\\VerifyingTestCase_test.obj + c:\tmp\compile\mockpp_30\\Assert_test.obj + c:\tmp\compile\mockpp_30\\MockObject_test.obj + c:\tmp\compile\mockpp_30\\mockpp_test.obj + c:\tmp\compile\mockpp_30\\ReturnObjectList_test.obj + c:\tmp\compile\mockpp_30\\Verifiable_test.obj + c:\tmp\compile\mockpp_30\\TrackingCounter_test.obj + c:\tmp\compile\mockpp_30\\VisitableMockObject_void_test.obj + c:\tmp\compile\mockpp_30\\Exception_test.obj + c:\tmp\compile\mockpp_30\\ExpectationBoundary_test.obj + c:\tmp\compile\mockpp_30\\Throwable_test.obj + c:\tmp\compile\mockpp_30\\ThrowableList_test.obj + c:\tmp\compile\mockpp_30\\VisitableMockObject_1_test.obj + c:\tmp\compile\mockpp_30\\VisitableMockObject_1_void_test.obj + c:\tmp\compile\mockpp_30\\VisitableMockObject_2_test.obj + c:\tmp\compile\mockpp_30\\VisitableMockObject_2_void_test.obj + c:\tmp\compile\mockpp_30\\VisitableMockObject_3_test.obj + c:\tmp\compile\mockpp_30\\VisitableMockObject_3_void_test.obj + c:\tmp\compile\mockpp_30\\VisitableMockObject_4_test.obj + c:\tmp\compile\mockpp_30\\VisitableMockObject_4_void_test.obj + c:\tmp\compile\mockpp_30\\VisitableMockObject_5_test.obj + c:\tmp\compile\mockpp_30\\VisitableMockObject_5_void_test.obj + c:\tmp\compile\mockpp_30\\MixedMockObject_5_test.obj + c:\tmp\compile\mockpp_30\\VisitableMockObject_template_test.obj + c:\tmp\compile\mockpp_30\\VisitableMockObject_test.obj + c:\tmp\compile\mockpp_30\\ExpectationConglomeration_test.obj + c:\tmp\compile\mockpp_30\\TimeServer_test.obj + c:\tmp\compile\mockpp_30\\classes_ABCDE.obj"/> <RESFILES value=""/> <DEFFILE value=""/> <RESDEPEN value="$(RESFILES)"/> - <LIBFILES value="c:\tmp\compile\mockpp_28.lib c:\tmp\compile\mockpp_production_28.lib + <LIBFILES value="c:\tmp\compile\mockpp_30.lib c:\tmp\compile\mockpp_production_30.lib c:\tmp\compile\cppunit_1_10.lib"/> <LIBRARIES value=""/> <SPARELIBS value=""/> @@ -64,17 +64,17 @@ <SYSDEFINES value="NO_STRICT;_NO_VCL;_RTLDLL;USEPACKAGES"/> <MAINSOURCE value="mock_test.bpf"/> <INCLUDEPATH value="..\mockpp\tests;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include"/> - <LIBPATH value="..\mockpp\tests;..\mockpp_28\tests;$(BCB)\lib\obj;$(BCB)\lib"/> + <LIBPATH value="..\mockpp\tests;..\mockpp_30\tests;$(BCB)\lib\obj;$(BCB)\lib"/> <WARNINGS value="-w8092 -w8091 -w8090 -w8089 -w8087 -wprc -wuse -wucp -wstv -wstu -wpin -wnod -wnak -wdef -wcln -wbbf -wasm -wamp -wamb"/> </MACROS> <OPTIONS> <CFLAG1 value="-vGc -vGt -vGd -Od -Vx -Ve -X- -r- -a8 -b- -k -y -v -vi- -tWC -tWM -c"/> - <PFLAGS value="-N2"c:\tmp\compile\mockpp_28\" -N0"c:\tmp\compile\mockpp_28\" -$YD -$W + <PFLAGS value="-N2"c:\tmp\compile\mockpp_30\" -N0"c:\tmp\compile\mockpp_30\" -$YD -$W -$O- -v -JPHNE -M"/> <RFLAGS value=""/> <AFLAGS value="/mx /w2 /zd"/> - <LFLAGS value="-l"c:\tmp\compile\" -I"c:\tmp\compile\mockpp_28\" -D"" -ap -Tpe -x -Gn -v"/> + <LFLAGS value="-l"c:\tmp\compile\" -I"c:\tmp\compile\mockpp_30\" -D"" -ap -Tpe -x -Gn -v"/> </OPTIONS> <LINKER> <ALLOBJ value="c0x32.obj $(PACKAGES) $(OBJFILES)"/> @@ -115,52 +115,52 @@ Item1=..\mockpp\tests;.\..;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include\ Item2=..\mockpp\tests;..\..\mockpp-1.8.0;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include\ Item3=..;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include -Item4=..\mockpp\tests;..\mockpp_28\tests;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include -Item5=..\mockpp\tests;..\mockpp_28\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include -Item6=..\mockpp\tests;..\mockpp_28\tests;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include +Item4=..\mockpp\tests;..\mockpp_30\tests;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include +Item5=..\mockpp\tests;..\mockpp_30\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include +Item6=..\mockpp\tests;..\mockpp_30\tests;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include Item7=..\..\mockpp;$(BCB)\include;..\..\..\cppunit.ups\include -Item8=..\tests;tests;\\SONNE\HOMES\Documents\src\mockpp_28\mockpp\mockpp_28\tests;\\SONNE\HOMES\src\mockpp_28\mockpp\mockpp_28\tests;..\mockpp_28\tests;..;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include +Item8=..\tests;tests;\\SONNE\HOMES\Documents\src\mockpp_30\mockpp\mockpp_30\tests;\\SONNE\HOMES\src\mockpp_30\mockpp\mockpp_30\tests;..\mockpp_30\tests;..;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include Item9=..;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include -Item10=..\mockpp_28\tests;..\..\mockpp;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include;.. -Item11=..\mockpp_28\tests;..\..\mockpp;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include -Item12=..\mockpp_28\tests;..;$(BCB)\include;..\..\cppunit\include;X:\src\cppunit-1.8.0\include -Item13=..\mockpp_28\tests;..;$(BCB)\include;..\..\cppunit\include -Item14=..\mockpp_28\tests;..;$(BCB)\include;B:\cvs\ups\src\3party\cppunit\include -Item15=..\mockpp_28\tests;..;$(BCB)\include;..\..\..\cppunit-1.8.0\include +Item10=..\mockpp_30\tests;..\..\mockpp;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include;.. +Item11=..\mockpp_30\tests;..\..\mockpp;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include +Item12=..\mockpp_30\tests;..;$(BCB)\include;..\..\cppunit\include;X:\src\cppunit-1.8.0\include +Item13=..\mockpp_30\tests;..;$(BCB)\include;..\..\cppunit\include +Item14=..\mockpp_30\tests;..;$(BCB)\include;B:\cvs\ups\src\3party\cppunit\include +Item15=..\mockpp_30\tests;..;$(BCB)\include;..\..\..\cppunit-1.8.0\include Item16=..;$(BCB)\include;..\..\..\cppunit-1.8.0\include -Item17=..\mockpp_28\tests;\\SONNE\HOMES\src\mockpp_28\mockpp\mockpp_28\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.8.0\include +Item17=..\mockpp_30\tests;\\SONNE\HOMES\src\mockpp_30\mockpp\mockpp_30\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.8.0\include Item18=..;$(BCB)\include;X:\src\cppunit-1.8.0\include -Item19=\\SONNE\HOMES\src\mockpp_2... [truncated message content] |
|
From: Ewald A. <ewa...@us...> - 2005-07-23 17:37:43
|
Update of /cvsroot/mockpp/mockpp/bcbX In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9329/bcbX Modified Files: basicmock.cbx chainmock.cbx cppunit.cbx jmock_test.cbx mock_greeter.cbx mock_test.cbx mockpp.cbx poormock-se.cbx poormock.cbx verifying.cbx visitmock.cbx Log Message: Formatter uses operator<<(ostream) Index: cppunit.cbx =================================================================== RCS file: /cvsroot/mockpp/mockpp/bcbX/cppunit.cbx,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- cppunit.cbx 6 May 2005 14:23:03 -0000 1.9 +++ cppunit.cbx 23 Jul 2005 17:37:32 -0000 1.10 @@ -101,7 +101,7 @@ <property category="win32.Debug_Build.win32b.ilink32" name="option.responsefile.enabled" value="1"/> <property category="win32.Debug_Build.win32b.ilink32" name="option.v.enabled" value="1"/> <property category="win32.Debug_Build.win32b.ilink32" name="option.x.enabled" value="1"/> - <property category="win32.Debug_Build.win32b.ilink32" name="param.exefile.1" value="c:\tmp\compilex\cppunit_28.exe"/> + <property category="win32.Debug_Build.win32b.ilink32" name="param.exefile.1" value="c:\tmp\compilex\cppunit_30.exe"/> <property category="win32.Debug_Build.win32b.ilink32" name="param.libfiles.1" value="cw32.lib"/> <property category="win32.Debug_Build.win32b.ilink32" name="param.libfiles.2" value="import32.lib"/> <property category="win32.win32b.Debug_Build" name="saved" value="1"/> @@ -117,7 +117,7 @@ <file path="../mockpp/examples/tutorial/cppunit.cpp"> <property category="unique" name="id" value="1"/> </file> - <file path="C%|/tmp/compilex/mockpp_28.lib"> + <file path="C%|/tmp/compilex/mockpp_30.lib"> <property category="unique" name="id" value="3"/> </file> </project> Index: chainmock.cbx =================================================================== RCS file: /cvsroot/mockpp/mockpp/bcbX/chainmock.cbx,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- chainmock.cbx 6 May 2005 14:23:03 -0000 1.9 +++ chainmock.cbx 23 Jul 2005 17:37:32 -0000 1.10 @@ -101,7 +101,7 @@ <property category="win32.Debug_Build.win32b.ilink32" name="option.responsefile.enabled" value="1"/> <property category="win32.Debug_Build.win32b.ilink32" name="option.v.enabled" value="1"/> <property category="win32.Debug_Build.win32b.ilink32" name="option.x.enabled" value="1"/> - <property category="win32.Debug_Build.win32b.ilink32" name="param.exefile.1" value="c:\tmp\compilex\chainmock_28.exe"/> + <property category="win32.Debug_Build.win32b.ilink32" name="param.exefile.1" value="c:\tmp\compilex\chainmock_30.exe"/> <property category="win32.Debug_Build.win32b.ilink32" name="param.libfiles.1" value="cw32.lib"/> <property category="win32.Debug_Build.win32b.ilink32" name="param.libfiles.2" value="import32.lib"/> <property category="win32.win32b.Debug_Build" name="saved" value="1"/> @@ -117,7 +117,7 @@ <file path="../mockpp/examples/tutorial/consumer.cpp"> <property category="unique" name="id" value="5"/> </file> - <file path="C%|/tmp/compilex/mockpp_28.lib"> + <file path="C%|/tmp/compilex/mockpp_30.lib"> <property category="unique" name="id" value="3"/> </file> </project> Index: poormock.cbx =================================================================== RCS file: /cvsroot/mockpp/mockpp/bcbX/poormock.cbx,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- poormock.cbx 6 May 2005 14:23:04 -0000 1.9 +++ poormock.cbx 23 Jul 2005 17:37:32 -0000 1.10 @@ -101,7 +101,7 @@ <property category="win32.Debug_Build.win32b.ilink32" name="option.responsefile.enabled" value="1"/> <property category="win32.Debug_Build.win32b.ilink32" name="option.v.enabled" value="1"/> <property category="win32.Debug_Build.win32b.ilink32" name="option.x.enabled" value="1"/> - <property category="win32.Debug_Build.win32b.ilink32" name="param.exefile.1" value="c:\tmp\compilex\poormock_28.exe"/> + <property category="win32.Debug_Build.win32b.ilink32" name="param.exefile.1" value="c:\tmp\compilex\poormock_30.exe"/> <property category="win32.Debug_Build.win32b.ilink32" name="param.libfiles.1" value="cw32.lib"/> <property category="win32.Debug_Build.win32b.ilink32" name="param.libfiles.2" value="import32.lib"/> <property category="win32.win32b.Debug_Build" name="saved" value="1"/> Index: poormock-se.cbx =================================================================== RCS file: /cvsroot/mockpp/mockpp/bcbX/poormock-se.cbx,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- poormock-se.cbx 6 May 2005 14:23:04 -0000 1.7 +++ poormock-se.cbx 23 Jul 2005 17:37:32 -0000 1.8 @@ -101,7 +101,7 @@ <property category="win32.Debug_Build.win32b.ilink32" name="option.responsefile.enabled" value="1"/> <property category="win32.Debug_Build.win32b.ilink32" name="option.v.enabled" value="1"/> <property category="win32.Debug_Build.win32b.ilink32" name="option.x.enabled" value="1"/> - <property category="win32.Debug_Build.win32b.ilink32" name="param.exefile.1" value="c:\tmp\compilex\poormock-se_28.exe"/> + <property category="win32.Debug_Build.win32b.ilink32" name="param.exefile.1" value="c:\tmp\compilex\poormock-se_30.exe"/> <property category="win32.Debug_Build.win32b.ilink32" name="param.libfiles.1" value="cw32.lib"/> <property category="win32.Debug_Build.win32b.ilink32" name="param.libfiles.2" value="import32.lib"/> <property category="win32.win32b.Debug_Build" name="saved" value="1"/> Index: mock_greeter.cbx =================================================================== RCS file: /cvsroot/mockpp/mockpp/bcbX/mock_greeter.cbx,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- mock_greeter.cbx 6 May 2005 14:23:03 -0000 1.9 +++ mock_greeter.cbx 23 Jul 2005 17:37:32 -0000 1.10 @@ -98,7 +98,7 @@ <property category="win32.Debug_Build.win32b.ilink32" name="option.responsefile.enabled" value="1"/> <property category="win32.Debug_Build.win32b.ilink32" name="option.v.enabled" value="1"/> <property category="win32.Debug_Build.win32b.ilink32" name="option.x.enabled" value="1"/> - <property category="win32.Debug_Build.win32b.ilink32" name="param.exefile.1" value="c:\tmp\compilex\mock_greeter_28.exe"/> + <property category="win32.Debug_Build.win32b.ilink32" name="param.exefile.1" value="c:\tmp\compilex\mock_greeter_30.exe"/> <property category="win32.Debug_Build.win32b.ilink32" name="param.libfiles.1" value="cw32.lib"/> <property category="win32.Debug_Build.win32b.ilink32" name="param.libfiles.2" value="import32.lib"/> <property category="win32.win32b.Debug_Build" name="saved" value="1"/> @@ -114,7 +114,7 @@ <file path="../mockpp/examples/mock_greeter.cpp"> <property category="unique" name="id" value="1"/> </file> - <file path="C%|/tmp/compilex/mockpp_28.lib"> + <file path="C%|/tmp/compilex/mockpp_30.lib"> <property category="unique" name="id" value="3"/> </file> </project> Index: mockpp.cbx =================================================================== RCS file: /cvsroot/mockpp/mockpp/bcbX/mockpp.cbx,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- mockpp.cbx 6 May 2005 14:23:03 -0000 1.14 +++ mockpp.cbx 23 Jul 2005 17:37:32 -0000 1.15 @@ -150,7 +150,7 @@ <property category="win32.Debug_Build.win32b.ilink32" name="option.responsefile.enabled" value="1"/> <property category="win32.Debug_Build.win32b.ilink32" name="option.v.enabled" value="1"/> <property category="win32.Debug_Build.win32b.ilink32" name="option.x.enabled" value="1"/> - <property category="win32.Debug_Build.win32b.ilink32" name="param.exefile.1" value="c:\tmp\compilex\mockpp_28.dll"/> + <property category="win32.Debug_Build.win32b.ilink32" name="param.exefile.1" value="c:\tmp\compilex\mockpp_30.dll"/> <property category="win32.Debug_Build.win32b.ilink32" name="param.libfiles.1" value="cw32.lib"/> <property category="win32.Debug_Build.win32b.ilink32" name="param.libfiles.2" value="import32.lib"/> <property category="win32.Debug_Build.win32b.ilink32" name="param.libfiles.3" value="stlp.lib"/> Index: visitmock.cbx =================================================================== RCS file: /cvsroot/mockpp/mockpp/bcbX/visitmock.cbx,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- visitmock.cbx 6 May 2005 14:23:04 -0000 1.9 +++ visitmock.cbx 23 Jul 2005 17:37:32 -0000 1.10 @@ -120,7 +120,7 @@ <property category="win32.Debug_Build.win32b.ilink32" name="option.responsefile.enabled" value="1"/> <property category="win32.Debug_Build.win32b.ilink32" name="option.v.enabled" value="1"/> <property category="win32.Debug_Build.win32b.ilink32" name="option.x.enabled" value="1"/> - <property category="win32.Debug_Build.win32b.ilink32" name="param.exefile.1" value="c:\tmp\compilex\visitmock_28.exe"/> + <property category="win32.Debug_Build.win32b.ilink32" name="param.exefile.1" value="c:\tmp\compilex\visitmock_30.exe"/> <property category="win32.Debug_Build.win32b.ilink32" name="param.libfiles.1" value="cw32.lib"/> <property category="win32.Debug_Build.win32b.ilink32" name="param.libfiles.2" value="import32.lib"/> <property category="win32.MinGW.Debug_Build" name="saved" value="1"/> @@ -134,7 +134,7 @@ <file path="../mockpp/examples/tutorial/consumer.cpp"> <property category="unique" name="id" value="5"/> </file> - <file path="C%|/tmp/compilex/mockpp_28.lib"> + <file path="C%|/tmp/compilex/mockpp_30.lib"> <property category="unique" name="id" value="3"/> </file> <file path="../mockpp/examples/tutorial/visitmock.cpp"> Index: jmock_test.cbx =================================================================== RCS file: /cvsroot/mockpp/mockpp/bcbX/jmock_test.cbx,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- jmock_test.cbx 6 May 2005 14:23:03 -0000 1.14 +++ jmock_test.cbx 23 Jul 2005 17:37:32 -0000 1.15 @@ -114,7 +114,7 @@ <property category="win32.Debug_Build.win32b.ilink32" name="option.responsefile.enabled" value="1"/> <property category="win32.Debug_Build.win32b.ilink32" name="option.v.enabled" value="1"/> <property category="win32.Debug_Build.win32b.ilink32" name="option.x.enabled" value="1"/> - <property category="win32.Debug_Build.win32b.ilink32" name="param.exefile.1" value="c:\tmp\compilex\jmock_test_28.exe"/> + <property category="win32.Debug_Build.win32b.ilink32" name="param.exefile.1" value="c:\tmp\compilex\jmock_test_30.exe"/> <property category="win32.Debug_Build.win32b.ilink32" name="param.libfiles.1" value="cw32.lib"/> <property category="win32.Debug_Build.win32b.ilink32" name="param.libfiles.2" value="import32.lib"/> <property category="win32.Debug_Build.win32b.ilink32" name="param.libfiles.3" value="stlp.lib"/> @@ -340,7 +340,7 @@ <file path="../mockpp/tests/MockObject_test.cpp"> <property category="unique" name="id" value="53"/> </file> - <file path="C%|/tmp/compilex/mockpp_28.lib"> + <file path="C%|/tmp/compilex/mockpp_30.lib"> <property category="unique" name="id" value="71"/> </file> <file path="../mockpp/tests/mockpp_pti_test.cpp"> Index: mock_test.cbx =================================================================== RCS file: /cvsroot/mockpp/mockpp/bcbX/mock_test.cbx,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- mock_test.cbx 6 May 2005 14:23:03 -0000 1.10 +++ mock_test.cbx 23 Jul 2005 17:37:32 -0000 1.11 @@ -108,7 +108,7 @@ <property category="win32.Debug_Build.win32b.ilink32" name="option.responsefile.enabled" value="1"/> <property category="win32.Debug_Build.win32b.ilink32" name="option.v.enabled" value="1"/> <property category="win32.Debug_Build.win32b.ilink32" name="option.x.enabled" value="1"/> - <property category="win32.Debug_Build.win32b.ilink32" name="param.exefile.1" value="c:\tmp\compilex\mock_test_28.exe"/> + <property category="win32.Debug_Build.win32b.ilink32" name="param.exefile.1" value="c:\tmp\compilex\mock_test_30.exe"/> <property category="win32.Debug_Build.win32b.ilink32" name="param.libfiles.1" value="cw32.lib"/> <property category="win32.Debug_Build.win32b.ilink32" name="param.libfiles.2" value="import32.lib"/> <property category="win32.Debug_Build.win32b.ilink32" name="param.libfiles.3" value="stlp.lib"/> @@ -170,7 +170,7 @@ <file path="../mockpp/tests/MockObject_test.cpp"> <property category="unique" name="id" value="15"/> </file> - <file path="C%|/tmp/compilex/mockpp_28.lib"> + <file path="C%|/tmp/compilex/mockpp_30.lib"> <property category="unique" name="id" value="37"/> </file> <file path="../mockpp/tests/mockpp_test.cpp"> Index: basicmock.cbx =================================================================== RCS file: /cvsroot/mockpp/mockpp/bcbX/basicmock.cbx,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- basicmock.cbx 6 May 2005 14:23:02 -0000 1.9 +++ basicmock.cbx 23 Jul 2005 17:37:32 -0000 1.10 @@ -101,7 +101,7 @@ <property category="win32.Debug_Build.win32b.ilink32" name="option.responsefile.enabled" value="1"/> <property category="win32.Debug_Build.win32b.ilink32" name="option.v.enabled" value="1"/> <property category="win32.Debug_Build.win32b.ilink32" name="option.x.enabled" value="1"/> - <property category="win32.Debug_Build.win32b.ilink32" name="param.exefile.1" value="c:\tmp\compilex\basicmock_28.exe"/> + <property category="win32.Debug_Build.win32b.ilink32" name="param.exefile.1" value="c:\tmp\compilex\basicmock_30.exe"/> <property category="win32.Debug_Build.win32b.ilink32" name="param.libfiles.1" value="cw32.lib"/> <property category="win32.Debug_Build.win32b.ilink32" name="param.libfiles.2" value="import32.lib"/> <property category="win32.win32b.Debug_Build" name="saved" value="1"/> @@ -117,7 +117,7 @@ <file path="../mockpp/examples/tutorial/consumer.cpp"> <property category="unique" name="id" value="5"/> </file> - <file path="C%|/tmp/compilex/mockpp_28.lib"> + <file path="C%|/tmp/compilex/mockpp_30.lib"> <property category="unique" name="id" value="3"/> </file> </project> Index: verifying.cbx =================================================================== RCS file: /cvsroot/mockpp/mockpp/bcbX/verifying.cbx,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- verifying.cbx 6 May 2005 14:23:04 -0000 1.8 +++ verifying.cbx 23 Jul 2005 17:37:32 -0000 1.9 @@ -100,7 +100,7 @@ <property category="win32.Debug_Build.win32b.ilink32" name="option.responsefile.enabled" value="1"/> <property category="win32.Debug_Build.win32b.ilink32" name="option.v.enabled" value="1"/> <property category="win32.Debug_Build.win32b.ilink32" name="option.x.enabled" value="1"/> - <property category="win32.Debug_Build.win32b.ilink32" name="param.exefile.1" value="c:\tmp\compilex\verifying_28.exe"/> + <property category="win32.Debug_Build.win32b.ilink32" name="param.exefile.1" value="c:\tmp\compilex\verifying_30.exe"/> <property category="win32.Debug_Build.win32b.ilink32" name="param.libfiles.1" value="cw32.lib"/> <property category="win32.Debug_Build.win32b.ilink32" name="param.libfiles.2" value="import32.lib"/> <property category="win32.win32b.Debug_Build" name="saved" value="1"/> @@ -113,7 +113,7 @@ <file path="C%|/tmp/compilex/cppunit_1_10.lib"> <property category="unique" name="id" value="4"/> </file> - <file path="C%|/tmp/compilex/mockpp_28.lib"> + <file path="C%|/tmp/compilex/mockpp_30.lib"> <property category="unique" name="id" value="3"/> </file> <file path="../mockpp/examples/tutorial/verifying.cpp"> |
|
From: Ewald A. <ewa...@us...> - 2005-07-23 17:37:43
|
Update of /cvsroot/mockpp/mockpp/mockpp/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9329/mockpp/tests Modified Files: Formatter_test.cpp Log Message: Formatter uses operator<<(ostream) Index: Formatter_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/Formatter_test.cpp,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- Formatter_test.cpp 10 Apr 2005 12:33:53 -0000 1.24 +++ Formatter_test.cpp 23 Jul 2005 17:37:33 -0000 1.25 @@ -28,7 +28,6 @@ ***************************************************************************/ #include <mockpp/mockpp.h> // always first - #include <cstdio> #ifndef HAVE_CPPUNIT @@ -59,6 +58,7 @@ CPPUNIT_TEST(test_fmt_float); CPPUNIT_TEST(test_fmt_double); + CPPUNIT_TEST(test_ostreamed); CPPUNIT_TEST(test_number_long_range); CPPUNIT_TEST(test_number_ulong_range); CPPUNIT_TEST(test_number_ulong_oct); @@ -96,6 +96,7 @@ void test_number_long_range(); void test_number_ulong_range(); + void test_ostreamed(); void test_fmt_int(); void test_fmt_bool(); void test_fmt_uint(); @@ -491,5 +492,48 @@ MOCKPP_ASSERT_EQUALS(fmt, MOCKPP_PCSTRING("==1.2==")); } +class Formatter_Dummy +{ + unsigned u; +}; + + +std::basic_ostream<char> & + operator<< (std::basic_ostream<char> &os, const Formatter_Dummy &fd) +{ + os << "Formatter_Dummy-char"; + return os; +} + + +std::basic_ostream<wchar_t> & + operator<< (std::basic_ostream<wchar_t> &os, const Formatter_Dummy &fd) +{ + os << "Formatter_Dummy-wchar_t"; + return os; +} + + +void Formatter_test::test_ostreamed() +{ + +#ifndef MOCKPP_DISABLE_OSTREAMED + + Formatter_Dummy fd; + { + mockpp::String fmt (MOCKPP_PCHAR("==%0==")); + fmt << ostreamed(fd); + MOCKPP_ASSERT_EQUALS(fmt, MOCKPP_PCSTRING("==Formatter_Dummy-char==")); + } + + { + mockpp::String fmt (MOCKPP_PCHAR("==%0==")); + fmt << owstreamed(fd); + MOCKPP_ASSERT_EQUALS(fmt, MOCKPP_PCSTRING("==Formatter_Dummy-wchar_t==")); + } + +#endif // MOCKPP_DISABLE_OSTREAMED + +} #endif // HAVE_CPPUNIT |
|
From: Ewald A. <ewa...@us...> - 2005-07-23 17:37:43
|
Update of /cvsroot/mockpp/mockpp/mockpp/production In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9329/mockpp/production Modified Files: TimeServer.cpp Log Message: Formatter uses operator<<(ostream) Index: TimeServer.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/production/TimeServer.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- TimeServer.cpp 30 Apr 2005 15:06:05 -0000 1.1 +++ TimeServer.cpp 23 Jul 2005 17:37:33 -0000 1.2 @@ -51,3 +51,4 @@ } // namespace mockpp + |
|
From: Ewald A. <ewa...@us...> - 2005-07-23 17:37:43
|
Update of /cvsroot/mockpp/mockpp/mockpp/compat In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9329/mockpp/compat Modified Files: Formatter.cpp Formatter.h Log Message: Formatter uses operator<<(ostream) Index: Formatter.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/compat/Formatter.h,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- Formatter.h 1 May 2005 14:22:16 -0000 1.28 +++ Formatter.h 23 Jul 2005 17:37:33 -0000 1.29 @@ -199,7 +199,7 @@ */ mockpp::String & operator << (mockpp::String &formatter, const wchar_t *repdata); -#endif +#endif // MOCKPP_UNICODE /** Replace a positional %-parameter with a value. @@ -236,7 +236,7 @@ */ mockpp::String & operator << (mockpp::String &formatter, const std::string &repdata); -#else +#else // MOCKPP_UNICODE /** Replace a positional %-parameter with a value. * Replaces the lowest %-parameter with the string representation of the data. @@ -248,7 +248,7 @@ */ // mockpp::String & operator << (mockpp::String &formatter, const std::basic_string<wchar_t> &repdata); -#endif +#endif // MOCKPP_UNICODE /** Replace a positional %-parameter with a value. @@ -307,5 +307,37 @@ #endif // MOCKPP_ENABLE_DEFAULT_FORMATTER +#ifndef MOCKPP_DISABLE_OSTREAMED + +#include <sstream> + + +template <class T> +mockpp::String ostreamed(const T& t) +{ + std::basic_ostringstream<char> oss; + oss << t; +#ifdef MOCKPP_UNICODE + return mockpp::getUnicode(oss.str()); +#else + return oss.str(); +#endif +} + + +template <class T> +mockpp::String owstreamed(const T& t) +{ + std::basic_ostringstream<wchar_t> oss; + oss << t; +#ifdef MOCKPP_UNICODE + return oss.str(); +#else + return mockpp::getLatin1(oss.str()); +#endif +} + +#endif // MOCKPP_DISABLE_OSTREAMED + #endif // MOCKPP_FORMATTER_H Index: Formatter.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/compat/Formatter.cpp,v retrieving revision 1.40 retrieving revision 1.41 diff -u -d -r1.40 -r1.41 --- Formatter.cpp 7 May 2005 12:46:19 -0000 1.40 +++ Formatter.cpp 23 Jul 2005 17:37:33 -0000 1.41 @@ -10,6 +10,7 @@ begin : Wed Dez 25 2002 copyright : (C) 2002-2005 by Ewald Arnold email : mockpp at ewald-arnold dot de + This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2 of the License, |
|
From: Ewald A. <ewa...@us...> - 2005-07-23 17:37:43
|
Update of /cvsroot/mockpp/mockpp/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9329/mockpp Modified Files: ReturnObjectList.h Log Message: Formatter uses operator<<(ostream) Index: ReturnObjectList.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/ReturnObjectList.h,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- ReturnObjectList.h 23 Jul 2005 13:31:57 -0000 1.27 +++ ReturnObjectList.h 23 Jul 2005 17:37:32 -0000 1.28 @@ -163,7 +163,7 @@ * The string only contains the remaining objects. * @return string representation */ - virtual String toString() const + String toString() const // virtual { if (myObjects.size() == 0 && !haveDefault) return MOCKPP_PCHAR("[]"); |
