mockpp-commits Mailing List for Mock Objects for C++ (Page 14)
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-12-13 14:54:40
|
Update of /cvsroot/mockpp/mockpp/msvc71/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv742/msvc71/mockpp Added Files: mockpp_cxxtest.vcproj Log Message: new --- NEW FILE: mockpp_cxxtest.vcproj --- <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" Version="7.10" Name="mockpp_cxxtest" ProjectGUID="{6AB18DF8-7204-4B80-AE27-0CDB36E321B4}" Keyword="MFCDLLProj"> <Platforms> <Platform Name="Win32"/> </Platforms> <Configurations> <Configuration Name="Debug|Win32" OutputDirectory="C:\tmp\compile\mockpp\production\Debug" IntermediateDirectory="c:\tmp\compile\mockpp\production\Debug" ConfigurationType="4" UseOfMFC="0" CharacterSet="2"> <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="../.." PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_USRDLL" MinimalRebuild="TRUE" BasicRuntimeChecks="3" RuntimeLibrary="3" TreatWChar_tAsBuiltInType="TRUE" UsePrecompiledHeader="0" WarningLevel="3" Detect64BitPortabilityProblems="TRUE" DebugInformationFormat="4"/> <Tool Name="VCCustomBuildTool"/> <Tool Name="VCLibrarianTool"/> <Tool Name="VCMIDLTool" PreprocessorDefinitions="_DEBUG" MkTypLibCompatible="FALSE"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPreLinkEventTool"/> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1031" AdditionalIncludeDirectories="$(IntDir)"/> <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool Name="VCXMLDataGeneratorTool"/> <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> </Configuration> <Configuration Name="Release|Win32" OutputDirectory="C:\tmp\compile\mockpp\production\Release" IntermediateDirectory="C:\tmp\compile\mockpp\production\Release" ConfigurationType="4" UseOfMFC="0" CharacterSet="2"> <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories="../.." PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_USRDLL" RuntimeLibrary="2" TreatWChar_tAsBuiltInType="TRUE" UsePrecompiledHeader="0" WarningLevel="3" Detect64BitPortabilityProblems="TRUE" DebugInformationFormat="3"/> <Tool Name="VCCustomBuildTool"/> <Tool Name="VCLibrarianTool"/> <Tool Name="VCMIDLTool" PreprocessorDefinitions="NDEBUG" MkTypLibCompatible="FALSE"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPreLinkEventTool"/> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1031" AdditionalIncludeDirectories="$(IntDir)"/> <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool Name="VCXMLDataGeneratorTool"/> <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> </Configuration> </Configurations> <References> </References> <Files> <Filter Name="Source Files" Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"> <File RelativePath="..\..\mockpp\production\TimeServer.cpp"> </File> </Filter> <Filter Name="Header Files" Filter="h;hpp;hxx;hm;inl;inc;xsd" UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"> <File RelativePath="..\..\mockpp\production\mockpp_cxxtest.h"> </File> <File RelativePath="..\..\mockpp\production\TimeServer.h"> </File> </Filter> </Files> <Globals> </Globals> </VisualStudioProject> |
|
From: Ewald A. <ewa...@us...> - 2005-12-13 14:54:40
|
Update of /cvsroot/mockpp/mockpp/msvc2005/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv742/msvc2005/mockpp Added Files: mockpp_cxxtest.vcproj Log Message: new --- NEW FILE: mockpp_cxxtest.vcproj --- <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" Version="8,00" Name="mockpp_cxxtest" ProjectGUID="{C46232E9-BB75-49BB-ADE6-306433257444}" Keyword="MFCDLLProj" > <Platforms> <Platform Name="Win32" /> </Platforms> <ToolFiles> </ToolFiles> <Configurations> <Configuration Name="Debug|Win32" OutputDirectory="$(TEMP)\compile\mockpp\cxxtest\Debug" IntermediateDirectory="$(TEMP)\compile\mockpp\cxxtest\Debug" ConfigurationType="4" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" CharacterSet="2" > <Tool Name="VCPreBuildEventTool" /> <Tool Name="VCCustomBuildTool" /> <Tool Name="VCXMLDataGeneratorTool" /> <Tool Name="VCWebServiceProxyGeneratorTool" /> <Tool Name="VCMIDLTool" PreprocessorDefinitions="_DEBUG" MkTypLibCompatible="false" /> <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="../.." PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_USRDLL" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" TreatWChar_tAsBuiltInType="true" UsePrecompiledHeader="0" WarningLevel="3" Detect64BitPortabilityProblems="true" DebugInformationFormat="4" /> <Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1031" AdditionalIncludeDirectories="$(IntDir)" /> <Tool Name="VCPreLinkEventTool" /> <Tool Name="VCLibrarianTool" /> <Tool Name="VCALinkTool" /> <Tool Name="VCXDCMakeTool" /> <Tool Name="VCBscMakeTool" /> <Tool Name="VCFxCopTool" /> <Tool Name="VCPostBuildEventTool" /> </Configuration> <Configuration Name="Release|Win32" OutputDirectory="$(TEMP)\compile\mockpp\production\Release" IntermediateDirectory="$(TEMP)\compile\mockpp\production\Release" ConfigurationType="4" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" CharacterSet="2" > <Tool Name="VCPreBuildEventTool" /> <Tool Name="VCCustomBuildTool" /> <Tool Name="VCXMLDataGeneratorTool" /> <Tool Name="VCWebServiceProxyGeneratorTool" /> <Tool Name="VCMIDLTool" PreprocessorDefinitions="NDEBUG" MkTypLibCompatible="false" /> <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories="../.." PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_USRDLL" RuntimeLibrary="2" TreatWChar_tAsBuiltInType="true" UsePrecompiledHeader="0" WarningLevel="3" Detect64BitPortabilityProblems="true" DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1031" AdditionalIncludeDirectories="$(IntDir)" /> <Tool Name="VCPreLinkEventTool" /> <Tool Name="VCLibrarianTool" /> <Tool Name="VCALinkTool" /> <Tool Name="VCXDCMakeTool" /> <Tool Name="VCBscMakeTool" /> <Tool Name="VCFxCopTool" /> <Tool Name="VCPostBuildEventTool" /> </Configuration> </Configurations> <References> </References> <Files> <Filter Name="Source Files" Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > <File RelativePath="..\..\3party\cxxtest\cxxtest\Descriptions.cpp" > </File> <File RelativePath="..\..\3party\cxxtest\cxxtest\DummyDescriptions.cpp" > </File> <File RelativePath="..\..\3party\cxxtest\cxxtest\GlobalFixture.cpp" > </File> <File RelativePath="..\..\3party\cxxtest\cxxtest\LinkedList.cpp" > </File> <File RelativePath="..\..\3party\cxxtest\cxxtest\RealDescriptions.cpp" > </File> <File RelativePath="..\..\3party\cxxtest\cxxtest\TestSuite.cpp" > </File> <File RelativePath="..\..\3party\cxxtest\cxxtest\TestTracker.cpp" > </File> <File RelativePath="..\..\3party\cxxtest\cxxtest\ValueTraits.cpp" > </File> </Filter> <Filter Name="Header Files" Filter="h;hpp;hxx;hm;inl;inc;xsd" UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" > <File RelativePath="..\..\3party\cxxtest\cxxtest\Descriptions.h" > </File> <File RelativePath="..\..\3party\cxxtest\cxxtest\DummyDescriptions.h" > </File> <File RelativePath="..\..\3party\cxxtest\cxxtest\ErrorFormatter.h" > </File> <File RelativePath="..\..\3party\cxxtest\cxxtest\ErrorPrinter.h" > </File> <File RelativePath="..\..\3party\cxxtest\cxxtest\Flags.h" > </File> <File RelativePath="..\..\3party\cxxtest\cxxtest\GlobalFixture.h" > </File> <File RelativePath="..\..\3party\cxxtest\cxxtest\Gui.h" > </File> <File RelativePath="..\..\3party\cxxtest\cxxtest\LinkedList.h" > </File> <File RelativePath="..\..\3party\cxxtest\cxxtest\Mock.h" > </File> <File RelativePath="..\..\3party\cxxtest\cxxtest\ParenPrinter.h" > </File> <File RelativePath="..\..\3party\cxxtest\cxxtest\QtGui.h" > </File> <File RelativePath="..\..\3party\cxxtest\cxxtest\RealDescriptions.h" > </File> <File RelativePath="..\..\3party\cxxtest\cxxtest\SelfTest.h" > </File> <File RelativePath="..\..\3party\cxxtest\cxxtest\StdHeaders.h" > </File> <File RelativePath="..\..\3party\cxxtest\cxxtest\StdioFilePrinter.h" > </File> <File RelativePath="..\..\3party\cxxtest\cxxtest\StdioPrinter.h" > </File> <File RelativePath="..\..\3party\cxxtest\cxxtest\StdValueTraits.h" > </File> <File RelativePath="..\..\3party\cxxtest\cxxtest\TeeListener.h" > </File> <File RelativePath="..\..\3party\cxxtest\cxxtest\TestListener.h" > </File> <File RelativePath="..\..\3party\cxxtest\cxxtest\TestRunner.h" > </File> <File RelativePath="..\..\3party\cxxtest\cxxtest\TestSuite.h" > </File> <File RelativePath="..\..\3party\cxxtest\cxxtest\TestTracker.h" > </File> <File RelativePath="..\..\3party\cxxtest\cxxtest\ValueTraits.h" > </File> <File RelativePath="..\..\3party\cxxtest\cxxtest\Win32Gui.h" > </File> <File RelativePath="..\..\3party\cxxtest\cxxtest\X11Gui.h" > </File> <File RelativePath="..\..\3party\cxxtest\cxxtest\YesNoRunner.h" > </File> </Filter> </Files> <Globals> </Globals> </VisualStudioProject> |
|
From: Ewald A. <ewa...@us...> - 2005-12-13 14:48:56
|
Update of /cvsroot/mockpp/mockpp/bcb5 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31840/bcb5 Added Files: mockpp_cxxtest.bpr mockpp_cxxtest.bpf Log Message: new --- NEW FILE: mockpp_cxxtest.bpf --- //--------------------------------------------------------------------------- This file is used by the project manager only and should be treated like the project file DllEntryPoint --- NEW FILE: mockpp_cxxtest.bpr --- <?xml version='1.0' encoding='utf-8' ?> <!-- C++Builder XML Project --> <PROJECT> <MACROS> <VERSION value="BCB.05.03"/> <PROJECT value="c:\tmp\compile\mockpp_cxxtest_34.dll"/> <OBJFILES value=""/> <RESFILES value=""/> <DEFFILE value=""/> <RESDEPEN value="$(RESFILES)"/> <LIBFILES value=""/> <LIBRARIES value=""/> <SPARELIBS value="VCL50.lib"/> <PACKAGES value="VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi ibsmp50.bpi VCLDBX50.bpi TEEUI50.bpi TEEDB50.bpi TEE50.bpi TEEQR50.bpi VCLIB50.bpi bcbie50.bpi VCLIE50.bpi INETDB50.bpi INET50.bpi NMFAST50.bpi dclocx50.bpi bcb2kaxserver50.bpi"/> <PATHCPP value=".;..\mockpp\production"/> <PATHPAS value=".;"/> <PATHRC value=".;"/> <PATHASM value=".;"/> <DEBUGLIBPATH value="$(BCB)\lib\debug"/> <RELEASELIBPATH value="$(BCB)\lib\release"/> <LINKER value="tlink32"/> <USERDEFINES value="__DLL___;_DEBUG"/> <SYSDEFINES value="NO_STRICT;_NO_VCL;_RTLDLL;USEPACKAGES"/> <MAINSOURCE value="mockpp_cxxtest.bpf"/> <INCLUDEPATH value="..\mockpp\production;..\..\mockpp;$(BCB)\include"/> <LIBPATH value="..\mockpp\production;..mockpp\builder;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\constraint;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\mockpp_34\matcher;..\mockpp_34\constraint;..\mockpp_34\builder;..\mockpp;..\mockpp_34\chaining;..\mockpp_34\compat;..\mockpp_34\util;..\..\mockpp-1.8.0;$(BCB)\lib\obj;$(BCB)\lib"/> <WARNINGS value="-w8092 -w8091 -w8090 -w8089 -w8087 -wprc -wuse -wucp -wstv -wstu -wpin -wnod -wnak -wdef -wcln -wbbf -wasm -wamp -wamb"/> </MACROS> <OPTIONS> <CFLAG1 value="-WD -vGc -vGt -vGd -Od -Vx -Ve -X- -r- -a8 -b- -k -y -v -vi- -tWD -tWM -c"/> <PFLAGS value="-N2"c:\tmp\compile\mockpp_34\" -N0"c:\tmp\compile\mockpp_34\" -$YD -$W -$O- -v -JPHNE -M"/> <RFLAGS value=""/> <AFLAGS value="/mx /w2 /zi"/> <LFLAGS value="-l"c:\tmp\compile\" -I"c:\tmp\compile\mockpp_34\" -D"" -aa -Tpd -x -Gn -Gi -v"/> </OPTIONS> <LINKER> <ALLOBJ value="c0d32.obj $(PACKAGES) $(OBJFILES)"/> <ALLRES value="$(RESFILES)"/> <ALLLIB value="cg32.lib $(LIBFILES) $(LIBRARIES) import32.lib cw32mti.lib"/> </LINKER> <IDEOPTIONS> [Version Info] IncludeVerInfo=0 AutoIncBuild=0 MajorVer=1 MinorVer=0 Release=0 Build=0 Debug=0 PreRelease=0 Special=0 Private=0 DLL=0 Locale=1031 CodePage=1252 [Version Info Keys] CompanyName= FileDescription= FileVersion=1.0.0.0 InternalName= LegalCopyright= LegalTrademarks= OriginalFilename= ProductName= ProductVersion=1.0.0.0 Comments= [HistoryLists\hlIncludePath] Count=30 Item0=..\mockpp\production;..;$(BCB)\include Item1=..\mockpp\production;..\..\mockpp;$(BCB)\include Item2=..\mockpp\production;..;..\..\mockpp;$(BCB)\include Item3=..\mockpp\production;.\..;$(BCB)\include Item4=..\mockpp\production;..\..\mockpp-1.8.0;$(BCB)\include Item5=..\..\mockpp-1.8.0;$(BCB)\include Item6=..\mockpp\production;..mockpp\builder;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\constraint;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\..\mockpp-1.8.0;$(BCB)\include;X:\cppunit-1.10.2\include\;..\..\cppunit-1.10\include Item7=..\mockpp\production;..mockpp\builder;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\constraint;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include Item8=..mockpp\builder;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\constraint;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include Item9=..mockpp\builder;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\constraint;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include Item10=..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include Item11=..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include Item12=..;$(BCB)\include;..\..\..\cppunit-1.10.2\include Item13=..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\..\cppunit-1.10\include Item14=..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\..\cppunit-1.10\include Item15=..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\mockpp_34\matcher;..\mockpp_34\constraint;..\mockpp_34\builder;..\mockpp;..\mockpp_34\chaining;..\mockpp_34\compat;..\mockpp_34\util;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include Item16=..\..\mockpp;$(BCB)\include;..\..\..\cppunit.ups\include Item17=..\mockpp_34\matcher;..\mockpp_34\constraint;..\mockpp_34\builder;..\mockpp_34\chaining;..\mockpp_34\compat;..\mockpp_34\util;..\mockpp;..\..\mockpp;$(BCB)\include;..\..\..\cppunit.ups\include Item18=..\mockpp;..;$(BCB)\include;..\..\..\cppunit.ups\include Item19=..\mockpp_34\builder;..\mockpp_34\matcher;..\mockpp_34\constraint;..\builder;\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp_34\matcher;\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp_34\constraint;\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp_34\builder;..\mockpp_34\chaining;\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp;\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp_34\chaining;mockpp;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp;..\mockpp_34\compat;..\mockpp_34\util;..\mockpp;..;$(BCB)\include;..\..\..\cppunit-1.8.0\include Item20=..\mockpp_34\builder;..\mockpp_34\matcher;..\mockpp_34\constraint;..\builder;\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp_34\matcher;\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp_34\constraint;\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp_34\builder;..\mockpp_34\chaining;\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp;\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp_34\chaining;mockpp;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp;..\mockpp_34\compat;..\mockpp_34\util;..\mockpp;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.8.0\include Item21=mockpp;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp;..\mockpp_34\compat;..\mockpp_34\util;..\mockpp;..\..\mockpp;$(BCB)\include;X:\Documents\src\cppunit-1.8.0\include Item22=mockpp;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp;..\mockpp_34\compat;..\mockpp_34\util;..\mockpp;..\..\mockpp;$(BCB)\include Item23=mockpp;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp;..\mockpp_34\compat;..\mockpp_34\util;..\mockpp;..;$(BCB)\include Item24=..;$(BCB)\include Item25=..\mockpp_34\compat;..\mockpp_34\util;..\mockpp;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp_34\compat;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp_34\util;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp;..\ulxmlrpcpp;..\..\mockpp;$(BCB)\include;$(BCB)\include\vcl Item26=..;$(BCB)\include;$(BCB)\include\vcl Item27=..\ulxmlrpcpp;C:\Programme\Borland\CBuilder5\Projects;\\SONNE\HOMES\src\ulxr\mockpp_34\mockpp;..;..\mockpp;..\expat;$(BCB)\include;$(BCB)\include\vcl;C:\wx2\include\ Item28=..\..\mockpp;..\mockpp;..\expat;$(BCB)\include;$(BCB)\include\vcl;C:\wx2\include\ Item29=..;..\mockpp;..\expat;$(BCB)\include;$(BCB)\include\vcl;C:\wx2\include\ [HistoryLists\hlLibraryPath] Count=18 Item0=..\mockpp\production;..mockpp\builder;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\constraint;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\mockpp_34\matcher;..\mockpp_34\constraint;..\mockpp_34\builder;..\mockpp;..\mockpp_34\chaining;..\mockpp_34\compat;..\mockpp_34\util;..\..\mockpp-1.8.0;$(BCB)\lib\obj;$(BCB)\lib Item1=..\mockpp\production;..mockpp\builder;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\constraint;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\mockpp_34\matcher;..\mockpp_34\constraint;..\mockpp_34\builder;..\mockpp;..\mockpp_34\chaining;..\mockpp_34\compat;..\mockpp_34\util;..;$(BCB)\lib\obj;$(BCB)\lib Item2=..mockpp\builder;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\constraint;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\mockpp_34\matcher;..\mockpp_34\constraint;..\mockpp_34\builder;..\mockpp;..\mockpp_34\chaining;..\mockpp_34\compat;..\mockpp_34\util;..;$(BCB)\lib\obj;$(BCB)\lib Item3=..mockpp\builder;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\constraint;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\mockpp_34\matcher;..\mockpp_34\constraint;..\mockpp_34\builder;..\mockpp;..\mockpp_34\chaining;..\mockpp_34\compat;..\mockpp_34\util;..\..\mockpp;$(BCB)\lib\obj;$(BCB)\lib Item4=..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\mockpp_34\matcher;..\mockpp_34\constraint;..\mockpp_34\builder;..\mockpp;..\mockpp_34\chaining;..\mockpp_34\compat;..\mockpp_34\util;..;$(BCB)\lib\obj;$(BCB)\lib Item5=..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\mockpp_34\matcher;..\mockpp_34\constraint;..\mockpp_34\builder;..\mockpp;..\mockpp_34\chaining;..\mockpp_34\compat;..\mockpp_34\util;..\..\mockpp;$(BCB)\lib\obj;$(BCB)\lib Item6=..;$(BCB)\lib\obj;$(BCB)\lib Item7=..\mockpp_34\matcher;..\mockpp_34\constraint;..\mockpp_34\builder;..\mockpp;..\mockpp_34\chaining;..\mockpp_34\compat;..\mockpp_34\util;..;$(BCB)\lib\obj;$(BCB)\lib Item8=..\mockpp_34\matcher;..\mockpp_34\constraint;..\mockpp_34\builder;..\mockpp;..\mockpp_34\chaining;..\mockpp_34\compat;..\mockpp_34\util;..\..\mockpp;$(BCB)\lib\obj;$(BCB)\lib Item9=..\mockpp_34\builder;..\mockpp_34\matcher;..\mockpp_34\constraint;..\builder;\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp_34\matcher;\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp_34\constraint;\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp_34\builder;..\mockpp_34\chaining;\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp;\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp_34\chaining;mockpp;..\mockpp_34\compat;..\mockpp_34\util;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp_34\compat;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp_34\util;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp;..\ulxmlrpcpp;C:\Programme\Borland\CBuilder5\Projects\;\\SONNE\HOMES\src\ulxr\mockpp_34\mockpp;..\mockpp;..\expat;$(BCB)\lib\obj;$(BCB)\lib;c:\tmp\compile\mockpp_34\ Item10=mockpp;..\mockpp_34\compat;..\mockpp_34\util;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp_34\compat;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp_34\util;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp;..\ulxmlrpcpp;C:\Programme\Borland\CBuilder5\Projects\;\\SONNE\HOMES\src\ulxr\mockpp_34\mockpp;..\mockpp;..\expat;$(BCB)\lib\obj;$(BCB)\lib;c:\tmp\compile\mockpp_34\ Item11=..\mockpp_34\compat;..\mockpp_34\util;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp_34\compat;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp_34\util;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp;..\ulxmlrpcpp;C:\Programme\Borland\CBuilder5\Projects\;\\SONNE\HOMES\src\ulxr\mockpp_34\mockpp;..\mockpp;..\expat;$(BCB)\lib\obj;$(BCB)\lib;c:\tmp\compile\mockpp_34\ Item12=..\ulxmlrpcpp;C:\Programme\Borland\CBuilder5\Projects;\\SONNE\HOMES\src\ulxr\mockpp_34\mockpp;..\mockpp;..\expat;$(BCB)\lib\obj;$(BCB)\lib;c:\tmp\compile\mockpp_34\ Item13=..\mockpp;..\expat;$(BCB)\lib\obj;$(BCB)\lib;c:\tmp\compile\mockpp_34\ Item14=..\mockpp;..\expat;$(BCB)\lib\obj;$(BCB)\lib;c:\temp Item15=..\mockpp;..\expat;$(BCB)\lib\obj;$(BCB)\lib Item16=..\expat;$(BCB)\lib\obj;$(BCB)\lib Item17=..\mockpp;$(BCB)\lib\obj;$(BCB)\lib [HistoryLists\hlDebugSourcePath] Count=1 Item0=$(BCB)\source\vcl [HistoryLists\hlConditionals] Count=6 Item0=__DLL___;_DEBUG Item1=__DLL___ Item2=_DEBUG;DEBUG;__DLL___ Item3=_DEBUG;ULXR_SHOW_CONTENT;ULXR_SHOW_HTTP;ULXR_SHOW_WRTIE;ULXR_SHOW_READ;ULXR_SHOW_XML;DEBUG;__DLL___ Item4=_DEBUG;__DLL__ Item5=_DEBUG [HistoryLists\hlIntOutputDir] Count=3 Item0=c:\tmp\compile\mockpp_34\ Item1=c:\temp Item2=output [HistoryLists\hlFinalOutputDir] Count=5 Item0=c:\tmp\compile\ Item1=c:\tmp\compile\mockpp_34\ Item2=c:\temp Item3=output\ Item4=output [HistoryLists\hIBPIOutputDir] Count=5 Item0=c:\tmp\compile\ Item1=c:\tmp\compile\mockpp_34\ Item2=c:\temp Item3=E:\Eigene Dateien\c++\mockpp_34\bcb5\output\ Item4=output [Debugging] DebugSourceDirs=$(BCB)\source\vcl [Parameters] RunParams= HostApplication=c:\tmp\compile\mock_test.exe RemoteHost= RemotePath= RemoteDebug=0 [Compiler] ShowInfoMsgs=0 LinkDebugVcl=0 LinkCGLIB=1 [Language] ActiveLang= ProjectLang= RootDir= </IDEOPTIONS> </PROJECT> |
|
From: Ewald A. <ewa...@us...> - 2005-12-11 20:47:09
|
Update of /cvsroot/mockpp/mockpp/mockpp/framework In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9020/mockpp/framework Modified Files: SelectUnittestFramework.h Log Message: disable exceptions Index: SelectUnittestFramework.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/framework/SelectUnittestFramework.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- SelectUnittestFramework.h 10 Dec 2005 21:57:37 -0000 1.2 +++ SelectUnittestFramework.h 11 Dec 2005 20:47:01 -0000 1.3 @@ -1,5 +1,5 @@ /*************************************************************************** - SelectUnittestFramework.h - setup for unittest framework in use + SelectUnittestFramework.h - setup for unittest framework in use ------------------- begin : Fri Dec 9 2005 copyright : (C) 2002-2005 by Ewald Arnold @@ -35,19 +35,21 @@ # define MOCKPP_DERIVE_PUBLIC_UNITFRAMEWORK : public CxxTest::TestSuite #define CXXTEST_HAVE_STD -#define CXXTEST_ABORT_TEST_ON_FAIL #ifndef CXXTEST_RUNNING #define CXXTEST_RUNNING #endif #define _CXXTEST_HAVE_STD + +#ifndef MOCKPP_NO_EXCEPTIONS +#define CXXTEST_ABORT_TEST_ON_FAIL #define _CXXTEST_HAVE_EH +#endif + #include <cxxtest/TestListener.h> #include <cxxtest/TestTracker.h> #include <cxxtest/RealDescriptions.h> -//#include <cxxtest/TestRunner.h> - #include <mockpp/framework/CxxTestSupport.h> #elif defined(HAVE_CPPUNIT) |
|
From: Ewald A. <ewa...@us...> - 2005-12-11 20:11:46
|
Update of /cvsroot/mockpp/mockpp/mockpp/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2613/mockpp/tests Modified Files: Makefile.am Log Message: fix warning Index: Makefile.am =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/Makefile.am,v retrieving revision 1.95 retrieving revision 1.96 diff -u -d -r1.95 -r1.96 --- Makefile.am 11 Dec 2005 20:09:53 -0000 1.95 +++ Makefile.am 11 Dec 2005 20:11:33 -0000 1.96 @@ -107,7 +107,7 @@ mock_test_x11_SOURCES = mock_test_x11.cpp $(libmocktesting_la_SOURCES) -mock_test_win32_SOURCES = mock_test_win32.cpp $(libmocktesting_la_SOURCES) +#mock_test_win32_SOURCES = mock_test_win32.cpp $(libmocktesting_la_SOURCES) mock_test_SOURCES = mock_test.cpp $(libmocktesting_la_SOURCES) @@ -129,7 +129,7 @@ mock_test_x11_LDFLAGS = -L/opt/intel_cc_80/lib -L/usr/X11R6/lib -mock_test_win32_LDFLAGS = -L/opt/intel_cc_80/lib -L/windows +#mock_test__LDFLAGS = -L/opt/intel_cc_80/lib -L/windows readability_test_LDFLAGS = -L/opt/intel_cc_80/lib |
|
From: Ewald A. <ewa...@us...> - 2005-12-11 20:10:04
|
Update of /cvsroot/mockpp/mockpp/mockpp/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2248/mockpp/tests Modified Files: Makefile.am Log Message: prepared win32 version Index: Makefile.am =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/Makefile.am,v retrieving revision 1.94 retrieving revision 1.95 diff -u -d -r1.94 -r1.95 --- Makefile.am 11 Dec 2005 20:03:44 -0000 1.94 +++ Makefile.am 11 Dec 2005 20:09:53 -0000 1.95 @@ -7,6 +7,7 @@ AM_LDFLAGS = $(all_libraries) +#mock_test_win32 check_PROGRAMS = mock_test \ mock_test_qt mock_test_x11 \ jmock_test \ @@ -22,37 +23,24 @@ AM_CXXFLAGS = -I$(QTDIR)/include -I/usr/X11R6/include -#readability_CXXFLAGS = - -#check_inst_CXXFLAGS = - -#mock_test_CXXFLAGS = - -#jmock_test_CXXFLAGS = - -#mock_test_qt_CXXFLAGS = -I$(QTDIR)/include -DGUI_QT - -#mock_test_x11_CXXFLAGS = -I/usr/X11R6/include -DGUI_X11 - ########################################################################### if BUILTIN_CXXTEST cxxtest_lib=$(top_builddir)/3party/cxxtest/cxxtest/libmockpp_cxxtest.la endif -#libmocktesting.la mock_test_LDADD = $(top_builddir)/mockpp/libmockpp.la \ $(cxxtest_lib) $(LIBDL) -lstdc++ $(EA_EXTRA_LIB) -#libmocktesting.la mock_test_qt_LDADD = $(top_builddir)/mockpp/libmockpp.la \ $(cxxtest_lib) $(LIBDL) -lstdc++ $(EA_EXTRA_LIB) -lqt-mt -#libmocktesting.la mock_test_x11_LDADD = $(top_builddir)/mockpp/libmockpp.la \ $(cxxtest_lib) $(LIBDL) -lstdc++ $(EA_EXTRA_LIB) -lX11 -#libjmocktesting.la +#mock_test_win32_LDADD = $(top_builddir)/mockpp/libmockpp.la \ +# $(cxxtest_lib) $(LIBDL) -lstdc++ $(EA_EXTRA_LIB) -lwindows + jmock_test_LDADD = $(top_builddir)/mockpp/libmockpp.la \ $(cxxtest_lib) $(LIBDL) -lstdc++ $(EA_EXTRA_LIB) @@ -74,8 +62,6 @@ ########################################################################### -#noinst_LTLIBRARIES = libmocktesting.la libjmocktesting.la - libmocktesting_la_SOURCES = \ VisitableMockObject_test.cpp \ Formatter_test.cpp Throwable_test.cpp ThrowableList_test.cpp ExpectationCounter_test.cpp \ @@ -121,6 +107,8 @@ mock_test_x11_SOURCES = mock_test_x11.cpp $(libmocktesting_la_SOURCES) +mock_test_win32_SOURCES = mock_test_win32.cpp $(libmocktesting_la_SOURCES) + mock_test_SOURCES = mock_test.cpp $(libmocktesting_la_SOURCES) jmock_test_SOURCES = mock_test.cpp $(libjmocktesting_la_SOURCES) @@ -141,6 +129,8 @@ mock_test_x11_LDFLAGS = -L/opt/intel_cc_80/lib -L/usr/X11R6/lib +mock_test_win32_LDFLAGS = -L/opt/intel_cc_80/lib -L/windows + readability_test_LDFLAGS = -L/opt/intel_cc_80/lib check_inst_LDFLAGS = -L/opt/intel_cc_80/lib |
|
From: Ewald A. <ewa...@us...> - 2005-12-11 20:05:11
|
Update of /cvsroot/mockpp/mockpp/mockpp/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1267/mockpp/tests Added Files: mock_test_win32.cpp mock_test_x11.cpp Log Message: migrate to cxxtest --- NEW FILE: mock_test_x11.cpp --- #define GUI_X11 #include "mock_test.cpp" --- NEW FILE: mock_test_win32.cpp --- #define GUI_WIN32 #include "mock_test.cpp" |
Update of /cvsroot/mockpp/mockpp/mockpp/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv926/mockpp/tests Modified Files: AbstractDynamicChainingMock_test.cpp AbstractInvocationDispatcher_test.cpp AnyArgumentsMatcher_test.cpp ArgumentsMatchBuilder_test.cpp ArgumentsMatcher_test.cpp AssertMo_test.cpp Assert_test.cpp ChainableMockMethod_1_test.cpp ChainableMockMethod_2_test.cpp ChainableMockMethod_test.cpp ChainableMockObjectPolymorphism_test.cpp ChainableMockObject_1_test.cpp ChainableMockObject_1_void_test.cpp ChainableMockObject_2_test.cpp ChainableMockObject_2_void_test.cpp ChainableMockObject_3_test.cpp ChainableMockObject_3_void_test.cpp ChainableMockObject_4_test.cpp ChainableMockObject_4_void_test.cpp ChainableMockObject_5_test.cpp ChainableMockObject_5_void_test.cpp ChainableMockObject_test.cpp ChainableMockObject_void_test.cpp ChainingMockBuilder_test.cpp ChainingMockObjectSupport_test.cpp ConstraintList_test.cpp ConstraintSet_test.cpp CoreMock_test.cpp CustomStub_test.cpp DefaultResultStub_test.cpp DynamicChainingMockError_test.cpp ExpectationBoundary_test.cpp ExpectationConglomeration_test.cpp ExpectationCounterRange_test.cpp ExpectationCounter_test.cpp ExpectationList_test.cpp ExpectationMap_test.cpp ExpectationSegment_test.cpp ExpectationSet_test.cpp ExpectationValue_test.cpp FIFOInvocationDispatcher_test.cpp Formatter_test.cpp IncCounter.h InvocationMockerBuilder_test.cpp InvocationMocker_test.cpp Invocation_test.cpp InvokeAtLeastMatcher_test.cpp InvokeAtLeastOnceMatcher_test.cpp InvokeAtMostMatcher_test.cpp InvokeCountMatcher_test.cpp InvokeOnceMatcher_test.cpp InvokedAfterMatcher_test.cpp InvokedBeforeMatcher_test.cpp InvokedRecorder_test.cpp IsAnything_test.cpp IsCloseTo_test.cpp IsEqual_test.cpp IsGreaterOrEqual_test.cpp IsGreaterThan_test.cpp IsInstanceOf_test.cpp IsLessOrEqual_test.cpp IsLessThan_test.cpp IsNot_test.cpp IsNothing_test.cpp IsSame_test.cpp LIFOInvocationDispatcher_test.cpp Makefile.am MatchBuilder_test.cpp MixedMockObject_5_test.cpp MockObject_test.cpp NoArgumentsMatcher_test.cpp NoException_test.cpp Or_test.cpp OutBound_test.cpp ResponseVector_test.cpp ReturnObjectList_test.cpp ReturnStub_test.cpp StringContains_test.cpp StringEndsWith_test.cpp StringStartsWith_test.cpp StubBuilder_test.cpp StubSequence_test.cpp TestFailureMatcher_test.cpp TestFailureStub_test.cpp ThrowStub_test.cpp ThrowableList_test.cpp Throwable_test.cpp TimeServer_test.cpp TrackingCounter_test.cpp TypelessStubSequence_test.cpp UnlimitedMatcher_test.cpp Verifiable_test.cpp VerifyingTestCaller_test.cpp VerifyingTestCase_test.cpp VisitableMockMethod_1_test.cpp VisitableMockMethod_2_test.cpp VisitableMockMethod_test.cpp VisitableMockObject_1_test.cpp VisitableMockObject_1_void_test.cpp VisitableMockObject_2_test.cpp VisitableMockObject_2_void_test.cpp VisitableMockObject_3_test.cpp VisitableMockObject_3_void_test.cpp VisitableMockObject_4_test.cpp VisitableMockObject_4_void_test.cpp VisitableMockObject_5_test.cpp VisitableMockObject_5_void_test.cpp VisitableMockObject_template_test.cpp VisitableMockObject_test.cpp VisitableMockObject_void_test.cpp VoidStub_test.cpp mock_test.cpp mock_test_qt.cpp mockpp_pti_test.cpp Log Message: migrate to cxxtest Index: Or_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/Or_test.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- Or_test.cpp 9 Dec 2005 18:56:20 -0000 1.12 +++ Or_test.cpp 11 Dec 2005 20:03:44 -0000 1.13 @@ -65,6 +65,10 @@ #if defined (HAVE_CXXTEST) +MOCKPP_CXXTEST_SUITE_REGISTRATION( Or_test ); +MOCKPP_CXXTEST(Or_test, test_describe); +MOCKPP_CXXTEST(Or_test, test_invoke); + #elif defined(HAVE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (Or_test); Index: TestFailureMatcher_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/TestFailureMatcher_test.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- TestFailureMatcher_test.cpp 9 Dec 2005 18:56:20 -0000 1.10 +++ TestFailureMatcher_test.cpp 11 Dec 2005 20:03:44 -0000 1.11 @@ -59,6 +59,9 @@ #if defined (HAVE_CXXTEST) +MOCKPP_CXXTEST_SUITE_REGISTRATION( TestFailureMatcher_test ); +MOCKPP_CXXTEST(TestFailureMatcher_test, test_invoke); + #elif defined(HAVE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (TestFailureMatcher_test); Index: DynamicChainingMockError_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/DynamicChainingMockError_test.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- DynamicChainingMockError_test.cpp 9 Dec 2005 18:56:20 -0000 1.16 +++ DynamicChainingMockError_test.cpp 11 Dec 2005 20:03:44 -0000 1.17 @@ -67,6 +67,9 @@ #if defined (HAVE_CXXTEST) +MOCKPP_CXXTEST_SUITE_REGISTRATION( DynamicChainingMockError_test ); +MOCKPP_CXXTEST(DynamicChainingMockError_test, test_describe); + #elif defined(HAVE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (DynamicChainingMockError_test); Index: AbstractDynamicChainingMock_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/AbstractDynamicChainingMock_test.cpp,v retrieving revision 1.34 retrieving revision 1.35 diff -u -d -r1.34 -r1.35 --- AbstractDynamicChainingMock_test.cpp 9 Dec 2005 18:56:20 -0000 1.34 +++ AbstractDynamicChainingMock_test.cpp 11 Dec 2005 20:03:44 -0000 1.35 @@ -65,14 +65,14 @@ CPPUNIT_TEST_SUITE( AbstractDynamicChainingMock_test ); - CPPUNIT_TEST( test_void_invocation ); - CPPUNIT_TEST( test_invocation ); - CPPUNIT_TEST( test_describer ); - CPPUNIT_TEST( test_describe ); - CPPUNIT_TEST( test_void_describe ); - CPPUNIT_TEST( test_verify ); + CPPUNIT_TEST( test_void_invocation ); + CPPUNIT_TEST( test_invocation ); + CPPUNIT_TEST( test_describer ); + CPPUNIT_TEST( test_describe ); + CPPUNIT_TEST( test_void_describe ); + CPPUNIT_TEST( test_verify ); - CPPUNIT_TEST_SUITE_END(); +CPPUNIT_TEST_SUITE_END(); #endif @@ -89,6 +89,14 @@ #if defined (HAVE_CXXTEST) +MOCKPP_CXXTEST_SUITE_REGISTRATION(AbstractDynamicChainingMock_test); +MOCKPP_CXXTEST(AbstractDynamicChainingMock_test, test_void_invocation ); +MOCKPP_CXXTEST(AbstractDynamicChainingMock_test, test_invocation ); +MOCKPP_CXXTEST(AbstractDynamicChainingMock_test, test_describer ); +MOCKPP_CXXTEST(AbstractDynamicChainingMock_test, test_describe ); +MOCKPP_CXXTEST(AbstractDynamicChainingMock_test, test_void_describe ); +MOCKPP_CXXTEST(AbstractDynamicChainingMock_test, test_verify ); + #elif defined(HAVE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION ( AbstractDynamicChainingMock_test ); Index: IsInstanceOf_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/IsInstanceOf_test.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- IsInstanceOf_test.cpp 9 Dec 2005 18:56:20 -0000 1.15 +++ IsInstanceOf_test.cpp 11 Dec 2005 20:03:44 -0000 1.16 @@ -66,6 +66,10 @@ #if defined (HAVE_CXXTEST) +MOCKPP_CXXTEST_SUITE_REGISTRATION( IsInstanceOf_test ); +MOCKPP_CXXTEST(IsInstanceOf_test, test_describe); +MOCKPP_CXXTEST(IsInstanceOf_test, test_invoke); + #elif defined(HAVE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (IsInstanceOf_test); Index: ExpectationList_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ExpectationList_test.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- ExpectationList_test.cpp 9 Dec 2005 18:56:20 -0000 1.18 +++ ExpectationList_test.cpp 11 Dec 2005 20:03:44 -0000 1.19 @@ -58,13 +58,13 @@ CPPUNIT_TEST(test_expectActualVerify); CPPUNIT_TEST(test_ifNoExpected); - CPPUNIT_TEST_EXCEPTION(fail_clearActual, mockpp::AssertionFailedError); - CPPUNIT_TEST_EXCEPTION(fail_expectActualImmediate, mockpp::AssertionFailedError); - CPPUNIT_TEST_EXCEPTION(fail_expectActualVerify, mockpp::AssertionFailedError); - CPPUNIT_TEST_EXCEPTION(fail_expectNothing, mockpp::AssertionFailedError); - CPPUNIT_TEST_EXCEPTION(fail_many, mockpp::AssertionFailedError); + CPPUNIT_TEST(fail_clearActual); + CPPUNIT_TEST(fail_expectActualImmediate); + CPPUNIT_TEST(fail_expectActualVerify); + CPPUNIT_TEST(fail_expectNothing); + CPPUNIT_TEST(fail_many); - CPPUNIT_TEST_EXCEPTION(fail_ifNoActual, mockpp::AssertionFailedError); + CPPUNIT_TEST(fail_ifNoActual); CPPUNIT_TEST_SUITE_END(); @@ -96,6 +96,29 @@ #if defined (HAVE_CXXTEST) +MOCKPP_CXXTEST_SUITE_REGISTRATION( ExpectationList_test ); + +MOCKPP_CXXTEST(ExpectationList_test, test_chain); +MOCKPP_CXXTEST(ExpectationList_test, test_hasExpectations); +MOCKPP_CXXTEST(ExpectationList_test, test_name); +MOCKPP_CXXTEST(ExpectationList_test, test_many); +MOCKPP_CXXTEST(ExpectationList_test, test_balance); +MOCKPP_CXXTEST(ExpectationList_test, test_clear); + +MOCKPP_CXXTEST(ExpectationList_test, test_expectNothing); +MOCKPP_CXXTEST(ExpectationList_test, test_expectNothing_revoked); +MOCKPP_CXXTEST(ExpectationList_test, test_expectActualImmediate); +MOCKPP_CXXTEST(ExpectationList_test, test_expectActualVerify); +MOCKPP_CXXTEST(ExpectationList_test, test_ifNoExpected); + +MOCKPP_CXXTEST(ExpectationList_test, fail_clearActual); +MOCKPP_CXXTEST(ExpectationList_test, fail_expectActualImmediate); +MOCKPP_CXXTEST(ExpectationList_test, fail_expectActualVerify); +MOCKPP_CXXTEST(ExpectationList_test, fail_expectNothing); +MOCKPP_CXXTEST(ExpectationList_test, fail_many); + +MOCKPP_CXXTEST(ExpectationList_test, fail_ifNoActual); + #elif defined(HAVE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (ExpectationList_test); @@ -160,7 +183,18 @@ ec.addExpected(3); ec.addActual(3); ec.clearActual(); - ec.verify(); + bool thrown = false; + MOCKPP_TRY + { + ec.verify(); + } +#ifndef MOCKPP_NO_EXCEPTIONS + catch(mockpp::AssertionFailedError &) + { + thrown = true; + } +#endif + MOCKPP_ASSERT_TRUE(thrown == true); } @@ -175,7 +209,18 @@ { mockpp::ExpectationList<int> ec (MOCKPP_PCHAR("nothingList"), 0); ec.addExpected(3); - ec.verify(); // fails because no value + bool thrown = false; + MOCKPP_TRY + { + ec.verify(); // fails because no value + } +#ifndef MOCKPP_NO_EXCEPTIONS + catch(mockpp::AssertionFailedError &) + { + thrown = true; + } +#endif + MOCKPP_ASSERT_TRUE(thrown == true); } @@ -208,7 +253,18 @@ { mockpp::ExpectationList<int> ec (MOCKPP_PCHAR("nothingList"), 0); doNothing(ec); - ec.addActual(3); // fails even if equal + bool thrown = false; + MOCKPP_TRY + { + ec.addActual(3); // fails even if equal + } +#ifndef MOCKPP_NO_EXCEPTIONS + catch(mockpp::AssertionFailedError &) + { + thrown = true; + } +#endif + MOCKPP_ASSERT_TRUE(thrown == true); } @@ -251,7 +307,18 @@ int prep[10] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 }; ec.addExpected(prep+0, prep+10); - ec.addActual(prep+2, prep+10); + bool thrown = false; + MOCKPP_TRY + { + ec.addActual(prep+2, prep+10); + } +#ifndef MOCKPP_NO_EXCEPTIONS + catch(mockpp::AssertionFailedError &) + { + thrown = true; + } +#endif + MOCKPP_ASSERT_TRUE(thrown == true); } @@ -259,7 +326,18 @@ { mockpp::ExpectationList<int> ec (MOCKPP_PCHAR("actualList"), 0); doActualImmediate(ec); - ec.addActual(4321); // fails + bool thrown = false; + MOCKPP_TRY + { + ec.addActual(4321); // fails + } +#ifndef MOCKPP_NO_EXCEPTIONS + catch(mockpp::AssertionFailedError &) + { + thrown = true; + } +#endif + MOCKPP_ASSERT_TRUE(thrown == true); } @@ -282,7 +360,18 @@ { mockpp::ExpectationList<int> ec (MOCKPP_PCHAR("verifyList"), 0); doActualVerify(ec); // no fail - ec.verify(); // fails + bool thrown = false; + MOCKPP_TRY + { + ec.verify(); // fails + } +#ifndef MOCKPP_NO_EXCEPTIONS + catch(mockpp::AssertionFailedError &) + { + thrown = true; + } +#endif + MOCKPP_ASSERT_TRUE(thrown == true); } Index: IsLessThan_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/IsLessThan_test.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- IsLessThan_test.cpp 9 Dec 2005 18:56:20 -0000 1.8 +++ IsLessThan_test.cpp 11 Dec 2005 20:03:44 -0000 1.9 @@ -62,6 +62,10 @@ #if defined (HAVE_CXXTEST) +MOCKPP_CXXTEST_SUITE_REGISTRATION( IsLessThan_test ); +MOCKPP_CXXTEST(IsLessThan_test, test_describe); +MOCKPP_CXXTEST(IsLessThan_test, test_invoke); + #elif defined(HAVE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (IsLessThan_test); Index: ExpectationMap_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ExpectationMap_test.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- ExpectationMap_test.cpp 9 Dec 2005 18:56:20 -0000 1.18 +++ ExpectationMap_test.cpp 11 Dec 2005 20:03:44 -0000 1.19 @@ -61,13 +61,13 @@ CPPUNIT_TEST(test_expectActualVerify); CPPUNIT_TEST(test_ifNoExpected); - CPPUNIT_TEST_EXCEPTION(fail_expectActualImmediate, mockpp::AssertionFailedError); - CPPUNIT_TEST_EXCEPTION(fail_expectActualVerify, mockpp::AssertionFailedError); - CPPUNIT_TEST_EXCEPTION(fail_expectNothing, mockpp::AssertionFailedError); - CPPUNIT_TEST_EXCEPTION(fail_many, mockpp::AssertionFailedError); + CPPUNIT_TEST(fail_expectActualImmediate); + CPPUNIT_TEST(fail_expectActualVerify); + CPPUNIT_TEST(fail_expectNothing); + CPPUNIT_TEST(fail_many); - CPPUNIT_TEST_EXCEPTION(fail_ifNoActual, mockpp::AssertionFailedError); - CPPUNIT_TEST_EXCEPTION(fail_clearActual, mockpp::AssertionFailedError); + CPPUNIT_TEST(fail_ifNoActual); + CPPUNIT_TEST(fail_clearActual); CPPUNIT_TEST_SUITE_END(); @@ -102,6 +102,32 @@ #if defined (HAVE_CXXTEST) +MOCKPP_CXXTEST_SUITE_REGISTRATION( ExpectationMap_test ); + +MOCKPP_CXXTEST(ExpectationMap_test, test_chain); +MOCKPP_CXXTEST(ExpectationMap_test, test_hasExpectations); +MOCKPP_CXXTEST(ExpectationMap_test, test_name); +MOCKPP_CXXTEST(ExpectationMap_test, test_clear); +MOCKPP_CXXTEST(ExpectationMap_test, test_many); +MOCKPP_CXXTEST(ExpectationMap_test, test_get); +MOCKPP_CXXTEST(ExpectationMap_test, test_missing); +MOCKPP_CXXTEST(ExpectationMap_test, test_pair_get); +MOCKPP_CXXTEST(ExpectationMap_test, test_pair_getmany); + +MOCKPP_CXXTEST(ExpectationMap_test, test_expectNothing); +MOCKPP_CXXTEST(ExpectationMap_test, test_expectNothing_revoked); +MOCKPP_CXXTEST(ExpectationMap_test, test_expectActualImmediate); +MOCKPP_CXXTEST(ExpectationMap_test, test_expectActualVerify); +MOCKPP_CXXTEST(ExpectationMap_test, test_ifNoExpected); + +MOCKPP_CXXTEST(ExpectationMap_test, fail_expectActualImmediate); +MOCKPP_CXXTEST(ExpectationMap_test, fail_expectActualVerify); +MOCKPP_CXXTEST(ExpectationMap_test, fail_expectNothing); +MOCKPP_CXXTEST(ExpectationMap_test, fail_many); + +MOCKPP_CXXTEST(ExpectationMap_test, fail_ifNoActual); +MOCKPP_CXXTEST(ExpectationMap_test, fail_clearActual); + #elif defined(HAVE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (ExpectationMap_test); @@ -173,7 +199,18 @@ mockpp::ExpectationMap<int, MOCKPP_STL::string> ec (MOCKPP_PCHAR("testMap"), 0); ec.addExpected(3, "three"); ec.clearActual(); - ec.verify(); + bool thrown = false; + MOCKPP_TRY + { + ec.verify(); + } +#ifndef MOCKPP_NO_EXCEPTIONS + catch(mockpp::AssertionFailedError &) + { + thrown = true; + } +#endif + MOCKPP_ASSERT_TRUE(thrown == true); } @@ -188,7 +225,18 @@ { mockpp::ExpectationMap<int, MOCKPP_STL::string> ec (MOCKPP_PCHAR("nothingMap"), 0); ec.addExpected(3, "three"); - ec.verify(); // fails because no value + bool thrown = false; + MOCKPP_TRY + { + ec.verify(); // fails because no value + } +#ifndef MOCKPP_NO_EXCEPTIONS + catch(mockpp::AssertionFailedError &) + { + thrown = true; + } +#endif + MOCKPP_ASSERT_TRUE(thrown == true); } @@ -221,7 +269,18 @@ { mockpp::ExpectationMap<int, MOCKPP_STL::string> ec (MOCKPP_PCHAR("nothingMap"), 0); doNothing(ec); - ec.addActual(3); // fails even if equal + bool thrown = false; + MOCKPP_TRY + { + ec.addActual(3); // fails even if equal + } +#ifndef MOCKPP_NO_EXCEPTIONS + catch(mockpp::AssertionFailedError &) + { + thrown = true; + } +#endif + MOCKPP_ASSERT_TRUE(thrown == true); } @@ -291,7 +350,18 @@ ec.addExpected(MOCKPP_STL::pair<int, MOCKPP_STL::string>(2, "four")); ec.addExpected(MOCKPP_STL::pair<int, MOCKPP_STL::string>(1, "five")); - ec.addActual(10); + bool thrown = false; + MOCKPP_TRY + { + ec.addActual(10); + } +#ifndef MOCKPP_NO_EXCEPTIONS + catch(mockpp::AssertionFailedError &) + { + thrown = true; + } +#endif + MOCKPP_ASSERT_TRUE(thrown == true); } @@ -321,7 +391,18 @@ { mockpp::ExpectationMap<int, MOCKPP_STL::string> ec (MOCKPP_PCHAR("actualMap"), 0); doActualImmediate(ec); - ec.addActual(1111); // fails + bool thrown = false; + MOCKPP_TRY + { + ec.addActual(1111); // fails + } +#ifndef MOCKPP_NO_EXCEPTIONS + catch(mockpp::AssertionFailedError &) + { + thrown = true; + } +#endif + MOCKPP_ASSERT_TRUE(thrown == true); } @@ -360,7 +441,18 @@ { mockpp::ExpectationMap<int, MOCKPP_STL::string> ec (MOCKPP_PCHAR("verifyMap"), 0); doActualVerify(ec); // no fail - ec.verify(); // fails + bool thrown = false; + MOCKPP_TRY + { + ec.verify(); // fails + } +#ifndef MOCKPP_NO_EXCEPTIONS + catch(mockpp::AssertionFailedError &) + { + thrown = true; + } +#endif + MOCKPP_ASSERT_TRUE(thrown == true); } Index: CustomStub_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/CustomStub_test.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- CustomStub_test.cpp 9 Dec 2005 18:56:20 -0000 1.12 +++ CustomStub_test.cpp 11 Dec 2005 20:03:44 -0000 1.13 @@ -60,6 +60,9 @@ #if defined (HAVE_CXXTEST) +MOCKPP_CXXTEST_SUITE_REGISTRATION( CustomStub_test ); +MOCKPP_CXXTEST(CustomStub_test, test_invoke); + #elif defined(HAVE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (CustomStub_test); Index: VisitableMockObject_2_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_2_void_test.cpp,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- VisitableMockObject_2_void_test.cpp 10 Dec 2005 20:07:22 -0000 1.23 +++ VisitableMockObject_2_void_test.cpp 11 Dec 2005 20:03:44 -0000 1.24 @@ -63,12 +63,12 @@ CPPUNIT_TEST(test_constraint); CPPUNIT_TEST(test_controller_constraint); - CPPUNIT_TEST_EXCEPTION(fail_add_throw_after_active, mockpp::AssertionFailedError); - CPPUNIT_TEST_EXCEPTION(fail_add_throw_val_after_active, mockpp::AssertionFailedError); - CPPUNIT_TEST_EXCEPTION(fail_set_throw_after_active, mockpp::AssertionFailedError); - CPPUNIT_TEST_EXCEPTION(fail_add_method_after_active, mockpp::AssertionFailedError); - CPPUNIT_TEST_EXCEPTION(fail_parameter, mockpp::AssertionFailedError); - CPPUNIT_TEST_EXCEPTION(fail_unused_throwable, mockpp::AssertionFailedError); + CPPUNIT_TEST(fail_add_throw_after_active); + CPPUNIT_TEST(fail_add_throw_val_after_active); + CPPUNIT_TEST(fail_set_throw_after_active); + CPPUNIT_TEST(fail_add_method_after_active); + CPPUNIT_TEST(fail_parameter); + CPPUNIT_TEST(fail_unused_throwable); CPPUNIT_TEST_SUITE_END(); @@ -97,6 +97,25 @@ #if defined (HAVE_CXXTEST) +MOCKPP_CXXTEST_SUITE_REGISTRATION( VisitableMockObject_2_void_test ); + +MOCKPP_CXXTEST(VisitableMockObject_2_void_test, test_outbound); +MOCKPP_CXXTEST(VisitableMockObject_2_void_test, test_controller); +MOCKPP_CXXTEST(VisitableMockObject_2_void_test, test_parameter); +MOCKPP_CXXTEST(VisitableMockObject_2_void_test, test_parameter_ex); +MOCKPP_CXXTEST(VisitableMockObject_2_void_test, test_thrower); +MOCKPP_CXXTEST(VisitableMockObject_2_void_test, test_clear); +MOCKPP_CXXTEST(VisitableMockObject_2_void_test, test_default_throw); +MOCKPP_CXXTEST(VisitableMockObject_2_void_test, test_constraint); +MOCKPP_CXXTEST(VisitableMockObject_2_void_test, test_controller_constraint); + +MOCKPP_CXXTEST(VisitableMockObject_2_void_test, fail_add_throw_after_active); +MOCKPP_CXXTEST(VisitableMockObject_2_void_test, fail_add_throw_val_after_active); +MOCKPP_CXXTEST(VisitableMockObject_2_void_test, fail_set_throw_after_active); +MOCKPP_CXXTEST(VisitableMockObject_2_void_test, fail_add_method_after_active); +MOCKPP_CXXTEST(VisitableMockObject_2_void_test, fail_parameter); +MOCKPP_CXXTEST(VisitableMockObject_2_void_test, fail_unused_throwable); + #elif defined(HAVE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (VisitableMockObject_2_void_test); @@ -215,7 +234,18 @@ mvo.visitable(1, 2); mvo.activate(); mvo.visitable(1, 2); - mvo.visitable(1, 2); + bool thrown = false; + MOCKPP_TRY + { + mvo.visitable(1, 2); + } +#ifndef MOCKPP_NO_EXCEPTIONS + catch(mockpp::AssertionFailedError &) + { + thrown = true; + } +#endif + MOCKPP_ASSERT_TRUE(thrown == true); } @@ -224,7 +254,18 @@ MyVisitableMockObject_2_void mvo(MOCKPP_PCHAR("mvo")); MOCKPP_CONTROLLER_FOR(MyVisitableMockObject_2_void, visitable) ctr (&mvo); mvo.activate(); - ctr.addThrowable(mockpp::make_throwable(MOCKPP_STL::string("exceptional string"))); + bool thrown = false; + MOCKPP_TRY + { + ctr.addThrowable(mockpp::make_throwable(MOCKPP_STL::string("exceptional string"))); + } +#ifndef MOCKPP_NO_EXCEPTIONS + catch(mockpp::AssertionFailedError &) + { + thrown = true; + } +#endif + MOCKPP_ASSERT_TRUE(thrown == true); } @@ -233,7 +274,18 @@ MyVisitableMockObject_2_void mvo(MOCKPP_PCHAR("mvo")); MOCKPP_CONTROLLER_FOR(MyVisitableMockObject_2_void, visitable) ctr (&mvo); mvo.activate(); - ctr.addThrowable(MOCKPP_STL::string("exceptional string"), 1); + bool thrown = false; + MOCKPP_TRY + { + ctr.addThrowable(MOCKPP_STL::string("exceptional string"), 1); + } +#ifndef MOCKPP_NO_EXCEPTIONS + catch(mockpp::AssertionFailedError &) + { + thrown = true; + } +#endif + MOCKPP_ASSERT_TRUE(thrown == true); } @@ -242,7 +294,18 @@ MyVisitableMockObject_2_void mvo(MOCKPP_PCHAR("mvo")); MOCKPP_CONTROLLER_FOR(MyVisitableMockObject_2_void, visitable) ctr (&mvo); mvo.activate(); - ctr.setDefaultThrowable(mockpp::make_throwable(MOCKPP_STL::string("exceptional string"))); + bool thrown = false; + MOCKPP_TRY + { + ctr.setDefaultThrowable(mockpp::make_throwable(MOCKPP_STL::string("exceptional string"))); + } +#ifndef MOCKPP_NO_EXCEPTIONS + catch(mockpp::AssertionFailedError &) + { + thrown = true; + } +#endif + MOCKPP_ASSERT_TRUE(thrown == true); } @@ -256,7 +319,18 @@ mvo.activate(); mvo.visitable(1, 2); mvo.visitable(11, 2); - mvo.visitable(222, 2); + bool thrown = false; + MOCKPP_TRY + { + mvo.visitable(222, 2); + } +#ifndef MOCKPP_NO_EXCEPTIONS + catch(mockpp::AssertionFailedError &) + { + thrown = true; + } +#endif + MOCKPP_ASSERT_TRUE(thrown == true); } @@ -355,7 +429,18 @@ MOCKPP_CONTROLLER_FOR(MyVisitableMockObject_2_void, visitable) ctr (&mvo); ctr.setDefaultThrowable(mockpp::make_throwable(MOCKPP_STL::string("throw default"))); mvo.activate(); - mvo.verify(); + bool thrown = false; + MOCKPP_TRY + { + mvo.verify(); + } +#ifndef MOCKPP_NO_EXCEPTIONS + catch(mockpp::AssertionFailedError &) + { + thrown = true; + } +#endif + MOCKPP_ASSERT_TRUE(thrown == true); } Index: VisitableMockObject_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_test.cpp,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- VisitableMockObject_test.cpp 10 Dec 2005 20:07:22 -0000 1.27 +++ VisitableMockObject_test.cpp 11 Dec 2005 20:03:44 -0000 1.28 @@ -56,15 +56,15 @@ CPPUNIT_TEST(test_inline_post_1_2); CPPUNIT_TEST(test_method_unused); - CPPUNIT_TEST_EXCEPTION(fail_add_throw_after_active, mockpp::AssertionFailedError); - CPPUNIT_TEST_EXCEPTION(fail_add_throw_val_after_active, mockpp::AssertionFailedError); - CPPUNIT_TEST_EXCEPTION(fail_set_throw_after_active, mockpp::AssertionFailedError); - CPPUNIT_TEST_EXCEPTION(fail_add_method_after_active, mockpp::AssertionFailedError); - CPPUNIT_TEST_EXCEPTION(fail_add_return_after_active, mockpp::AssertionFailedError); - CPPUNIT_TEST_EXCEPTION(fail_set_return_after_active, mockpp::AssertionFailedError); - CPPUNIT_TEST_EXCEPTION(fail_return, mockpp::AssertionFailedError); - CPPUNIT_TEST_EXCEPTION(fail_unused_throwable, mockpp::AssertionFailedError); - CPPUNIT_TEST_EXCEPTION(fail_unused_value, mockpp::AssertionFailedError); + CPPUNIT_TEST(fail_add_throw_after_active); + CPPUNIT_TEST(fail_add_throw_val_after_active); + CPPUNIT_TEST(fail_set_throw_after_active); + CPPUNIT_TEST(fail_add_method_after_active); + CPPUNIT_TEST(fail_add_return_after_active); + CPPUNIT_TEST(fail_set_return_after_active); + CPPUNIT_TEST(fail_return); + CPPUNIT_TEST(fail_unused_throwable); + CPPUNIT_TEST(fail_unused_value); CPPUNIT_TEST(test_stub_return_const_ref); CPPUNIT_TEST_SUITE_END(); @@ -97,6 +97,28 @@ #if defined (HAVE_CXXTEST) +MOCKPP_CXXTEST_SUITE_REGISTRATION( VisitableMockObject_test ); + +MOCKPP_CXXTEST(VisitableMockObject_test, test_controller); +MOCKPP_CXXTEST(VisitableMockObject_test, test_thrower); +MOCKPP_CXXTEST(VisitableMockObject_test, test_return); +MOCKPP_CXXTEST(VisitableMockObject_test, test_clear); +MOCKPP_CXXTEST(VisitableMockObject_test, test_parameter_ex); +MOCKPP_CXXTEST(VisitableMockObject_test, test_inline_pre_1_2); +MOCKPP_CXXTEST(VisitableMockObject_test, test_inline_post_1_2); +MOCKPP_CXXTEST(VisitableMockObject_test, test_method_unused); + +MOCKPP_CXXTEST(VisitableMockObject_test, fail_add_throw_after_active); +MOCKPP_CXXTEST(VisitableMockObject_test, fail_add_throw_val_after_active); +MOCKPP_CXXTEST(VisitableMockObject_test, fail_set_throw_after_active); +MOCKPP_CXXTEST(VisitableMockObject_test, fail_add_method_after_active); +MOCKPP_CXXTEST(VisitableMockObject_test, fail_add_return_after_active); +MOCKPP_CXXTEST(VisitableMockObject_test, fail_set_return_after_active); +MOCKPP_CXXTEST(VisitableMockObject_test, fail_return); +MOCKPP_CXXTEST(VisitableMockObject_test, fail_unused_throwable); +MOCKPP_CXXTEST(VisitableMockObject_test, fail_unused_value); +MOCKPP_CXXTEST(VisitableMockObject_test, test_stub_return_const_ref); + #elif defined(HAVE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (VisitableMockObject_test); @@ -232,8 +254,18 @@ MOCKPP_CONTROLLER_FOR(MyVisitableMockObject, visitable) ctr (&mvo); mvo.visitable(); mvo.activate(); - mvo.visitable(); - mvo.visitable(); + bool thrown = false; + MOCKPP_TRY + { + mvo.visitable(); + } +#ifndef MOCKPP_NO_EXCEPTIONS + catch(mockpp::AssertionFailedError &) + { + thrown = true; + } +#endif + MOCKPP_ASSERT_TRUE(thrown == true); } @@ -262,7 +294,18 @@ MyVisitableMockObject mvo(MOCKPP_PCHAR("mvo")); MOCKPP_CONTROLLER_FOR(MyVisitableMockObject, visitable) ctr (&mvo); mvo.activate(); - ctr.addThrowable(mockpp::make_throwable(MOCKPP_STL::string("exceptional string"))); + bool thrown = false; + MOCKPP_TRY + { + ctr.addThrowable(mockpp::make_throwable(MOCKPP_STL::string("exceptional string"))); + } +#ifndef MOCKPP_NO_EXCEPTIONS + catch(mockpp::AssertionFailedError &) + { + thrown = true; + } +#endif + MOCKPP_ASSERT_TRUE(thrown == true); } @@ -271,7 +314,18 @@ MyVisitableMockObject mvo(MOCKPP_PCHAR("mvo")); MOCKPP_CONTROLLER_FOR(MyVisitableMockObject, visitable) ctr (&mvo); mvo.activate(); - ctr.addThrowable(MOCKPP_STL::string("exceptional string"), 1); + bool thrown = false; + MOCKPP_TRY + { + ctr.addThrowable(MOCKPP_STL::string("exceptional string"), 1); + } +#ifndef MOCKPP_NO_EXCEPTIONS + catch(mockpp::AssertionFailedError &) + { + thrown = true; + } +#endif + MOCKPP_ASSERT_TRUE(thrown == true); } @@ -280,7 +334,18 @@ MyVisitableMockObject mvo(MOCKPP_PCHAR("mvo")); MOCKPP_CONTROLLER_FOR(MyVisitableMockObject, visitable) ctr (&mvo); mvo.activate(); - ctr.setDefaultThrowable(mockpp::make_throwable(MOCKPP_STL::string("exceptional string"))); + bool thrown = false; + MOCKPP_TRY + { + ctr.setDefaultThrowable(mockpp::make_throwable(MOCKPP_STL::string("exceptional string"))); + } +#ifndef MOCKPP_NO_EXCEPTIONS + catch(mockpp::AssertionFailedError &) + { + thrown = true; + } +#endif + MOCKPP_ASSERT_TRUE(thrown == true); } @@ -289,7 +354,18 @@ MyVisitableMockObject mvo(MOCKPP_PCHAR("mvo")); MOCKPP_CONTROLLER_FOR(MyVisitableMockObject, visitable) ctr (&mvo); mvo.activate(); - ctr.addReturnValue(1); + bool thrown = false; + MOCKPP_TRY + { + ctr.addReturnValue(1); + } +#ifndef MOCKPP_NO_EXCEPTIONS + catch(mockpp::AssertionFailedError &) + { + thrown = true; + } +#endif + MOCKPP_ASSERT_TRUE(thrown == true); } @@ -298,7 +374,18 @@ MyVisitableMockObject mvo(MOCKPP_PCHAR("mvo")); MOCKPP_CONTROLLER_FOR(MyVisitableMockObject, visitable) ctr (&mvo); mvo.activate(); - ctr.setDefaultReturnValue(1); + bool thrown = false; + MOCKPP_TRY + { + ctr.setDefaultReturnValue(1); + } +#ifndef MOCKPP_NO_EXCEPTIONS + catch(mockpp::AssertionFailedError &) + { + thrown = true; + } +#endif + MOCKPP_ASSERT_TRUE(thrown == true); } @@ -318,7 +405,18 @@ MOCKPP_ASSERT_TRUE(1 == mvo.visitable()); MOCKPP_ASSERT_TRUE(11 == mvo.visitable()); - mvo.visitable(); // no more return objects + bool thrown = false; + MOCKPP_TRY + { + mvo.visitable(); // no more return objects + } +#ifndef MOCKPP_NO_EXCEPTIONS + catch(mockpp::AssertionFailedError &) + { + thrown = true; + } +#endif + MOCKPP_ASSERT_TRUE(thrown == true); } @@ -371,7 +469,18 @@ MOCKPP_CONTROLLER_FOR(MyVisitableMockObject, visitable) ctr (&mvo); ctr.setDefaultThrowable(mockpp::make_throwable(MOCKPP_STL::string("throw default"))); mvo.activate(); - mvo.verify(); + bool thrown = false; + MOCKPP_TRY + { + mvo.verify(); + } +#ifndef MOCKPP_NO_EXCEPTIONS + catch(mockpp::AssertionFailedError &) + { + thrown = true; + } +#endif + MOCKPP_ASSERT_TRUE(thrown == true); } @@ -381,7 +490,18 @@ MOCKPP_CONTROLLER_FOR(MyVisitableMockObject, visitable) ctr (&mvo); ctr.setDefaultReturnValue(111); mvo.activate(); - mvo.verify(); + bool thrown = false; + MOCKPP_TRY + { + mvo.verify(); + } +#ifndef MOCKPP_NO_EXCEPTIONS + catch(mockpp::AssertionFailedError &) + { + thrown = true; + } +#endif + MOCKPP_ASSERT_TRUE(thrown == true); } Index: Assert_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/Assert_test.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- Assert_test.cpp 9 Dec 2005 18:56:20 -0000 1.20 +++ Assert_test.cpp 11 Dec 2005 20:03:44 -0000 1.21 @@ -64,8 +64,8 @@ CPPUNIT_TEST(test_equalsPChar); CPPUNIT_TEST(test_macros); - CPPUNIT_TEST_EXCEPTION( fail_fail, mockpp::AssertionFailedError); - CPPUNIT_TEST_EXCEPTION( fail_failmsg, mockpp::AssertionFailedError); + CPPUNIT_TEST( fail_fail); + CPPUNIT_TEST( fail_failmsg); CPPUNIT_TEST_SUITE_END(); @@ -98,6 +98,31 @@ #if defined (HAVE_CXXTEST) +MOCKPP_CXXTEST_SUITE_REGISTRATION( Assert_test ); + +MOCKPP_CXXTEST(Assert_test, test_FalseTrue); +MOCKPP_CXXTEST(Assert_test, test_boundary); + +MOCKPP_CXXTEST(Assert_test, test_equalsDouble); +MOCKPP_CXXTEST(Assert_test, test_equalsFloat); +MOCKPP_CXXTEST(Assert_test, test_equalsLong); +MOCKPP_CXXTEST(Assert_test, test_equalsBool); +MOCKPP_CXXTEST(Assert_test, test_equalsChar); +MOCKPP_CXXTEST(Assert_test, test_equalsInt); +MOCKPP_CXXTEST(Assert_test, test_equalsShort); +MOCKPP_CXXTEST(Assert_test, test_equalsAString); + +#ifdef MOCKPP_UNICODE +MOCKPP_CXXTEST(Assert_test, test_equalsWString); +MOCKPP_CXXTEST(Assert_test, test_equalsPWChar); +#endif + +MOCKPP_CXXTEST(Assert_test, test_equalsPChar); +MOCKPP_CXXTEST(Assert_test, test_macros); + +MOCKPP_CXXTEST(Assert_test, fail_fail); +MOCKPP_CXXTEST(Assert_test, fail_failmsg); + #elif defined(HAVE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (Assert_test); @@ -775,13 +800,35 @@ void Assert_test::fail_fail() { - MOCKPP_FAIL(MOCKPP_PCHAR("")); + bool thrown = false; + MOCKPP_TRY + { + MOCKPP_FAIL(MOCKPP_PCHAR("")); + } +#ifndef MOCKPP_NO_EXCEPTIONS + catch(mockpp::AssertionFailedError &) + { + thrown = true; + } +#endif + MOCKPP_ASSERT_TRUE(thrown == true); } void Assert_test::fail_failmsg() { - MOCKPP_FAIL(MOCKPP_PCHAR("fail with msg")); + bool thrown = false; + MOCKPP_TRY + { + MOCKPP_FAIL(MOCKPP_PCHAR("fail with msg")); + } +#ifndef MOCKPP_NO_EXCEPTIONS + catch(mockpp::AssertionFailedError &) + { + thrown = true; + } +#endif + MOCKPP_ASSERT_TRUE(thrown == true); } Index: IsLessOrEqual_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/IsLessOrEqual_test.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- IsLessOrEqual_test.cpp 9 Dec 2005 18:56:20 -0000 1.8 +++ IsLessOrEqual_test.cpp 11 Dec 2005 20:03:44 -0000 1.9 @@ -62,6 +62,10 @@ #if defined (HAVE_CXXTEST) +MOCKPP_CXXTEST_SUITE_REGISTRATION( IsLessOrEqual_test ); +MOCKPP_CXXTEST(IsLessOrEqual_test, test_describe); +MOCKPP_CXXTEST(IsLessOrEqual_test, test_invoke); + #elif defined(HAVE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (IsLessOrEqual_test); Index: MixedMockObject_5_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/MixedMockObject_5_test.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- MixedMockObject_5_test.cpp 9 Dec 2005 18:56:20 -0000 1.8 +++ MixedMockObject_5_test.cpp 11 Dec 2005 20:03:44 -0000 1.9 @@ -54,17 +54,17 @@ { public: - #if defined (HAVE_CXXTEST) +#if defined (HAVE_CXXTEST) #elif defined(HAVE_CPPUNIT) CPPUNIT_TEST_SUITE( MixedMockObject_5_test ); - CPPUNIT_TEST(test_controller); - CPPUNIT_TEST(test_chainer); - CPPUNIT_TEST(test_return); + CPPUNIT_TEST(test_controller); + CPPUNIT_TEST(test_chainer); + CPPUNIT_TEST(test_return); - CPPUNIT_TEST_SUITE_END(); +CPPUNIT_TEST_SUITE_END(); #endif @@ -78,6 +78,11 @@ #if defined (HAVE_CXXTEST) +MOCKPP_CXXTEST_SUITE_REGISTRATION( MixedMockObject_5_test ); +MOCKPP_CXXTEST(MixedMockObject_5_test, test_controller); +MOCKPP_CXXTEST(MixedMockObject_5_test, test_chainer); +MOCKPP_CXXTEST(MixedMockObject_5_test, test_return); + #elif defined(HAVE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (MixedMockObject_5_test); Index: ChainableMockObject_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_test.cpp,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- ChainableMockObject_test.cpp 10 Dec 2005 20:07:22 -0000 1.26 +++ ChainableMockObject_test.cpp 11 Dec 2005 20:03:44 -0000 1.27 @@ -47,26 +47,26 @@ { public: - #if defined (HAVE_CXXTEST) +#if defined (HAVE_CXXTEST) #elif defined(HAVE_CPPUNIT) CPPUNIT_TEST_SUITE( ChainableMockObject_test ); - CPPUNIT_TEST(test_register); - CPPUNIT_TEST(test_after_1); - CPPUNIT_TEST(test_after_2); - CPPUNIT_TEST(test_bad_after); - CPPUNIT_TEST(test_before_1); - CPPUNIT_TEST(test_before_2); - CPPUNIT_TEST(test_bad_before); - CPPUNIT_TEST(test_pending); - CPPUNIT_TEST(test_expect_return); - CPPUNIT_TEST(test_expect_throw); - CPPUNIT_TEST(test_stub_return); - CPPUNIT_TEST(test_stub_return_const_ref); + CPPUNIT_TEST(test_register); + CPPUNIT_TEST(test_after_1); + CPPUNIT_TEST(test_after_2); + CPPUNIT_TEST(test_bad_after); + CPPUNIT_TEST(test_before_1); + CPPUNIT_TEST(test_before_2); + CPPUNIT_TEST(test_bad_before); + CPPUNIT_TEST(test_pending); + CPPUNIT_TEST(test_expect_return); + CPPUNIT_TEST(test_expect_throw); + CPPUNIT_TEST(test_stub_return); + CPPUNIT_TEST(test_stub_return_const_ref); - CPPUNIT_TEST_SUITE_END(); +CPPUNIT_TEST_SUITE_END(); #endif @@ -89,6 +89,20 @@ #if defined (HAVE_CXXTEST) +MOCKPP_CXXTEST_SUITE_REGISTRATION( ChainableMockObject_test ); +MOCKPP_CXXTEST(ChainableMockObject_test, test_register); +MOCKPP_CXXTEST(ChainableMockObject_test, test_after_1); +MOCKPP_CXXTEST(ChainableMockObject_test, test_after_2); +MOCKPP_CXXTEST(ChainableMockObject_test, test_bad_after); +MOCKPP_CXXTEST(ChainableMockObject_test, test_before_1); +MOCKPP_CXXTEST(ChainableMockObject_test, test_before_2); +MOCKPP_CXXTEST(ChainableMockObject_test, test_bad_before); +MOCKPP_CXXTEST(ChainableMockObject_test, test_pending); +MOCKPP_CXXTEST(ChainableMockObject_test, test_expect_return); +MOCKPP_CXXTEST(ChainableMockObject_test, test_expect_throw); +MOCKPP_CXXTEST(ChainableMockObject_test, test_stub_return); +MOCKPP_CXXTEST(ChainableMockObject_test, test_stub_return_const_ref); + #elif defined(HAVE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (ChainableMockObject_test); Index: Invocation_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/Invocation_test.cpp,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- Invocation_test.cpp 9 Dec 2005 18:56:20 -0000 1.21 +++ Invocation_test.cpp 11 Dec 2005 20:03:44 -0000 1.22 @@ -84,6 +84,21 @@ #if defined (HAVE_CXXTEST) +MOCKPP_CXXTEST_SUITE_REGISTRATION( Invocation_test ); + +MOCKPP_CXXTEST(Invocation_test, test_equals0); +MOCKPP_CXXTEST(Invocation_test, test_equals1); +MOCKPP_CXXTEST(Invocation_test, test_equals2); +MOCKPP_CXXTEST(Invocation_test, test_equals3); +MOCKPP_CXXTEST(Invocation_test, test_equals4); +MOCKPP_CXXTEST(Invocation_test, test_equals5); +MOCKPP_CXXTEST(Invocation_test, test_get1); +MOCKPP_CXXTEST(Invocation_test, test_get2); +MOCKPP_CXXTEST(Invocation_test, test_get3); +MOCKPP_CXXTEST(Invocation_test, test_get4); +MOCKPP_CXXTEST(Invocation_test, test_get5); +MOCKPP_CXXTEST(Invocation_test, test_invoked); + #elif defined(HAVE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (Invocation_test); Index: IsGreaterThan_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/IsGreaterThan_test.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- IsGreaterThan_test.cpp 9 Dec 2005 18:56:20 -0000 1.8 +++ IsGreaterThan_test.cpp 11 Dec 2005 20:03:44 -0000 1.9 @@ -62,6 +62,10 @@ #if defined (HAVE_CXXTEST) +MOCKPP_CXXTEST_SUITE_REGISTRATION( IsGreaterThan_test ); +MOCKPP_CXXTEST(IsGreaterThan_test, test_describe); +MOCKPP_CXXTEST(IsGreaterThan_test, test_invoke); + #elif defined(HAVE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (IsGreaterThan_test); Index: NoException_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/NoException_test.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- NoException_test.cpp 9 Dec 2005 18:56:20 -0000 1.2 +++ NoException_test.cpp 11 Dec 2005 20:03:44 -0000 1.3 @@ -57,6 +57,9 @@ #if defined (HAVE_CXXTEST) +MOCKPP_CXXTEST_SUITE_REGISTRATION( NoException_test ); +MOCKPP_CXXTEST(NoException_test, test_invoke); + #elif defined(HAVE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (NoException_test); Index: ChainableMockObject_4_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_4_void_test.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- ChainableMockObject_4_void_test.cpp 10 Dec 2005 20:07:22 -0000 1.14 +++ ChainableMockObject_4_void_test.cpp 11 Dec 2005 20:03:44 -0000 1.15 @@ -47,16 +47,16 @@ { public: - #if defined (HAVE_CXXTEST) +#if defined (HAVE_CXXTEST) #elif defined(HAVE_CPPUNIT) CPPUNIT_TEST_SUITE( ChainableMockObject_4_void_test ); - CPPUNIT_TEST(test_outbound); - CPPUNIT_TEST( test_parameter_4 ); + CPPUNIT_TEST(test_outbound); + CPPUNIT_TEST( test_parameter_4 ); - CPPUNIT_TEST_SUITE_END(); +CPPUNIT_TEST_SUITE_END(); #endif @@ -69,6 +69,10 @@ #if defined (HAVE_CXXTEST) +MOCKPP_CXXTEST_SUITE_REGISTRATION( ChainableMockObject_4_void_test ); +MOCKPP_CXXTEST(ChainableMockObject_4_void_test, test_outbound); +MOCKPP_CXXTEST(ChainableMockObject_4_void_test, test_parameter_4 ); + #elif defined(HAVE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (ChainableMockObject_4_void_test); Index: InvocationMockerBuilder_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/InvocationMockerBuilder_test.cpp,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- InvocationMockerBuilder_test.cpp 9 Dec 2005 18:56:20 -0000 1.31 +++ InvocationMockerBuilder_test.cpp 11 Dec 2005 20:03:44 -0000 1.32 @@ -67,18 +67,18 @@ { public: - #if defined (HAVE_CXXTEST) +#if defined (HAVE_CXXTEST) #elif defined(HAVE_CPPUNIT) CPPUNIT_TEST_SUITE( InvocationMockerBuilder_test ); - CPPUNIT_TEST( test_instance0 ); - CPPUNIT_TEST( test_instance5 ); - CPPUNIT_TEST( test_instancev0 ); - CPPUNIT_TEST( test_instancev5 ); + CPPUNIT_TEST( test_instance0 ); + CPPUNIT_TEST( test_instance5 ); + CPPUNIT_TEST( test_instancev0 ); + CPPUNIT_TEST( test_instancev5 ); - CPPUNIT_TEST_SUITE_END(); +CPPUNIT_TEST_SUITE_END(); #endif @@ -93,6 +93,12 @@ #if defined (HAVE_CXXTEST) +MOCKPP_CXXTEST_SUITE_REGISTRATION( InvocationMockerBuilder_test ); +MOCKPP_CXXTEST(InvocationMockerBuilder_test, test_instance0 ); +MOCKPP_CXXTEST(InvocationMockerBuilder_test, test_instance5 ); +MOCKPP_CXXTEST(InvocationMockerBuilder_test, test_instancev0 ); +MOCKPP_CXXTEST(InvocationMockerBuilder_test, test_instancev5 ); + #elif defined(HAVE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION ( InvocationMockerBuilder_test ); Index: StringContains_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/StringContains_test.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- StringContains_test.cpp 9 Dec 2005 18:56:20 -0000 1.12 +++ StringContains_test.cpp 11 Dec 2005 20:03:44 -0000 1.13 @@ -62,6 +62,10 @@ #if defined (HAVE_CXXTEST) +MOCKPP_CXXTEST_SUITE_REGISTRATION( StringContains_test ); +MOCKPP_CXXTEST(StringContains_test, test_describe); +MOCKPP_CXXTEST(StringContains_test, test_invoke); + #elif defined(HAVE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (StringContains_test); Index: InvokeAtLeastOnceMatcher_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/InvokeAtLeastOnceMatcher_test.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- InvokeAtLeastOnceMatcher_test.cpp 9 Dec 2005 18:56:20 -0000 1.10 +++ InvokeAtLeastOnceMatcher_test.cpp 11 Dec 2005 20:03:44 -0000 1.11 @@ -58,6 +58,9 @@ #if defined (HAVE_CXXTEST) +MOCKPP_CXXTEST_SUITE_REGISTRATION( InvokeAtLeastOnceMatcher_test ); +MOCKPP_CXXTEST(InvokeAtLeastOnceMatcher_test, test_invoke); + #elif defined(HAVE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (InvokeAtLeastOnceMatcher_test); Index: ExpectationSet_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ExpectationSet_test.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- ExpectationSet_test.cpp 9 Dec 2005 18:56:20 -0000 1.16 +++ ExpectationSet_test.cpp 11 Dec 2005 20:03:44 -0000 1.17 @@ -57,13 +57,13 @@ CPPUNIT_TEST(test_expectActualVerify); CPPUNIT_TEST(test_ifNoExpected); - CPPUNIT_TEST_EXCEPTION(fail_clearActual, mockpp::AssertionFailedError); - CPPUNIT_TEST_EXCEPTION(fail_expectActualImmediate, mockpp::AssertionFailedError); - CPPUNIT_TEST_EXCEPTION(fail_expectActualVerify, mockpp::AssertionFailedError); - CPPUNIT_TEST_EXCEPTION(fail_expectNothing, mockpp::AssertionFailedError); - CPPUNIT_TEST_EXCEPTION(fail_many, mockpp::AssertionFailedError); + CPPUNIT_TEST(fail_clearActual); + CPPUNIT_TEST(fail_expectActualImmediate); + CPPUNIT_TEST(fail_expectActualVerify); + CPPUNIT_TEST(fail_expectNothing); + CPPUNIT_TEST(fail_many); - CPPUNIT_TEST_EXCEPTION(fail_ifNoActual, mockpp::AssertionFailedError); + CPPUNIT_TEST(fail_ifNoActual); CPPUNIT_TEST_SUITE_END(); @@ -94,6 +94,28 @@ #if defined (HAVE_CXXTEST) +MOCKPP_CXXTEST_SUITE_REGISTRATION( ExpectationSet_test ); + +MOCKPP_CXXTEST(ExpectationSet_test, test_hasExpectations); +MOCKPP_CXXTEST(ExpectationSet_test, test_name); +MOCKPP_CXXTEST(ExpectationSet_test, test_many); +MOCKPP_CXXTEST(ExpectationSet_test, test_chain); +MOCKPP_CXXTEST(ExpectationSet_test, test_clear); + +MOCKPP_CXXTEST(ExpectationSet_test, test_expectNothing); +MOCKPP_CXXTEST(ExpectationSet_test, test_expectNothing_revoked); +MOCKPP_CXXTEST(ExpectationSet_test, test_expectActualImmediate); +MOCKPP_CXXTEST(ExpectationSet_test, test_expectActualVerify); +MOCKPP_CXXTEST(ExpectationSet_test, test_ifNoExpected); + +MOCKPP_CXXTEST(ExpectationSet_test, fail_clearActual); +MOCKPP_CXXTEST(ExpectationSet_test, fail_expectActualImmediate); +MOCKPP_CXXTEST(ExpectationSet_test, fail_expectActualVerify); +MOCKPP_CXXTEST(ExpectationSet_test, fail_expectNothing); +MOCKPP_CXXTEST(ExpectationSet_test, fail_many); + +MOCKPP_CXXTEST(ExpectationSet_test, fail_ifNoActual); + #elif defined(HAVE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (ExpectationSet_test); @@ -162,7 +184,18 @@ ec.addExpected(3); ec.addActual(3); ec.clearActual(); - ec.verify(); + bool thrown = false; + MOCKPP_TRY + { + ec.verify(); + } +#ifndef MOCKPP_NO_EXCEPTIONS + catch(mockpp::AssertionFailedError &) + { + thrown = true; + } +#endif + MOCKPP_ASSERT_TRUE(thrown == true); } @@ -177,7 +210,18 @@ { mockpp::ExpectationSet<int> ec (MOCKPP_PCHAR("nothingSet"), 0); ec.addExpected(3); - ec.verify(); // fails because no value + bool thrown = false; + MOCKPP_TRY + { + ec.verify(); // fails because no value + } +#ifndef MOCKPP_NO_EXCEPTIONS + catch(mockpp::AssertionFailedError &) + { + thrown = true; + } +#endif + MOCKPP_ASSERT_TRUE(thrown == true); } @@ -210,7 +254,18 @@ { mockpp::ExpectationSet<int> ec (MOCKPP_PCHAR("nothingSet"), 0); doNothing(ec); - ec.addActual(3); // fails even if equal + bool thrown = false; + MOCKPP_TRY + { + ec.addActual(3); // fails even if equal + } +#ifndef MOCKPP_NO_EXCEPTIONS + catch(mockpp::AssertionFailedError &) + { + thrown = true; + } +#endif + MOCKPP_ASSERT_TRUE(thrown == true); } @@ -233,7 +288,18 @@ int act_prep[10] = { 10, 11, 12, 13, 14, 15, 16, 17, 18, 19 }; ec.addExpected(exp_prep+0, exp_prep+10); - ec.addActual(act_prep+2, act_prep+10); + bool thrown = false; + MOCKPP_TRY + { + ec.addActual(act_prep+2, act_prep+10); + } +#ifndef MOCKPP_NO_EXCEPTIONS + catch(mockpp::AssertionFailedError &) + { + thrown = true; + } +#endif + MOCKPP_ASSERT_TRUE(thrown == true); } @@ -263,7 +329,18 @@ { mockpp::ExpectationSet<int> ec (MOCKPP_PCHAR("actualSet"), 0); doActualImmediate(ec); - ec.addActual(1111); // fails + bool thrown = false; + MOCKPP_TRY + { + ec.addActual(1111); // fails + } +#ifndef MOCKPP_NO_EXCEPTIONS + catch(mockpp::AssertionFailedError &) + { + thrown = true; + } +#endif + MOCKPP_ASSERT_TRUE(thrown == true); } @@ -286,7 +363,18 @@ { mockpp::ExpectationSet<int> ec (MOCKPP_PCHAR("verifySet"), 0); doActualVerify(ec); // no fail - ec.verify(); // fails + bool thrown = false; + MOCKPP_TRY + { + ec.verify(); // fails + } +#ifndef MOCKPP_NO_EXCEPTIONS + catch(mockpp::AssertionFailedError &) + { + thrown = true; + } +#endif + MOCKPP_ASSERT_TRUE(thrown == true); } Index: ChainableMockObject_1_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_1_void_test.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- ChainableMockObject_1_void_test.cpp 10 Dec 2005 20:07:22 -0000 1.17 +++ ChainableMockObject_1_void_test.cpp 11 Dec 2005 20:03:44 -0000 1.18 @@ -52,16 +52,16 @@ { public: - #if defined (HAVE_CXXTEST) +#if defined (HAVE_CXXTEST) #elif defined(HAVE_CPPUNIT) CPPUNIT_TEST_SUITE( ChainableMockObject_1_void_test ); - CPPUNIT_TEST(test_outbound); - CPPUNIT_TEST( test_parameter_1 ); + CPPUNIT_TEST(test_outbound); + CPPUNIT_TEST( test_parameter_1 ); - CPPUNIT_TEST_SUITE_END(); +CPPUNIT_TEST_SUITE_END(); #endif @@ -75,6 +75,10 @@ #if defined (HAVE_CXXTEST) +MOCKPP_CXXTEST_SUITE_REGISTRATION( ChainableMockObject_1_void_test ); +MOCKPP_CXXTEST(ChainableMockObject_1_void_test, test_outbound); +MOCKPP_CXXTEST(ChainableMockObject_1_void_test, test_parameter_1 ); + #elif defined(HAVE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (ChainableMockObject_1_void_test); Index: ChainableMockMethod_2_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockMethod_2_test.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- ChainableMockMethod_2_test.cpp 9 Dec 2005 18:56:20 -0000 1.11 +++ ChainableMockMethod_2_test.cpp 11 Dec 2005 20:03:44 -0000 1.12 @@ -56,16 +56,16 @@ { public: - #if defined (HAVE_CXXTEST) +#if defined (HAVE_CXXTEST) #elif defined(HAVE_CPPUNIT) CPPUNIT_TEST_SUITE( ChainableMockMethod_2_test ); - CPPUNIT_TEST( test_parameter_2 ); - CPPUNIT_TEST( test_parameter_2v ); + CPPUNIT_TEST( test_parameter_2 ); + CPPUNIT_TEST( test_parameter_2v ); - CPPUNIT_TEST_SUITE_END(); +CPPUNIT_TEST_SUITE_END(); #endif @@ -78,6 +78,10 @@ #if defined (HAVE_CXXTEST) +MOCKPP_CXXTEST_SUITE_REGISTRATION( ChainableMockMethod_2_test ); +MOCKPP_CXXTEST(ChainableMockMethod_2_test, test_parameter_2 ); +MOCKPP_CXXTEST(ChainableMockMethod_2_test, test_parameter_2v ); + #elif defined(HAVE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (ChainableMockMethod_2_test); Index: InvokedAfterMatcher_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/InvokedAfterMatcher_test.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- InvokedAfterMatcher_test.cpp 9 Dec 2005 18:56:20 -0000 1.10 +++ InvokedAfterMatcher_test.cpp 11 Dec 2005 20:03:44 -0000 1.11 @@ -58,6 +58,9 @@ #if defined (HAVE_CXXTEST) +MOCKPP_CXXTEST_SUITE_REGISTRATION( InvokedAfterMatcher_test ); +MOCKPP_CXXTEST(InvokedAfterMatcher_test, test_invoke); + #elif defined(HAVE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (InvokedAfterMatcher_test); Index: InvokeOnceMatcher_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/InvokeOnceMatcher_test.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- InvokeOnceMatcher_test.cpp 9 Dec 2005 18:56:20 -0000 1.10 +++ InvokeOnceMatcher_test.cpp 11 Dec 2005 20:03:44 -0000 1.11 @@ -58,6 +58,9 @@ #if defined (HAVE_CXXTEST) +MOCKPP_CXXTEST_SUITE_REGISTRATION( InvokeOnceMatcher_test ); +MOCKPP_CXXTEST(InvokeOnceMatcher_test, test_invoke); + #elif defined(HAVE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (InvokeOnceMatcher_test); Index: ChainableMockObject_3_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_3_void_test.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- ChainableMockObject_3_void_test.cpp 10 Dec 2005 20:07:22 -0000 1.14 +++ ChainableMockObject_3_void_test.cpp 11 Dec 2005 20:03:44 -0000 1.15 @@ -47,16 +47,16 @@ { public: - #if defined (HAVE_CXXTEST) +#if defined (HAVE_CXXTEST) #elif defined(HAVE_CPPUNIT) CPPUNIT_TEST_SUITE( ChainableMockObject_3_void_test ); - CPPUNIT_TEST(test_outbound); - CPPUNIT_TEST( test_parameter_3 ); + CPPUNIT_TEST(test_outbound); + CPPUNIT_TEST( test_parameter_3 ); - CPPUNIT_TEST_SUITE_END(); +CPPUNIT_TEST_SUITE_END(); #endif @@ -69,6 +69,10 @@ #if defined (HAVE_CXXTEST) +MOCKPP_CXXTEST_SUITE_REGISTRATION( ChainableMockObject_3_void_test ); +MOCKPP_CXXTEST(ChainableMockObject_3_void_test, test_outbound); +MOCKPP_CXXTEST(ChainableMockObject_3_void_test, test_parameter_3 ); + #elif defined(HAVE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (ChainableMockObject_3_void_test); Index: VoidStub_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VoidStub_test.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- VoidStub_test.cpp 9 Dec 2005 18:56:20 -0000 1.12 +++ VoidStub_test.cpp 11 Dec 2005 20:03:44 -0000 1.13 @@ -62,6 +62,10 @@ #if defined (HAVE_CXXTEST) +MOCKPP_CXXTEST_SUITE_REGISTRATION( VoidStub_test ); +MOCKPP_CXXTEST(VoidStub_test, test_describe); +MOCKPP_CXXTEST(VoidStub_test, test_invoke); + #elif defined(HAVE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (VoidStub_test); Index: ExpectationCounter_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ExpectationCounter_test.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- ExpectationCounter_test.cpp 9 Dec 2005 18:56:20 -0000 1.15 +++ ExpectationCounter_test.cpp 11 Dec 2005 20:03:44 -0000 1.16 @@ -57,11 +57,11 @@ CPPUNIT_TEST(test_expectActualVerify); CPPUNIT_TEST(test_ifNoExpected); - CPPUNIT_TEST_EXCEPTION(fail_expectActualImmediate, mockpp::AssertionFailedError); - CPPUNIT_TEST_EXCEPTION(fail_expectActualVerify, mockpp::AssertionFailedError); - CPPUNIT_TEST_EXCEPTION(fail_expectNothing, mockpp::AssertionFailedError); + CPPUNIT_TEST(fail_expectActualImmediate); + CPPUNIT_TEST(fail_expectActualVerify); + CPPUNIT_TEST(fail_expectNothing); - CPPUNIT_TEST_EXCEPTION(fail_ifNoActual, mockpp::AssertionFailedError); + CPPUNIT_TEST(fail_ifNoActual); CPPUNIT_TEST_SUITE_END(); @@ -92,6 +92,25 @@ #if defined (HAVE_CXXTEST) +MOCKPP_CXXTEST_SUITE_REGISTRATION( ExpectationCounter_test ); + +MOCKPP_CXXTEST(ExpectationCounter_test, test_hasExpectations); +MOCKPP_CXXTEST(ExpectationCounter_test, test_name); +MOCKPP_CXXTEST(ExpectationCounter_test, test_clearActual); +MOCKPP_CXXTEST(ExpectationCounter_test, test_clear); + +MOCKPP_CXXTEST(ExpectationCounter_test, test_expectNothing); +MOCKPP_CXXTEST(ExpectationCounter_test, test_expectNothing_revoked); +MOCKPP_CXXTEST(ExpectationCounter_test, test_expectActualImmediate); +MOCKPP_CXXTEST(ExpectationCounter_test, test_expectActualVerify); +MOCKPP_CXXTEST(ExpectationCounter_test, test_ifNoExpected); + +MOCKPP_CXXTEST(ExpectationCounter_test, fail_expectActualImmediate); +MOCKPP_CXXTEST(ExpectationCounter_test, fail_expectActualVerify); +MOCKPP_CXXTEST(ExpectationCounter_test, fail_expectNothing); + +MOCKPP_CXXTEST(ExpectationCounter_test, fail_ifNoActual); + #elif defined(HAVE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (ExpectationCounter_test); @@ -161,7 +180,18 @@ { mockpp::ExpectationCounter ec (MOCKPP_PCHAR("nothingcounter"), 0); ec.setExpected(2); - ec.verify(); // fails because no value + bool thrown = false; + MOCKPP_TRY + { + ec.verify(); // fails because no value + } +#ifndef MOCKPP_NO_EXCEPTIONS + catch(mockpp::AssertionFailedError &) + { + thrown = true; + } +#endif + MOCKPP_ASSERT_TRUE(thrown == true); } @@ -196,7 +226,18 @@ { mockpp::ExpectationCounter ec (MOCKPP_PCHAR("nothingcounter"), 0); doNothing(ec); - ec.inc(); // fails + bool thrown = false; + MOCKPP_TRY + { + ec.inc(); // fails + } +#ifndef MOCKPP_NO_EXCEPTIONS + catch(mockpp::AssertionFailedError &) + { + thrown = true; + } +#endif + MOCKPP_ASSERT_TRUE(thrown == true); } @@ -220,7 +261,18 @@ { mockpp::ExpectationCounter ec (MOCKPP_PCHAR("actualcounter"), 0); doActualImmediate(ec); - ec.inc(); // fails + bool thrown = false; + MOCKPP_TRY + { + ec.inc(); // fails + } +#ifndef MOCKPP_NO_EXCEPTIONS + catch(mockpp::AssertionFailedError &) + { + thrown = true; + } +#endif + MOCKPP_ASSERT_TRUE(thrown == true); } @@ -246,7 +298,18 @@ { mockpp::ExpectationCounter ec (MOCKPP_PCHAR("verifycounter"), 0); doActualVerify(ec); // no fail - ec.verify(); // fails + bool thrown = false; + MOCKPP_TRY + { + ec.verify(); // fails + } +#ifndef MOCKPP_NO_EXCEPTIONS + catch(mockpp::AssertionFailedError &) + { + thrown = true; + } +#endif + MOCKPP_ASSERT_TRUE(thrown == true); } Index: OutBound_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/OutBound_test.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- OutBound_test.cpp 9 Dec 2005 18:56:20 -0000 1.3 +++ OutBound_test.cpp 11 Dec 2005 20:03:44 -0000 1.4 @@ -60,6 +60,10 @@ #if defined (HAVE_CXXTEST) +MOCKPP_CXXTEST_SUITE_REGISTRATION( OutBound_test ); +MOCKPP_CXXTEST(OutBound_test, test_describe); +MOCKPP_CXXTEST(OutBound_test, test_invoke); + #elif defined(HAVE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (OutBound_test); Index: ResponseVector_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ResponseVector_test.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- ResponseVector_test.cpp 10 Dec 2005 20:07:22 -0000 1.7 +++ ResponseVector_test.cpp 11 Dec 2005 20:03:44 -0000 1.8 @@ -62,6 +62,10 @@ #if defined (HAVE_CXXTEST) +MOCKPP_CXXTEST_SUITE_REGISTRATION( ResponseVector_Test ); +MOCKPP_CXXTEST(ResponseVector_Test, test_value); +MOCKPP_CXXTEST(ResponseVector_Test, test_thrower); + #elif defined(HAVE_CPPUNIT) CPPUNIT_TEST_SUITE_REGISTRATION (ResponseVector_Test); Index: ExpectationConglomeration_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ExpectationConglomeration_test.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- ExpectationConglomeration_test.cpp 9 Dec 2005 18:56:20 -0000 1.14 +++ ExpectationConglomeration_test.cpp 11 Dec 2005 20:03:44 -0000 1.15 @@ -58,13 +58,13 @@ CPPUNIT_TEST(test_expectActualVerify); CPPUNIT_TEST(test_ifNoExpected); - CPPUNIT_TEST_EXCEPTION(fail_clearActual, mockpp::AssertionFailedError); - CPPUNIT_TEST_EXCEPTION(fail_expectActualImmediate, mockpp::AssertionFailedError); - CPPUNIT_TEST_EXCEPTION(fail_expectActualVerify, mockpp::AssertionFailedError); - CPPUNIT_TEST_EXCEPTION(fail_expectNothing, mockpp::AssertionFailedError); - CPPUNIT_TEST_EXCEPTION(fail_many, mockpp::AssertionFailedError); + CPPUNIT_TEST(fail_clearActual); + CPPUNIT_TEST(fail_expectActualImmediate); + CPPUNIT_TEST(fail_expectActualVerify); + CPPUNIT_TEST(fail_expectNothing); + CPPUNIT_TEST(fail_many); - CPPUNIT_TEST_EXCEPTION(fail_ifNoActual, mockpp::AssertionFailedError); + CPPUNIT_TEST(fail_ifNoActual); CPPUNIT_TEST_SUITE_END(); @@ -96,6 +96,29 @@ #if defined (HAVE_CXXTEST) +MOCKPP_CXXTEST_SUITE_REGISTRATION( ExpectationConglomeration_test ); + +MOCKPP_CXXTEST(ExpectationConglomeration_test, test_hasExpectations); +MOCKPP_CXXTEST(ExpectationConglomeration_test, test_hasExpectations2); +MOCKPP_CXXTEST(ExpectationConglomeration_test, test_name); +MOCKPP_CXXTEST(ExpectationConglomeration_test, test_many); +MOCKPP_CXXTEST(ExpectationConglomeration_test, test_chain); +MOCKPP_CXXTEST(ExpectationConglomeration_test, test_clear); + +MOCKPP_CXXTEST(ExpectationConglomeration_test, test_expectNothing); +MOCKPP_CXXTEST(ExpectationConglomeration_test, test_expectNothing_revoked); +MOCKPP_CXXTEST(ExpectationConglomeration_test, test_expectActualImmediate); +MOCKPP_CXXTEST(ExpectationConglomeration_test, test_expectActualVerify);... [truncated message content] |
|
From: Ewald A. <ewa...@us...> - 2005-12-10 21:58:51
|
Update of /cvsroot/mockpp/mockpp/mockpp/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27576/mockpp/tests Modified Files: mock_test.cpp Log Message: use specialized runner Index: mock_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/mock_test.cpp,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- mock_test.cpp 10 Dec 2005 15:18:34 -0000 1.26 +++ mock_test.cpp 10 Dec 2005 21:58:43 -0000 1.27 @@ -42,6 +42,8 @@ #include <cxxtest/TestRunner.h> +#include <mockpp/framework/CxxTestRunner.h> + #ifdef GUI #include <cxxtest/StdioPrinter.h> //#include <cxxtest/QtGui.h> @@ -76,7 +78,10 @@ #ifdef GUI return CxxTest::GuiTuiRunner<CxxTest::QtGui, CxxTest::StdioPrinter>( argc, argv ).run(); #else - return CxxTest::ErrorPrinter().run(); + CxxTest::ErrorPrinter ep; + mockpp::CxxTestRunner::runAllTests(ep); + return CxxTest::tracker().failedTests(); + //return CxxTest::ErrorPrinter().run(); #endif } |
|
From: Ewald A. <ewa...@us...> - 2005-12-10 21:57:45
|
Update of /cvsroot/mockpp/mockpp/mockpp/framework In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27397/mockpp/framework Modified Files: SelectUnittestFramework.h Log Message: moved to subdir framework Index: SelectUnittestFramework.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/framework/SelectUnittestFramework.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- SelectUnittestFramework.h 10 Dec 2005 19:23:45 -0000 1.1 +++ SelectUnittestFramework.h 10 Dec 2005 21:57:37 -0000 1.2 @@ -48,7 +48,7 @@ //#include <cxxtest/TestRunner.h> -#include <mockpp/CxxTestSupport.h> +#include <mockpp/framework/CxxTestSupport.h> #elif defined(HAVE_CPPUNIT) |
|
From: Ewald A. <ewa...@us...> - 2005-12-10 21:57:20
|
Update of /cvsroot/mockpp/mockpp/mockpp/framework In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27304/mockpp/framework Added Files: CxxTestRunner.h Log Message: new --- NEW FILE: CxxTestRunner.h --- /** @file @brief Run tests based on CxxTest::TestRunner $Id: CxxTestRunner.h,v 1.1 2005/12/10 21:57:12 ewald-arnold Exp $ ***************************************************************************/ /************************************************************************** begin : Sat Dec 10 2005 copyright : (C) 2002-2005 by Ewald Arnold email : mockpp at ewald-arnold dot de This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2 of the License, 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. **/ #ifndef MOCKPP_CXXTESTRUNNER_H #define MOCKPP_CXXTESTRUNNER_H #include <mockpp/mockpp.h> // always first #if defined(HAVE_CXXTEST) #include <mockpp/compat/Exception.h> #include <cxxtest/TestRunner.h> namespace mockpp { class CxxTestRunner : public CxxTest::TestRunner { public: static void runAllTests( CxxTest::TestListener &listener ) { CxxTest::tracker().setListener( &listener ); _TS_TRY { CxxTestRunner().runWorld(); } _TS_CATCH_TYPE( (mockpp::Exception &ex), {CxxTest::tracker().failedTest( mockpp::getLatin1(ex.getSrcFile()).c_str(), ex.getSrcLine(), mockpp::getLatin1(ex.getMessage()).c_str() ); } ) _TS_CATCH_TYPE( (std::exception &ex), {CxxTest::tracker().failedTest( __FILE__, __LINE__, ex.what() ); } ) _TS_LAST_CATCH( { CxxTest::tracker().failedTest( __FILE__, __LINE__, "Exception thrown from world" ); } ); CxxTest::tracker().setListener( 0 ); } }; } // namespace mockpp #endif // HAVE_CXXTEST #endif // MOCKPP_CXXTESTRUNNER_H |
|
From: Ewald A. <ewa...@us...> - 2005-12-10 21:56:58
|
Update of /cvsroot/mockpp/mockpp/3party/cxxtest In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27169/3party/cxxtest Modified Files: README.mockpp Log Message: update Index: README.mockpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/3party/cxxtest/README.mockpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- README.mockpp 10 Dec 2005 15:14:39 -0000 1.3 +++ README.mockpp 10 Dec 2005 21:56:51 -0000 1.4 @@ -12,4 +12,7 @@ - make a library out of the *.cpp files. - omit samples directory - moved some static members to their actual cpp file -- fixed superfluous and nowadays erronous "namespace { .. };" to "namespace { .. }" \ No newline at end of file +- fixed superfluous and nowadays erroneous "namespace { .. };" to "namespace { .. }" + +- quick hack: public: TestTracker::void setListener( TestListener *l ); +- quick hack: protected: TestRunner::runWorld() |
|
From: Ewald A. <ewa...@us...> - 2005-12-10 21:56:44
|
Update of /cvsroot/mockpp/mockpp/3party/cxxtest/cxxtest In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27127/3party/cxxtest/cxxtest Modified Files: TestTracker.h Log Message: quick hack to grant access Index: TestTracker.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/3party/cxxtest/cxxtest/TestTracker.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- TestTracker.h 10 Dec 2005 15:13:16 -0000 1.2 +++ TestTracker.h 10 Dec 2005 21:56:37 -0000 1.3 @@ -78,6 +78,8 @@ bool otherThrown ); void failedAssertThrowsNot( const char *file, unsigned line, const char *expression ); + void setListener( TestListener *l ); + private: TestTracker( const TestTracker & ); TestTracker &operator=( const TestTracker & ); @@ -105,7 +107,6 @@ TestTracker(); void initialize(); - void setListener( TestListener *l ); }; inline TestTracker &tracker() { return TestTracker::tracker(); } |
|
From: Ewald A. <ewa...@us...> - 2005-12-10 21:56:16
|
Update of /cvsroot/mockpp/mockpp/3party/cxxtest/cxxtest In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27066/3party/cxxtest/cxxtest Modified Files: TestRunner.h Log Message: quick hack to grant access Index: TestRunner.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/3party/cxxtest/cxxtest/TestRunner.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- TestRunner.h 10 Dec 2005 15:13:16 -0000 1.2 +++ TestRunner.h 10 Dec 2005 21:56:05 -0000 1.3 @@ -33,7 +33,8 @@ } } - private: + protected: + void runWorld() { RealWorldDescription wd; @@ -50,6 +51,7 @@ tracker().leaveWorld( wd ); } + private: void runSuite( SuiteDescription &sd ) { StateGuard sg; |
|
From: Ewald A. <ewa...@us...> - 2005-12-10 20:24:25
|
Update of /cvsroot/mockpp/mockpp/msvc71/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10831/msvc71/mockpp Modified Files: mockpp.vcproj Log Message: restructuring and cleanup Index: mockpp.vcproj =================================================================== RCS file: /cvsroot/mockpp/mockpp/msvc71/mockpp/mockpp.vcproj,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- mockpp.vcproj 1 Nov 2005 09:42:19 -0000 1.9 +++ mockpp.vcproj 10 Dec 2005 20:24:17 -0000 1.10 @@ -122,7 +122,7 @@ Name="Source Files" Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"> <File - RelativePath="..\..\mockpp\ChainableMockObject.cpp"> + RelativePath="..\..\mockpp\chaining\ChainableMockObject.cpp"> </File> <File RelativePath="..\..\mockpp\ExpectationCounter.cpp"> @@ -158,16 +158,16 @@ RelativePath="..\..\mockpp\VerifiableList.cpp"> </File> <File - RelativePath="..\..\mockpp\VerifyingTestCaller.cpp"> + RelativePath="..\..\mockpp\framework\VerifyingTestCaller.cpp"> </File> <File - RelativePath="..\..\mockpp\VerifyingTestCase.cpp"> + RelativePath="..\..\mockpp\framework\VerifyingTestCase.cpp"> </File> <File - RelativePath="..\..\mockpp\VisitableMockMethod.cpp"> + RelativePath="..\..\mockpp\visiting\VisitableMockMethod.cpp"> </File> <File - RelativePath="..\..\mockpp\VisitableMockObject.cpp"> + RelativePath="..\..\mockpp\visiting\VisitableMockObject.cpp"> </File> <Filter Name="compat" @@ -320,10 +320,10 @@ RelativePath="..\..\mockpp\chainable-template.h"> </File> <File - RelativePath="..\..\mockpp\ChainableMockObject.h"> + RelativePath="..\..\mockpp\chaining\ChainableMockObject.h"> </File> <File - RelativePath="..\..\mockpp\CountedVisitableMethod.h"> + RelativePath="..\..\mockpp\visiting\CountedVisitableMethod.h"> </File> <File RelativePath="..\..\mockpp\CountParameters.h"> @@ -422,46 +422,46 @@ RelativePath="..\..\mockpp\VerifiableList.h"> </File> <File - RelativePath="..\..\mockpp\VerifyingTestCaller.h"> + RelativePath="..\..\mockpp\framework\VerifyingTestCaller.h"> </File> <File - RelativePath="..\..\mockpp\VerifyingTestCase.h"> + RelativePath="..\..\mockpp\framework\VerifyingTestCase.h"> </File> <File RelativePath="..\..\mockpp\visitable-template.h"> </File> <File - RelativePath="..\..\mockpp\VisitableMockMethod.h"> + RelativePath="..\..\mockpp\visiting\VisitableMockMethod.h"> </File> <File - RelativePath="..\..\mockpp\VisitableMockMethod0.h"> + RelativePath="..\..\mockpp\visiting\VisitableMockMethod0.h"> </File> <File - RelativePath="..\..\mockpp\VisitableMockMethod1.h"> + RelativePath="..\..\mockpp\visiting\VisitableMockMethod1.h"> </File> <File - RelativePath="..\..\mockpp\VisitableMockMethod2.h"> + RelativePath="..\..\mockpp\visiting\VisitableMockMethod2.h"> </File> <File - RelativePath="..\..\mockpp\VisitableMockMethod3.h"> + RelativePath="..\..\mockpp\visiting\VisitableMockMethod3.h"> </File> <File - RelativePath="..\..\mockpp\VisitableMockMethod4.h"> + RelativePath="..\..\mockpp\visiting\VisitableMockMethod4.h"> </File> <File - RelativePath="..\..\mockpp\VisitableMockMethod5.h"> + RelativePath="..\..\mockpp\visiting\VisitableMockMethod5.h"> </File> <File - RelativePath="..\..\mockpp\VisitableMockMethod6.h"> + RelativePath="..\..\mockpp\visiting\VisitableMockMethod6.h"> </File> <File - RelativePath="..\..\mockpp\VisitableMockObject.h"> + RelativePath="..\..\mockpp\visiting\VisitableMockObject.h"> </File> <File - RelativePath="..\..\mockpp\VisitableMockObject_macro.h"> + RelativePath="..\..\mockpp\visiting\VisitableMockObject_macro.h"> </File> <File - RelativePath="..\..\mockpp\VisitableMockObject_template.h"> + RelativePath="..\..\mockpp\visiting\VisitableMockObject_template.h"> </File> <Filter Name="compat" |
|
From: Ewald A. <ewa...@us...> - 2005-12-10 20:24:25
|
Update of /cvsroot/mockpp/mockpp/msvc2005/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10831/msvc2005/mockpp Modified Files: mockpp.vcproj Log Message: restructuring and cleanup Index: mockpp.vcproj =================================================================== RCS file: /cvsroot/mockpp/mockpp/msvc2005/mockpp/mockpp.vcproj,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- mockpp.vcproj 8 Dec 2005 18:15:28 -0000 1.2 +++ mockpp.vcproj 10 Dec 2005 20:24:17 -0000 1.3 @@ -172,7 +172,7 @@ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" > <File - RelativePath="..\..\mockpp\ChainableMockObject.cpp" + RelativePath="..\..\mockpp\chaining\ChainableMockObject.cpp" > </File> <File @@ -220,11 +220,11 @@ > </File> <File - RelativePath="..\..\mockpp\VerifyingTestCaller.cpp" + RelativePath="..\..\mockpp\framework\VerifyingTestCaller.cpp" > </File> <File - RelativePath="..\..\mockpp\VerifyingTestCase.cpp" + RelativePath="..\..\mockpp\framework\VerifyingTestCase.cpp" > </File> <File @@ -426,11 +426,11 @@ > </File> <File - RelativePath="..\..\mockpp\ChainableMockObject.h" + RelativePath="..\..\mockpp\chaining\ChainableMockObject.h" > </File> <File - RelativePath="..\..\mockpp\CountedVisitableMethod.h" + RelativePath="..\..\mockpp\visiting\CountedVisitableMethod.h" > </File> <File @@ -562,11 +562,11 @@ > </File> <File - RelativePath="..\..\mockpp\VerifyingTestCaller.h" + RelativePath="..\..\mockpp\framework\VerifyingTestCaller.h" > </File> <File - RelativePath="..\..\mockpp\VerifyingTestCase.h" + RelativePath="..\..\mockpp\framework\VerifyingTestCase.h" > </File> <File @@ -574,47 +574,47 @@ > </File> <File - RelativePath="..\..\mockpp\VisitableMockMethod.h" + RelativePath="..\..\mockpp\visiting\VisitableMockMethod.h" > </File> <File - RelativePath="..\..\mockpp\VisitableMockMethod0.h" + RelativePath="..\..\mockpp\visiting\VisitableMockMethod0.h" > </File> <File - RelativePath="..\..\mockpp\VisitableMockMethod1.h" + RelativePath="..\..\mockpp\visiting\VisitableMockMethod1.h" > </File> <File - RelativePath="..\..\mockpp\VisitableMockMethod2.h" + RelativePath="..\..\mockpp\visiting\VisitableMockMethod2.h" > </File> <File - RelativePath="..\..\mockpp\VisitableMockMethod3.h" + RelativePath="..\..\mockpp\visiting\VisitableMockMethod3.h" > </File> <File - RelativePath="..\..\mockpp\VisitableMockMethod4.h" + RelativePath="..\..\mockpp\visiting\VisitableMockMethod4.h" > </File> <File - RelativePath="..\..\mockpp\VisitableMockMethod5.h" + RelativePath="..\..\mockpp\visiting\VisitableMockMethod5.h" > </File> <File - RelativePath="..\..\mockpp\VisitableMockMethod6.h" + RelativePath="..\..\mockpp\visiting\VisitableMockMethod6.h" > </File> <File - RelativePath="..\..\mockpp\VisitableMockObject.h" + RelativePath="..\..\mockpp\visiting\VisitableMockObject.h" > </File> <File - RelativePath="..\..\mockpp\VisitableMockObject_macro.h" + RelativePath="..\..\mockpp\visiting\VisitableMockObject_macro.h" > </File> <File - RelativePath="..\..\mockpp\VisitableMockObject_template.h" + RelativePath="..\..\mockpp\visiting\VisitableMockObject_template.h" > </File> <Filter |
|
From: Ewald A. <ewa...@us...> - 2005-12-10 20:24:24
|
Update of /cvsroot/mockpp/mockpp/bcb5 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10831/bcb5 Modified Files: mockpp.bpf Log Message: restructuring and cleanup Index: mockpp.bpf =================================================================== RCS file: /cvsroot/mockpp/mockpp/bcb5/mockpp.bpf,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- mockpp.bpf 8 Dec 2005 17:29:48 -0000 1.28 +++ mockpp.bpf 10 Dec 2005 20:24:17 -0000 1.29 @@ -12,16 +12,17 @@ USEUNIT("..\mockpp\ThrowableList.cpp"); USEUNIT("..\mockpp\Verifiable.cpp"); USEUNIT("..\mockpp\VerifiableList.cpp"); -USEUNIT("..\mockpp\VisitableMockObject.cpp"); -USEUNIT("..\mockpp\VisitableMockMethod.cpp"); +USEUNIT("..\mockpp\visting\VisitableMockObject.cpp"); +USEUNIT("..\mockpp\visting\VisitableMockMethod.cpp"); USEUNIT("..\mockpp\MixedMockObject.cpp"); USEUNIT("..\mockpp\Throwable.cpp"); USEUNIT("..\mockpp\TrackingCounter.cpp"); USEUNIT("..\mockpp\mockpp.cpp"); USEUNIT("..\mockpp\MockObject.cpp"); -USEUNIT("..\mockpp\VerifyingTestCase.cpp"); +USEUNIT("..\mockpp\framework\VerifyingTestCase.cpp"); +USEUNIT("..\mockpp\framework\VerifyingTestCaller.cpp"); USEUNIT("..\mockpp\SelfDescribing.cpp"); -USEUNIT("..\mockpp\ChainableMockObject.cpp"); +USEUNIT("..\mockpp\chaining\ChainableMockObject.cpp"); USEUNIT("..\mockpp\builder\BuilderNamespace.cpp"); USEUNIT("..\mockpp\stub\VoidStub.cpp"); USEUNIT("..\mockpp\chaining\Invocation.cpp"); |
|
From: Ewald A. <ewa...@us...> - 2005-12-10 20:11:22
|
Update of /cvsroot/mockpp/mockpp/mockpp/config In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8126/mockpp/config Modified Files: .cvsignore Log Message: new Index: .cvsignore =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/config/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- .cvsignore 10 Dec 2005 19:13:45 -0000 1.1 +++ .cvsignore 10 Dec 2005 20:11:13 -0000 1.2 @@ -0,0 +1 @@ +Makefile.in |
Update of /cvsroot/mockpp/mockpp/mockpp/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7221/mockpp/tests Modified Files: ChainableMockObjectPolymorphism_test.cpp ChainableMockObject_1_test.cpp ChainableMockObject_1_void_test.cpp ChainableMockObject_2_test.cpp ChainableMockObject_2_void_test.cpp ChainableMockObject_3_test.cpp ChainableMockObject_3_void_test.cpp ChainableMockObject_4_test.cpp ChainableMockObject_4_void_test.cpp ChainableMockObject_5_test.cpp ChainableMockObject_5_void_test.cpp ChainableMockObject_test.cpp ChainableMockObject_void_test.cpp ResponseVector_test.cpp SelectFramework.h VerifyingTestCaller_test.cpp VerifyingTestCase_test.cpp VisitableMockMethod_1_test.cpp VisitableMockMethod_2_test.cpp VisitableMockMethod_test.cpp VisitableMockObject_1_test.cpp VisitableMockObject_1_void_test.cpp VisitableMockObject_2_test.cpp VisitableMockObject_2_void_test.cpp VisitableMockObject_3_test.cpp VisitableMockObject_3_void_test.cpp VisitableMockObject_4_test.cpp VisitableMockObject_4_void_test.cpp VisitableMockObject_5_test.cpp VisitableMockObject_5_void_test.cpp VisitableMockObject_template_test.cpp VisitableMockObject_test.cpp VisitableMockObject_void_test.cpp Log Message: restructuring and cleanup Index: ChainableMockObject_5_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_5_void_test.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- ChainableMockObject_5_void_test.cpp 9 Dec 2005 18:56:20 -0000 1.15 +++ ChainableMockObject_5_void_test.cpp 10 Dec 2005 20:07:22 -0000 1.16 @@ -34,7 +34,7 @@ #include "SelectFramework.h" #include <mockpp/chaining/mockpp_pti.h> -#include <mockpp/ChainableMockObject.h> +#include <mockpp/chaining/ChainableMockObject.h> #include "classes_ABCDE.h" Index: ChainableMockObject_4_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_4_test.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- ChainableMockObject_4_test.cpp 9 Dec 2005 18:56:20 -0000 1.12 +++ ChainableMockObject_4_test.cpp 10 Dec 2005 20:07:22 -0000 1.13 @@ -33,7 +33,7 @@ #include "SelectFramework.h" -#include <mockpp/ChainableMockObject.h> +#include <mockpp/chaining/ChainableMockObject.h> #include <mockpp/chaining/ChainingMockObjectSupport.h> Index: ResponseVector_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ResponseVector_test.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- ResponseVector_test.cpp 9 Dec 2005 18:56:20 -0000 1.6 +++ ResponseVector_test.cpp 10 Dec 2005 20:07:22 -0000 1.7 @@ -32,7 +32,7 @@ #include "SelectFramework.h" -#include <mockpp/VisitableMockObject.h> +#include <mockpp/visiting/VisitableMockObject.h> Index: VisitableMockObject_5_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_5_void_test.cpp,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- VisitableMockObject_5_void_test.cpp 9 Dec 2005 18:56:20 -0000 1.26 +++ VisitableMockObject_5_void_test.cpp 10 Dec 2005 20:07:22 -0000 1.27 @@ -34,7 +34,7 @@ #include "SelectFramework.h" #include <mockpp/ExpectationValue.h> -#include <mockpp/VisitableMockObject.h> +#include <mockpp/visiting/VisitableMockObject.h> #include <mockpp/chaining/ChainingMockObjectSupport.h> Index: VisitableMockObject_4_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_4_test.cpp,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- VisitableMockObject_4_test.cpp 9 Dec 2005 18:56:20 -0000 1.21 +++ VisitableMockObject_4_test.cpp 10 Dec 2005 20:07:22 -0000 1.22 @@ -39,7 +39,7 @@ #include <mockpp/constraint/IsNot.h> #include <mockpp/ExpectationValue.h> -#include <mockpp/VisitableMockObject.h> +#include <mockpp/visiting/VisitableMockObject.h> #include <mockpp/util/AssertMo.h> Index: VisitableMockObject_1_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_1_test.cpp,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- VisitableMockObject_1_test.cpp 9 Dec 2005 18:56:20 -0000 1.23 +++ VisitableMockObject_1_test.cpp 10 Dec 2005 20:07:22 -0000 1.24 @@ -34,7 +34,7 @@ #include "SelectFramework.h" #include <mockpp/ExpectationValue.h> -#include <mockpp/VisitableMockObject.h> +#include <mockpp/visiting/VisitableMockObject.h> #include <mockpp/util/AssertMo.h> #include <mockpp/chaining/ChainingMockObjectSupport.h> Index: VisitableMockObject_1_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_1_void_test.cpp,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- VisitableMockObject_1_void_test.cpp 9 Dec 2005 18:56:20 -0000 1.23 +++ VisitableMockObject_1_void_test.cpp 10 Dec 2005 20:07:22 -0000 1.24 @@ -34,7 +34,7 @@ #include "SelectFramework.h" #include <mockpp/ExpectationValue.h> -#include <mockpp/VisitableMockObject.h> +#include <mockpp/visiting/VisitableMockObject.h> #include <mockpp/chaining/ChainingMockObjectSupport.h> Index: SelectFramework.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/SelectFramework.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- SelectFramework.h 10 Dec 2005 15:18:34 -0000 1.3 +++ SelectFramework.h 10 Dec 2005 20:07:22 -0000 1.4 @@ -1 +1 @@ -#include <mockpp/SelectUnittestFramework.h> +#include <mockpp/framework/SelectUnittestFramework.h> Index: ChainableMockObject_2_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_2_void_test.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- ChainableMockObject_2_void_test.cpp 9 Dec 2005 18:56:20 -0000 1.13 +++ ChainableMockObject_2_void_test.cpp 10 Dec 2005 20:07:22 -0000 1.14 @@ -34,7 +34,7 @@ #include "SelectFramework.h" #include <mockpp/chaining/mockpp_pti.h> -#include <mockpp/ChainableMockObject.h> +#include <mockpp/chaining/ChainableMockObject.h> #include <mockpp/chaining/ChainingMockObjectSupport.h> Index: ChainableMockObjectPolymorphism_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObjectPolymorphism_test.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- ChainableMockObjectPolymorphism_test.cpp 9 Dec 2005 18:56:20 -0000 1.6 +++ ChainableMockObjectPolymorphism_test.cpp 10 Dec 2005 20:07:22 -0000 1.7 @@ -37,7 +37,7 @@ #include "SelectFramework.h" -#include <mockpp/ChainableMockObject.h> +#include <mockpp/chaining/ChainableMockObject.h> #include <mockpp/chaining/ChainingMockObjectSupport.h> #include <mockpp/chaining/Invocation.h> Index: ChainableMockObject_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_void_test.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- ChainableMockObject_void_test.cpp 9 Dec 2005 18:56:20 -0000 1.13 +++ ChainableMockObject_void_test.cpp 10 Dec 2005 20:07:22 -0000 1.14 @@ -35,7 +35,7 @@ #include "SelectFramework.h" -#include <mockpp/ChainableMockObject.h> +#include <mockpp/chaining/ChainableMockObject.h> #include <mockpp/matcher/TypelessMatcher.h> Index: ChainableMockObject_1_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_1_test.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- ChainableMockObject_1_test.cpp 9 Dec 2005 18:56:20 -0000 1.13 +++ ChainableMockObject_1_test.cpp 10 Dec 2005 20:07:22 -0000 1.14 @@ -33,8 +33,7 @@ #include "SelectFramework.h" -#include <mockpp/ChainableMockObject.h> - +#include <mockpp/chaining/ChainableMockObject.h> #include <mockpp/chaining/ChainingMockObjectSupport.h> #include <mockpp/chaining/Invocation.h> Index: VisitableMockObject_2_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_2_test.cpp,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- VisitableMockObject_2_test.cpp 9 Dec 2005 18:56:20 -0000 1.22 +++ VisitableMockObject_2_test.cpp 10 Dec 2005 20:07:22 -0000 1.23 @@ -39,7 +39,7 @@ #include <mockpp/constraint/IsNot.h> #include <mockpp/ExpectationValue.h> -#include <mockpp/VisitableMockObject.h> +#include <mockpp/visiting/VisitableMockObject.h> #include <mockpp/util/AssertMo.h> Index: VisitableMockObject_2_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_2_void_test.cpp,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- VisitableMockObject_2_void_test.cpp 9 Dec 2005 18:56:20 -0000 1.22 +++ VisitableMockObject_2_void_test.cpp 10 Dec 2005 20:07:22 -0000 1.23 @@ -40,7 +40,7 @@ #include <mockpp/chaining/ChainingMockObjectSupport.h> #include <mockpp/ExpectationValue.h> -#include <mockpp/VisitableMockObject.h> +#include <mockpp/visiting/VisitableMockObject.h> class VisitableMockObject_2_void_test MOCKPP_DERIVE_PUBLIC_UNITFRAMEWORK Index: VisitableMockObject_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_test.cpp,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- VisitableMockObject_test.cpp 9 Dec 2005 18:56:20 -0000 1.26 +++ VisitableMockObject_test.cpp 10 Dec 2005 20:07:22 -0000 1.27 @@ -34,7 +34,7 @@ #include "SelectFramework.h" #include <mockpp/ExpectationValue.h> -#include <mockpp/VisitableMockObject.h> +#include <mockpp/visiting/VisitableMockObject.h> class VisitableMockObject_test MOCKPP_DERIVE_PUBLIC_UNITFRAMEWORK Index: VisitableMockObject_3_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_3_void_test.cpp,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- VisitableMockObject_3_void_test.cpp 9 Dec 2005 18:56:20 -0000 1.21 +++ VisitableMockObject_3_void_test.cpp 10 Dec 2005 20:07:22 -0000 1.22 @@ -40,7 +40,7 @@ #include <mockpp/chaining/ChainingMockObjectSupport.h> #include <mockpp/ExpectationValue.h> -#include <mockpp/VisitableMockObject.h> +#include <mockpp/visiting/VisitableMockObject.h> class VisitableMockObject_3_void_test MOCKPP_DERIVE_PUBLIC_UNITFRAMEWORK Index: VisitableMockMethod_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockMethod_test.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- VisitableMockMethod_test.cpp 9 Dec 2005 18:56:20 -0000 1.18 +++ VisitableMockMethod_test.cpp 10 Dec 2005 20:07:22 -0000 1.19 @@ -35,17 +35,16 @@ //#define MOCKPP_COUNTED_WEAKNESS // only BCB5 -#include <mockpp/VisitableMockMethod.h> -#include <mockpp/VisitableMockMethod0.h> -#include <mockpp/VisitableMockMethod1.h> -#include <mockpp/VisitableMockMethod2.h> -#include <mockpp/VisitableMockMethod3.h> -#include <mockpp/VisitableMockMethod4.h> -#include <mockpp/VisitableMockMethod5.h> -#include <mockpp/VisitableMockMethod6.h> -#include <mockpp/CountedVisitableMethod.h> - -#include <mockpp/VisitableMockObject.h> +#include <mockpp/visiting/VisitableMockMethod.h> +#include <mockpp/visiting/VisitableMockMethod0.h> +#include <mockpp/visiting/VisitableMockMethod1.h> +#include <mockpp/visiting/VisitableMockMethod2.h> +#include <mockpp/visiting/VisitableMockMethod3.h> +#include <mockpp/visiting/VisitableMockMethod4.h> +#include <mockpp/visiting/VisitableMockMethod5.h> +#include <mockpp/visiting/VisitableMockMethod6.h> +#include <mockpp/visiting/CountedVisitableMethod.h> +#include <mockpp/visiting/VisitableMockObject.h> #include <mockpp/constraint/OutBound.h> Index: VisitableMockMethod_2_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockMethod_2_test.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- VisitableMockMethod_2_test.cpp 9 Dec 2005 18:56:20 -0000 1.11 +++ VisitableMockMethod_2_test.cpp 10 Dec 2005 20:07:22 -0000 1.12 @@ -33,8 +33,8 @@ #include "SelectFramework.h" -#include <mockpp/VisitableMockMethod2.h> -#include <mockpp/VisitableMockObject.h> +#include <mockpp/visiting/VisitableMockMethod2.h> +#include <mockpp/visiting/VisitableMockObject.h> #include <mockpp/chaining/ChainingMockObjectSupport.h> Index: ChainableMockObject_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_test.cpp,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- ChainableMockObject_test.cpp 9 Dec 2005 18:56:20 -0000 1.25 +++ ChainableMockObject_test.cpp 10 Dec 2005 20:07:22 -0000 1.26 @@ -33,7 +33,7 @@ #include "SelectFramework.h" -#include <mockpp/ChainableMockObject.h> +#include <mockpp/chaining/ChainableMockObject.h> #include <mockpp/chaining/ChainingMockObjectSupport.h> #include <mockpp/chaining/Invocation.h> Index: VerifyingTestCase_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VerifyingTestCase_test.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- VerifyingTestCase_test.cpp 9 Dec 2005 18:56:20 -0000 1.18 +++ VerifyingTestCase_test.cpp 10 Dec 2005 20:07:22 -0000 1.19 @@ -39,7 +39,8 @@ # include <memory> #endif -#include <mockpp/VerifyingTestCase.h> +#include <mockpp/framework/VerifyingTestCase.h> + #include <mockpp/ExpectationValue.h> #include <mockpp/compat/Assert.h> Index: ChainableMockObject_3_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_3_test.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- ChainableMockObject_3_test.cpp 9 Dec 2005 18:56:20 -0000 1.11 +++ ChainableMockObject_3_test.cpp 10 Dec 2005 20:07:22 -0000 1.12 @@ -33,7 +33,7 @@ #include "SelectFramework.h" -#include <mockpp/ChainableMockObject.h> +#include <mockpp/chaining/ChainableMockObject.h> #include <mockpp/chaining/ChainingMockObjectSupport.h> Index: ChainableMockObject_4_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_4_void_test.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- ChainableMockObject_4_void_test.cpp 9 Dec 2005 18:56:20 -0000 1.13 +++ ChainableMockObject_4_void_test.cpp 10 Dec 2005 20:07:22 -0000 1.14 @@ -34,7 +34,7 @@ #include "SelectFramework.h" #include <mockpp/chaining/mockpp_pti.h> -#include <mockpp/ChainableMockObject.h> +#include <mockpp/chaining/ChainableMockObject.h> #include <mockpp/chaining/ChainingMockObjectSupport.h> Index: VisitableMockObject_template_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_template_test.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- VisitableMockObject_template_test.cpp 9 Dec 2005 18:56:20 -0000 1.10 +++ VisitableMockObject_template_test.cpp 10 Dec 2005 20:07:22 -0000 1.11 @@ -33,7 +33,7 @@ #include "SelectFramework.h" -#include <mockpp/VisitableMockObject.h> +#include <mockpp/visiting/VisitableMockObject.h> class VisitableMockObject_template_test MOCKPP_DERIVE_PUBLIC_UNITFRAMEWORK Index: VisitableMockMethod_1_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockMethod_1_test.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- VisitableMockMethod_1_test.cpp 9 Dec 2005 18:56:20 -0000 1.6 +++ VisitableMockMethod_1_test.cpp 10 Dec 2005 20:07:22 -0000 1.7 @@ -33,8 +33,8 @@ #include "SelectFramework.h" -#include <mockpp/VisitableMockMethod1.h> -#include <mockpp/VisitableMockObject.h> +#include <mockpp/visiting/VisitableMockMethod1.h> +#include <mockpp/visiting/VisitableMockObject.h> #include <mockpp/chaining/ChainingMockObjectSupport.h> Index: ChainableMockObject_1_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_1_void_test.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- ChainableMockObject_1_void_test.cpp 9 Dec 2005 18:56:20 -0000 1.16 +++ ChainableMockObject_1_void_test.cpp 10 Dec 2005 20:07:22 -0000 1.17 @@ -34,7 +34,7 @@ #include "SelectFramework.h" #include <mockpp/chaining/mockpp_pti.h> -#include <mockpp/ChainableMockObject.h> +#include <mockpp/chaining/ChainableMockObject.h> #include <mockpp/chaining/ChainingMockObjectSupport.h> Index: ChainableMockObject_2_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_2_test.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- ChainableMockObject_2_test.cpp 9 Dec 2005 18:56:20 -0000 1.12 +++ ChainableMockObject_2_test.cpp 10 Dec 2005 20:07:22 -0000 1.13 @@ -33,7 +33,7 @@ #include "SelectFramework.h" -#include <mockpp/ChainableMockObject.h> +#include <mockpp/chaining/ChainableMockObject.h> #include <mockpp/chaining/ChainingMockObjectSupport.h> #include <mockpp/chaining/Invocation.h> Index: VisitableMockObject_5_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_5_test.cpp,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- VisitableMockObject_5_test.cpp 9 Dec 2005 18:56:20 -0000 1.30 +++ VisitableMockObject_5_test.cpp 10 Dec 2005 20:07:22 -0000 1.31 @@ -34,7 +34,7 @@ #include "SelectFramework.h" #include <mockpp/ExpectationValue.h> -#include <mockpp/VisitableMockObject.h> +#include <mockpp/visiting/VisitableMockObject.h> #include <mockpp/util/AssertMo.h> #include <mockpp/chaining/ChainingMockObjectSupport.h> Index: VisitableMockObject_3_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_3_test.cpp,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- VisitableMockObject_3_test.cpp 9 Dec 2005 18:56:20 -0000 1.21 +++ VisitableMockObject_3_test.cpp 10 Dec 2005 20:07:22 -0000 1.22 @@ -39,7 +39,7 @@ #include <mockpp/chaining/ChainingMockObjectSupport.h> #include <mockpp/ExpectationValue.h> -#include <mockpp/VisitableMockObject.h> +#include <mockpp/visiting/VisitableMockObject.h> #include <mockpp/util/AssertMo.h> Index: VisitableMockObject_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_void_test.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- VisitableMockObject_void_test.cpp 9 Dec 2005 18:56:20 -0000 1.19 +++ VisitableMockObject_void_test.cpp 10 Dec 2005 20:07:22 -0000 1.20 @@ -36,7 +36,7 @@ #include "SelectFramework.h" #include <mockpp/ExpectationValue.h> -#include <mockpp/VisitableMockObject.h> +#include <mockpp/visiting/VisitableMockObject.h> class VisitableMockObject_void_test MOCKPP_DERIVE_PUBLIC_UNITFRAMEWORK Index: ChainableMockObject_5_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_5_test.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- ChainableMockObject_5_test.cpp 9 Dec 2005 18:56:20 -0000 1.13 +++ ChainableMockObject_5_test.cpp 10 Dec 2005 20:07:22 -0000 1.14 @@ -33,7 +33,7 @@ #include "SelectFramework.h" -#include <mockpp/ChainableMockObject.h> +#include <mockpp/chaining/ChainableMockObject.h> #include "classes_ABCDE.h" Index: VerifyingTestCaller_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VerifyingTestCaller_test.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- VerifyingTestCaller_test.cpp 9 Dec 2005 18:56:20 -0000 1.11 +++ VerifyingTestCaller_test.cpp 10 Dec 2005 20:07:22 -0000 1.12 @@ -39,7 +39,7 @@ # include <memory> #endif -#include <mockpp/VerifyingTestCaller.h> +#include <mockpp/framework/VerifyingTestCaller.h> #include <mockpp/compat/Assert.h> Index: ChainableMockObject_3_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_3_void_test.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- ChainableMockObject_3_void_test.cpp 9 Dec 2005 18:56:20 -0000 1.13 +++ ChainableMockObject_3_void_test.cpp 10 Dec 2005 20:07:22 -0000 1.14 @@ -34,7 +34,7 @@ #include "SelectFramework.h" #include <mockpp/chaining/mockpp_pti.h> -#include <mockpp/ChainableMockObject.h> +#include <mockpp/chaining/ChainableMockObject.h> #include <mockpp/chaining/ChainingMockObjectSupport.h> Index: VisitableMockObject_4_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_4_void_test.cpp,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- VisitableMockObject_4_void_test.cpp 9 Dec 2005 18:56:20 -0000 1.21 +++ VisitableMockObject_4_void_test.cpp 10 Dec 2005 20:07:22 -0000 1.22 @@ -34,7 +34,7 @@ #include "SelectFramework.h" #include <mockpp/ExpectationValue.h> -#include <mockpp/VisitableMockObject.h> +#include <mockpp/visiting/VisitableMockObject.h> #include <mockpp/chaining/ChainingMockObjectSupport.h> |
|
From: Ewald A. <ewa...@us...> - 2005-12-10 20:07:32
|
Update of /cvsroot/mockpp/mockpp/mockpp/framework In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7221/mockpp/framework Modified Files: .cvsignore Makefile.am VerifyingTestCaller.cpp VerifyingTestCaller.h VerifyingTestCase.cpp VerifyingTestCase.h Log Message: restructuring and cleanup Index: .cvsignore =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/framework/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- .cvsignore 10 Dec 2005 19:19:17 -0000 1.1 +++ .cvsignore 10 Dec 2005 20:07:21 -0000 1.2 @@ -0,0 +1 @@ +Makefile.in Index: VerifyingTestCaller.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/framework/VerifyingTestCaller.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- VerifyingTestCaller.cpp 10 Dec 2005 19:23:45 -0000 1.1 +++ VerifyingTestCaller.cpp 10 Dec 2005 20:07:21 -0000 1.2 @@ -29,7 +29,7 @@ #include <mockpp/mockpp.h> // always first -#include <mockpp/VerifyingTestCaller.h> +#include <mockpp/framework/VerifyingTestCaller.h> namespace mockpp { Index: VerifyingTestCaller.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/framework/VerifyingTestCaller.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- VerifyingTestCaller.h 10 Dec 2005 19:23:45 -0000 1.1 +++ VerifyingTestCaller.h 10 Dec 2005 20:07:21 -0000 1.2 @@ -33,7 +33,8 @@ #include <mockpp/mockpp.h> // always first #include <mockpp/MockObject.h> -#include <mockpp/VerifyingTestCase.h> + +#include <mockpp/framework/VerifyingTestCase.h> #ifdef HAVE_CPPUNIT Index: Makefile.am =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/framework/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile.am 10 Dec 2005 19:19:18 -0000 1.1 +++ Makefile.am 10 Dec 2005 20:07:21 -0000 1.2 @@ -0,0 +1,19 @@ +INCLUDES = $(all_includes) -I$(top_srcdir) -I$(top_builddir) $(EA_EXTRA_INC) +DEFAULT_INCLUDES = $(INCLUDES) + +noinst_LTLIBRARIES = libframework.la + +libframeworkinclude_HEADERS = \ + CxxTestSupport.h SelectUnittestFramework.h \ + VerifyingTestCase.h VerifyingTestCaller.h + +EXTRA_DIST = + +libframeworkincludedir = $(includedir)/mockpp/framework + +CLEANFILES = *.~* *.~~* *~ *.old + +libframework_la_SOURCES = \ + VerifyingTestCase.cpp VerifyingTestCaller.cpp + +noinst_HEADERS = Index: VerifyingTestCase.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/framework/VerifyingTestCase.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- VerifyingTestCase.h 10 Dec 2005 19:23:45 -0000 1.1 +++ VerifyingTestCase.h 10 Dec 2005 20:07:21 -0000 1.2 @@ -107,5 +107,5 @@ #endif // MOCKPP_VERIFYINGTESTCASE_H -#include <mockpp/VerifyingTestCaller.h> +#include <mockpp/framework/VerifyingTestCaller.h> Index: VerifyingTestCase.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/framework/VerifyingTestCase.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- VerifyingTestCase.cpp 10 Dec 2005 19:23:45 -0000 1.1 +++ VerifyingTestCase.cpp 10 Dec 2005 20:07:21 -0000 1.2 @@ -33,7 +33,7 @@ #include <mockpp/mockpp.h> // always first -#include <mockpp/VerifyingTestCase.h> +#include <mockpp/framework/VerifyingTestCase.h> #include <mockpp/compat/Exception.h> #include <mockpp/compat/Formatter.h> |
|
From: Ewald A. <ewa...@us...> - 2005-12-10 20:07:32
|
Update of /cvsroot/mockpp/mockpp/mockpp/examples/tutorial In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7221/mockpp/examples/tutorial Modified Files: chainmock.cpp chainmock2.cpp cppunit.cpp verifying.cpp visitmock.cpp visitmock2.cpp Log Message: restructuring and cleanup Index: cppunit.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/examples/tutorial/cppunit.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- cppunit.cpp 15 Oct 2005 15:50:36 -0000 1.12 +++ cppunit.cpp 10 Dec 2005 20:07:21 -0000 1.13 @@ -13,8 +13,8 @@ #include <mockpp/mockpp.h> // always first #include <mockpp/Throwable.h> -#include <mockpp/VisitableMockObject.h> -#include <mockpp/ChainableMockObject.h> +#include <mockpp/visiting/VisitableMockObject.h> +#include <mockpp/chaining/ChainableMockObject.h> #include <mockpp/chaining/ChainingMockObjectSupport.h> #include <cppunit/extensions/TestFactoryRegistry.h> Index: verifying.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/examples/tutorial/verifying.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- verifying.cpp 1 May 2005 14:20:51 -0000 1.11 +++ verifying.cpp 10 Dec 2005 20:07:21 -0000 1.12 @@ -16,7 +16,8 @@ #ifdef HAVE_CPPUNIT -#include <mockpp/VerifyingTestCase.h> +#include <mockpp/framework/VerifyingTestCase.h> + #include <mockpp/ExpectationValue.h> #include <mockpp/compat/AssertionFailedError.h> @@ -123,5 +124,5 @@ #else std::cout << "CppUnit was not available at compile time.\n"; return 1; -#endif +#endif } Index: visitmock2.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/examples/tutorial/visitmock2.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- visitmock2.cpp 26 Nov 2005 17:58:40 -0000 1.2 +++ visitmock2.cpp 10 Dec 2005 20:07:21 -0000 1.3 @@ -13,8 +13,8 @@ #define MOCKPP_IMPORT_ABBREVIATED #include <mockpp/mockpp.h> // always first -#include <mockpp/VisitableMockObject.h> -#include <mockpp/CountedVisitableMethod.h> +#include <mockpp/visiting/VisitableMockObject.h> +#include <mockpp/visiting/CountedVisitableMethod.h> #include <mockpp/chaining/ChainingMockObjectSupport.h> Index: visitmock.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/examples/tutorial/visitmock.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- visitmock.cpp 26 Nov 2005 17:58:40 -0000 1.15 +++ visitmock.cpp 10 Dec 2005 20:07:21 -0000 1.16 @@ -13,7 +13,7 @@ #define MOCKPP_IMPORT_ABBREVIATED #include <mockpp/mockpp.h> // always first -#include <mockpp/VisitableMockObject.h> +#include <mockpp/visiting/VisitableMockObject.h> #include <mockpp/chaining/ChainingMockObjectSupport.h> Index: chainmock2.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/examples/tutorial/chainmock2.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- chainmock2.cpp 26 Nov 2005 17:58:40 -0000 1.2 +++ chainmock2.cpp 10 Dec 2005 20:07:21 -0000 1.3 @@ -15,7 +15,7 @@ #include "interface.h" #include "consumer.h" -#include <mockpp/ChainableMockObject.h> +#include <mockpp/chaining/ChainableMockObject.h> #include <mockpp/chaining/CountedChainableMethod.h> #include <mockpp/chaining/ChainingMockObjectSupport.h> Index: chainmock.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/examples/tutorial/chainmock.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- chainmock.cpp 10 Dec 2005 15:17:15 -0000 1.12 +++ chainmock.cpp 10 Dec 2005 20:07:21 -0000 1.13 @@ -16,7 +16,7 @@ #include "consumer.h" #include <mockpp/chaining/mockpp_pti.h> -#include <mockpp/ChainableMockObject.h> +#include <mockpp/chaining/ChainableMockObject.h> #include <mockpp/chaining/ChainingMockObjectSupport.h> #include <exception> |
|
From: Ewald A. <ewa...@us...> - 2005-12-10 20:07:32
|
Update of /cvsroot/mockpp/mockpp/mockpp/visiting In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7221/mockpp/visiting Modified Files: .cvsignore CountedVisitableMethod.h Makefile.am VisitableMockMethod.cpp VisitableMockMethod.h VisitableMockMethod0.h VisitableMockMethod1.h VisitableMockMethod2.h VisitableMockMethod3.h VisitableMockMethod4.h VisitableMockMethod5.h VisitableMockMethod6.h VisitableMockObject.cpp VisitableMockObject.h Log Message: restructuring and cleanup Index: .cvsignore =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/visiting/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- .cvsignore 10 Dec 2005 19:14:39 -0000 1.1 +++ .cvsignore 10 Dec 2005 20:07:22 -0000 1.2 @@ -0,0 +1 @@ +Makefile.in Index: VisitableMockMethod1.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/visiting/VisitableMockMethod1.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- VisitableMockMethod1.h 10 Dec 2005 19:20:00 -0000 1.1 +++ VisitableMockMethod1.h 10 Dec 2005 20:07:22 -0000 1.2 @@ -33,9 +33,9 @@ #include <mockpp/mockpp.h> -#include <mockpp/VisitableMockObject.h> -#include <mockpp/VisitableMockMethod.h> -#include <mockpp/ResponseVector1.h> +#include <mockpp/visiting/VisitableMockObject.h> +#include <mockpp/visiting/VisitableMockMethod.h> +#include <mockpp/visiting/ResponseVector1.h> namespace mockpp { Index: VisitableMockMethod.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/visiting/VisitableMockMethod.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- VisitableMockMethod.cpp 10 Dec 2005 19:20:00 -0000 1.1 +++ VisitableMockMethod.cpp 10 Dec 2005 20:07:22 -0000 1.2 @@ -31,7 +31,7 @@ #include <mockpp/mockpp.h> // always first #include <mockpp/mockpp_dbc.h> -#include <mockpp/VisitableMockMethod.h> +#include <mockpp/visiting/VisitableMockMethod.h> namespace mockpp { Index: VisitableMockMethod6.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/visiting/VisitableMockMethod6.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- VisitableMockMethod6.h 10 Dec 2005 19:20:00 -0000 1.1 +++ VisitableMockMethod6.h 10 Dec 2005 20:07:22 -0000 1.2 @@ -33,9 +33,9 @@ #include <mockpp/mockpp.h> -#include <mockpp/VisitableMockObject.h> -#include <mockpp/VisitableMockMethod.h> -#include <mockpp/ResponseVector6.h> +#include <mockpp/visiting/VisitableMockObject.h> +#include <mockpp/visiting/VisitableMockMethod.h> +#include <mockpp/visiting/ResponseVector6.h> namespace mockpp { Index: VisitableMockMethod2.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/visiting/VisitableMockMethod2.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- VisitableMockMethod2.h 10 Dec 2005 19:20:00 -0000 1.1 +++ VisitableMockMethod2.h 10 Dec 2005 20:07:22 -0000 1.2 @@ -33,9 +33,9 @@ #include <mockpp/mockpp.h> -#include <mockpp/VisitableMockObject.h> -#include <mockpp/VisitableMockMethod.h> -#include <mockpp/ResponseVector2.h> +#include <mockpp/visiting/VisitableMockObject.h> +#include <mockpp/visiting/VisitableMockMethod.h> +#include <mockpp/visiting/ResponseVector2.h> namespace mockpp { Index: VisitableMockObject.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/visiting/VisitableMockObject.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- VisitableMockObject.cpp 10 Dec 2005 19:20:00 -0000 1.1 +++ VisitableMockObject.cpp 10 Dec 2005 20:07:22 -0000 1.2 @@ -30,7 +30,7 @@ #include <mockpp/mockpp.h> // always first -#include <mockpp/VisitableMockObject.h> +#include <mockpp/visiting/VisitableMockObject.h> namespace mockpp { Index: VisitableMockMethod3.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/visiting/VisitableMockMethod3.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- VisitableMockMethod3.h 10 Dec 2005 19:20:00 -0000 1.1 +++ VisitableMockMethod3.h 10 Dec 2005 20:07:22 -0000 1.2 @@ -33,9 +33,9 @@ #include <mockpp/mockpp.h> -#include <mockpp/VisitableMockObject.h> -#include <mockpp/VisitableMockMethod.h> -#include <mockpp/ResponseVector3.h> +#include <mockpp/visiting/VisitableMockObject.h> +#include <mockpp/visiting/VisitableMockMethod.h> +#include <mockpp/visiting/ResponseVector3.h> namespace mockpp { Index: CountedVisitableMethod.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/visiting/CountedVisitableMethod.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- CountedVisitableMethod.h 10 Dec 2005 19:19:59 -0000 1.1 +++ CountedVisitableMethod.h 10 Dec 2005 20:07:22 -0000 1.2 @@ -1,7 +1,7 @@ /** @file @internal NOT INTENDED FOR PUBLIC INCLUSION @brief Generated with gen_countvisitable.pl. - + $Id$ ***************************************************************************/ @@ -33,13 +33,13 @@ #include <mockpp/CountParameters.h> -#include <mockpp/VisitableMockMethod0.h> -#include <mockpp/VisitableMockMethod1.h> -#include <mockpp/VisitableMockMethod2.h> -#include <mockpp/VisitableMockMethod3.h> -#include <mockpp/VisitableMockMethod4.h> -#include <mockpp/VisitableMockMethod5.h> -#include <mockpp/VisitableMockMethod6.h> +#include <mockpp/visiting/VisitableMockMethod0.h> +#include <mockpp/visiting/VisitableMockMethod1.h> +#include <mockpp/visiting/VisitableMockMethod2.h> +#include <mockpp/visiting/VisitableMockMethod3.h> +#include <mockpp/visiting/VisitableMockMethod4.h> +#include <mockpp/visiting/VisitableMockMethod5.h> +#include <mockpp/visiting/VisitableMockMethod6.h> namespace mockpp { Index: VisitableMockMethod.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/visiting/VisitableMockMethod.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- VisitableMockMethod.h 10 Dec 2005 19:20:00 -0000 1.1 +++ VisitableMockMethod.h 10 Dec 2005 20:07:22 -0000 1.2 @@ -33,7 +33,7 @@ #include <mockpp/mockpp.h> -#include <mockpp/VisitableMockObject.h> +#include <mockpp/visiting/VisitableMockObject.h> //#include <mockpp/CountedVisitableMethod.h> Index: VisitableMockMethod4.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/visiting/VisitableMockMethod4.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- VisitableMockMethod4.h 10 Dec 2005 19:20:00 -0000 1.1 +++ VisitableMockMethod4.h 10 Dec 2005 20:07:22 -0000 1.2 @@ -33,9 +33,9 @@ #include <mockpp/mockpp.h> -#include <mockpp/VisitableMockObject.h> -#include <mockpp/VisitableMockMethod.h> -#include <mockpp/ResponseVector4.h> +#include <mockpp/visiting/VisitableMockObject.h> +#include <mockpp/visiting/VisitableMockMethod.h> +#include <mockpp/visiting/ResponseVector4.h> namespace mockpp { Index: VisitableMockMethod0.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/visiting/VisitableMockMethod0.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- VisitableMockMethod0.h 10 Dec 2005 19:20:00 -0000 1.1 +++ VisitableMockMethod0.h 10 Dec 2005 20:07:22 -0000 1.2 @@ -33,8 +33,8 @@ #include <mockpp/mockpp.h> -#include <mockpp/VisitableMockObject.h> -#include <mockpp/VisitableMockMethod.h> +#include <mockpp/visiting/VisitableMockObject.h> +#include <mockpp/visiting/VisitableMockMethod.h> namespace mockpp { Index: VisitableMockMethod5.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/visiting/VisitableMockMethod5.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- VisitableMockMethod5.h 10 Dec 2005 19:20:00 -0000 1.1 +++ VisitableMockMethod5.h 10 Dec 2005 20:07:22 -0000 1.2 @@ -33,9 +33,9 @@ #include <mockpp/mockpp.h> -#include <mockpp/VisitableMockObject.h> -#include <mockpp/VisitableMockMethod.h> -#include <mockpp/ResponseVector5.h> +#include <mockpp/visiting/VisitableMockObject.h> +#include <mockpp/visiting/VisitableMockMethod.h> +#include <mockpp/visiting/ResponseVector5.h> namespace mockpp { Index: VisitableMockObject.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/visiting/VisitableMockObject.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- VisitableMockObject.h 10 Dec 2005 19:20:00 -0000 1.1 +++ VisitableMockObject.h 10 Dec 2005 20:07:22 -0000 1.2 @@ -43,8 +43,8 @@ #include <mockpp/constraint/ConstraintList.h> -#include <mockpp/VisitableMockObject_macro.h> -#include <mockpp/VisitableMockObject_template.h> +#include <mockpp/visiting/VisitableMockObject_macro.h> +#include <mockpp/visiting/VisitableMockObject_template.h> namespace mockpp { Index: Makefile.am =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/visiting/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile.am 10 Dec 2005 19:14:39 -0000 1.1 +++ Makefile.am 10 Dec 2005 20:07:22 -0000 1.2 @@ -0,0 +1,26 @@ +INCLUDES = $(all_includes) -I$(top_srcdir) -I$(top_builddir) $(EA_EXTRA_INC) +DEFAULT_INCLUDES = $(INCLUDES) + +noinst_LTLIBRARIES = libvisiting.la + +libvisitinginclude_HEADERS = \ +VisitableMockObject_macro.h VisitableMockObject_template.h VisitableMockObject.h \ +VisitableMockMethod.h VisitableMockMethod0.h VisitableMockMethod1.h VisitableMockMethod2.h \ + VisitableMockMethod3.h VisitableMockMethod4.h VisitableMockMethod5.h VisitableMockMethod6.h \ + ResponseVector1.h ResponseVector2.h \ + ResponseVector3.h ResponseVector4.h ResponseVector5.h ResponseVector6.h \ + CountedVisitableMethod.h + +EXTRA_DIST = \ + gen_visitablemethod_N.pl \ + gen_countvisitable_N.pl \ + gen_responsevector_N.pl + +libvisitingincludedir = $(includedir)/mockpp/visiting + +CLEANFILES = *.~* *.~~* *~ *.old + +libvisiting_la_SOURCES = \ + VisitableMockMethod.cpp VisitableMockObject.cpp + +noinst_HEADERS = |
|
From: Ewald A. <ewa...@us...> - 2005-12-10 20:07:30
|
Update of /cvsroot/mockpp/mockpp/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7221/mockpp Modified Files: .cvsignore Makefile.am MixedMockObject.h Log Message: restructuring and cleanup Index: .cvsignore =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- .cvsignore 22 Mar 2005 22:03:21 -0000 1.10 +++ .cvsignore 10 Dec 2005 20:07:21 -0000 1.11 @@ -20,6 +20,7 @@ doc-template.h visitable-template.h chainable-template.h +var Index: MixedMockObject.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/MixedMockObject.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- MixedMockObject.h 13 Nov 2005 11:53:18 -0000 1.3 +++ MixedMockObject.h 10 Dec 2005 20:07:21 -0000 1.4 @@ -32,8 +32,9 @@ #include <mockpp/mockpp.h> // always first -#include <mockpp/VisitableMockObject.h> -#include <mockpp/ChainableMockObject.h> +#include <mockpp/visiting/VisitableMockObject.h> + +#include <mockpp/chaining/ChainableMockObject.h> namespace mockpp { Index: Makefile.am =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/Makefile.am,v retrieving revision 1.98 retrieving revision 1.99 diff -u -d -r1.98 -r1.99 --- Makefile.am 9 Dec 2005 21:16:49 -0000 1.98 +++ Makefile.am 10 Dec 2005 20:07:21 -0000 1.99 @@ -1,7 +1,9 @@ INCLUDES = $(all_includes) -I$(top_srcdir) -I$(top_builddir) $(EA_EXTRA_INC) DEFAULT_INCLUDES = $(INCLUDES) -SUBDIRS = chaining compat util builder constraint matcher stub production . docs tests po examples +SUBDIRS = chaining visiting compat util builder constraint matcher stub \ + production framework \ + . config docs tests po examples lib_LTLIBRARIES = libmockpp.la @@ -14,39 +16,32 @@ $(top_builddir)/mockpp/util/libutil.la $(top_builddir)/mockpp/stub/libstub.la \ $(top_builddir)/mockpp/matcher/libmatcher.la $(top_builddir)/mockpp/constraint/libconstraint.la \ $(top_builddir)/mockpp/compat/libcompat.la $(top_builddir)/mockpp/chaining/libchaining.la \ + $(top_builddir)/mockpp/visiting/libvisiting.la $(top_builddir)/mockpp/framework/libframework.la \ $(top_builddir)/mockpp/builder/libbuilder.la \ $(EA_EXTRA_LIB) $(LIBCPPUNIT) libmockpp_la_SOURCES = ExpectationCounter.cpp mockpp.cpp Throwable.cpp \ - ThrowableList.cpp MockObject.cpp VisitableMockObject.cpp VerifiableList.cpp \ - Verifiable.cpp VerifyingTestCase.cpp SelfDescribing.cpp ChainableMockObject.cpp \ - VerifyingTestCaller.cpp TrackingCounter.cpp MixedMockObject.cpp MockTimeServer.cpp \ - VisitableMockMethod.cpp + ThrowableList.cpp MockObject.cpp VerifiableList.cpp \ + Verifiable.cpp SelfDescribing.cpp\ + TrackingCounter.cpp MixedMockObject.cpp MockTimeServer.cpp pkginclude_HEADERS = mockpp_config.h ReturnObjectList.h Expectation.h \ AbstractExpectation.h ExpectationValue.h ExpectationSegment.h ExpectationList.h \ ExpectationSet.h ExpectationMap.h ExpectationBoundary.h AbstractExpectationCollection.h \ - VisitableMockObject_macro.h VisitableMockObject_template.h ExpectationConglomeration.h \ - ExpectationCounter.h mockpp.h Throwable.h ThrowableList.h MockObject.h VisitableMockObject.h \ - VerifiableList.h Verifiable.h VerifyingTestCase.h SelfDescribing.h ChainableMockObject.h \ - VerifyingTestCaller.h TrackingCounter.h MixedMockObject.h mockpp_dbc.h MockTimeServer.h \ - VisitableMockMethod.h VisitableMockMethod0.h VisitableMockMethod1.h VisitableMockMethod2.h \ - VisitableMockMethod3.h VisitableMockMethod4.h VisitableMockMethod5.h VisitableMockMethod6.h \ - CountParameters.h CountedVisitableMethod.h ResponseVector1.h ResponseVector2.h \ - ResponseVector3.h ResponseVector4.h ResponseVector5.h ResponseVector6.h CxxTestSupport.h + ExpectationConglomeration.h \ + ExpectationCounter.h mockpp.h Throwable.h ThrowableList.h MockObject.h \ + VerifiableList.h Verifiable.h SelfDescribing.h \ + TrackingCounter.h MixedMockObject.h mockpp_dbc.h MockTimeServer.h \ + CountParameters.h EXTRA_DIST = \ mockpp_config-bcb5.h \ - mockpp_config-msvc_60_70.h \ mockpp_config-msvc_71.h \ - gen_visitablemethod_N.pl \ - gen_countparams_N.pl \ - gen_countvisitable_N.pl \ - gen_responsevector_N.pl + gen_countparams_N.pl CLEANFILES = *.~* *.~~* *~ mockpp_config.h *.old -.PHONY: chainer mockpp_config-bcb5.h mockpp_config-msvc_60_70.h mockpp_config-msvc_71.h mockpp_config.h metrics templates +.PHONY: chainer mockpp_config-bcb5.h mockpp_config-msvc_71.h mockpp_config.h metrics templates metrics: TODAY=`date +%y%m%d`; \ @@ -103,22 +98,22 @@ grep MOCKPP_USE_MINI_STL ../config.h >>$@ mockpp_config-bcb5.h: - perl -i.bak -pe "s/(.*mockpp_production)_(\d*)(\.lib|\.dll)/\1_$(LT_CURRENT)\3/g" $(top_srcdir)/bcb5/*.bpr $(top_srcdir)/bcb5/*.bpf $(top_srcdir)/bcb5/*.bpg $(top_srcdir)/bcbX/*.cbx - perl -i.bak -pe "s/\\\\(mockpp)_(\d*)\\\\/\\\\\1_$(LT_CURRENT)\\\\/g" $(top_srcdir)/bcb5/*.bpr $(top_srcdir)/bcbX/*.cbx $(top_srcdir)/bcbX/*.cbx $(top_srcdir)/bcbX/*.bat + perl -i.bak -pe "s/(.*mockpp_production)_(\d*)(\.lib|\.dll)/\1_$(LT_CURRENT)\3/g" $(top_srcdir)/bcb5/*.bpr $(top_srcdir)/bcb5/*.bpf $(top_srcdir)/bcb5/*.bpg + perl -i.bak -pe "s/\\\\(mockpp)_(\d*)\\\\/\\\\\1_$(LT_CURRENT)\\\\/g" $(top_srcdir)/bcb5/*.bpr perl -i.bak -pe "s/\\\\(mockpp)_(\d*)/\\\\\1_$(LT_CURRENT)/g" $(top_srcdir)/bcb5/*.bat - perl -i.bak -pe "s/(.*mockpp)_(\d*)(\.lib|\.dll)/\1_$(LT_CURRENT)\3/g" $(top_srcdir)/bcb5/*.bpr $(top_srcdir)/bcb5/*.bpf $(top_srcdir)/bcb5/*.bpg $(top_srcdir)/bcbX/*.cbx - perl -i.bak -pe "s/(cppunit)_(\d*)(\.exe)/\1_$(LT_CURRENT)\3/g" $(top_srcdir)/bcb5/*.bpr $(top_srcdir)/bcbX/*.cbx $(top_srcdir)/bcb5/*.bpf - perl -i.bak -pe "s/(readability_test)_(\d*)(\.exe)/\1_$(LT_CURRENT)\3/g" $(top_srcdir)/bcb5/*.bpr $(top_srcdir)/bcbX/*.cbx $(top_srcdir)/bcb5/*.bpf - perl -i.bak -pe "s/(verifying)_(\d*)(\.exe)/\1_$(LT_CURRENT)\3/g" $(top_srcdir)/bcb5/*.bpr $(top_srcdir)/bcbX/*.cbx $(top_srcdir)/bcb5/*.bpf - perl -i.bak -pe "s/(basicmock)_(\d*)(\.exe)/\1_$(LT_CURRENT)\3/g" $(top_srcdir)/bcb5/*.bpr $(top_srcdir)/bcbX/*.cbx $(top_srcdir)/bcb5/*.bpf - perl -i.bak -pe "s/(chainmock)_(\d*)(\.exe)/\1_$(LT_CURRENT)\3/g" $(top_srcdir)/bcb5/*.bpr $(top_srcdir)/bcbX/*.cbx $(top_srcdir)/bcb5/*.bpf - perl -i.bak -pe "s/(visitmock)_(\d*)(\.exe)/\1_$(LT_CURRENT)\3/g" $(top_srcdir)/bcb5/*.bpr $(top_srcdir)/bcbX/*.cbx $(top_srcdir)/bcb5/*.bpf - perl -i.bak -pe "s/(poormock)_(\d*)(\.exe)/\1_$(LT_CURRENT)\3/g" $(top_srcdir)/bcb5/*.bpr $(top_srcdir)/bcbX/*.cbx $(top_srcdir)/bcb5/*.bpf - perl -i.bak -pe "s/(poormock_se)_(\d*)(\.exe)/\1_$(LT_CURRENT)\3/g" $(top_srcdir)/bcb5/*.bpr $(top_srcdir)/bcbX/*.cbx $(top_srcdir)/bcb5/*.bpf - perl -i.bak -pe "s/(poormock-se)_(\d*)(\.exe)/\1_$(LT_CURRENT)\3/g" $(top_srcdir)/bcb5/*.bpr $(top_srcdir)/bcbX/*.cbx $(top_srcdir)/bcb5/*.bpf - perl -i.bak -pe "s/(mock_greeter)_(\d*)(\.exe)/\1_$(LT_CURRENT)\3/g" $(top_srcdir)/bcb5/*.bpr $(top_srcdir)/bcbX/*.cbx $(top_srcdir)/bcb5/*.bpf - perl -i.bak -pe "s/(mock_test)_(\d*)(\.exe)/\1_$(LT_CURRENT)\3/g" $(top_srcdir)/bcb5/*.bpr $(top_srcdir)/bcbX/*.cbx $(top_srcdir)/bcb5/*.bpf - perl -i.bak -pe "s/(jmock_test)_(\d*)(\.exe)/\1_$(LT_CURRENT)\3/g" $(top_srcdir)/bcb5/*.bpr $(top_srcdir)/bcbX/*.cbx $(top_srcdir)/bcb5/*.bpf + perl -i.bak -pe "s/(.*mockpp)_(\d*)(\.lib|\.dll)/\1_$(LT_CURRENT)\3/g" $(top_srcdir)/bcb5/*.bpr $(top_srcdir)/bcb5/*.bpf $(top_srcdir)/bcb5/*.bpg + perl -i.bak -pe "s/(cppunit)_(\d*)(\.exe)/\1_$(LT_CURRENT)\3/g" $(top_srcdir)/bcb5/*.bpr $(top_srcdir)/bcb5/*.bpf + perl -i.bak -pe "s/(readability_test)_(\d*)(\.exe)/\1_$(LT_CURRENT)\3/g" $(top_srcdir)/bcb5/*.bpr $(top_srcdir)/bcb5/*.bpf + perl -i.bak -pe "s/(verifying)_(\d*)(\.exe)/\1_$(LT_CURRENT)\3/g" $(top_srcdir)/bcb5/*.bpr $(top_srcdir)/bcb5/*.bpf + perl -i.bak -pe "s/(basicmock)_(\d*)(\.exe)/\1_$(LT_CURRENT)\3/g" $(top_srcdir)/bcb5/*.bpr $(top_srcdir)/bcb5/*.bpf + perl -i.bak -pe "s/(chainmock)_(\d*)(\.exe)/\1_$(LT_CURRENT)\3/g" $(top_srcdir)/bcb5/*.bpr $(top_srcdir)/bcb5/*.bpf + perl -i.bak -pe "s/(visitmock)_(\d*)(\.exe)/\1_$(LT_CURRENT)\3/g" $(top_srcdir)/bcb5/*.bpr $(top_srcdir)/bcb5/*.bpf + perl -i.bak -pe "s/(poormock)_(\d*)(\.exe)/\1_$(LT_CURRENT)\3/g" $(top_srcdir)/bcb5/*.bpr $(top_srcdir)/bcb5/*.bpf + perl -i.bak -pe "s/(poormock_se)_(\d*)(\.exe)/\1_$(LT_CURRENT)\3/g" $(top_srcdir)/bcb5/*.bpr $(top_srcdir)/bcb5/*.bpf + perl -i.bak -pe "s/(poormock-se)_(\d*)(\.exe)/\1_$(LT_CURRENT)\3/g" $(top_srcdir)/bcb5/*.bpr $(top_srcdir)/bcb5/*.bpf + perl -i.bak -pe "s/(mock_greeter)_(\d*)(\.exe)/\1_$(LT_CURRENT)\3/g" $(top_srcdir)/bcb5/*.bpr $(top_srcdir)/bcb5/*.bpf + perl -i.bak -pe "s/(mock_test)_(\d*)(\.exe)/\1_$(LT_CURRENT)\3/g" $(top_srcdir)/bcb5/*.bpr $(top_srcdir)/bcb5/*.bpf + perl -i.bak -pe "s/(jmock_test)_(\d*)(\.exe)/\1_$(LT_CURRENT)\3/g" $(top_srcdir)/bcb5/*.bpr $(top_srcdir)/bcb5/*.bpf echo "// #define's for Borland BCB5" >$@ echo "// derived from automatically generated config.h. See Makefile.am." >>$@ TODAY=`date +%Y-%m-%d` ; echo "/* Generated: $$TODAY */" >>$@ @@ -153,7 +148,7 @@ echo "#define HAVE_CWCHAR" >>$@ echo "" >>$@ echo "/* Define if you have the std::wstring type. */" >>$@ - echo "#define HAVE_WSTRING" >>$@ + echo "#defi$(top_srcdir)/bcbX/*.cbx ne HAVE_WSTRING" >>$@ echo "" >>$@ echo "/* Define if you have the wcscmp function. */" >>$@ echo "#define HAVE_WCSCMP" >>$@ @@ -167,7 +162,7 @@ -test $@ -ef $(srcdir) || cp $@ $(srcdir) mockpp_config-msvc_71.h: - echo "// #define's for MS Visual C++ 7.1 (NOT 6.0/7.0)" >$@ + echo "// #define's for MS Visual C++ 7.1 and later (NOT 6.0/7.0)" >$@ echo "// derived from automatically generated config.h. See Makefile.am." >>$@ TODAY=`date +%Y-%m-%d` ; echo "/* Generated: $$TODAY */" >>$@ echo "" >>$@ @@ -209,52 +204,6 @@ echo "" >>$@ -test $@ -ef $(srcdir) || cp $@ $(srcdir) -mockpp_config-msvc_60_70.h: - echo "// #define's for MS Visual C++ (only V6?)" >$@ - echo "// derived from automatically generated config.h. See Makefile.am." >>$@ - TODAY=`date +%Y-%m-%d` ; echo "/* Generated: $$TODAY */" >>$@ - echo "" >>$@ - echo "/* Define to turn debugging globally on. */" >>$@ - echo "#undef DEBUG" >>$@ - echo "" >>$@ - echo "/* Turn on support for weak template capabilities. */" >>$@ - echo "#define MOCKPP_PTI_WEAKNESS" >>$@ - echo "" >>$@ - echo "/* Version number of package */" >>$@ - echo "#define MOCKPP_VERSION \"$(VERSION)\"" >>$@ - echo "" >>$@ - echo "/* Name of package */" >>$@ - echo "#define MOCKPP_PACKAGE \"$(PACKAGE)\"" >>$@ - echo "" >>$@ - echo "/* Define if you have CppUnit installed. */" >>$@ - echo "#define HAVE_CPPUNIT" >>$@ - echo "" >>$@ - echo "/* Define to 1 if you have the <limits> header file. */" >>$@ - echo "#define HAVE_LIMITS 1" >>$@ - echo "" >>$@ - echo "/* Define to 1 if you have the <cppunit/Message.h> header file. */" >>$@ - echo "#define HAVE_CPPUNIT_MESSAGE_H 1" >>$@ - echo "" >>$@ - echo "/* Define to compile for unicode environment. */" >>$@ - echo "#undef MOCKPP_UNICODE" >>$@ - echo "" >>$@ - echo "/* Define if you have the cwchar header. */" >>$@ - echo "#define HAVE_CWCHAR" >>$@ - echo "" >>$@ - echo "/* Define if you have the std::wstring type. */" >>$@ - echo "#define HAVE_WSTRING" >>$@ - echo "" >>$@ - echo "/* Define if you have the wcscmp function. */" >>$@ - echo "#define HAVE_WCSCMP" >>$@ - echo "" >>$@ - echo "/* Define if you have the std::wcscmp function. */" >>$@ - echo "#undef HAVE_STD_WCSCMP" >>$@ - echo "" >>$@ - echo "/* Define to supress compiler warnings about unused variables. */" >>$@ - echo "#define MOCKPP_UNUSED(x) x;" >>$@ - echo "" >>$@ - -test $@ -ef $(srcdir) || cp $@ $(srcdir) - i18n_files = $(srcdir)/*.cpp $(srcdir)/*.h \ $(srcdir)/compat/*.h $(srcdir)/compat/*.cpp \ $(srcdir)/util/*.h $(srcdir)/util/*.cpp |
|
From: Ewald A. <ewa...@us...> - 2005-12-10 20:07:30
|
Update of /cvsroot/mockpp/mockpp/mockpp/chaining In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7221/mockpp/chaining Modified Files: ChainableMockMethod.h ChainableMockMethod0.h ChainableMockMethod1.h ChainableMockMethod2.h ChainableMockMethod3.h ChainableMockMethod4.h ChainableMockMethod5.h ChainableMockMethod6.h ChainableMockObject.cpp Makefile.am Log Message: restructuring and cleanup Index: ChainableMockMethod6.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/ChainableMockMethod6.h,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- ChainableMockMethod6.h 24 Nov 2005 19:17:09 -0000 1.9 +++ ChainableMockMethod6.h 10 Dec 2005 20:07:21 -0000 1.10 @@ -33,7 +33,7 @@ #include <mockpp/mockpp.h> -#include <mockpp/ChainableMockObject.h> +#include <mockpp/chaining/ChainableMockObject.h> #include <mockpp/chaining/ChainableMockMethod.h> Index: ChainableMockMethod.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/ChainableMockMethod.h,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- ChainableMockMethod.h 24 Nov 2005 19:17:09 -0000 1.12 +++ ChainableMockMethod.h 10 Dec 2005 20:07:21 -0000 1.13 @@ -34,7 +34,7 @@ #include <mockpp/mockpp.h> #include <mockpp/mockpp_dbc.h> -#include <mockpp/ChainableMockObject.h> +#include <mockpp/chaining/ChainableMockObject.h> //#include <mockpp/CountedChainableMethod.h> Index: ChainableMockMethod2.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/ChainableMockMethod2.h,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- ChainableMockMethod2.h 24 Nov 2005 19:17:09 -0000 1.11 +++ ChainableMockMethod2.h 10 Dec 2005 20:07:21 -0000 1.12 @@ -33,7 +33,7 @@ #include <mockpp/mockpp.h> -#include <mockpp/ChainableMockObject.h> +#include <mockpp/chaining/ChainableMockObject.h> #include <mockpp/chaining/ChainableMockMethod.h> Index: ChainableMockMethod3.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/ChainableMockMethod3.h,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- ChainableMockMethod3.h 24 Nov 2005 19:17:09 -0000 1.11 +++ ChainableMockMethod3.h 10 Dec 2005 20:07:21 -0000 1.12 @@ -33,7 +33,7 @@ #include <mockpp/mockpp.h> -#include <mockpp/ChainableMockObject.h> +#include <mockpp/chaining/ChainableMockObject.h> #include <mockpp/chaining/ChainableMockMethod.h> Index: Makefile.am =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/Makefile.am,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- Makefile.am 30 Oct 2005 13:53:00 -0000 1.16 +++ Makefile.am 10 Dec 2005 20:07:21 -0000 1.17 @@ -16,9 +16,9 @@ ChainableMockMethod4.h \ ChainableMockMethod5.h \ ChainableMockMethod6.h \ - CountedChainableMethod.h \ + ChainableMockObject.h CountedChainableMethod.h \ InvocationN.h - + EXTRA_DIST = \ gen_chainablemethod_N.pl \ gen_countchainable_N.pl \ @@ -28,6 +28,8 @@ CLEANFILES = *.~* *.~~* *~ *.old -libchaining_la_SOURCES = ChainingMockObjectSupport.cpp Invocation.cpp +libchaining_la_SOURCES = \ + ChainingMockObjectSupport.cpp Invocation.cpp \ + ChainableMockObject.cpp noinst_HEADERS = mockpp_pti.h Index: ChainableMockMethod4.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/ChainableMockMethod4.h,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- ChainableMockMethod4.h 24 Nov 2005 19:17:09 -0000 1.11 +++ ChainableMockMethod4.h 10 Dec 2005 20:07:21 -0000 1.12 @@ -33,7 +33,7 @@ #include <mockpp/mockpp.h> -#include <mockpp/ChainableMockObject.h> +#include <mockpp/chaining/ChainableMockObject.h> #include <mockpp/chaining/ChainableMockMethod.h> Index: ChainableMockObject.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/ChainableMockObject.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- ChainableMockObject.cpp 10 Dec 2005 19:18:50 -0000 1.1 +++ ChainableMockObject.cpp 10 Dec 2005 20:07:21 -0000 1.2 @@ -32,7 +32,7 @@ #include MOCKPP_ALGORITHM_H -#include <mockpp/ChainableMockObject.h> +#include <mockpp/chaining/ChainableMockObject.h> namespace mockpp { Index: ChainableMockMethod5.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/ChainableMockMethod5.h,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- ChainableMockMethod5.h 24 Nov 2005 19:17:09 -0000 1.11 +++ ChainableMockMethod5.h 10 Dec 2005 20:07:21 -0000 1.12 @@ -33,7 +33,7 @@ #include <mockpp/mockpp.h> -#include <mockpp/ChainableMockObject.h> +#include <mockpp/chaining/ChainableMockObject.h> #include <mockpp/chaining/ChainableMockMethod.h> Index: ChainableMockMethod0.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/ChainableMockMethod0.h,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- ChainableMockMethod0.h 24 Nov 2005 19:17:09 -0000 1.11 +++ ChainableMockMethod0.h 10 Dec 2005 20:07:21 -0000 1.12 @@ -33,7 +33,7 @@ #include <mockpp/mockpp.h> -#include <mockpp/ChainableMockObject.h> +#include <mockpp/chaining/ChainableMockObject.h> #include <mockpp/chaining/ChainableMockMethod.h> Index: ChainableMockMethod1.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/ChainableMockMethod1.h,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- ChainableMockMethod1.h 24 Nov 2005 19:17:09 -0000 1.11 +++ ChainableMockMethod1.h 10 Dec 2005 20:07:21 -0000 1.12 @@ -33,7 +33,7 @@ #include <mockpp/mockpp.h> -#include <mockpp/ChainableMockObject.h> +#include <mockpp/chaining/ChainableMockObject.h> #include <mockpp/chaining/ChainableMockMethod.h> |
|
From: Ewald A. <ewa...@us...> - 2005-12-10 20:07:29
|
Update of /cvsroot/mockpp/mockpp/3party/cxxtest/cxxtest In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7221/3party/cxxtest/cxxtest Modified Files: Makefile.am Log Message: restructuring and cleanup Index: Makefile.am =================================================================== RCS file: /cvsroot/mockpp/mockpp/3party/cxxtest/cxxtest/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Makefile.am 9 Dec 2005 20:40:42 -0000 1.2 +++ Makefile.am 10 Dec 2005 20:07:21 -0000 1.3 @@ -6,7 +6,7 @@ libmockpp_cxxtest_la_LDFLAGS = -no-undefined -version-info \ $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -libmockpp_cxxtestincludedir = $(includedir)/mockpp/mockpp_cxxtest +libmockpp_cxxtestincludedir = $(includedir)/mockpp/cxxtest libmockpp_cxxtest_la_SOURCES = \ Descriptions.cpp \ |
