AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
e8ceaabb87
wxWidgets/tests/test_vc7_test.vcproj
Vadim Zeitlin e70fc11ef1 Replace CppUnit with Catch for unit tests 
Drop the legacy CppUnit testing framework used for the unit tests.
Replacing it with Catch has the advantage of not requiring CppUnit
libraries to be installed on the system in order to be able to run
tests (Catch is header-only and a copy of it is now included in the
main repository itself) and, in the future, of being able to write
the tests in a much more natural way.

For now, however, avoid changing the existing tests code as much as
[reasonably] possible to avoid introducing bugs in them and provide
the CppUnit compatibility macros in the new wx/catch_cppunit.h header
which allow to preserve the 99% of the existing code unchanged. Some
of the required changes are:

 - Decompose asserts using "a && b" conditions into multiple asserts
   checking "a" and "b" independently. This would have been better
   even with CppUnit (to know which part of condition exactly failed)
   and is required with Catch.

 - Use extra parentheses around such conditions when they can't be
   easily decomposed in the arrays test, due to the use of macros.
   This is not ideal from the point of view of messages given when
   the tests fail but will do for now.

 - Rewrite asserts using "a || b" as a combination of condition
   checks and assert macros. Again, this is better anyhow, and is
   required with Catch. Incidentally, this allowed to fix a bug in
   the "exec" unit test which didn't leave enough time for the new
   process to be launched before trying to kill it.

 - Remove multiple CPPUNIT_TEST_SUITE_NAMED_REGISTRATION() macros,
   our emulation of this macro can be used only once.

 - Provide string conversions using Catch-specific StringMaker for
   a couple of types.

 - Replace custom wxImage comparison with a Catch-specific matcher
   class.

 - Remove most of test running logic from test.cpp, in particular don't
   parse command line ourselves any longer but use Catch built-in
   command line parser. This is a source of a minor regression:
   previously, both "Foo" and "FooTestCase" could be used as the name of
   the test to run, but now only the latter is accepted.
2017-11-02 01:53:16 +01:00

584 lines
16 KiB
XML
Raw Blame History

<?xml version="1.0" encoding="Windows-1252"?>
<!--
This project was generated by
Bakefile 0.2.11 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
<VisualStudioProject
ProjectType="Visual C++"
Version="7.10"
Name="test"
ProjectGUID="{CDA4AD82-E498-50E6-91F2-AB83AD292EA3}">
<Platforms>
<Platform
Name="Win32"/>
</Platforms>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory="vc_mswud"
IntermediateDirectory="vc_mswud\test"
ConfigurationType="1"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\3rdparty\catch\include"
PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
MinimalRebuild="TRUE"
ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
BufferSecurityCheck="TRUE"
RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="testprec.h"
PrecompiledHeaderFile="vc_mswud\testprec_test.pch"
ObjectFile="vc_mswud\test\"
ProgramDataBaseFileName="vc_mswud\test.pdb"
WarningLevel="4"
SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE"
DebugInformationFormat="3"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxbase31ud_net.lib wxbase31ud_xml.lib wxbase31ud.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswud\test.exe"
LinkIncremental="2"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\lib\vc_lib"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswud\test.pdb"
SubSystem="1"
TargetMachine="1"/>
<Tool
Name="VCMIDLTool"
PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\3rdparty\catch\include"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
Culture="1033"
AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\3rdparty\catch\include"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
Name="VCManagedWrapperGeneratorTool"/>
<Tool
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="vc_mswu"
IntermediateDirectory="vc_mswu\test"
ConfigurationType="1"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;.;.\..\3rdparty\catch\include"
PreprocessorDefinitions="WIN32;__WXMSW__;NDEBUG;_UNICODE;_CONSOLE;wxUSE_GUI=0"
ExceptionHandling="TRUE"
RuntimeLibrary="2"
RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="testprec.h"
PrecompiledHeaderFile="vc_mswu\testprec_test.pch"
ObjectFile="vc_mswu\test\"
ProgramDataBaseFileName="vc_mswu\test.pdb"
WarningLevel="4"
SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE"
DebugInformationFormat="3"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxbase31u_net.lib wxbase31u_xml.lib wxbase31u.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswu\test.exe"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\lib\vc_lib"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswu\test.pdb"
SubSystem="1"
TargetMachine="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"/>
<Tool
Name="VCMIDLTool"
PreprocessorDefinitions="WIN32;__WXMSW__;NDEBUG;_UNICODE;_CONSOLE;wxUSE_GUI=0"
AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;.;.\..\3rdparty\catch\include"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;_CONSOLE;wxUSE_GUI=0"
Culture="1033"
AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;.;.\..\3rdparty\catch\include"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
Name="VCManagedWrapperGeneratorTool"/>
<Tool
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
OutputDirectory="vc_mswuddll"
IntermediateDirectory="vc_mswuddll\test"
ConfigurationType="1"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;.;.\..\3rdparty\catch\include"
PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
MinimalRebuild="TRUE"
ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
BufferSecurityCheck="TRUE"
RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="testprec.h"
PrecompiledHeaderFile="vc_mswuddll\testprec_test.pch"
ObjectFile="vc_mswuddll\test\"
ProgramDataBaseFileName="vc_mswuddll\test.pdb"
WarningLevel="4"
SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE"
DebugInformationFormat="3"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxbase31ud_net.lib wxbase31ud_xml.lib wxbase31ud.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswuddll\test.exe"
LinkIncremental="2"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\lib\vc_dll"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswuddll\test.pdb"
SubSystem="1"
TargetMachine="1"/>
<Tool
Name="VCMIDLTool"
PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;.;.\..\3rdparty\catch\include"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
Culture="1033"
AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;.;.\..\3rdparty\catch\include"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
Name="VCManagedWrapperGeneratorTool"/>
<Tool
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
OutputDirectory="vc_mswudll"
IntermediateDirectory="vc_mswudll\test"
ConfigurationType="1"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\3rdparty\catch\include"
PreprocessorDefinitions="WIN32;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
ExceptionHandling="TRUE"
RuntimeLibrary="2"
RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="testprec.h"
PrecompiledHeaderFile="vc_mswudll\testprec_test.pch"
ObjectFile="vc_mswudll\test\"
ProgramDataBaseFileName="vc_mswudll\test.pdb"
WarningLevel="4"
SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE"
DebugInformationFormat="3"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxbase31u_net.lib wxbase31u_xml.lib wxbase31u.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswudll\test.exe"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\lib\vc_dll"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswudll\test.pdb"
SubSystem="1"
TargetMachine="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"/>
<Tool
Name="VCMIDLTool"
PreprocessorDefinitions="WIN32;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\3rdparty\catch\include"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
Culture="1033"
AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\3rdparty\catch\include"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
Name="VCManagedWrapperGeneratorTool"/>
<Tool
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
</References>
<Files>
<Filter
Name="Source Files"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
RelativePath=".\any\anytest.cpp">
</File>
<File
RelativePath=".\archive\archivetest.cpp">
</File>
<File
RelativePath=".\arrays\arrays.cpp">
</File>
<File
RelativePath=".\thread\atomic.cpp">
</File>
<File
RelativePath=".\base64\base64.cpp">
</File>
<File
RelativePath=".\cmdline\cmdlinetest.cpp">
</File>
<File
RelativePath=".\mbconv\convautotest.cpp">
</File>
<File
RelativePath=".\strings\crt.cpp">
</File>
<File
RelativePath=".\streams\datastreamtest.cpp">
</File>
<File
RelativePath=".\datetime\datetimetest.cpp">
</File>
<File
RelativePath=".\file\dir.cpp">
</File>
<File
RelativePath=".\dummy.cpp">
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="1"/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="1"/>
</FileConfiguration>
<FileConfiguration
Name="DLL Debug|Win32">
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="1"/>
</FileConfiguration>
<FileConfiguration
Name="DLL Release|Win32">
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="1"/>
</FileConfiguration>
</File>
<File
RelativePath=".\misc\dynamiclib.cpp">
</File>
<File
RelativePath=".\misc\environ.cpp">
</File>
<File
RelativePath=".\weakref\evtconnection.cpp">
</File>
<File
RelativePath=".\events\evthandler.cpp">
</File>
<File
RelativePath=".\events\evtlooptest.cpp">
</File>
<File
RelativePath=".\events\evtsource.cpp">
</File>
<File
RelativePath=".\exec\exec.cpp">
</File>
<File
RelativePath=".\streams\ffilestream.cpp">
</File>
<File
RelativePath=".\streams\fileback.cpp">
</File>
<File
RelativePath=".\config\fileconf.cpp">
</File>
<File
RelativePath=".\file\filefn.cpp">
</File>
<File
RelativePath=".\filekind\filekind.cpp">
</File>
<File
RelativePath=".\filename\filenametest.cpp">
</File>
<File
RelativePath=".\streams\filestream.cpp">
</File>
<File
RelativePath=".\filesys\filesystest.cpp">
</File>
<File
RelativePath=".\file\filetest.cpp">
</File>
<File
RelativePath=".\fontmap\fontmaptest.cpp">
</File>
<File
RelativePath=".\formatconverter\formatconvertertest.cpp">
</File>
<File
RelativePath=".\fswatcher\fswatchertest.cpp">
</File>
<File
RelativePath=".\uris\ftp.cpp">
</File>
<File
RelativePath=".\hashes\hashes.cpp">
</File>
<File
RelativePath=".\strings\hexconv.cpp">
</File>
<File
RelativePath=".\interactive\input.cpp">
</File>
<File
RelativePath=".\intl\intltest.cpp">
</File>
<File
RelativePath=".\strings\iostream.cpp">
</File>
<File
RelativePath=".\streams\iostreams.cpp">
</File>
<File
RelativePath=".\net\ipc.cpp">
</File>
<File
RelativePath=".\streams\largefile.cpp">
</File>
<File
RelativePath=".\lists\lists.cpp">
</File>
<File
RelativePath=".\log\logtest.cpp">
</File>
<File
RelativePath=".\longlong\longlongtest.cpp">
</File>
<File
RelativePath=".\mbconv\mbconvtest.cpp">
</File>
<File
RelativePath=".\streams\memstream.cpp">
</File>
<File
RelativePath=".\misc\metatest.cpp">
</File>
<File
RelativePath=".\thread\misc.cpp">
</File>
<File
RelativePath=".\misc\misctests.cpp">
</File>
<File
RelativePath=".\misc\module.cpp">
</File>
<File
RelativePath=".\strings\numformatter.cpp">
</File>
<File
RelativePath=".\interactive\output.cpp">
</File>
<File
RelativePath=".\misc\pathlist.cpp">
</File>
<File
RelativePath=".\thread\queue.cpp">
</File>
<File
RelativePath=".\config\regconf.cpp">
</File>
<File
RelativePath=".\regex\regextest.cpp">
</File>
<File
RelativePath=".\scopeguard\scopeguardtest.cpp">
</File>
<File
RelativePath=".\net\socket.cpp">
</File>
<File
RelativePath=".\streams\socketstream.cpp">
</File>
<File
RelativePath=".\streams\sstream.cpp">
</File>
<File
RelativePath=".\streams\stdstream.cpp">
</File>
<File
RelativePath=".\strings\stdstrings.cpp">
</File>
<File
RelativePath=".\events\stopwatch.cpp">
</File>
<File
RelativePath=".\strings\strings.cpp">
</File>
<File
RelativePath=".\archive\tartest.cpp">
</File>
<File
RelativePath=".\streams\tempfile.cpp">
</File>
<File
RelativePath=".\test.cpp">
</File>
<File
RelativePath=".\textfile\textfiletest.cpp">
</File>
<File
RelativePath=".\streams\textstreamtest.cpp">
</File>
<File
RelativePath=".\events\timertest.cpp">
</File>
<File
RelativePath=".\thread\tls.cpp">
</File>
<File
RelativePath=".\strings\tokenizer.cpp">
</File>
<File
RelativePath=".\misc\typeinfotest.cpp">
</File>
<File
RelativePath=".\strings\unichar.cpp">
</File>
<File
RelativePath=".\strings\unicode.cpp">
</File>
<File
RelativePath=".\uris\uris.cpp">
</File>
<File
RelativePath=".\uris\url.cpp">
</File>
<File
RelativePath=".\strings\vararg.cpp">
</File>
<File
RelativePath=".\vectors\vectors.cpp">
</File>
<File
RelativePath=".\strings\vsnprintf.cpp">
</File>
<File
RelativePath=".\weakref\weakref.cpp">
</File>
<File
RelativePath=".\regex\wxregextest.cpp">
</File>
<File
RelativePath=".\xlocale\xlocale.cpp">
</File>
<File
RelativePath=".\xml\xmltest.cpp">
</File>
<File
RelativePath=".\archive\ziptest.cpp">
</File>
<File
RelativePath=".\streams\zlibstream.cpp">
</File>
</Filter>
</Files>
<Globals>
</Globals>
</VisualStudioProject>
Reference in New Issue View Git Blame Copy Permalink