mockpp-commits Mailing List for Mock Objects for C++ (Page 40)
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-04-09 20:15:29
|
Update of /cvsroot/mockpp/mockpp/msvc71/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22539/msvc71/mockpp Modified Files: mockpp.sln Log Message: updated project files Index: mockpp.sln =================================================================== RCS file: /cvsroot/mockpp/mockpp/msvc71/mockpp/mockpp.sln,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- mockpp.sln 22 Mar 2005 20:44:18 -0000 1.1 +++ mockpp.sln 9 Apr 2005 20:15:19 -0000 1.2 @@ -38,6 +38,10 @@ {4B2B3833-C35A-4F2F-BFAF-B686D3827531} = {4B2B3833-C35A-4F2F-BFAF-B686D3827531} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "poormock_se", "examples\tutorial\poormock_se.vcproj", "{BD779AA5-9F07-466E-AC76-7C27BD3D4E86}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection +EndProject Global GlobalSection(SolutionConfiguration) = preSolution Debug = Debug @@ -76,6 +80,10 @@ {ADC8008C-7D8F-44BC-9498-E1097B4DCCA1}.Debug.Build.0 = Debug|Win32 {ADC8008C-7D8F-44BC-9498-E1097B4DCCA1}.Release.ActiveCfg = Release|Win32 {ADC8008C-7D8F-44BC-9498-E1097B4DCCA1}.Release.Build.0 = Release|Win32 + {BD779AA5-9F07-466E-AC76-7C27BD3D4E86}.Debug.ActiveCfg = Debug|Win32 + {BD779AA5-9F07-466E-AC76-7C27BD3D4E86}.Debug.Build.0 = Debug|Win32 + {BD779AA5-9F07-466E-AC76-7C27BD3D4E86}.Release.ActiveCfg = Release|Win32 + {BD779AA5-9F07-466E-AC76-7C27BD3D4E86}.Release.Build.0 = Release|Win32 EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution EndGlobalSection |
|
From: Ewald A. <ewa...@us...> - 2005-04-09 20:15:28
|
Update of /cvsroot/mockpp/mockpp/msvc71/mockpp/examples/tutorial In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22539/msvc71/mockpp/examples/tutorial Modified Files: Makefile.am basicmock.vcproj chainmock.vcproj poormock.vcproj visitmock.vcproj Added Files: poormock_se.vcproj Log Message: updated project files Index: basicmock.vcproj =================================================================== RCS file: /cvsroot/mockpp/mockpp/msvc71/mockpp/examples/tutorial/basicmock.vcproj,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- basicmock.vcproj 25 Mar 2005 10:22:55 -0000 1.3 +++ basicmock.vcproj 9 Apr 2005 20:15:19 -0000 1.4 @@ -86,6 +86,7 @@ StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" + RuntimeTypeInfo="TRUE" PrecompiledHeaderFile="./basicmock.pch" AssemblerListingLocation="C:\tmp\compile\mockpp\examples\tutorial\Release/" ObjectFile="C:\tmp\compile\mockpp\examples\tutorial\Release/" Index: visitmock.vcproj =================================================================== RCS file: /cvsroot/mockpp/mockpp/msvc71/mockpp/examples/tutorial/visitmock.vcproj,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- visitmock.vcproj 25 Mar 2005 10:22:55 -0000 1.3 +++ visitmock.vcproj 9 Apr 2005 20:15:19 -0000 1.4 @@ -86,6 +86,7 @@ StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" + RuntimeTypeInfo="TRUE" PrecompiledHeaderFile="./visitmock.pch" AssemblerListingLocation="C:\tmp\compile\mockpp\examples\tutorial\Release/" ObjectFile="C:\tmp\compile\mockpp\examples\tutorial\Release/" @@ -96,7 +97,7 @@ <Tool Name="VCLinkerTool" AdditionalDependencies="mockpp.lib" - OutputFile="./visitmock.exe" + OutputFile="C:\tmp\compile\mockpp\examples\tutorial\Release/visitmock.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="../../../lib" --- NEW FILE: poormock_se.vcproj --- <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" Version="7.10" Name="poormock_se" ProjectGUID="{BD779AA5-9F07-466E-AC76-7C27BD3D4E86}" SccProjectName="" SccLocalPath=""> <Platforms> <Platform Name="Win32"/> </Platforms> <Configurations> <Configuration Name="Debug|Win32" OutputDirectory="C:\tmp\compile\mockpp\examples\tutorial\Debug" IntermediateDirectory="C:\tmp\compile\mockpp\examples\tutorial\Debug" ConfigurationType="1" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" CharacterSet="2"> <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="../../../.." PreprocessorDefinitions="WIN32,_CONSOLE" BasicRuntimeChecks="3" RuntimeLibrary="3" RuntimeTypeInfo="TRUE" PrecompiledHeaderFile="C:\tmp\compile\mockpp\examples\tutorial\Debug/poormock_se.pch" AssemblerListingLocation="C:\tmp\compile\mockpp\examples\tutorial\Debug/" ObjectFile="C:\tmp\compile\mockpp\examples\tutorial\Debug/" ProgramDataBaseFileName="C:\tmp\compile\mockpp\examples\tutorial\Debug/" WarningLevel="4" SuppressStartupBanner="TRUE" DebugInformationFormat="4" CompileAs="0"/> <Tool Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" AdditionalDependencies="mockppd.lib" OutputFile="C:\tmp\compile\mockpp\examples\tutorial\Debug/poormock_se.exe" LinkIncremental="2" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="../../../lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="C:\tmp\compile\mockpp\examples\tutorial\Debug/poormock_se.pdb" SubSystem="1" TargetMachine="1"/> <Tool Name="VCMIDLTool" TypeLibraryName="C:\tmp\compile\mockpp\examples\tutorial\Debug/poormock_se.tlb" HeaderFileName=""/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPreLinkEventTool"/> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1041"/> <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool Name="VCXMLDataGeneratorTool"/> <Tool Name="VCWebDeploymentTool"/> <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> </Configuration> <Configuration Name="Release|Win32" OutputDirectory="C:\tmp\compile\mockpp\examples\tutorial\Release" IntermediateDirectory="C:\tmp\compile\mockpp\examples\tutorial\Release" ConfigurationType="1" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" CharacterSet="2"> <Tool Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../../.." PreprocessorDefinitions="NDEBUG,WIN32,_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" RuntimeTypeInfo="TRUE" PrecompiledHeaderFile="C:\tmp\compile\mockpp\examples\tutorial\Release/poormock_se.pch" AssemblerListingLocation="C:\tmp\compile\mockpp\examples\tutorial\Release/" ObjectFile="C:\tmp\compile\mockpp\examples\tutorial\Release/" ProgramDataBaseFileName="C:\tmp\compile\mockpp\examples\tutorial\Release/" WarningLevel="4" SuppressStartupBanner="TRUE" CompileAs="0"/> <Tool Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" AdditionalDependencies="mockpp.lib" OutputFile="C:\tmp\compile\mockpp\examples\tutorial\Release/poormock_se.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="../../../lib" ProgramDatabaseFile="C:\tmp\compile\mockpp\examples\tutorial\Release/poormock_se.pdb" SubSystem="1" TargetMachine="1"/> <Tool Name="VCMIDLTool" TypeLibraryName="C:\tmp\compile\mockpp\examples\tutorial\Release/poormock_se.tlb" HeaderFileName=""/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPreLinkEventTool"/> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1041"/> <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool Name="VCXMLDataGeneratorTool"/> <Tool Name="VCWebDeploymentTool"/> <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> </Configuration> </Configurations> <References> </References> <Files> <Filter Name="Source Files" Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"> <File RelativePath="..\..\..\..\mockpp\examples\tutorial\consumer.cpp"> </File> <File RelativePath="..\..\..\..\mockpp\examples\tutorial\poormock-se.cpp"> <FileConfiguration Name="Debug|Win32"> <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3"/> </FileConfiguration> <FileConfiguration Name="Release|Win32"> <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions=""/> </FileConfiguration> </File> </Filter> <Filter Name="Header Files" Filter="h;hpp;hxx;hm;inl"> <File RelativePath="..\..\..\..\mockpp\examples\tutorial\consumer.h"> </File> <File RelativePath="..\..\..\..\mockpp\examples\tutorial\interface.h"> </File> </Filter> </Files> <Globals> </Globals> </VisualStudioProject> Index: chainmock.vcproj =================================================================== RCS file: /cvsroot/mockpp/mockpp/msvc71/mockpp/examples/tutorial/chainmock.vcproj,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- chainmock.vcproj 25 Mar 2005 10:22:55 -0000 1.3 +++ chainmock.vcproj 9 Apr 2005 20:15:19 -0000 1.4 @@ -86,6 +86,7 @@ StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" + RuntimeTypeInfo="TRUE" PrecompiledHeaderFile="./chainmock.pch" AssemblerListingLocation="C:\tmp\compile\mockpp\examples\tutorial\Release/" ObjectFile="C:\tmp\compile\mockpp\examples\tutorial\Release/" Index: poormock.vcproj =================================================================== RCS file: /cvsroot/mockpp/mockpp/msvc71/mockpp/examples/tutorial/poormock.vcproj,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- poormock.vcproj 25 Mar 2005 10:22:55 -0000 1.3 +++ poormock.vcproj 9 Apr 2005 20:15:19 -0000 1.4 @@ -145,21 +145,6 @@ RelativePath="..\..\..\..\mockpp\examples\tutorial\consumer.cpp"> </File> <File - RelativePath="..\..\..\..\mockpp\examples\tutorial\poormock-se.cpp"> - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCCLCompilerTool"/> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCCLCompilerTool"/> - </FileConfiguration> - </File> - <File RelativePath="..\..\..\..\mockpp\examples\tutorial\poormock.cpp"> <FileConfiguration Name="Debug|Win32"> Index: Makefile.am =================================================================== RCS file: /cvsroot/mockpp/mockpp/msvc71/mockpp/examples/tutorial/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile.am 22 Mar 2005 20:44:33 -0000 1.1 +++ Makefile.am 9 Apr 2005 20:15:19 -0000 1.2 @@ -1,6 +1,6 @@ all: -EXTRA_DIST = basicmock.vcproj visitmock.vcproj chainmock.vcproj poormock.vcproj cppunit.vcproj +EXTRA_DIST = basicmock.vcproj visitmock.vcproj chainmock.vcproj poormock.vcproj poormock_se.vcproj cppunit.vcproj CLEAN_FILES = *.plg *.opt *.ncb *.dep *.~* *.~~* *~ *SD*.EA |
|
From: Ewald A. <ewa...@us...> - 2005-04-09 20:15:28
|
Update of /cvsroot/mockpp/mockpp/msvc71/mockpp/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22539/msvc71/mockpp/tests Modified Files: mock_test.vcproj Log Message: updated project files Index: mock_test.vcproj =================================================================== RCS file: /cvsroot/mockpp/mockpp/msvc71/mockpp/tests/mock_test.vcproj,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- mock_test.vcproj 3 Apr 2005 19:11:27 -0000 1.4 +++ mock_test.vcproj 9 Apr 2005 20:15:20 -0000 1.5 @@ -345,12 +345,9 @@ <File RelativePath="..\..\..\mockpp\tests\MockObject_test.cpp"> </File> - <File - RelativePath="..\..\..\mockpp\tests\mockpp_test.cpp"> - </File> - <File - RelativePath="..\..\..\mockpp\tests\mockpp_pti_test.cpp"> - </File> + <File + RelativePath="..\..\..\mockpp\tests\mockpp_test.cpp"> + </File> <File RelativePath="..\..\..\mockpp\tests\NoArgumentsMatcher_test.cpp"> </File> |
|
From: Ewald A. <ewa...@us...> - 2005-04-09 20:09:59
|
Update of /cvsroot/mockpp/mockpp/msvc6/mockpp/examples/tutorial In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19192/msvc6/mockpp/examples/tutorial Modified Files: basicmock.dsp chainmock.dsp poormock.dsp visitmock.dsp Added Files: poormock_se.dsp Log Message: updated project files Index: visitmock.dsp =================================================================== RCS file: /cvsroot/mockpp/mockpp/msvc6/mockpp/examples/tutorial/visitmock.dsp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- visitmock.dsp 25 Mar 2005 10:22:11 -0000 1.2 +++ visitmock.dsp 9 Apr 2005 20:09:35 -0000 1.3 @@ -26,7 +26,6 @@ # PROP Scc_ProjName "" # PROP Scc_LocalPath "" CPP=cl.exe -MTL=midl.exe RSC=rc.exe !IF "$(CFG)" == "visitmock - Win32 Debug" @@ -41,18 +40,21 @@ # PROP Output_Dir "C:\tmp\compile\mockpp\examples\tutorial\Debug" # PROP Intermediate_Dir "C:\tmp\compile\mockpp\examples\tutorial\Debug" # PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /I "../../../.." /ZI /W4 /Od /D "WIN32" /D "_CONSOLE" /D "_MBCS" /GR /Fp"C:\tmp\compile\mockpp\examples\tutorial\Debug/visitmock.pch" /Fo"C:\tmp\compile\mockpp\examples\tutorial\Debug/" /Fd"C:\tmp\compile\mockpp\examples\tutorial\Debug/" /GZ /c /GX -# ADD CPP /nologo /MDd /I "../../../.." /ZI /W4 /Od /D "WIN32" /D "_CONSOLE" /D "_MBCS" /GR /Fp"C:\tmp\compile\mockpp\examples\tutorial\Debug/visitmock.pch" /Fo"C:\tmp\compile\mockpp\examples\tutorial\Debug/" /Fd"C:\tmp\compile\mockpp\examples\tutorial\Debug/" /GZ /c /GX -# ADD BASE MTL /nologo /tlb"C:\tmp\compile\mockpp\examples\tutorial\Debug\visitmock.tlb" /win32 -# ADD MTL /nologo /tlb"C:\tmp\compile\mockpp\examples\tutorial\Debug\visitmock.tlb" /win32 -# ADD BASE RSC /l 1041 /d "NDEBUG" /d "_DEBUG" -# ADD RSC /l 1041 /d "NDEBUG" /d "_DEBUG" +MTL=midl.exe +# ADD BASE MTL /nologo /tlb"C:\tmp\compile\mockpp\examples\tutorial\Debug\visitmock.tlb" /win32 +# ADD MTL /nologo /tlb"C:\tmp\compile\mockpp\examples\tutorial\Debug\visitmock.tlb" /win32 +# ADD BASE CPP /nologo /MDd /W4 /GR /GX /ZI /Od /I "../../../.." /D "WIN32" /D "_CONSOLE" /D "_MBCS" /GZ /c +# ADD CPP /nologo /MDd /W4 /GR /GX /ZI /Od /I "../../../.." /D "WIN32" /D "_CONSOLE" /D "_MBCS" /GZ /c +# ADD BASE RSC /l 0x411 /d "NDEBUG" /d "_DEBUG" +# ADD RSC /l 0x411 /d "NDEBUG" /d "_DEBUG" BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib mockppd.lib /nologo /out:"C:\tmp\compile\mockpp\examples\tutorial\Debug\visitmock.exe" /incremental:yes /libpath:"../../../lib" /debug /pdb:"C:\tmp\compile\mockpp\examples\tutorial\Debug\visitmock.pdb" /pdbtype:sept /subsystem:console /machine:ix86 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib mockppd.lib /nologo /out:"C:\tmp\compile\mockpp\examples\tutorial\Debug\visitmock.exe" /incremental:yes /libpath:"../../../lib" /debug /pdb:"C:\tmp\compile\mockpp\examples\tutorial\Debug\visitmock.pdb" /pdbtype:sept /subsystem:console /machine:ix86 +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib mockppd.lib /nologo /subsystem:console /debug /machine:IX86 /pdbtype:sept /libpath:"../../../lib" +# SUBTRACT BASE LINK32 /pdb:none +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib mockppd.lib /nologo /subsystem:console /debug /machine:IX86 /pdbtype:sept /libpath:"../../../lib" +# SUBTRACT LINK32 /pdb:none !ELSEIF "$(CFG)" == "visitmock - Win32 Release" @@ -66,20 +68,23 @@ # PROP Output_Dir "C:\tmp\compile\mockpp\examples\tutorial\Release" # PROP Intermediate_Dir "C:\tmp\compile\mockpp\examples\tutorial\Release" # PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /I "../../../.." /W4 /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /GF /Gy /Fp"./visitmock.pch" /Fo"C:\tmp\compile\mockpp\examples\tutorial\Release/" /Fd"C:\tmp\compile\mockpp\examples\tutorial\Release/" /c /GX -# ADD CPP /nologo /MD /I "../../../.." /W4 /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /GF /Gy /Fp"./visitmock.pch" /Fo"C:\tmp\compile\mockpp\examples\tutorial\Release/" /Fd"C:\tmp\compile\mockpp\examples\tutorial\Release/" /c /GX -# ADD BASE MTL /nologo /tlb".\visitmock.tlb" /win32 -# ADD MTL /nologo /tlb".\visitmock.tlb" /win32 -# ADD BASE RSC /l 1036 -# ADD RSC /l 1036 +MTL=midl.exe +# ADD BASE MTL /nologo /tlb".\visitmock.tlb" /win32 +# ADD MTL /nologo /tlb".\visitmock.tlb" /win32 +# ADD BASE CPP /nologo /MD /W4 /GX /Gy /I "../../../.." /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /GF /c +# ADD CPP /nologo /MD /W4 /GR /GX /Gy /I "../../../.." /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /GF /c +# ADD BASE RSC /l 0x40c +# ADD RSC /l 0x40c BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib mockpp.lib /nologo /out:".\visitmock.exe" /incremental:no /libpath:"../../../lib" /pdb:".\visitmock.pdb" /pdbtype:sept /subsystem:windows -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib mockpp.lib /nologo /out:".\visitmock.exe" /incremental:no /libpath:"../../../lib" /pdb:".\visitmock.pdb" /pdbtype:sept /subsystem:windows +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib mockpp.lib /nologo /subsystem:windows /pdb:".\visitmock.pdb" /machine:IX86 /pdbtype:sept /libpath:"../../../lib" +# SUBTRACT BASE LINK32 /pdb:none +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib mockpp.lib /nologo /subsystem:windows /pdb:".\visitmock.pdb" /machine:IX86 /pdbtype:sept /libpath:"../../../lib" +# SUBTRACT LINK32 /pdb:none -!ENDIF +!ENDIF # Begin Target @@ -98,8 +103,11 @@ !IF "$(CFG)" == "visitmock - Win32 Debug" -# ADD CPP /nologo /Od /GZ /GX -!ENDIF +# ADD CPP /nologo /GX /Od /GZ + +!ELSEIF "$(CFG)" == "visitmock - Win32 Release" + +!ENDIF # End Source File # End Group @@ -117,4 +125,3 @@ # End Group # End Target # End Project - Index: chainmock.dsp =================================================================== RCS file: /cvsroot/mockpp/mockpp/msvc6/mockpp/examples/tutorial/chainmock.dsp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- chainmock.dsp 25 Mar 2005 10:22:11 -0000 1.2 +++ chainmock.dsp 9 Apr 2005 20:09:34 -0000 1.3 @@ -26,7 +26,6 @@ # PROP Scc_ProjName "" # PROP Scc_LocalPath "" CPP=cl.exe -MTL=midl.exe RSC=rc.exe !IF "$(CFG)" == "chainmock - Win32 Debug" @@ -41,18 +40,21 @@ # PROP Output_Dir "C:\tmp\compile\mockpp\examples\tutorial\Debug" # PROP Intermediate_Dir "C:\tmp\compile\mockpp\examples\tutorial\Debug" # PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /I "../../../.." /ZI /W4 /Od /D "WIN32" /D "_CONSOLE" /D "_MBCS" /GR /Fp"C:\tmp\compile\mockpp\examples\tutorial\Debug/chainmock.pch" /Fo"C:\tmp\compile\mockpp\examples\tutorial\Debug/" /Fd"C:\tmp\compile\mockpp\examples\tutorial\Debug/" /GZ /c /GX -# ADD CPP /nologo /MDd /I "../../../.." /ZI /W4 /Od /D "WIN32" /D "_CONSOLE" /D "_MBCS" /GR /Fp"C:\tmp\compile\mockpp\examples\tutorial\Debug/chainmock.pch" /Fo"C:\tmp\compile\mockpp\examples\tutorial\Debug/" /Fd"C:\tmp\compile\mockpp\examples\tutorial\Debug/" /GZ /c /GX -# ADD BASE MTL /nologo /tlb"C:\tmp\compile\mockpp\examples\tutorial\Debug\chainmock.tlb" /win32 -# ADD MTL /nologo /tlb"C:\tmp\compile\mockpp\examples\tutorial\Debug\chainmock.tlb" /win32 -# ADD BASE RSC /l 1041 /d "NDEBUG" /d "_DEBUG" -# ADD RSC /l 1041 /d "NDEBUG" /d "_DEBUG" +MTL=midl.exe +# ADD BASE MTL /nologo /tlb"C:\tmp\compile\mockpp\examples\tutorial\Debug\chainmock.tlb" /win32 +# ADD MTL /nologo /tlb"C:\tmp\compile\mockpp\examples\tutorial\Debug\chainmock.tlb" /win32 +# ADD BASE CPP /nologo /MDd /W4 /GR /GX /ZI /Od /I "../../../.." /D "WIN32" /D "_CONSOLE" /D "_MBCS" /GZ /c +# ADD CPP /nologo /MDd /W4 /GR /GX /ZI /Od /I "../../../.." /D "WIN32" /D "_CONSOLE" /D "_MBCS" /GZ /c +# ADD BASE RSC /l 0x411 /d "NDEBUG" /d "_DEBUG" +# ADD RSC /l 0x411 /d "NDEBUG" /d "_DEBUG" BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib mockppd.lib /nologo /out:"C:\tmp\compile\mockpp\examples\tutorial\Debug\chainmock.exe" /incremental:yes /libpath:"../../../lib" /debug /pdb:"C:\tmp\compile\mockpp\examples\tutorial\Debug\chainmock.pdb" /pdbtype:sept /subsystem:console /machine:ix86 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib mockppd.lib /nologo /out:"C:\tmp\compile\mockpp\examples\tutorial\Debug\chainmock.exe" /incremental:yes /libpath:"../../../lib" /debug /pdb:"C:\tmp\compile\mockpp\examples\tutorial\Debug\chainmock.pdb" /pdbtype:sept /subsystem:console /machine:ix86 +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib mockppd.lib /nologo /subsystem:console /debug /machine:IX86 /pdbtype:sept /libpath:"../../../lib" +# SUBTRACT BASE LINK32 /pdb:none +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib mockppd.lib /nologo /subsystem:console /debug /machine:IX86 /pdbtype:sept /libpath:"../../../lib" +# SUBTRACT LINK32 /pdb:none !ELSEIF "$(CFG)" == "chainmock - Win32 Release" @@ -66,20 +68,23 @@ # PROP Output_Dir "C:\tmp\compile\mockpp\examples\tutorial\Release" # PROP Intermediate_Dir "C:\tmp\compile\mockpp\examples\tutorial\Release" # PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /I "../../../.." /W4 /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /GF /Gy /Fp"./chainmock.pch" /Fo"C:\tmp\compile\mockpp\examples\tutorial\Release/" /Fd"C:\tmp\compile\mockpp\examples\tutorial\Release/" /c /GX -# ADD CPP /nologo /MD /I "../../../.." /W4 /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /GF /Gy /Fp"./chainmock.pch" /Fo"C:\tmp\compile\mockpp\examples\tutorial\Release/" /Fd"C:\tmp\compile\mockpp\examples\tutorial\Release/" /c /GX -# ADD BASE MTL /nologo /tlb".\chainmock.tlb" /win32 -# ADD MTL /nologo /tlb".\chainmock.tlb" /win32 -# ADD BASE RSC /l 1036 -# ADD RSC /l 1036 +MTL=midl.exe +# ADD BASE MTL /nologo /tlb".\chainmock.tlb" /win32 +# ADD MTL /nologo /tlb".\chainmock.tlb" /win32 +# ADD BASE CPP /nologo /MD /W4 /GX /Gy /I "../../../.." /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /GF /c +# ADD CPP /nologo /MD /W4 /GR /GX /Gy /I "../../../.." /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /GF /c +# ADD BASE RSC /l 0x40c +# ADD RSC /l 0x40c BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib mockpp.lib /nologo /out:"C:\tmp\compile\mockpp\examples\tutorial\Release\chainmock.exe" /incremental:no /libpath:"../../../lib" /pdb:".\chainmock.pdb" /pdbtype:sept /subsystem:windows -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib mockpp.lib /nologo /out:"C:\tmp\compile\mockpp\examples\tutorial\Release\chainmock.exe" /incremental:no /libpath:"../../../lib" /pdb:".\chainmock.pdb" /pdbtype:sept /subsystem:windows +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib mockpp.lib /nologo /subsystem:windows /pdb:".\chainmock.pdb" /machine:IX86 /pdbtype:sept /libpath:"../../../lib" +# SUBTRACT BASE LINK32 /pdb:none +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib mockpp.lib /nologo /subsystem:windows /pdb:".\chainmock.pdb" /machine:IX86 /pdbtype:sept /libpath:"../../../lib" +# SUBTRACT LINK32 /pdb:none -!ENDIF +!ENDIF # Begin Target @@ -94,8 +99,11 @@ !IF "$(CFG)" == "chainmock - Win32 Debug" -# ADD CPP /nologo /Od /GZ /GX -!ENDIF +# ADD CPP /nologo /GX /Od /GZ + +!ELSEIF "$(CFG)" == "chainmock - Win32 Release" + +!ENDIF # End Source File # Begin Source File @@ -117,4 +125,3 @@ # End Group # End Target # End Project - Index: poormock.dsp =================================================================== RCS file: /cvsroot/mockpp/mockpp/msvc6/mockpp/examples/tutorial/poormock.dsp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- poormock.dsp 25 Mar 2005 10:22:11 -0000 1.2 +++ poormock.dsp 9 Apr 2005 20:09:34 -0000 1.3 @@ -26,7 +26,6 @@ # PROP Scc_ProjName "" # PROP Scc_LocalPath "" CPP=cl.exe -MTL=midl.exe RSC=rc.exe !IF "$(CFG)" == "poormock - Win32 Debug" @@ -41,18 +40,21 @@ # PROP Output_Dir "C:\tmp\compile\mockpp\examples\tutorial\Debug" # PROP Intermediate_Dir "C:\tmp\compile\mockpp\examples\tutorial\Debug" # PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /I "../../../.." /ZI /W4 /Od /D "WIN32" /D "_CONSOLE" /D "_MBCS" /GR /Fp"C:\tmp\compile\mockpp\examples\tutorial\Debug/poormock.pch" /Fo"C:\tmp\compile\mockpp\examples\tutorial\Debug/" /Fd"C:\tmp\compile\mockpp\examples\tutorial\Debug/" /GZ /c /GX -# ADD CPP /nologo /MDd /I "../../../.." /ZI /W4 /Od /D "WIN32" /D "_CONSOLE" /D "_MBCS" /GR /Fp"C:\tmp\compile\mockpp\examples\tutorial\Debug/poormock.pch" /Fo"C:\tmp\compile\mockpp\examples\tutorial\Debug/" /Fd"C:\tmp\compile\mockpp\examples\tutorial\Debug/" /GZ /c /GX -# ADD BASE MTL /nologo /tlb"C:\tmp\compile\mockpp\examples\tutorial\Debug\poormock.tlb" /win32 -# ADD MTL /nologo /tlb"C:\tmp\compile\mockpp\examples\tutorial\Debug\poormock.tlb" /win32 -# ADD BASE RSC /l 1041 /d "_DEBUG" -# ADD RSC /l 1041 /d "_DEBUG" +MTL=midl.exe +# ADD BASE MTL /nologo /tlb"C:\tmp\compile\mockpp\examples\tutorial\Debug\poormock.tlb" /win32 +# ADD MTL /nologo /tlb"C:\tmp\compile\mockpp\examples\tutorial\Debug\poormock.tlb" /win32 +# ADD BASE CPP /nologo /MDd /W4 /GR /GX /ZI /Od /I "../../../.." /D "WIN32" /D "_CONSOLE" /D "_MBCS" /GZ /c +# ADD CPP /nologo /MDd /W4 /GR /GX /ZI /Od /I "../../../.." /D "WIN32" /D "_CONSOLE" /D "_MBCS" /GZ /c +# ADD BASE RSC /l 0x411 /d "_DEBUG" +# ADD RSC /l 0x411 /d "_DEBUG" BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib mockppd.lib /nologo /out:"C:\tmp\compile\mockpp\examples\tutorial\Debug\poormock.exe" /incremental:yes /libpath:"../../../lib" /debug /pdb:"C:\tmp\compile\mockpp\examples\tutorial\Debug\poormock.pdb" /pdbtype:sept /subsystem:console /machine:ix86 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib mockppd.lib /nologo /out:"C:\tmp\compile\mockpp\examples\tutorial\Debug\poormock.exe" /incremental:yes /libpath:"../../../lib" /debug /pdb:"C:\tmp\compile\mockpp\examples\tutorial\Debug\poormock.pdb" /pdbtype:sept /subsystem:console /machine:ix86 +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib mockppd.lib /nologo /subsystem:console /debug /machine:IX86 /pdbtype:sept /libpath:"../../../lib" +# SUBTRACT BASE LINK32 /pdb:none +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib mockppd.lib /nologo /subsystem:console /debug /machine:IX86 /pdbtype:sept /libpath:"../../../lib" +# SUBTRACT LINK32 /pdb:none !ELSEIF "$(CFG)" == "poormock - Win32 Release" @@ -66,20 +68,23 @@ # PROP Output_Dir "C:\tmp\compile\mockpp\examples\tutorial\Release" # PROP Intermediate_Dir "C:\tmp\compile\mockpp\examples\tutorial\Release" # PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /I "../../../.." /W4 /O2 /Ob1 /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /GF /Gy /GR /Fp"C:\tmp\compile\mockpp\examples\tutorial\Release/poormock.pch" /Fo"C:\tmp\compile\mockpp\examples\tutorial\Release/" /Fd"C:\tmp\compile\mockpp\examples\tutorial\Release/" /c /GX -# ADD CPP /nologo /MD /I "../../../.." /W4 /O2 /Ob1 /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /GF /Gy /GR /Fp"C:\tmp\compile\mockpp\examples\tutorial\Release/poormock.pch" /Fo"C:\tmp\compile\mockpp\examples\tutorial\Release/" /Fd"C:\tmp\compile\mockpp\examples\tutorial\Release/" /c /GX -# ADD BASE MTL /nologo /tlb"C:\tmp\compile\mockpp\examples\tutorial\Release\poormock.tlb" /win32 -# ADD MTL /nologo /tlb"C:\tmp\compile\mockpp\examples\tutorial\Release\poormock.tlb" /win32 -# ADD BASE RSC /l 1041 /d "NDEBUG" -# ADD RSC /l 1041 /d "NDEBUG" +MTL=midl.exe +# ADD BASE MTL /nologo /tlb"C:\tmp\compile\mockpp\examples\tutorial\Release\poormock.tlb" /win32 +# ADD MTL /nologo /tlb"C:\tmp\compile\mockpp\examples\tutorial\Release\poormock.tlb" /win32 +# ADD BASE CPP /nologo /MD /W4 /GR /GX /O2 /I "../../../.." /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /GF /c +# ADD CPP /nologo /MD /W4 /GR /GX /O2 /I "../../../.." /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /GF /c +# ADD BASE RSC /l 0x411 /d "NDEBUG" +# ADD RSC /l 0x411 /d "NDEBUG" BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib mockpp.lib /nologo /out:"C:\tmp\compile\mockpp\examples\tutorial\Release\poormock.exe" /incremental:no /libpath:"../../../lib" /pdb:"C:\tmp\compile\mockpp\examples\tutorial\Release\poormock.pdb" /pdbtype:sept /subsystem:console /machine:ix86 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib mockpp.lib /nologo /out:"C:\tmp\compile\mockpp\examples\tutorial\Release\poormock.exe" /incremental:no /libpath:"../../../lib" /pdb:"C:\tmp\compile\mockpp\examples\tutorial\Release\poormock.pdb" /pdbtype:sept /subsystem:console /machine:ix86 +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib mockpp.lib /nologo /subsystem:console /machine:IX86 /pdbtype:sept /libpath:"../../../lib" +# SUBTRACT BASE LINK32 /pdb:none +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib mockpp.lib /nologo /subsystem:console /machine:IX86 /pdbtype:sept /libpath:"../../../lib" +# SUBTRACT LINK32 /pdb:none -!ENDIF +!ENDIF # Begin Target @@ -94,30 +99,17 @@ # End Source File # Begin Source File -SOURCE=..\..\..\..\mockpp\examples\tutorial\poormock-se.cpp +SOURCE=..\..\..\..\mockpp\examples\tutorial\poormock.cpp !IF "$(CFG)" == "poormock - Win32 Debug" -# PROP Exclude_From_Build 1 +# ADD CPP /nologo /GX /Od /GZ !ELSEIF "$(CFG)" == "poormock - Win32 Release" -# PROP Exclude_From_Build 1 - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\mockpp\examples\tutorial\poormock.cpp - -!IF "$(CFG)" == "poormock - Win32 Debug" - -# ADD CPP /nologo /Od /GZ /GX -!ELSEIF "$(CFG)" == "poormock - Win32 Release" +# ADD CPP /nologo /GX /O2 -# ADD CPP /nologo /O2 /GX -!ENDIF +!ENDIF # End Source File # End Group @@ -135,4 +127,3 @@ # End Group # End Target # End Project - Index: basicmock.dsp =================================================================== RCS file: /cvsroot/mockpp/mockpp/msvc6/mockpp/examples/tutorial/basicmock.dsp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- basicmock.dsp 25 Mar 2005 10:22:11 -0000 1.2 +++ basicmock.dsp 9 Apr 2005 20:09:34 -0000 1.3 @@ -26,7 +26,6 @@ # PROP Scc_ProjName "" # PROP Scc_LocalPath "" CPP=cl.exe -MTL=midl.exe RSC=rc.exe !IF "$(CFG)" == "basicmock - Win32 Debug" @@ -41,18 +40,21 @@ # PROP Output_Dir "C:\tmp\compile\mockpp\examples\tutorial\Debug" # PROP Intermediate_Dir "C:\tmp\compile\mockpp\examples\tutorial\Debug" # PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /I "../../../.." /ZI /W4 /Od /D "WIN32" /D "_CONSOLE" /D "_MBCS" /GR /Fp"C:\tmp\compile\mockpp\examples\tutorial\Debug/basicmock.pch" /Fo"C:\tmp\compile\mockpp\examples\tutorial\Debug/" /Fd"C:\tmp\compile\mockpp\examples\tutorial\Debug/" /GZ /c /GX -# ADD CPP /nologo /MDd /I "../../../.." /ZI /W4 /Od /D "WIN32" /D "_CONSOLE" /D "_MBCS" /GR /Fp"C:\tmp\compile\mockpp\examples\tutorial\Debug/basicmock.pch" /Fo"C:\tmp\compile\mockpp\examples\tutorial\Debug/" /Fd"C:\tmp\compile\mockpp\examples\tutorial\Debug/" /GZ /c /GX -# ADD BASE MTL /nologo /tlb"C:\tmp\compile\mockpp\examples\tutorial\Debug\basicmock.tlb" /win32 -# ADD MTL /nologo /tlb"C:\tmp\compile\mockpp\examples\tutorial\Debug\basicmock.tlb" /win32 -# ADD BASE RSC /l 1041 /d "NDEBUG" /d "_DEBUG" -# ADD RSC /l 1041 /d "NDEBUG" /d "_DEBUG" +MTL=midl.exe +# ADD BASE MTL /nologo /tlb"C:\tmp\compile\mockpp\examples\tutorial\Debug\basicmock.tlb" /win32 +# ADD MTL /nologo /tlb"C:\tmp\compile\mockpp\examples\tutorial\Debug\basicmock.tlb" /win32 +# ADD BASE CPP /nologo /MDd /W4 /GR /GX /ZI /Od /I "../../../.." /D "WIN32" /D "_CONSOLE" /D "_MBCS" /GZ /c +# ADD CPP /nologo /MDd /W4 /GR /GX /ZI /Od /I "../../../.." /D "WIN32" /D "_CONSOLE" /D "_MBCS" /GZ /c +# ADD BASE RSC /l 0x411 /d "NDEBUG" /d "_DEBUG" +# ADD RSC /l 0x411 /d "NDEBUG" /d "_DEBUG" BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib mockppd.lib /nologo /out:"C:\tmp\compile\mockpp\examples\tutorial\Debug\basicmock.exe" /incremental:yes /libpath:"../../../lib" /debug /pdb:"C:\tmp\compile\mockpp\examples\tutorial\Debug\basicmock.pdb" /pdbtype:sept /subsystem:console /machine:ix86 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib mockppd.lib /nologo /out:"C:\tmp\compile\mockpp\examples\tutorial\Debug\basicmock.exe" /incremental:yes /libpath:"../../../lib" /debug /pdb:"C:\tmp\compile\mockpp\examples\tutorial\Debug\basicmock.pdb" /pdbtype:sept /subsystem:console /machine:ix86 +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib mockppd.lib /nologo /subsystem:console /debug /machine:IX86 /pdbtype:sept /libpath:"../../../lib" +# SUBTRACT BASE LINK32 /pdb:none +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib mockppd.lib /nologo /subsystem:console /debug /machine:IX86 /pdbtype:sept /libpath:"../../../lib" +# SUBTRACT LINK32 /pdb:none !ELSEIF "$(CFG)" == "basicmock - Win32 Release" @@ -66,20 +68,23 @@ # PROP Output_Dir "C:\tmp\compile\mockpp\examples\tutorial\Release" # PROP Intermediate_Dir "C:\tmp\compile\mockpp\examples\tutorial\Release" # PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /I "../../../.." /W4 /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /GF /Gy /Fp"./basicmock.pch" /Fo"C:\tmp\compile\mockpp\examples\tutorial\Release/" /Fd"C:\tmp\compile\mockpp\examples\tutorial\Release/" /c /GX -# ADD CPP /nologo /MD /I "../../../.." /W4 /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /GF /Gy /Fp"./basicmock.pch" /Fo"C:\tmp\compile\mockpp\examples\tutorial\Release/" /Fd"C:\tmp\compile\mockpp\examples\tutorial\Release/" /c /GX -# ADD BASE MTL /nologo /tlb".\basicmock.tlb" /win32 -# ADD MTL /nologo /tlb".\basicmock.tlb" /win32 -# ADD BASE RSC /l 1036 -# ADD RSC /l 1036 +MTL=midl.exe +# ADD BASE MTL /nologo /tlb".\basicmock.tlb" /win32 +# ADD MTL /nologo /tlb".\basicmock.tlb" /win32 +# ADD BASE CPP /nologo /MD /W4 /GX /Gy /I "../../../.." /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /GF /c +# ADD CPP /nologo /MD /W4 /GR /GX /Gy /I "../../../.." /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /GF /c +# ADD BASE RSC /l 0x40c +# ADD RSC /l 0x40c BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib mockpp.lib /nologo /out:"C:\tmp\compile\mockpp\examples\tutorial\Release.\basicmock.exe" /incremental:no /libpath:"../../../lib" /pdb:".\basicmock.pdb" /pdbtype:sept /subsystem:windows -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib mockpp.lib /nologo /out:"C:\tmp\compile\mockpp\examples\tutorial\Release.\basicmock.exe" /incremental:no /libpath:"../../../lib" /pdb:".\basicmock.pdb" /pdbtype:sept /subsystem:windows +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib mockpp.lib /nologo /subsystem:windows /pdb:".\basicmock.pdb" /machine:IX86 /out:"C:\tmp\compile\mockpp\examples\tutorial\Release.\basicmock.exe" /pdbtype:sept /libpath:"../../../lib" +# SUBTRACT BASE LINK32 /pdb:none +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib mockpp.lib /nologo /subsystem:windows /pdb:".\basicmock.pdb" /machine:IX86 /out:"C:\tmp\compile\mockpp\examples\tutorial\Release.\basicmock.exe" /pdbtype:sept /libpath:"../../../lib" +# SUBTRACT LINK32 /pdb:none -!ENDIF +!ENDIF # Begin Target @@ -94,8 +99,11 @@ !IF "$(CFG)" == "basicmock - Win32 Debug" -# ADD CPP /nologo /Od /GZ /GX -!ENDIF +# ADD CPP /nologo /GX /Od /GZ + +!ELSEIF "$(CFG)" == "basicmock - Win32 Release" + +!ENDIF # End Source File # Begin Source File @@ -117,4 +125,3 @@ # End Group # End Target # End Project - --- NEW FILE: poormock_se.dsp --- # Microsoft Developer Studio Project File - Name="poormock_se" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Console Application" 0x0103 CFG=poormock_se - Win32 Debug !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE !MESSAGE NMAKE /f "poormock_se.mak". !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE !MESSAGE NMAKE /f "poormock_se.mak" CFG="poormock_se - Win32 Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE !MESSAGE "poormock_se - Win32 Debug" (based on "Win32 (x86) Console Application") !MESSAGE "poormock_se - Win32 Release" (based on "Win32 (x86) Console Application") !MESSAGE # Begin Project # PROP AllowPerConfigDependencies 0 # PROP Scc_ProjName "" # PROP Scc_LocalPath "" CPP=cl.exe RSC=rc.exe !IF "$(CFG)" == "poormock_se - Win32 Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "C:\tmp\compile\mockpp\examples\tutorial\Debug" # PROP BASE Intermediate_Dir "C:\tmp\compile\mockpp\examples\tutorial\Debug" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "C:\tmp\compile\mockpp\examples\tutorial\Debug" # PROP Intermediate_Dir "C:\tmp\compile\mockpp\examples\tutorial\Debug" # PROP Target_Dir "" MTL=midl.exe # ADD BASE MTL /nologo /tlb"C:\tmp\compile\mockpp\examples\tutorial\Debug\poormock_se.tlb" /win32 # ADD MTL /nologo /tlb"C:\tmp\compile\mockpp\examples\tutorial\Debug\poormock_se.tlb" /win32 # ADD BASE CPP /nologo /MDd /W4 /GR /GX /ZI /Od /I "../../../.." /D "WIN32" /D "_CONSOLE" /D "_MBCS" /GZ /c # ADD CPP /nologo /MDd /W4 /GR /GX /ZI /Od /I "../../../.." /D "WIN32" /D "_CONSOLE" /D "_MBCS" /GZ /c # ADD BASE RSC /l 0x411 /d "_DEBUG" # ADD RSC /l 0x411 /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib mockppd.lib /nologo /subsystem:console /debug /machine:IX86 /pdbtype:sept /libpath:"../../../lib" # SUBTRACT BASE LINK32 /pdb:none # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib mockppd.lib /nologo /subsystem:console /debug /machine:IX86 /pdbtype:sept /libpath:"../../../lib" # SUBTRACT LINK32 /pdb:none !ELSEIF "$(CFG)" == "poormock_se - Win32 Release" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "C:\tmp\compile\mockpp\examples\tutorial\Release" # PROP BASE Intermediate_Dir "C:\tmp\compile\mockpp\examples\tutorial\Release" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "C:\tmp\compile\mockpp\examples\tutorial\Release" # PROP Intermediate_Dir "C:\tmp\compile\mockpp\examples\tutorial\Release" # PROP Target_Dir "" MTL=midl.exe # ADD BASE MTL /nologo /tlb"C:\tmp\compile\mockpp\examples\tutorial\Release\poormock_se.tlb" /win32 # ADD MTL /nologo /tlb"C:\tmp\compile\mockpp\examples\tutorial\Release\poormock_se.tlb" /win32 # ADD BASE CPP /nologo /MD /W4 /GR /GX /O2 /I "../../../.." /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /GF /c # ADD CPP /nologo /MD /W4 /GR /GX /O2 /I "../../../.." /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /GF /c # ADD BASE RSC /l 0x411 /d "NDEBUG" # ADD RSC /l 0x411 /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib mockpp.lib /nologo /subsystem:console /machine:IX86 /pdbtype:sept /libpath:"../../../lib" # SUBTRACT BASE LINK32 /pdb:none # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib mockpp.lib /nologo /subsystem:console /machine:IX86 /pdbtype:sept /libpath:"../../../lib" # SUBTRACT LINK32 /pdb:none !ENDIF # Begin Target # Name "poormock_se - Win32 Debug" # Name "poormock_se - Win32 Release" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" # Begin Source File SOURCE=..\..\..\..\mockpp\examples\tutorial\consumer.cpp # End Source File # Begin Source File SOURCE=..\..\..\..\mockpp\examples\tutorial\poormock-se.cpp !IF "$(CFG)" == "poormock_se - Win32 Debug" # ADD CPP /nologo /GX /Od /GZ !ELSEIF "$(CFG)" == "poormock_se - Win32 Release" # ADD CPP /nologo /GX /O2 !ENDIF # End Source File # End Group # Begin Group "Header Files" # PROP Default_Filter "h;hpp;hxx;hm;inl" # Begin Source File SOURCE=..\..\..\..\mockpp\examples\tutorial\consumer.h # End Source File # Begin Source File SOURCE=..\..\..\..\mockpp\examples\tutorial\interface.h # End Source File # End Group # End Target # End Project |
|
From: Ewald A. <ewa...@us...> - 2005-04-09 18:17:45
|
Update of /cvsroot/mockpp/homepage In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20231 Modified Files: general-box-en.gtml index-en.gtml install-en.gtml Log Message: general update compatibilty section moved Index: index-en.gtml =================================================================== RCS file: /cvsroot/mockpp/homepage/index-en.gtml,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- index-en.gtml 3 Dec 2004 20:26:07 -0000 1.8 +++ index-en.gtml 9 Apr 2005 18:17:33 -0000 1.9 @@ -84,43 +84,22 @@ similar in MockObjects but I guess EasyMock is easier to use and certainly was easier to port to C++. </p> - <p> - From my personal experience mockpp is now running on - <ul> - <li>Linux (SuSE 8.2) + gcc 3.3</li> - <li>OpenBsd 3.1 + gcc 2.95.3 (verified up to version 1.1.16)</li> - <li>Windows (ME, NT) + Borland CBuilder 5</li> - </ul> - Since OpenBSD is a working platform I assume that other *BSD - flavours work fine as well. - </p> - - <p> - From bug reports I know that the following combinations work fine, too: - <ul> - <li>Windows + MSVC6 / MSVC7 (at least MSVC6 can't compile version 1.2.x)</li> - </ul> - </p> + <h2><a name="example"></a>How to use this library</h2> <p> - The following combination had problems but I expect it to work now: - <ul> - <li>HP-UX 11 + g++ 3.2 (version 1.1.16)</li> - </ul> + Note: the following sections describe only the basic elements within mockpp. There are also + a <a href="handbook/index.html">handbook</a>, + an <a href="api-doc/index.html">api reference</a> + and a <a href="tutorial/index.html">tutorial</a> + available which explain the various parts of mockpp. </p> <p> - Reports about other working platforms or even contributions how to achive it are - highly welcome. - </p> - - - <h2><a name="example"></a>How to use this library</h2> - Mockpp contains a number of classes, templates and macros which I divide into <a href="#basic"><em>Basic Expectations</em></a> and <a href="#advanced"><em>Advanced Expectations</em></a>. + </p> <h3><a name="basic">Basic expectations</h3> @@ -203,7 +182,7 @@ </p> <p>For more information please refer to the - <a href="hb/ch01s02.html">basic section</a> + <a href="handbook/ch01s02.html">basic section</a> of the developers guide.</p> </p> @@ -213,7 +192,7 @@ mockpp currently supports two different approaches to create mock objects. The first is easier to understand but rather strict. The second is more complex but offers more flexibiliy and is extensible with user defined classes. But this is also a matter of personal taste. - There is a chapter which introduces into the <a href="hb/ch01s03.html">common characteristics</a>. + There is a chapter which introduces into the <a href="handbook/ch01s03.html">common characteristics</a>. <h4><a name="advanced-visit">Vistable Mock Objects</h4> <p> @@ -290,7 +269,7 @@ #compress ON <p>For more information please refer to the - section about <a href="hb/ch01s03s02.html">vistable mock objects</a> + section about <a href="handbook/ch01s03s02.html">vistable mock objects</a> in the developers guide.</p> </p> @@ -300,14 +279,14 @@ similar to describing it in words. You may say for example: <ul> - <li>I <emphasis>expect</emphasis> some method invocation exactly - <emphasis>once</emphasis></li> - <li>This must happen <emphasis>after</emphasis> another invocation + <li>I <b>expect</b> some method invocation exactly + <b>once</b></li> + <li>This must happen <b>after</b> another invocation labeled "other-ident"</li> - <li>The method must be called <emphasis>with</emphasis> a value - <emphasis>equal</emphasis> to 321</li> - <li>Then the method <emphasis>will</emphasis> return 123</li> - <li>This invocation has an <emphasis>identifier</emphasis> called "ident"</li> + <li>The method must be called <b>with</b> with a value + which <b>is equal</b> to 321</li> + <li>Then the method <b>will</b> return 123</li> + <li>This invocation has an <b>id</b>entifier called "ident"</li> </ul> </p> @@ -332,14 +311,14 @@ <p>Similar to the former approach you must create a helper object to express your expectations. This is further explained in the section about - <a href="hb/ch01s03s03.html">chainable mock objects</a> in the handbook. + <a href="handbook/ch01s03s03.html">chainable mock objects</a> in the handbook. </p> <h4><a name="advanced-poor">Poor Man's Mock Objects</h4> <p> Most of the times you don't need a full blown mock objects library. Often some simple lines of code with a quick and dirty approach suffice. For that reason the handbook contains - some <a href="hb/ch01s03s03.html">simple mock object patterns</a> that don't need further + some <a href="handbook/ch01s03s04.html">simple mock object patterns</a> that don't need further support from a library.</p> <p>If you know some other patterns I would be happy if could send them to Index: install-en.gtml =================================================================== RCS file: /cvsroot/mockpp/homepage/install-en.gtml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- install-en.gtml 3 Dec 2004 20:26:07 -0000 1.3 +++ install-en.gtml 9 Apr 2005 18:17:33 -0000 1.4 @@ -96,13 +96,57 @@ <p> Since mockpp uses automake and friends you should not need to do more than - running "configure" and "make install". + running "configure" and "make install". If you are using a non-GNU platform + you should searchin the topmost directory of the source distribution + if project files for your platform are available. + </p> + <p>You you don't find them and you decide to create yourself, please send them + to <a href="mailto:mockpp at ewald-arnold dot de">me</a>. </p> <p>For more information please refer to the -<a href="hb/apas03.html">installation section</a> +<a href="handbook/apas03.html">installation section</a> of the devlopers guide.</p> + <h2><a NAME="compat"></a>Compatibility</h2> + + <p> + From my personal experience mockpp 1.7.1 is running perfectly on + <ul> + <li>Linux (SuSE 8.2) + gcc 3.4</li> + <li>Linux (SuSE 9.2) + gcc 3.3</li> + <li>OpenBsd 3.1 + gcc 2.95.3</li> + <li>Windows (ME, NT) + Borland CBuilder 5</li> + </ul> + Since OpenBSD is a working platform I assume that other *BSD + and *nix flavours work fine as well. + </p> + + <p> + From reports and little personal experience I know that the following + combinations work more or less fine, too: + <ul> + <li>Windows + MSVC6 up to mockpp 1.1.16.</li> + <li>Windows + MSVC7.1. Please note that MSVC6.0 compiles + the library itself but fails on a lot of test files. This is + due to its weak support for templates. The state of MSVC7.0 seems similar. + </li> + <li>Windows + Borland CBuilder6. Use the project files under bcb5 and + tweak them a bit (e.g. add stlport.lib or similar).</li> + </ul> + </p> + + <p> + The following combination had problems but I expect it to work now: + <ul> + <li>HP-UX 11 + g++ 3.2 (version 1.1.16)</li> + </ul> + </p> + + <p> + Reports about other working platforms or even contributions how to achive it are + highly welcome. + </p> [[MULTICOL_FOOTER]] Index: general-box-en.gtml =================================================================== RCS file: /cvsroot/mockpp/homepage/general-box-en.gtml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- general-box-en.gtml 30 Jun 2004 16:51:43 -0000 1.3 +++ general-box-en.gtml 9 Apr 2005 18:17:33 -0000 1.4 @@ -6,12 +6,15 @@ [[NAVI_BOX_ENTRY('<a href="index-en.html#example">How to use this library</a>')]] [[NAVI_BOX_SEPARATOR]] - [[NAVI_BOX_ENTRY('<a href="hb/index.html">The Handbook</a>')]] - [[NAVI_BOX_ENTRY('<a href="api/index.html">The API Reference</a>')]] + [[NAVI_BOX_ENTRY('<a href="handbook/index.html">The Handbook</a>')]] + [[NAVI_BOX_ENTRY('<a href="handbook/ch02.html">FnAQ</a>')]] + [[NAVI_BOX_ENTRY('<a href="tutorial/index.html">A Tutorial</a>')]] + [[NAVI_BOX_ENTRY('<a href="api-doc/index.html">The API Reference</a>')]] [[NAVI_BOX_SEPARATOR]] [[NAVI_BOX_ENTRY('<a href="install-en.html#download">Download</a>')]] [[NAVI_BOX_ENTRY('<a href="install-en.html#install">Installation</a>')]] + [[NAVI_BOX_ENTRY('<a href="install-en.html#compat">Compatibility</a>')]] [[NAVI_BOX_SEPARATOR]] [[NAVI_BOX_ENTRY('<img src="common-pics/errata.png" width="16" height="16"><a href="errata-en.html"><b>Known problems</b></a>')]] |
|
From: Ewald A. <ewa...@us...> - 2005-04-09 18:17:43
|
Update of /cvsroot/mockpp/homepage/templates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20231/templates Modified Files: layout.gtml mock_header-en.gtml navi-box.gtml Log Message: general update compatibilty section moved Index: navi-box.gtml =================================================================== RCS file: /cvsroot/mockpp/homepage/templates/navi-box.gtml,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- navi-box.gtml 22 Dec 2002 09:59:10 -0000 1.1.1.1 +++ navi-box.gtml 9 Apr 2005 18:17:34 -0000 1.2 @@ -12,7 +12,7 @@ <div ALIGN=right> \ <a href="__filename__-en.html"><img SRC="common-pics/en.png" height="14" width="21" align=BOTTOM alt="en" border="0"></a> \ </div> - + #define NAVI_BOX_WIDTH 274 Index: layout.gtml =================================================================== RCS file: /cvsroot/mockpp/homepage/templates/layout.gtml,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- layout.gtml 22 Dec 2002 09:59:10 -0000 1.1.1.1 +++ layout.gtml 9 Apr 2005 18:17:34 -0000 1.2 @@ -6,6 +6,6 @@ #define MULTICOL_OFFSET(__off__,__width__) </td><td WIDTH="__off__"></td><td WIDTH="__width__" VALIGN="TOP" > #define MULTICOL_DIV(__width__) </td><td WIDTH="__width__"> - + #define MULTICOL_FOOTER </td></tr></table> Index: mock_header-en.gtml =================================================================== RCS file: /cvsroot/mockpp/homepage/templates/mock_header-en.gtml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- mock_header-en.gtml 23 Mar 2003 13:35:39 -0000 1.2 +++ mock_header-en.gtml 9 Apr 2005 18:17:34 -0000 1.3 @@ -15,3 +15,4 @@ <!-- body text="#000000" bgcolor="#010101" background="common-pics/kde-background.png" --> + |
|
From: Ewald A. <ewa...@us...> - 2005-04-09 18:15:30
|
Update of /cvsroot/mockpp/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19054 Modified Files: mockpp.kdevelop Log Message: update Index: mockpp.kdevelop =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp.kdevelop,v retrieving revision 1.69 retrieving revision 1.70 diff -u -d -r1.69 -r1.70 --- mockpp.kdevelop 30 Mar 2005 18:33:59 -0000 1.69 +++ mockpp.kdevelop 9 Apr 2005 18:15:08 -0000 1.70 @@ -35,6 +35,7 @@ <jmock_test/> <compilecheck/> <mock_greeter/> + <readability></readability> </runarguments> </run> <make> |
|
From: Ewald A. <ewa...@us...> - 2005-04-09 18:14:06
|
Update of /cvsroot/mockpp/mockpp/mockpp/docs/en In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18179/mockpp/docs/en Modified Files: faq.docbook index.docbook Log Message: update docs Index: faq.docbook =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/docs/en/faq.docbook,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- faq.docbook 20 Nov 2004 20:32:59 -0000 1.3 +++ faq.docbook 9 Apr 2005 18:13:57 -0000 1.4 @@ -4,22 +4,59 @@ --> <chapter id="faq"> -<title>Questions and Answers</title> +<title>Frequently And Never Asked Questions</title> <qandaset id="faqlist"> - + <qandaentry> <question> + <para>I have the following simple method but it does not compile.</para> + <para> + <programlisting> + + const X& method(int p1); + </programlisting> + </para> + </question> + + <answer> + <para>Since &mockpp; emulates all method calls there is no variable to which you + can return a reference. One solution is, to use a shadow method. The trick + is to separate the mocking elements and the method in question which contains + a real variable. + + <programlisting> + + MOCKPP_VISITABLE1(ClassName, shadow_method, int); + + X shadow_variable; // the variable is a class member + + const X& method(int p1) + { + shadow_variable = shadow_method(p1); + return shadow; + } + </programlisting> + </para> + </answer> + + </qandaentry> + + <!-- --> + + <qandaentry> + + <question> <para>Where can I ask a question regarding &mockpp;?</para> </question> - + <answer> - <para>Send a mail to the according + <para>Send a mail to the according <ulink url="http://sourceforge.net/mail/?group_id=69135">mailing list</ulink> - or point your browser to the + or point your browser to the <ulink url="http://sourceforge.net/forum/?group_id=69135">forum</ulink>.</para> </answer> - + </qandaentry> </qandaset> Index: index.docbook =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/docs/en/index.docbook,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- index.docbook 3 Apr 2005 12:58:25 -0000 1.24 +++ index.docbook 9 Apr 2005 18:13:57 -0000 1.25 @@ -10,8 +10,8 @@ <!ENTITY cppunit '<application>cppunit</application>' > <!ENTITY copyyears '2002-2005' > <!ENTITY mockpp_email 'mockpp at ewald-arnold dot de' > - <!ENTITY release_date '<date>2005-04-03</date>' > - <!ENTITY release_info '<releaseinfo>1.07.00</releaseinfo>' > + <!ENTITY release_date '<date>2005-04-10</date>' > + <!ENTITY release_info '<releaseinfo>1.07.01</releaseinfo>' > <!ENTITY chap_bookinfo SYSTEM 'bookinfo.docbook' > <!ENTITY chap_intro SYSTEM 'intro.docbook' > |
|
From: Ewald A. <ewa...@us...> - 2005-04-09 16:44:11
|
Update of /cvsroot/mockpp/mockpp/mockpp/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27422/mockpp/tests Modified Files: readability_test.cpp Log Message: add object name to method names Index: readability_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/readability_test.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- readability_test.cpp 9 Apr 2005 15:31:42 -0000 1.1 +++ readability_test.cpp 9 Apr 2005 16:43:55 -0000 1.2 @@ -31,14 +31,14 @@ #include <iostream> -#include <mockpp/ExpectationValue.h> #include <mockpp/MixedMockObject.h> -#include <mockpp/util/AssertMo.h> #define MOCKPP_IMPORT_ABBREVIATED #include <mockpp/chaining/ChainingMockObjectSupport.h> #include <mockpp/chaining/mockpp_pti.h> +#include <mockpp/constraint/ConstraintList.h> + #include "classes_ABCDE.h" class MyMixedMockObject : public mockpp::MixedMockObject @@ -46,7 +46,7 @@ public: MyMixedMockObject() - : mockpp::MixedMockObject(MOCKPP_PCHAR("MyMixedMockObject") , 0) + : mockpp::MixedMockObject(MOCKPP_PCHAR("MyMixedMockObjectInstance") , 0) , MOCKPP_CONSTRUCT_MEMBERS_FOR_CHAINABLE4(chain) , MOCKPP_CONSTRUCT_MEMBERS_FOR_VISITABLE4(visit) , MOCKPP_CONSTRUCT_MEMBERS_FOR_VOID_CHAINABLE4(void_chain) @@ -97,6 +97,86 @@ } +void visiter_1() +{ + MyMixedMockObject mmo; + mmo.void_visit(CA(), CB(), "hallo", 12); + mmo.activate(); + + try + { + mmo.visit(CA(), CB(), "hallo", 12); + } + catch(std::exception &ex) + { + std::cout << ex.what() << std::endl; + } +} + + +void visiter_2() +{ + MyMixedMockObject mmo; + mmo.void_visit(CA(), CB(), "hallo", 12); + mmo.activate(); + + try + { + mmo.void_visit(CA(), CB(), "hallo", 21); + } + catch(std::exception &ex) + { + std::cout << ex.what() << std::endl; + } +} + + +void constraintlist_1() +{ + mockpp::ConstraintList<std::string> list(MOCKPP_PCHAR("ConstraintListInstance")); + list.addExpected(eq(std::string("string"))); + try + { + list.addActual(std::string("no-string")); + } + catch(std::exception &ex) + { + std::cout << ex.what() << std::endl; + } +} + + +void expectationlist_1() +{ + mockpp::ExpectationList<std::string> list(MOCKPP_PCHAR("ExpectationListInstance")); + list.addExpected(std::string("string")); + try + { + list.addActual(std::string("no-string")); + } + catch(std::exception &ex) + { + std::cout << ex.what() << std::endl; + } +} + + +void expectationlist_2() +{ + mockpp::ExpectationList<std::string> list(MOCKPP_PCHAR("ExpectationListInstance") ); + list.addExpected(std::string("string")); + list.addActual(std::string("string")); + try + { + list.addActual(std::string("no-string")); + } + catch(std::exception &ex) + { + std::cout << ex.what() << std::endl; + } +} + + int main(int /* argc */, char ** /* argv */) { unsigned result = 0; @@ -104,7 +184,25 @@ try { + std::cout << "--\n"; + chainer_1(); + std::cout << "--\n"; + + visiter_1(); + std::cout << "--\n"; + + visiter_2(); + std::cout << "--\n"; + + expectationlist_1(); + std::cout << "--\n"; + + expectationlist_2(); + std::cout << "--\n"; + + constraintlist_1(); + std::cout << "--\n"; } catch(...) |
|
From: Ewald A. <ewa...@us...> - 2005-04-09 16:44:11
|
Update of /cvsroot/mockpp/mockpp/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27422/mockpp Modified Files: VisitableMockObject_macro.h Log Message: add object name to method names Index: VisitableMockObject_macro.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/VisitableMockObject_macro.h,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- VisitableMockObject_macro.h 4 Mar 2005 17:39:40 -0000 1.27 +++ VisitableMockObject_macro.h 9 Apr 2005 16:43:55 -0000 1.28 @@ -691,12 +691,12 @@ std::string func_name (#m_name); \ if (!isActivated() ) \ { \ - addExpectedMethod(func_name); \ + addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + func_name); \ return;\ } \ else \ { \ - addActualMethod(func_name); \ + addActualMethod(mockpp::getLatin1(getVerifiableName()) + "." + func_name); \ MOCKPP_THROWER_IMPL(m_name ); \ return;\ } \ @@ -721,13 +721,13 @@ std::string func_name (#m_name); \ if (!isActivated() ) \ { \ - addExpectedMethod(func_name); \ + addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + func_name); \ m_name ## Parameter1.addExpected((v_type1)param1); \ return; \ } \ else \ { \ - addActualMethod(func_name); \ + addActualMethod(mockpp::getLatin1(getVerifiableName()) + "." + func_name); \ try { \ mockpp::Throwable *t; \ if (m_name ## ResponseValues.find(t, (v_type1)param1)) \ @@ -744,7 +744,7 @@ \ void a_name (const mockpp::ConstraintHolder<v_type1> ¶m1) /* @todo const? */ \ { \ - addExpectedMethod(std::string(#m_name)); \ + addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + #m_name); \ mockpp::Constraint<v_type1>::AP cons1 (param1); \ m_name ## Parameter1.addExpected(cons1.release()); \ } \ @@ -772,14 +772,14 @@ std::string func_name (#m_name); \ if (!isActivated() ) \ { \ - addExpectedMethod(func_name); \ + addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + func_name); \ m_name ## Parameter1.addExpected((v_type1)param1); \ m_name ## Parameter2.addExpected((v_type2)param2); \ return; \ } \ else \ { \ - addActualMethod(func_name); \ + addActualMethod(mockpp::getLatin1(getVerifiableName()) + "." + func_name); \ try { \ mockpp::Throwable *t; \ if (m_name ## ResponseValues.find(t, (v_type1)param1, (v_type2)param2)) \ @@ -799,7 +799,7 @@ void a_name(const mockpp::ConstraintHolder<v_type1> ¶m1, \ const mockpp::ConstraintHolder<v_type2> ¶m2) /* @todo const? */ \ { \ - addExpectedMethod(std::string(#m_name)); \ + 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()); \ @@ -831,7 +831,7 @@ std::string func_name (#m_name); \ if (!isActivated() ) \ { \ - addExpectedMethod(func_name); \ + addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + func_name); \ m_name ## Parameter1.addExpected((v_type1)param1); \ m_name ## Parameter2.addExpected((v_type2)param2); \ m_name ## Parameter3.addExpected((v_type3)param3); \ @@ -839,7 +839,7 @@ } \ else \ { \ - addActualMethod(func_name); \ + addActualMethod(mockpp::getLatin1(getVerifiableName()) + "." + func_name); \ try { \ mockpp::Throwable *t; \ if (m_name ## ResponseValues.find(t, (v_type1)param1, (v_type2)param2, (v_type3)param3)) \ @@ -862,7 +862,7 @@ const mockpp::ConstraintHolder<v_type2> ¶m2, \ const mockpp::ConstraintHolder<v_type3> ¶m3) /* @todo const? */ \ { \ - addExpectedMethod(std::string(#m_name)); \ + 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); \ @@ -898,7 +898,7 @@ std::string func_name (#m_name); \ if (!isActivated() ) \ { \ - addExpectedMethod(func_name); \ + addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + func_name); \ m_name ## Parameter1.addExpected((v_type1)param1); \ m_name ## Parameter2.addExpected((v_type2)param2); \ m_name ## Parameter3.addExpected((v_type3)param3); \ @@ -907,7 +907,7 @@ } \ else \ { \ - addActualMethod(func_name); \ + addActualMethod(mockpp::getLatin1(getVerifiableName()) + "." + func_name); \ try { \ mockpp::Throwable *t; \ if (m_name ## ResponseValues.find(t, (v_type1)param1, (v_type2)param2, (v_type3)param3, (v_type4)param4)) \ @@ -933,7 +933,7 @@ const mockpp::ConstraintHolder<v_type3> ¶m3, \ const mockpp::ConstraintHolder<v_type4> ¶m4) /* @todo const? */ \ { \ - addExpectedMethod(std::string(#m_name)); \ + 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); \ @@ -973,7 +973,7 @@ std::string func_name (#m_name); \ if (!isActivated() ) \ { \ - addExpectedMethod(func_name); \ + addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + func_name); \ m_name ## Parameter1.addExpected((v_type1)param1); \ m_name ## Parameter2.addExpected((v_type2)param2); \ m_name ## Parameter3.addExpected((v_type3)param3); \ @@ -983,7 +983,7 @@ } \ else \ { \ - addActualMethod(func_name); \ + addActualMethod(mockpp::getLatin1(getVerifiableName()) + "." + func_name); \ try { \ mockpp::Throwable *t; \ if (m_name ## ResponseValues.find(t, (v_type1)param1, (v_type2)param2, (v_type3)param3, (v_type4)param4, (v_type5)param5)) \ @@ -1012,7 +1012,7 @@ const mockpp::ConstraintHolder<v_type4> ¶m4, \ const mockpp::ConstraintHolder<v_type5> ¶m5) /* @todo const? */ \ { \ - addExpectedMethod(std::string(#m_name)); \ + 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); \ @@ -1045,13 +1045,13 @@ std::string func_name = #m_name; \ if (!isActivated() ) \ { \ - addExpectedMethod(func_name); \ + addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + func_name); \ v_ret_type ret_val = v_ret_type(); \ return ret_val; \ } \ else \ { \ - addActualMethod(func_name); \ + addActualMethod(mockpp::getLatin1(getVerifiableName()) + "." + func_name); \ MOCKPP_THROWER_IMPL(m_name); \ \ if (m_name ## ReturnValues.hasMoreObjects()) \ @@ -1085,14 +1085,14 @@ std::string func_name = #m_name; \ if (!isActivated() ) \ { \ - addExpectedMethod(func_name); \ + addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + func_name); \ m_name ## Parameter1.addExpected((v_type1)param1); \ v_ret_type ret_val = v_ret_type(); \ return ret_val; \ } \ else \ { \ - addActualMethod(func_name); \ + addActualMethod(mockpp::getLatin1(getVerifiableName()) + "." + func_name); \ try { \ mockpp::Throwable *t; \ if (m_name ## ResponseValues.find(t, (v_type1)param1)) \ @@ -1117,7 +1117,7 @@ \ m_ret_type a_name(const mockpp::ConstraintHolder<v_type1> ¶m1) /* @todo const? */ \ { \ - addExpectedMethod(std::string(#m_name)); \ + addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + #m_name); \ mockpp::Constraint<v_type1>::AP cons1 (param1); \ m_name ## Parameter1.addExpected(cons1.release()); \ return v_ret_type(); \ @@ -1149,7 +1149,7 @@ std::string func_name = #m_name; \ if (!isActivated() ) \ { \ - addExpectedMethod(func_name); \ + addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + func_name); \ m_name ## Parameter1.addExpected((v_type1)param1); \ m_name ## Parameter2.addExpected((v_type2)param2); \ v_ret_type ret_val = v_ret_type(); \ @@ -1157,7 +1157,7 @@ } \ else \ { \ - addActualMethod(func_name); \ + addActualMethod(mockpp::getLatin1(getVerifiableName()) + "." + func_name); \ try { \ mockpp::Throwable *t; \ if (m_name ## ResponseValues.find(t, (v_type1)param1, (v_type2)param2)) \ @@ -1185,7 +1185,7 @@ m_ret_type a_name(const mockpp::ConstraintHolder<v_type1> ¶m1, \ const mockpp::ConstraintHolder<v_type2> ¶m2) /* @todo const? */ \ { \ - addExpectedMethod(std::string(#m_name)); \ + 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()); \ @@ -1221,7 +1221,7 @@ std::string func_name = #m_name; \ if (!isActivated() ) \ { \ - addExpectedMethod(func_name); \ + addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + func_name); \ m_name ## Parameter1.addExpected((v_type1)param1); \ m_name ## Parameter2.addExpected((v_type2)param2); \ m_name ## Parameter3.addExpected((v_type3)param3); \ @@ -1230,7 +1230,7 @@ } \ else \ { \ - addActualMethod(func_name); \ + addActualMethod(mockpp::getLatin1(getVerifiableName()) + "." + func_name); \ try { \ mockpp::Throwable *t; \ if (m_name ## ResponseValues.find(t, (v_type1)param1, (v_type2)param2, (v_type3)param3)) \ @@ -1261,7 +1261,7 @@ const mockpp::ConstraintHolder<v_type2> ¶m2, \ const mockpp::ConstraintHolder<v_type3> ¶m3) /* @todo const? */ \ { \ - addExpectedMethod(std::string(#m_name)); \ + 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); \ @@ -1300,7 +1300,7 @@ std::string func_name = #m_name; \ if (!isActivated() ) \ { \ - addExpectedMethod(func_name); \ + addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + func_name); \ m_name ## Parameter1.addExpected((v_type1)param1); \ m_name ## Parameter2.addExpected((v_type2)param2); \ m_name ## Parameter3.addExpected((v_type3)param3); \ @@ -1310,7 +1310,7 @@ } \ else \ { \ - addActualMethod(func_name); \ + addActualMethod(mockpp::getLatin1(getVerifiableName()) + "." + func_name); \ try { \ mockpp::Throwable *t; \ if (m_name ## ResponseValues.find(t, (v_type1)param1, (v_type2)param2, (v_type3)param3, (v_type4)param4)) \ @@ -1344,7 +1344,7 @@ const mockpp::ConstraintHolder<v_type3> ¶m3, \ const mockpp::ConstraintHolder<v_type4> ¶m4) /* @todo const? */ \ { \ - addExpectedMethod(std::string(#m_name)); \ + 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); \ @@ -1387,7 +1387,7 @@ std::string func_name = #m_name; \ if (!isActivated() ) \ { \ - addExpectedMethod(func_name); \ + addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + func_name); \ m_name ## Parameter1.addExpected((v_type1)param1); \ m_name ## Parameter2.addExpected((v_type2)param2); \ m_name ## Parameter3.addExpected((v_type3)param3); \ @@ -1398,7 +1398,7 @@ } \ else \ { \ - addActualMethod(func_name); \ + addActualMethod(mockpp::getLatin1(getVerifiableName()) + "." + func_name); \ try { \ mockpp::Throwable *t; \ if (m_name ## ResponseValues.find(t, (v_type1)param1, (v_type2)param2, (v_type3)param3, (v_type4)param4, (v_type5)param5)) \ @@ -1435,7 +1435,7 @@ const mockpp::ConstraintHolder<v_type4> ¶m4, \ const mockpp::ConstraintHolder<v_type5> ¶m5) /* @todo const? */ \ { \ - addExpectedMethod(std::string(#m_name)); \ + 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); \ |
|
From: Ewald A. <ewa...@us...> - 2005-04-09 16:44:11
|
Update of /cvsroot/mockpp/mockpp/mockpp/chaining In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27422/mockpp/chaining Modified Files: ChainableMockObject_macro.h Log Message: add object name to method names Index: ChainableMockObject_macro.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/ChainableMockObject_macro.h,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- ChainableMockObject_macro.h 4 Mar 2005 20:26:38 -0000 1.10 +++ ChainableMockObject_macro.h 9 Apr 2005 16:43:55 -0000 1.11 @@ -101,7 +101,7 @@ a_name) \ { \ std::string func_name (#m_name); \ - mockpp::Invocation0 inv(MOCKPP_PCHAR(#m_name)); \ + mockpp::Invocation0 inv(getVerifiableName() + MOCKPP_PCHAR(".") MOCKPP_PCHAR(#m_name)); \ m_name ## CoreMock.invoke(inv); \ } \ MOCKPP_MEMBER_RESTRICTOR_PRIVATE: \ @@ -121,7 +121,7 @@ a_name, v_type1) \ { \ std::string func_name (#m_name); \ - mockpp::Invocation1<v_type1> inv(MOCKPP_PCHAR(#m_name), (v_type1)param1); \ + mockpp::Invocation1<v_type1> inv(getVerifiableName() + MOCKPP_PCHAR(".") MOCKPP_PCHAR(#m_name), (v_type1)param1); \ m_name ## CoreMock.invoke(inv); \ } \ MOCKPP_MEMBER_RESTRICTOR_PRIVATE: \ @@ -141,7 +141,7 @@ a_name, v_type1, v_type2) \ { \ std::string func_name (#m_name); \ - mockpp::Invocation2<v_type1, v_type2> inv(MOCKPP_PCHAR(#m_name), (v_type1)param1, (v_type2)param2); \ + mockpp::Invocation2<v_type1, v_type2> inv(getVerifiableName() + MOCKPP_PCHAR(".") MOCKPP_PCHAR(#m_name), (v_type1)param1, (v_type2)param2); \ m_name ## CoreMock.invoke(inv); \ } \ MOCKPP_MEMBER_RESTRICTOR_PRIVATE: \ @@ -165,7 +165,7 @@ a_name, v_type1, v_type2, v_type3) \ { \ std::string func_name (#m_name); \ - mockpp::Invocation3<v_type1, v_type2, v_type3> inv(MOCKPP_PCHAR(#m_name), (v_type1)param1, (v_type2)param2, (v_type3)param3); \ + mockpp::Invocation3<v_type1, v_type2, v_type3> inv(getVerifiableName() + MOCKPP_PCHAR(".") MOCKPP_PCHAR(#m_name), (v_type1)param1, (v_type2)param2, (v_type3)param3); \ m_name ## CoreMock.invoke(inv); \ } \ MOCKPP_MEMBER_RESTRICTOR_PRIVATE: \ @@ -191,7 +191,7 @@ a_name, v_type1, v_type2, v_type3, v_type4) \ { \ std::string func_name (#m_name); \ - mockpp::Invocation4<v_type1, v_type2, v_type3, v_type4> inv(MOCKPP_PCHAR(#m_name), (v_type1)param1, (v_type2)param2, (v_type3)param3, (v_type4)param4); \ + mockpp::Invocation4<v_type1, v_type2, v_type3, v_type4> inv(getVerifiableName() + MOCKPP_PCHAR(".") MOCKPP_PCHAR(#m_name), (v_type1)param1, (v_type2)param2, (v_type3)param3, (v_type4)param4); \ m_name ## CoreMock.invoke(inv); \ } \ MOCKPP_MEMBER_RESTRICTOR_PRIVATE: \ @@ -219,7 +219,7 @@ a_name, v_type1, v_type2, v_type3, v_type4, v_type5) \ { \ std::string func_name (#m_name); \ - mockpp::Invocation5<v_type1, v_type2, v_type3, v_type4, v_type5> inv(MOCKPP_PCHAR(#m_name), (v_type1)param1, (v_type2)param2, (v_type3)param3, (v_type4)param4, (v_type5)param5); \ + mockpp::Invocation5<v_type1, v_type2, v_type3, v_type4, v_type5> inv(getVerifiableName() + MOCKPP_PCHAR(".") MOCKPP_PCHAR(#m_name), (v_type1)param1, (v_type2)param2, (v_type3)param3, (v_type4)param4, (v_type5)param5); \ m_name ## CoreMock.invoke(inv); \ } \ MOCKPP_MEMBER_RESTRICTOR_PRIVATE: \ @@ -240,7 +240,7 @@ v_ret_type, a_name) \ { \ std::string func_name (#m_name); \ - mockpp::Invocation0 inv(MOCKPP_PCHAR(#m_name)); \ + mockpp::Invocation0 inv(getVerifiableName() + MOCKPP_PCHAR(".") MOCKPP_PCHAR(#m_name)); \ return m_name ## CoreMock.invoke(inv); \ } \ MOCKPP_MEMBER_RESTRICTOR_PRIVATE: \ @@ -262,7 +262,7 @@ v_ret_type, a_name, v_type1) \ { \ std::string func_name (#m_name); \ - mockpp::Invocation1<v_type1> inv(MOCKPP_PCHAR(#m_name), (v_type1)param1); \ + mockpp::Invocation1<v_type1> inv(getVerifiableName() + MOCKPP_PCHAR(".") MOCKPP_PCHAR(#m_name), (v_type1)param1); \ return m_name ## CoreMock.invoke(inv); \ } \ MOCKPP_MEMBER_RESTRICTOR_PRIVATE: \ @@ -284,7 +284,7 @@ v_ret_type, a_name, v_type1, v_type2) \ { \ std::string func_name (#m_name); \ - mockpp::Invocation2<v_type1, v_type2> inv(MOCKPP_PCHAR(#m_name), (v_type1)param1, (v_type2)param2); \ + mockpp::Invocation2<v_type1, v_type2> inv(getVerifiableName() + MOCKPP_PCHAR(".") MOCKPP_PCHAR(#m_name), (v_type1)param1, (v_type2)param2); \ return m_name ## CoreMock.invoke(inv); \ } \ MOCKPP_MEMBER_RESTRICTOR_PRIVATE: \ @@ -310,7 +310,7 @@ v_ret_type, a_name, v_type1, v_type2, v_type3) \ { \ std::string func_name (#m_name); \ - mockpp::Invocation3<v_type1, v_type2, v_type3> inv(MOCKPP_PCHAR(#m_name), (v_type1)param1, (v_type2)param2, (v_type3)param3); \ + mockpp::Invocation3<v_type1, v_type2, v_type3> inv(getVerifiableName() + MOCKPP_PCHAR(".") MOCKPP_PCHAR(#m_name), (v_type1)param1, (v_type2)param2, (v_type3)param3); \ return m_name ## CoreMock.invoke(inv); \ } \ MOCKPP_MEMBER_RESTRICTOR_PRIVATE: \ @@ -338,7 +338,7 @@ v_ret_type, a_name, v_type1, v_type2, v_type3, v_type4) \ { \ std::string func_name (#m_name); \ - mockpp::Invocation4<v_type1, v_type2, v_type3, v_type4> inv(MOCKPP_PCHAR(#m_name), (v_type1)param1, (v_type2)param2, (v_type3)param3, (v_type4)param4); \ + mockpp::Invocation4<v_type1, v_type2, v_type3, v_type4> inv(getVerifiableName() + MOCKPP_PCHAR(".") MOCKPP_PCHAR(#m_name), (v_type1)param1, (v_type2)param2, (v_type3)param3, (v_type4)param4); \ return m_name ## CoreMock.invoke(inv); \ } \ MOCKPP_MEMBER_RESTRICTOR_PRIVATE: \ @@ -368,7 +368,7 @@ v_ret_type, a_name, v_type1, v_type2, v_type3, v_type4, v_type5) \ { \ std::string func_name (#m_name); \ - mockpp::Invocation5<v_type1, v_type2, v_type3, v_type4, v_type5> inv(MOCKPP_PCHAR(#m_name), (v_type1)param1, (v_type2)param2, (v_type3)param3, (v_type4)param4, (v_type5)param5); \ + mockpp::Invocation5<v_type1, v_type2, v_type3, v_type4, v_type5> inv(getVerifiableName() + MOCKPP_PCHAR(".") MOCKPP_PCHAR(#m_name), (v_type1)param1, (v_type2)param2, (v_type3)param3, (v_type4)param4, (v_type5)param5); \ return m_name ## CoreMock.invoke(inv); \ } \ MOCKPP_MEMBER_RESTRICTOR_PRIVATE: \ |
|
From: Ewald A. <ewa...@us...> - 2005-04-09 16:44:11
|
Update of /cvsroot/mockpp/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27422 Modified Files: ChangeLog Log Message: add object name to method names Index: ChangeLog =================================================================== RCS file: /cvsroot/mockpp/mockpp/ChangeLog,v retrieving revision 1.44 retrieving revision 1.45 diff -u -d -r1.44 -r1.45 --- ChangeLog 6 Apr 2005 20:16:12 -0000 1.44 +++ ChangeLog 9 Apr 2005 16:43:54 -0000 1.45 @@ -3,12 +3,14 @@ mockpp history -------------- -2005-04-05 1.7.1: +2005-04-10 1.7.1: - fix for unicode on some cygwin platforms - fix for broken config files for MSVC and BCB5 - - forbid copy classes with pointer inside - - improved some error messages + - forbid to copy classes with pointers inside + - improved readability of error messages + => compatibility break: appearance of char/wchar_t changed + #undef MOCKPP_MAKE_CHAR_READABLE if needed 2005-04-03 1.7.0: |
|
From: Ewald A. <ewa...@us...> - 2005-04-09 15:32:57
|
Update of /cvsroot/mockpp/mockpp/mockpp/compat In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25765/mockpp/compat Modified Files: Formatter.cpp Log Message: make char/wchar_t more readable Index: Formatter.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/compat/Formatter.cpp,v retrieving revision 1.37 retrieving revision 1.38 diff -u -d -r1.37 -r1.38 --- Formatter.cpp 24 Mar 2005 21:43:06 -0000 1.37 +++ Formatter.cpp 9 Apr 2005 15:32:44 -0000 1.38 @@ -205,6 +205,29 @@ } +static String charToReadable(unsigned x) +{ + String text; +#ifndef MOCKPP_MAKE_CHAR_READABLE + text += x; +#else + if (!std::isalnum(x)) + { + text += MOCKPP_PCHAR("0x") + number((unsigned long)x, 16); + } + else + { + text += MOCKPP_PCHAR("{\""); + text += x; + text += MOCKPP_PCHAR("\", "); + text += MOCKPP_PCHAR("0x") + number((unsigned long)x, 16); + text += MOCKPP_PCHAR("}"); + } +#endif + return text; +} + + } // namespace mockpp @@ -239,26 +262,21 @@ mockpp::String & MOCKPP_EXPORT operator << ( mockpp::String &formatter, signed char repdata ) { mockpp::String s; - s += repdata; - formatter << s; + formatter << mockpp::charToReadable(repdata); return formatter; } mockpp::String & MOCKPP_EXPORT operator << ( mockpp::String &formatter, char repdata ) { - mockpp::String s; - s += repdata; - formatter << s; + formatter << mockpp::charToReadable(repdata); return formatter; } mockpp::String & MOCKPP_EXPORT operator << ( mockpp::String &formatter, unsigned char repdata ) { - mockpp::String s; - s += repdata; - formatter << s; + formatter << mockpp::charToReadable(repdata); return formatter; } @@ -281,9 +299,7 @@ mockpp::String & MOCKPP_EXPORT operator << ( mockpp::String &formatter, wchar_t repdata ) { - mockpp::String s; - s += repdata; - formatter << s; + formatter << mockpp::charToReadable(repdata); return formatter; } |
|
From: Ewald A. <ewa...@us...> - 2005-04-09 15:32:56
|
Update of /cvsroot/mockpp/mockpp/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25765/mockpp Modified Files: mockpp.h Log Message: make char/wchar_t more readable Index: mockpp.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/mockpp.h,v retrieving revision 1.51 retrieving revision 1.52 diff -u -d -r1.51 -r1.52 --- mockpp.h 3 Apr 2005 18:32:45 -0000 1.51 +++ mockpp.h 9 Apr 2005 15:32:45 -0000 1.52 @@ -104,7 +104,7 @@ # endif // _MSC_VER -#ifdef _MSC_VER +#ifdef _MSC_VER # if _MSC_VER <= 1300 # define _MSC_VER_60_70 # include <mockpp/mockpp_config-msvc_60_70.h> @@ -198,8 +198,11 @@ #define MOCKPP_UNUSED(x) #endif +//! Output char values more readable (e.g. non-alphanumeric as number) +#define MOCKPP_MAKE_CHAR_READABLE 1 + //! mockpp::Exception is derived from std::exception -#define MOCKPP_USE_STD_EXCEPTION +#define MOCKPP_USE_STD_EXCEPTION 1 #undef HAVE_MULTITHREAD // obsolete and error prone |
|
From: Ewald A. <ewa...@us...> - 2005-04-09 15:32:56
|
Update of /cvsroot/mockpp/mockpp/mockpp/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25765/mockpp/tests Modified Files: Formatter_test.cpp Log Message: make char/wchar_t more readable Index: Formatter_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/Formatter_test.cpp,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- Formatter_test.cpp 5 Mar 2005 14:53:41 -0000 1.22 +++ Formatter_test.cpp 9 Apr 2005 15:32:45 -0000 1.23 @@ -401,7 +401,11 @@ << (signed char)('7') << (signed char)('8') << (signed char)('9'); +#ifndef MOCKPP_MAKE_CHAR_READABLE MOCKPP_ASSERT_EQUALS(fmt, MOCKPP_PCSTRING("9876543210")); +#else + MOCKPP_ASSERT_EQUALS(fmt, MOCKPP_PCSTRING("{\"9\", 0x39}{\"8\", 0x38}{\"7\", 0x37}{\"6\", 0x36}{\"5\", 0x35}{\"4\", 0x34}{\"3\", 0x33}{\"2\", 0x32}{\"1\", 0x31}{\"0\", 0x30}")); +#endif fmt = MOCKPP_PCHAR("%9%8%7%6%5%4%3%2%1%0"); fmt << (unsigned char)('0') @@ -414,7 +418,11 @@ << (unsigned char)('7') << (unsigned char)('8') << (unsigned char)('9'); +#ifndef MOCKPP_MAKE_CHAR_READABLE MOCKPP_ASSERT_EQUALS(fmt, MOCKPP_PCSTRING("9876543210")); +#else + MOCKPP_ASSERT_EQUALS(fmt, MOCKPP_PCSTRING("{\"9\", 0x39}{\"8\", 0x38}{\"7\", 0x37}{\"6\", 0x36}{\"5\", 0x35}{\"4\", 0x34}{\"3\", 0x33}{\"2\", 0x32}{\"1\", 0x31}{\"0\", 0x30}")); +#endif fmt = MOCKPP_PCHAR("%9%8%7%6%5%4%3%2%1%0"); fmt << (char)('0') @@ -427,7 +435,11 @@ << (char)('7') << (char)('8') << (char)('9'); +#ifndef MOCKPP_MAKE_CHAR_READABLE MOCKPP_ASSERT_EQUALS(fmt, MOCKPP_PCSTRING("9876543210")); +#else + MOCKPP_ASSERT_EQUALS(fmt, MOCKPP_PCSTRING("{\"9\", 0x39}{\"8\", 0x38}{\"7\", 0x37}{\"6\", 0x36}{\"5\", 0x35}{\"4\", 0x34}{\"3\", 0x33}{\"2\", 0x32}{\"1\", 0x31}{\"0\", 0x30}")); +#endif fmt = MOCKPP_PCHAR("%9%8%7%6%5%4%3%2%1%0"); fmt << MOCKPP_CHAR('0') @@ -440,7 +452,11 @@ << MOCKPP_CHAR('7') << MOCKPP_CHAR('8') << MOCKPP_CHAR('9'); +#ifndef MOCKPP_MAKE_CHAR_READABLE MOCKPP_ASSERT_EQUALS(fmt, MOCKPP_PCSTRING("9876543210")); +#else + MOCKPP_ASSERT_EQUALS(fmt, MOCKPP_PCSTRING("{\"9\", 0x39}{\"8\", 0x38}{\"7\", 0x37}{\"6\", 0x36}{\"5\", 0x35}{\"4\", 0x34}{\"3\", 0x33}{\"2\", 0x32}{\"1\", 0x31}{\"0\", 0x30}")); +#endif } |
|
From: Ewald A. <ewa...@us...> - 2005-04-09 15:31:53
|
Update of /cvsroot/mockpp/mockpp/mockpp/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25421/mockpp/tests Modified Files: Makefile.am Added Files: readability_test.cpp Log Message: new test file --- NEW FILE: readability_test.cpp --- /*************************************************************************** readability_test.cpp - visually check readability of output ------------------- begin : Sat Apr 09 2005 copyright : (C) 2002-2005 by Ewald Arnold email : mockpp at ewald-arnold dot de $Id: readability_test.cpp,v 1.1 2005/04/09 15:31:42 ewald-arnold Exp $ ***************************************************************************/ /************************************************************************** * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as * published by the Free Software Foundation; either version 2 of the License, * or (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU Lesser General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * ***************************************************************************/ #include <mockpp/mockpp.h> // always first #include <iostream> #include <mockpp/ExpectationValue.h> #include <mockpp/MixedMockObject.h> #include <mockpp/util/AssertMo.h> #define MOCKPP_IMPORT_ABBREVIATED #include <mockpp/chaining/ChainingMockObjectSupport.h> #include <mockpp/chaining/mockpp_pti.h> #include "classes_ABCDE.h" class MyMixedMockObject : public mockpp::MixedMockObject { public: MyMixedMockObject() : mockpp::MixedMockObject(MOCKPP_PCHAR("MyMixedMockObject") , 0) , MOCKPP_CONSTRUCT_MEMBERS_FOR_CHAINABLE4(chain) , MOCKPP_CONSTRUCT_MEMBERS_FOR_VISITABLE4(visit) , MOCKPP_CONSTRUCT_MEMBERS_FOR_VOID_CHAINABLE4(void_chain) , MOCKPP_CONSTRUCT_MEMBERS_FOR_VOID_VISITABLE4(void_visit) , chainer(this) , void_chainer(this) , visiter(this) , void_visiter(this) {} MOCKPP_CHAINABLE4(MyMixedMockObject, int, chain, CA, CB, std::string, char); MOCKPP_VISITABLE4(MyMixedMockObject, int, visit, CA, CB, std::string, char); MOCKPP_VOID_CHAINABLE4(MyMixedMockObject, void_chain, CA, CB, std::string, char); MOCKPP_VOID_VISITABLE4(MyMixedMockObject, void_visit, CA, CB, std::string, char); MOCKPP_CHAINER_FOR(MyMixedMockObject, chain) chainer; MOCKPP_CHAINER_FOR(MyMixedMockObject, void_chain) void_chainer; MOCKPP_CONTROLLER_FOR(MyMixedMockObject, visit) visiter; MOCKPP_CONTROLLER_FOR(MyMixedMockObject, void_visit) void_visiter; }; void chainer_1() { MyMixedMockObject mmo; mmo.chainer.expects(exactly(3)) .with(eq(CA()), eq(CB(3)), stringContains(std::string("string")), eq<char>(123, 45)) .will(returnValue(321)); mmo.chainer.expects(atLeast(3)) .with(eq(CA(5)), eq(CB()), stringContains(std::string("no-string")), eq<char>(0x23)) .will(returnValue(123)); try { mmo.chain(CA(), CB(), "hallo", 12); } catch(std::exception &ex) { std::cout << ex.what() << std::endl; } } int main(int /* argc */, char ** /* argv */) { unsigned result = 0; std::cout << "Starting readability tests..\n"; try { chainer_1(); } catch(...) { std::cout << "Caught unexpected exception\n"; result = 1; } std::cout << "Finishing readability tests\n"; return result; } Index: Makefile.am =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/Makefile.am,v retrieving revision 1.72 retrieving revision 1.73 diff -u -d -r1.72 -r1.73 --- Makefile.am 3 Apr 2005 19:11:26 -0000 1.72 +++ Makefile.am 9 Apr 2005 15:31:42 -0000 1.73 @@ -2,15 +2,18 @@ CLEANFILES = *.~* *.~~* *~ -mock_test_LDADD = $(top_builddir)/mockpp/libmockpp.la $(LIBDL) -lstdc++ \ - $(EA_EXTRA_LIB) $(LIBCPPUNIT) +mock_test_LDADD = $(top_builddir)/mockpp/libmockpp.la \ + $(LIBDL) -lstdc++ $(EA_EXTRA_LIB) $(LIBCPPUNIT) -jmock_test_LDADD = $(top_builddir)/mockpp/libmockpp.la $(LIBDL) -lstdc++ \ - $(EA_EXTRA_LIB) $(LIBCPPUNIT) +jmock_test_LDADD = $(top_builddir)/mockpp/libmockpp.la \ + $(LIBDL) -lstdc++ $(EA_EXTRA_LIB) $(LIBCPPUNIT) + +readability_test_LDADD = $(top_builddir)/mockpp/libmockpp.la \ + $(LIBDL) -lstdc++ $(EA_EXTRA_LIB) $(LIBCPPUNIT) AM_LDFLAGS = $(all_libraries) -check_PROGRAMS = jmock_test mock_test +check_PROGRAMS = jmock_test mock_test readability_test SINGLE_TESTS = $(check_PROGRAMS) @@ -48,25 +51,27 @@ cat $$list.tmp | sort >$$list jmock_test_SOURCES = And_test.cpp IsAnything_test.cpp IsCloseTo_test.cpp \ - IsEqual_test.cpp IsGreaterOrEqual_test.cpp IsGreaterThan_test.cpp IsInstanceOf_test.cpp \ - IsLessOrEqual_test.cpp IsLessThan_test.cpp IsNot_test.cpp IsNothing_test.cpp IsSame_test.cpp \ - Or_test.cpp ReturnStub_test.cpp StringContains_test.cpp StubSequence_test.cpp \ - TestFailureStub_test.cpp ThrowStub_test.cpp VoidStub_test.cpp ChainingMockObjectSupport_test.cpp \ - CustomStub_test.cpp DefaultResultStub_test.cpp mock_test.cpp Invocation_test.cpp \ - AnyArgumentsMatcher_test.cpp InvokedRecorder_test.cpp InvokeAtLeastOnceMatcher_test.cpp \ - InvokeOnceMatcher_test.cpp InvokeCountMatcher_test.cpp InvokedAfterMatcher_test.cpp \ - TestFailureMatcher_test.cpp NoArgumentsMatcher_test.cpp ArgumentsMatcher_test.cpp \ - ConstraintSet_test.cpp ArgumentsMatchBuilder_test.cpp InvocationMockerBuilder_test.cpp \ - AbstractDynamicChainingMock_test.cpp AbstractInvocationDispatcher_test.cpp ChainingMockBuilder_test.cpp \ - CoreMock_test.cpp DynamicChainingMockError_test.cpp FIFOInvocationDispatcher_test.cpp \ - InvocationMocker_test.cpp LIFOInvocationDispatcher_test.cpp InvokeAtMostMatcher_test.cpp \ - InvokedBeforeMatcher_test.cpp StubBuilder_test.cpp MatchBuilder_test.cpp \ - InvokeAtLeastMatcher_test.cpp classes_ABCDE.cpp ChainableMockObject_1_test.cpp \ - ChainableMockObject_1_void_test.cpp ChainableMockObject_2_test.cpp ChainableMockObject_2_void_test.cpp \ - ChainableMockObject_3_test.cpp ChainableMockObject_3_void_test.cpp ChainableMockObject_4_test.cpp \ - ChainableMockObject_4_void_test.cpp ChainableMockObject_5_test.cpp ChainableMockObject_5_void_test.cpp \ - ChainableMockObject_test.cpp ChainableMockObject_void_test.cpp TypelessStubSequence_test.cpp \ - StringEndsWith_test.cpp StringStartsWith_test.cpp UnlimitedMatcher_test.cpp mockpp_pti_test.cpp + IsEqual_test.cpp IsGreaterOrEqual_test.cpp IsGreaterThan_test.cpp IsInstanceOf_test.cpp \ + IsLessOrEqual_test.cpp IsLessThan_test.cpp IsNot_test.cpp IsNothing_test.cpp IsSame_test.cpp \ + Or_test.cpp ReturnStub_test.cpp StringContains_test.cpp StubSequence_test.cpp \ + TestFailureStub_test.cpp ThrowStub_test.cpp VoidStub_test.cpp ChainingMockObjectSupport_test.cpp \ + CustomStub_test.cpp DefaultResultStub_test.cpp mock_test.cpp Invocation_test.cpp \ + AnyArgumentsMatcher_test.cpp InvokedRecorder_test.cpp InvokeAtLeastOnceMatcher_test.cpp \ + InvokeOnceMatcher_test.cpp InvokeCountMatcher_test.cpp InvokedAfterMatcher_test.cpp \ + TestFailureMatcher_test.cpp NoArgumentsMatcher_test.cpp ArgumentsMatcher_test.cpp \ + ConstraintSet_test.cpp ArgumentsMatchBuilder_test.cpp InvocationMockerBuilder_test.cpp \ + AbstractDynamicChainingMock_test.cpp AbstractInvocationDispatcher_test.cpp ChainingMockBuilder_test.cpp \ + CoreMock_test.cpp DynamicChainingMockError_test.cpp FIFOInvocationDispatcher_test.cpp \ + InvocationMocker_test.cpp LIFOInvocationDispatcher_test.cpp InvokeAtMostMatcher_test.cpp \ + InvokedBeforeMatcher_test.cpp StubBuilder_test.cpp MatchBuilder_test.cpp \ + InvokeAtLeastMatcher_test.cpp classes_ABCDE.cpp ChainableMockObject_1_test.cpp \ + ChainableMockObject_1_void_test.cpp ChainableMockObject_2_test.cpp ChainableMockObject_2_void_test.cpp \ + ChainableMockObject_3_test.cpp ChainableMockObject_3_void_test.cpp ChainableMockObject_4_test.cpp \ + ChainableMockObject_4_void_test.cpp ChainableMockObject_5_test.cpp ChainableMockObject_5_void_test.cpp \ + ChainableMockObject_test.cpp ChainableMockObject_void_test.cpp TypelessStubSequence_test.cpp \ + StringEndsWith_test.cpp StringStartsWith_test.cpp UnlimitedMatcher_test.cpp mockpp_pti_test.cpp + +readability_test_SOURCES = readability_test.cpp classes_ABCDE.cpp jmock_test_count: list=jmock_test.files; \ @@ -107,5 +112,6 @@ mock_test_LDFLAGS = -L/opt/intel_cc_80/lib -noinst_HEADERS = classes_ABCDE.h MyBuilderNamespace.h MyMatchBuilder.h +readability_test_LDFLAGS = -L/opt/intel_cc_80/lib +noinst_HEADERS = classes_ABCDE.h MyBuilderNamespace.h MyMatchBuilder.h |
|
From: Ewald A. <ewa...@us...> - 2005-04-08 21:44:02
|
Update of /cvsroot/mockpp/mockpp/mockpp/chaining In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21405/mockpp/chaining Modified Files: AbstractInvocationDispatcher.h Log Message: format multiline output Index: AbstractInvocationDispatcher.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/AbstractInvocationDispatcher.h,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- AbstractInvocationDispatcher.h 22 Mar 2005 22:03:22 -0000 1.14 +++ AbstractInvocationDispatcher.h 8 Apr 2005 21:43:51 -0000 1.15 @@ -139,16 +139,28 @@ private: /** Transforms the invokables to a human readable string. - * @return the string representation + * @param out_result reference to the output string */ - void writeInvokablesTo( String &result ) const + void writeInvokablesTo( String &out_result ) const { + unsigned lines = 0; + String result; for ( unsigned i = 0; i < invokables.size(); ++i ) + { if ( invokables[ i ] ->hasDescription() ) { - invokables[ i ] ->describeTo( result ); - result += MOCKPP_PCHAR( "\n" ); + ++lines; + String s; + invokables[ i ] ->describeTo( s ); + if (lines > 1) + s.insert(0, MOCKPP_PCHAR(" - ")); + result += s + MOCKPP_PCHAR( "\n" ); } + } + + if (lines > 1) + out_result += MOCKPP_PCHAR("\n - "); + out_result += result; } /** Checks if any invokable has a description. |
|
From: Ewald A. <ewa...@us...> - 2005-04-08 21:44:02
|
Update of /cvsroot/mockpp/mockpp/mockpp/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21405/mockpp/tests Modified Files: AbstractInvocationDispatcher_test.cpp Log Message: format multiline output Index: AbstractInvocationDispatcher_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/AbstractInvocationDispatcher_test.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- AbstractInvocationDispatcher_test.cpp 12 Mar 2005 17:50:55 -0000 1.18 +++ AbstractInvocationDispatcher_test.cpp 8 Apr 2005 21:43:51 -0000 1.19 @@ -34,7 +34,7 @@ # warning CppUnit not available at compile time #else - +#include <iostream> #include <mockpp/chaining/AbstractInvocationDispatcher.h> #include <cppunit/extensions/HelperMacros.h> @@ -202,8 +202,8 @@ ti2->description_result = true; s = MOCKPP_PCHAR("??") ; - CPPUNIT_ASSERT( aid.describeTo(s) == MOCKPP_PCHAR( "??t1\nt2\n" )); - CPPUNIT_ASSERT( s == MOCKPP_PCHAR( "??t1\nt2\n" )); + CPPUNIT_ASSERT( aid.describeTo(s) == MOCKPP_PCHAR( "??\n - t1\n - t2\n" )); + CPPUNIT_ASSERT( s == MOCKPP_PCHAR( "??\n - t1\n - t2\n" )); aid.clear(); s = MOCKPP_PCHAR(""); |
|
From: Ewald A. <ewa...@us...> - 2005-04-07 20:45:20
|
Update of /cvsroot/mockpp/mockpp/mockpp/chaining In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18640/mockpp/chaining Modified Files: AbstractDynamicChainingMock.h Log Message: cleanup Index: AbstractDynamicChainingMock.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/AbstractDynamicChainingMock.h,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- AbstractDynamicChainingMock.h 7 Apr 2005 20:31:10 -0000 1.30 +++ AbstractDynamicChainingMock.h 7 Apr 2005 20:45:10 -0000 1.31 @@ -73,8 +73,6 @@ class Describer : public InvocationMocker<R, I>::DescriberBase { - typedef InvocationMocker<R, I>::DescriberBase inherited; - public: /** Does the object provide meaningful description via describeTo() ?. |
|
From: Ewald A. <ewa...@us...> - 2005-04-07 20:40:39
|
Update of /cvsroot/mockpp/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15550 Modified Files: configure.in Log Message: inc version number Index: configure.in =================================================================== RCS file: /cvsroot/mockpp/mockpp/configure.in,v retrieving revision 1.73 retrieving revision 1.74 diff -u -d -r1.73 -r1.74 --- configure.in 3 Apr 2005 12:01:36 -0000 1.73 +++ configure.in 7 Apr 2005 20:40:16 -0000 1.74 @@ -17,11 +17,11 @@ # MOCKPP_MAJOR_VERSION=1 MOCKPP_MINOR_VERSION=7 -MOCKPP_PATCH_VERSION=0 +MOCKPP_PATCH_VERSION=1 -MOCKPP_MICRO_VERSION=25 -MOCKPP_INTERFACE_AGE=0 -MOCKPP_BINARY_AGE=3 +MOCKPP_MICRO_VERSION=26 +MOCKPP_INTERFACE_AGE=1 +MOCKPP_BINARY_AGE=4 MOCKPP_VERSION=$MOCKPP_MAJOR_VERSION.$MOCKPP_MINOR_VERSION.$MOCKPP_PATCH_VERSION |
|
From: Ewald A. <ewa...@us...> - 2005-04-07 20:38:15
|
Update of /cvsroot/mockpp/mockpp/mockpp/examples/tutorial In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14244/mockpp/examples/tutorial Modified Files: tutorial.doxygen.in Log Message: update Index: tutorial.doxygen.in =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/examples/tutorial/tutorial.doxygen.in,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- tutorial.doxygen.in 8 Jan 2005 09:22:53 -0000 1.4 +++ tutorial.doxygen.in 7 Apr 2005 20:38:06 -0000 1.5 @@ -58,7 +58,7 @@ EXCLUDE = EXCLUDE_SYMLINKS = NO EXCLUDE_PATTERNS = -EXAMPLE_PATH = +EXAMPLE_PATH = . EXAMPLE_PATTERNS = EXAMPLE_RECURSIVE = NO IMAGE_PATH = |
|
From: Ewald A. <ewa...@us...> - 2005-04-07 20:31:20
|
Update of /cvsroot/mockpp/mockpp/mockpp/chaining In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10219/mockpp/chaining Modified Files: AbstractDynamicChainingMock.h InvocationMocker.h Log Message: re-introduced patch for BCB5 Index: InvocationMocker.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/InvocationMocker.h,v retrieving revision 1.32 retrieving revision 1.33 diff -u -d -r1.32 -r1.33 --- InvocationMocker.h 4 Apr 2005 08:57:33 -0000 1.32 +++ InvocationMocker.h 7 Apr 2005 20:31:10 -0000 1.33 @@ -200,7 +200,7 @@ * @return The current content of the buffer data */ virtual String describeTo( String &result, - const typename std::vector<InvocationMatcher<I>*> &matchers, // const InvocationMockerBase<R,I>::List &matchers + const typename std::vector<InvocationMatcher<I>*> &matchers, Stub<R, I> *stub, const String &name ) const = 0; Index: AbstractDynamicChainingMock.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/AbstractDynamicChainingMock.h,v retrieving revision 1.29 retrieving revision 1.30 diff -u -d -r1.29 -r1.30 --- AbstractDynamicChainingMock.h 6 Apr 2005 20:13:27 -0000 1.29 +++ AbstractDynamicChainingMock.h 7 Apr 2005 20:31:10 -0000 1.30 @@ -73,6 +73,8 @@ class Describer : public InvocationMocker<R, I>::DescriberBase { + typedef InvocationMocker<R, I>::DescriberBase inherited; + public: /** Does the object provide meaningful description via describeTo() ?. @@ -99,7 +101,29 @@ return result; } +#ifdef __BORLANDC__ + + // prevent internal compiler error + + /** Appends the description of this object to the buffer. + * @param result the buffer that the description is appended to. + * @param matchers a list of matcher objects + * @param stub pointer to the stub + * @param name the object's name + * @return The current content of the buffer data + */ + String describeTo( String &result, + const typename std::vector<InvocationMatcher<I>*> &matchers, + TypelessStub<R>* stub, + const String &name ) const + { + return InvocationMocker<R, I>::DescriberBase::describeTo(result, matchers, adap.get(), name); + } + +#else using InvocationMocker<R, I>::DescriberBase::describeTo; +#endif + }; /** Verify that the expected value is within the allowed bounds. |
|
From: Ewald A. <ewa...@us...> - 2005-04-06 20:16:25
|
Update of /cvsroot/mockpp/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12531 Modified Files: ChangeLog TODO Log Message: update Index: TODO =================================================================== RCS file: /cvsroot/mockpp/mockpp/TODO,v retrieving revision 1.41 retrieving revision 1.42 diff -u -d -r1.41 -r1.42 --- TODO 6 Apr 2005 19:37:38 -0000 1.41 +++ TODO 6 Apr 2005 20:16:12 -0000 1.42 @@ -1,6 +1,4 @@ -Anzeigen: added item xx. does not match - DOC: ---- Index: ChangeLog =================================================================== RCS file: /cvsroot/mockpp/mockpp/ChangeLog,v retrieving revision 1.43 retrieving revision 1.44 diff -u -d -r1.43 -r1.44 --- ChangeLog 5 Apr 2005 19:34:26 -0000 1.43 +++ ChangeLog 6 Apr 2005 20:16:12 -0000 1.44 @@ -5,8 +5,10 @@ 2005-04-05 1.7.1: - fix for unicode on some cygwin platforms - fix for broken config files for MSVC and BCB5 + - fix for unicode on some cygwin platforms + - fix for broken config files for MSVC and BCB5 + - forbid copy classes with pointer inside + - improved some error messages 2005-04-03 1.7.0: |
Update of /cvsroot/mockpp/mockpp/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11299/mockpp Modified Files: VisitableMockObject.h VerifyingTestCase.h VerifiableList.h TrackingCounter.h ThrowableList.h MockObject.h ChainableMockObject.h Log Message: forbid copying Index: VerifyingTestCase.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/VerifyingTestCase.h,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- VerifyingTestCase.h 27 Feb 2005 11:48:14 -0000 1.19 +++ VerifyingTestCase.h 6 Apr 2005 20:15:19 -0000 1.20 @@ -93,6 +93,9 @@ private: + VerifyingTestCase (const VerifyingTestCase &); // forbid + VerifyingTestCase& operator=(VerifyingTestCase&); + std::vector<Verifiable*> registeredVerifiables; }; Index: ThrowableList.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/ThrowableList.h,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- ThrowableList.h 27 Feb 2005 11:48:14 -0000 1.16 +++ ThrowableList.h 6 Apr 2005 20:15:19 -0000 1.17 @@ -116,6 +116,9 @@ private: + ThrowableList (const ThrowableList &); // forbid + ThrowableList& operator=(ThrowableList&); + std::deque<Throwable *> list; std::deque<Throwable *> already_used; }; Index: TrackingCounter.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/TrackingCounter.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- TrackingCounter.h 27 Feb 2005 11:48:14 -0000 1.4 +++ TrackingCounter.h 6 Apr 2005 20:15:19 -0000 1.5 @@ -177,6 +177,9 @@ private: + TrackingCounterMaster (const TrackingCounterMaster &); // forbid + TrackingCounterMaster& operator=(TrackingCounterMaster&); + std::vector<TrackingCounterClient*> clients; unsigned myActualValue; }; @@ -249,6 +252,9 @@ private: + TrackingCounterClient (const TrackingCounterClient &); // forbid + TrackingCounterClient& operator=(TrackingCounterClient&); + std::vector<unsigned> countervalues; TrackingCounterMaster *master; unsigned myActualValue; Index: ChainableMockObject.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/ChainableMockObject.h,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- ChainableMockObject.h 6 Mar 2005 21:45:51 -0000 1.24 +++ ChainableMockObject.h 6 Apr 2005 20:15:20 -0000 1.25 @@ -105,7 +105,7 @@ /** Checks if there are any pending recorders left. If there are, an exception is * throw. - * @internal + * @internalVerifiableList */ void checkPendingRecorders() const; // @todo make private @@ -130,6 +130,9 @@ */ void storeID( const String &id, MatchBuilderAdapterBase *builder ); + ChainableMockObjectBase (const ChainableMockObjectBase &); // forbid + ChainableMockObjectBase& operator=(ChainableMockObjectBase&); + std::vector<MatchBuilderAdapterBase*> allBuilders; TableType idTable; mutable PendingType pendingRecorders; Index: VerifiableList.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/VerifiableList.h,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- VerifiableList.h 27 Feb 2005 11:48:14 -0000 1.16 +++ VerifiableList.h 6 Apr 2005 20:15:19 -0000 1.17 @@ -96,6 +96,9 @@ private: + VerifiableList (const VerifiableList &); // forbid + VerifiableList& operator=(VerifiableList&); + std::vector<Verifiable*> verifiables; }; Index: VisitableMockObject.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/VisitableMockObject.h,v retrieving revision 1.38 retrieving revision 1.39 diff -u -d -r1.38 -r1.39 --- VisitableMockObject.h 6 Mar 2005 21:45:52 -0000 1.38 +++ VisitableMockObject.h 6 Apr 2005 20:15:19 -0000 1.39 @@ -125,6 +125,9 @@ private: + VisitableMockObjectBase (const VisitableMockObjectBase &); // forbid + VisitableMockObjectBase& operator=(VisitableMockObjectBase&); + mutable ExpectationList<std::string> methodList; mutable bool activated; std::vector<Controller*> controllers; Index: MockObject.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/MockObject.h,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- MockObject.h 27 Feb 2005 11:48:14 -0000 1.20 +++ MockObject.h 6 Apr 2005 20:15:20 -0000 1.21 @@ -74,6 +74,9 @@ private: + MockObject (const MockObject &); // forbid + MockObject& operator=(MockObject&); + typedef std::vector<const Verifiable*> VerifierVec; /** |
|
From: Ewald A. <ewa...@us...> - 2005-04-06 20:13:37
|
Update of /cvsroot/mockpp/mockpp/mockpp/chaining In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9944/mockpp/chaining Modified Files: AbstractDynamicChainingMock.h Log Message: reverted previous "cleanup" Index: AbstractDynamicChainingMock.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/AbstractDynamicChainingMock.h,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- AbstractDynamicChainingMock.h 6 Apr 2005 19:27:13 -0000 1.28 +++ AbstractDynamicChainingMock.h 6 Apr 2005 20:13:27 -0000 1.29 @@ -46,7 +46,7 @@ namespace mockpp { - + /** Implementation of a chaining mock. * @internal @@ -98,8 +98,9 @@ { return result; } - }; + using InvocationMocker<R, I>::DescriberBase::describeTo; + }; /** Verify that the expected value is within the allowed bounds. * If it fails, an AssertionFailedError is thrown |
