mockpp-commits Mailing List for Mock Objects for C++ (Page 34)
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-31 17:45:30
|
Update of /cvsroot/mockpp/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21403 Added Files: configure Log Message: new --- NEW FILE: configure --- #! /bin/sh # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59. # # Copyright (C) 2003 Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. ## --------------------- ## ## M4sh Initialization. ## ## --------------------- ## # Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then [...22570 lines suppressed...] # Unfortunately, on DOS this fails, as config.log is still kept open # by configure, so config.status won't be able to write to it; its # output is simply discarded. So we exec the FD to /dev/null, # effectively closing config.log, so it can be properly (re)opened and # appended to by config.status. When coming back to configure, we # need to make the FD available again. if test "$no_create" != yes; then ac_cs_success=: ac_config_status_args= test "$silent" = yes && ac_config_status_args="$ac_config_status_args --quiet" exec 5>/dev/null $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false exec 5>>config.log # Use ||, not &&, to avoid exiting from the if with $? = 1, which # would make configure fail if this is the last instruction. $ac_cs_success || { (exit 1); exit 1; } fi |
|
From: Ewald A. <ewa...@us...> - 2005-07-31 16:15:20
|
Update of /cvsroot/mockpp/mockpp/mockpp/production In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2021/mockpp/production Modified Files: TimeServer.cpp Log Message: fix win32 Index: TimeServer.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/production/TimeServer.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- TimeServer.cpp 23 Jul 2005 17:37:33 -0000 1.2 +++ TimeServer.cpp 31 Jul 2005 16:15:11 -0000 1.3 @@ -52,3 +52,4 @@ } // namespace mockpp + |
|
From: Ewald A. <ewa...@us...> - 2005-07-31 16:14:19
|
Update of /cvsroot/mockpp/mockpp/bcbX In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1822/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: next release Index: cppunit.cbx =================================================================== RCS file: /cvsroot/mockpp/mockpp/bcbX/cppunit.cbx,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- cppunit.cbx 23 Jul 2005 17:37:32 -0000 1.10 +++ cppunit.cbx 31 Jul 2005 16:14:05 -0000 1.11 @@ -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_30.exe"/> + <property category="win32.Debug_Build.win32b.ilink32" name="param.exefile.1" value="c:\tmp\compilex\cppunit_31.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_30.lib"> + <file path="C%|/tmp/compilex/mockpp_31.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.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- chainmock.cbx 23 Jul 2005 17:37:32 -0000 1.10 +++ chainmock.cbx 31 Jul 2005 16:14:05 -0000 1.11 @@ -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_30.exe"/> + <property category="win32.Debug_Build.win32b.ilink32" name="param.exefile.1" value="c:\tmp\compilex\chainmock_31.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_30.lib"> + <file path="C%|/tmp/compilex/mockpp_31.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.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- poormock.cbx 23 Jul 2005 17:37:32 -0000 1.10 +++ poormock.cbx 31 Jul 2005 16:14:06 -0000 1.11 @@ -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_30.exe"/> + <property category="win32.Debug_Build.win32b.ilink32" name="param.exefile.1" value="c:\tmp\compilex\poormock_31.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.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- poormock-se.cbx 23 Jul 2005 17:37:32 -0000 1.8 +++ poormock-se.cbx 31 Jul 2005 16:14:06 -0000 1.9 @@ -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_30.exe"/> + <property category="win32.Debug_Build.win32b.ilink32" name="param.exefile.1" value="c:\tmp\compilex\poormock-se_31.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.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- mock_greeter.cbx 23 Jul 2005 17:37:32 -0000 1.10 +++ mock_greeter.cbx 31 Jul 2005 16:14:05 -0000 1.11 @@ -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_30.exe"/> + <property category="win32.Debug_Build.win32b.ilink32" name="param.exefile.1" value="c:\tmp\compilex\mock_greeter_31.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_30.lib"> + <file path="C%|/tmp/compilex/mockpp_31.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.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- mockpp.cbx 23 Jul 2005 17:37:32 -0000 1.15 +++ mockpp.cbx 31 Jul 2005 16:14:06 -0000 1.16 @@ -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_30.dll"/> + <property category="win32.Debug_Build.win32b.ilink32" name="param.exefile.1" value="c:\tmp\compilex\mockpp_31.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.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- visitmock.cbx 23 Jul 2005 17:37:32 -0000 1.10 +++ visitmock.cbx 31 Jul 2005 16:14:06 -0000 1.11 @@ -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_30.exe"/> + <property category="win32.Debug_Build.win32b.ilink32" name="param.exefile.1" value="c:\tmp\compilex\visitmock_31.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_30.lib"> + <file path="C%|/tmp/compilex/mockpp_31.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.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- jmock_test.cbx 23 Jul 2005 17:37:32 -0000 1.15 +++ jmock_test.cbx 31 Jul 2005 16:14:05 -0000 1.16 @@ -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_30.exe"/> + <property category="win32.Debug_Build.win32b.ilink32" name="param.exefile.1" value="c:\tmp\compilex\jmock_test_31.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_30.lib"> + <file path="C%|/tmp/compilex/mockpp_31.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.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- mock_test.cbx 23 Jul 2005 17:37:32 -0000 1.11 +++ mock_test.cbx 31 Jul 2005 16:14:05 -0000 1.12 @@ -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_30.exe"/> + <property category="win32.Debug_Build.win32b.ilink32" name="param.exefile.1" value="c:\tmp\compilex\mock_test_31.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_30.lib"> + <file path="C%|/tmp/compilex/mockpp_31.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.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- basicmock.cbx 23 Jul 2005 17:37:32 -0000 1.10 +++ basicmock.cbx 31 Jul 2005 16:14:05 -0000 1.11 @@ -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_30.exe"/> + <property category="win32.Debug_Build.win32b.ilink32" name="param.exefile.1" value="c:\tmp\compilex\basicmock_31.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_30.lib"> + <file path="C%|/tmp/compilex/mockpp_31.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.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- verifying.cbx 23 Jul 2005 17:37:32 -0000 1.9 +++ verifying.cbx 31 Jul 2005 16:14:06 -0000 1.10 @@ -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_30.exe"/> + <property category="win32.Debug_Build.win32b.ilink32" name="param.exefile.1" value="c:\tmp\compilex\verifying_31.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_30.lib"> + <file path="C%|/tmp/compilex/mockpp_31.lib"> <property category="unique" name="id" value="3"/> </file> <file path="../mockpp/examples/tutorial/verifying.cpp"> |
Update of /cvsroot/mockpp/mockpp/bcb5 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1297 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: next release Index: poormock.bpr =================================================================== RCS file: /cvsroot/mockpp/mockpp/bcb5/poormock.bpr,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- poormock.bpr 23 Jul 2005 17:37:32 -0000 1.18 +++ poormock.bpr 31 Jul 2005 16:10:50 -0000 1.19 @@ -3,13 +3,13 @@ <PROJECT> <MACROS> <VERSION value="BCB.05.03"/> - <PROJECT value="c:\tmp\compile\poormock_30.exe"/> - <OBJFILES value="c:\tmp\compile\mockpp_30\\poormock.obj - c:\tmp\compile\mockpp_30\\consumer.obj"/> + <PROJECT value="c:\tmp\compile\poormock_31.exe"/> + <OBJFILES value="c:\tmp\compile\mockpp_31\\poormock.obj + c:\tmp\compile\mockpp_31\\consumer.obj"/> <RESFILES value=""/> <DEFFILE value=""/> <RESDEPEN value="$(RESFILES)"/> - <LIBFILES value="c:\tmp\compile\mockpp_30.lib c:\tmp\compile\cppunit_1_10.lib"/> + <LIBFILES value="c:\tmp\compile\mockpp_31.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_30\examples\tutorial;$(BCB)\lib\obj;$(BCB)\lib"/> + <LIBPATH value="..\mockpp\examples\tutorial;..\mockpp_31\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_30\" -N0"c:\tmp\compile\mockpp_30\" -$YD -$W + <PFLAGS value="-N2"c:\tmp\compile\mockpp_31\" -N0"c:\tmp\compile\mockpp_31\" -$YD -$W -$O- -v -JPHNE -M"/> <RFLAGS value=""/> <AFLAGS value="/mx /w2 /zd"/> - <LFLAGS value="-l"c:\tmp\compile\" -I"c:\tmp\compile\mockpp_30\" -D"" -ap -Tpe -x -Gn -v"/> + <LFLAGS value="-l"c:\tmp\compile\" -I"c:\tmp\compile\mockpp_31\" -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_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 +Item6=..\mockpp\examples\tutorial;..\mockpp_31\examples\tutorial;..\mockpp_31\examples;..\mockpp_31\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include +Item7=..\mockpp\examples\tutorial;..\mockpp_31\examples\tutorial;..\mockpp_31\examples;..\mockpp_31\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include +Item8=..\mockpp_31\examples\tutorial;..\mockpp_31\examples;..\mockpp_31\tests;..;$(BCB)\include;..\..\..\cppunit.ups\include +Item9=\\SONNE\HOMES\Documents\src\mockpp_31\mockpp\mockpp_31\examples\tutorial;..\mockpp_31\examples\tutorial;..\mockpp_31\examples;..\mockpp_31\tests;..;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include +Item10=..\mockpp_31\examples;..\mockpp_31\tests;..\..\mockpp;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include +Item11=..\mockpp_31\tests;..;$(BCB)\include;..\..\cppunit\include;X:\src\cppunit-1.8.0\include +Item12=..\mockpp_31\tests;..;$(BCB)\include;..\..\cppunit\include +Item13=..\mockpp_31\tests;..;$(BCB)\include;B:\cvs\ups\src\3party\cppunit\include +Item14=..\mockpp_31\tests;..;$(BCB)\include;..\..\..\cppunit-1.8.0\include Item15=..;$(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 +Item16=..\mockpp_31\tests;\\SONNE\HOMES\src\mockpp_31\mockpp\mockpp_31\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.8.0\include Item17=..;$(BCB)\include;X:\src\cppunit-1.8.0\include -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 +Item18=\\SONNE\HOMES\src\mockpp_31\mockpp\mockpp_31\tests;..\..\mockpp;..\mockpp_31\tests;..\mockpp;..\expat;$(BCB)\include +Item19=..;..\mockpp_31\tests;..\mockpp;..\expat;$(BCB)\include +Item20=..\..\mockpp;..\mockpp_31\tests;..\mockpp;..\expat;$(BCB)\include +Item21=..\..\mockpp;..\mockpp_31\tests;..\mockpp;..\expat;$(BCB)\include;$(BCB)\include\vcl;C:\wx2\include\ +Item22=.. ;..\mockpp_31\tests;..\mockpp;..\expat;$(BCB)\include;$(BCB)\include\vcl;C:\wx2\include\ +Item23=.. ;..\mockpp_31\tests;..\expat;..\mockpp;$(BCB)\include;$(BCB)\include\vcl;C:\wx2\include +Item24=..\mockpp_31\tests;..\expat;..\mockpp;$(BCB)\include;$(BCB)\include\vcl +Item25=..\mockpp_31\tests;..\mockpp;$(BCB)\include;$(BCB)\include\vcl;expat Item26=..\mockpp;$(BCB)\include;$(BCB)\include\vcl;expat -Item27=..\mockpp_30\tests;..\mockpp;$(BCB)\include;$(BCB)\include\vcl -Item28=..\mockpp_30\tests;..\mockpp;$(BCB)\include -Item29=..\mockpp_30\tests;..\mockpp;$(BCB)/include +Item27=..\mockpp_31\tests;..\mockpp;$(BCB)\include;$(BCB)\include\vcl +Item28=..\mockpp_31\tests;..\mockpp;$(BCB)\include +Item29=..\mockpp_31\tests;..\mockpp;$(BCB)/include [HistoryLists\hlLibraryPath] Count=19 -Item0=..\mockpp\examples\tutorial;..\mockpp_30\examples\tutorial;$(BCB)\lib\obj;$(BCB)\lib +Item0=..\mockpp\examples\tutorial;..\mockpp_31\examples\tutorial;$(BCB)\lib\obj;$(BCB)\lib Item1=$(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 +Item2=\\SONNE\HOMES\Documents\src\mockpp_31\mockpp\mockpp_31\examples\tutorial;..\mockpp_31\examples\tutorial;..\mockpp_31\examples;..\mockpp_31\tests;..\expat;$(BCB)\lib\obj;$(BCB)\lib +Item3=..\mockpp_31\examples;..\mockpp_31\tests;..\expat;$(BCB)\lib\obj;$(BCB)\lib +Item4=..\mockpp_31\examples;\\SONNE\HOMES\src\mockpp_31\mockpp\mockpp_31\tests;..\mockpp_31\tests;..\expat;$(BCB)\lib\obj;$(BCB)\lib +Item5=\\SONNE\HOMES\src\mockpp_31\mockpp\mockpp_31\tests;..\mockpp_31\tests;..\expat;$(BCB)\lib\obj;$(BCB)\lib +Item6=..\mockpp_31\tests;..\expat;$(BCB)\lib\obj;$(BCB)\lib +Item7=..\mockpp_31\tests;$(BCB)\lib\obj;$(BCB)\lib;output;expat +Item8=..\mockpp_31\tests;$(BCB)\lib\obj;$(BCB)\lib;output;bin +Item9=..\mockpp_31\apps;$(BCB)\lib\obj;$(BCB)\lib;output;bin +Item10=..\mockpp_31\apps;$(BCB)\lib\obj;$(BCB)\lib;output +Item11=..\mockpp_31\apps;$(BCB)\lib\obj;$(BCB)\lib;E:\Eigene Dateien\c++\mockpp_31\bcb5\output +Item12=..\mockpp_31\apps;$(BCB)\lib\obj;$(BCB)\lib;..\output +Item13=..\mockpp_31\apps;$(BCB)\lib\obj;$(BCB)\lib +Item14=..\mockpp_31\apps;D:\CBuilder5\mockpp_31\;$(BCB)\lib\obj;$(BCB)\lib +Item15=e:\Eigene Dateien\c++\mockpp_31\mockpp\apps\;..\mockpp;$(BCB)\lib\obj;$(BCB)\lib +Item16=e:\Eigene Dateien\c++\mockpp_31\mockpp\apps;..\mockpp;$(BCB)\lib\obj;$(BCB)\lib Item17=..\mockpp;$(BCB)\lib\obj;$(BCB)\lib -Item18=e:\Eigene Dateien\c++\mockpp_30\mockpp\apps;$(BCB)\lib\obj;$(BCB)\lib +Item18=e:\Eigene Dateien\c++\mockpp_31\mockpp\apps;$(BCB)\lib\obj;$(BCB)\lib [HistoryLists\hlDebugSourcePath] Count=1 @@ -138,35 +138,35 @@ [HistoryLists\hlIntOutputDir] Count=7 -Item0=c:\tmp\compile\mockpp_30\ -Item1=c:\tmp\compile\mockpp_30\ulxr_bcb5\ +Item0=c:\tmp\compile\mockpp_31\ +Item1=c:\tmp\compile\mockpp_31\ulxr_bcb5\ Item2=c:\temp Item3=output -Item4=E:\Eigene Dateien\c++\mockpp_30\bcb5\output\ -Item5=E:\Eigene Dateien\c++\mockpp_30\bcb5\output +Item4=E:\Eigene Dateien\c++\mockpp_31\bcb5\output\ +Item5=E:\Eigene Dateien\c++\mockpp_31\bcb5\output Item6=D:\CBuilder5\Projects\output\ [HistoryLists\hlFinalOutputDir] Count=8 Item0=c:\tmp\compile\ Item1=c:\tmp\compile -Item2=c:\tmp\compile\mockpp_30\ +Item2=c:\tmp\compile\mockpp_31\ Item3=c:\temp Item4=output\ -Item5=E:\Eigene Dateien\c++\mockpp_30\bcb5\output\ -Item6=E:\Eigene Dateien\c++\mockpp_30\bcb5\output +Item5=E:\Eigene Dateien\c++\mockpp_31\bcb5\output\ +Item6=E:\Eigene Dateien\c++\mockpp_31\bcb5\output Item7=output [HistoryLists\hIBPIOutputDir] Count=10 Item0=c:\tmp\compile\ Item1=c:\tmp\compile -Item2=c:\tmp\compile\mockpp_30\ -Item3=c:\tmp\compile\mockpp_30\ulxr_bcb5\ +Item2=c:\tmp\compile\mockpp_31\ +Item3=c:\tmp\compile\mockpp_31\ulxr_bcb5\ Item4=c:\temp -Item5=e:\Eigene Dateien\c++\mockpp_30\bcb5\output\ +Item5=e:\Eigene Dateien\c++\mockpp_31\bcb5\output\ Item6=output\ -Item7=E:\Eigene Dateien\c++\mockpp_30\bcb5\output +Item7=E:\Eigene Dateien\c++\mockpp_31\bcb5\output Item8=D:\CBuilder5\Projects\output\ Item9=output Index: verifying.bpr =================================================================== RCS file: /cvsroot/mockpp/mockpp/bcb5/verifying.bpr,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- verifying.bpr 23 Jul 2005 17:37:32 -0000 1.15 +++ verifying.bpr 31 Jul 2005 16:10:50 -0000 1.16 @@ -3,12 +3,12 @@ <PROJECT> <MACROS> <VERSION value="BCB.05.03"/> - <PROJECT value="c:\tmp\compile\verifying_30.exe"/> - <OBJFILES value="c:\tmp\compile\mockpp_30\\verifying.obj"/> + <PROJECT value="c:\tmp\compile\verifying_31.exe"/> + <OBJFILES value="c:\tmp\compile\mockpp_31\\verifying.obj"/> <RESFILES value=""/> <DEFFILE value=""/> <RESDEPEN value="$(RESFILES)"/> - <LIBFILES value="c:\tmp\compile\mockpp_30.lib c:\tmp\compile\cppunit_1_10.lib"/> + <LIBFILES value="c:\tmp\compile\mockpp_31.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_30\examples\tutorial;..\examples\tutorial;$(BCB)\lib\obj;$(BCB)\lib"/> + <LIBPATH value="..\mockpp\examples\tutorial;..\mockpp_31\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_30\" -N0"c:\tmp\compile\mockpp_30\" -$YD -$W + <PFLAGS value="-N2"c:\tmp\compile\mockpp_31\" -N0"c:\tmp\compile\mockpp_31\" -$YD -$W -$O- -v -JPHNE -M"/> <RFLAGS value=""/> <AFLAGS value="/mx /w2 /zi"/> - <LFLAGS value="-l"c:\tmp\compile\" -I"c:\tmp\compile\mockpp_30\" -D"" -ap -Tpe -x -Gn -v"/> + <LFLAGS value="-l"c:\tmp\compile\" -I"c:\tmp\compile\mockpp_31\" -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_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 +Item3=..\mockpp\examples\tutorial;..\mockpp_31\examples\tutorial;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include +Item4=..\mockpp\examples\tutorial;..\mockpp_31\examples\tutorial;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include +Item5=..\mockpp_31\examples\tutorial;..\..\mockpp;$(BCB)\include;..\..\..\cppunit.ups\include +Item6=..\mockpp_31\examples\tutorial;..\..\..\..\src;$(BCB)\include;..\..\..\cppunit.ups\include +Item7=..\mockpp_31\examples\tutorial;..\..\..;$(BCB)\include;..\..\..\cppunit.ups\include +Item8=..\mockpp_31\examples\tutorial;..\..\..\mockpp;$(BCB)\include;..\..\..\cppunit.ups\include Item9=..\..;$(BCB)\include;..\..\..\cppunit.ups\include -Item10=..\mockpp_30\examples\tutorial;..\..\mockpp;$(BCB)\include;..\..\..\..\cppunit.ups\include +Item10=..\mockpp_31\examples\tutorial;..\..\mockpp;$(BCB)\include;..\..\..\..\cppunit.ups\include Item11=..;$(BCB)\include;..\..\..\..\cppunit.ups\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 +Item12=..\mockpp_31\examples\tutorial;..\examples\tutorial;..\examples;..\..\..\mockpp;$(BCB)\include;..\..\..\..\cppunit.ups\include +Item13=..\mockpp_31\examples\tutorial;..\mockpp_31\examples;..\..\mockpp;$(BCB)\include;..\..\..\cppunit.ups\include +Item14=..\mockpp_31\examples\tutorial;..\mockpp_31\examples;..\mockpp_31\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit.ups\include +Item15=..\mockpp_31\examples\tutorial;..\mockpp_31\examples;..\mockpp_31\tests;..;$(BCB)\include;..\..\..\cppunit.ups\include +Item16=..\mockpp_31\examples\tutorial;..\mockpp_31\examples;..\mockpp_31\tests;..;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include +Item17=..\mockpp_31\examples;..\mockpp_31\tests;..\..\mockpp;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include +Item18=..\mockpp_31\tests;..;$(BCB)\include;..\..\cppunit\include;X:\src\cppunit-1.8.0\include +Item19=..\mockpp_31\tests;..;$(BCB)\include;..\..\cppunit\include +Item20=..\mockpp_31\tests;..;$(BCB)\include;B:\cvs\ups\src\3party\cppunit\include +Item21=..\mockpp_31\tests;..;$(BCB)\include;..\..\..\cppunit-1.8.0\include Item22=..;$(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 +Item23=..\mockpp_31\tests;\\SONNE\HOMES\src\mockpp_31\mockpp\mockpp_31\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.8.0\include Item24=..;$(BCB)\include;X:\src\cppunit-1.8.0\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\ +Item25=\\SONNE\HOMES\src\mockpp_31\mockpp\mockpp_31\tests;..\..\mockpp;..\mockpp_31\tests;..\mockpp;..\expat;$(BCB)\include +Item26=..;..\mockpp_31\tests;..\mockpp;..\expat;$(BCB)\include +Item27=..\..\mockpp;..\mockpp_31\tests;..\mockpp;..\expat;$(BCB)\include +Item28=..\..\mockpp;..\mockpp_31\tests;..\mockpp;..\expat;$(BCB)\include;$(BCB)\include\vcl;C:\wx2\include\ +Item29=.. ;..\mockpp_31\tests;..\mockpp;..\expat;$(BCB)\include;$(BCB)\include\vcl;C:\wx2\include\ [HistoryLists\hlLibraryPath] Count=20 -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 +Item0=..\mockpp\examples\tutorial;..\mockpp_31\examples\tutorial;..\examples\tutorial;$(BCB)\lib\obj;$(BCB)\lib +Item1=..\mockpp_31\examples\tutorial;..\examples\tutorial;$(BCB)\lib\obj;$(BCB)\lib Item2=$(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 +Item3=..\mockpp_31\examples\tutorial;..\mockpp_31\examples;..\mockpp_31\tests;..\expat;$(BCB)\lib\obj;$(BCB)\lib +Item4=..\mockpp_31\examples;..\mockpp_31\tests;..\expat;$(BCB)\lib\obj;$(BCB)\lib +Item5=..\mockpp_31\examples;\\SONNE\HOMES\src\mockpp_31\mockpp\mockpp_31\tests;..\mockpp_31\tests;..\expat;$(BCB)\lib\obj;$(BCB)\lib +Item6=\\SONNE\HOMES\src\mockpp_31\mockpp\mockpp_31\tests;..\mockpp_31\tests;..\expat;$(BCB)\lib\obj;$(BCB)\lib +Item7=..\mockpp_31\tests;..\expat;$(BCB)\lib\obj;$(BCB)\lib +Item8=..\mockpp_31\tests;$(BCB)\lib\obj;$(BCB)\lib;output;expat +Item9=..\mockpp_31\tests;$(BCB)\lib\obj;$(BCB)\lib;output;bin +Item10=..\mockpp_31\apps;$(BCB)\lib\obj;$(BCB)\lib;output;bin +Item11=..\mockpp_31\apps;$(BCB)\lib\obj;$(BCB)\lib;output +Item12=..\mockpp_31\apps;$(BCB)\lib\obj;$(BCB)\lib;E:\Eigene Dateien\c++\mockpp_31\bcb5\output +Item13=..\mockpp_31\apps;$(BCB)\lib\obj;$(BCB)\lib;..\output +Item14=..\mockpp_31\apps;$(BCB)\lib\obj;$(BCB)\lib +Item15=..\mockpp_31\apps;D:\CBuilder5\mockpp_31\;$(BCB)\lib\obj;$(BCB)\lib +Item16=e:\Eigene Dateien\c++\mockpp_31\mockpp\apps\;..\mockpp;$(BCB)\lib\obj;$(BCB)\lib +Item17=e:\Eigene Dateien\c++\mockpp_31\mockpp\apps;..\mockpp;$(BCB)\lib\obj;$(BCB)\lib Item18=..\mockpp;$(BCB)\lib\obj;$(BCB)\lib -Item19=e:\Eigene Dateien\c++\mockpp_30\mockpp\apps;$(BCB)\lib\obj;$(BCB)\lib +Item19=e:\Eigene Dateien\c++\mockpp_31\mockpp\apps;$(BCB)\lib\obj;$(BCB)\lib [HistoryLists\hlDebugSourcePath] Count=1 @@ -139,35 +139,35 @@ [HistoryLists\hlIntOutputDir] Count=7 -Item0=c:\tmp\compile\mockpp_30\ -Item1=c:\tmp\compile\mockpp_30\ulxr_bcb5\ +Item0=c:\tmp\compile\mockpp_31\ +Item1=c:\tmp\compile\mockpp_31\ulxr_bcb5\ Item2=c:\temp Item3=output -Item4=E:\Eigene Dateien\c++\mockpp_30\bcb5\output\ -Item5=E:\Eigene Dateien\c++\mockpp_30\bcb5\output +Item4=E:\Eigene Dateien\c++\mockpp_31\bcb5\output\ +Item5=E:\Eigene Dateien\c++\mockpp_31\bcb5\output Item6=D:\CBuilder5\Projects\output\ [HistoryLists\hlFinalOutputDir] Count=8 Item0=c:\tmp\compile\ Item1=c:\tmp\compile -Item2=c:\tmp\compile\mockpp_30\ +Item2=c:\tmp\compile\mockpp_31\ Item3=c:\temp Item4=output\ -Item5=E:\Eigene Dateien\c++\mockpp_30\bcb5\output\ -Item6=E:\Eigene Dateien\c++\mockpp_30\bcb5\output +Item5=E:\Eigene Dateien\c++\mockpp_31\bcb5\output\ +Item6=E:\Eigene Dateien\c++\mockpp_31\bcb5\output Item7=output [HistoryLists\hIBPIOutputDir] Count=10 Item0=c:\tmp\compile\ Item1=c:\tmp\compile -Item2=c:\tmp\compile\mockpp_30\ -Item3=c:\tmp\compile\mockpp_30\ulxr_bcb5\ +Item2=c:\tmp\compile\mockpp_31\ +Item3=c:\tmp\compile\mockpp_31\ulxr_bcb5\ Item4=c:\temp -Item5=e:\Eigene Dateien\c++\mockpp_30\bcb5\output\ +Item5=e:\Eigene Dateien\c++\mockpp_31\bcb5\output\ Item6=output\ -Item7=E:\Eigene Dateien\c++\mockpp_30\bcb5\output +Item7=E:\Eigene Dateien\c++\mockpp_31\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.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- mock_test.bpf 23 Jul 2005 17:37:31 -0000 1.31 +++ mock_test.bpf 31 Jul 2005 16:10:48 -0000 1.32 @@ -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_30.lib"); -USELIB("c:\tmp\compile\mockpp_production_30.lib"); +USELIB("c:\tmp\compile\mockpp_31.lib"); +USELIB("c:\tmp\compile\mockpp_production_31.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.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- mockpp_production.bpr 23 Jul 2005 17:37:32 -0000 1.8 +++ mockpp_production.bpr 31 Jul 2005 16:10:49 -0000 1.9 @@ -3,8 +3,8 @@ <PROJECT> <MACROS> <VERSION value="BCB.05.03"/> - <PROJECT value="c:\tmp\compile\mockpp_production_30.dll"/> - <OBJFILES value="c:\tmp\compile\mockpp_30\\TimeServer.obj"/> + <PROJECT value="c:\tmp\compile\mockpp_production_31.dll"/> + <OBJFILES value="c:\tmp\compile\mockpp_31\\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;..;$(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"/> + <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_31\matcher;..\mockpp_31\constraint;..\mockpp_31\builder;..\mockpp;..\mockpp_31\chaining;..\mockpp_31\compat;..\mockpp_31\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_30\" -N0"c:\tmp\compile\mockpp_30\" -$YD -$W + <PFLAGS value="-N2"c:\tmp\compile\mockpp_31\" -N0"c:\tmp\compile\mockpp_31\" -$YD -$W -$O- -v -JPHNE -M"/> <RFLAGS value=""/> <AFLAGS value="/mx /w2 /zi"/> - <LFLAGS value="-l"c:\tmp\compile\" -I"c:\tmp\compile\mockpp_30\" -D"" -aa -Tpd -x -Gn -Gi + <LFLAGS value="-l"c:\tmp\compile\" -I"c:\tmp\compile\mockpp_31\" -D"" -aa -Tpd -x -Gn -Gi -v"/> </OPTIONS> <LINKER> @@ -74,8 +74,8 @@ [HistoryLists\hlIncludePath] Count=30 -Item0=..\mockpp\production;..;..\..\mockpp;$(BCB)\include -Item1=..\mockpp\production;..;$(BCB)\include +Item0=..\mockpp\production;..;$(BCB)\include +Item1=..\mockpp\production;..;..\..\mockpp;$(BCB)\include Item2=..\mockpp\production;..\..\mockpp;$(BCB)\include Item3=..\mockpp\production;.\..;$(BCB)\include Item4=..\mockpp\production;..\..\mockpp-1.8.0;$(BCB)\include @@ -89,38 +89,38 @@ 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 +Item15=..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\mockpp_31\matcher;..\mockpp_31\constraint;..\mockpp_31\builder;..\mockpp;..\mockpp_31\chaining;..\mockpp_31\compat;..\mockpp_31\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 +Item17=..\mockpp_31\matcher;..\mockpp_31\constraint;..\mockpp_31\builder;..\mockpp_31\chaining;..\mockpp_31\compat;..\mockpp_31\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 +Item19=..\mockpp_31\builder;..\mockpp_31\matcher;..\mockpp_31\constraint;..\builder;\\SONNE\HOMES\Documents\src\mockpp_31\mockpp\mockpp_31\matcher;\\SONNE\HOMES\Documents\src\mockpp_31\mockpp\mockpp_31\constraint;\\SONNE\HOMES\Documents\src\mockpp_31\mockpp\mockpp_31\builder;..\mockpp_31\chaining;\\SONNE\HOMES\Documents\src\mockpp_31\mockpp\mockpp;\\SONNE\HOMES\Documents\src\mockpp_31\mockpp\mockpp_31\chaining;mockpp;\\SONNE\HOMES\src\mockpp_31\mockpp\mockpp;..\mockpp_31\compat;..\mockpp_31\util;..\mockpp;..;$(BCB)\include;..\..\..\cppunit-1.8.0\include +Item20=..\mockpp_31\builder;..\mockpp_31\matcher;..\mockpp_31\constraint;..\builder;\\SONNE\HOMES\Documents\src\mockpp_31\mockpp\mockpp_31\matcher;\\SONNE\HOMES\Documents\src\mockpp_31\mockpp\mockpp_31\constraint;\\SONNE\HOMES\Documents\src\mockpp_31\mockpp\mockpp_31\builder;..\mockpp_31\chaining;\\SONNE\HOMES\Documents\src\mockpp_31\mockpp\mockpp;\\SONNE\HOMES\Documents\src\mockpp_31\mockpp\mockpp_31\chaining;mockpp;\\SONNE\HOMES\src\mockpp_31\mockpp\mockpp;..\mockpp_31\compat;..\mockpp_31\util;..\mockpp;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.8.0\include +Item21=mockpp;\\SONNE\HOMES\src\mockpp_31\mockpp\mockpp;..\mockpp_31\compat;..\mockpp_31\util;..\mockpp;..\..\mockpp;$(BCB)\include;X:\Documents\src\cppunit-1.8.0\include +Item22=mockpp;\\SONNE\HOMES\src\mockpp_31\mockpp\mockpp;..\mockpp_31\compat;..\mockpp_31\util;..\mockpp;..\..\mockpp;$(BCB)\include +Item23=mockpp;\\SONNE\HOMES\src\mockpp_31\mockpp\mockpp;..\mockpp_31\compat;..\mockpp_31\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 +Item25=..\mockpp_31\compat;..\mockpp_31\util;..\mockpp;\\SONNE\HOMES\src\mockpp_31\mockpp\mockpp_31\compat;\\SONNE\HOMES\src\mockpp_31\mockpp\mockpp_31\util;\\SONNE\HOMES\src\mockpp_31\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\ +Item27=..\ulxmlrpcpp;C:\Programme\Borland\CBuilder5\Projects;\\SONNE\HOMES\src\ulxr\mockpp_31\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_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 +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_31\matcher;..\mockpp_31\constraint;..\mockpp_31\builder;..\mockpp;..\mockpp_31\chaining;..\mockpp_31\compat;..\mockpp_31\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_31\matcher;..\mockpp_31\constraint;..\mockpp_31\builder;..\mockpp;..\mockpp_31\chaining;..\mockpp_31\compat;..\mockpp_31\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_31\matcher;..\mockpp_31\constraint;..\mockpp_31\builder;..\mockpp;..\mockpp_31\chaining;..\mockpp_31\compat;..\mockpp_31\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_31\matcher;..\mockpp_31\constraint;..\mockpp_31\builder;..\mockpp;..\mockpp_31\chaining;..\mockpp_31\compat;..\mockpp_31\util;..\..\mockpp;$(BCB)\lib\obj;$(BCB)\lib +Item4=..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\mockpp_31\matcher;..\mockpp_31\constraint;..\mockpp_31\builder;..\mockpp;..\mockpp_31\chaining;..\mockpp_31\compat;..\mockpp_31\util;..;$(BCB)\lib\obj;$(BCB)\lib +Item5=..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\mockpp_31\matcher;..\mockpp_31\constraint;..\mockpp_31\builder;..\mockpp;..\mockpp_31\chaining;..\mockpp_31\compat;..\mockpp_31\util;..\..\mockpp;$(BCB)\lib\obj;$(BCB)\lib Item6=..;$(BCB)\lib\obj;$(BCB)\lib -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\ +Item7=..\mockpp_31\matcher;..\mockpp_31\constraint;..\mockpp_31\builder;..\mockpp;..\mockpp_31\chaining;..\mockpp_31\compat;..\mockpp_31\util;..;$(BCB)\lib\obj;$(BCB)\lib +Item8=..\mockpp_31\matcher;..\mockpp_31\constraint;..\mockpp_31\builder;..\mockpp;..\mockpp_31\chaining;..\mockpp_31\compat;..\mockpp_31\util;..\..\mockpp;$(BCB)\lib\obj;$(BCB)\lib +Item9=..\mockpp_31\builder;..\mockpp_31\matcher;..\mockpp_31\constraint;..\builder;\\SONNE\HOMES\Documents\src\mockpp_31\mockpp\mockpp_31\matcher;\\SONNE\HOMES\Documents\src\mockpp_31\mockpp\mockpp_31\constraint;\\SONNE\HOMES\Documents\src\mockpp_31\mockpp\mockpp_31\builder;..\mockpp_31\chaining;\\SONNE\HOMES\Documents\src\mockpp_31\mockpp\mockpp;\\SONNE\HOMES\Documents\src\mockpp_31\mockpp\mockpp_31\chaining;mockpp;..\mockpp_31\compat;..\mockpp_31\util;\\SONNE\HOMES\src\mockpp_31\mockpp\mockpp_31\compat;\\SONNE\HOMES\src\mockpp_31\mockpp\mockpp_31\util;\\SONNE\HOMES\src\mockpp_31\mockpp\mockpp;..\ulxmlrpcpp;C:\Programme\Borland\CBuilder5\Projects\;\\SONNE\HOMES\src\ulxr\mockpp_31\mockpp;..\mockpp;..\expat;$(BCB)\lib\obj;$(BCB)\lib;c:\tmp\compile\mockpp_31\ +Item10=mockpp;..\mockpp_31\compat;..\mockpp_31\util;\\SONNE\HOMES\src\mockpp_31\mockpp\mockpp_31\compat;\\SONNE\HOMES\src\mockpp_31\mockpp\mockpp_31\util;\\SONNE\HOMES\src\mockpp_31\mockpp\mockpp;..\ulxmlrpcpp;C:\Programme\Borland\CBuilder5\Projects\;\\SONNE\HOMES\src\ulxr\mockpp_31\mockpp;..\mockpp;..\expat;$(BCB)\lib\obj;$(BCB)\lib;c:\tmp\compile\mockpp_31\ +Item11=..\mockpp_31\compat;..\mockpp_31\util;\\SONNE\HOMES\src\mockpp_31\mockpp\mockpp_31\compat;\\SONNE\HOMES\src\mockpp_31\mockpp\mockpp_31\util;\\SONNE\HOMES\src\mockpp_31\mockpp\mockpp;..\ulxmlrpcpp;C:\Programme\Borland\CBuilder5\Projects\;\\SONNE\HOMES\src\ulxr\mockpp_31\mockpp;..\mockpp;..\expat;$(BCB)\lib\obj;$(BCB)\lib;c:\tmp\compile\mockpp_31\ +Item12=..\ulxmlrpcpp;C:\Programme\Borland\CBuilder5\Projects;\\SONNE\HOMES\src\ulxr\mockpp_31\mockpp;..\mockpp;..\expat;$(BCB)\lib\obj;$(BCB)\lib;c:\tmp\compile\mockpp_31\ +Item13=..\mockpp;..\expat;$(BCB)\lib\obj;$(BCB)\lib;c:\tmp\compile\mockpp_31\ 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_30\ +Item0=c:\tmp\compile\mockpp_31\ Item1=c:\temp Item2=output [HistoryLists\hlFinalOutputDir] Count=5 Item0=c:\tmp\compile\ -Item1=c:\tmp\compile\mockpp_30\ +Item1=c:\tmp\compile\mockpp_31\ Item2=c:\temp Item3=output\ Item4=output @@ -156,9 +156,9 @@ [HistoryLists\hIBPIOutputDir] Count=5 Item0=c:\tmp\compile\ -Item1=c:\tmp\compile\mockpp_30\ +Item1=c:\tmp\compile\mockpp_31\ Item2=c:\temp -Item3=E:\Eigene Dateien\c++\mockpp_30\bcb5\output\ +Item3=E:\Eigene Dateien\c++\mockpp_31\bcb5\output\ Item4=output [Debugging] Index: poormock.bpf =================================================================== RCS file: /cvsroot/mockpp/mockpp/bcb5/poormock.bpf,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- poormock.bpf 23 Jul 2005 17:37:32 -0000 1.14 +++ poormock.bpf 31 Jul 2005 16:10:50 -0000 1.15 @@ -1,4 +1,4 @@ -USELIB("c:\tmp\compile\mockpp_30.lib"); +USELIB("c:\tmp\compile\mockpp_31.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.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- verifying.bpf 23 Jul 2005 17:37:32 -0000 1.12 +++ verifying.bpf 31 Jul 2005 16:10:50 -0000 1.13 @@ -1,4 +1,4 @@ -USELIB("c:\tmp\compile\mockpp_30.lib"); +USELIB("c:\tmp\compile\mockpp_31.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.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- mock_greeter.bpf 23 Jul 2005 17:37:31 -0000 1.17 +++ mock_greeter.bpf 31 Jul 2005 16:10:48 -0000 1.18 @@ -1,4 +1,4 @@ -USELIB("c:\tmp\compile\mockpp_30.lib"); +USELIB("c:\tmp\compile\mockpp_31.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.38 retrieving revision 1.39 diff -u -d -r1.38 -r1.39 --- mock_test.bpr 24 Jul 2005 16:11:13 -0000 1.38 +++ mock_test.bpr 31 Jul 2005 16:10:48 -0000 1.39 @@ -3,49 +3,49 @@ <PROJECT> <MACROS> <VERSION value="BCB.05.03"/> - <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"/> + <PROJECT value="c:\tmp\compile\mock_test_31.exe"/> + <OBJFILES value="c:\tmp\compile\mockpp_31\\AssertMo_test.obj + c:\tmp\compile\mockpp_31\\ExpectationCounter_test.obj + c:\tmp\compile\mockpp_31\\ExpectationCounterRange_test.obj + c:\tmp\compile\mockpp_31\\ExpectationList_test.obj + c:\tmp\compile\mockpp_31\\ExpectationMap_test.obj + c:\tmp\compile\mockpp_31\\ExpectationSegment_test.obj + c:\tmp\compile\mockpp_31\\ExpectationSet_test.obj + c:\tmp\compile\mockpp_31\\ExpectationValue_test.obj + c:\tmp\compile\mockpp_31\\Formatter_test.obj + c:\tmp\compile\mockpp_31\\mock_test.obj + c:\tmp\compile\mockpp_31\\VerifyingTestCase_test.obj + c:\tmp\compile\mockpp_31\\Assert_test.obj + c:\tmp\compile\mockpp_31\\MockObject_test.obj + c:\tmp\compile\mockpp_31\\mockpp_test.obj + c:\tmp\compile\mockpp_31\\ReturnObjectList_test.obj + c:\tmp\compile\mockpp_31\\Verifiable_test.obj + c:\tmp\compile\mockpp_31\\TrackingCounter_test.obj + c:\tmp\compile\mockpp_31\\VisitableMockObject_void_test.obj + c:\tmp\compile\mockpp_31\\Exception_test.obj + c:\tmp\compile\mockpp_31\\ExpectationBoundary_test.obj + c:\tmp\compile\mockpp_31\\Throwable_test.obj + c:\tmp\compile\mockpp_31\\ThrowableList_test.obj + c:\tmp\compile\mockpp_31\\VisitableMockObject_1_test.obj + c:\tmp\compile\mockpp_31\\VisitableMockObject_1_void_test.obj + c:\tmp\compile\mockpp_31\\VisitableMockObject_2_test.obj + c:\tmp\compile\mockpp_31\\VisitableMockObject_2_void_test.obj + c:\tmp\compile\mockpp_31\\VisitableMockObject_3_test.obj + c:\tmp\compile\mockpp_31\\VisitableMockObject_3_void_test.obj + c:\tmp\compile\mockpp_31\\VisitableMockObject_4_test.obj + c:\tmp\compile\mockpp_31\\VisitableMockObject_4_void_test.obj + c:\tmp\compile\mockpp_31\\VisitableMockObject_5_test.obj + c:\tmp\compile\mockpp_31\\VisitableMockObject_5_void_test.obj + c:\tmp\compile\mockpp_31\\MixedMockObject_5_test.obj + c:\tmp\compile\mockpp_31\\VisitableMockObject_template_test.obj + c:\tmp\compile\mockpp_31\\VisitableMockObject_test.obj + c:\tmp\compile\mockpp_31\\ExpectationConglomeration_test.obj + c:\tmp\compile\mockpp_31\\TimeServer_test.obj + c:\tmp\compile\mockpp_31\\classes_ABCDE.obj"/> <RESFILES value=""/> <DEFFILE value=""/> <RESDEPEN value="$(RESFILES)"/> - <LIBFILES value="c:\tmp\compile\mockpp_30.lib c:\tmp\compile\mockpp_production_30.lib + <LIBFILES value="c:\tmp\compile\mockpp_31.lib c:\tmp\compile\mockpp_production_31.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;..\..\cppunit-1.10.2\include"/> - <LIBPATH value="..\mockpp\tests;..\mockpp_30\tests;$(BCB)\lib\obj;$(BCB)\lib"/> + <LIBPATH value="..\mockpp\tests;..\mockpp_31\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_30\" -N0"c:\tmp\compile\mockpp_30\" -$YD -$W + <PFLAGS value="-N2"c:\tmp\compile\mockpp_31\" -N0"c:\tmp\compile\mockpp_31\" -$YD -$W -$O- -v -JPHNE -M"/> <RFLAGS value=""/> <AFLAGS value="/mx /w2 /zd"/> - <LFLAGS value="-l"c:\tmp\compile\" -I"c:\tmp\compile\mockpp_30\" -D"" -ap -Tpe -x -Gn -v"/> + <LFLAGS value="-l"c:\tmp\compile\" -I"c:\tmp\compile\mockpp_31\" -D"" -ap -Tpe -x -Gn -v"/> </OPTIONS> <LINKER> <ALLOBJ value="c0x32.obj $(PACKAGES) $(OBJFILES)"/> @@ -117,50 +117,50 @@ 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 +Item6=..\mockpp\tests;..\mockpp_31\tests;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include +Item7=..\mockpp\tests;..\mockpp_31\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include +Item8=..\mockpp\tests;..\mockpp_31\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 +Item10=..\tests;tests;\\SONNE\HOMES\Documents\src\mockpp_31\mockpp\mockpp_31\tests;\\SONNE\HOMES\src\mockpp_31\mockpp\mockpp_31\tests;..\mockpp_31\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 +Item12=..\mockpp_31\tests;..\..\mockpp;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include;.. +Item13=..\mockpp_31\tests;..\..\mockpp;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include +Item14=..\mockpp_31\tests;..;$(BCB)\include;..\..\cppunit\include;X:\src\cppunit-1.8.0\include +Item15=..\mockpp_31\tests;..;$(BCB)\include;..\..\cppunit\include +Item16=..\mockpp_31\tests;..;$(BCB)\include;B:\cvs\ups\src\3party\cppunit\include +Item17=..\mockpp_31\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 +Item19=..\mockpp_31\tests;\\SONNE\HOMES\src\mockpp_31\mockpp\mockpp_31\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 +Item21=\\SONNE\HOMES\src\mockpp_31\mockpp\mockpp_31\tests;..\..\mockpp;..\mockpp_31\tests;..\mockpp;..\expat;$(BCB)\include +Item22=..;..\mockpp_31\tests;..\mockpp;..\expat;$(BCB)\include +Item23=..\..\mockpp;..\mockpp_31\tests;..\mockpp;..\expat;$(BCB)\include +Item24=..\..\mockpp;..\mockpp_31\tests;..\mockpp;..\expat;$(BCB)\include;$(BCB)\include\vcl;C:\wx2\include\ +Item25=.. ;..\mockpp_31\tests;..\mockpp;..\expat;$(BCB)\include;$(BCB)\include\vcl;C:\wx2\include\ +Item26=.. ;..\mockpp_31\tests;..\expat;..\mockpp;$(BCB)\include;$(BCB)\include\vcl;C:\wx2\include +Item27=..\mockpp_31\tests;..\expat;..\mockpp;$(BCB)\include;$(BCB)\include\vcl +Item28=..\mockpp_31\tests;..\mockpp;$(BCB)\include;$(BCB)\include\vcl;expat Item29=..\mockpp;$(BCB)\include;$(BCB)\include\vcl;expat [HistoryLists\hlLibraryPath] Count=17 -Item0=..\mockpp\tests;..\mockpp_30\tests;$(BCB)\lib\obj;$(BCB)\lib +Item0=..\mockpp\tests;..\mockpp_31\tests;$(BCB)\lib\obj;$(BCB)\lib Item1=$(BCB)\lib\obj;$(BCB)\lib -Item2=..\tests;tests;\\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 +Item2=..\tests;tests;\\SONNE\HOMES\Documents\src\mockpp_31\mockpp\mockpp_31\tests;\\SONNE\HOMES\src\mockpp_31\mockpp\mockpp_31\tests;..\mockpp_31\tests;..\expat;$(BCB)\lib\obj;$(BCB)\lib +Item3=\\SONNE\HOMES\src\mockpp_31\mockpp\mockpp_31\tests;..\mockpp_31\tests;..\expat;$(BCB)\lib\obj;$(BCB)\lib +Item4=..\mockpp_31\tests;..\expat;$(BCB)\lib\obj;$(BCB)\lib +Item5=..\mockpp_31\tests;$(BCB)\lib\obj;$(BCB)\lib;output;expat +Item6=..\mockpp_31\tests;$(BCB)\lib\obj;$(BCB)\lib;output;bin +Item7=..\mockpp_31\apps;$(BCB)\lib\obj;$(BCB)\lib;output;bin +Item8=..\mockpp_31\apps;$(BCB)\lib\obj;$(BCB)\lib;output +Item9=..\mockpp_31\apps;$(BCB)\lib\obj;$(BCB)\lib;E:\Eigene Dateien\c++\mockpp_31\bcb5\output +Item10=..\mockpp_31\apps;$(BCB)\lib\obj;$(BCB)\lib;..\output +Item11=..\mockpp_31\apps;$(BCB)\lib\obj;$(BCB)\lib +Item12=..\mockpp_31\apps;D:\CBuilder5\mockpp_31\;$(BCB)\lib\obj;$(BCB)\lib +Item13=e:\Eigene Dateien\c++\mockpp_31\mockpp\apps\;..\mockpp;$(BCB)\lib\obj;$(BCB)\lib +Item14=e:\Eigene Dateien\c++\mockpp_31\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 +Item16=e:\Eigene Dateien\c++\mockpp_31\mockpp\apps;$(BCB)\lib\obj;$(BCB)\lib [HistoryLists\hlDebugSourcePath] Count=1 @@ -174,35 +174,35 @@ [HistoryLists\hlIntOutputDir] Count=7 -Item0=c:\tmp\compile\mockpp_30\ -Item1=c:\tmp\compile\mockpp_30\ulxr_bcb5\ +Item0=c:\tmp\compile\mockpp_31\ +Item1=c:\tmp\compile\mockpp_31\ulxr_bcb5\ Item2=c:\temp Item3=output -Item4=E:\Eigene Dateien\c++\mockpp_30\bcb5\output\ -Item5=E:\Eigene Dateien\c++\mockpp_30\bcb5\output +Item4=E:\Eigene Dateien\c++\mockpp_31\bcb5\output\ +Item5=E:\Eigene Dateien\c++\mockpp_31\bcb5\output Item6=D:\CBuilder5\Projects\output\ [HistoryLists\hlFinalOutputDir] Count=8 Item0=c:\tmp\compile\ Item1=c:\tmp\compile -Item2=c:\tmp\... [truncated message content] |
|
From: Ewald A. <ewa...@us...> - 2005-07-31 14:43:39
|
Update of /cvsroot/mockpp/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17007 Modified Files: configure.in Log Message: fixed compilation problems on certain data types Index: configure.in =================================================================== RCS file: /cvsroot/mockpp/mockpp/configure.in,v retrieving revision 1.84 retrieving revision 1.85 diff -u -d -r1.84 -r1.85 --- configure.in 29 Jul 2005 10:07:23 -0000 1.84 +++ configure.in 31 Jul 2005 14:43:30 -0000 1.85 @@ -17,11 +17,11 @@ # MOCKPP_MAJOR_VERSION=1 MOCKPP_MINOR_VERSION=9 -MOCKPP_PATCH_VERSION=0 +MOCKPP_PATCH_VERSION=1 -MOCKPP_MICRO_VERSION=30 +MOCKPP_MICRO_VERSION=31 MOCKPP_INTERFACE_AGE=0 -MOCKPP_BINARY_AGE=7 +MOCKPP_BINARY_AGE=0 MOCKPP_VERSION=$MOCKPP_MAJOR_VERSION.$MOCKPP_MINOR_VERSION.$MOCKPP_PATCH_VERSION |
|
From: Ewald A. <ewa...@us...> - 2005-07-31 14:38:16
|
Update of /cvsroot/mockpp/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15966 Modified Files: ChangeLog Log Message: update Index: ChangeLog =================================================================== RCS file: /cvsroot/mockpp/mockpp/ChangeLog,v retrieving revision 1.57 retrieving revision 1.58 diff -u -d -r1.57 -r1.58 --- ChangeLog 29 Jul 2005 07:47:25 -0000 1.57 +++ ChangeLog 31 Jul 2005 14:37:54 -0000 1.58 @@ -2,6 +2,10 @@ mockpp history -------------- +2005-08-01 1.9.1: + + - fixed compilation problems with certain data types + 2005-07-29 1.9.0: - class OutBound enables outbound parameter references |
|
From: Ewald A. <ewa...@us...> - 2005-07-31 14:23:44
|
Update of /cvsroot/mockpp/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13041 Modified Files: mockpp.kdevelop Log Message: update Index: mockpp.kdevelop =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp.kdevelop,v retrieving revision 1.74 retrieving revision 1.75 diff -u -d -r1.74 -r1.75 --- mockpp.kdevelop 24 Jul 2005 12:56:03 -0000 1.74 +++ mockpp.kdevelop 31 Jul 2005 14:23:35 -0000 1.75 @@ -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/jmock_test</mainprogram> - <programargs/> + <mainprogram>mockpp/tests/mock_test</mainprogram> + <programargs></programargs> <terminal>false</terminal> <envvars/> <directoryradio>executable</directoryradio> @@ -140,14 +140,14 @@ <kdevdebugger> <general> <dbgshell>libtool</dbgshell> - <programargs/> - <gdbpath/> + <programargs></programargs> + <gdbpath></gdbpath> <breakonloadinglibs>true</breakonloadinglibs> <separatetty>false</separatetty> <floatingtoolbar>true</floatingtoolbar> - <configGdbScript/> - <runShellScript/> - <runGdbScript/> + <configGdbScript></configGdbScript> + <runShellScript></runShellScript> + <runGdbScript></runGdbScript> </general> <display> <staticmembers>true</staticmembers> @@ -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-31 14:23:11
|
Update of /cvsroot/mockpp/mockpp/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12866/mockpp Modified Files: VisitableMockObject_macro.h VisitableMockObject_template.h Log Message: fixed compilation problems on certain data types Index: VisitableMockObject_template.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/VisitableMockObject_template.h,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- VisitableMockObject_template.h 7 May 2005 12:45:11 -0000 1.25 +++ VisitableMockObject_template.h 31 Jul 2005 14:22:57 -0000 1.26 @@ -121,7 +121,7 @@ * @param c1 the constraint upon which to return * @param count the number of times the object may be used */ - void add(Throwable *t, const mockpp::ConstraintHolder<T1> &c1, unsigned count) + void add(Throwable *t, const ConstraintHolder<T1> &c1, unsigned count) { counter.push_back(count); tvec.push_back(t); @@ -136,7 +136,8 @@ */ void add(Throwable *t, const T1 &t1, unsigned count) { - add(t, new IsEqual<T1>(t1), count); + const ConstraintHolder<T1> h1 = new IsEqual<T1>(t1); + add(t, h1, count); } /** Removes all the objects from the list. @@ -219,7 +220,7 @@ * @param c1 the constraint upon which to return * @param count the number of times the object may be used */ - void add(Throwable *t, const mockpp::ConstraintHolder<T1> &c1, unsigned count) + void add(Throwable *t, const ConstraintHolder<T1> &c1, unsigned count) { MOCKPP_ASSERT_TRUE(t != 0); ResponseThrowableVector1<T1>::add (t, c1, count); @@ -243,7 +244,7 @@ * @param c1 the constraint upon which to return * @param count the number of times the object may be used */ - void add(const R &r, const mockpp::ConstraintHolder<T1> &c1, unsigned count) + void add(const R &r, const ConstraintHolder<T1> &c1, unsigned count) { ResponseThrowableVector1<T1>::add ((Throwable*)0, c1, count); rvec.push_back(r); @@ -331,8 +332,8 @@ * @param count the number of times the object may be used */ void add(Throwable *t, - const mockpp::ConstraintHolder<T1> &c1, - const mockpp::ConstraintHolder<T2> &c2, + const ConstraintHolder<T1> &c1, + const ConstraintHolder<T2> &c2, unsigned count) { counter.push_back(count); @@ -351,10 +352,9 @@ */ void add(Throwable *t, const T1 &t1, const T2 &t2, unsigned count) { - add(t, - new IsEqual<T1>(t1), - new IsEqual<T2>(t2), - count); + const ConstraintHolder<T1> h1 = new IsEqual<T1>(t1); + const ConstraintHolder<T2> h2 = new IsEqual<T2>(t2); + add(t, h1, h2, count); } /** Removes all the objects from the list. @@ -447,8 +447,8 @@ * @param count the number of times the object may be used */ void add(Throwable *t, - const mockpp::ConstraintHolder<T1> &c1, - const mockpp::ConstraintHolder<T2> &c2, + const ConstraintHolder<T1> &c1, + const ConstraintHolder<T2> &c2, unsigned count) { MOCKPP_ASSERT_TRUE(t != 0); @@ -464,8 +464,8 @@ * @param count the number of times the object may be used */ void add(const R &r, - const mockpp::ConstraintHolder<T1> &c1, - const mockpp::ConstraintHolder<T2> &c2, + const ConstraintHolder<T1> &c1, + const ConstraintHolder<T2> &c2, unsigned count) { ResponseThrowableVector2<T1, T2>::add((Throwable*)0, c1, c2, count); @@ -571,11 +571,10 @@ */ void add(Throwable *t, const T1 &t1, const T2 &t2, const T3 &t3, unsigned count) { - add(t, - new IsEqual<T1>(t1), - new IsEqual<T2>(t2), - new IsEqual<T3>(t3), - count); + const ConstraintHolder<T1> h1 = new IsEqual<T1>(t1); + const ConstraintHolder<T2> h2 = new IsEqual<T2>(t2); + const ConstraintHolder<T3> h3 = new IsEqual<T3>(t3); + add(t, h1, h2, h3, count); } /** Adds a throwable. @@ -586,9 +585,9 @@ * @param count the number of times the object may be used */ void add(Throwable *t, - const mockpp::ConstraintHolder<T1> &c1, - const mockpp::ConstraintHolder<T2> &c2, - const mockpp::ConstraintHolder<T3> &c3, + const ConstraintHolder<T1> &c1, + const ConstraintHolder<T2> &c2, + const ConstraintHolder<T3> &c3, unsigned count) { counter.push_back(count); @@ -699,9 +698,9 @@ * @param count the number of times the object may be used */ void add(Throwable *t, - const mockpp::ConstraintHolder<T1> &c1, - const mockpp::ConstraintHolder<T2> &c2, - const mockpp::ConstraintHolder<T3> &c3, + const ConstraintHolder<T1> &c1, + const ConstraintHolder<T2> &c2, + const ConstraintHolder<T3> &c3, unsigned count) { MOCKPP_ASSERT_TRUE(t != 0); @@ -731,9 +730,9 @@ * @param count the number of times the object may be used */ void add(const R &r, - const mockpp::ConstraintHolder<T1> &c1, - const mockpp::ConstraintHolder<T2> &c2, - const mockpp::ConstraintHolder<T3> &c3, + const ConstraintHolder<T1> &c1, + const ConstraintHolder<T2> &c2, + const ConstraintHolder<T3> &c3, unsigned count) { ResponseThrowableVector3<T1, T2, T3>::add((Throwable*)0, c1, c2, c3, count); @@ -830,12 +829,11 @@ */ void add(Throwable *t, const T1 &t1, const T2 &t2, const T3 &t3, const T4 &t4, unsigned count) { - add(t, - new IsEqual<T1>(t1), - new IsEqual<T2>(t2), - new IsEqual<T3>(t3), - new IsEqual<T4>(t4), - count); + const ConstraintHolder<T1> h1 = new IsEqual<T1>(t1); + const ConstraintHolder<T2> h2 = new IsEqual<T2>(t2); + const ConstraintHolder<T3> h3 = new IsEqual<T3>(t3); + const ConstraintHolder<T4> h4 = new IsEqual<T4>(t4); + add(t, h1, h2, h3, h4, count); } /** Adds a throwable. @@ -847,10 +845,10 @@ * @param count the number of times the object may be used */ void add(Throwable *t, - const mockpp::ConstraintHolder<T1> &c1, - const mockpp::ConstraintHolder<T2> &c2, - const mockpp::ConstraintHolder<T3> &c3, - const mockpp::ConstraintHolder<T4> &c4, + const ConstraintHolder<T1> &c1, + const ConstraintHolder<T2> &c2, + const ConstraintHolder<T3> &c3, + const ConstraintHolder<T4> &c4, unsigned count) { counter.push_back(count); @@ -969,10 +967,10 @@ * @param count the number of times the object may be used */ void add(const R &r, - const mockpp::ConstraintHolder<T1> &c1, - const mockpp::ConstraintHolder<T2> &c2, - const mockpp::ConstraintHolder<T3> &c3, - const mockpp::ConstraintHolder<T4> &c4, + const ConstraintHolder<T1> &c1, + const ConstraintHolder<T2> &c2, + const ConstraintHolder<T3> &c3, + const ConstraintHolder<T4> &c4, unsigned count) { ResponseThrowableVector4<T1, T2, T3, T4>::add((Throwable*)0, c1, c2, c3, c4, count); @@ -1004,10 +1002,10 @@ * @param count the number of times the object may be used */ void add(Throwable *t, - const mockpp::ConstraintHolder<T1> &c1, - const mockpp::ConstraintHolder<T2> &c2, - const mockpp::ConstraintHolder<T3> &c3, - const mockpp::ConstraintHolder<T4> &c4, + const ConstraintHolder<T1> &c1, + const ConstraintHolder<T2> &c2, + const ConstraintHolder<T3> &c3, + const ConstraintHolder<T4> &c4, unsigned count) { MOCKPP_ASSERT_TRUE(t != 0); @@ -1111,13 +1109,12 @@ */ void add(Throwable *t, const T1 &t1, const T2 &t2, const T3 &t3, const T4 &t4, const T5 &t5, unsigned count) { - add(t, - new IsEqual<T1>(t1), - new IsEqual<T2>(t2), - new IsEqual<T3>(t3), - new IsEqual<T4>(t4), - new IsEqual<T5>(t5), - count); + const ConstraintHolder<T1> h1 = new IsEqual<T1>(t1); + const ConstraintHolder<T2> h2 = new IsEqual<T2>(t2); + const ConstraintHolder<T3> h3 = new IsEqual<T3>(t3); + const ConstraintHolder<T4> h4 = new IsEqual<T4>(t4); + const ConstraintHolder<T5> h5 = new IsEqual<T5>(t5); + add(t, h1, h2, h3, h4, h5, count); } /** Adds a throwable. @@ -1130,11 +1127,11 @@ * @param count the number of times the object may be used */ void add(Throwable *t, - const mockpp::ConstraintHolder<T1> &c1, - const mockpp::ConstraintHolder<T2> &c2, - const mockpp::ConstraintHolder<T3> &c3, - const mockpp::ConstraintHolder<T4> &c4, - const mockpp::ConstraintHolder<T5> &c5, + const ConstraintHolder<T1> &c1, + const ConstraintHolder<T2> &c2, + const ConstraintHolder<T3> &c3, + const ConstraintHolder<T4> &c4, + const ConstraintHolder<T5> &c5, unsigned count) { counter.push_back(count); @@ -1265,11 +1262,11 @@ * @param count the number of times the object may be used */ void add(Throwable *t, - const mockpp::ConstraintHolder<T1> &c1, - const mockpp::ConstraintHolder<T2> &c2, - const mockpp::ConstraintHolder<T3> &c3, - const mockpp::ConstraintHolder<T4> &c4, - const mockpp::ConstraintHolder<T5> &c5, + const ConstraintHolder<T1> &c1, + const ConstraintHolder<T2> &c2, + const ConstraintHolder<T3> &c3, + const ConstraintHolder<T4> &c4, + const ConstraintHolder<T5> &c5, unsigned count) { MOCKPP_ASSERT_TRUE(t != 0); @@ -1303,11 +1300,11 @@ * @param count the number of times the object may be used */ void add(const R &r, - const mockpp::ConstraintHolder<T1> &c1, - const mockpp::ConstraintHolder<T2> &c2, - const mockpp::ConstraintHolder<T3> &c3, - const mockpp::ConstraintHolder<T4> &c4, - const mockpp::ConstraintHolder<T5> &c5, + const ConstraintHolder<T1> &c1, + const ConstraintHolder<T2> &c2, + const ConstraintHolder<T3> &c3, + const ConstraintHolder<T4> &c4, + const ConstraintHolder<T5> &c5, unsigned count) { ResponseThrowableVector5<T1, T2, T3, T4, T5>::add((Throwable*)0, c1, c2, c3, c4, c5, count); Index: VisitableMockObject_macro.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/VisitableMockObject_macro.h,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- VisitableMockObject_macro.h 23 Jul 2005 13:30:49 -0000 1.30 +++ VisitableMockObject_macro.h 31 Jul 2005 14:22:57 -0000 1.31 @@ -745,8 +745,7 @@ void a_name (const mockpp::ConstraintHolder<v_type1> ¶m1) /* @todo const? */ \ { \ addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + #m_name); \ - mockpp::Constraint<v_type1>::AP cons1 (param1); \ - m_name ## Parameter1.addExpected(cons1.release()); \ + m_name ## Parameter1.addExpected(param1); \ } \ MOCKPP_MEMBER_RESTRICTOR_PRIVATE: \ MOCKPP_DECLARE_DEFAULT_VARS(m_name); \ @@ -800,10 +799,8 @@ const mockpp::ConstraintHolder<v_type2> ¶m2) /* @todo const? */ \ { \ addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + #m_name); \ - mockpp::Constraint<v_type1>::AP cons1 (param1); \ - mockpp::Constraint<v_type2>::AP cons2 (param2); \ - m_name ## Parameter1.addExpected(cons1.release()); \ - m_name ## Parameter2.addExpected(cons2.release()); \ + m_name ## Parameter1.addExpected(param1); \ + m_name ## Parameter2.addExpected(param2); \ } \ MOCKPP_MEMBER_RESTRICTOR_PRIVATE: \ MOCKPP_DECLARE_DEFAULT_VARS(m_name); \ @@ -863,12 +860,9 @@ const mockpp::ConstraintHolder<v_type3> ¶m3) /* @todo const? */ \ { \ addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + #m_name); \ - mockpp::Constraint<v_type1>::AP cons1 (param1); \ - mockpp::Constraint<v_type2>::AP cons2 (param2); \ - mockpp::Constraint<v_type3>::AP cons3 (param3); \ - m_name ## Parameter1.addExpected(cons1.release()); \ - m_name ## Parameter2.addExpected(cons2.release()); \ - m_name ## Parameter3.addExpected(cons3.release()); \ + m_name ## Parameter1.addExpected(param1); \ + m_name ## Parameter2.addExpected(param2); \ + m_name ## Parameter3.addExpected(param3); \ } \ MOCKPP_MEMBER_RESTRICTOR_PRIVATE: \ MOCKPP_DECLARE_DEFAULT_VARS(m_name); \ @@ -934,14 +928,10 @@ const mockpp::ConstraintHolder<v_type4> ¶m4) /* @todo const? */ \ { \ addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + #m_name); \ - mockpp::Constraint<v_type1>::AP cons1 (param1); \ - mockpp::Constraint<v_type2>::AP cons2 (param2); \ - mockpp::Constraint<v_type3>::AP cons3 (param3); \ - mockpp::Constraint<v_type4>::AP cons4 (param4); \ - m_name ## Parameter1.addExpected(cons1.release()); \ - m_name ## Parameter2.addExpected(cons2.release()); \ - m_name ## Parameter3.addExpected(cons3.release()); \ - m_name ## Parameter4.addExpected(cons4.release()); \ + m_name ## Parameter1.addExpected(param1); \ + m_name ## Parameter2.addExpected(param2); \ + m_name ## Parameter3.addExpected(param3); \ + m_name ## Parameter4.addExpected(param4); \ } \ MOCKPP_MEMBER_RESTRICTOR_PRIVATE: \ MOCKPP_DECLARE_DEFAULT_VARS(m_name); \ @@ -1013,16 +1003,11 @@ const mockpp::ConstraintHolder<v_type5> ¶m5) /* @todo const? */ \ { \ addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + #m_name); \ - mockpp::Constraint<v_type1>::AP cons1 (param1); \ - mockpp::Constraint<v_type2>::AP cons2 (param2); \ - mockpp::Constraint<v_type3>::AP cons3 (param3); \ - mockpp::Constraint<v_type4>::AP cons4 (param4); \ - mockpp::Constraint<v_type5>::AP cons5 (param5); \ - m_name ## Parameter1.addExpected(cons1.release()); \ - m_name ## Parameter2.addExpected(cons2.release()); \ - m_name ## Parameter3.addExpected(cons3.release()); \ - m_name ## Parameter4.addExpected(cons4.release()); \ - m_name ## Parameter5.addExpected(cons5.release()); \ + m_name ## Parameter1.addExpected(param1); \ + m_name ## Parameter2.addExpected(param2); \ + m_name ## Parameter3.addExpected(param3); \ + m_name ## Parameter4.addExpected(param4); \ + m_name ## Parameter5.addExpected(param5); \ } \ MOCKPP_MEMBER_RESTRICTOR_PRIVATE: \ MOCKPP_DECLARE_DEFAULT_VARS(m_name); \ @@ -1118,8 +1103,7 @@ m_ret_type a_name(const mockpp::ConstraintHolder<v_type1> ¶m1) /* @todo const? */ \ { \ addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + #m_name); \ - mockpp::Constraint<v_type1>::AP cons1 (param1); \ - m_name ## Parameter1.addExpected(cons1.release()); \ + m_name ## Parameter1.addExpected(param1); \ return v_ret_type(); \ } \ MOCKPP_MEMBER_RESTRICTOR_PRIVATE: \ @@ -1186,10 +1170,8 @@ const mockpp::ConstraintHolder<v_type2> ¶m2) /* @todo const? */ \ { \ addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + #m_name); \ - mockpp::Constraint<v_type1>::AP cons1 (param1); \ - mockpp::Constraint<v_type2>::AP cons2 (param2); \ - m_name ## Parameter1.addExpected(cons1.release()); \ - m_name ## Parameter2.addExpected(cons2.release()); \ + m_name ## Parameter1.addExpected(param1); \ + m_name ## Parameter2.addExpected(param2); \ return v_ret_type(); \ } \ MOCKPP_MEMBER_RESTRICTOR_PRIVATE: \ @@ -1262,12 +1244,9 @@ const mockpp::ConstraintHolder<v_type3> ¶m3) /* @todo const? */ \ { \ addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + #m_name); \ - mockpp::Constraint<v_type1>::AP cons1 (param1); \ - mockpp::Constraint<v_type2>::AP cons2 (param2); \ - mockpp::Constraint<v_type3>::AP cons3 (param3); \ - m_name ## Parameter1.addExpected(cons1.release()); \ - m_name ## Parameter2.addExpected(cons2.release()); \ - m_name ## Parameter3.addExpected(cons3.release()); \ + m_name ## Parameter1.addExpected(param1); \ + m_name ## Parameter2.addExpected(param2); \ + m_name ## Parameter3.addExpected(param3); \ return v_ret_type(); \ } \ MOCKPP_MEMBER_RESTRICTOR_PRIVATE: \ @@ -1345,14 +1324,10 @@ const mockpp::ConstraintHolder<v_type4> ¶m4) /* @todo const? */ \ { \ addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + #m_name); \ - mockpp::Constraint<v_type1>::AP cons1 (param1); \ - mockpp::Constraint<v_type2>::AP cons2 (param2); \ - mockpp::Constraint<v_type3>::AP cons3 (param3); \ - mockpp::Constraint<v_type4>::AP cons4 (param4); \ - m_name ## Parameter1.addExpected(cons1.release()); \ - m_name ## Parameter2.addExpected(cons2.release()); \ - m_name ## Parameter3.addExpected(cons3.release()); \ - m_name ## Parameter4.addExpected(cons4.release()); \ + m_name ## Parameter1.addExpected(param1); \ + m_name ## Parameter2.addExpected(param2); \ + m_name ## Parameter3.addExpected(param3); \ + m_name ## Parameter4.addExpected(param4); \ return v_ret_type(); \ } \ MOCKPP_MEMBER_RESTRICTOR_PRIVATE: \ @@ -1436,16 +1411,11 @@ const mockpp::ConstraintHolder<v_type5> ¶m5) /* @todo const? */ \ { \ addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + #m_name); \ - mockpp::Constraint<v_type1>::AP cons1 (param1); \ - mockpp::Constraint<v_type2>::AP cons2 (param2); \ - mockpp::Constraint<v_type3>::AP cons3 (param3); \ - mockpp::Constraint<v_type4>::AP cons4 (param4); \ - mockpp::Constraint<v_type5>::AP cons5 (param5); \ - m_name ## Parameter1.addExpected(cons1.release()); \ - m_name ## Parameter2.addExpected(cons2.release()); \ - m_name ## Parameter3.addExpected(cons3.release()); \ - m_name ## Parameter4.addExpected(cons4.release()); \ - m_name ## Parameter5.addExpected(cons5.release()); \ + m_name ## Parameter1.addExpected(param1); \ + m_name ## Parameter2.addExpected(param2); \ + m_name ## Parameter3.addExpected(param3); \ + m_name ## Parameter4.addExpected(param4); \ + m_name ## Parameter5.addExpected(param5); \ return v_ret_type(); \ } \ MOCKPP_MEMBER_RESTRICTOR_PRIVATE: \ |
|
From: Ewald A. <ewa...@us...> - 2005-07-31 14:21:59
|
Update of /cvsroot/mockpp/mockpp/mockpp/bugs/boost In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12646/mockpp/bugs/boost Modified Files: test.cpp Log Message: update Index: test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/bugs/boost/test.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- test.cpp 31 Jul 2005 11:19:23 -0000 1.1 +++ test.cpp 31 Jul 2005 14:21:50 -0000 1.2 @@ -10,7 +10,6 @@ using namespace boost; typedef variant<int, string> var_t; -// typedef int var_t; mockpp::String& operator<<(mockpp::String& s, const var_t& t) { @@ -27,6 +26,7 @@ class mock : public mockpp::VisitableMockObject, public Foo { + public: mock (): VisitableMockObject (MOCKPP_PCHAR("mock"), 0 ), MOCKPP_CONSTRUCT_MEMBERS_FOR_VISITABLE_EXT1 ( bar, ext) @@ -41,5 +41,8 @@ int main (int argc, char* argv[]) { + var_t vt; + mock mo; + mo.bar(vt); std::cout << "ready" << std::endl; } |
|
From: Ewald A. <ewa...@us...> - 2005-07-31 14:14:21
|
Update of /cvsroot/mockpp/mockpp/mockpp/compat In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10742/mockpp/compat Modified Files: Formatter.cpp Formatter.h Log Message: fixed compilation problems on certain data types Index: Formatter.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/compat/Formatter.h,v retrieving revision 1.32 retrieving revision 1.33 diff -u -d -r1.32 -r1.33 --- Formatter.h 24 Jul 2005 18:58:38 -0000 1.32 +++ Formatter.h 31 Jul 2005 14:14:08 -0000 1.33 @@ -86,7 +86,7 @@ * @param repdata value to replace * @return the resulting string */ -mockpp::String & operator << (mockpp::String &formatter, int repdata); +mockpp::String & operator << (mockpp::String &formatter, const int &repdata); /** Replace a positional %-parameter with a value. @@ -97,7 +97,7 @@ * @param repdata value to replace * @return the resulting string */ -mockpp::String & operator << (mockpp::String &formatter, bool repdata); +mockpp::String & operator << (mockpp::String &formatter, const bool &repdata); /** Replace a positional %-parameter with a value. @@ -108,7 +108,7 @@ * @param repdata value to replace * @return the resulting string */ -mockpp::String & operator << (mockpp::String &formatter, unsigned int repdata); +mockpp::String & operator << (mockpp::String &formatter, const unsigned int &repdata); /** Replace a positional %-parameter with a value. @@ -119,7 +119,7 @@ * @param repdata value to replace * @return the resulting string */ -mockpp::String & operator << (mockpp::String &formatter, unsigned long repdata); +mockpp::String & operator << (mockpp::String &formatter, const unsigned long &repdata); /** Replace a positional %-parameter with a value. @@ -130,7 +130,7 @@ * @param repdata value to replace * @return the resulting string */ -mockpp::String & operator << (mockpp::String &formatter, signed char repdata); +mockpp::String & operator << (mockpp::String &formatter, const signed char &repdata); /** Replace a positional %-parameter with a value. @@ -141,7 +141,7 @@ * @param repdata value to replace * @return the resulting string */ -mockpp::String & operator << (mockpp::String &formatter, unsigned char repdata); +mockpp::String & operator << (mockpp::String &formatter, const unsigned char &repdata); /** Replace a positional %-parameter with a value. @@ -152,7 +152,7 @@ * @param repdata value to replace * @return the resulting string */ -mockpp::String & operator << (mockpp::String &formatter, char repdata); +mockpp::String & operator << (mockpp::String &formatter, const char &repdata); /** Replace a positional %-parameter with a value. @@ -163,7 +163,7 @@ * @param repdata value to replace * @return the resulting string */ -mockpp::String & operator << (mockpp::String &formatter, const char *repdata); +mockpp::String & operator << (mockpp::String &formatter, const char * repdata); /** Replace a positional %-parameter with a value. @@ -174,7 +174,7 @@ * @param repdata value to replace * @return the resulting string */ -mockpp::String & operator << (mockpp::String &formatter, float repdata); +mockpp::String & operator << (mockpp::String &formatter, const float &repdata); #ifdef MOCKPP_UNICODE @@ -186,7 +186,7 @@ * @param repdata value to replace * @return the resulting string */ -mockpp::String & operator << (mockpp::String &formatter, wchar_t repdata); +mockpp::String & operator << (mockpp::String &formatter, const wchar_t &repdata); /** Replace a positional %-parameter with a value. @@ -197,7 +197,7 @@ * @param repdata value to replace * @return the resulting string */ -mockpp::String & operator << (mockpp::String &formatter, const wchar_t *repdata); +mockpp::String & operator << (mockpp::String &formatter, const wchar_t * repdata); #endif // MOCKPP_UNICODE @@ -210,7 +210,7 @@ * @param repdata value to replace * @return the resulting string */ -mockpp::String & operator << (mockpp::String &formatter, long repdata); +mockpp::String & operator << (mockpp::String &formatter, const long &repdata); /** Replace a positional %-parameter with a value. @@ -259,7 +259,7 @@ * @param repdata value to replace * @return the resulting string */ -mockpp::String & operator << (mockpp::String &formatter, double repdata); +mockpp::String & operator << (mockpp::String &formatter, const double &repdata); #ifdef MOCKPP_ENABLE_DEFAULT_FORMATTER @@ -293,7 +293,7 @@ * @return the resulting string */ template <typename T> -mockpp::String & MOCKPP_EXPORT operator << (mockpp::String &formatter, const T *po) +mockpp::String & MOCKPP_EXPORT operator << (mockpp::String &formatter, const T * &po) { mockpp::String s = MOCKPP_PCHAR("[") + MOCKPP_GET_STRING(typeid(*po).name()) Index: Formatter.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/compat/Formatter.cpp,v retrieving revision 1.41 retrieving revision 1.42 diff -u -d -r1.41 -r1.42 --- Formatter.cpp 23 Jul 2005 17:37:33 -0000 1.41 +++ Formatter.cpp 31 Jul 2005 14:14:08 -0000 1.42 @@ -215,7 +215,7 @@ #else #if (defined (_MSC_VER) && (_MSC_VER <= 1300)) || (defined (__GNUC__) && (__GNUC__ < 3)) if (!isalnum(x)) -#else +#else if (!std::isalnum(x)) #endif { @@ -237,35 +237,35 @@ } // namespace mockpp -mockpp::String & MOCKPP_EXPORT operator << ( mockpp::String &formatter, int repdata ) +mockpp::String & MOCKPP_EXPORT operator << ( mockpp::String &formatter, const int &repdata ) { formatter << mockpp::number( ( long ) repdata ); return formatter; } -mockpp::String & MOCKPP_EXPORT operator << ( mockpp::String &formatter, bool repdata ) +mockpp::String & MOCKPP_EXPORT operator << ( mockpp::String &formatter, const bool &repdata ) { formatter << mockpp::number( ( long ) repdata ); return formatter; } -mockpp::String & MOCKPP_EXPORT operator << ( mockpp::String &formatter, unsigned int repdata ) +mockpp::String & MOCKPP_EXPORT operator << ( mockpp::String &formatter, const unsigned int &repdata ) { formatter << mockpp::number( ( unsigned long ) repdata ); return formatter; } -mockpp::String & MOCKPP_EXPORT operator << ( mockpp::String &formatter, unsigned long repdata ) +mockpp::String & MOCKPP_EXPORT operator << ( mockpp::String &formatter, const unsigned long &repdata ) { formatter << mockpp::number( repdata ); return formatter; } -mockpp::String & MOCKPP_EXPORT operator << ( mockpp::String &formatter, signed char repdata ) +mockpp::String & MOCKPP_EXPORT operator << ( mockpp::String &formatter, const signed char &repdata ) { mockpp::String s; formatter << mockpp::charToReadable(repdata); @@ -273,14 +273,14 @@ } -mockpp::String & MOCKPP_EXPORT operator << ( mockpp::String &formatter, char repdata ) +mockpp::String & MOCKPP_EXPORT operator << ( mockpp::String &formatter, const char &repdata ) { formatter << mockpp::charToReadable(repdata); return formatter; } -mockpp::String & MOCKPP_EXPORT operator << ( mockpp::String &formatter, unsigned char repdata ) +mockpp::String & MOCKPP_EXPORT operator << ( mockpp::String &formatter, const unsigned char &repdata ) { formatter << mockpp::charToReadable(repdata); return formatter; @@ -294,7 +294,7 @@ } -mockpp::String & MOCKPP_EXPORT operator << ( mockpp::String &formatter, float repdata ) +mockpp::String & MOCKPP_EXPORT operator << ( mockpp::String &formatter, const float &repdata ) { formatter << mockpp::number( repdata ); return formatter; @@ -303,14 +303,14 @@ #ifdef MOCKPP_UNICODE -mockpp::String & MOCKPP_EXPORT operator << ( mockpp::String &formatter, wchar_t repdata ) +mockpp::String & MOCKPP_EXPORT operator << ( mockpp::String &formatter, const wchar_t &repdata ) { formatter << mockpp::charToReadable(repdata); return formatter; } -mockpp::String & MOCKPP_EXPORT operator << ( mockpp::String &formatter, const wchar_t *repdata ) +mockpp::String & MOCKPP_EXPORT operator << ( mockpp::String &formatter, const wchar_t * repdata ) { formatter << mockpp::String(repdata); return formatter; @@ -319,14 +319,14 @@ #endif -mockpp::String & MOCKPP_EXPORT operator << ( mockpp::String &formatter, long repdata ) +mockpp::String & MOCKPP_EXPORT operator << ( mockpp::String &formatter, const long &repdata ) { formatter << mockpp::number( repdata ); return formatter; } -mockpp::String & MOCKPP_EXPORT operator << ( mockpp::String &formatter, double repdata ) +mockpp::String & MOCKPP_EXPORT operator << ( mockpp::String &formatter, const double &repdata ) { formatter << mockpp::number( repdata ); return formatter; |
|
From: Ewald A. <ewa...@us...> - 2005-07-31 14:12:54
|
Update of /cvsroot/mockpp/mockpp/mockpp/constraint In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10406/mockpp/constraint Modified Files: ConstraintList.h Log Message: fixed compilation problems on certain data types Index: ConstraintList.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/constraint/ConstraintList.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- ConstraintList.h 7 May 2005 12:46:19 -0000 1.4 +++ ConstraintList.h 31 Jul 2005 14:12:44 -0000 1.5 @@ -161,7 +161,8 @@ */ ConstraintList& addExpected(const T &expectedItem) { - return addExpected(new IsEqual<T>(expectedItem)); + const ConstraintHolder<T> h = new IsEqual<T>(expectedItem); + return addExpected(h); } |
|
From: Ewald A. <ewa...@us...> - 2005-07-31 14:12:06
|
Update of /cvsroot/mockpp/mockpp/mockpp/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10144/mockpp/tests Modified Files: Formatter_test.cpp Log Message: update Index: Formatter_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/Formatter_test.cpp,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- Formatter_test.cpp 24 Jul 2005 18:58:39 -0000 1.28 +++ Formatter_test.cpp 31 Jul 2005 14:11:51 -0000 1.29 @@ -392,7 +392,7 @@ mockpp::String fmt; fmt = MOCKPP_PCHAR("%9%8%7%6%5%4%3%2%1%0"); - fmt << (signed char) ('0') + fmt << (signed char)('0') << (signed char)('1') << (signed char)('2') << (signed char)('3') |
|
From: Ewald A. <ewa...@us...> - 2005-07-31 14:11:18
|
Update of /cvsroot/mockpp/mockpp/mockpp/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9923/mockpp/tests Modified Files: ChainableMockObject_5_void_test.cpp VisitableMockObject_2_void_test.cpp VisitableMockObject_3_void_test.cpp VisitableMockObject_4_void_test.cpp VisitableMockObject_5_void_test.cpp Log Message: fixed warnings Index: VisitableMockObject_4_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_4_void_test.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- VisitableMockObject_4_void_test.cpp 25 Jul 2005 19:02:15 -0000 1.16 +++ VisitableMockObject_4_void_test.cpp 31 Jul 2005 14:11:05 -0000 1.17 @@ -135,9 +135,6 @@ MOCKPP_CONSTRUCT_MEMBERS_FOR_VOID_VISITABLE_EXT4(outbound, Ext) {} - MOCKPP_VOID_VISITABLE_EXT4(MyVisitableMockObject_4_void_ex, outbound, unsigned &, unsigned &, unsigned &, unsigned &, - Ext, unsigned, unsigned, unsigned, unsigned); - MOCKPP_VOID_VISITABLE_EXT4(MyVisitableMockObject_4_void_ex, visitable4, const std::string &, const std::string &, const std::string &, const std::string &, Ext, std::string, std::string, std::string, std::string); @@ -153,6 +150,9 @@ MOCKPP_VOID_VISITABLE_EXT0(MyVisitableMockObject_4_void_ex, visitable0, Ext); + MOCKPP_VOID_VISITABLE_EXT4(MyVisitableMockObject_4_void_ex, outbound, unsigned &, unsigned &, unsigned &, unsigned &, + Ext, unsigned, unsigned, unsigned, unsigned); + bool isClear() { return visitable4ExtDefaultThrowable.get() == 0 // check preprocessed doc-template.h for the actual members Index: ChainableMockObject_5_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_5_void_test.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- ChainableMockObject_5_void_test.cpp 25 Jul 2005 19:02:15 -0000 1.11 +++ ChainableMockObject_5_void_test.cpp 31 Jul 2005 14:11:04 -0000 1.12 @@ -237,9 +237,6 @@ MOCKPP_VOID_CHAINABLE_EXT0(MyChainableMockObject_5_void_ex, chainable0, Ext); - MOCKPP_VOID_CHAINABLE_EXT5(MyChainableMockObject_5_void_ex, outbound, unsigned &, unsigned &, unsigned &, unsigned &, unsigned &, - Ext, unsigned, unsigned, unsigned, unsigned, unsigned ); - MOCKPP_VOID_CONST_CHAINABLE_EXT5(MyChainableMockObject_5_void_ex, const_chainable5, const CA&, const CB&, const CC&, const CD&, CE, Ext1, CA, CB, CC, CD, CE); @@ -280,6 +277,9 @@ MOCKPP_VOID_CONST_CHAINABLE_EXT0(MyChainableMockObject_5_void_ex, const_chainable0_p, Ext); + + MOCKPP_VOID_CHAINABLE_EXT5(MyChainableMockObject_5_void_ex, outbound, unsigned &, unsigned &, unsigned &, unsigned &, unsigned &, + Ext, unsigned, unsigned, unsigned, unsigned, unsigned ); }; Index: VisitableMockObject_2_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_2_void_test.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- VisitableMockObject_2_void_test.cpp 25 Jul 2005 19:02:15 -0000 1.17 +++ VisitableMockObject_2_void_test.cpp 31 Jul 2005 14:11:05 -0000 1.18 @@ -131,9 +131,6 @@ MOCKPP_CONSTRUCT_MEMBERS_FOR_VOID_VISITABLE_EXT2(outbound, Ext) {} - MOCKPP_VOID_VISITABLE_EXT2(MyVisitableMockObject_2_void_ex, outbound, unsigned &, unsigned &, - Ext, unsigned, unsigned); - MOCKPP_VOID_VISITABLE_EXT2(MyVisitableMockObject_2_void_ex, visitable2, const std::string &, const std::string &, Ext, std::string, std::string); @@ -143,6 +140,9 @@ MOCKPP_VOID_VISITABLE_EXT0(MyVisitableMockObject_2_void_ex, visitable0, Ext); + MOCKPP_VOID_VISITABLE_EXT2(MyVisitableMockObject_2_void_ex, outbound, unsigned &, unsigned &, + Ext, unsigned, unsigned); + bool isClear() { return visitable2ExtDefaultThrowable.get() == 0 // check preprocessed doc-template.h for the actual members Index: VisitableMockObject_5_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_5_void_test.cpp,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- VisitableMockObject_5_void_test.cpp 25 Jul 2005 19:02:15 -0000 1.21 +++ VisitableMockObject_5_void_test.cpp 31 Jul 2005 14:11:05 -0000 1.22 @@ -329,9 +329,6 @@ , MOCKPP_CONSTRUCT_MEMBERS_FOR_VOID_VISITABLE_EXT5(outbound, Ext) {} - MOCKPP_VOID_VISITABLE_EXT5(MyVisitableMockObject_5_void_ex, outbound, unsigned &, unsigned &, unsigned &, unsigned &, unsigned &, - Ext, unsigned, unsigned, unsigned, unsigned, unsigned ); - MOCKPP_VOID_VISITABLE_EXT5(MyVisitableMockObject_5_void_ex, visitable5, const std::string &, const std::string &, const std::string &, const std::string &, const std::string &, Ext1, std::string, std::string, std::string, std::string, std::string); @@ -459,6 +456,10 @@ MOCKPP_VOID_CONST_VISITABLE_EXT0(MyVisitableMockObject_5_void_ex, abc_const_visitable0, Ext); + + MOCKPP_VOID_VISITABLE_EXT5(MyVisitableMockObject_5_void_ex, outbound, unsigned &, unsigned &, unsigned &, unsigned &, unsigned &, + Ext, unsigned, unsigned, unsigned, unsigned, unsigned ); + bool isClear() { return visitable5Ext1DefaultThrowable.get() == 0 // check preprocessed doc-template.h for the actual members Index: VisitableMockObject_3_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_3_void_test.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- VisitableMockObject_3_void_test.cpp 25 Jul 2005 19:02:15 -0000 1.16 +++ VisitableMockObject_3_void_test.cpp 31 Jul 2005 14:11:05 -0000 1.17 @@ -133,9 +133,6 @@ MOCKPP_CONSTRUCT_MEMBERS_FOR_VOID_VISITABLE_EXT3(outbound, Ext) {} - MOCKPP_VOID_VISITABLE_EXT3(MyVisitableMockObject_3_void_ex, outbound, unsigned &, unsigned &, unsigned &, - Ext, unsigned, unsigned, unsigned); - MOCKPP_VOID_VISITABLE_EXT3(MyVisitableMockObject_3_void_ex, visitable3, const std::string &, const std::string &, const std::string &, Ext, std::string, std::string, std::string); @@ -148,6 +145,9 @@ MOCKPP_VOID_VISITABLE_EXT0(MyVisitableMockObject_3_void_ex, visitable0, Ext); + MOCKPP_VOID_VISITABLE_EXT3(MyVisitableMockObject_3_void_ex, outbound, unsigned &, unsigned &, unsigned &, + Ext, unsigned, unsigned, unsigned); + bool isClear() { return visitable3ExtDefaultThrowable.get() == 0 // check preprocessed doc-template.h for the actual members |
|
From: Ewald A. <ewa...@us...> - 2005-07-31 11:19:32
|
Update of /cvsroot/mockpp/mockpp/mockpp/bugs/boost In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8831/mockpp/bugs/boost Added Files: .cvsignore Makefile test.cpp tuple.cpp Log Message: new --- NEW FILE: .cvsignore --- tuple test --- NEW FILE: tuple.cpp --- #include <boost/tuple/tuple.hpp> #include <boost/tuple/tuple_io.hpp> #include <string> #include <iostream> #include <mockpp/mockpp.h> #include <mockpp/VisitableMockObject.h> #include <mockpp/chaining/ChainingMockObjectSupport.h> using namespace std; using namespace boost; typedef tuple<int, int> tuple_t; /* std::ostream& operator<<(std::ostream& s, const tuple_t& t) { s << "tuple_t"; return s; } */ MOCKPP_OSTREAMABLE (tuple_t) class Foo { public: virtual int bar ( const tuple_t& ){} }; class mock : public mockpp::VisitableMockObject, public Foo { mock (): VisitableMockObject (MOCKPP_PCHAR("mock"), 0 ), MOCKPP_CONSTRUCT_MEMBERS_FOR_VISITABLE_EXT1 ( bar, ext) {} MOCKPP_VISITABLE_EXT1 ( mock, int, bar, const tuple_t&, int, ext, tuple_t ); }; int main (int argc, char* argv[]) { tuple_t t; std::basic_ostringstream<char> oss; oss << t; std::cout << t << std::endl; std::cout << "ready" << std::endl; } --- NEW FILE: Makefile --- INC=-I../../.. -I/home/compile/mockpp/u/ -I/home/ea/Documents/src/boost_1_31_0/ LIBS=-L/home/compile/mockpp/u/mockpp/.libs -lmockpp -lcppunit -ldl .PHONY: tuple test test: g++ $(INC) $(LIBS) test.cpp -o test tuple: g++ $(INC) $(LIBS) tuple.cpp -o tuple --- NEW FILE: test.cpp --- #include <boost/variant.hpp> #include <string> #include <iostream> #include <mockpp/mockpp.h> #include <mockpp/VisitableMockObject.h> #include <mockpp/chaining/ChainingMockObjectSupport.h> using namespace std; using namespace boost; typedef variant<int, string> var_t; // typedef int var_t; mockpp::String& operator<<(mockpp::String& s, const var_t& t) { s << MOCKPP_PCHAR("var_t"); return s; } class Foo { public: virtual int bar ( const var_t& ){} }; class mock : public mockpp::VisitableMockObject, public Foo { mock (): VisitableMockObject (MOCKPP_PCHAR("mock"), 0 ), MOCKPP_CONSTRUCT_MEMBERS_FOR_VISITABLE_EXT1 ( bar, ext) {} MOCKPP_VISITABLE_EXT1 ( mock, int, bar, const var_t&, int, ext, var_t ); }; int main (int argc, char* argv[]) { std::cout << "ready" << std::endl; } |
|
From: Ewald A. <ewa...@us...> - 2005-07-31 11:13:03
|
Update of /cvsroot/mockpp/mockpp/mockpp/bugs/boost In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7802/mockpp/bugs/boost Log Message: Directory /cvsroot/mockpp/mockpp/mockpp/bugs/boost added to the repository |
|
From: Ewald A. <ewa...@us...> - 2005-07-29 10:07:39
|
Update of /cvsroot/mockpp/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27090 Modified Files: Makefile.am configure.in mockpp.doxygen.in Added Files: run-configure-ascii.sh run-configure-unicode.sh Log Message: next release --- NEW FILE: run-configure-unicode.sh --- #!/bin/sh CFLAGS="-O0 -g3 -Wall" CXXFLAGS="-O0 -g3 -Wall" CXX="ccache g++" CC="ccache g++" ${0%/*}/configure --enable-unicode --enable-debug=full Index: mockpp.doxygen.in =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp.doxygen.in,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- mockpp.doxygen.in 23 Jul 2005 13:31:56 -0000 1.15 +++ mockpp.doxygen.in 29 Jul 2005 10:07:23 -0000 1.16 @@ -22,7 +22,7 @@ # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = MOCKPP_VERSION +PROJECT_NUMBER = @MOCKPP_VERSION@ # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. @@ -442,15 +442,15 @@ # directories like "/usr/src/myproject". Separate the files or directories # with spaces. -INPUT = TOP_SRCDIR/mockpp/ \ - TOP_SRCDIR/mockpp/compat \ - TOP_SRCDIR/mockpp/util \ - TOP_SRCDIR/mockpp/stub \ - TOP_SRCDIR/mockpp/builder \ - TOP_SRCDIR/mockpp/constraint \ - TOP_SRCDIR/mockpp/matcher \ - TOP_SRCDIR/mockpp/production \ - TOP_SRCDIR/mockpp/chaining +INPUT = @top_srcdir@/mockpp/ \ + @top_srcdir@/mockpp/compat \ + @top_srcdir@/mockpp/util \ + @top_srcdir@/mockpp/stub \ + @top_srcdir@/mockpp/builder \ + @top_srcdir@/mockpp/constraint \ + @top_srcdir@/mockpp/matcher \ + @top_srcdir@/mockpp/production \ + @top_srcdir@/mockpp/chaining # If the value of the INPUT tag contains directories, you can use the # FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp @@ -472,20 +472,20 @@ # excluded from the INPUT source files. This way you can easily exclude a # subdirectory from a directory tree whose root is specified with the INPUT tag. -EXCLUDE = TOP_SRCDIR/mockpp/doc-template.h \ - TOP_SRCDIR/mockpp/mockpp_config-bcb5.h \ - TOP_SRCDIR/mockpp/mockpp_config-msvc.h \ - TOP_SRCDIR/mockpp/mockpp_config-msvc_71.h \ - TOP_SRCDIR/mockpp/mockpp_config-msvc_60_70.h \ - TOP_SRCDIR/mockpp/mockpp_config-cygwin.h \ - TOP_SRCDIR/mockpp/mockpp_config.h \ - TOP_SRCDIR/mockpp/lint-bcb \ - TOP_SRCDIR/mockpp/visitable-template.h \ - TOP_SRCDIR/mockpp/chainable-template.h \ - TOP_SRCDIR/mockpp/builder/dummy.cpp \ - TOP_SRCDIR/mockpp/matcher/dummy.cpp \ - TOP_SRCDIR/mockpp/constraint/dummy.cpp \ - TOP_SRCDIR/mockpp/stub/dummy.cpp +EXCLUDE = @top_srcdir@/mockpp/doc-template.h \ + @top_srcdir@/mockpp/mockpp_config-bcb5.h \ + @top_srcdir@/mockpp/mockpp_config-msvc.h \ + @top_srcdir@/mockpp/mockpp_config-msvc_71.h \ + @top_srcdir@/mockpp/mockpp_config-msvc_60_70.h \ + @top_srcdir@/mockpp/mockpp_config-cygwin.h \ + @top_srcdir@/mockpp/mockpp_config.h \ + @top_srcdir@/mockpp/lint-bcb \ + @top_srcdir@/mockpp/visitable-template.h \ + @top_srcdir@/mockpp/chainable-template.h \ + @top_srcdir@/mockpp/builder/dummy.cpp \ + @top_srcdir@/mockpp/matcher/dummy.cpp \ + @top_srcdir@/mockpp/constraint/dummy.cpp \ + @top_srcdir@/mockpp/stub/dummy.cpp # The EXCLUDE_SYMLINKS tag can be used select whether or not files or # directories that are symbolic links (a Unix filesystem feature) are excluded @@ -1008,6 +1008,7 @@ MOCKPP_BOUNDARY_DELTA \ DOXYGEN_SHOULD_SKIP_THIS \ DOXYGEN_SHOULD_SKIP_THIS \ + "MOCKPP_MEMBER_RESTRICTOR_PROTECTED = protected \" "MOCKPP_PRE(a) = /*! \pre a */" \ "MOCKPP_PRE_MSG(a,b) = /*! \pre a \code b \endcode */" \ "MOCKPP_POST(a) = /*! \post a */" \ --- NEW FILE: run-configure-ascii.sh --- #!/bin/sh CFLAGS="-O0 -g3 -Wall" CXXFLAGS="-O0 -g3 -Wall" CXX="ccache g++" CC="ccache g++" ${0%/*}/configure --enable-debug=full Index: Makefile.am =================================================================== RCS file: /cvsroot/mockpp/mockpp/Makefile.am,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- Makefile.am 7 May 2005 17:00:55 -0000 1.28 +++ Makefile.am 29 Jul 2005 10:07:23 -0000 1.29 @@ -81,6 +81,9 @@ @echo "" +release-check: gz-dist + sh $(srcdir)/release-check $(distdir) `pwd` + MAINTAINERCLEANFILES = subdirs configure.in acinclude.m4 configure.files ################################################################# Index: configure.in =================================================================== RCS file: /cvsroot/mockpp/mockpp/configure.in,v retrieving revision 1.83 retrieving revision 1.84 diff -u -d -r1.83 -r1.84 --- configure.in 23 Jul 2005 17:37:31 -0000 1.83 +++ configure.in 29 Jul 2005 10:07:23 -0000 1.84 @@ -430,6 +430,7 @@ AC_OUTPUT(\ mockpp.spec \ + mockpp.doxygen \ \ Makefile \ \ |
|
From: Ewald A. <ewa...@us...> - 2005-07-29 10:07:39
|
Update of /cvsroot/mockpp/mockpp/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27090/mockpp Modified Files: ChainableMockObject.h Log Message: next release Index: ChainableMockObject.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/ChainableMockObject.h,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- ChainableMockObject.h 6 Apr 2005 20:15:20 -0000 1.25 +++ ChainableMockObject.h 29 Jul 2005 10:07:24 -0000 1.26 @@ -105,7 +105,7 @@ /** Checks if there are any pending recorders left. If there are, an exception is * throw. - * @internalVerifiableList + * @internal */ void checkPendingRecorders() const; // @todo make private |
|
From: Ewald A. <ewa...@us...> - 2005-07-29 10:07:39
|
Update of /cvsroot/mockpp/mockpp/mockpp/docs/api In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27090/mockpp/docs/api Modified Files: Makefile.am Log Message: next release Index: Makefile.am =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/docs/api/Makefile.am,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- Makefile.am 27 May 2005 16:49:28 -0000 1.17 +++ Makefile.am 29 Jul 2005 10:07:25 -0000 1.18 @@ -17,12 +17,7 @@ -test -L handbook && rm handbook ln -s ../../docs/en/var handbook -test -d html && rm -rf html - sed -e "s#TOP_SRCDIR#$(top_srcdir)#g" \ - -e "s#MOCKPP_VERSION#$(MOCKPP_VERSION)#g" \ - -e "s#HAVE_DOT#@HAVE_DOT@#g" \ - $(top_srcdir)/mockpp.doxygen.in >tmp.doxygen - $(DOXYGEN) tmp.doxygen - rm tmp.doxygen + $(DOXYGEN) $(top_builddir)/mockpp.doxygen apidoc-dist: apidoc -test -r $(PACKAGE)-$(VERSION)-apidoc.tar.bz2 && rm $(PACKAGE)-$(VERSION)-apidoc.tar.bz2 @@ -45,6 +40,9 @@ rm -rf $(PACKAGE)-$(VERSION)-apidoc +release-check: gz-dist + sh $(srcdir)/release-check $(distdir) `pwd` + ################################################################# htmldir = $(pkgdatadir)/html |
|
From: Ewald A. <ewa...@us...> - 2005-07-29 08:02:20
|
Update of /cvsroot/mockpp/mockpp/mockpp/docs/en In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5444/mockpp/docs/en Modified Files: index.docbook Log Message: next release Index: index.docbook =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/docs/en/index.docbook,v retrieving revision 1.29 retrieving revision 1.30 diff -u -d -r1.29 -r1.30 --- index.docbook 2 Jul 2005 13:49:44 -0000 1.29 +++ index.docbook 29 Jul 2005 08:02:06 -0000 1.30 @@ -11,7 +11,7 @@ <!ENTITY copyyears '2002-2005' > <!ENTITY mockpp_email 'mockpp at ewald-arnold dot de' > <!ENTITY release_date '<pubdate>Published: <?dbtimestamp format="Y-m-d"?></pubdate>' > - <!ENTITY release_info '<releaseinfo>1.08.02</releaseinfo>' > + <!ENTITY release_info '<releaseinfo>1.09.00</releaseinfo>' > <!ENTITY chap_bookinfo SYSTEM 'bookinfo.docbook' > <!ENTITY chap_intro SYSTEM 'intro.docbook' > |
|
From: Ewald A. <ewa...@us...> - 2005-07-29 08:00:46
|
Update of /cvsroot/mockpp/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5165 Modified Files: TODO Log Message: todo Index: TODO =================================================================== RCS file: /cvsroot/mockpp/mockpp/TODO,v retrieving revision 1.49 retrieving revision 1.50 diff -u -d -r1.49 -r1.50 --- TODO 25 Jul 2005 19:02:13 -0000 1.49 +++ TODO 29 Jul 2005 08:00:38 -0000 1.50 @@ -1,3 +1,11 @@ +VerifiableGroup + +.add(Verifiable*) +.add(Verifiable &) + +verify(); + + DOC: ---- |
|
From: Ewald A. <ewa...@us...> - 2005-07-29 07:47:34
|
Update of /cvsroot/mockpp/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3189 Modified Files: ChangeLog Log Message: next release Index: ChangeLog =================================================================== RCS file: /cvsroot/mockpp/mockpp/ChangeLog,v retrieving revision 1.56 retrieving revision 1.57 diff -u -d -r1.56 -r1.57 --- ChangeLog 23 Jul 2005 17:37:30 -0000 1.56 +++ ChangeLog 29 Jul 2005 07:47:25 -0000 1.57 @@ -2,10 +2,10 @@ mockpp history -------------- -2005-07-23 1.9.0: +2005-07-29 1.9.0: - class OutBound enables outbound parameter references - - Formatter can reuse existing operator<<(ostream, X) + - Formatter can reuse existing operator<<(ostream&, X&) 2005-05-28 1.8.2: |
Update of /cvsroot/mockpp/mockpp/mockpp/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4614/mockpp/tests Modified Files: ChainableMockObject_1_test.cpp ChainableMockObject_1_void_test.cpp ChainableMockObject_2_test.cpp ChainableMockObject_2_void_test.cpp ChainableMockObject_3_test.cpp ChainableMockObject_3_void_test.cpp ChainableMockObject_4_test.cpp ChainableMockObject_4_void_test.cpp ChainableMockObject_5_test.cpp ChainableMockObject_5_void_test.cpp VisitableMockObject_2_void_test.cpp VisitableMockObject_3_void_test.cpp VisitableMockObject_4_void_test.cpp VisitableMockObject_5_void_test.cpp Log Message: broader test coverage Index: ChainableMockObject_5_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_5_void_test.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- ChainableMockObject_5_void_test.cpp 3 Apr 2005 18:32:54 -0000 1.10 +++ ChainableMockObject_5_void_test.cpp 25 Jul 2005 19:02:15 -0000 1.11 @@ -47,6 +47,8 @@ #include <mockpp/chaining/ChainingMockObjectSupport.h> #include <mockpp/chaining/Invocation.h> +#include <mockpp/constraint/OutBound.h> + class ChainableMockObject_5_void_test : public CppUnit::TestFixture { @@ -54,6 +56,7 @@ CPPUNIT_TEST_SUITE( ChainableMockObject_5_void_test ); + CPPUNIT_TEST(test_outbound); CPPUNIT_TEST(test_controller); CPPUNIT_TEST(test_controller_ext); CPPUNIT_TEST( test_parameter_5 ); @@ -62,6 +65,7 @@ public: + void test_outbound(); void test_parameter_5(); void test_controller(); void test_controller_ext(); @@ -73,10 +77,10 @@ typedef mockpp::Invocation5<unsigned, unsigned, unsigned, unsigned, unsigned> mockpp_Invocation5_unsigned_unsigned_unsigned_unsigned_unsigned; - -MOCKPP_PTI_IMPLEMENT(mockpp_Invocation5_unsigned_unsigned_unsigned_unsigned_unsigned) - - + +MOCKPP_PTI_IMPLEMENT(mockpp_Invocation5_unsigned_unsigned_unsigned_unsigned_unsigned) + + class MyChainableMockObject_5_void_Interface { public: @@ -208,6 +212,8 @@ , MOCKPP_CONSTRUCT_MEMBERS_FOR_VOID_CHAINABLE_EXT2(const_chainable2_p, Ext) , MOCKPP_CONSTRUCT_MEMBERS_FOR_VOID_CHAINABLE_EXT1(const_chainable1_p, Ext) , MOCKPP_CONSTRUCT_MEMBERS_FOR_VOID_CHAINABLE_EXT0(const_chainable0_p, Ext) + + , MOCKPP_CONSTRUCT_MEMBERS_FOR_VOID_CHAINABLE_EXT5(outbound, Ext) {} MOCKPP_VOID_CHAINABLE_EXT5(MyChainableMockObject_5_void_ex, chainable5, const CA&, const CB&, const CC&, const CD&, CE, @@ -231,6 +237,9 @@ MOCKPP_VOID_CHAINABLE_EXT0(MyChainableMockObject_5_void_ex, chainable0, Ext); + MOCKPP_VOID_CHAINABLE_EXT5(MyChainableMockObject_5_void_ex, outbound, unsigned &, unsigned &, unsigned &, unsigned &, unsigned &, + Ext, unsigned, unsigned, unsigned, unsigned, unsigned ); + MOCKPP_VOID_CONST_CHAINABLE_EXT5(MyChainableMockObject_5_void_ex, const_chainable5, const CA&, const CB&, const CC&, const CD&, CE, Ext1, CA, CB, CC, CD, CE); @@ -370,4 +379,31 @@ } +void ChainableMockObject_5_void_test::test_outbound() +{ + MyChainableMockObject_5_void_ex mcm(MOCKPP_PCHAR("chainable-object")); + + MOCKPP_CHAINER_FOR_EXT(MyChainableMockObject_5_void_ex, outbound, Ext) chain(&mcm); + + chain.stubs(mockpp::once()) + .with(mockpp::outBound( (unsigned int) 1123), + mockpp::outBound( (unsigned int) 2123), + mockpp::outBound( (unsigned int) 3123), + mockpp::outBound( (unsigned int) 4123), + mockpp::outBound( (unsigned int) 5123)); + + unsigned val1 = 0; + unsigned val2 = 0; + unsigned val3 = 0; + unsigned val4 = 0; + unsigned val5 = 0; + mcm.outbound(val1,val2, val3, val4, val5); + CPPUNIT_ASSERT_EQUAL((unsigned)1123, val1); + CPPUNIT_ASSERT_EQUAL((unsigned)2123, val2); + CPPUNIT_ASSERT_EQUAL((unsigned)3123, val3); + CPPUNIT_ASSERT_EQUAL((unsigned)4123, val4); + CPPUNIT_ASSERT_EQUAL((unsigned)5123, val5); +} + + #endif // HAVE_CPPUNIT Index: ChainableMockObject_4_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_4_test.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- ChainableMockObject_4_test.cpp 2 Apr 2005 20:45:32 -0000 1.6 +++ ChainableMockObject_4_test.cpp 25 Jul 2005 19:02:14 -0000 1.7 @@ -44,6 +44,8 @@ #include <mockpp/chaining/ChainingMockObjectSupport.h> #include <mockpp/chaining/Invocation.h> +#include <mockpp/constraint/OutBound.h> + class ChainableMockObject_4_test : public CppUnit::TestFixture { @@ -51,12 +53,14 @@ CPPUNIT_TEST_SUITE( ChainableMockObject_4_test ); + CPPUNIT_TEST(test_outbound); CPPUNIT_TEST( test_parameter_4 ); CPPUNIT_TEST_SUITE_END(); public: + void test_outbound(); void test_parameter_4(); }; @@ -85,10 +89,14 @@ MyChainableMockObject_4ex(const mockpp::String &name) : mockpp::ChainableMockObject(name, 0) , MOCKPP_CONSTRUCT_MEMBERS_FOR_CHAINABLE_EXT4(chainable4, Ext) + , MOCKPP_CONSTRUCT_MEMBERS_FOR_CHAINABLE_EXT4(outbound, Ext) {} MOCKPP_CHAINABLE_EXT4(MyChainableMockObject_4ex, std::string, chainable4, const std::string &, const std::string &, const std::string &, const std::string &, std::string, Ext, std::string, std::string, std::string, std::string); + + MOCKPP_CHAINABLE_EXT4(MyChainableMockObject_4ex, int, outbound, unsigned &, unsigned &, unsigned &, unsigned &, + int, Ext, unsigned, unsigned, unsigned, unsigned); }; @@ -129,4 +137,28 @@ } +void ChainableMockObject_4_test::test_outbound() +{ + MyChainableMockObject_4ex mcm(MOCKPP_PCHAR("chainable-object")); + + MOCKPP_CHAINER_FOR_EXT(MyChainableMockObject_4ex, outbound, Ext) chain(&mcm); + + chain.stubs(mockpp::once()) + .with(mockpp::outBound( (unsigned int) 1123), + mockpp::outBound( (unsigned int) 2123), + mockpp::outBound( (unsigned int) 3123), + mockpp::outBound( (unsigned int) 4123)); + + unsigned val1 = 0; + unsigned val2 = 0; + unsigned val3 = 0; + unsigned val4 = 0; + mcm.outbound(val1,val2, val3, val4); + CPPUNIT_ASSERT_EQUAL((unsigned)1123, val1); + CPPUNIT_ASSERT_EQUAL((unsigned)2123, val2); + CPPUNIT_ASSERT_EQUAL((unsigned)3123, val3); + CPPUNIT_ASSERT_EQUAL((unsigned)4123, val4); +} + + #endif // HAVE_CPPUNIT Index: ChainableMockObject_2_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_2_void_test.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- ChainableMockObject_2_void_test.cpp 3 Apr 2005 18:32:53 -0000 1.8 +++ ChainableMockObject_2_void_test.cpp 25 Jul 2005 19:02:14 -0000 1.9 @@ -45,6 +45,8 @@ #include <mockpp/chaining/ChainingMockObjectSupport.h> #include <mockpp/chaining/Invocation.h> +#include <mockpp/constraint/OutBound.h> + class ChainableMockObject_2_void_test : public CppUnit::TestFixture { @@ -52,12 +54,14 @@ CPPUNIT_TEST_SUITE( ChainableMockObject_2_void_test ); + CPPUNIT_TEST(test_outbound); CPPUNIT_TEST( test_parameter_2 ); CPPUNIT_TEST_SUITE_END(); public: + void test_outbound(); void test_parameter_2(); }; @@ -67,8 +71,8 @@ typedef mockpp::Invocation2<unsigned, unsigned> mockpp_Invocation2_unsigned_unsigned; - -MOCKPP_PTI_IMPLEMENT(mockpp_Invocation2_unsigned_unsigned) + +MOCKPP_PTI_IMPLEMENT(mockpp_Invocation2_unsigned_unsigned) class MyChainableMockObject_2_void : public mockpp::ChainableMockObject @@ -91,10 +95,14 @@ MyChainableMockObject_2_void_ex(const mockpp::String &name) : mockpp::ChainableMockObject(name, 0) , MOCKPP_CONSTRUCT_MEMBERS_FOR_VOID_CHAINABLE_EXT2(chainable2, Ext) + , MOCKPP_CONSTRUCT_MEMBERS_FOR_VOID_CHAINABLE_EXT2(outbound, Ext) {} MOCKPP_VOID_CHAINABLE_EXT2(MyChainableMockObject_2_void_ex, chainable2, const std::string &, const std::string &, Ext, std::string, std::string); + + MOCKPP_VOID_CHAINABLE_EXT2(MyChainableMockObject_2_void_ex, outbound, unsigned &, unsigned &, + Ext, unsigned, unsigned); }; @@ -148,5 +156,22 @@ } +void ChainableMockObject_2_void_test::test_outbound() +{ + MyChainableMockObject_2_void_ex mcm(MOCKPP_PCHAR("chainable-object")); + + MOCKPP_CHAINER_FOR_EXT(MyChainableMockObject_2_void_ex, outbound, Ext) chain(&mcm); + + chain.stubs(mockpp::once()) + .with(mockpp::outBound( (unsigned int) 1123), + mockpp::outBound( (unsigned int) 2123)); + + unsigned val1 = 0; + unsigned val2 = 0; + mcm.outbound(val1,val2); + CPPUNIT_ASSERT_EQUAL((unsigned)1123, val1); + CPPUNIT_ASSERT_EQUAL((unsigned)2123, val2); +} + #endif // HAVE_CPPUNIT Index: ChainableMockObject_3_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_3_test.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- ChainableMockObject_3_test.cpp 2 Apr 2005 20:45:32 -0000 1.5 +++ ChainableMockObject_3_test.cpp 25 Jul 2005 19:02:14 -0000 1.6 @@ -44,6 +44,8 @@ #include <mockpp/chaining/ChainingMockObjectSupport.h> #include <mockpp/chaining/Invocation.h> +#include <mockpp/constraint/OutBound.h> + class ChainableMockObject_3_test : public CppUnit::TestFixture { @@ -51,12 +53,14 @@ CPPUNIT_TEST_SUITE( ChainableMockObject_3_test ); + CPPUNIT_TEST(test_outbound); CPPUNIT_TEST( test_parameter_3 ); CPPUNIT_TEST_SUITE_END(); public: + void test_outbound(); void test_parameter_3(); }; @@ -84,10 +88,14 @@ MyChainableMockObject_3ex(const mockpp::String &name) : mockpp::ChainableMockObject(name, 0) , MOCKPP_CONSTRUCT_MEMBERS_FOR_CHAINABLE_EXT3(chainable3, Ext) + , MOCKPP_CONSTRUCT_MEMBERS_FOR_CHAINABLE_EXT3(outbound, Ext) {} MOCKPP_CHAINABLE_EXT3(MyChainableMockObject_3ex, std::string, chainable3, const std::string &, const std::string &, const std::string &, std::string, Ext, std::string, std::string, std::string); + + MOCKPP_CHAINABLE_EXT3(MyChainableMockObject_3ex, int, outbound, unsigned &, unsigned &, unsigned &, + int, Ext, unsigned, unsigned, unsigned); }; @@ -126,4 +134,25 @@ } +void ChainableMockObject_3_test::test_outbound() +{ + MyChainableMockObject_3ex mcm(MOCKPP_PCHAR("chainable-object")); + + MOCKPP_CHAINER_FOR_EXT(MyChainableMockObject_3ex, outbound, Ext) chain(&mcm); + + chain.stubs(mockpp::once()) + .with(mockpp::outBound( (unsigned int) 1123), + mockpp::outBound( (unsigned int) 2123), + mockpp::outBound( (unsigned int) 3123)); + + unsigned val1 = 0; + unsigned val2 = 0; + unsigned val3 = 0; + mcm.outbound(val1,val2, val3); + CPPUNIT_ASSERT_EQUAL((unsigned)1123, val1); + CPPUNIT_ASSERT_EQUAL((unsigned)2123, val2); + CPPUNIT_ASSERT_EQUAL((unsigned)3123, val3); +} + + #endif // HAVE_CPPUNIT Index: ChainableMockObject_4_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_4_void_test.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- ChainableMockObject_4_void_test.cpp 3 Apr 2005 18:32:54 -0000 1.8 +++ ChainableMockObject_4_void_test.cpp 25 Jul 2005 19:02:14 -0000 1.9 @@ -45,6 +45,8 @@ #include <mockpp/chaining/ChainingMockObjectSupport.h> #include <mockpp/chaining/Invocation.h> +#include <mockpp/constraint/OutBound.h> + class ChainableMockObject_4_void_test : public CppUnit::TestFixture { @@ -52,12 +54,14 @@ CPPUNIT_TEST_SUITE( ChainableMockObject_4_void_test ); + CPPUNIT_TEST(test_outbound); CPPUNIT_TEST( test_parameter_4 ); CPPUNIT_TEST_SUITE_END(); public: + void test_outbound(); void test_parameter_4(); }; @@ -67,10 +71,10 @@ typedef mockpp::Invocation4<unsigned, unsigned, unsigned, unsigned> mockpp_Invocation4_unsigned_unsigned_unsigned_unsigned; - -MOCKPP_PTI_IMPLEMENT(mockpp_Invocation4_unsigned_unsigned_unsigned_unsigned) - - + +MOCKPP_PTI_IMPLEMENT(mockpp_Invocation4_unsigned_unsigned_unsigned_unsigned) + + class MyChainableMockObject_4_void : public mockpp::ChainableMockObject { public: @@ -91,10 +95,14 @@ MyChainableMockObject_4_void_ex(const mockpp::String &name) : mockpp::ChainableMockObject(name, 0) , MOCKPP_CONSTRUCT_MEMBERS_FOR_VOID_CHAINABLE_EXT4(chainable4, Ext) + , MOCKPP_CONSTRUCT_MEMBERS_FOR_VOID_CHAINABLE_EXT4(outbound, Ext) {} MOCKPP_VOID_CHAINABLE_EXT4(MyChainableMockObject_4_void_ex, chainable4, const std::string &, const std::string &, const std::string &, const std::string &, Ext, std::string, std::string, std::string, std::string); + + MOCKPP_VOID_CHAINABLE_EXT4(MyChainableMockObject_4_void_ex, outbound, unsigned &, unsigned &, unsigned &, unsigned &, + Ext, unsigned, unsigned, unsigned, unsigned); }; @@ -152,4 +160,28 @@ } +void ChainableMockObject_4_void_test::test_outbound() +{ + MyChainableMockObject_4_void_ex mcm(MOCKPP_PCHAR("chainable-object")); + + MOCKPP_CHAINER_FOR_EXT(MyChainableMockObject_4_void_ex, outbound, Ext) chain(&mcm); + + chain.stubs(mockpp::once()) + .with(mockpp::outBound( (unsigned int) 1123), + mockpp::outBound( (unsigned int) 2123), + mockpp::outBound( (unsigned int) 3123), + mockpp::outBound( (unsigned int) 4123)); + + unsigned val1 = 0; + unsigned val2 = 0; + unsigned val3 = 0; + unsigned val4 = 0; + mcm.outbound(val1,val2, val3, val4); + CPPUNIT_ASSERT_EQUAL((unsigned)1123, val1); + CPPUNIT_ASSERT_EQUAL((unsigned)2123, val2); + CPPUNIT_ASSERT_EQUAL((unsigned)3123, val3); + CPPUNIT_ASSERT_EQUAL((unsigned)4123, val4); +} + + #endif // HAVE_CPPUNIT Index: ChainableMockObject_5_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_5_test.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- ChainableMockObject_5_test.cpp 2 Apr 2005 20:45:32 -0000 1.8 +++ ChainableMockObject_5_test.cpp 25 Jul 2005 19:02:14 -0000 1.9 @@ -46,6 +46,8 @@ #include <mockpp/chaining/ChainingMockObjectSupport.h> #include <mockpp/chaining/Invocation.h> +#include <mockpp/constraint/OutBound.h> + class ChainableMockObject_5_test : public CppUnit::TestFixture { @@ -53,6 +55,7 @@ CPPUNIT_TEST_SUITE( ChainableMockObject_5_test ); + CPPUNIT_TEST(test_outbound); CPPUNIT_TEST(test_chainer); CPPUNIT_TEST(test_chainer_ext); CPPUNIT_TEST( test_parameter_5 ); @@ -61,6 +64,7 @@ public: + void test_outbound(); void test_parameter_5(); void test_chainer_ext(); void test_chainer(); @@ -197,6 +201,8 @@ , MOCKPP_CONSTRUCT_MEMBERS_FOR_CHAINABLE_EXT2(const_chainable2_p, Ext) , MOCKPP_CONSTRUCT_MEMBERS_FOR_CHAINABLE_EXT1(const_chainable1_p, Ext) , MOCKPP_CONSTRUCT_MEMBERS_FOR_CHAINABLE_EXT0(const_chainable0_p, Ext) + + , MOCKPP_CONSTRUCT_MEMBERS_FOR_CHAINABLE_EXT5(outbound, Ext) {} virtual ~MyChainableMockObject_5ex() @@ -263,6 +269,9 @@ MOCKPP_CONST_CHAINABLE_EXT0(MyChainableMockObject_5ex, int, const_chainable0_p, int, Ext); + + MOCKPP_CHAINABLE_EXT5(MyChainableMockObject_5ex, int, outbound, unsigned &, unsigned &, unsigned &, unsigned &, unsigned &, + int, Ext, unsigned, unsigned, unsigned, unsigned, unsigned ); }; @@ -345,4 +354,31 @@ } +void ChainableMockObject_5_test::test_outbound() +{ + MyChainableMockObject_5ex mcm(MOCKPP_PCHAR("chainable-object")); + + MOCKPP_CHAINER_FOR_EXT(MyChainableMockObject_5ex, outbound, Ext) chain(&mcm); + + chain.stubs(mockpp::once()) + .with(mockpp::outBound( (unsigned int) 1123), + mockpp::outBound( (unsigned int) 2123), + mockpp::outBound( (unsigned int) 3123), + mockpp::outBound( (unsigned int) 4123), + mockpp::outBound( (unsigned int) 5123)); + + unsigned val1 = 0; + unsigned val2 = 0; + unsigned val3 = 0; + unsigned val4 = 0; + unsigned val5 = 0; + mcm.outbound(val1,val2, val3, val4, val5); + CPPUNIT_ASSERT_EQUAL((unsigned)1123, val1); + CPPUNIT_ASSERT_EQUAL((unsigned)2123, val2); + CPPUNIT_ASSERT_EQUAL((unsigned)3123, val3); + CPPUNIT_ASSERT_EQUAL((unsigned)4123, val4); + CPPUNIT_ASSERT_EQUAL((unsigned)5123, val5); +} + + #endif // HAVE_CPPUNIT Index: ChainableMockObject_1_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_1_test.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- ChainableMockObject_1_test.cpp 2 Apr 2005 20:45:32 -0000 1.6 +++ ChainableMockObject_1_test.cpp 25 Jul 2005 19:02:14 -0000 1.7 @@ -42,6 +42,8 @@ #include <mockpp/chaining/ChainingMockObjectSupport.h> #include <mockpp/chaining/Invocation.h> +#include <mockpp/constraint/OutBound.h> + #include <cppunit/extensions/HelperMacros.h> @@ -51,12 +53,14 @@ CPPUNIT_TEST_SUITE( ChainableMockObject_1_test ); + CPPUNIT_TEST(test_outbound); CPPUNIT_TEST( test_parameter_1 ); CPPUNIT_TEST_SUITE_END(); public: + void test_outbound(); void test_parameter_1(); }; @@ -73,6 +77,7 @@ {} MOCKPP_CHAINABLE1(MyChainableMockObject_1, int, chainable, unsigned); + }; @@ -83,11 +88,15 @@ MyChainableMockObject_1ex(const mockpp::String &name) : mockpp::ChainableMockObject(name, 0) , MOCKPP_CONSTRUCT_MEMBERS_FOR_CHAINABLE_EXT1(chainable1, Ext) + , MOCKPP_CONSTRUCT_MEMBERS_FOR_CHAINABLE_EXT1(outbound, Ext) {} MOCKPP_CHAINABLE_EXT1(MyChainableMockObject_1ex, std::string, chainable1, const std::string &, std::string, Ext, std::string); + MOCKPP_CHAINABLE_EXT1(MyChainableMockObject_1ex, int, outbound, unsigned &, + int, Ext, unsigned ); + }; @@ -122,4 +131,24 @@ } +void ChainableMockObject_1_test::test_outbound() +{ + MyChainableMockObject_1ex mcm(MOCKPP_PCHAR("chainable-object")); + + MOCKPP_CHAINER_FOR_EXT(MyChainableMockObject_1ex, 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: VisitableMockObject_2_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_2_void_test.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- VisitableMockObject_2_void_test.cpp 27 Feb 2005 18:04:29 -0000 1.16 +++ VisitableMockObject_2_void_test.cpp 25 Jul 2005 19:02:15 -0000 1.17 @@ -39,6 +39,7 @@ #include <mockpp/constraint/IsEqual.h> #include <mockpp/constraint/IsNot.h> +#include <mockpp/constraint/OutBound.h> #include <mockpp/chaining/ChainingMockObjectSupport.h> @@ -53,6 +54,7 @@ CPPUNIT_TEST_SUITE( VisitableMockObject_2_void_test ); + CPPUNIT_TEST(test_outbound); CPPUNIT_TEST(test_controller); CPPUNIT_TEST(test_parameter); CPPUNIT_TEST(test_parameter_ex); @@ -73,6 +75,7 @@ public: + void test_outbound(); void test_controller(); void test_thrower(); void test_clear(); @@ -124,9 +127,13 @@ : mockpp::VisitableMockObject(name, 0), MOCKPP_CONSTRUCT_MEMBERS_FOR_VOID_VISITABLE_EXT2(visitable2, Ext), MOCKPP_CONSTRUCT_MEMBERS_FOR_VOID_VISITABLE_EXT1(visitable1, Ext), - MOCKPP_CONSTRUCT_MEMBERS_FOR_VOID_VISITABLE_EXT0(visitable0, Ext) + MOCKPP_CONSTRUCT_MEMBERS_FOR_VOID_VISITABLE_EXT0(visitable0, Ext), + MOCKPP_CONSTRUCT_MEMBERS_FOR_VOID_VISITABLE_EXT2(outbound, Ext) {} + MOCKPP_VOID_VISITABLE_EXT2(MyVisitableMockObject_2_void_ex, outbound, unsigned &, unsigned &, + Ext, unsigned, unsigned); + MOCKPP_VOID_VISITABLE_EXT2(MyVisitableMockObject_2_void_ex, visitable2, const std::string &, const std::string &, Ext, std::string, std::string); @@ -394,4 +401,21 @@ } +void VisitableMockObject_2_void_test::test_outbound() +{ + MyVisitableMockObject_2_void_ex mvo(MOCKPP_PCHAR("mvo")); + MOCKPP_CONTROLLER_FOR_EXT(MyVisitableMockObject_2_void_ex, outbound, Ext) ctr1 (&mvo); + + mvo.outbound(mockpp::outBound<unsigned>(1123), + mockpp::outBound<unsigned>(2123)); + mvo.activate(); + + unsigned val1 = 0; + unsigned val2 = 0; + mvo.outbound(val1,val2); + CPPUNIT_ASSERT_EQUAL((unsigned)1123, val1); + CPPUNIT_ASSERT_EQUAL((unsigned)2123, val2); +} + + #endif // HAVE_CPPUNIT Index: ChainableMockObject_1_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_1_void_test.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- ChainableMockObject_1_void_test.cpp 24 Jul 2005 16:11:14 -0000 1.11 +++ ChainableMockObject_1_void_test.cpp 25 Jul 2005 19:02:14 -0000 1.12 @@ -153,7 +153,6 @@ mcm.verify(); } -#include <iostream> void ChainableMockObject_1_void_test::test_outbound() { @@ -172,7 +171,6 @@ CPPUNIT_ASSERT_EQUAL((unsigned)123, val); mcm.outbound(val); CPPUNIT_ASSERT_EQUAL((unsigned)456, val); - } Index: ChainableMockObject_2_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_2_test.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- ChainableMockObject_2_test.cpp 2 Apr 2005 20:45:32 -0000 1.6 +++ ChainableMockObject_2_test.cpp 25 Jul 2005 19:02:14 -0000 1.7 @@ -42,6 +42,8 @@ #include <mockpp/chaining/ChainingMockObjectSupport.h> #include <mockpp/chaining/Invocation.h> +#include <mockpp/constraint/OutBound.h> + #include <cppunit/extensions/HelperMacros.h> class ChainableMockObject_2_test : public CppUnit::TestFixture @@ -50,13 +52,15 @@ CPPUNIT_TEST_SUITE( ChainableMockObject_2_test ); + CPPUNIT_TEST(test_outbound); CPPUNIT_TEST( test_parameter_2 ); CPPUNIT_TEST_SUITE_END(); public: - void test_parameter_2(); + void test_outbound(); + void test_parameter_2(); }; @@ -83,10 +87,14 @@ MyChainableMockObject_2ex(const mockpp::String &name) : mockpp::ChainableMockObject(name, 0) , MOCKPP_CONSTRUCT_MEMBERS_FOR_CHAINABLE_EXT2(chainable2, Ext) + , MOCKPP_CONSTRUCT_MEMBERS_FOR_CHAINABLE_EXT2(outbound, Ext) {} MOCKPP_CHAINABLE_EXT2(MyChainableMockObject_2ex, std::string, chainable2, const std::string &, const std::string &, std::string, Ext, std::string, std::string); + + MOCKPP_CHAINABLE_EXT2(MyChainableMockObject_2ex, int, outbound, unsigned &, unsigned &, + int, Ext, unsigned, unsigned); }; @@ -123,4 +131,22 @@ } +void ChainableMockObject_2_test::test_outbound() +{ + MyChainableMockObject_2ex mcm(MOCKPP_PCHAR("chainable-object")); + + MOCKPP_CHAINER_FOR_EXT(MyChainableMockObject_2ex, outbound, Ext) chain(&mcm); + + chain.stubs(mockpp::once()) + .with(mockpp::outBound( (unsigned int) 1123), + mockpp::outBound( (unsigned int) 2123)); + + unsigned val1 = 0; + unsigned val2 = 0; + mcm.outbound(val1,val2); + CPPUNIT_ASSERT_EQUAL((unsigned)1123, val1); + CPPUNIT_ASSERT_EQUAL((unsigned)2123, val2); +} + + #endif // HAVE_CPPUNIT Index: ChainableMockObject_3_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_3_void_test.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- ChainableMockObject_3_void_test.cpp 3 Apr 2005 18:32:54 -0000 1.8 +++ ChainableMockObject_3_void_test.cpp 25 Jul 2005 19:02:14 -0000 1.9 @@ -45,6 +45,8 @@ #include <mockpp/chaining/ChainingMockObjectSupport.h> #include <mockpp/chaining/Invocation.h> +#include <mockpp/constraint/OutBound.h> + class ChainableMockObject_3_void_test : public CppUnit::TestFixture { @@ -52,12 +54,14 @@ CPPUNIT_TEST_SUITE( ChainableMockObject_3_void_test ); + CPPUNIT_TEST(test_outbound); CPPUNIT_TEST( test_parameter_3 ); CPPUNIT_TEST_SUITE_END(); public: + void test_outbound(); void test_parameter_3(); }; @@ -66,9 +70,9 @@ typedef mockpp::Invocation3<unsigned, unsigned, unsigned> mockpp_Invocation3_unsigned_unsigned_unsigned; - -MOCKPP_PTI_IMPLEMENT(mockpp_Invocation3_unsigned_unsigned_unsigned) - + +MOCKPP_PTI_IMPLEMENT(mockpp_Invocation3_unsigned_unsigned_unsigned) + class MyChainableMockObject_3_void : public mockpp::ChainableMockObject { @@ -90,10 +94,14 @@ MyChainableMockObject_3_void_ex(const mockpp::String &name) : mockpp::ChainableMockObject(name, 0) , MOCKPP_CONSTRUCT_MEMBERS_FOR_VOID_CHAINABLE_EXT3(chainable3, Ext) + , MOCKPP_CONSTRUCT_MEMBERS_FOR_VOID_CHAINABLE_EXT3(outbound, Ext) {} MOCKPP_VOID_CHAINABLE_EXT3(MyChainableMockObject_3_void_ex, chainable3, const std::string &, const std::string &, const std::string &, Ext, std::string, std::string, std::string); + + MOCKPP_VOID_CHAINABLE_EXT3(MyChainableMockObject_3_void_ex, outbound, unsigned &, unsigned &, unsigned &, + Ext, unsigned, unsigned, unsigned ); }; @@ -149,4 +157,27 @@ } + + +void ChainableMockObject_3_void_test::test_outbound() +{ + MyChainableMockObject_3_void_ex mcm(MOCKPP_PCHAR("chainable-object")); + + MOCKPP_CHAINER_FOR_EXT(MyChainableMockObject_3_void_ex, outbound, Ext) chain(&mcm); + + chain.stubs(mockpp::once()) + .with(mockpp::outBound( (unsigned int) 1123), + mockpp::outBound( (unsigned int) 2123), + mockpp::outBound( (unsigned int) 3123)); + + unsigned val1 = 0; + unsigned val2 = 0; + unsigned val3 = 0; + mcm.outbound(val1,val2, val3); + CPPUNIT_ASSERT_EQUAL((unsigned)1123, val1); + CPPUNIT_ASSERT_EQUAL((unsigned)2123, val2); + CPPUNIT_ASSERT_EQUAL((unsigned)3123, val3); +} + + #endif // HAVE_CPPUNIT Index: VisitableMockObject_4_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_4_void_test.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- VisitableMockObject_4_void_test.cpp 27 Feb 2005 18:04:29 -0000 1.15 +++ VisitableMockObject_4_void_test.cpp 25 Jul 2005 19:02:15 -0000 1.16 @@ -44,6 +44,7 @@ #include <mockpp/constraint/IsEqual.h> #include <mockpp/constraint/IsNot.h> +#include <mockpp/constraint/OutBound.h> #include <cppunit/extensions/HelperMacros.h> @@ -53,6 +54,7 @@ CPPUNIT_TEST_SUITE( VisitableMockObject_4_void_test ); + CPPUNIT_TEST(test_outbound); CPPUNIT_TEST(test_controller); CPPUNIT_TEST(test_parameter); CPPUNIT_TEST(test_parameter_ex); @@ -73,6 +75,7 @@ public: + void test_outbound(); void test_controller(); void test_thrower(); void test_clear(); @@ -128,9 +131,13 @@ MOCKPP_CONSTRUCT_MEMBERS_FOR_VOID_VISITABLE_EXT3(visitable3, Ext), MOCKPP_CONSTRUCT_MEMBERS_FOR_VOID_VISITABLE_EXT2(visitable2, Ext), MOCKPP_CONSTRUCT_MEMBERS_FOR_VOID_VISITABLE_EXT1(visitable1, Ext), - MOCKPP_CONSTRUCT_MEMBERS_FOR_VOID_VISITABLE_EXT0(visitable0, Ext) + MOCKPP_CONSTRUCT_MEMBERS_FOR_VOID_VISITABLE_EXT0(visitable0, Ext), + MOCKPP_CONSTRUCT_MEMBERS_FOR_VOID_VISITABLE_EXT4(outbound, Ext) {} + MOCKPP_VOID_VISITABLE_EXT4(MyVisitableMockObject_4_void_ex, outbound, unsigned &, unsigned &, unsigned &, unsigned &, + Ext, unsigned, unsigned, unsigned, unsigned); + MOCKPP_VOID_VISITABLE_EXT4(MyVisitableMockObject_4_void_ex, visitable4, const std::string &, const std::string &, const std::string &, const std::string &, Ext, std::string, std::string, std::string, std::string); @@ -422,4 +429,27 @@ } +void VisitableMockObject_4_void_test::test_outbound() +{ + MyVisitableMockObject_4_void_ex mvo(MOCKPP_PCHAR("mvo")); + MOCKPP_CONTROLLER_FOR_EXT(MyVisitableMockObject_4_void_ex, outbound, Ext) ctr1 (&mvo); + + mvo.outbound(mockpp::outBound<unsigned>(1123), + mockpp::outBound<unsigned>(2123), + mockpp::outBound<unsigned>(3123), + mockpp::outBound<unsigned>(4123)); + mvo.activate(); + + unsigned val1 = 0; + unsigned val2 = 0; + unsigned val3 = 0; + unsigned val4 = 0; + mvo.outbound(val1,val2, val3, val4); + CPPUNIT_ASSERT_EQUAL((unsigned)1123, val1); + CPPUNIT_ASSERT_EQUAL((unsigned)2123, val2); + CPPUNIT_ASSERT_EQUAL((unsigned)3123, val3); + CPPUNIT_ASSERT_EQUAL((unsigned)4123, val4); +} + + #endif // HAVE_CPPUNIT Index: VisitableMockObject_5_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_5_void_test.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- VisitableMockObject_5_void_test.cpp 24 Mar 2005 21:43:07 -0000 1.20 +++ VisitableMockObject_5_void_test.cpp 25 Jul 2005 19:02:15 -0000 1.21 @@ -44,6 +44,7 @@ #include <mockpp/constraint/IsEqual.h> #include <mockpp/constraint/IsNot.h> +#include <mockpp/constraint/OutBound.h> #include "classes_ABCDE.h" @@ -55,6 +56,7 @@ CPPUNIT_TEST_SUITE( VisitableMockObject_5_void_test ); + CPPUNIT_TEST(test_outbound); CPPUNIT_TEST(test_controller); CPPUNIT_TEST(test_parameter); CPPUNIT_TEST(test_parameter_ex); @@ -76,6 +78,7 @@ public: + void test_outbound(); void test_controller(); void test_thrower(); void test_clear(); @@ -322,8 +325,13 @@ , MOCKPP_CONSTRUCT_MEMBERS_FOR_VOID_VISITABLE_EXT2(abc_const_visitable2, Ext) , MOCKPP_CONSTRUCT_MEMBERS_FOR_VOID_VISITABLE_EXT1(abc_const_visitable1, Ext) , MOCKPP_CONSTRUCT_MEMBERS_FOR_VOID_VISITABLE_EXT0(abc_const_visitable0, Ext) + + , MOCKPP_CONSTRUCT_MEMBERS_FOR_VOID_VISITABLE_EXT5(outbound, Ext) {} + MOCKPP_VOID_VISITABLE_EXT5(MyVisitableMockObject_5_void_ex, outbound, unsigned &, unsigned &, unsigned &, unsigned &, unsigned &, + Ext, unsigned, unsigned, unsigned, unsigned, unsigned ); + MOCKPP_VOID_VISITABLE_EXT5(MyVisitableMockObject_5_void_ex, visitable5, const std::string &, const std::string &, const std::string &, const std::string &, const std::string &, Ext1, std::string, std::string, std::string, std::string, std::string); @@ -858,4 +866,31 @@ mvo.verify(); } + +void VisitableMockObject_5_void_test::test_outbound() +{ + MyVisitableMockObject_5_void_ex mvo(MOCKPP_PCHAR("mvo")); + MOCKPP_CONTROLLER_FOR_EXT(MyVisitableMockObject_5_void_ex, outbound, Ext) ctr1 (&mvo); + + mvo.outbound(mockpp::outBound<unsigned>(1123), + mockpp::outBound<unsigned>(2123), + mockpp::outBound<unsigned>(3123), + mockpp::outBound<unsigned>(4123), + mockpp::outBound<unsigned>(5123)); + mvo.activate(); + + unsigned val1 = 0; + unsigned val2 = 0; + unsigned val3 = 0; + unsigned val4 = 0; + unsigned val5 = 0; + mvo.outbound(val1,val2, val3, val4,val5); + CPPUNIT_ASSERT_EQUAL((unsigned)1123, val1); + CPPUNIT_ASSERT_EQUAL((unsigned)2123, val2); + CPPUNIT_ASSERT_EQUAL((unsigned)3123, val3); + CPPUNIT_ASSERT_EQUAL((unsigned)4123, val4); + CPPUNIT_ASSERT_EQUAL((unsigned)5123, val5); +} + + #endif // HAVE_CPPUNIT Index: VisitableMockObject_3_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_3_void_test.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- VisitableMockObject_3_void_test.cpp 27 Feb 2005 18:04:29 -0000 1.15 +++ VisitableMockObject_3_void_test.cpp 25 Jul 2005 19:02:15 -0000 1.16 @@ -39,6 +39,7 @@ #include <mockpp/constraint/IsEqual.h> #include <mockpp/constraint/IsNot.h> +#include <mockpp/constraint/OutBound.h> #include <mockpp/chaining/ChainingMockObjectSupport.h> @@ -53,6 +54,7 @@ CPPUNIT_TEST_SUITE( VisitableMockObject_3_void_test ); + CPPUNIT_TEST(test_outbound); CPPUNIT_TEST(test_controller); CPPUNIT_TEST(test_parameter); CPPUNIT_TEST(test_parameter_ex); @@ -73,6 +75,7 @@ public: + void test_outbound(); void test_controller(); void test_thrower(); void test_clear(); @@ -126,9 +129,13 @@ MOCKPP_CONSTRUCT_MEMBERS_FOR_VOID_VISITABLE_EXT3(visitable3, Ext), MOCKPP_CONSTRUCT_MEMBERS_FOR_VOID_VISITABLE_EXT2(visitable2, Ext), MOCKPP_CONSTRUCT_MEMBERS_FOR_VOID_VISITABLE_EXT1(visitable1, Ext), - MOCKPP_CONSTRUCT_MEMBERS_FOR_VOID_VISITABLE_EXT0(visitable0, Ext) + MOCKPP_CONSTRUCT_MEMBERS_FOR_VOID_VISITABLE_EXT0(visitable0, Ext), + MOCKPP_CONSTRUCT_MEMBERS_FOR_VOID_VISITABLE_EXT3(outbound, Ext) {} + MOCKPP_VOID_VISITABLE_EXT3(MyVisitableMockObject_3_void_ex, outbound, unsigned &, unsigned &, unsigned &, + Ext, unsigned, unsigned, unsigned); + MOCKPP_VOID_VISITABLE_EXT3(MyVisitableMockObject_3_void_ex, visitable3, const std::string &, const std::string &, const std::string &, Ext, std::string, std::string, std::string); @@ -408,4 +415,24 @@ } +void VisitableMockObject_3_void_test::test_outbound() +{ + MyVisitableMockObject_3_void_ex mvo(MOCKPP_PCHAR("mvo")); + MOCKPP_CONTROLLER_FOR_EXT(MyVisitableMockObject_3_void_ex, outbound, Ext) ctr1 (&mvo); + + mvo.outbound(mockpp::outBound<unsigned>(1123), + mockpp::outBound<unsigned>(2123), + mockpp::outBound<unsigned>(3123)); + mvo.activate(); + + unsigned val1 = 0; + unsigned val2 = 0; + unsigned val3 = 0; + mvo.outbound(val1,val2, val3); + CPPUNIT_ASSERT_EQUAL((unsigned)1123, val1); + CPPUNIT_ASSERT_EQUAL((unsigned)2123, val2); + CPPUNIT_ASSERT_EQUAL((unsigned)3123, val3); +} + + #endif // HAVE_CPPUNIT |
|
From: Ewald A. <ewa...@us...> - 2005-07-25 19:02:22
|
Update of /cvsroot/mockpp/mockpp/mockpp/docs/en In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4614/mockpp/docs/en Modified Files: dev_helper.docbook Log Message: broader test coverage Index: dev_helper.docbook =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/docs/en/dev_helper.docbook,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- dev_helper.docbook 24 Jul 2005 18:08:01 -0000 1.9 +++ dev_helper.docbook 25 Jul 2005 19:02:14 -0000 1.10 @@ -194,7 +194,7 @@ </callout> <callout arearefs="std-shift-op-co" id="std-shift-op" > - <para>Output the string by using an existing standard streaming operator.</para> + <para>Output the string using an existing standard streaming operator.</para> </callout> </calloutlist> |
|
From: Ewald A. <ewa...@us...> - 2005-07-25 19:02:22
|
Update of /cvsroot/mockpp/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4614 Modified Files: TODO Log Message: broader test coverage Index: TODO =================================================================== RCS file: /cvsroot/mockpp/mockpp/TODO,v retrieving revision 1.48 retrieving revision 1.49 diff -u -d -r1.48 -r1.49 --- TODO 24 Jul 2005 16:11:12 -0000 1.48 +++ TODO 25 Jul 2005 19:02:13 -0000 1.49 @@ -1,10 +1,6 @@ DOC: ---- - ostreamed - - OutBound all Chain/Visit Tests - Problem Exception-Transformation?? Tests |
|
From: Ewald A. <ewa...@us...> - 2005-07-24 18:58:50
|
Update of /cvsroot/mockpp/mockpp/mockpp/compat In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21565/mockpp/compat Modified Files: Formatter.h Log Message: move to mockpp namespace Index: Formatter.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/compat/Formatter.h,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- Formatter.h 24 Jul 2005 17:48:33 -0000 1.31 +++ Formatter.h 24 Jul 2005 18:58:38 -0000 1.32 @@ -312,6 +312,8 @@ #include <sstream> +namespace mockpp { + template <class T> mockpp::String ostreamed(const T& t) { @@ -324,6 +326,7 @@ #endif } +} /** Outputter which reuses an existing operator<<(std::basic_ostream<char>&, T). * @param T data type for output @@ -331,13 +334,15 @@ #define MOCKPP_OSTREAMABLE(T) \ mockpp::String & MOCKPP_EXPORT operator << (mockpp::String &formatter, const T &o) \ { \ - formatter << ostreamed(o); \ + formatter << mockpp::ostreamed(o); \ return formatter; \ } #ifdef MOCKPP_UNICODE +namespace mockpp { + template <class T> mockpp::String owstreamed(const T& t) { @@ -346,6 +351,7 @@ return oss.str(); } +} /** Outputter which reuses an existing operator<<(std::basic_ostream<wchar_t>&, T). * @param T data type for output @@ -353,7 +359,7 @@ #define MOCKPP_OWSTREAMABLE(T) \ mockpp::String & MOCKPP_EXPORT operator << (mockpp::String &formatter, const T &o) \ { \ - formatter << owstreamed(o); \ + formatter << mockpp::owstreamed(o); \ return formatter; \ } |
