Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

abstract VC6 workaround inside a WX_CPPUNIT_ALLOW_EQUALS_TO_INT() macro

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57833 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-01-04 16:04:22 +00:00
parent 39e12b2d52
commit b2eabfe866
4 changed files with 377 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
include/wx/cppunit.h
View File

@@ -56,7 +56,6 @@
#include "wx/afterstd.h" #include "wx/afterstd.h"
#include "wx/string.h" #include "wx/string.h"
#include "wx/filefn.h" // for wxFileOffset
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
@@ -106,6 +105,10 @@ assertEquals(const wchar_t *expected,
assertEquals(wxString(expected), actual, sourceLine, message); assertEquals(wxString(expected), actual, sourceLine, message);
} }
CPPUNIT_NS_END
// define an assertEquals() overload for the given types, this is a helper and
// shouldn't be used directly because of VC6 complications, see below
#define WX_CPPUNIT_ASSERT_EQUALS(T1, T2) \ #define WX_CPPUNIT_ASSERT_EQUALS(T1, T2) \
inline void \ inline void \
assertEquals(T1 expected, \ assertEquals(T1 expected, \
@@ -122,28 +125,34 @@ assertEquals(const wchar_t *expected,
} \ } \
} }
// and another to be able to specify (usually literal) ints as expected values // this macro allows us to specify (usually literal) ints as expected values
// for functions returning size_t/short/long/wxFileOffset // for functions returning integral types different from "int"
WX_CPPUNIT_ASSERT_EQUALS(int, long) //
WX_CPPUNIT_ASSERT_EQUALS(int, short) // FIXME-VC6: due to incorrect resolution of overloaded/template functions in
WX_CPPUNIT_ASSERT_EQUALS(int, size_t) // this compiler (it basically doesn't use the template version at
WX_CPPUNIT_ASSERT_EQUALS(int, wxFileOffset) // all if any overloaded function matches partially even if none of
// them matches fully) we also need to provide extra overloads
// special section with VC6 workarounds: due to incorrect resolution of
// overloaded/template functions in this compiler (it basically doesn't use the
// template version at all if any overloaded function matches partially even if
// none of them matches fully) we also need
#ifdef __VISUALC6__ #ifdef __VISUALC6__
#define WX_CPPUNIT_ALLOW_EQUALS_TO_INT(T) \
CPPUNIT_NS_BEGIN \
WX_CPPUNIT_ASSERT_EQUALS(int, T) \
WX_CPPUNIT_ASSERT_EQUALS(T, T) \
CPPUNIT_NS_END
WX_CPPUNIT_ASSERT_EQUALS(int, int) CPPUNIT_NS_BEGIN
WX_CPPUNIT_ASSERT_EQUALS(long, long) WX_CPPUNIT_ASSERT_EQUALS(int, int)
WX_CPPUNIT_ASSERT_EQUALS(short, short) CPPUNIT_NS_END
WX_CPPUNIT_ASSERT_EQUALS(size_t, size_t) #else // !VC6
WX_CPPUNIT_ASSERT_EQUALS(wxFileOffset, wxFileOffset) #define WX_CPPUNIT_ALLOW_EQUALS_TO_INT(T) \
CPPUNIT_NS_BEGIN \
WX_CPPUNIT_ASSERT_EQUALS(int, T) \
CPPUNIT_NS_END
#endif // VC6/!VC6
#endif // VC6 WX_CPPUNIT_ALLOW_EQUALS_TO_INT(long)
WX_CPPUNIT_ALLOW_EQUALS_TO_INT(short)
CPPUNIT_NS_END WX_CPPUNIT_ALLOW_EQUALS_TO_INT(size_t)
// Use this macro to compare a wxArrayString with the pipe-separated elements // Use this macro to compare a wxArrayString with the pipe-separated elements
// of the given string // of the given string

2
tests/datetime/datetimetest.cpp
View File

@@ -32,6 +32,8 @@ static std::ostream& operator<<(std::ostream& ostr, const wxDateTime& dt)
return ostr; return ostr;
} }
WX_CPPUNIT_ALLOW_EQUALS_TO_INT(wxDateTime::wxDateTime_t)
// to test Today() meaningfully we must be able to change the system date which // to test Today() meaningfully we must be able to change the system date which
// is not usually the case, but if we're under Win32 we can try it -- define // is not usually the case, but if we're under Win32 we can try it -- define
// the macro below to do it // the macro below to do it

2
tests/streams/bstream.h
View File

@@ -29,6 +29,8 @@
STREAM_IMPLEMENT_SUB_REGISTRATION_ROUTINE( Name ) STREAM_IMPLEMENT_SUB_REGISTRATION_ROUTINE( Name )
WX_CPPUNIT_ALLOW_EQUALS_TO_INT(wxFileOffset)
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// Template class that implements a test for all base stream functions. // Template class that implements a test for all base stream functions.
// //

355
tests/test_vc7_test.vcproj
View File

@@ -1,11 +1,4 @@
<?xml version="1.0" encoding="Windows-1252"?> <?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
Bakefile 0.2.5 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
<VisualStudioProject <VisualStudioProject
ProjectType="Visual C++" ProjectType="Visual C++"
Version="7.10" Version="7.10"
@@ -542,7 +535,6 @@
</Configuration> </Configuration>
</Configurations> </Configurations>
<References> <References>
</References> </References>
<Files> <Files>
<Filter <Filter
@@ -551,33 +543,92 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"> UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File <File
RelativePath=".\archive\archivetest.cpp"> RelativePath=".\archive\archivetest.cpp">
<FileConfiguration
Name="Debug|Win32"
ExcludedFromBuild="TRUE">
<Tool
Name="VCCLCompilerTool"/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath=".\arrays\arrays.cpp"> RelativePath=".\arrays\arrays.cpp">
<FileConfiguration
Name="Debug|Win32"
ExcludedFromBuild="TRUE">
<Tool
Name="VCCLCompilerTool"/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath=".\thread\atomic.cpp"> RelativePath=".\thread\atomic.cpp">
<FileConfiguration
Name="Debug|Win32"
ExcludedFromBuild="TRUE">
<Tool
Name="VCCLCompilerTool"/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath=".\base64\base64.cpp"> RelativePath=".\base64\base64.cpp">
<FileConfiguration
Name="Debug|Win32"
ExcludedFromBuild="TRUE">
<Tool
Name="VCCLCompilerTool"/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath=".\streams\bstream.cpp"> RelativePath=".\streams\bstream.cpp">
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath=".\cmdline\cmdlinetest.cpp"> RelativePath=".\cmdline\cmdlinetest.cpp">
<FileConfiguration
Name="Debug|Win32"
ExcludedFromBuild="TRUE">
<Tool
Name="VCCLCompilerTool"/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath=".\mbconv\convautotest.cpp"> RelativePath=".\mbconv\convautotest.cpp">
<FileConfiguration
Name="Debug|Win32"
ExcludedFromBuild="TRUE">
<Tool
Name="VCCLCompilerTool"/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath=".\strings\crt.cpp"> RelativePath=".\strings\crt.cpp">
<FileConfiguration
Name="Debug|Win32"
ExcludedFromBuild="TRUE">
<Tool
Name="VCCLCompilerTool"/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath=".\streams\datastreamtest.cpp"> RelativePath=".\streams\datastreamtest.cpp">
<FileConfiguration
Name="Debug|Win32"
ExcludedFromBuild="TRUE">
<Tool
Name="VCCLCompilerTool"/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath=".\datetime\datetimetest.cpp"> RelativePath=".\datetime\datetimetest.cpp">
<FileConfiguration
Name="Debug|Win32"
ExcludedFromBuild="TRUE">
<Tool
Name="VCCLCompilerTool"/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath=".\dummy.cpp"> RelativePath=".\dummy.cpp">
@@ -632,155 +683,439 @@
</File> </File>
<File <File
RelativePath=".\weakref\evtconnection.cpp"> RelativePath=".\weakref\evtconnection.cpp">
<FileConfiguration
Name="Debug|Win32"
ExcludedFromBuild="TRUE">
<Tool
Name="VCCLCompilerTool"/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath=".\streams\ffilestream.cpp"> RelativePath=".\streams\ffilestream.cpp">
<FileConfiguration
Name="Debug|Win32"
ExcludedFromBuild="TRUE">
<Tool
Name="VCCLCompilerTool"/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath=".\streams\fileback.cpp"> RelativePath=".\streams\fileback.cpp">
<FileConfiguration
Name="Debug|Win32"
ExcludedFromBuild="TRUE">
<Tool
Name="VCCLCompilerTool"/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath=".\config\fileconf.cpp"> RelativePath=".\config\fileconf.cpp">
<FileConfiguration
Name="Debug|Win32"
ExcludedFromBuild="TRUE">
<Tool
Name="VCCLCompilerTool"/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath=".\filekind\filekind.cpp"> RelativePath=".\filekind\filekind.cpp">
<FileConfiguration
Name="Debug|Win32"
ExcludedFromBuild="TRUE">
<Tool
Name="VCCLCompilerTool"/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath=".\filename\filenametest.cpp"> RelativePath=".\filename\filenametest.cpp">
<FileConfiguration
Name="Debug|Win32"
ExcludedFromBuild="TRUE">
<Tool
Name="VCCLCompilerTool"/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath=".\streams\filestream.cpp"> RelativePath=".\streams\filestream.cpp">
<FileConfiguration
Name="Debug|Win32"
ExcludedFromBuild="TRUE">
<Tool
Name="VCCLCompilerTool"/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath=".\filesys\filesystest.cpp"> RelativePath=".\filesys\filesystest.cpp">
<FileConfiguration
Name="Debug|Win32"
ExcludedFromBuild="TRUE">
<Tool
Name="VCCLCompilerTool"/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath=".\fontmap\fontmaptest.cpp"> RelativePath=".\fontmap\fontmaptest.cpp">
<FileConfiguration
Name="Debug|Win32"
ExcludedFromBuild="TRUE">
<Tool
Name="VCCLCompilerTool"/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath=".\formatconverter\formatconvertertest.cpp"> RelativePath=".\formatconverter\formatconvertertest.cpp">
<FileConfiguration
Name="Debug|Win32"
ExcludedFromBuild="TRUE">
<Tool
Name="VCCLCompilerTool"/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath=".\hashes\hashes.cpp"> RelativePath=".\hashes\hashes.cpp">
<FileConfiguration
Name="Debug|Win32"
ExcludedFromBuild="TRUE">
<Tool
Name="VCCLCompilerTool"/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath=".\intl\intltest.cpp"> RelativePath=".\intl\intltest.cpp">
<FileConfiguration
Name="Debug|Win32"
ExcludedFromBuild="TRUE">
<Tool
Name="VCCLCompilerTool"/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath=".\strings\iostream.cpp"> RelativePath=".\strings\iostream.cpp">
<FileConfiguration
Name="Debug|Win32"
ExcludedFromBuild="TRUE">
<Tool
Name="VCCLCompilerTool"/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath=".\streams\iostreams.cpp"> RelativePath=".\streams\iostreams.cpp">
<FileConfiguration
Name="Debug|Win32"
ExcludedFromBuild="TRUE">
<Tool
Name="VCCLCompilerTool"/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath=".\net\ipc.cpp"> RelativePath=".\net\ipc.cpp">
<FileConfiguration
Name="Debug|Win32"
ExcludedFromBuild="TRUE">
<Tool
Name="VCCLCompilerTool"/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath=".\streams\largefile.cpp"> RelativePath=".\streams\largefile.cpp">
<FileConfiguration
Name="Debug|Win32"
ExcludedFromBuild="TRUE">
<Tool
Name="VCCLCompilerTool"/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath=".\lists\lists.cpp"> RelativePath=".\lists\lists.cpp">
<FileConfiguration
Name="Debug|Win32"
ExcludedFromBuild="TRUE">
<Tool
Name="VCCLCompilerTool"/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath=".\longlong\longlongtest.cpp"> RelativePath=".\longlong\longlongtest.cpp">
<FileConfiguration
Name="Debug|Win32"
ExcludedFromBuild="TRUE">
<Tool
Name="VCCLCompilerTool"/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath=".\mbconv\mbconvtest.cpp"> RelativePath=".\mbconv\mbconvtest.cpp">
<FileConfiguration
Name="Debug|Win32"
ExcludedFromBuild="TRUE">
<Tool
Name="VCCLCompilerTool"/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath=".\streams\memstream.cpp"> RelativePath=".\streams\memstream.cpp">
<FileConfiguration
Name="Debug|Win32"
ExcludedFromBuild="TRUE">
<Tool
Name="VCCLCompilerTool"/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath=".\misc\misctests.cpp"> RelativePath=".\misc\misctests.cpp">
<FileConfiguration
Name="Debug|Win32"
ExcludedFromBuild="TRUE">
<Tool
Name="VCCLCompilerTool"/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath=".\thread\queue.cpp"> RelativePath=".\thread\queue.cpp">
<FileConfiguration
Name="Debug|Win32"
ExcludedFromBuild="TRUE">
<Tool
Name="VCCLCompilerTool"/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath=".\regex\regextest.cpp"> RelativePath=".\regex\regextest.cpp">
<FileConfiguration
Name="Debug|Win32"
ExcludedFromBuild="TRUE">
<Tool
Name="VCCLCompilerTool"/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath=".\scopeguard\scopeguardtest.cpp"> RelativePath=".\scopeguard\scopeguardtest.cpp">
<FileConfiguration
Name="Debug|Win32"
ExcludedFromBuild="TRUE">
<Tool
Name="VCCLCompilerTool"/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath=".\net\socket.cpp"> RelativePath=".\net\socket.cpp">
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath=".\streams\socketstream.cpp"> RelativePath=".\streams\socketstream.cpp">
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath=".\streams\sstream.cpp"> RelativePath=".\streams\sstream.cpp">
<FileConfiguration
Name="Debug|Win32"
ExcludedFromBuild="TRUE">
<Tool
Name="VCCLCompilerTool"/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath=".\strings\stdstrings.cpp"> RelativePath=".\strings\stdstrings.cpp">
<FileConfiguration
Name="Debug|Win32"
ExcludedFromBuild="TRUE">
<Tool
Name="VCCLCompilerTool"/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath=".\strings\strings.cpp"> RelativePath=".\strings\strings.cpp">
<FileConfiguration
Name="Debug|Win32"
ExcludedFromBuild="TRUE">
<Tool
Name="VCCLCompilerTool"/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath=".\archive\tartest.cpp"> RelativePath=".\archive\tartest.cpp">
<FileConfiguration
Name="Debug|Win32"
ExcludedFromBuild="TRUE">
<Tool
Name="VCCLCompilerTool"/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath=".\streams\tempfile.cpp"> RelativePath=".\streams\tempfile.cpp">
<FileConfiguration
Name="Debug|Win32"
ExcludedFromBuild="TRUE">
<Tool
Name="VCCLCompilerTool"/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath=".\test.cpp"> RelativePath=".\test.cpp">
</File> </File>
<File <File
RelativePath=".\textfile\textfiletest.cpp"> RelativePath=".\textfile\textfiletest.cpp">
<FileConfiguration
Name="Debug|Win32"
ExcludedFromBuild="TRUE">
<Tool
Name="VCCLCompilerTool"/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath=".\streams\textstreamtest.cpp"> RelativePath=".\streams\textstreamtest.cpp">
<FileConfiguration
Name="Debug|Win32"
ExcludedFromBuild="TRUE">
<Tool
Name="VCCLCompilerTool"/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath=".\events\timertest.cpp"> RelativePath=".\events\timertest.cpp">
<FileConfiguration
Name="Debug|Win32"
ExcludedFromBuild="TRUE">
<Tool
Name="VCCLCompilerTool"/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath=".\thread\tls.cpp"> RelativePath=".\thread\tls.cpp">
<FileConfiguration
Name="Debug|Win32"
ExcludedFromBuild="TRUE">
<Tool
Name="VCCLCompilerTool"/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath=".\strings\tokenizer.cpp"> RelativePath=".\strings\tokenizer.cpp">
<FileConfiguration
Name="Debug|Win32"
ExcludedFromBuild="TRUE">
<Tool
Name="VCCLCompilerTool"/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath=".\strings\unichar.cpp"> RelativePath=".\strings\unichar.cpp">
<FileConfiguration
Name="Debug|Win32"
ExcludedFromBuild="TRUE">
<Tool
Name="VCCLCompilerTool"/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath=".\strings\unicode.cpp"> RelativePath=".\strings\unicode.cpp">
<FileConfiguration
Name="Debug|Win32"
ExcludedFromBuild="TRUE">
<Tool
Name="VCCLCompilerTool"/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath=".\uris\uris.cpp"> RelativePath=".\uris\uris.cpp">
<FileConfiguration
Name="Debug|Win32"
ExcludedFromBuild="TRUE">
<Tool
Name="VCCLCompilerTool"/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath=".\strings\vararg.cpp"> RelativePath=".\strings\vararg.cpp">
<FileConfiguration
Name="Debug|Win32"
ExcludedFromBuild="TRUE">
<Tool
Name="VCCLCompilerTool"/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath=".\vectors\vectors.cpp"> RelativePath=".\vectors\vectors.cpp">
<FileConfiguration
Name="Debug|Win32"
ExcludedFromBuild="TRUE">
<Tool
Name="VCCLCompilerTool"/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath=".\strings\vsnprintf.cpp"> RelativePath=".\strings\vsnprintf.cpp">
<FileConfiguration
Name="Debug|Win32"
ExcludedFromBuild="TRUE">
<Tool
Name="VCCLCompilerTool"/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath=".\weakref\weakref.cpp"> RelativePath=".\weakref\weakref.cpp">
<FileConfiguration
Name="Debug|Win32"
ExcludedFromBuild="TRUE">
<Tool
Name="VCCLCompilerTool"/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath=".\regex\wxregextest.cpp"> RelativePath=".\regex\wxregextest.cpp">
<FileConfiguration
Name="Debug|Win32"
ExcludedFromBuild="TRUE">
<Tool
Name="VCCLCompilerTool"/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath=".\xlocale\xlocale.cpp"> RelativePath=".\xlocale\xlocale.cpp">
<FileConfiguration
Name="Debug|Win32"
ExcludedFromBuild="TRUE">
<Tool
Name="VCCLCompilerTool"/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath=".\xml\xmltest.cpp"> RelativePath=".\xml\xmltest.cpp">
<FileConfiguration
Name="Debug|Win32"
ExcludedFromBuild="TRUE">
<Tool
Name="VCCLCompilerTool"/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath=".\archive\ziptest.cpp"> RelativePath=".\archive\ziptest.cpp">
<FileConfiguration
Name="Debug|Win32"
ExcludedFromBuild="TRUE">
<Tool
Name="VCCLCompilerTool"/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath=".\streams\zlibstream.cpp"> RelativePath=".\streams\zlibstream.cpp">
<FileConfiguration
Name="Debug|Win32"
ExcludedFromBuild="TRUE">
<Tool
Name="VCCLCompilerTool"/>
</FileConfiguration>
</File> </File>
</Filter> </Filter>
</Files> </Files>
<Globals> <Globals>
</Globals> </Globals>
</VisualStudioProject> </VisualStudioProject>