X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e87b78335291c67025c5a763c2acfb22343f9908..e4de825ee6f3f991e2aa86159d6e3457afb6a8e0:/samples/console/console.cpp diff --git a/samples/console/console.cpp b/samples/console/console.cpp index 6c365c276a..8a9a0705c6 100644 --- a/samples/console/console.cpp +++ b/samples/console/console.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: samples/console/console.cpp -// Purpose: a sample console (as opposed to GUI) progam using wxWindows +// Purpose: A sample console (as opposed to GUI) program using wxWidgets // Author: Vadim Zeitlin // Modified by: // Created: 04.10.99 @@ -9,6 +9,57 @@ // Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// +// IMPORTANT NOTE FOR WXWIDGETS USERS: +// If you're a wxWidgets user and you're looking at this file to learn how to +// structure a wxWidgets console application, then you don't have much to learn. +// This application is used more for testing rather than as sample but +// basically the following simple block is enough for you to start your +// own console application: + +/* + int main(int argc, char **argv) + { + wxApp::CheckBuildOptions(WX_BUILD_OPTIONS_SIGNATURE, "program"); + + wxInitializer initializer; + if ( !initializer ) + { + fprintf(stderr, "Failed to initialize the wxWidgets library, aborting."); + return -1; + } + + static const wxCmdLineEntryDesc cmdLineDesc[] = + { + { wxCMD_LINE_SWITCH, "h", "help", "show this help message", + wxCMD_LINE_VAL_NONE, wxCMD_LINE_OPTION_HELP }, + // ... your other command line options here... + + { wxCMD_LINE_NONE } + }; + + wxCmdLineParser parser(cmdLineDesc, argc, wxArgv); + switch ( parser.Parse() ) + { + case -1: + wxLogMessage(_T("Help was given, terminating.")); + break; + + case 0: + // everything is ok; proceed + break; + + default: + wxLogMessage(_T("Syntax error detected, aborting.")); + break; + } + + // do something useful here + + return 0; + } +*/ + + // ============================================================================ // declarations // ============================================================================ @@ -19,16 +70,16 @@ #include "wx/defs.h" -#if wxUSE_GUI - #error "This sample can't be compiled in GUI mode." -#endif // wxUSE_GUI - #include #include "wx/string.h" #include "wx/file.h" +#include "wx/filename.h" #include "wx/app.h" #include "wx/log.h" +#include "wx/apptrait.h" +#include "wx/platinfo.h" +#include "wx/wxchar.h" // without this pragma, the stupid compiler precompiles #defines below so that // changing them doesn't "take place" later! @@ -42,21 +93,22 @@ /* A note about all these conditional compilation macros: this file is used - both as a test suite for various non-GUI wxWindows classes and as a + both as a test suite for various non-GUI wxWidgets classes and as a scratchpad for quick tests. So there are two compilation modes: if you define TEST_ALL all tests are run, otherwise you may enable the individual tests individually in the "#else" branch below. */ -// what to test (in alphabetic order)? uncomment the line below to do all tests -//#define TEST_ALL -#ifdef TEST_ALL - #define TEST_ARRAYS - #define TEST_CHARSET +// what to test (in alphabetic order)? Define TEST_ALL to 0 to do a single +// test, define it to 1 to do all tests. +#define TEST_ALL 1 + + +#if TEST_ALL #define TEST_CMDLINE #define TEST_DATETIME #define TEST_DIR - #define TEST_DLLLOADER + #define TEST_DYNLIB #define TEST_ENVIRON #define TEST_EXECUTE #define TEST_FILE @@ -64,79 +116,42 @@ #define TEST_FILENAME #define TEST_FILETIME #define TEST_FTP - #define TEST_HASH - #define TEST_HASHMAP #define TEST_INFO_FUNCTIONS - #define TEST_LIST #define TEST_LOCALE #define TEST_LOG - #define TEST_LONGLONG #define TEST_MIME + #define TEST_MODULE #define TEST_PATHLIST - #define TEST_ODBC #define TEST_PRINTF #define TEST_REGCONF #define TEST_REGEX #define TEST_REGISTRY #define TEST_SCOPEGUARD #define TEST_SNGLINST - #define TEST_SOCKETS +// #define TEST_SOCKETS --FIXME! (RN) + #define TEST_STACKWALKER + #define TEST_STDPATHS #define TEST_STREAMS - #define TEST_STRINGS #define TEST_TEXTSTREAM #define TEST_THREADS #define TEST_TIMER - #define TEST_UNICODE // #define TEST_VCARD -- don't enable this (VZ) - #define TEST_VOLUME +// #define TEST_VOLUME --FIXME! (RN) #define TEST_WCHAR #define TEST_ZIP - #define TEST_ZLIB - - #undef TEST_ALL - static const bool TEST_ALL = true; -#else - #define TEST_HASHMAP - - static const bool TEST_ALL = false; +#else // #if TEST_ALL + #define TEST_FTP #endif // some tests are interactive, define this to run them #ifdef TEST_INTERACTIVE #undef TEST_INTERACTIVE - static const bool TEST_INTERACTIVE = true; + #define TEST_INTERACTIVE 1 #else - static const bool TEST_INTERACTIVE = false; + #define TEST_INTERACTIVE 0 #endif -// ---------------------------------------------------------------------------- -// test class for container objects -// ---------------------------------------------------------------------------- - -#if defined(TEST_ARRAYS) || defined(TEST_LIST) - -class Bar // Foo is already taken in the hash test -{ -public: - Bar(const wxString& name) : m_name(name) { ms_bars++; } - Bar(const Bar& bar) : m_name(bar.m_name) { ms_bars++; } - ~Bar() { ms_bars--; } - - static size_t GetNumber() { return ms_bars; } - - const wxChar *GetName() const { return m_name; } - -private: - wxString m_name; - - static size_t ms_bars; -}; - -size_t Bar::ms_bars = 0; - -#endif // defined(TEST_ARRAYS) || defined(TEST_LIST) - // ============================================================================ // implementation // ============================================================================ @@ -145,7 +160,7 @@ size_t Bar::ms_bars = 0; // helper functions // ---------------------------------------------------------------------------- -#if defined(TEST_STRINGS) || defined(TEST_SOCKETS) +#if defined(TEST_SOCKETS) // replace TABs with \t and CRs with \n static wxString MakePrintable(const wxChar *s) @@ -160,46 +175,6 @@ static wxString MakePrintable(const wxChar *s) #endif // MakePrintable() is used -// ---------------------------------------------------------------------------- -// wxFontMapper::CharsetToEncoding -// ---------------------------------------------------------------------------- - -#ifdef TEST_CHARSET - -#include "wx/fontmap.h" - -static void TestCharset() -{ - static const wxChar *charsets[] = - { - // some vali charsets - _T("us-ascii "), - _T("iso8859-1 "), - _T("iso-8859-12 "), - _T("koi8-r "), - _T("utf-7 "), - _T("cp1250 "), - _T("windows-1252"), - - // and now some bogus ones - _T(" "), - _T("cp1249 "), - _T("iso--8859-1 "), - _T("iso-8859-19 "), - }; - - for ( size_t n = 0; n < WXSIZEOF(charsets); n++ ) - { - wxFontEncoding enc = wxFontMapper::Get()->CharsetToEncoding(charsets[n]); - wxPrintf(_T("Charset: %s\tEncoding: %s (%s)\n"), - charsets[n], - wxFontMapper::Get()->GetEncodingName(enc).c_str(), - wxFontMapper::Get()->GetEncodingDescription(enc).c_str()); - } -} - -#endif // TEST_CHARSET - // ---------------------------------------------------------------------------- // wxCmdLineParser // ---------------------------------------------------------------------------- @@ -213,7 +188,7 @@ static void TestCharset() static void ShowCmdLine(const wxCmdLineParser& parser) { - wxString s = _T("Input files: "); + wxString s = _T("Command line parsed successfully:\nInput files: "); size_t count = parser.GetParamCount(); for ( size_t param = 0; param < count; param++ ) @@ -227,6 +202,7 @@ static void ShowCmdLine(const wxCmdLineParser& parser) wxString strVal; long lVal; + double dVal; wxDateTime dt; if ( parser.Found(_T("o"), &strVal) ) s << _T("Output file:\t") << strVal << '\n'; @@ -234,6 +210,8 @@ static void ShowCmdLine(const wxCmdLineParser& parser) s << _T("Input dir:\t") << strVal << '\n'; if ( parser.Found(_T("s"), &lVal) ) s << _T("Size:\t") << lVal << '\n'; + if ( parser.Found(_T("f"), &dVal) ) + s << _T("Double:\t") << dVal << '\n'; if ( parser.Found(_T("d"), &dt) ) s << _T("Date:\t") << dt.FormatISODate() << '\n'; if ( parser.Found(_T("project_name"), &strVal) ) @@ -281,7 +259,7 @@ static void TestCmdLineConvert() #ifdef __UNIX__ static const wxChar *ROOTDIR = _T("/"); static const wxChar *TESTDIR = _T("/usr/local/share"); -#elif defined(__WXMSW__) +#elif defined(__WXMSW__) || defined(__DOS__) || defined(__OS2__) static const wxChar *ROOTDIR = _T("c:\\"); static const wxChar *TESTDIR = _T("d:\\"); #else @@ -305,9 +283,11 @@ static void TestDirEnumHelper(wxDir& dir, cont = dir.GetNext(&filename); } - wxPuts(_T("")); + wxPuts(wxEmptyString); } +#if TEST_ALL + static void TestDirEnum() { wxPuts(_T("*** Testing wxDir::GetFirst/GetNext ***")); @@ -333,7 +313,7 @@ static void TestDirEnum() TestDirEnumHelper(dir, wxDIR_DEFAULT | wxDIR_DOTDOT); wxPuts(_T("Enumerating object files in current directory:")); - TestDirEnumHelper(dir, wxDIR_DEFAULT, "*.o*"); + TestDirEnumHelper(dir, wxDIR_DEFAULT, _T("*.o*")); wxPuts(_T("Enumerating directories in current directory:")); TestDirEnumHelper(dir, wxDIR_DIRS); @@ -359,14 +339,16 @@ static void TestDirEnum() TestDirEnumHelper(dir, wxDIR_FILES | wxDIR_HIDDEN); wxPuts(_T("Enumerating files in non existing directory:")); - wxDir dirNo("nosuchdir"); + wxDir dirNo(_T("nosuchdir")); TestDirEnumHelper(dirNo); } +#endif // TEST_ALL + class DirPrintTraverser : public wxDirTraverser { public: - virtual wxDirTraverseResult OnFile(const wxString& filename) + virtual wxDirTraverseResult OnFile(const wxString& WXUNUSED(filename)) { return wxDIR_CONTINUE; } @@ -374,7 +356,7 @@ public: virtual wxDirTraverseResult OnDir(const wxString& dirname) { wxString path, name, ext; - wxSplitPath(dirname, &path, &name, &ext); + wxFileName::SplitPath(dirname, &path, &name, &ext); if ( !ext.empty() ) name << _T('.') << ext; @@ -410,9 +392,11 @@ static void TestDirTraverse() wxPuts(_T("Now enumerating directories:")); wxDir dir(TESTDIR); DirPrintTraverser traverser; - dir.Traverse(traverser, _T(""), wxDIR_DIRS | wxDIR_HIDDEN); + dir.Traverse(traverser, wxEmptyString, wxDIR_DIRS | wxDIR_HIDDEN); } +#if TEST_ALL + static void TestDirExists() { wxPuts(_T("*** Testing wxDir::Exists() ***")); @@ -446,13 +430,15 @@ static void TestDirExists() } } +#endif // TEST_ALL + #endif // TEST_DIR // ---------------------------------------------------------------------------- // wxDllLoader // ---------------------------------------------------------------------------- -#ifdef TEST_DLLLOADER +#ifdef TEST_DYNLIB #include "wx/dynlib.h" @@ -463,13 +449,13 @@ static void TestDllLoad() static const wxChar *FUNC_NAME = _T("lstrlenA"); #elif defined(__UNIX__) // weird: using just libc.so does *not* work! - static const wxChar *LIB_NAME = _T("/lib/libc-2.0.7.so"); + static const wxChar *LIB_NAME = _T("/lib/libc.so.6"); static const wxChar *FUNC_NAME = _T("strlen"); #else #error "don't know how to test wxDllLoader on this platform" #endif - wxPuts(_T("*** testing wxDllLoader ***\n")); + wxPuts(_T("*** testing basic wxDynamicLibrary functions ***\n")); wxDynamicLibrary lib(LIB_NAME); if ( !lib.IsLoaded() ) @@ -478,7 +464,7 @@ static void TestDllLoad() } else { - typedef int (*wxStrlenType)(const char *); + typedef int (wxSTDCALL *wxStrlenType)(const char *); wxStrlenType pfnStrlen = (wxStrlenType)lib.GetSymbol(FUNC_NAME); if ( !pfnStrlen ) { @@ -487,6 +473,9 @@ static void TestDllLoad() } else { + wxPrintf(_T("Calling %s dynamically loaded from %s "), + FUNC_NAME, LIB_NAME); + if ( pfnStrlen("foo") != 3 ) { wxPrintf(_T("ERROR: loaded function is not wxStrlen()!\n")); @@ -496,10 +485,58 @@ static void TestDllLoad() wxPuts(_T("... ok")); } } + +#ifdef __WXMSW__ + static const wxChar *FUNC_NAME_AW = _T("lstrlen"); + + typedef int (wxSTDCALL *wxStrlenTypeAorW)(const wxChar *); + wxStrlenTypeAorW + pfnStrlenAorW = (wxStrlenTypeAorW)lib.GetSymbolAorW(FUNC_NAME_AW); + if ( !pfnStrlenAorW ) + { + wxPrintf(_T("ERROR: function '%s' wasn't found in '%s'.\n"), + FUNC_NAME_AW, LIB_NAME); + } + else + { + if ( pfnStrlenAorW(_T("foobar")) != 6 ) + { + wxPrintf(_T("ERROR: loaded function is not wxStrlen()!\n")); + } + } +#endif // __WXMSW__ + } +} + +#if defined(__WXMSW__) || defined(__UNIX__) + +static void TestDllListLoaded() +{ + wxPuts(_T("*** testing wxDynamicLibrary::ListLoaded() ***\n")); + + puts("\nLoaded modules:"); + wxDynamicLibraryDetailsArray dlls = wxDynamicLibrary::ListLoaded(); + const size_t count = dlls.GetCount(); + for ( size_t n = 0; n < count; ++n ) + { + const wxDynamicLibraryDetails& details = dlls[n]; + printf("%-45s", (const char *)details.GetPath().mb_str()); + + void *addr; + size_t len; + if ( details.GetAddress(&addr, &len) ) + { + printf(" %08lx:%08lx", + (unsigned long)addr, (unsigned long)((char *)addr + len)); + } + + printf(" %s\n", (const char *)details.GetVersion().mb_str()); } } -#endif // TEST_DLLLOADER +#endif + +#endif // TEST_DYNLIB // ---------------------------------------------------------------------------- // wxGet/SetEnv @@ -551,11 +588,13 @@ static void TestExecute() wxPuts(_T("*** testing wxExecute ***")); #ifdef __UNIX__ - #define COMMAND "cat -n ../../Makefile" // "echo hi" + #define COMMAND "echo hi" + #define ASYNC_COMMAND "xclock" #define SHELL_COMMAND "echo hi from shell" - #define REDIRECT_COMMAND COMMAND // "date" + #define REDIRECT_COMMAND "cat -n Makefile" #elif defined(__WXMSW__) #define COMMAND "command.com /c echo hi" + #define ASYNC_COMMAND "notepad" #define SHELL_COMMAND "echo hi" #define REDIRECT_COMMAND COMMAND #else @@ -564,39 +603,57 @@ static void TestExecute() wxPrintf(_T("Testing wxShell: ")); fflush(stdout); - if ( wxShell(SHELL_COMMAND) ) + if ( wxShell(_T(SHELL_COMMAND)) ) wxPuts(_T("Ok.")); else wxPuts(_T("ERROR.")); wxPrintf(_T("Testing wxExecute: ")); fflush(stdout); - if ( wxExecute(COMMAND, true /* sync */) == 0 ) + if ( wxExecute(_T(COMMAND), wxEXEC_SYNC) == 0 ) wxPuts(_T("Ok.")); else wxPuts(_T("ERROR.")); -#if 0 // no, it doesn't work (yet?) wxPrintf(_T("Testing async wxExecute: ")); fflush(stdout); - if ( wxExecute(COMMAND) != 0 ) + int pid = wxExecute(ASYNC_COMMAND); + if ( pid != 0 ) + { wxPuts(_T("Ok (command launched).")); + if ( wxKill(pid) == -1 ) + wxPuts("ERROR: failed to kill child process."); + } else wxPuts(_T("ERROR.")); -#endif // 0 wxPrintf(_T("Testing wxExecute with redirection:\n")); wxArrayString output; - if ( wxExecute(REDIRECT_COMMAND, output) != 0 ) + if ( wxExecute(_T(REDIRECT_COMMAND), output) != 0 ) { wxPuts(_T("ERROR.")); } else { - size_t count = output.GetCount(); - for ( size_t n = 0; n < count; n++ ) + // don't show too much output, MAX_LINES is enough + static const unsigned MAX_LINES = 20; + + const unsigned count = output.size(); + for ( unsigned n = 0; + n < (count > MAX_LINES ? MAX_LINES/2 : count); + n++ ) + { + wxPrintf("%04u:\t%s\n", n + 1, output[n]); + } + + if ( count > MAX_LINES ) { - wxPrintf(_T("\t%s\n"), output[n].c_str()); + wxPrintf("... skipping %u lines...\n", count - MAX_LINES); + + for ( unsigned n = count - MAX_LINES/2; n < count; n++ ) + { + wxPrintf("%04u:\t%s\n", n + 1, output[n]); + } } wxPuts(_T("Ok.")); @@ -626,12 +683,12 @@ static void TestFileRead() wxPuts(_T("File dump:\n----------")); - static const off_t len = 1024; + static const size_t len = 1024; wxChar buf[len]; for ( ;; ) { - off_t nRead = file.Read(buf, len); - if ( nRead == wxInvalidOffset ) + size_t nRead = file.Read(buf, len); + if ( nRead == (size_t)wxInvalidOffset ) { wxPrintf(_T("Failed to read the file.")); break; @@ -650,7 +707,7 @@ static void TestFileRead() wxPrintf(_T("ERROR: can't open test file.\n")); } - wxPuts(_T("")); + wxPuts(wxEmptyString); } static void TestTextFileRead() @@ -686,7 +743,7 @@ static void TestTextFileRead() wxPrintf(_T("ERROR: can't open '%s'\n"), file.GetName()); } - wxPuts(_T("")); + wxPuts(wxEmptyString); } static void TestFileCopy() @@ -701,8 +758,8 @@ static void TestFileCopy() } else { - wxFFile f1(filename1, "rb"), - f2(filename2, "rb"); + wxFFile f1(filename1, _T("rb")), + f2(filename2, _T("rb")); if ( !f1.IsOpened() || !f2.IsOpened() ) { @@ -735,7 +792,25 @@ static void TestFileCopy() wxPuts(_T("ERROR: failed to remove the file")); } - wxPuts(_T("")); + wxPuts(wxEmptyString); +} + +static void TestTempFile() +{ + wxPuts(_T("*** wxTempFile test ***")); + + wxTempFile tmpFile; + if ( tmpFile.Open(_T("test2")) && tmpFile.Write(_T("the answer is 42")) ) + { + if ( tmpFile.Commit() ) + wxPuts(_T("File committed.")); + else + wxPuts(_T("ERROR: could't commit temp file.")); + + wxRemoveFile(_T("test2")); + } + + wxPuts(wxEmptyString); } #endif // TEST_FILE @@ -817,8 +892,11 @@ static void TestFileConfRead() #include "wx/filename.h" -static void DumpFileName(const wxFileName& fn) +#if 0 +static void DumpFileName(const wxChar *desc, const wxFileName& fn) { + wxPuts(desc); + wxString full = fn.GetFullPath(); wxString vol, path, name, ext; @@ -847,116 +925,7 @@ static void DumpFileName(const wxFileName& fn) wxPrintf(_T("\t%u: %s\n"), n, dirs[n].c_str()); } } - -static struct FileNameInfo -{ - const wxChar *fullname; - const wxChar *volume; - const wxChar *path; - const wxChar *name; - const wxChar *ext; - bool isAbsolute; - wxPathFormat format; -} filenames[] = -{ - // Unix file names - { _T("/usr/bin/ls"), _T(""), _T("/usr/bin"), _T("ls"), _T(""), true, wxPATH_UNIX }, - { _T("/usr/bin/"), _T(""), _T("/usr/bin"), _T(""), _T(""), true, wxPATH_UNIX }, - { _T("~/.zshrc"), _T(""), _T("~"), _T(".zshrc"), _T(""), true, wxPATH_UNIX }, - { _T("../../foo"), _T(""), _T("../.."), _T("foo"), _T(""), false, wxPATH_UNIX }, - { _T("foo.bar"), _T(""), _T(""), _T("foo"), _T("bar"), false, wxPATH_UNIX }, - { _T("~/foo.bar"), _T(""), _T("~"), _T("foo"), _T("bar"), true, wxPATH_UNIX }, - { _T("/foo"), _T(""), _T("/"), _T("foo"), _T(""), true, wxPATH_UNIX }, - { _T("Mahogany-0.60/foo.bar"), _T(""), _T("Mahogany-0.60"), _T("foo"), _T("bar"), false, wxPATH_UNIX }, - { _T("/tmp/wxwin.tar.bz"), _T(""), _T("/tmp"), _T("wxwin.tar"), _T("bz"), true, wxPATH_UNIX }, - - // Windows file names - { _T("foo.bar"), _T(""), _T(""), _T("foo"), _T("bar"), false, wxPATH_DOS }, - { _T("\\foo.bar"), _T(""), _T("\\"), _T("foo"), _T("bar"), false, wxPATH_DOS }, - { _T("c:foo.bar"), _T("c"), _T(""), _T("foo"), _T("bar"), false, wxPATH_DOS }, - { _T("c:\\foo.bar"), _T("c"), _T("\\"), _T("foo"), _T("bar"), true, wxPATH_DOS }, - { _T("c:\\Windows\\command.com"), _T("c"), _T("\\Windows"), _T("command"), _T("com"), true, wxPATH_DOS }, - { _T("\\\\server\\foo.bar"), _T("server"), _T("\\"), _T("foo"), _T("bar"), true, wxPATH_DOS }, - { _T("\\\\server\\dir\\foo.bar"), _T("server"), _T("\\dir"), _T("foo"), _T("bar"), true, wxPATH_DOS }, - - // wxFileName support for Mac file names is broken currently -#if 0 - // Mac file names - { _T("Volume:Dir:File"), _T("Volume"), _T("Dir"), _T("File"), _T(""), true, wxPATH_MAC }, - { _T("Volume:Dir:Subdir:File"), _T("Volume"), _T("Dir:Subdir"), _T("File"), _T(""), true, wxPATH_MAC }, - { _T("Volume:"), _T("Volume"), _T(""), _T(""), _T(""), true, wxPATH_MAC }, - { _T(":Dir:File"), _T(""), _T("Dir"), _T("File"), _T(""), false, wxPATH_MAC }, - { _T(":File.Ext"), _T(""), _T(""), _T("File"), _T(".Ext"), false, wxPATH_MAC }, - { _T("File.Ext"), _T(""), _T(""), _T("File"), _T(".Ext"), false, wxPATH_MAC }, -#endif // 0 - - // VMS file names - { _T("device:[dir1.dir2.dir3]file.txt"), _T("device"), _T("dir1.dir2.dir3"), _T("file"), _T("txt"), true, wxPATH_VMS }, - { _T("file.txt"), _T(""), _T(""), _T("file"), _T("txt"), false, wxPATH_VMS }, -}; - -static void TestFileNameConstruction() -{ - wxPuts(_T("*** testing wxFileName construction ***")); - - for ( size_t n = 0; n < WXSIZEOF(filenames); n++ ) - { - const FileNameInfo& fni = filenames[n]; - - wxFileName fn(fni.fullname, fni.format); - - wxString fullname = fn.GetFullPath(fni.format); - if ( fullname != fni.fullname ) - { - wxPrintf(_T("ERROR: fullname should be '%s'\n"), fni.fullname); - } - - bool isAbsolute = fn.IsAbsolute(fni.format); - wxPrintf(_T("'%s' is %s (%s)\n\t"), - fullname.c_str(), - isAbsolute ? "absolute" : "relative", - isAbsolute == fni.isAbsolute ? "ok" : "ERROR"); - - if ( !fn.Normalize(wxPATH_NORM_ALL, _T(""), fni.format) ) - { - wxPuts(_T("ERROR (couldn't be normalized)")); - } - else - { - wxPrintf(_T("normalized: '%s'\n"), fn.GetFullPath(fni.format).c_str()); - } - } - - wxPuts(_T("")); -} - -static void TestFileNameSplit() -{ - wxPuts(_T("*** testing wxFileName splitting ***")); - - for ( size_t n = 0; n < WXSIZEOF(filenames); n++ ) - { - const FileNameInfo& fni = filenames[n]; - wxString volume, path, name, ext; - wxFileName::SplitPath(fni.fullname, - &volume, &path, &name, &ext, fni.format); - - wxPrintf(_T("%s -> volume = '%s', path = '%s', name = '%s', ext = '%s'"), - fni.fullname, - volume.c_str(), path.c_str(), name.c_str(), ext.c_str()); - - if ( volume != fni.volume ) - wxPrintf(_T(" (ERROR: volume = '%s')"), fni.volume); - if ( path != fni.path ) - wxPrintf(_T(" (ERROR: path = '%s')"), fni.path); - if ( name != fni.name ) - wxPrintf(_T(" (ERROR: name = '%s')"), fni.name); - if ( ext != fni.ext ) - wxPrintf(_T(" (ERROR: ext = '%s')"), fni.ext); - - wxPuts(_T("")); - } -} +#endif static void TestFileNameTemp() { @@ -996,68 +965,9 @@ static void TestFileNameTemp() } } -static void TestFileNameMakeRelative() -{ - wxPuts(_T("*** testing wxFileName::MakeRelativeTo() ***")); - - for ( size_t n = 0; n < WXSIZEOF(filenames); n++ ) - { - const FileNameInfo& fni = filenames[n]; - - wxFileName fn(fni.fullname, fni.format); - - // choose the base dir of the same format - wxString base; - switch ( fni.format ) - { - case wxPATH_UNIX: - base = "/usr/bin/"; - break; - - case wxPATH_DOS: - base = "c:\\"; - break; - - case wxPATH_MAC: - case wxPATH_VMS: - // TODO: I don't know how this is supposed to work there - continue; - - case wxPATH_NATIVE: // make gcc happy - default: - wxFAIL_MSG( "unexpected path format" ); - } - - wxPrintf(_T("'%s' relative to '%s': "), - fn.GetFullPath(fni.format).c_str(), base.c_str()); - - if ( !fn.MakeRelativeTo(base, fni.format) ) - { - wxPuts(_T("unchanged")); - } - else - { - wxPrintf(_T("'%s'\n"), fn.GetFullPath(fni.format).c_str()); - } - } -} - -static void TestFileNameMakeAbsolute() +static void TestFileNameDirManip() { - wxPuts(_T("*** testing wxFileName::MakeAbsolute() ***")); - - for ( size_t n = 0; n < WXSIZEOF(filenames); n++ ) - { - const FileNameInfo& fni = filenames[n]; - wxFileName fn(fni.fullname, fni.format); - - wxPrintf(_T("'%s' absolutized: "), - fn.GetFullPath(fni.format).c_str()); - fn.MakeAbsolute(); - wxPrintf(_T("'%s'\n"), fn.GetFullPath(fni.format).c_str()); - } - - wxPuts(_T("")); + // TODO: test AppendDir(), RemoveDir(), ... } static void TestFileNameComparison() @@ -1083,8 +993,8 @@ static void TestFileNameCwd() #ifdef TEST_FILETIME -#include -#include +#include "wx/filename.h" +#include "wx/datetime.h" static void TestFileGetTimes() { @@ -1106,6 +1016,7 @@ static void TestFileGetTimes() } } +#if 0 static void TestFileSetTimes() { wxFileName fn(_T("testdata.fc")); @@ -1115,433 +1026,28 @@ static void TestFileSetTimes() wxPrintf(_T("ERROR: Touch() failed.\n")); } } - -#endif // TEST_FILETIME - -// ---------------------------------------------------------------------------- -// wxHashTable -// ---------------------------------------------------------------------------- - -#ifdef TEST_HASH - -#include "wx/hash.h" - -struct Foo -{ - Foo(int n_) { n = n_; count++; } - ~Foo() { count--; } - - int n; - - static size_t count; -}; - -size_t Foo::count = 0; - -WX_DECLARE_LIST(Foo, wxListFoos); -WX_DECLARE_HASH(Foo, wxListFoos, wxHashFoos); - -#include "wx/listimpl.cpp" - -WX_DEFINE_LIST(wxListFoos); - -static void TestHash() -{ - wxPuts(_T("*** Testing wxHashTable ***\n")); - - { - wxHashTable hash(wxKEY_INTEGER), hash2(wxKEY_STRING); - int i; - - for ( i = 0; i < 100; ++i ) - hash.Put(i, (wxObject*)&i + i); - - hash.BeginFind(); - wxHashTable::compatibility_iterator it = hash.Next(); - i = 0; - - while (it) - { - ++i; - it = hash.Next(); - } - - if (i != 100) - wxPuts(_T("Error in wxHashTable::compatibility_iterator\n")); - - for ( i = 99; i >= 0; --i ) - if( hash.Get(i) != (wxObject*)&i + i ) - wxPuts(_T("Error in wxHashTable::Get/Put\n")); - - hash2.Put("foo", (wxObject*)&i + 1); - hash2.Put("bar", (wxObject*)&i + 2); - hash2.Put("baz", (wxObject*)&i + 3); - - if (hash2.Get("moo") != NULL) - wxPuts(_T("Error in wxHashTable::Get\n")); - - if (hash2.Get("bar") != (wxObject*)&i + 2) - wxPuts(_T("Error in wxHashTable::Get/Put\n")); - } -#if !wxUSE_STL - { - wxHashFoos hash; - hash.DeleteContents(true); - - wxPrintf(_T("Hash created: %u foos in hash, %u foos totally\n"), - hash.GetCount(), Foo::count); - - static const int hashTestData[] = - { - 0, 1, 17, -2, 2, 4, -4, 345, 3, 3, 2, 1, - }; - - size_t n; - for ( n = 0; n < WXSIZEOF(hashTestData); n++ ) - { - hash.Put(hashTestData[n], n, new Foo(n)); - } - - wxPrintf(_T("Hash filled: %u foos in hash, %u foos totally\n"), - hash.GetCount(), Foo::count); - - wxPuts(_T("Hash access test:")); - for ( n = 0; n < WXSIZEOF(hashTestData); n++ ) - { - wxPrintf(_T("\tGetting element with key %d, value %d: "), - hashTestData[n], n); - Foo *foo = hash.Get(hashTestData[n], n); - if ( !foo ) - { - wxPrintf(_T("ERROR, not found.\n")); - } - else - { - wxPrintf(_T("%d (%s)\n"), foo->n, - (size_t)foo->n == n ? "ok" : "ERROR"); - } - } - - wxPrintf(_T("\nTrying to get an element not in hash: ")); - - if ( hash.Get(1234) || hash.Get(1, 0) ) - { - wxPuts(_T("ERROR: found!")); - } - else - { - wxPuts(_T("ok (not found)")); - } - } #endif - wxPrintf(_T("Hash destroyed: %u foos left\n"), Foo::count); - wxPuts(_T("*** Testing wxHashTable finished ***\n")); -} - -#endif // TEST_HASH +#endif // TEST_FILETIME // ---------------------------------------------------------------------------- -// wxHashMap +// wxLocale // ---------------------------------------------------------------------------- -#ifdef TEST_HASHMAP - -#include "wx/hashmap.h" - -// test compilation of basic map types -WX_DECLARE_HASH_MAP( int*, int*, wxPointerHash, wxPointerEqual, myPtrHashMap ); -WX_DECLARE_HASH_MAP( long, long, wxIntegerHash, wxIntegerEqual, myLongHashMap ); -WX_DECLARE_HASH_MAP( unsigned long, unsigned, wxIntegerHash, wxIntegerEqual, - myUnsignedHashMap ); -WX_DECLARE_HASH_MAP( unsigned int, unsigned, wxIntegerHash, wxIntegerEqual, - myTestHashMap1 ); -WX_DECLARE_HASH_MAP( int, unsigned, wxIntegerHash, wxIntegerEqual, - myTestHashMap2 ); -WX_DECLARE_HASH_MAP( short, unsigned, wxIntegerHash, wxIntegerEqual, - myTestHashMap3 ); -WX_DECLARE_HASH_MAP( unsigned short, unsigned, wxIntegerHash, wxIntegerEqual, - myTestHashMap4 ); +#ifdef TEST_LOCALE -// same as: -// WX_DECLARE_HASH_MAP( wxString, wxString, wxStringHash, wxStringEqual, -// myStringHashMap ); -WX_DECLARE_STRING_HASH_MAP(wxString, myStringHashMap); +#include "wx/intl.h" +#include "wx/utils.h" // for wxSetEnv -typedef myStringHashMap::iterator Itor; +static wxLocale gs_localeDefault; + // NOTE: don't init it here as it needs a wxAppTraits object + // and thus must be init-ed after creation of the wxInitializer + // class in the main() -static void TestHashMap() +// find the name of the language from its value +static const wxChar *GetLangName(int lang) { - wxPuts(_T("*** Testing wxHashMap ***\n")); - myStringHashMap sh(0); // as small as possible - wxString buf; - size_t i; - const size_t count = 10000; - - // init with some data - for( i = 0; i < count; ++i ) - { - buf.Printf(wxT("%d"), i ); - sh[buf] = wxT("A") + buf + wxT("C"); - } - - // test that insertion worked - if( sh.size() != count ) - { - wxPrintf(_T("*** ERROR: %u ELEMENTS, SHOULD BE %u ***\n"), sh.size(), count); - } - - for( i = 0; i < count; ++i ) - { - buf.Printf(wxT("%d"), i ); - if( sh[buf] != wxT("A") + buf + wxT("C") ) - { - wxPrintf(_T("*** ERROR INSERTION BROKEN! STOPPING NOW! ***\n")); - return; - } - } - - // check that iterators work - Itor it; - for( i = 0, it = sh.begin(); it != sh.end(); ++it, ++i ) - { - if( i == count ) - { - wxPrintf(_T("*** ERROR ITERATORS DO NOT TERMINATE! STOPPING NOW! ***\n")); - return; - } - - if( it->second != sh[it->first] ) - { - wxPrintf(_T("*** ERROR ITERATORS BROKEN! STOPPING NOW! ***\n")); - return; - } - } - - if( sh.size() != i ) - { - wxPrintf(_T("*** ERROR: %u ELEMENTS ITERATED, SHOULD BE %u ***\n"), i, count); - } - - // test copy ctor, assignment operator - myStringHashMap h1( sh ), h2( 0 ); - h2 = sh; - - for( i = 0, it = sh.begin(); it != sh.end(); ++it, ++i ) - { - if( h1[it->first] != it->second ) - { - wxPrintf(_T("*** ERROR: COPY CTOR BROKEN %s ***\n"), it->first.c_str()); - } - - if( h2[it->first] != it->second ) - { - wxPrintf(_T("*** ERROR: OPERATOR= BROKEN %s ***\n"), it->first.c_str()); - } - } - - // other tests - for( i = 0; i < count; ++i ) - { - buf.Printf(wxT("%d"), i ); - size_t sz = sh.size(); - - // test find() and erase(it) - if( i < 100 ) - { - it = sh.find( buf ); - if( it != sh.end() ) - { - sh.erase( it ); - - if( sh.find( buf ) != sh.end() ) - { - wxPrintf(_T("*** ERROR: FOUND DELETED ELEMENT %u ***\n"), i); - } - } - else - wxPrintf(_T("*** ERROR: CANT FIND ELEMENT %u ***\n"), i); - } - else - // test erase(key) - { - size_t c = sh.erase( buf ); - if( c != 1 ) - wxPrintf(_T("*** ERROR: SHOULD RETURN 1 ***\n")); - - if( sh.find( buf ) != sh.end() ) - { - wxPrintf(_T("*** ERROR: FOUND DELETED ELEMENT %u ***\n"), i); - } - } - - // count should decrease - if( sh.size() != sz - 1 ) - { - wxPrintf(_T("*** ERROR: COUNT DID NOT DECREASE ***\n")); - } - } - - wxPrintf(_T("*** Finished testing wxHashMap ***\n")); -} - -#endif // TEST_HASHMAP - -// ---------------------------------------------------------------------------- -// wxList -// ---------------------------------------------------------------------------- - -#ifdef TEST_LIST - -#include "wx/list.h" - -WX_DECLARE_LIST(Bar, wxListBars); -#include "wx/listimpl.cpp" -WX_DEFINE_LIST(wxListBars); - -WX_DECLARE_LIST(int, wxListInt); -WX_DEFINE_LIST(wxListInt); - -static void TestList() -{ - wxPuts(_T("*** Testing wxList operations ***\n")); - { - wxListInt list1; - int dummy[5]; - int i; - - for ( i = 0; i < 5; ++i ) - list1.Append(dummy + i); - - if ( list1.GetCount() != 5 ) - wxPuts(_T("Wrong number of items in list\n")); - - if ( list1.Item(3)->GetData() != dummy + 3 ) - wxPuts(_T("Error in Item()\n")); - - if ( !list1.Find(dummy + 4) ) - wxPuts(_T("Error in Find()\n")); - - wxListInt::compatibility_iterator node = list1.GetFirst(); - i = 0; - - while (node) - { - if ( node->GetData() != dummy + i ) - wxPuts(_T("Error in compatibility_iterator\n")); - node = node->GetNext(); - ++i; - } - - if ( size_t(i) != list1.GetCount() ) - wxPuts(_T("Error in compatibility_iterator\n")); - - list1.Insert(dummy + 0); - list1.Insert(1, dummy + 1); - list1.Insert(list1.GetFirst()->GetNext()->GetNext(), dummy + 2); - - node = list1.GetFirst(); - i = 0; - - while (i < 3) - { - int* t = node->GetData(); - if ( t != dummy + i ) - wxPuts(_T("Error in Insert\n")); - node = node->GetNext(); - ++i; - } - } - - wxPuts(_T("*** Testing wxList operations finished ***\n")); - - wxPuts(_T("*** Testing std::list operations ***\n")); - - { - wxListInt list1; - wxListInt::iterator it, en; - wxListInt::reverse_iterator rit, ren; - int i; - for ( i = 0; i < 5; ++i ) - list1.push_back(i + &i); - - for ( it = list1.begin(), en = list1.end(), i = 0; - it != en; ++it, ++i ) - if ( *it != i + &i ) - wxPuts(_T("Error in iterator\n")); - - for ( rit = list1.rbegin(), ren = list1.rend(), i = 4; - rit != ren; ++rit, --i ) - if ( *rit != i + &i ) - wxPuts(_T("Error in reverse_iterator\n")); - - if ( *list1.rbegin() != *--list1.end() || - *list1.begin() != *--list1.rend() ) - wxPuts(_T("Error in iterator/reverse_iterator\n")); - if ( *list1.begin() != *--++list1.begin() || - *list1.rbegin() != *--++list1.rbegin() ) - wxPuts(_T("Error in iterator/reverse_iterator\n")); - - if ( list1.front() != &i || list1.back() != &i + 4 ) - wxPuts(_T("Error in front()/back()\n")); - - list1.erase(list1.begin()); - list1.erase(--list1.end()); - - for ( it = list1.begin(), en = list1.end(), i = 1; - it != en; ++it, ++i ) - if ( *it != i + &i ) - wxPuts(_T("Error in erase()\n")); - } - - wxPuts(_T("*** Testing std::list operations finished ***\n")); -} - -static void TestListCtor() -{ - wxPuts(_T("*** Testing wxList construction ***\n")); - - { - wxListBars list1; - list1.Append(new Bar(_T("first"))); - list1.Append(new Bar(_T("second"))); - - wxPrintf(_T("After 1st list creation: %u objects in the list, %u objects total.\n"), - list1.GetCount(), Bar::GetNumber()); - - wxListBars list2; - list2 = list1; - - wxPrintf(_T("After 2nd list creation: %u and %u objects in the lists, %u objects total.\n"), - list1.GetCount(), list2.GetCount(), Bar::GetNumber()); - -#if !wxUSE_STL - list1.DeleteContents(true); -#else - WX_CLEAR_LIST(wxListBars, list1); -#endif - } - - wxPrintf(_T("After list destruction: %u objects left.\n"), Bar::GetNumber()); -} - -#endif // TEST_LIST - -// ---------------------------------------------------------------------------- -// wxLocale -// ---------------------------------------------------------------------------- - -#ifdef TEST_LOCALE - -#include "wx/intl.h" -#include "wx/utils.h" // for wxSetEnv - -static wxLocale gs_localeDefault(wxLANGUAGE_ENGLISH); - -// find the name of the language from its value -static const wxChar *GetLangName(int lang) -{ - static const wxChar *languageNames[] = + static const wxChar *languageNames[] = { _T("DEFAULT"), _T("UNKNOWN"), @@ -1785,6 +1291,8 @@ static void TestDefaultLang() { wxPuts(_T("*** Testing wxLocale::GetSystemLanguage ***")); + gs_localeDefault.Init(wxLANGUAGE_ENGLISH); + static const wxChar *langStrings[] = { NULL, // system default @@ -1871,33 +1379,7 @@ static void TestMimeEnum() mimetypes[n].c_str(), desc.c_str(), extsAll.c_str()); } - wxPuts(_T("")); -} - -static void TestMimeOverride() -{ - wxPuts(_T("*** Testing wxMimeTypesManager additional files loading ***\n")); - - static const wxChar *mailcap = _T("/tmp/mailcap"); - static const wxChar *mimetypes = _T("/tmp/mime.types"); - - if ( wxFile::Exists(mailcap) ) - wxPrintf(_T("Loading mailcap from '%s': %s\n"), - mailcap, - wxTheMimeTypesManager->ReadMailcap(mailcap) ? _T("ok") : _T("ERROR")); - else - wxPrintf(_T("WARN: mailcap file '%s' doesn't exist, not loaded.\n"), - mailcap); - - if ( wxFile::Exists(mimetypes) ) - wxPrintf(_T("Loading mime.types from '%s': %s\n"), - mimetypes, - wxTheMimeTypesManager->ReadMimeTypes(mimetypes) ? _T("ok") : _T("ERROR")); - else - wxPrintf(_T("WARN: mime.types file '%s' doesn't exist, not loaded.\n"), - mimetypes); - - wxPuts(_T("")); + wxPuts(wxEmptyString); } static void TestMimeFilename() @@ -1929,7 +1411,7 @@ static void TestMimeFilename() wxString cmd; if ( !ft->GetOpenCommand(&cmd, - wxFileType::MessageParameters(fname, _T(""))) ) + wxFileType::MessageParameters(fname, wxEmptyString)) ) cmd = _T(""); else cmd = wxString(_T('"')) + cmd + _T('"'); @@ -1941,7 +1423,36 @@ static void TestMimeFilename() } } - wxPuts(_T("")); + wxPuts(wxEmptyString); +} + +// these tests were broken by wxMimeTypesManager changes, temporarily disabling +#if 0 + +static void TestMimeOverride() +{ + wxPuts(_T("*** Testing wxMimeTypesManager additional files loading ***\n")); + + static const wxChar *mailcap = _T("/tmp/mailcap"); + static const wxChar *mimetypes = _T("/tmp/mime.types"); + + if ( wxFile::Exists(mailcap) ) + wxPrintf(_T("Loading mailcap from '%s': %s\n"), + mailcap, + wxTheMimeTypesManager->ReadMailcap(mailcap) ? _T("ok") : _T("ERROR")); + else + wxPrintf(_T("WARN: mailcap file '%s' doesn't exist, not loaded.\n"), + mailcap); + + if ( wxFile::Exists(mimetypes) ) + wxPrintf(_T("Loading mime.types from '%s': %s\n"), + mimetypes, + wxTheMimeTypesManager->ReadMimeTypes(mimetypes) ? _T("ok") : _T("ERROR")); + else + wxPrintf(_T("WARN: mime.types file '%s' doesn't exist, not loaded.\n"), + mimetypes); + + wxPuts(wxEmptyString); } static void TestMimeAssociate() @@ -1954,7 +1465,7 @@ static void TestMimeAssociate() _T(""), // print cmd _T("XYZ File"), // description _T(".xyz"), // extensions - NULL // end of extensions + wxNullPtr // end of extensions ); ftInfo.SetShortDesc(_T("XYZFile")); // used under Win32 only @@ -1969,11 +1480,87 @@ static void TestMimeAssociate() delete ft; } - wxPuts(_T("")); + wxPuts(wxEmptyString); } +#endif // 0 + #endif // TEST_MIME +// ---------------------------------------------------------------------------- +// module dependencies feature +// ---------------------------------------------------------------------------- + +#ifdef TEST_MODULE + +#include "wx/module.h" + +class wxTestModule : public wxModule +{ +protected: + virtual bool OnInit() { wxPrintf(_T("Load module: %s\n"), GetClassInfo()->GetClassName()); return true; } + virtual void OnExit() { wxPrintf(_T("Unload module: %s\n"), GetClassInfo()->GetClassName()); } +}; + +class wxTestModuleA : public wxTestModule +{ +public: + wxTestModuleA(); +private: + DECLARE_DYNAMIC_CLASS(wxTestModuleA) +}; + +class wxTestModuleB : public wxTestModule +{ +public: + wxTestModuleB(); +private: + DECLARE_DYNAMIC_CLASS(wxTestModuleB) +}; + +class wxTestModuleC : public wxTestModule +{ +public: + wxTestModuleC(); +private: + DECLARE_DYNAMIC_CLASS(wxTestModuleC) +}; + +class wxTestModuleD : public wxTestModule +{ +public: + wxTestModuleD(); +private: + DECLARE_DYNAMIC_CLASS(wxTestModuleD) +}; + +IMPLEMENT_DYNAMIC_CLASS(wxTestModuleC, wxModule) +wxTestModuleC::wxTestModuleC() +{ + AddDependency(CLASSINFO(wxTestModuleD)); +} + +IMPLEMENT_DYNAMIC_CLASS(wxTestModuleA, wxModule) +wxTestModuleA::wxTestModuleA() +{ + AddDependency(CLASSINFO(wxTestModuleB)); + AddDependency(CLASSINFO(wxTestModuleD)); +} + +IMPLEMENT_DYNAMIC_CLASS(wxTestModuleD, wxModule) +wxTestModuleD::wxTestModuleD() +{ +} + +IMPLEMENT_DYNAMIC_CLASS(wxTestModuleB, wxModule) +wxTestModuleB::wxTestModuleB() +{ + AddDependency(CLASSINFO(wxTestModuleD)); + AddDependency(CLASSINFO(wxTestModuleC)); +} + +#endif // TEST_MODULE + // ---------------------------------------------------------------------------- // misc information functions // ---------------------------------------------------------------------------- @@ -1982,6 +1569,7 @@ static void TestMimeAssociate() #include "wx/utils.h" +#if TEST_INTERACTIVE static void TestDiskInfo() { wxPuts(_T("*** Testing wxGetDiskSpace() ***")); @@ -2010,6 +1598,7 @@ static void TestDiskInfo() } } } +#endif // TEST_INTERACTIVE static void TestOsInfo() { @@ -2020,12 +1609,29 @@ static void TestOsInfo() wxPrintf(_T("Running under: %s, version %d.%d\n"), wxGetOsDescription().c_str(), major, minor); - wxPrintf(_T("%ld free bytes of memory left.\n"), wxGetFreeMemory()); + wxPrintf(_T("%ld free bytes of memory left.\n"), wxGetFreeMemory().ToLong()); wxPrintf(_T("Host name is %s (%s).\n"), wxGetHostName().c_str(), wxGetFullHostName().c_str()); - wxPuts(_T("")); + wxPuts(wxEmptyString); +} + +static void TestPlatformInfo() +{ + wxPuts(_T("*** Testing wxPlatformInfo functions ***\n")); + + // get this platform + wxPlatformInfo plat; + + wxPrintf(_T("Operating system family name is: %s\n"), plat.GetOperatingSystemFamilyName().c_str()); + wxPrintf(_T("Operating system name is: %s\n"), plat.GetOperatingSystemIdName().c_str()); + wxPrintf(_T("Port ID name is: %s\n"), plat.GetPortIdName().c_str()); + wxPrintf(_T("Port ID short name is: %s\n"), plat.GetPortIdShortName().c_str()); + wxPrintf(_T("Architecture is: %s\n"), plat.GetArchName().c_str()); + wxPrintf(_T("Endianness is: %s\n"), plat.GetEndiannessName().c_str()); + + wxPuts(wxEmptyString); } static void TestUserInfo() @@ -2037,536 +1643,50 @@ static void TestUserInfo() wxPrintf(_T("Home dir is:\t%s\n"), wxGetHomeDir().c_str()); wxPrintf(_T("Email address:\t%s\n"), wxGetEmailAddress().c_str()); - wxPuts(_T("")); + wxPuts(wxEmptyString); } #endif // TEST_INFO_FUNCTIONS // ---------------------------------------------------------------------------- -// long long +// path list // ---------------------------------------------------------------------------- -#ifdef TEST_LONGLONG - -#include "wx/longlong.h" -#include "wx/timer.h" - -// make a 64 bit number from 4 16 bit ones -#define MAKE_LL(x1, x2, x3, x4) wxLongLong((x1 << 16) | x2, (x3 << 16) | x3) - -// get a random 64 bit number -#define RAND_LL() MAKE_LL(rand(), rand(), rand(), rand()) - -static const long testLongs[] = -{ - 0, - 1, - -1, - LONG_MAX, - LONG_MIN, - 0x1234, - -0x1234 -}; +#ifdef TEST_PATHLIST -#if wxUSE_LONGLONG_WX -inline bool operator==(const wxLongLongWx& a, const wxLongLongNative& b) - { return a.GetHi() == b.GetHi() && a.GetLo() == b.GetLo(); } -inline bool operator==(const wxLongLongNative& a, const wxLongLongWx& b) - { return a.GetHi() == b.GetHi() && a.GetLo() == b.GetLo(); } -#endif // wxUSE_LONGLONG_WX +#ifdef __UNIX__ + #define CMD_IN_PATH _T("ls") +#else + #define CMD_IN_PATH _T("command.com") +#endif -static void TestSpeed() +static void TestPathList() { - static const long max = 100000000; - long n; + wxPuts(_T("*** Testing wxPathList ***\n")); + wxPathList pathlist; + pathlist.AddEnvList(_T("PATH")); + wxString path = pathlist.FindValidPath(CMD_IN_PATH); + if ( path.empty() ) { - wxStopWatch sw; - - long l = 0; - for ( n = 0; n < max; n++ ) - { - l += n; - } - - wxPrintf(_T("Summing longs took %ld milliseconds.\n"), sw.Time()); + wxPrintf(_T("ERROR: command not found in the path.\n")); } - -#if wxUSE_LONGLONG_NATIVE + else { - wxStopWatch sw; - - wxLongLong_t l = 0; - for ( n = 0; n < max; n++ ) - { - l += n; - } - - wxPrintf(_T("Summing wxLongLong_t took %ld milliseconds.\n"), sw.Time()); + wxPrintf(_T("Command found in the path as '%s'.\n"), path.c_str()); } -#endif // wxUSE_LONGLONG_NATIVE +} - { - wxStopWatch sw; - - wxLongLong l; - for ( n = 0; n < max; n++ ) - { - l += n; - } - - wxPrintf(_T("Summing wxLongLongs took %ld milliseconds.\n"), sw.Time()); - } -} - -static void TestLongLongConversion() -{ - wxPuts(_T("*** Testing wxLongLong conversions ***\n")); - - wxLongLong a; - size_t nTested = 0; - for ( size_t n = 0; n < 100000; n++ ) - { - a = RAND_LL(); - -#if wxUSE_LONGLONG_NATIVE - wxLongLongNative b(a.GetHi(), a.GetLo()); - - wxASSERT_MSG( a == b, "conversions failure" ); -#else - wxPuts(_T("Can't do it without native long long type, test skipped.")); - - return; -#endif // wxUSE_LONGLONG_NATIVE - - if ( !(nTested % 1000) ) - { - putchar('.'); - fflush(stdout); - } - - nTested++; - } - - wxPuts(_T(" done!")); -} - -static void TestMultiplication() -{ - wxPuts(_T("*** Testing wxLongLong multiplication ***\n")); - - wxLongLong a, b; - size_t nTested = 0; - for ( size_t n = 0; n < 100000; n++ ) - { - a = RAND_LL(); - b = RAND_LL(); - -#if wxUSE_LONGLONG_NATIVE - wxLongLongNative aa(a.GetHi(), a.GetLo()); - wxLongLongNative bb(b.GetHi(), b.GetLo()); - - wxASSERT_MSG( a*b == aa*bb, "multiplication failure" ); -#else // !wxUSE_LONGLONG_NATIVE - wxPuts(_T("Can't do it without native long long type, test skipped.")); - - return; -#endif // wxUSE_LONGLONG_NATIVE - - if ( !(nTested % 1000) ) - { - putchar('.'); - fflush(stdout); - } - - nTested++; - } - - wxPuts(_T(" done!")); -} - -static void TestDivision() -{ - wxPuts(_T("*** Testing wxLongLong division ***\n")); - - wxLongLong q, r; - size_t nTested = 0; - for ( size_t n = 0; n < 100000; n++ ) - { - // get a random wxLongLong (shifting by 12 the MSB ensures that the - // multiplication will not overflow) - wxLongLong ll = MAKE_LL((rand() >> 12), rand(), rand(), rand()); - - // get a random (but non null) long (not wxLongLong for now) to divide - // it with - long l; - do - { - l = rand(); - } - while ( !l ); - - q = ll / l; - r = ll % l; - -#if wxUSE_LONGLONG_NATIVE - wxLongLongNative m(ll.GetHi(), ll.GetLo()); - - wxLongLongNative p = m / l, s = m % l; - wxASSERT_MSG( q == p && r == s, "division failure" ); -#else // !wxUSE_LONGLONG_NATIVE - // verify the result - wxASSERT_MSG( ll == q*l + r, "division failure" ); -#endif // wxUSE_LONGLONG_NATIVE - - if ( !(nTested % 1000) ) - { - putchar('.'); - fflush(stdout); - } - - nTested++; - } - - wxPuts(_T(" done!")); -} - -static void TestAddition() -{ - wxPuts(_T("*** Testing wxLongLong addition ***\n")); - - wxLongLong a, b, c; - size_t nTested = 0; - for ( size_t n = 0; n < 100000; n++ ) - { - a = RAND_LL(); - b = RAND_LL(); - c = a + b; - -#if wxUSE_LONGLONG_NATIVE - wxASSERT_MSG( c == wxLongLongNative(a.GetHi(), a.GetLo()) + - wxLongLongNative(b.GetHi(), b.GetLo()), - "addition failure" ); -#else // !wxUSE_LONGLONG_NATIVE - wxASSERT_MSG( c - b == a, "addition failure" ); -#endif // wxUSE_LONGLONG_NATIVE - - if ( !(nTested % 1000) ) - { - putchar('.'); - fflush(stdout); - } - - nTested++; - } - - wxPuts(_T(" done!")); -} - -static void TestBitOperations() -{ - wxPuts(_T("*** Testing wxLongLong bit operation ***\n")); - - wxLongLong ll; - size_t nTested = 0; - for ( size_t n = 0; n < 100000; n++ ) - { - ll = RAND_LL(); - -#if wxUSE_LONGLONG_NATIVE - for ( size_t n = 0; n < 33; n++ ) - { - } -#else // !wxUSE_LONGLONG_NATIVE - wxPuts(_T("Can't do it without native long long type, test skipped.")); - - return; -#endif // wxUSE_LONGLONG_NATIVE - - if ( !(nTested % 1000) ) - { - putchar('.'); - fflush(stdout); - } - - nTested++; - } - - wxPuts(_T(" done!")); -} - -static void TestLongLongComparison() -{ -#if wxUSE_LONGLONG_WX - wxPuts(_T("*** Testing wxLongLong comparison ***\n")); - - static const long ls[2] = - { - 0x1234, - -0x1234, - }; - - wxLongLongWx lls[2]; - lls[0] = ls[0]; - lls[1] = ls[1]; - - for ( size_t n = 0; n < WXSIZEOF(testLongs); n++ ) - { - bool res; - - for ( size_t m = 0; m < WXSIZEOF(lls); m++ ) - { - res = lls[m] > testLongs[n]; - wxPrintf(_T("0x%lx > 0x%lx is %s (%s)\n"), - ls[m], testLongs[n], res ? "true" : "false", - res == (ls[m] > testLongs[n]) ? "ok" : "ERROR"); - - res = lls[m] < testLongs[n]; - wxPrintf(_T("0x%lx < 0x%lx is %s (%s)\n"), - ls[m], testLongs[n], res ? "true" : "false", - res == (ls[m] < testLongs[n]) ? "ok" : "ERROR"); - - res = lls[m] == testLongs[n]; - wxPrintf(_T("0x%lx == 0x%lx is %s (%s)\n"), - ls[m], testLongs[n], res ? "true" : "false", - res == (ls[m] == testLongs[n]) ? "ok" : "ERROR"); - } - } -#endif // wxUSE_LONGLONG_WX -} - -static void TestLongLongToString() -{ - wxPuts(_T("*** Testing wxLongLong::ToString() ***\n")); - - for ( size_t n = 0; n < WXSIZEOF(testLongs); n++ ) - { - wxLongLong ll = testLongs[n]; - wxPrintf(_T("%ld == %s\n"), testLongs[n], ll.ToString().c_str()); - } - - wxLongLong ll(0x12345678, 0x87654321); - wxPrintf(_T("0x1234567887654321 = %s\n"), ll.ToString().c_str()); - - ll.Negate(); - wxPrintf(_T("-0x1234567887654321 = %s\n"), ll.ToString().c_str()); -} - -static void TestLongLongPrintf() -{ - wxPuts(_T("*** Testing wxLongLong printing ***\n")); - -#ifdef wxLongLongFmtSpec - wxLongLong ll = wxLL(0x1234567890abcdef); - wxString s = wxString::Format(_T("%") wxLongLongFmtSpec _T("x"), ll); - wxPrintf(_T("0x1234567890abcdef -> %s (%s)\n"), - s.c_str(), s == _T("1234567890abcdef") ? _T("ok") : _T("ERROR")); -#else // !wxLongLongFmtSpec - #error "wxLongLongFmtSpec not defined for this compiler/platform" -#endif -} - -#undef MAKE_LL -#undef RAND_LL - -#endif // TEST_LONGLONG - -// ---------------------------------------------------------------------------- -// path list -// ---------------------------------------------------------------------------- - -#ifdef TEST_PATHLIST - -#ifdef __UNIX__ - #define CMD_IN_PATH _T("ls") -#else - #define CMD_IN_PATH _T("command.com") -#endif - -static void TestPathList() -{ - wxPuts(_T("*** Testing wxPathList ***\n")); - - wxPathList pathlist; - pathlist.AddEnvList(_T("PATH")); - wxString path = pathlist.FindValidPath(CMD_IN_PATH); - if ( path.empty() ) - { - wxPrintf(_T("ERROR: command not found in the path.\n")); - } - else - { - wxPrintf(_T("Command found in the path as '%s'.\n"), path.c_str()); - } -} - -#endif // TEST_PATHLIST +#endif // TEST_PATHLIST // ---------------------------------------------------------------------------- // regular expressions // ---------------------------------------------------------------------------- -#ifdef TEST_REGEX +#if defined TEST_REGEX && TEST_INTERACTIVE #include "wx/regex.h" -static void TestRegExCompile() -{ - wxPuts(_T("*** Testing RE compilation ***\n")); - - static struct RegExCompTestData - { - const wxChar *pattern; - bool correct; - } regExCompTestData[] = - { - { _T("foo"), true }, - { _T("foo("), false }, - { _T("foo(bar"), false }, - { _T("foo(bar)"), true }, - { _T("foo["), false }, - { _T("foo[bar"), false }, - { _T("foo[bar]"), true }, - { _T("foo{"), true }, - { _T("foo{1"), false }, - { _T("foo{bar"), true }, - { _T("foo{1}"), true }, - { _T("foo{1,2}"), true }, - { _T("foo{bar}"), true }, - { _T("foo*"), true }, - { _T("foo**"), false }, - { _T("foo+"), true }, - { _T("foo++"), false }, - { _T("foo?"), true }, - { _T("foo??"), false }, - { _T("foo?+"), false }, - }; - - wxRegEx re; - for ( size_t n = 0; n < WXSIZEOF(regExCompTestData); n++ ) - { - const RegExCompTestData& data = regExCompTestData[n]; - bool ok = re.Compile(data.pattern); - - wxPrintf(_T("'%s' is %sa valid RE (%s)\n"), - data.pattern, - ok ? _T("") : _T("not "), - ok == data.correct ? _T("ok") : _T("ERROR")); - } -} - -static void TestRegExMatch() -{ - wxPuts(_T("*** Testing RE matching ***\n")); - - static struct RegExMatchTestData - { - const wxChar *pattern; - const wxChar *text; - bool correct; - } regExMatchTestData[] = - { - { _T("foo"), _T("bar"), false }, - { _T("foo"), _T("foobar"), true }, - { _T("^foo"), _T("foobar"), true }, - { _T("^foo"), _T("barfoo"), false }, - { _T("bar$"), _T("barbar"), true }, - { _T("bar$"), _T("barbar "), false }, - }; - - for ( size_t n = 0; n < WXSIZEOF(regExMatchTestData); n++ ) - { - const RegExMatchTestData& data = regExMatchTestData[n]; - - wxRegEx re(data.pattern); - bool ok = re.Matches(data.text); - - wxPrintf(_T("'%s' %s %s (%s)\n"), - data.pattern, - ok ? _T("matches") : _T("doesn't match"), - data.text, - ok == data.correct ? _T("ok") : _T("ERROR")); - } -} - -static void TestRegExSubmatch() -{ - wxPuts(_T("*** Testing RE subexpressions ***\n")); - - wxRegEx re(_T("([[:alpha:]]+) ([[:alpha:]]+) ([[:digit:]]+).*([[:digit:]]+)$")); - if ( !re.IsValid() ) - { - wxPuts(_T("ERROR: compilation failed.")); - return; - } - - wxString text = _T("Fri Jul 13 18:37:52 CEST 2001"); - - if ( !re.Matches(text) ) - { - wxPuts(_T("ERROR: match expected.")); - } - else - { - wxPrintf(_T("Entire match: %s\n"), re.GetMatch(text).c_str()); - - wxPrintf(_T("Date: %s/%s/%s, wday: %s\n"), - re.GetMatch(text, 3).c_str(), - re.GetMatch(text, 2).c_str(), - re.GetMatch(text, 4).c_str(), - re.GetMatch(text, 1).c_str()); - } -} - -static void TestRegExReplacement() -{ - wxPuts(_T("*** Testing RE replacement ***")); - - static struct RegExReplTestData - { - const wxChar *text; - const wxChar *repl; - const wxChar *result; - size_t count; - } regExReplTestData[] = - { - { _T("foo123"), _T("bar"), _T("bar"), 1 }, - { _T("foo123"), _T("\\2\\1"), _T("123foo"), 1 }, - { _T("foo_123"), _T("\\2\\1"), _T("123foo"), 1 }, - { _T("123foo"), _T("bar"), _T("123foo"), 0 }, - { _T("123foo456foo"), _T("&&"), _T("123foo456foo456foo"), 1 }, - { _T("foo123foo123"), _T("bar"), _T("barbar"), 2 }, - { _T("foo123_foo456_foo789"), _T("bar"), _T("bar_bar_bar"), 3 }, - }; - - const wxChar *pattern = _T("([a-z]+)[^0-9]*([0-9]+)"); - wxRegEx re(pattern); - - wxPrintf(_T("Using pattern '%s' for replacement.\n"), pattern); - - for ( size_t n = 0; n < WXSIZEOF(regExReplTestData); n++ ) - { - const RegExReplTestData& data = regExReplTestData[n]; - - wxString text = data.text; - size_t nRepl = re.Replace(&text, data.repl); - - wxPrintf(_T("%s =~ s/RE/%s/g: %u match%s, result = '%s' ("), - data.text, data.repl, - nRepl, nRepl == 1 ? _T("") : _T("es"), - text.c_str()); - if ( text == data.result && nRepl == data.count ) - { - wxPuts(_T("ok)")); - } - else - { - wxPrintf(_T("ERROR: should be %u and '%s')\n"), - data.count, data.result); - } - } -} - static void TestRegExInteractive() { wxPuts(_T("*** Testing RE interactively ***")); @@ -2623,33 +1743,13 @@ static void TestRegExInteractive() #endif // TEST_REGEX -// ---------------------------------------------------------------------------- -// database -// ---------------------------------------------------------------------------- - -#if !wxUSE_ODBC - #undef TEST_ODBC -#endif - -#ifdef TEST_ODBC - -#include - -static void TestDbOpen() -{ - HENV henv; - wxDb db(henv); -} - -#endif // TEST_ODBC - // ---------------------------------------------------------------------------- // printf() tests // ---------------------------------------------------------------------------- /* NB: this stuff was taken from the glibc test suite and modified to build - in wxWindows: if I read the copyright below properly, this shouldn't + in wxWidgets: if I read the copyright below properly, this shouldn't be a problem */ @@ -2721,6 +1821,8 @@ fmtst2chk (const wxChar *fmt) * This exercises the output formatting code. */ +wxChar *PointerNull = NULL; + static void fp_test (void) { @@ -2762,8 +1864,8 @@ fp_test (void) } } } - wxPrintf(_T("%10s\n"), (wxChar *) NULL); - wxPrintf(_T("%-10s\n"), (wxChar *) NULL); + wxPrintf(_T("%10s\n"), PointerNull); + wxPrintf(_T("%-10s\n"), PointerNull); } static void TestPrintf() @@ -2772,6 +1874,7 @@ static void TestPrintf() static wxChar longstr[] = _T("Good morning, Doctor Chandra. This is Hal. \ I am ready for my first lesson today."); int result = 0; + wxString test_format; fmtchk(_T("%.4x")); fmtchk(_T("%04x")); @@ -2785,7 +1888,8 @@ I am ready for my first lesson today."); fmtst2chk(_T("%*.*x")); fmtst2chk(_T("%0*.*x")); - wxPrintf(_T("bad format:\t\"%b\"\n")); + wxString bad_format = _T("bad format:\t\"%b\"\n"); + wxPrintf(bad_format.c_str()); wxPrintf(_T("nil pointer (padded):\t\"%10p\"\n"), (void *) NULL); wxPrintf(_T("decimal negative:\t\"%d\"\n"), -2345); @@ -2795,15 +1899,18 @@ I am ready for my first lesson today."); wxPrintf(_T("long octal negative:\t\"%lo\"\n"), -2345L); wxPrintf(_T("long unsigned decimal number:\t\"%lu\"\n"), -123456L); wxPrintf(_T("zero-padded LDN:\t\"%010ld\"\n"), -123456L); - wxPrintf(_T("left-adjusted ZLDN:\t\"%-010ld\"\n"), -123456); + test_format = _T("left-adjusted ZLDN:\t\"%-010ld\"\n"); + wxPrintf(test_format.c_str(), -123456); wxPrintf(_T("space-padded LDN:\t\"%10ld\"\n"), -123456L); wxPrintf(_T("left-adjusted SLDN:\t\"%-10ld\"\n"), -123456L); - wxPrintf(_T("zero-padded string:\t\"%010s\"\n"), shortstr); - wxPrintf(_T("left-adjusted Z string:\t\"%-010s\"\n"), shortstr); + test_format = _T("zero-padded string:\t\"%010s\"\n"); + wxPrintf(test_format.c_str(), shortstr); + test_format = _T("left-adjusted Z string:\t\"%-010s\"\n"); + wxPrintf(test_format.c_str(), shortstr); wxPrintf(_T("space-padded string:\t\"%10s\"\n"), shortstr); wxPrintf(_T("left-adjusted S string:\t\"%-10s\"\n"), shortstr); - wxPrintf(_T("null string:\t\"%s\"\n"), (wxChar *)NULL); + wxPrintf(_T("null string:\t\"%s\"\n"), PointerNull); wxPrintf(_T("limited string:\t\"%.22s\"\n"), longstr); wxPrintf(_T("e-style >= 1:\t\"%e\"\n"), 12.34); @@ -2836,7 +1943,11 @@ I am ready for my first lesson today."); fflush (stdout); } +#ifndef __WATCOMC__ + // Open Watcom cause compiler error here + // Error! E173: col(24) floating-point constant too small to represent wxPrintf (_T("%15.5e\n"), 4.9406564584124654e-324); +#endif #define FORMAT _T("|%12.4f|%12.4e|%12.4g|\n") wxPrintf (FORMAT, 0.0, 0.0, 0.0); @@ -2894,14 +2005,18 @@ I am ready for my first lesson today."); wxChar buf[200]; wxSprintf(buf, _T("%07") wxLongLongFmtSpec _T("o"), wxLL(040000000000)); + #if 0 + // for some reason below line fails under Borland wxPrintf (_T("sprintf (buf, \"%%07Lo\", 040000000000ll) = %s"), buf); + #endif if (wxStrcmp (buf, _T("40000000000")) != 0) { result = 1; wxPuts (_T("\tFAILED")); } - wxPuts (_T("")); + wxUnusedVar(result); + wxPuts (wxEmptyString); } #endif // wxLongLong_t @@ -2964,6 +2079,7 @@ rfg2 (void) { int prec; wxChar buf[100]; + wxString test_format; prec = 0; wxSprintf (buf, _T("%.*g"), prec, 3.3); @@ -2978,19 +2094,23 @@ rfg2 (void) if (wxStrcmp (buf, _T(" 3")) != 0) wxPrintf (_T("got: '%s', expected: '%s'\n"), buf, _T(" 3")); prec = 3; - wxSprintf (buf, _T("%04.*o"), prec, 33); + test_format = _T("%04.*o"); + wxSprintf (buf, test_format.c_str(), prec, 33); if (wxStrcmp (buf, _T(" 041")) != 0) wxPrintf (_T("got: '%s', expected: '%s'\n"), buf, _T(" 041")); prec = 7; - wxSprintf (buf, _T("%09.*u"), prec, 33); + test_format = _T("%09.*u"); + wxSprintf (buf, test_format.c_str(), prec, 33); if (wxStrcmp (buf, _T(" 0000033")) != 0) wxPrintf (_T("got: '%s', expected: '%s'\n"), buf, _T(" 0000033")); prec = 3; - wxSprintf (buf, _T("%04.*x"), prec, 33); + test_format = _T("%04.*x"); + wxSprintf (buf, test_format.c_str(), prec, 33); if (wxStrcmp (buf, _T(" 021")) != 0) wxPrintf (_T("got: '%s', expected: '%s'\n"), buf, _T(" 021")); prec = 3; - wxSprintf (buf, _T("%04.*X"), prec, 33); + test_format = _T("%04.*X"); + wxSprintf (buf, test_format.c_str(), prec, 33); if (wxStrcmp (buf, _T(" 021")) != 0) wxPrintf (_T("got: '%s', expected: '%s'\n"), buf, _T(" 021")); } @@ -3012,10 +2132,31 @@ rfg2 (void) #include "wx/confbase.h" #include "wx/msw/regconf.h" +#if 0 static void TestRegConfWrite() { - wxRegConfig regconf(_T("console"), _T("wxwindows")); - regconf.Write(_T("Hello"), wxString(_T("world"))); + wxConfig *config = new wxConfig(_T("myapp")); + config->SetPath(_T("/group1")); + config->Write(_T("entry1"), _T("foo")); + config->SetPath(_T("/group2")); + config->Write(_T("entry1"), _T("bar")); +} +#endif + +static void TestRegConfRead() +{ + wxRegConfig *config = new wxRegConfig(_T("myapp")); + + wxString str; + long dummy; + config->SetPath(_T("/")); + wxPuts(_T("Enumerating / subgroups:")); + bool bCont = config->GetFirstGroup(str, dummy); + while(bCont) + { + wxPuts(str); + bCont = config->GetNextGroup(str, dummy); + } } #endif // TEST_REGCONF @@ -3084,7 +2225,7 @@ static void TestRegistryRead() wxPrintf(_T(" (raw value '%s')"), val.c_str()); } - putchar('\n'); + wxPutchar('\n'); cont = key.GetNextValue(value, dummy); } @@ -3100,26 +2241,26 @@ static void TestRegistryAssociation() wxRegKey key; - key.SetName("HKEY_CLASSES_ROOT\\.ddf" ); + key.SetName(_T("HKEY_CLASSES_ROOT\\.ddf") ); key.Create(); - key = "ddxf_auto_file" ; - key.SetName("HKEY_CLASSES_ROOT\\.flo" ); + key = _T("ddxf_auto_file") ; + key.SetName(_T("HKEY_CLASSES_ROOT\\.flo") ); key.Create(); - key = "ddxf_auto_file" ; - key.SetName("HKEY_CLASSES_ROOT\\ddxf_auto_file\\DefaultIcon"); + key = _T("ddxf_auto_file") ; + key.SetName(_T("HKEY_CLASSES_ROOT\\ddxf_auto_file\\DefaultIcon")); key.Create(); - key = "program,0" ; - key.SetName("HKEY_CLASSES_ROOT\\ddxf_auto_file\\shell\\open\\command"); + key = _T("program,0") ; + key.SetName(_T("HKEY_CLASSES_ROOT\\ddxf_auto_file\\shell\\open\\command")); key.Create(); - key = "program \"%1\"" ; + key = _T("program \"%1\"") ; - key.SetName("HKEY_CLASSES_ROOT\\.ddf" ); + key.SetName(_T("HKEY_CLASSES_ROOT\\.ddf") ); key.DeleteSelf(); - key.SetName("HKEY_CLASSES_ROOT\\.flo" ); + key.SetName(_T("HKEY_CLASSES_ROOT\\.flo") ); key.DeleteSelf(); - key.SetName("HKEY_CLASSES_ROOT\\ddxf_auto_file\\DefaultIcon"); + key.SetName(_T("HKEY_CLASSES_ROOT\\ddxf_auto_file\\DefaultIcon")); key.DeleteSelf(); - key.SetName("HKEY_CLASSES_ROOT\\ddxf_auto_file\\shell\\open\\command"); + key.SetName(_T("HKEY_CLASSES_ROOT\\ddxf_auto_file\\shell\\open\\command")); key.DeleteSelf(); } @@ -3146,14 +2287,14 @@ struct Object static void TestScopeGuard() { - ON_BLOCK_EXIT0(function0); - ON_BLOCK_EXIT1(function1, 17); - ON_BLOCK_EXIT2(function2, 3.14, 'p'); + wxON_BLOCK_EXIT0(function0); + wxON_BLOCK_EXIT1(function1, 17); + wxON_BLOCK_EXIT2(function2, 3.14, 'p'); Object obj; - ON_BLOCK_EXIT_OBJ0(obj, &Object::method0); - ON_BLOCK_EXIT_OBJ1(obj, &Object::method1, 7); - ON_BLOCK_EXIT_OBJ2(obj, &Object::method2, 2.71, 'e'); + wxON_BLOCK_EXIT_OBJ0(obj, Object::method0); + wxON_BLOCK_EXIT_OBJ1(obj, Object::method1, 7); + wxON_BLOCK_EXIT_OBJ2(obj, Object::method2, 2.71, 'e'); wxScopeGuard dismissed = wxMakeGuard(function0); dismissed.Dismiss(); @@ -3274,7 +2415,7 @@ static void TestSocketClient() { wxPuts(_T("*** Testing wxSocketClient ***\n")); - static const wxChar *hostname = _T("www.wxwindows.org"); + static const wxChar *hostname = _T("www.wxwidgets.org"); wxIPV4address addr; addr.Hostname(hostname); @@ -3315,10 +2456,10 @@ static void TestSocketClient() #include "wx/protocol/ftp.h" -static wxFTP ftp; - #define FTP_ANONYMOUS +static wxFTP *ftp; + #ifdef FTP_ANONYMOUS static const wxChar *directory = _T("/pub"); static const wxChar *filename = _T("welcome.msg"); @@ -3332,7 +2473,7 @@ static bool TestFtpConnect() wxPuts(_T("*** Testing FTP connect ***")); #ifdef FTP_ANONYMOUS - static const wxChar *hostname = _T("ftp.wxwindows.org"); + static const wxChar *hostname = _T("ftp.wxwidgets.org"); wxPrintf(_T("--- Attempting to connect to %s:21 anonymously...\n"), hostname); #else // !FTP_ANONYMOUS @@ -3341,18 +2482,18 @@ static bool TestFtpConnect() wxChar user[256]; wxFgets(user, WXSIZEOF(user), stdin); user[wxStrlen(user) - 1] = '\0'; // chop off '\n' - ftp.SetUser(user); + ftp->SetUser(user); wxChar password[256]; wxPrintf(_T("Password for %s: "), password); wxFgets(password, WXSIZEOF(password), stdin); password[wxStrlen(password) - 1] = '\0'; // chop off '\n' - ftp.SetPassword(password); + ftp->SetPassword(password); wxPrintf(_T("--- Attempting to connect to %s:21 as %s...\n"), hostname, user); #endif // FTP_ANONYMOUS/!FTP_ANONYMOUS - if ( !ftp.Connect(hostname) ) + if ( !ftp->Connect(hostname) ) { wxPrintf(_T("ERROR: failed to connect to %s\n"), hostname); @@ -3361,71 +2502,34 @@ static bool TestFtpConnect() else { wxPrintf(_T("--- Connected to %s, current directory is '%s'\n"), - hostname, ftp.Pwd().c_str()); + hostname, ftp->Pwd().c_str()); + ftp->Close(); } return true; } -// test (fixed?) wxFTP bug with wu-ftpd >= 2.6.0? -static void TestFtpWuFtpd() -{ - wxFTP ftp; - static const wxChar *hostname = _T("ftp.eudora.com"); - if ( !ftp.Connect(hostname) ) - { - wxPrintf(_T("ERROR: failed to connect to %s\n"), hostname); - } - else - { - static const wxChar *filename = _T("eudora/pubs/draft-gellens-submit-09.txt"); - wxInputStream *in = ftp.GetInputStream(filename); - if ( !in ) - { - wxPrintf(_T("ERROR: couldn't get input stream for %s\n"), filename); - } - else - { - size_t size = in->GetSize(); - wxPrintf(_T("Reading file %s (%u bytes)..."), filename, size); - - wxChar *data = new wxChar[size]; - if ( !in->Read(data, size) ) - { - wxPuts(_T("ERROR: read error")); - } - else - { - wxPrintf(_T("Successfully retrieved the file.\n")); - } - - delete [] data; - delete in; - } - } -} - static void TestFtpList() { wxPuts(_T("*** Testing wxFTP file listing ***\n")); // test CWD - if ( !ftp.ChDir(directory) ) + if ( !ftp->ChDir(directory) ) { wxPrintf(_T("ERROR: failed to cd to %s\n"), directory); } - wxPrintf(_T("Current directory is '%s'\n"), ftp.Pwd().c_str()); + wxPrintf(_T("Current directory is '%s'\n"), ftp->Pwd().c_str()); // test NLIST and LIST wxArrayString files; - if ( !ftp.GetFilesList(files) ) + if ( !ftp->GetFilesList(files) ) { wxPuts(_T("ERROR: failed to get NLIST of files")); } else { - wxPrintf(_T("Brief list of files under '%s':\n"), ftp.Pwd().c_str()); + wxPrintf(_T("Brief list of files under '%s':\n"), ftp->Pwd().c_str()); size_t count = files.GetCount(); for ( size_t n = 0; n < count; n++ ) { @@ -3434,13 +2538,13 @@ static void TestFtpList() wxPuts(_T("End of the file list")); } - if ( !ftp.GetDirList(files) ) + if ( !ftp->GetDirList(files) ) { wxPuts(_T("ERROR: failed to get LIST of files")); } else { - wxPrintf(_T("Detailed list of files under '%s':\n"), ftp.Pwd().c_str()); + wxPrintf(_T("Detailed list of files under '%s':\n"), ftp->Pwd().c_str()); size_t count = files.GetCount(); for ( size_t n = 0; n < count; n++ ) { @@ -3449,12 +2553,12 @@ static void TestFtpList() wxPuts(_T("End of the file list")); } - if ( !ftp.ChDir(_T("..")) ) + if ( !ftp->ChDir(_T("..")) ) { wxPuts(_T("ERROR: failed to cd to ..")); } - wxPrintf(_T("Current directory is '%s'\n"), ftp.Pwd().c_str()); + wxPrintf(_T("Current directory is '%s'\n"), ftp->Pwd().c_str()); } static void TestFtpDownload() @@ -3462,7 +2566,7 @@ static void TestFtpDownload() wxPuts(_T("*** Testing wxFTP download ***\n")); // test RETR - wxInputStream *in = ftp.GetInputStream(filename); + wxInputStream *in = ftp->GetInputStream(filename); if ( !in ) { wxPrintf(_T("ERROR: couldn't get input stream for %s\n"), filename); @@ -3492,16 +2596,16 @@ static void TestFtpFileSize() { wxPuts(_T("*** Testing FTP SIZE command ***")); - if ( !ftp.ChDir(directory) ) + if ( !ftp->ChDir(directory) ) { wxPrintf(_T("ERROR: failed to cd to %s\n"), directory); } - wxPrintf(_T("Current directory is '%s'\n"), ftp.Pwd().c_str()); + wxPrintf(_T("Current directory is '%s'\n"), ftp->Pwd().c_str()); - if ( ftp.FileExists(filename) ) + if ( ftp->FileExists(filename) ) { - int size = ftp.GetFileSize(filename); + int size = ftp->GetFileSize(filename); if ( size == -1 ) wxPrintf(_T("ERROR: couldn't get size of '%s'\n"), filename); else @@ -3517,26 +2621,28 @@ static void TestFtpMisc() { wxPuts(_T("*** Testing miscellaneous wxFTP functions ***")); - if ( ftp.SendCommand("STAT") != '2' ) + if ( ftp->SendCommand(_T("STAT")) != '2' ) { wxPuts(_T("ERROR: STAT failed")); } else { - wxPrintf(_T("STAT returned:\n\n%s\n"), ftp.GetLastResult().c_str()); + wxPrintf(_T("STAT returned:\n\n%s\n"), ftp->GetLastResult().c_str()); } - if ( ftp.SendCommand("HELP SITE") != '2' ) + if ( ftp->SendCommand(_T("HELP SITE")) != '2' ) { wxPuts(_T("ERROR: HELP SITE failed")); } else { wxPrintf(_T("The list of site-specific commands:\n\n%s\n"), - ftp.GetLastResult().c_str()); + ftp->GetLastResult().c_str()); } } +#if TEST_INTERACTIVE + static void TestFtpInteractive() { wxPuts(_T("\n*** Interactive wxFTP test ***")); @@ -3555,21 +2661,21 @@ static void TestFtpInteractive() // special handling of LIST and NLST as they require data connection wxString start(buf, 4); start.MakeUpper(); - if ( start == "LIST" || start == "NLST" ) + if ( start == _T("LIST") || start == _T("NLST") ) { wxString wildcard; if ( wxStrlen(buf) > 4 ) wildcard = buf + 5; wxArrayString files; - if ( !ftp.GetList(files, wildcard, start == "LIST") ) + if ( !ftp->GetList(files, wildcard, start == _T("LIST")) ) { wxPrintf(_T("ERROR: failed to get %s of files\n"), start.c_str()); } else { wxPrintf(_T("--- %s of '%s' under '%s':\n"), - start.c_str(), wildcard.c_str(), ftp.Pwd().c_str()); + start.c_str(), wildcard.c_str(), ftp->Pwd().c_str()); size_t count = files.GetCount(); for ( size_t n = 0; n < count; n++ ) { @@ -3580,20 +2686,22 @@ static void TestFtpInteractive() } else // !list { - wxChar ch = ftp.SendCommand(buf); + wxChar ch = ftp->SendCommand(buf); wxPrintf(_T("Command %s"), ch ? _T("succeeded") : _T("failed")); if ( ch ) { wxPrintf(_T(" (return code %c)"), ch); } - wxPrintf(_T(", server reply:\n%s\n\n"), ftp.GetLastResult().c_str()); + wxPrintf(_T(", server reply:\n%s\n\n"), ftp->GetLastResult().c_str()); } } wxPuts(_T("\n*** done ***")); } +#endif // TEST_INTERACTIVE + static void TestFtpUpload() { wxPuts(_T("*** Testing wxFTP uploading ***\n")); @@ -3601,7 +2709,7 @@ static void TestFtpUpload() // upload a file static const wxChar *file1 = _T("test1"); static const wxChar *file2 = _T("test2"); - wxOutputStream *out = ftp.GetOutputStream(file1); + wxOutputStream *out = ftp->GetOutputStream(file1); if ( out ) { wxPrintf(_T("--- Uploading to %s ---\n"), file1); @@ -3610,17 +2718,17 @@ static void TestFtpUpload() } // send a command to check the remote file - if ( ftp.SendCommand(wxString("STAT ") + file1) != '2' ) + if ( ftp->SendCommand(wxString(_T("STAT ")) + file1) != '2' ) { wxPrintf(_T("ERROR: STAT %s failed\n"), file1); } else { wxPrintf(_T("STAT %s returned:\n\n%s\n"), - file1, ftp.GetLastResult().c_str()); + file1, ftp->GetLastResult().c_str()); } - out = ftp.GetOutputStream(file2); + out = ftp->GetOutputStream(file2); if ( out ) { wxPrintf(_T("--- Uploading to %s ---\n"), file1); @@ -3632,34 +2740,146 @@ static void TestFtpUpload() #endif // TEST_FTP // ---------------------------------------------------------------------------- -// streams +// stack backtrace // ---------------------------------------------------------------------------- -#ifdef TEST_STREAMS +#ifdef TEST_STACKWALKER -#include "wx/wfstream.h" -#include "wx/mstream.h" +#if wxUSE_STACKWALKER -static void TestFileStream() -{ - wxPuts(_T("*** Testing wxFileInputStream ***")); +#include "wx/stackwalk.h" - static const wxChar *filename = _T("testdata.fs"); +class StackDump : public wxStackWalker +{ +public: + StackDump(const char *argv0) + : wxStackWalker(argv0) { - wxFileOutputStream fsOut(filename); - fsOut.Write("foo", 3); } - wxFileInputStream fsIn(filename); - wxPrintf(_T("File stream size: %u\n"), fsIn.GetSize()); - while ( !fsIn.Eof() ) + virtual void Walk(size_t skip = 1, size_t maxdepth = wxSTACKWALKER_MAX_DEPTH) { - putchar(fsIn.GetC()); + wxPuts(_T("Stack dump:")); + + wxStackWalker::Walk(skip, maxdepth); } - if ( !wxRemoveFile(filename) ) +protected: + virtual void OnStackFrame(const wxStackFrame& frame) { - wxPrintf(_T("ERROR: failed to remove the file '%s'.\n"), filename); + printf("[%2d] ", (int) frame.GetLevel()); + + wxString name = frame.GetName(); + if ( !name.empty() ) + { + printf("%-20.40s", (const char*)name.mb_str()); + } + else + { + printf("0x%08lx", (unsigned long)frame.GetAddress()); + } + + if ( frame.HasSourceLocation() ) + { + printf("\t%s:%d", + (const char*)frame.GetFileName().mb_str(), + (int)frame.GetLine()); + } + + puts(""); + + wxString type, val; + for ( size_t n = 0; frame.GetParam(n, &type, &name, &val); n++ ) + { + printf("\t%s %s = %s\n", (const char*)type.mb_str(), + (const char*)name.mb_str(), + (const char*)val.mb_str()); + } + } +}; + +static void TestStackWalk(const char *argv0) +{ + wxPuts(_T("*** Testing wxStackWalker ***\n")); + + StackDump dump(argv0); + dump.Walk(); +} + +#endif // wxUSE_STACKWALKER + +#endif // TEST_STACKWALKER + +// ---------------------------------------------------------------------------- +// standard paths +// ---------------------------------------------------------------------------- + +#ifdef TEST_STDPATHS + +#include "wx/stdpaths.h" +#include "wx/wxchar.h" // wxPrintf + +static void TestStandardPaths() +{ + wxPuts(_T("*** Testing wxStandardPaths ***\n")); + + wxTheApp->SetAppName(_T("console")); + + wxStandardPathsBase& stdp = wxStandardPaths::Get(); + wxPrintf(_T("Config dir (sys):\t%s\n"), stdp.GetConfigDir().c_str()); + wxPrintf(_T("Config dir (user):\t%s\n"), stdp.GetUserConfigDir().c_str()); + wxPrintf(_T("Data dir (sys):\t\t%s\n"), stdp.GetDataDir().c_str()); + wxPrintf(_T("Data dir (sys local):\t%s\n"), stdp.GetLocalDataDir().c_str()); + wxPrintf(_T("Data dir (user):\t%s\n"), stdp.GetUserDataDir().c_str()); + wxPrintf(_T("Data dir (user local):\t%s\n"), stdp.GetUserLocalDataDir().c_str()); + wxPrintf(_T("Documents dir:\t\t%s\n"), stdp.GetDocumentsDir().c_str()); + wxPrintf(_T("Executable path:\t%s\n"), stdp.GetExecutablePath().c_str()); + wxPrintf(_T("Plugins dir:\t\t%s\n"), stdp.GetPluginsDir().c_str()); + wxPrintf(_T("Resources dir:\t\t%s\n"), stdp.GetResourcesDir().c_str()); + wxPrintf(_T("Localized res. dir:\t%s\n"), + stdp.GetLocalizedResourcesDir(_T("fr")).c_str()); + wxPrintf(_T("Message catalogs dir:\t%s\n"), + stdp.GetLocalizedResourcesDir + ( + _T("fr"), + wxStandardPaths::ResourceCat_Messages + ).c_str()); +} + +#endif // TEST_STDPATHS + +// ---------------------------------------------------------------------------- +// streams +// ---------------------------------------------------------------------------- + +#ifdef TEST_STREAMS + +#include "wx/wfstream.h" +#include "wx/mstream.h" + +static void TestFileStream() +{ + wxPuts(_T("*** Testing wxFileInputStream ***")); + + static const wxString filename = _T("testdata.fs"); + { + wxFileOutputStream fsOut(filename); + fsOut.Write("foo", 3); + } + + { + wxFileInputStream fsIn(filename); + wxPrintf(_T("File stream size: %u\n"), fsIn.GetSize()); + int c; + while ( (c=fsIn.GetC()) != wxEOF ) + { + wxPutchar(c); + } + } + + if ( !wxRemoveFile(filename) ) + { + wxPrintf(_T("ERROR: failed to remove the file '%s'.\n"), filename.c_str()); } wxPuts(_T("\n*** wxFileInputStream test done ***")); @@ -3688,9 +2908,10 @@ static void TestMemoryStream() wxMemoryInputStream memInpStream(buf, len); wxPrintf(_T("Memory stream size: %u\n"), memInpStream.GetSize()); - while ( !memInpStream.Eof() ) + int c; + while ( (c=memInpStream.GetC()) != wxEOF ) { - putchar(memInpStream.GetC()); + wxPutchar(c); } wxPuts(_T("\n*** wxMemoryInputStream test done ***")); @@ -3704,7 +2925,7 @@ static void TestMemoryStream() #ifdef TEST_TIMER -#include "wx/timer.h" +#include "wx/stopwatch.h" #include "wx/utils.h" static void TestStopWatch() @@ -3750,13 +2971,59 @@ static void TestStopWatch() } } - putchar('.'); + wxPutchar('.'); fflush(stdout); } wxPuts(_T(", ok.")); } +#include "wx/timer.h" +#include "wx/evtloop.h" + +void TestTimer() +{ + wxPuts(_T("*** Testing wxTimer ***\n")); + + class MyTimer : public wxTimer + { + public: + MyTimer() : wxTimer() { m_num = 0; } + + virtual void Notify() + { + wxPrintf(_T("%d"), m_num++); + fflush(stdout); + + if ( m_num == 10 ) + { + wxPrintf(_T("... exiting the event loop")); + Stop(); + + wxEventLoop::GetActive()->Exit(0); + wxPuts(_T(", ok.")); + } + + fflush(stdout); + } + + private: + int m_num; + }; + + wxEventLoop loop; + + wxTimer timer1; + timer1.Start(100, true /* one shot */); + timer1.Stop(); + timer1.Start(100, true /* one shot */); + + MyTimer timer; + timer.Start(500); + + loop.Run(); +} + #endif // TEST_TIMER // ---------------------------------------------------------------------------- @@ -3818,7 +3085,7 @@ static void DumpVObject(size_t level, const wxVCardObject& vcard) if ( !!value ) wxPrintf(_T(" = %s"), value.c_str()); - putchar('\n'); + wxPutchar('\n'); DumpVObject(level + 1, *vcObj); @@ -3965,7 +3232,7 @@ static void TestVCardRead() wxPrintf(_T("Full name from wxVCard API: %s\n"), value.c_str()); - // now show how to deal with multiply occuring properties + // now show how to deal with multiply occurring properties DumpVCardAddresses(vcard); DumpVCardPhoneNumbers(vcard); @@ -3991,7 +3258,7 @@ static void TestVCardWrite() // set some fields vcard.SetName("Zeitlin", "Vadim"); vcard.SetFullName("Vadim Zeitlin"); - vcard.SetOrganization("wxWindows", "R&D"); + vcard.SetOrganization("wxWidgets", "R&D"); // just dump the vCard back wxPuts(_T("Entire vCard follows:\n")); @@ -4064,23 +3331,6 @@ static void TestFSVolume() // wide char and Unicode support // ---------------------------------------------------------------------------- -#ifdef TEST_UNICODE - -static void TestUnicodeToFromAscii() -{ - wxPuts(_T("Testing wxString::To/FromAscii()\n")); - - static const char *msg = "Hello, world!"; - wxString s = wxString::FromAscii(msg); - - wxPrintf(_T("Message in Unicode: %s\n"), s.c_str()); - printf("Message in ASCII: %s\n", (const char *)s.ToAscii()); - - wxPutchar(_T('\n')); -} - -#endif // TEST_UNICODE - #ifdef TEST_WCHAR #include "wx/strconv.h" @@ -4158,14 +3408,14 @@ static void TestUtf8() } } - wxString s(wxConvUTF8.cMB2WC((const char *)u8d.text), *wxConvCurrent); + wxString s(wxConvUTF8.cMB2WC((const char *)u8d.text)); if ( s.empty() ) s = _T("<< conversion failed >>"); wxPrintf(_T("String in current cset: %s\n"), s.c_str()); } - wxPuts(_T("")); + wxPuts(wxEmptyString); } static void TestEncodingConverter() @@ -4188,7 +3438,7 @@ static void TestEncodingConverter() wxPrintf(_T("The same KOI8-R string using wxEC: %s\n"), buf); } - wxPuts(_T("")); + wxPuts(wxEmptyString); } #endif // TEST_WCHAR @@ -4209,14 +3459,19 @@ static void TestZipStreamRead() { wxPuts(_T("*** Testing ZIP reading ***\n")); - static const wxChar *filename = _T("foo"); - wxZipInputStream istr(TESTFILE_ZIP, filename); + static const wxString filename = _T("foo"); + wxFFileInputStream in(TESTFILE_ZIP); + wxZipInputStream istr(in); + wxZipEntry entry(filename); + istr.OpenEntry(entry); + wxPrintf(_T("Archive size: %u\n"), istr.GetSize()); - wxPrintf(_T("Dumping the file '%s':\n"), filename); - while ( !istr.Eof() ) + wxPrintf(_T("Dumping the file '%s':\n"), filename.c_str()); + int c; + while ( (c=istr.GetC()) != wxEOF ) { - putchar(istr.GetC()); + wxPutchar(c); fflush(stdout); } @@ -4278,147 +3533,19 @@ static void TestZipFileSystem() #endif // TEST_ZIP -// ---------------------------------------------------------------------------- -// ZLIB stream -// ---------------------------------------------------------------------------- - -#ifdef TEST_ZLIB - -#include "wx/zstream.h" -#include "wx/wfstream.h" - -static const wxChar *FILENAME_GZ = _T("test.gz"); -static const wxChar *TEST_DATA = _T("hello and hello and hello and hello and hello"); - -static void TestZlibStreamWrite() -{ - wxPuts(_T("*** Testing Zlib stream reading ***\n")); - - wxFileOutputStream fileOutStream(FILENAME_GZ); - wxZlibOutputStream ostr(fileOutStream); - wxPrintf(_T("Compressing the test string... ")); - ostr.Write(TEST_DATA, wxStrlen(TEST_DATA) + 1); - if ( !ostr ) - { - wxPuts(_T("(ERROR: failed)")); - } - else - { - wxPuts(_T("(ok)")); - } - - wxPuts(_T("\n----- done ------")); -} - -static void TestZlibStreamRead() -{ - wxPuts(_T("*** Testing Zlib stream reading ***\n")); - - wxFileInputStream fileInStream(FILENAME_GZ); - wxZlibInputStream istr(fileInStream); - wxPrintf(_T("Archive size: %u\n"), istr.GetSize()); - - wxPuts(_T("Dumping the file:")); - while ( !istr.Eof() ) - { - putchar(istr.GetC()); - fflush(stdout); - } - - wxPuts(_T("\n----- done ------")); -} - -#endif // TEST_ZLIB - // ---------------------------------------------------------------------------- // date time // ---------------------------------------------------------------------------- #ifdef TEST_DATETIME -#include - +#include "wx/math.h" #include "wx/datetime.h" -// the test data -struct Date -{ - wxDateTime::wxDateTime_t day; - wxDateTime::Month month; - int year; - wxDateTime::wxDateTime_t hour, min, sec; - double jdn; - wxDateTime::WeekDay wday; - time_t gmticks, ticks; - - void Init(const wxDateTime::Tm& tm) - { - day = tm.mday; - month = tm.mon; - year = tm.year; - hour = tm.hour; - min = tm.min; - sec = tm.sec; - jdn = 0.0; - gmticks = ticks = -1; - } - - wxDateTime DT() const - { return wxDateTime(day, month, year, hour, min, sec); } - - bool SameDay(const wxDateTime::Tm& tm) const - { - return day == tm.mday && month == tm.mon && year == tm.year; - } - - wxString Format() const - { - wxString s; - s.Printf(_T("%02d:%02d:%02d %10s %02d, %4d%s"), - hour, min, sec, - wxDateTime::GetMonthName(month).c_str(), - day, - abs(wxDateTime::ConvertYearToBC(year)), - year > 0 ? _T("AD") : _T("BC")); - return s; - } - - wxString FormatDate() const - { - wxString s; - s.Printf(_T("%02d-%s-%4d%s"), - day, - wxDateTime::GetMonthName(month, wxDateTime::Name_Abbr).c_str(), - abs(wxDateTime::ConvertYearToBC(year)), - year > 0 ? _T("AD") : _T("BC")); - return s; - } -}; +// this test miscellaneous static wxDateTime functions -static const Date testDates[] = -{ - { 1, wxDateTime::Jan, 1970, 00, 00, 00, 2440587.5, wxDateTime::Thu, 0, -3600 }, - { 7, wxDateTime::Feb, 2036, 00, 00, 00, 2464730.5, wxDateTime::Thu, -1, -1 }, - { 8, wxDateTime::Feb, 2036, 00, 00, 00, 2464731.5, wxDateTime::Fri, -1, -1 }, - { 1, wxDateTime::Jan, 2037, 00, 00, 00, 2465059.5, wxDateTime::Thu, -1, -1 }, - { 1, wxDateTime::Jan, 2038, 00, 00, 00, 2465424.5, wxDateTime::Fri, -1, -1 }, - { 21, wxDateTime::Jan, 2222, 00, 00, 00, 2532648.5, wxDateTime::Mon, -1, -1 }, - { 29, wxDateTime::May, 1976, 12, 00, 00, 2442928.0, wxDateTime::Sat, 202219200, 202212000 }, - { 29, wxDateTime::Feb, 1976, 00, 00, 00, 2442837.5, wxDateTime::Sun, 194400000, 194396400 }, - { 1, wxDateTime::Jan, 1900, 12, 00, 00, 2415021.0, wxDateTime::Mon, -1, -1 }, - { 1, wxDateTime::Jan, 1900, 00, 00, 00, 2415020.5, wxDateTime::Mon, -1, -1 }, - { 15, wxDateTime::Oct, 1582, 00, 00, 00, 2299160.5, wxDateTime::Fri, -1, -1 }, - { 4, wxDateTime::Oct, 1582, 00, 00, 00, 2299149.5, wxDateTime::Mon, -1, -1 }, - { 1, wxDateTime::Mar, 1, 00, 00, 00, 1721484.5, wxDateTime::Thu, -1, -1 }, - { 1, wxDateTime::Jan, 1, 00, 00, 00, 1721425.5, wxDateTime::Mon, -1, -1 }, - { 31, wxDateTime::Dec, 0, 00, 00, 00, 1721424.5, wxDateTime::Sun, -1, -1 }, - { 1, wxDateTime::Jan, 0, 00, 00, 00, 1721059.5, wxDateTime::Sat, -1, -1 }, - { 12, wxDateTime::Aug, -1234, 00, 00, 00, 1270573.5, wxDateTime::Fri, -1, -1 }, - { 12, wxDateTime::Aug, -4000, 00, 00, 00, 260313.5, wxDateTime::Sat, -1, -1 }, - { 24, wxDateTime::Nov, -4713, 00, 00, 00, -0.5, wxDateTime::Mon, -1, -1 }, -}; +#if TEST_ALL -// this test miscellaneous static wxDateTime functions static void TestTimeStatic() { wxPuts(_T("\n*** wxDateTime static methods test ***")); @@ -4435,53 +3562,6 @@ static void TestTimeStatic() wxDateTime::GetMonthName(month, wxDateTime::Name_Abbr).c_str(), wxDateTime::GetMonthName(month).c_str(), wxDateTime::GetNumberOfDays(month)); - - // leap year logic - static const size_t nYears = 5; - static const size_t years[2][nYears] = - { - // first line: the years to test - { 1990, 1976, 2000, 2030, 1984, }, - - // second line: true if leap, false otherwise - { false, true, true, false, true } - }; - - for ( size_t n = 0; n < nYears; n++ ) - { - int year = years[0][n]; - bool should = years[1][n] != 0, - is = wxDateTime::IsLeapYear(year); - - wxPrintf(_T("Year %d is %sa leap year (%s)\n"), - year, - is ? "" : "not ", - should == is ? "ok" : "ERROR"); - - wxASSERT( should == wxDateTime::IsLeapYear(year) ); - } -} - -// test constructing wxDateTime objects -static void TestTimeSet() -{ - wxPuts(_T("\n*** wxDateTime construction test ***")); - - for ( size_t n = 0; n < WXSIZEOF(testDates); n++ ) - { - const Date& d1 = testDates[n]; - wxDateTime dt = d1.DT(); - - Date d2; - d2.Init(dt.GetTm()); - - wxString s1 = d1.Format(), - s2 = d2.Format(); - - wxPrintf(_T("Date: %s == %s (%s)\n"), - s1.c_str(), s2.c_str(), - s1 == s2 ? _T("ok") : _T("ERROR")); - } } // test time zones stuff @@ -4498,6 +3578,8 @@ static void TestTimeZones() wxPrintf(_T(" Moscow:\t%s\n"), now.Format(_T("%c"), wxDateTime::MSK).c_str()); wxPrintf(_T(" New York:\t%s\n"), now.Format(_T("%c"), wxDateTime::EST).c_str()); + wxPrintf(_T("%s\n"), wxDateTime::Now().Format(_T("Our timezone is %Z")).c_str()); + wxDateTime::Tm tm = now.GetTm(); if ( wxDateTime(tm) != now ) { @@ -4525,2059 +3607,611 @@ static void TestTimeRange() wxDateTime(29, wxDateTime::May, 2099).Format(fmt).c_str()); } -static void TestTimeTicks() +// test DST calculations +static void TestTimeDST() { - wxPuts(_T("\n*** wxDateTime ticks test ***")); - - for ( size_t n = 0; n < WXSIZEOF(testDates); n++ ) - { - const Date& d = testDates[n]; - if ( d.ticks == -1 ) - continue; + wxPuts(_T("\n*** wxDateTime DST test ***")); - wxDateTime dt = d.DT(); - long ticks = (dt.GetValue() / 1000).ToLong(); - wxPrintf(_T("Ticks of %s:\t% 10ld"), d.Format().c_str(), ticks); - if ( ticks == d.ticks ) - { - wxPuts(_T(" (ok)")); - } - else - { - wxPrintf(_T(" (ERROR: should be %ld, delta = %ld)\n"), - (long)d.ticks, (long)(ticks - d.ticks)); - } + wxPrintf(_T("DST is%s in effect now.\n\n"), + wxDateTime::Now().IsDST() ? wxEmptyString : _T(" not")); - dt = d.DT().ToTimezone(wxDateTime::GMT0); - ticks = (dt.GetValue() / 1000).ToLong(); - wxPrintf(_T("GMtks of %s:\t% 10ld"), d.Format().c_str(), ticks); - if ( ticks == d.gmticks ) - { - wxPuts(_T(" (ok)")); - } - else - { - wxPrintf(_T(" (ERROR: should be %ld, delta = %ld)\n"), - (long)d.gmticks, (long)(ticks - d.gmticks)); - } + for ( int year = 1990; year < 2005; year++ ) + { + wxPrintf(_T("DST period in Europe for year %d: from %s to %s\n"), + year, + wxDateTime::GetBeginDST(year, wxDateTime::Country_EEC).Format().c_str(), + wxDateTime::GetEndDST(year, wxDateTime::Country_EEC).Format().c_str()); } - - wxPuts(_T("")); } -// test conversions to JDN &c -static void TestTimeJDN() +#endif // TEST_ALL + +#if TEST_INTERACTIVE + +static void TestDateTimeInteractive() { - wxPuts(_T("\n*** wxDateTime to JDN test ***")); + wxPuts(_T("\n*** interactive wxDateTime tests ***")); + + wxChar buf[128]; - for ( size_t n = 0; n < WXSIZEOF(testDates); n++ ) + for ( ;; ) { - const Date& d = testDates[n]; - wxDateTime dt(d.day, d.month, d.year, d.hour, d.min, d.sec); - double jdn = dt.GetJulianDayNumber(); + wxPrintf(_T("Enter a date: ")); + if ( !wxFgets(buf, WXSIZEOF(buf), stdin) ) + break; - wxPrintf(_T("JDN of %s is:\t% 15.6f"), d.Format().c_str(), jdn); - if ( jdn == d.jdn ) + // kill the last '\n' + buf[wxStrlen(buf) - 1] = 0; + + wxDateTime dt; + const wxChar *p = dt.ParseDate(buf); + if ( !p ) { - wxPuts(_T(" (ok)")); + wxPrintf(_T("ERROR: failed to parse the date '%s'.\n"), buf); + + continue; } - else + else if ( *p ) { - wxPrintf(_T(" (ERROR: should be %f, delta = %f)\n"), - d.jdn, jdn - d.jdn); + wxPrintf(_T("WARNING: parsed only first %u characters.\n"), p - buf); } + + wxPrintf(_T("%s: day %u, week of month %u/%u, week of year %u\n"), + dt.Format(_T("%b %d, %Y")).c_str(), + dt.GetDayOfYear(), + dt.GetWeekOfMonth(wxDateTime::Monday_First), + dt.GetWeekOfMonth(wxDateTime::Sunday_First), + dt.GetWeekOfYear(wxDateTime::Monday_First)); } + + wxPuts(_T("\n*** done ***")); } -// test week days computation -static void TestTimeWDays() +#endif // TEST_INTERACTIVE + +#if TEST_ALL + +static void TestTimeMS() { - wxPuts(_T("\n*** wxDateTime weekday test ***")); + wxPuts(_T("*** testing millisecond-resolution support in wxDateTime ***")); - // test GetWeekDay() - size_t n; - for ( n = 0; n < WXSIZEOF(testDates); n++ ) - { - const Date& d = testDates[n]; - wxDateTime dt(d.day, d.month, d.year, d.hour, d.min, d.sec); + wxDateTime dt1 = wxDateTime::Now(), + dt2 = wxDateTime::UNow(); - wxDateTime::WeekDay wday = dt.GetWeekDay(); - wxPrintf(_T("%s is: %s"), - d.Format().c_str(), - wxDateTime::GetWeekDayName(wday).c_str()); - if ( wday == d.wday ) - { - wxPuts(_T(" (ok)")); - } - else + wxPrintf(_T("Now = %s\n"), dt1.Format(_T("%H:%M:%S:%l")).c_str()); + wxPrintf(_T("UNow = %s\n"), dt2.Format(_T("%H:%M:%S:%l")).c_str()); + wxPrintf(_T("Dummy loop: ")); + for ( int i = 0; i < 6000; i++ ) + { + //for ( int j = 0; j < 10; j++ ) { - wxPrintf(_T(" (ERROR: should be %s)\n"), - wxDateTime::GetWeekDayName(d.wday).c_str()); + wxString s; + s.Printf(_T("%g"), sqrt((float)i)); } + + if ( !(i % 100) ) + wxPutchar('.'); } + wxPuts(_T(", done")); - wxPuts(_T("")); + dt1 = dt2; + dt2 = wxDateTime::UNow(); + wxPrintf(_T("UNow = %s\n"), dt2.Format(_T("%H:%M:%S:%l")).c_str()); - // test SetToWeekDay() - struct WeekDateTestData - { - Date date; // the real date (precomputed) - int nWeek; // its week index in the month - wxDateTime::WeekDay wday; // the weekday - wxDateTime::Month month; // the month - int year; // and the year + wxPrintf(_T("Loop executed in %s ms\n"), (dt2 - dt1).Format(_T("%l")).c_str()); - wxString Format() const - { - wxString s, which; - switch ( nWeek < -1 ? -nWeek : nWeek ) - { - case 1: which = _T("first"); break; - case 2: which = _T("second"); break; - case 3: which = _T("third"); break; - case 4: which = _T("fourth"); break; - case 5: which = _T("fifth"); break; + wxPuts(_T("\n*** done ***")); +} - case -1: which = _T("last"); break; - } +static void TestTimeHolidays() +{ + wxPuts(_T("\n*** testing wxDateTimeHolidayAuthority ***\n")); - if ( nWeek < -1 ) - { - which += _T(" from end"); - } + wxDateTime::Tm tm = wxDateTime(29, wxDateTime::May, 2000).GetTm(); + wxDateTime dtStart(1, tm.mon, tm.year), + dtEnd = dtStart.GetLastMonthDay(); - s.Printf(_T("The %s %s of %s in %d"), - which.c_str(), - wxDateTime::GetWeekDayName(wday).c_str(), - wxDateTime::GetMonthName(month).c_str(), - year); - - return s; - } - }; - - // the array data was generated by the following python program - /* -from DateTime import * -from whrandom import * -from string import * - -monthNames = [ 'Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec' ] -wdayNames = [ 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun' ] - -week = DateTimeDelta(7) - -for n in range(20): - year = randint(1900, 2100) - month = randint(1, 12) - day = randint(1, 28) - dt = DateTime(year, month, day) - wday = dt.day_of_week - - countFromEnd = choice([-1, 1]) - weekNum = 0; - - while dt.month is month: - dt = dt - countFromEnd * week - weekNum = weekNum + countFromEnd - - data = { 'day': rjust(`day`, 2), 'month': monthNames[month - 1], 'year': year, 'weekNum': rjust(`weekNum`, 2), 'wday': wdayNames[wday] } - - print "{ { %(day)s, wxDateTime::%(month)s, %(year)d }, %(weekNum)d, "\ - "wxDateTime::%(wday)s, wxDateTime::%(month)s, %(year)d }," % data - */ + wxDateTimeArray hol; + wxDateTimeHolidayAuthority::GetHolidaysInRange(dtStart, dtEnd, hol); - static const WeekDateTestData weekDatesTestData[] = - { - { { 20, wxDateTime::Mar, 2045 }, 3, wxDateTime::Mon, wxDateTime::Mar, 2045 }, - { { 5, wxDateTime::Jun, 1985 }, -4, wxDateTime::Wed, wxDateTime::Jun, 1985 }, - { { 12, wxDateTime::Nov, 1961 }, -3, wxDateTime::Sun, wxDateTime::Nov, 1961 }, - { { 27, wxDateTime::Feb, 2093 }, -1, wxDateTime::Fri, wxDateTime::Feb, 2093 }, - { { 4, wxDateTime::Jul, 2070 }, -4, wxDateTime::Fri, wxDateTime::Jul, 2070 }, - { { 2, wxDateTime::Apr, 1906 }, -5, wxDateTime::Mon, wxDateTime::Apr, 1906 }, - { { 19, wxDateTime::Jul, 2023 }, -2, wxDateTime::Wed, wxDateTime::Jul, 2023 }, - { { 5, wxDateTime::May, 1958 }, -4, wxDateTime::Mon, wxDateTime::May, 1958 }, - { { 11, wxDateTime::Aug, 1900 }, 2, wxDateTime::Sat, wxDateTime::Aug, 1900 }, - { { 14, wxDateTime::Feb, 1945 }, 2, wxDateTime::Wed, wxDateTime::Feb, 1945 }, - { { 25, wxDateTime::Jul, 1967 }, -1, wxDateTime::Tue, wxDateTime::Jul, 1967 }, - { { 9, wxDateTime::May, 1916 }, -4, wxDateTime::Tue, wxDateTime::May, 1916 }, - { { 20, wxDateTime::Jun, 1927 }, 3, wxDateTime::Mon, wxDateTime::Jun, 1927 }, - { { 2, wxDateTime::Aug, 2000 }, 1, wxDateTime::Wed, wxDateTime::Aug, 2000 }, - { { 20, wxDateTime::Apr, 2044 }, 3, wxDateTime::Wed, wxDateTime::Apr, 2044 }, - { { 20, wxDateTime::Feb, 1932 }, -2, wxDateTime::Sat, wxDateTime::Feb, 1932 }, - { { 25, wxDateTime::Jul, 2069 }, 4, wxDateTime::Thu, wxDateTime::Jul, 2069 }, - { { 3, wxDateTime::Apr, 1925 }, 1, wxDateTime::Fri, wxDateTime::Apr, 1925 }, - { { 21, wxDateTime::Mar, 2093 }, 3, wxDateTime::Sat, wxDateTime::Mar, 2093 }, - { { 3, wxDateTime::Dec, 2074 }, -5, wxDateTime::Mon, wxDateTime::Dec, 2074 }, - }; + const wxChar *format = _T("%d-%b-%Y (%a)"); - static const wxChar *fmt = _T("%d-%b-%Y"); + wxPrintf(_T("All holidays between %s and %s:\n"), + dtStart.Format(format).c_str(), dtEnd.Format(format).c_str()); - wxDateTime dt; - for ( n = 0; n < WXSIZEOF(weekDatesTestData); n++ ) + size_t count = hol.GetCount(); + for ( size_t n = 0; n < count; n++ ) { - const WeekDateTestData& wd = weekDatesTestData[n]; - - dt.SetToWeekDay(wd.wday, wd.nWeek, wd.month, wd.year); - - wxPrintf(_T("%s is %s"), wd.Format().c_str(), dt.Format(fmt).c_str()); - - const Date& d = wd.date; - if ( d.SameDay(dt.GetTm()) ) - { - wxPuts(_T(" (ok)")); - } - else - { - dt.Set(d.day, d.month, d.year); - - wxPrintf(_T(" (ERROR: should be %s)\n"), dt.Format(fmt).c_str()); - } + wxPrintf(_T("\t%s\n"), hol[n].Format(format).c_str()); } -} - -// test the computation of (ISO) week numbers -static void TestTimeWNumber() -{ - wxPuts(_T("\n*** wxDateTime week number test ***")); - - struct WeekNumberTestData - { - Date date; // the date - wxDateTime::wxDateTime_t week; // the week number in the year - wxDateTime::wxDateTime_t wmon; // the week number in the month - wxDateTime::wxDateTime_t wmon2; // same but week starts with Sun - wxDateTime::wxDateTime_t dnum; // day number in the year - }; - - // data generated with the following python script: - /* -from DateTime import * -from whrandom import * -from string import * - -monthNames = [ 'Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec' ] -wdayNames = [ 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun' ] - -def GetMonthWeek(dt): - weekNumMonth = dt.iso_week[1] - DateTime(dt.year, dt.month, 1).iso_week[1] + 1 - if weekNumMonth < 0: - weekNumMonth = weekNumMonth + 53 - return weekNumMonth - -def GetLastSundayBefore(dt): - if dt.iso_week[2] == 7: - return dt - else: - return dt - DateTimeDelta(dt.iso_week[2]) - -for n in range(20): - year = randint(1900, 2100) - month = randint(1, 12) - day = randint(1, 28) - dt = DateTime(year, month, day) - dayNum = dt.day_of_year - weekNum = dt.iso_week[1] - weekNumMonth = GetMonthWeek(dt) - - weekNumMonth2 = 0 - dtSunday = GetLastSundayBefore(dt) - - while dtSunday >= GetLastSundayBefore(DateTime(dt.year, dt.month, 1)): - weekNumMonth2 = weekNumMonth2 + 1 - dtSunday = dtSunday - DateTimeDelta(7) - - data = { 'day': rjust(`day`, 2), \ - 'month': monthNames[month - 1], \ - 'year': year, \ - 'weekNum': rjust(`weekNum`, 2), \ - 'weekNumMonth': weekNumMonth, \ - 'weekNumMonth2': weekNumMonth2, \ - 'dayNum': rjust(`dayNum`, 3) } - - print " { { %(day)s, "\ - "wxDateTime::%(month)s, "\ - "%(year)d }, "\ - "%(weekNum)s, "\ - "%(weekNumMonth)s, "\ - "%(weekNumMonth2)s, "\ - "%(dayNum)s }," % data - - */ - static const WeekNumberTestData weekNumberTestDates[] = - { - { { 27, wxDateTime::Dec, 1966 }, 52, 5, 5, 361 }, - { { 22, wxDateTime::Jul, 1926 }, 29, 4, 4, 203 }, - { { 22, wxDateTime::Oct, 2076 }, 43, 4, 4, 296 }, - { { 1, wxDateTime::Jul, 1967 }, 26, 1, 1, 182 }, - { { 8, wxDateTime::Nov, 2004 }, 46, 2, 2, 313 }, - { { 21, wxDateTime::Mar, 1920 }, 12, 3, 4, 81 }, - { { 7, wxDateTime::Jan, 1965 }, 1, 2, 2, 7 }, - { { 19, wxDateTime::Oct, 1999 }, 42, 4, 4, 292 }, - { { 13, wxDateTime::Aug, 1955 }, 32, 2, 2, 225 }, - { { 18, wxDateTime::Jul, 2087 }, 29, 3, 3, 199 }, - { { 2, wxDateTime::Sep, 2028 }, 35, 1, 1, 246 }, - { { 28, wxDateTime::Jul, 1945 }, 30, 5, 4, 209 }, - { { 15, wxDateTime::Jun, 1901 }, 24, 3, 3, 166 }, - { { 10, wxDateTime::Oct, 1939 }, 41, 3, 2, 283 }, - { { 3, wxDateTime::Dec, 1965 }, 48, 1, 1, 337 }, - { { 23, wxDateTime::Feb, 1940 }, 8, 4, 4, 54 }, - { { 2, wxDateTime::Jan, 1987 }, 1, 1, 1, 2 }, - { { 11, wxDateTime::Aug, 2079 }, 32, 2, 2, 223 }, - { { 2, wxDateTime::Feb, 2063 }, 5, 1, 1, 33 }, - { { 16, wxDateTime::Oct, 1942 }, 42, 3, 3, 289 }, - }; - - for ( size_t n = 0; n < WXSIZEOF(weekNumberTestDates); n++ ) - { - const WeekNumberTestData& wn = weekNumberTestDates[n]; - const Date& d = wn.date; - - wxDateTime dt = d.DT(); - - wxDateTime::wxDateTime_t - week = dt.GetWeekOfYear(wxDateTime::Monday_First), - wmon = dt.GetWeekOfMonth(wxDateTime::Monday_First), - wmon2 = dt.GetWeekOfMonth(wxDateTime::Sunday_First), - dnum = dt.GetDayOfYear(); - - wxPrintf(_T("%s: the day number is %d"), d.FormatDate().c_str(), dnum); - if ( dnum == wn.dnum ) - { - wxPrintf(_T(" (ok)")); - } - else - { - wxPrintf(_T(" (ERROR: should be %d)"), wn.dnum); - } - - wxPrintf(_T(", week in month = %d"), wmon); - if ( wmon != wn.wmon ) - { - wxPrintf(_T(" (ERROR: should be %d)"), wn.wmon); - } - - wxPrintf(_T(" or %d"), wmon2); - if ( wmon2 == wn.wmon2 ) - { - wxPrintf(_T(" (ok)")); - } - else - { - wxPrintf(_T(" (ERROR: should be %d)"), wn.wmon2); - } - - wxPrintf(_T(", week in year = %d"), week); - if ( week != wn.week ) - { - wxPrintf(_T(" (ERROR: should be %d)"), wn.week); - } - - wxPutchar(_T('\n')); - wxDateTime dt2(1, wxDateTime::Jan, d.year); - dt2.SetToTheWeek(wn.week, dt.GetWeekDay()); - if ( dt2 != dt ) - { - Date d2; - d2.Init(dt2.GetTm()); - wxPrintf(_T("ERROR: SetToTheWeek() returned %s\n"), - d2.FormatDate().c_str()); - } - } + wxPuts(wxEmptyString); } -// test DST calculations -static void TestTimeDST() +static void TestTimeZoneBug() { - wxPuts(_T("\n*** wxDateTime DST test ***")); - - wxPrintf(_T("DST is%s in effect now.\n\n"), - wxDateTime::Now().IsDST() ? _T("") : _T(" not")); - - // taken from http://www.energy.ca.gov/daylightsaving.html - static const Date datesDST[2][2004 - 1900 + 1] = - { - { - { 1, wxDateTime::Apr, 1990 }, - { 7, wxDateTime::Apr, 1991 }, - { 5, wxDateTime::Apr, 1992 }, - { 4, wxDateTime::Apr, 1993 }, - { 3, wxDateTime::Apr, 1994 }, - { 2, wxDateTime::Apr, 1995 }, - { 7, wxDateTime::Apr, 1996 }, - { 6, wxDateTime::Apr, 1997 }, - { 5, wxDateTime::Apr, 1998 }, - { 4, wxDateTime::Apr, 1999 }, - { 2, wxDateTime::Apr, 2000 }, - { 1, wxDateTime::Apr, 2001 }, - { 7, wxDateTime::Apr, 2002 }, - { 6, wxDateTime::Apr, 2003 }, - { 4, wxDateTime::Apr, 2004 }, - }, - { - { 28, wxDateTime::Oct, 1990 }, - { 27, wxDateTime::Oct, 1991 }, - { 25, wxDateTime::Oct, 1992 }, - { 31, wxDateTime::Oct, 1993 }, - { 30, wxDateTime::Oct, 1994 }, - { 29, wxDateTime::Oct, 1995 }, - { 27, wxDateTime::Oct, 1996 }, - { 26, wxDateTime::Oct, 1997 }, - { 25, wxDateTime::Oct, 1998 }, - { 31, wxDateTime::Oct, 1999 }, - { 29, wxDateTime::Oct, 2000 }, - { 28, wxDateTime::Oct, 2001 }, - { 27, wxDateTime::Oct, 2002 }, - { 26, wxDateTime::Oct, 2003 }, - { 31, wxDateTime::Oct, 2004 }, - } - }; + wxPuts(_T("\n*** testing for DST/timezone bug ***\n")); - int year; - for ( year = 1990; year < 2005; year++ ) + wxDateTime date = wxDateTime(1, wxDateTime::Mar, 2000); + for ( int i = 0; i < 31; i++ ) { - wxDateTime dtBegin = wxDateTime::GetBeginDST(year, wxDateTime::USA), - dtEnd = wxDateTime::GetEndDST(year, wxDateTime::USA); - - wxPrintf(_T("DST period in the US for year %d: from %s to %s"), - year, dtBegin.Format().c_str(), dtEnd.Format().c_str()); - - size_t n = year - 1990; - const Date& dBegin = datesDST[0][n]; - const Date& dEnd = datesDST[1][n]; + wxPrintf(_T("Date %s: week day %s.\n"), + date.Format(_T("%d-%m-%Y")).c_str(), + date.GetWeekDayName(date.GetWeekDay()).c_str()); - if ( dBegin.SameDay(dtBegin.GetTm()) && dEnd.SameDay(dtEnd.GetTm()) ) - { - wxPuts(_T(" (ok)")); - } - else - { - wxPrintf(_T(" (ERROR: should be %s %d to %s %d)\n"), - wxDateTime::GetMonthName(dBegin.month).c_str(), dBegin.day, - wxDateTime::GetMonthName(dEnd.month).c_str(), dEnd.day); - } + date += wxDateSpan::Day(); } - wxPuts(_T("")); - - for ( year = 1990; year < 2005; year++ ) - { - wxPrintf(_T("DST period in Europe for year %d: from %s to %s\n"), - year, - wxDateTime::GetBeginDST(year, wxDateTime::Country_EEC).Format().c_str(), - wxDateTime::GetEndDST(year, wxDateTime::Country_EEC).Format().c_str()); - } + wxPuts(wxEmptyString); } -// test wxDateTime -> text conversion -static void TestTimeFormat() +static void TestTimeSpanFormat() { - wxPuts(_T("\n*** wxDateTime formatting test ***")); - - // some information may be lost during conversion, so store what kind - // of info should we recover after a round trip - enum CompareKind - { - CompareNone, // don't try comparing - CompareBoth, // dates and times should be identical - CompareDate, // dates only - CompareTime // time only - }; - - static const struct - { - CompareKind compareKind; - const wxChar *format; - } formatTestFormats[] = - { - { CompareBoth, _T("---> %c") }, - { CompareDate, _T("Date is %A, %d of %B, in year %Y") }, - { CompareBoth, _T("Date is %x, time is %X") }, - { CompareTime, _T("Time is %H:%M:%S or %I:%M:%S %p") }, - { CompareNone, _T("The day of year: %j, the week of year: %W") }, - { CompareDate, _T("ISO date without separators: %Y%m%d") }, - }; + wxPuts(_T("\n*** wxTimeSpan tests ***")); - static const Date formatTestDates[] = + static const wxChar *formats[] = { - { 29, wxDateTime::May, 1976, 18, 30, 00 }, - { 31, wxDateTime::Dec, 1999, 23, 30, 00 }, -#if 0 - // this test can't work for other centuries because it uses two digit - // years in formats, so don't even try it - { 29, wxDateTime::May, 2076, 18, 30, 00 }, - { 29, wxDateTime::Feb, 2400, 02, 15, 25 }, - { 01, wxDateTime::Jan, -52, 03, 16, 47 }, -#endif + _T("(default) %H:%M:%S"), + _T("%E weeks and %D days"), + _T("%l milliseconds"), + _T("(with ms) %H:%M:%S:%l"), + _T("100%% of minutes is %M"), // test "%%" + _T("%D days and %H hours"), + _T("or also %S seconds"), }; - // an extra test (as it doesn't depend on date, don't do it in the loop) - wxPrintf(_T("%s\n"), wxDateTime::Now().Format(_T("Our timezone is %Z")).c_str()); - - for ( size_t d = 0; d < WXSIZEOF(formatTestDates) + 1; d++ ) + wxTimeSpan ts1(1, 2, 3, 4), + ts2(111, 222, 333); + for ( size_t n = 0; n < WXSIZEOF(formats); n++ ) { - wxPuts(_T("")); + wxPrintf(_T("ts1 = %s\tts2 = %s\n"), + ts1.Format(formats[n]).c_str(), + ts2.Format(formats[n]).c_str()); + } - wxDateTime dt = d == 0 ? wxDateTime::Now() : formatTestDates[d - 1].DT(); - for ( size_t n = 0; n < WXSIZEOF(formatTestFormats); n++ ) - { - wxString s = dt.Format(formatTestFormats[n].format); - wxPrintf(_T("%s"), s.c_str()); + wxPuts(wxEmptyString); +} - // what can we recover? - int kind = formatTestFormats[n].compareKind; +#endif // TEST_ALL - // convert back - wxDateTime dt2; - const wxChar *result = dt2.ParseFormat(s, formatTestFormats[n].format); - if ( !result ) - { - // converion failed - should it have? - if ( kind == CompareNone ) - wxPuts(_T(" (ok)")); - else - wxPuts(_T(" (ERROR: conversion back failed)")); - } - else if ( *result ) - { - // should have parsed the entire string - wxPuts(_T(" (ERROR: conversion back stopped too soon)")); - } - else - { - bool equal = false; // suppress compilaer warning - switch ( kind ) - { - case CompareBoth: - equal = dt2 == dt; - break; +#endif // TEST_DATETIME - case CompareDate: - equal = dt.IsSameDate(dt2); - break; +// ---------------------------------------------------------------------------- +// wxTextInput/OutputStream +// ---------------------------------------------------------------------------- - case CompareTime: - equal = dt.IsSameTime(dt2); - break; - } +#ifdef TEST_TEXTSTREAM - if ( !equal ) - { - wxPrintf(_T(" (ERROR: got back '%s' instead of '%s')\n"), - dt2.Format().c_str(), dt.Format().c_str()); - } - else - { - wxPuts(_T(" (ok)")); - } - } - } - } -} +#include "wx/txtstrm.h" +#include "wx/wfstream.h" -// test text -> wxDateTime conversion -static void TestTimeParse() +static void TestTextInputStream() { - wxPuts(_T("\n*** wxDateTime parse test ***")); - - struct ParseTestData - { - const wxChar *format; - Date date; - bool good; - }; + wxPuts(_T("\n*** wxTextInputStream test ***")); - static const ParseTestData parseTestDates[] = + wxString filename = _T("testdata.fc"); + wxFileInputStream fsIn(filename); + if ( !fsIn.Ok() ) { - { _T("Sat, 18 Dec 1999 00:46:40 +0100"), { 18, wxDateTime::Dec, 1999, 00, 46, 40 }, true }, - { _T("Wed, 1 Dec 1999 05:17:20 +0300"), { 1, wxDateTime::Dec, 1999, 03, 17, 20 }, true }, - }; - - for ( size_t n = 0; n < WXSIZEOF(parseTestDates); n++ ) + wxPuts(_T("ERROR: couldn't open file.")); + } + else { - const wxChar *format = parseTestDates[n].format; - - wxPrintf(_T("%s => "), format); + wxTextInputStream tis(fsIn); - wxDateTime dt; - if ( dt.ParseRfc822Date(format) ) + size_t line = 1; + for ( ;; ) { - wxPrintf(_T("%s "), dt.Format().c_str()); + const wxString s = tis.ReadLine(); - if ( parseTestDates[n].good ) - { - wxDateTime dtReal = parseTestDates[n].date.DT(); - if ( dt == dtReal ) - { - wxPuts(_T("(ok)")); - } - else - { - wxPrintf(_T("(ERROR: should be %s)\n"), dtReal.Format().c_str()); - } - } - else - { - wxPuts(_T("(ERROR: bad format)")); - } - } - else - { - wxPrintf(_T("bad format (%s)\n"), - parseTestDates[n].good ? "ERROR" : "ok"); + // line could be non empty if the last line of the file isn't + // terminated with EOL + if ( fsIn.Eof() && s.empty() ) + break; + + wxPrintf(_T("Line %d: %s\n"), line++, s.c_str()); } } } -static void TestDateTimeInteractive() -{ - wxPuts(_T("\n*** interactive wxDateTime tests ***")); - - wxChar buf[128]; - - for ( ;; ) - { - wxPrintf(_T("Enter a date: ")); - if ( !wxFgets(buf, WXSIZEOF(buf), stdin) ) - break; - - // kill the last '\n' - buf[wxStrlen(buf) - 1] = 0; +#endif // TEST_TEXTSTREAM - wxDateTime dt; - const wxChar *p = dt.ParseDate(buf); - if ( !p ) - { - wxPrintf(_T("ERROR: failed to parse the date '%s'.\n"), buf); +// ---------------------------------------------------------------------------- +// threads +// ---------------------------------------------------------------------------- - continue; - } - else if ( *p ) - { - wxPrintf(_T("WARNING: parsed only first %u characters.\n"), p - buf); - } +#ifdef TEST_THREADS - wxPrintf(_T("%s: day %u, week of month %u/%u, week of year %u\n"), - dt.Format(_T("%b %d, %Y")).c_str(), - dt.GetDayOfYear(), - dt.GetWeekOfMonth(wxDateTime::Monday_First), - dt.GetWeekOfMonth(wxDateTime::Sunday_First), - dt.GetWeekOfYear(wxDateTime::Monday_First)); - } +#include "wx/thread.h" - wxPuts(_T("\n*** done ***")); -} +static size_t gs_counter = (size_t)-1; +static wxCriticalSection gs_critsect; +static wxSemaphore gs_cond; -static void TestTimeMS() +class MyJoinableThread : public wxThread { - wxPuts(_T("*** testing millisecond-resolution support in wxDateTime ***")); - - wxDateTime dt1 = wxDateTime::Now(), - dt2 = wxDateTime::UNow(); +public: + MyJoinableThread(size_t n) : wxThread(wxTHREAD_JOINABLE) + { m_n = n; Create(); } - wxPrintf(_T("Now = %s\n"), dt1.Format(_T("%H:%M:%S:%l")).c_str()); - wxPrintf(_T("UNow = %s\n"), dt2.Format(_T("%H:%M:%S:%l")).c_str()); - wxPrintf(_T("Dummy loop: ")); - for ( int i = 0; i < 6000; i++ ) - { - //for ( int j = 0; j < 10; j++ ) - { - wxString s; - s.Printf(_T("%g"), sqrt(i)); - } - - if ( !(i % 100) ) - putchar('.'); - } - wxPuts(_T(", done")); - - dt1 = dt2; - dt2 = wxDateTime::UNow(); - wxPrintf(_T("UNow = %s\n"), dt2.Format(_T("%H:%M:%S:%l")).c_str()); - - wxPrintf(_T("Loop executed in %s ms\n"), (dt2 - dt1).Format(_T("%l")).c_str()); - - wxPuts(_T("\n*** done ***")); -} - -static void TestTimeArithmetics() -{ - wxPuts(_T("\n*** testing arithmetic operations on wxDateTime ***")); - - static const struct ArithmData - { - ArithmData(const wxDateSpan& sp, const wxChar *nam) - : span(sp), name(nam) { } - - wxDateSpan span; - const wxChar *name; - } testArithmData[] = - { - ArithmData(wxDateSpan::Day(), _T("day")), - ArithmData(wxDateSpan::Week(), _T("week")), - ArithmData(wxDateSpan::Month(), _T("month")), - ArithmData(wxDateSpan::Year(), _T("year")), - ArithmData(wxDateSpan(1, 2, 3, 4), _T("year, 2 months, 3 weeks, 4 days")), - }; - - wxDateTime dt(29, wxDateTime::Dec, 1999), dt1, dt2; - - for ( size_t n = 0; n < WXSIZEOF(testArithmData); n++ ) - { - wxDateSpan span = testArithmData[n].span; - dt1 = dt + span; - dt2 = dt - span; - - const wxChar *name = testArithmData[n].name; - wxPrintf(_T("%s + %s = %s, %s - %s = %s\n"), - dt.FormatISODate().c_str(), name, dt1.FormatISODate().c_str(), - dt.FormatISODate().c_str(), name, dt2.FormatISODate().c_str()); - - wxPrintf(_T("Going back: %s"), (dt1 - span).FormatISODate().c_str()); - if ( dt1 - span == dt ) - { - wxPuts(_T(" (ok)")); - } - else - { - wxPrintf(_T(" (ERROR: should be %s)\n"), dt.FormatISODate().c_str()); - } - - wxPrintf(_T("Going forward: %s"), (dt2 + span).FormatISODate().c_str()); - if ( dt2 + span == dt ) - { - wxPuts(_T(" (ok)")); - } - else - { - wxPrintf(_T(" (ERROR: should be %s)\n"), dt.FormatISODate().c_str()); - } - - wxPrintf(_T("Double increment: %s"), (dt2 + 2*span).FormatISODate().c_str()); - if ( dt2 + 2*span == dt1 ) - { - wxPuts(_T(" (ok)")); - } - else - { - wxPrintf(_T(" (ERROR: should be %s)\n"), dt2.FormatISODate().c_str()); - } - - wxPuts(_T("")); - } -} - -static void TestTimeHolidays() -{ - wxPuts(_T("\n*** testing wxDateTimeHolidayAuthority ***\n")); - - wxDateTime::Tm tm = wxDateTime(29, wxDateTime::May, 2000).GetTm(); - wxDateTime dtStart(1, tm.mon, tm.year), - dtEnd = dtStart.GetLastMonthDay(); - - wxDateTimeArray hol; - wxDateTimeHolidayAuthority::GetHolidaysInRange(dtStart, dtEnd, hol); - - const wxChar *format = _T("%d-%b-%Y (%a)"); - - wxPrintf(_T("All holidays between %s and %s:\n"), - dtStart.Format(format).c_str(), dtEnd.Format(format).c_str()); - - size_t count = hol.GetCount(); - for ( size_t n = 0; n < count; n++ ) - { - wxPrintf(_T("\t%s\n"), hol[n].Format(format).c_str()); - } - - wxPuts(_T("")); -} - -static void TestTimeZoneBug() -{ - wxPuts(_T("\n*** testing for DST/timezone bug ***\n")); - - wxDateTime date = wxDateTime(1, wxDateTime::Mar, 2000); - for ( int i = 0; i < 31; i++ ) - { - wxPrintf(_T("Date %s: week day %s.\n"), - date.Format(_T("%d-%m-%Y")).c_str(), - date.GetWeekDayName(date.GetWeekDay()).c_str()); - - date += wxDateSpan::Day(); - } - - wxPuts(_T("")); -} - -static void TestTimeSpanFormat() -{ - wxPuts(_T("\n*** wxTimeSpan tests ***")); - - static const wxChar *formats[] = - { - _T("(default) %H:%M:%S"), - _T("%E weeks and %D days"), - _T("%l milliseconds"), - _T("(with ms) %H:%M:%S:%l"), - _T("100%% of minutes is %M"), // test "%%" - _T("%D days and %H hours"), - _T("or also %S seconds"), - }; - - wxTimeSpan ts1(1, 2, 3, 4), - ts2(111, 222, 333); - for ( size_t n = 0; n < WXSIZEOF(formats); n++ ) - { - wxPrintf(_T("ts1 = %s\tts2 = %s\n"), - ts1.Format(formats[n]).c_str(), - ts2.Format(formats[n]).c_str()); - } - - wxPuts(_T("")); -} - -#endif // TEST_DATETIME - -// ---------------------------------------------------------------------------- -// wxTextInput/OutputStream -// ---------------------------------------------------------------------------- - -#ifdef TEST_TEXTSTREAM - -#include "wx/txtstrm.h" -#include "wx/wfstream.h" - -static void TestTextInputStream() -{ - wxPuts(_T("\n*** wxTextInputStream test ***")); - - wxFileInputStream fsIn(_T("testdata.fc")); - if ( !fsIn.Ok() ) - { - wxPuts(_T("ERROR: couldn't open file.")); - } - else - { - wxTextInputStream tis(fsIn); - - size_t line = 1; - for ( ;; ) - { - const wxString s = tis.ReadLine(); - - // line could be non empty if the last line of the file isn't - // terminated with EOL - if ( fsIn.Eof() && s.empty() ) - break; - - wxPrintf(_T("Line %d: %s\n"), line++, s.c_str()); - } - } -} - -#endif // TEST_TEXTSTREAM - -// ---------------------------------------------------------------------------- -// threads -// ---------------------------------------------------------------------------- - -#ifdef TEST_THREADS - -#include "wx/thread.h" - -static size_t gs_counter = (size_t)-1; -static wxCriticalSection gs_critsect; -static wxSemaphore gs_cond; - -class MyJoinableThread : public wxThread -{ -public: - MyJoinableThread(size_t n) : wxThread(wxTHREAD_JOINABLE) - { m_n = n; Create(); } - - // thread execution starts here - virtual ExitCode Entry(); - -private: - size_t m_n; -}; - -wxThread::ExitCode MyJoinableThread::Entry() -{ - unsigned long res = 1; - for ( size_t n = 1; n < m_n; n++ ) - { - res *= n; - - // it's a loooong calculation :-) - Sleep(100); - } - - return (ExitCode)res; -} - -class MyDetachedThread : public wxThread -{ -public: - MyDetachedThread(size_t n, wxChar ch) - { - m_n = n; - m_ch = ch; - m_cancelled = false; - - Create(); - } - - // thread execution starts here - virtual ExitCode Entry(); - - // and stops here - virtual void OnExit(); - -private: - size_t m_n; // number of characters to write - wxChar m_ch; // character to write - - bool m_cancelled; // false if we exit normally -}; - -wxThread::ExitCode MyDetachedThread::Entry() -{ - { - wxCriticalSectionLocker lock(gs_critsect); - if ( gs_counter == (size_t)-1 ) - gs_counter = 1; - else - gs_counter++; - } - - for ( size_t n = 0; n < m_n; n++ ) - { - if ( TestDestroy() ) - { - m_cancelled = true; - - break; - } - - putchar(m_ch); - fflush(stdout); - - wxThread::Sleep(100); - } - - return 0; -} - -void MyDetachedThread::OnExit() -{ - wxLogTrace(_T("thread"), _T("Thread %ld is in OnExit"), GetId()); - - wxCriticalSectionLocker lock(gs_critsect); - if ( !--gs_counter && !m_cancelled ) - gs_cond.Post(); -} - -static void TestDetachedThreads() -{ - wxPuts(_T("\n*** Testing detached threads ***")); - - static const size_t nThreads = 3; - MyDetachedThread *threads[nThreads]; - size_t n; - for ( n = 0; n < nThreads; n++ ) - { - threads[n] = new MyDetachedThread(10, 'A' + n); - } - - threads[0]->SetPriority(WXTHREAD_MIN_PRIORITY); - threads[1]->SetPriority(WXTHREAD_MAX_PRIORITY); - - for ( n = 0; n < nThreads; n++ ) - { - threads[n]->Run(); - } - - // wait until all threads terminate - gs_cond.Wait(); - - wxPuts(_T("")); -} - -static void TestJoinableThreads() -{ - wxPuts(_T("\n*** Testing a joinable thread (a loooong calculation...) ***")); - - // calc 10! in the background - MyJoinableThread thread(10); - thread.Run(); - - wxPrintf(_T("\nThread terminated with exit code %lu.\n"), - (unsigned long)thread.Wait()); -} - -static void TestThreadSuspend() -{ - wxPuts(_T("\n*** Testing thread suspend/resume functions ***")); - - MyDetachedThread *thread = new MyDetachedThread(15, 'X'); - - thread->Run(); - - // this is for this demo only, in a real life program we'd use another - // condition variable which would be signaled from wxThread::Entry() to - // tell us that the thread really started running - but here just wait a - // bit and hope that it will be enough (the problem is, of course, that - // the thread might still not run when we call Pause() which will result - // in an error) - wxThread::Sleep(300); - - for ( size_t n = 0; n < 3; n++ ) - { - thread->Pause(); - - wxPuts(_T("\nThread suspended")); - if ( n > 0 ) - { - // don't sleep but resume immediately the first time - wxThread::Sleep(300); - } - wxPuts(_T("Going to resume the thread")); - - thread->Resume(); - } - - wxPuts(_T("Waiting until it terminates now")); - - // wait until the thread terminates - gs_cond.Wait(); - - wxPuts(_T("")); -} - -static void TestThreadDelete() -{ - // As above, using Sleep() is only for testing here - we must use some - // synchronisation object instead to ensure that the thread is still - // running when we delete it - deleting a detached thread which already - // terminated will lead to a crash! - - wxPuts(_T("\n*** Testing thread delete function ***")); - - MyDetachedThread *thread0 = new MyDetachedThread(30, 'W'); - - thread0->Delete(); - - wxPuts(_T("\nDeleted a thread which didn't start to run yet.")); - - MyDetachedThread *thread1 = new MyDetachedThread(30, 'Y'); - - thread1->Run(); - - wxThread::Sleep(300); - - thread1->Delete(); - - wxPuts(_T("\nDeleted a running thread.")); - - MyDetachedThread *thread2 = new MyDetachedThread(30, 'Z'); - - thread2->Run(); - - wxThread::Sleep(300); - - thread2->Pause(); - - thread2->Delete(); - - wxPuts(_T("\nDeleted a sleeping thread.")); - - MyJoinableThread thread3(20); - thread3.Run(); - - thread3.Delete(); - - wxPuts(_T("\nDeleted a joinable thread.")); - - MyJoinableThread thread4(2); - thread4.Run(); - - wxThread::Sleep(300); - - thread4.Delete(); - - wxPuts(_T("\nDeleted a joinable thread which already terminated.")); - - wxPuts(_T("")); -} - -class MyWaitingThread : public wxThread -{ -public: - MyWaitingThread( wxMutex *mutex, wxCondition *condition ) - { - m_mutex = mutex; - m_condition = condition; - - Create(); - } - - virtual ExitCode Entry() - { - wxPrintf(_T("Thread %lu has started running.\n"), GetId()); - fflush(stdout); - - gs_cond.Post(); - - wxPrintf(_T("Thread %lu starts to wait...\n"), GetId()); - fflush(stdout); - - m_mutex->Lock(); - m_condition->Wait(); - m_mutex->Unlock(); - - wxPrintf(_T("Thread %lu finished to wait, exiting.\n"), GetId()); - fflush(stdout); - - return 0; - } - -private: - wxMutex *m_mutex; - wxCondition *m_condition; -}; - -static void TestThreadConditions() -{ - wxMutex mutex; - wxCondition condition(mutex); - - // otherwise its difficult to understand which log messages pertain to - // which condition - //wxLogTrace(_T("thread"), _T("Local condition var is %08x, gs_cond = %08x"), - // condition.GetId(), gs_cond.GetId()); - - // create and launch threads - MyWaitingThread *threads[10]; - - size_t n; - for ( n = 0; n < WXSIZEOF(threads); n++ ) - { - threads[n] = new MyWaitingThread( &mutex, &condition ); - } - - for ( n = 0; n < WXSIZEOF(threads); n++ ) - { - threads[n]->Run(); - } - - // wait until all threads run - wxPuts(_T("Main thread is waiting for the other threads to start")); - fflush(stdout); - - size_t nRunning = 0; - while ( nRunning < WXSIZEOF(threads) ) - { - gs_cond.Wait(); - - nRunning++; - - wxPrintf(_T("Main thread: %u already running\n"), nRunning); - fflush(stdout); - } - - wxPuts(_T("Main thread: all threads started up.")); - fflush(stdout); - - wxThread::Sleep(500); - -#if 1 - // now wake one of them up - wxPrintf(_T("Main thread: about to signal the condition.\n")); - fflush(stdout); - condition.Signal(); -#endif - - wxThread::Sleep(200); - - // wake all the (remaining) threads up, so that they can exit - wxPrintf(_T("Main thread: about to broadcast the condition.\n")); - fflush(stdout); - condition.Broadcast(); - - // give them time to terminate (dirty!) - wxThread::Sleep(500); -} - -#include "wx/utils.h" - -class MyExecThread : public wxThread -{ -public: - MyExecThread(const wxString& command) : wxThread(wxTHREAD_JOINABLE), - m_command(command) - { - Create(); - } - - virtual ExitCode Entry() - { - return (ExitCode)wxExecute(m_command, wxEXEC_SYNC); - } + // thread execution starts here + virtual ExitCode Entry(); private: - wxString m_command; + size_t m_n; }; -static void TestThreadExec() +wxThread::ExitCode MyJoinableThread::Entry() { - wxPuts(_T("*** Testing wxExecute interaction with threads ***\n")); - - MyExecThread thread(_T("true")); - thread.Run(); + unsigned long res = 1; + for ( size_t n = 1; n < m_n; n++ ) + { + res *= n; - wxPrintf(_T("Main program exit code: %ld.\n"), - wxExecute(_T("false"), wxEXEC_SYNC)); + // it's a loooong calculation :-) + Sleep(100); + } - wxPrintf(_T("Thread exit code: %ld.\n"), (long)thread.Wait()); + return (ExitCode)res; } -// semaphore tests -#include "wx/datetime.h" - -class MySemaphoreThread : public wxThread +class MyDetachedThread : public wxThread { public: - MySemaphoreThread(int i, wxSemaphore *sem) - : wxThread(wxTHREAD_JOINABLE), - m_sem(sem), - m_i(i) + MyDetachedThread(size_t n, wxChar ch) { + m_n = n; + m_ch = ch; + m_cancelled = false; + Create(); } - virtual ExitCode Entry() - { - wxPrintf(_T("%s: Thread #%d (%ld) starting to wait for semaphore...\n"), - wxDateTime::Now().FormatTime().c_str(), m_i, (long)GetId()); - - m_sem->Wait(); - - wxPrintf(_T("%s: Thread #%d (%ld) acquired the semaphore.\n"), - wxDateTime::Now().FormatTime().c_str(), m_i, (long)GetId()); - - Sleep(1000); - - wxPrintf(_T("%s: Thread #%d (%ld) releasing the semaphore.\n"), - wxDateTime::Now().FormatTime().c_str(), m_i, (long)GetId()); - - m_sem->Post(); + // thread execution starts here + virtual ExitCode Entry(); - return 0; - } + // and stops here + virtual void OnExit(); private: - wxSemaphore *m_sem; - int m_i; -}; + size_t m_n; // number of characters to write + wxChar m_ch; // character to write -WX_DEFINE_ARRAY(wxThread *, ArrayThreads); + bool m_cancelled; // false if we exit normally +}; -static void TestSemaphore() +wxThread::ExitCode MyDetachedThread::Entry() { - wxPuts(_T("*** Testing wxSemaphore class. ***")); - - static const int SEM_LIMIT = 3; - - wxSemaphore sem(SEM_LIMIT, SEM_LIMIT); - ArrayThreads threads; - - for ( int i = 0; i < 3*SEM_LIMIT; i++ ) { - threads.Add(new MySemaphoreThread(i, &sem)); - threads.Last()->Run(); + wxCriticalSectionLocker lock(gs_critsect); + if ( gs_counter == (size_t)-1 ) + gs_counter = 1; + else + gs_counter++; } - for ( size_t n = 0; n < threads.GetCount(); n++ ) + for ( size_t n = 0; n < m_n; n++ ) { - threads[n]->Wait(); - delete threads[n]; - } -} - -#endif // TEST_THREADS + if ( TestDestroy() ) + { + m_cancelled = true; -// ---------------------------------------------------------------------------- -// arrays -// ---------------------------------------------------------------------------- + break; + } -#ifdef TEST_ARRAYS - -#include "wx/dynarray.h" - -typedef unsigned short ushort; - -#define DefineCompare(name, T) \ - \ -int wxCMPFUNC_CONV name ## CompareValues(T first, T second) \ -{ \ - return first - second; \ -} \ - \ -int wxCMPFUNC_CONV name ## Compare(T* first, T* second) \ -{ \ - return *first - *second; \ -} \ - \ -int wxCMPFUNC_CONV name ## RevCompare(T* first, T* second) \ -{ \ - return *second - *first; \ -} \ - -DefineCompare(UShort, ushort); -DefineCompare(Int, int); - -// test compilation of all macros -WX_DEFINE_ARRAY_SHORT(ushort, wxArrayUShort); -WX_DEFINE_SORTED_ARRAY_SHORT(ushort, wxSortedArrayUShortNoCmp); -WX_DEFINE_SORTED_ARRAY_CMP_SHORT(ushort, UShortCompareValues, wxSortedArrayUShort); -WX_DEFINE_SORTED_ARRAY_CMP_INT(int, IntCompareValues, wxSortedArrayInt); - -WX_DECLARE_OBJARRAY(Bar, ArrayBars); -#include "wx/arrimpl.cpp" -WX_DEFINE_OBJARRAY(ArrayBars); - -static void PrintArray(const wxChar* name, const wxArrayString& array) -{ - wxPrintf(_T("Dump of the array '%s'\n"), name); + wxPutchar(m_ch); + fflush(stdout); - size_t nCount = array.GetCount(); - for ( size_t n = 0; n < nCount; n++ ) - { - wxPrintf(_T("\t%s[%u] = '%s'\n"), name, n, array[n].c_str()); + wxThread::Sleep(100); } -} - -static void PrintArray(const wxChar* name, const wxSortedArrayString& array) -{ - wxPrintf(_T("Dump of the array '%s'\n"), name); - size_t nCount = array.GetCount(); - for ( size_t n = 0; n < nCount; n++ ) - { - wxPrintf(_T("\t%s[%u] = '%s'\n"), name, n, array[n].c_str()); - } + return 0; } -int wxCMPFUNC_CONV StringLenCompare(const wxString& first, - const wxString& second) +void MyDetachedThread::OnExit() { - return first.length() - second.length(); -} + wxLogTrace(_T("thread"), _T("Thread %ld is in OnExit"), GetId()); -#define TestArrayOf(name) \ - \ -static void PrintArray(const wxChar* name, const wxSortedArray##name & array) \ -{ \ - wxPrintf(_T("Dump of the array '%s'\n"), name); \ - \ - size_t nCount = array.GetCount(); \ - for ( size_t n = 0; n < nCount; n++ ) \ - { \ - wxPrintf(_T("\t%s[%u] = %d\n"), name, n, array[n]); \ - } \ -} \ - \ -static void PrintArray(const wxChar* name, const wxArray##name & array) \ -{ \ - wxPrintf(_T("Dump of the array '%s'\n"), name); \ - \ - size_t nCount = array.GetCount(); \ - for ( size_t n = 0; n < nCount; n++ ) \ - { \ - wxPrintf(_T("\t%s[%u] = %d\n"), name, n, array[n]); \ - } \ -} \ - \ -static void TestArrayOf ## name ## s() \ -{ \ - wxPrintf(_T("*** Testing wxArray%s ***\n"), #name); \ - \ - wxArray##name a; \ - a.Add(1); \ - a.Add(17,2); \ - a.Add(5,3); \ - a.Add(3,4); \ - \ - wxPuts(_T("Initially:")); \ - PrintArray(_T("a"), a); \ - \ - wxPuts(_T("After sort:")); \ - a.Sort(name ## Compare); \ - PrintArray(_T("a"), a); \ - \ - wxPuts(_T("After reverse sort:")); \ - a.Sort(name ## RevCompare); \ - PrintArray(_T("a"), a); \ - \ - wxSortedArray##name b; \ - b.Add(1); \ - b.Add(17); \ - b.Add(5); \ - b.Add(3); \ - \ - wxPuts(_T("Sorted array initially:")); \ - PrintArray(_T("b"), b); \ + wxCriticalSectionLocker lock(gs_critsect); + if ( !--gs_counter && !m_cancelled ) + gs_cond.Post(); } -TestArrayOf(UShort); -TestArrayOf(Int); - -static void TestStlArray() +static void TestDetachedThreads() { - wxPuts(_T("*** Testing std::vector operations ***\n")); + wxPuts(_T("\n*** Testing detached threads ***")); + static const size_t nThreads = 3; + MyDetachedThread *threads[nThreads]; + size_t n; + for ( n = 0; n < nThreads; n++ ) { - wxArrayInt list1; - wxArrayInt::iterator it, en; - wxArrayInt::reverse_iterator rit, ren; - int i; - for ( i = 0; i < 5; ++i ) - list1.push_back(i); + threads[n] = new MyDetachedThread(10, 'A' + n); + } - for ( it = list1.begin(), en = list1.end(), i = 0; - it != en; ++it, ++i ) - if ( *it != i ) - wxPuts(_T("Error in iterator\n")); + threads[0]->SetPriority(WXTHREAD_MIN_PRIORITY); + threads[1]->SetPriority(WXTHREAD_MAX_PRIORITY); - for ( rit = list1.rbegin(), ren = list1.rend(), i = 4; - rit != ren; ++rit, --i ) - if ( *rit != i ) - wxPuts(_T("Error in reverse_iterator\n")); + for ( n = 0; n < nThreads; n++ ) + { + threads[n]->Run(); + } - if ( *list1.rbegin() != *(list1.end()-1) || - *list1.begin() != *(list1.rend()-1) ) - wxPuts(_T("Error in iterator/reverse_iterator\n")); + // wait until all threads terminate + gs_cond.Wait(); - it = list1.begin()+1; - rit = list1.rbegin()+1; - if ( *list1.begin() != *(it-1) || - *list1.rbegin() != *(rit-1) ) - wxPuts(_T("Error in iterator/reverse_iterator\n")); + wxPuts(wxEmptyString); +} - if ( list1.front() != 0 || list1.back() != 4 ) - wxPuts(_T("Error in front()/back()\n")); +static void TestJoinableThreads() +{ + wxPuts(_T("\n*** Testing a joinable thread (a loooong calculation...) ***")); - list1.erase(list1.begin()); - list1.erase(list1.end()-1); + // calc 10! in the background + MyJoinableThread thread(10); + thread.Run(); - for ( it = list1.begin(), en = list1.end(), i = 1; - it != en; ++it, ++i ) - if ( *it != i ) - wxPuts(_T("Error in erase()\n")); - } - - wxPuts(_T("*** Testing std::vector operations finished ***\n")); + wxPrintf(_T("\nThread terminated with exit code %lu.\n"), + (unsigned long)thread.Wait()); } -static void TestArrayOfObjects() +static void TestThreadSuspend() { - wxPuts(_T("*** Testing wxObjArray ***\n")); - - { - ArrayBars bars; - Bar bar("second bar (two copies!)"); - - wxPrintf(_T("Initially: %u objects in the array, %u objects total.\n"), - bars.GetCount(), Bar::GetNumber()); + wxPuts(_T("\n*** Testing thread suspend/resume functions ***")); - bars.Add(new Bar("first bar")); - bars.Add(bar,2); + MyDetachedThread *thread = new MyDetachedThread(15, 'X'); - wxPrintf(_T("Now: %u objects in the array, %u objects total.\n"), - bars.GetCount(), Bar::GetNumber()); + thread->Run(); - bars.RemoveAt(1, bars.GetCount() - 1); + // this is for this demo only, in a real life program we'd use another + // condition variable which would be signaled from wxThread::Entry() to + // tell us that the thread really started running - but here just wait a + // bit and hope that it will be enough (the problem is, of course, that + // the thread might still not run when we call Pause() which will result + // in an error) + wxThread::Sleep(300); - wxPrintf(_T("After removing all but first element: %u objects in the ") - _T("array, %u objects total.\n"), - bars.GetCount(), Bar::GetNumber()); + for ( size_t n = 0; n < 3; n++ ) + { + thread->Pause(); - bars.Empty(); + wxPuts(_T("\nThread suspended")); + if ( n > 0 ) + { + // don't sleep but resume immediately the first time + wxThread::Sleep(300); + } + wxPuts(_T("Going to resume the thread")); - wxPrintf(_T("After Empty(): %u objects in the array, %u objects total.\n"), - bars.GetCount(), Bar::GetNumber()); + thread->Resume(); } - wxPrintf(_T("Finally: no more objects in the array, %u objects total.\n"), - Bar::GetNumber()); -} - -#endif // TEST_ARRAYS - -// ---------------------------------------------------------------------------- -// strings -// ---------------------------------------------------------------------------- + wxPuts(_T("Waiting until it terminates now")); -#ifdef TEST_STRINGS + // wait until the thread terminates + gs_cond.Wait(); -#include "wx/timer.h" -#include "wx/tokenzr.h" + wxPuts(wxEmptyString); +} -static void TestStringConstruction() +static void TestThreadDelete() { - wxPuts(_T("*** Testing wxString constructores ***")); - - #define TEST_CTOR(args, res) \ - { \ - wxString s args ; \ - wxPrintf(_T("wxString%s = %s "), #args, s.c_str()); \ - if ( s == res ) \ - { \ - wxPuts(_T("(ok)")); \ - } \ - else \ - { \ - wxPrintf(_T("(ERROR: should be %s)\n"), res); \ - } \ - } + // As above, using Sleep() is only for testing here - we must use some + // synchronisation object instead to ensure that the thread is still + // running when we delete it - deleting a detached thread which already + // terminated will lead to a crash! - TEST_CTOR((_T('Z'), 4), _T("ZZZZ")); - TEST_CTOR((_T("Hello"), 4), _T("Hell")); - TEST_CTOR((_T("Hello"), 5), _T("Hello")); - // TEST_CTOR((_T("Hello"), 6), _T("Hello")); -- should give assert failure + wxPuts(_T("\n*** Testing thread delete function ***")); - static const wxChar *s = _T("?really!"); - const wxChar *start = wxStrchr(s, _T('r')); - const wxChar *end = wxStrchr(s, _T('!')); - TEST_CTOR((start, end), _T("really")); + MyDetachedThread *thread0 = new MyDetachedThread(30, 'W'); - wxPuts(_T("")); -} + thread0->Delete(); -static void TestString() -{ - wxStopWatch sw; + wxPuts(_T("\nDeleted a thread which didn't start to run yet.")); - wxString a, b, c; + MyDetachedThread *thread1 = new MyDetachedThread(30, 'Y'); - a.reserve (128); - b.reserve (128); - c.reserve (128); + thread1->Run(); - for (int i = 0; i < 1000000; ++i) - { - a = _T("Hello"); - b = _T(" world"); - c = _T("! How'ya doin'?"); - a += b; - a += c; - c = _T("Hello world! What's up?"); - if (c != a) - c = _T("Doh!"); - } + wxThread::Sleep(300); - wxPrintf(_T("TestString elapsed time: %ld\n"), sw.Time()); -} + thread1->Delete(); -static void TestPChar() -{ - wxStopWatch sw; + wxPuts(_T("\nDeleted a running thread.")); - wxChar a [128]; - wxChar b [128]; - wxChar c [128]; + MyDetachedThread *thread2 = new MyDetachedThread(30, 'Z'); - for (int i = 0; i < 1000000; ++i) - { - wxStrcpy (a, _T("Hello")); - wxStrcpy (b, _T(" world")); - wxStrcpy (c, _T("! How'ya doin'?")); - wxStrcat (a, b); - wxStrcat (a, c); - wxStrcpy (c, _T("Hello world! What's up?")); - if (wxStrcmp (c, a) == 0) - wxStrcpy (c, _T("Doh!")); - } + thread2->Run(); - wxPrintf(_T("TestPChar elapsed time: %ld\n"), sw.Time()); -} + wxThread::Sleep(300); -static void TestStringSub() -{ - wxString s(_T("Hello, world!")); + thread2->Pause(); - wxPuts(_T("*** Testing wxString substring extraction ***")); + thread2->Delete(); - wxPrintf(_T("String = '%s'\n"), s.c_str()); - wxPrintf(_T("Left(5) = '%s'\n"), s.Left(5).c_str()); - wxPrintf(_T("Right(6) = '%s'\n"), s.Right(6).c_str()); - wxPrintf(_T("Mid(3, 5) = '%s'\n"), s(3, 5).c_str()); - wxPrintf(_T("Mid(3) = '%s'\n"), s.Mid(3).c_str()); - wxPrintf(_T("substr(3, 5) = '%s'\n"), s.substr(3, 5).c_str()); - wxPrintf(_T("substr(3) = '%s'\n"), s.substr(3).c_str()); + wxPuts(_T("\nDeleted a sleeping thread.")); - static const wxChar *prefixes[] = - { - _T("Hello"), - _T("Hello, "), - _T("Hello, world!"), - _T("Hello, world!!!"), - _T(""), - _T("Goodbye"), - _T("Hi"), - }; + MyJoinableThread thread3(20); + thread3.Run(); - for ( size_t n = 0; n < WXSIZEOF(prefixes); n++ ) - { - wxString prefix = prefixes[n], rest; - bool rc = s.StartsWith(prefix, &rest); - wxPrintf(_T("StartsWith('%s') = %s"), prefix.c_str(), rc ? _T("true") : _T("false")); - if ( rc ) - { - wxPrintf(_T(" (the rest is '%s')\n"), rest.c_str()); - } - else - { - putchar('\n'); - } - } + thread3.Delete(); - wxPuts(_T("")); -} + wxPuts(_T("\nDeleted a joinable thread.")); -static void TestStringFormat() -{ - wxPuts(_T("*** Testing wxString formatting ***")); + MyJoinableThread thread4(2); + thread4.Run(); - wxString s; - s.Printf(_T("%03d"), 18); + wxThread::Sleep(300); - wxPrintf(_T("Number 18: %s\n"), wxString::Format(_T("%03d"), 18).c_str()); - wxPrintf(_T("Number 18: %s\n"), s.c_str()); + thread4.Delete(); - wxPuts(_T("")); -} + wxPuts(_T("\nDeleted a joinable thread which already terminated.")); -// returns "not found" for npos, value for all others -static wxString PosToString(size_t res) -{ - wxString s = res == wxString::npos ? wxString(_T("not found")) - : wxString::Format(_T("%u"), res); - return s; + wxPuts(wxEmptyString); } -static void TestStringFind() +class MyWaitingThread : public wxThread { - wxPuts(_T("*** Testing wxString find() functions ***")); - - static const wxChar *strToFind = _T("ell"); - static const struct StringFindTest - { - const wxChar *str; - size_t start, - result; // of searching "ell" in str - } findTestData[] = +public: + MyWaitingThread( wxMutex *mutex, wxCondition *condition ) { - { _T("Well, hello world"), 0, 1 }, - { _T("Well, hello world"), 6, 7 }, - { _T("Well, hello world"), 9, wxString::npos }, - }; + m_mutex = mutex; + m_condition = condition; + + Create(); + } - for ( size_t n = 0; n < WXSIZEOF(findTestData); n++ ) + virtual ExitCode Entry() { - const StringFindTest& ft = findTestData[n]; - size_t res = wxString(ft.str).find(strToFind, ft.start); + wxPrintf(_T("Thread %lu has started running.\n"), GetId()); + fflush(stdout); - wxPrintf(_T("Index of '%s' in '%s' starting from %u is %s "), - strToFind, ft.str, ft.start, PosToString(res).c_str()); + gs_cond.Post(); - size_t resTrue = ft.result; - if ( res == resTrue ) - { - wxPuts(_T("(ok)")); - } - else - { - wxPrintf(_T("(ERROR: should be %s)\n"), - PosToString(resTrue).c_str()); - } + wxPrintf(_T("Thread %lu starts to wait...\n"), GetId()); + fflush(stdout); + + m_mutex->Lock(); + m_condition->Wait(); + m_mutex->Unlock(); + + wxPrintf(_T("Thread %lu finished to wait, exiting.\n"), GetId()); + fflush(stdout); + + return 0; } - wxPuts(_T("")); -} +private: + wxMutex *m_mutex; + wxCondition *m_condition; +}; -static void TestStringTokenizer() +static void TestThreadConditions() { - wxPuts(_T("*** Testing wxStringTokenizer ***")); + wxMutex mutex; + wxCondition condition(mutex); - static const wxChar *modeNames[] = - { - _T("default"), - _T("return empty"), - _T("return all empty"), - _T("with delims"), - _T("like strtok"), - }; + // otherwise its difficult to understand which log messages pertain to + // which condition + //wxLogTrace(_T("thread"), _T("Local condition var is %08x, gs_cond = %08x"), + // condition.GetId(), gs_cond.GetId()); - static const struct StringTokenizerTest - { - const wxChar *str; // string to tokenize - const wxChar *delims; // delimiters to use - size_t count; // count of token - wxStringTokenizerMode mode; // how should we tokenize it - } tokenizerTestData[] = - { - { _T(""), _T(" "), 0 }, - { _T("Hello, world"), _T(" "), 2 }, - { _T("Hello, world "), _T(" "), 2 }, - { _T("Hello, world"), _T(","), 2 }, - { _T("Hello, world!"), _T(",!"), 2 }, - { _T("Hello,, world!"), _T(",!"), 3 }, - { _T("Hello, world!"), _T(",!"), 3, wxTOKEN_RET_EMPTY_ALL }, - { _T("username:password:uid:gid:gecos:home:shell"), _T(":"), 7 }, - { _T("1 \t3\t4 6 "), wxDEFAULT_DELIMITERS, 4 }, - { _T("1 \t3\t4 6 "), wxDEFAULT_DELIMITERS, 6, wxTOKEN_RET_EMPTY }, - { _T("1 \t3\t4 6 "), wxDEFAULT_DELIMITERS, 9, wxTOKEN_RET_EMPTY_ALL }, - { _T("01/02/99"), _T("/-"), 3 }, - { _T("01-02/99"), _T("/-"), 3, wxTOKEN_RET_DELIMS }, - }; + // create and launch threads + MyWaitingThread *threads[10]; - for ( size_t n = 0; n < WXSIZEOF(tokenizerTestData); n++ ) + size_t n; + for ( n = 0; n < WXSIZEOF(threads); n++ ) { - const StringTokenizerTest& tt = tokenizerTestData[n]; - wxStringTokenizer tkz(tt.str, tt.delims, tt.mode); - - size_t count = tkz.CountTokens(); - wxPrintf(_T("String '%s' has %u tokens delimited by '%s' (mode = %s) "), - MakePrintable(tt.str).c_str(), - count, - MakePrintable(tt.delims).c_str(), - modeNames[tkz.GetMode()]); - if ( count == tt.count ) - { - wxPuts(_T("(ok)")); - } - else - { - wxPrintf(_T("(ERROR: should be %u)\n"), tt.count); + threads[n] = new MyWaitingThread( &mutex, &condition ); + } - continue; - } + for ( n = 0; n < WXSIZEOF(threads); n++ ) + { + threads[n]->Run(); + } - // if we emulate strtok(), check that we do it correctly - wxChar *buf, *s = NULL, *last; + // wait until all threads run + wxPuts(_T("Main thread is waiting for the other threads to start")); + fflush(stdout); - if ( tkz.GetMode() == wxTOKEN_STRTOK ) - { - buf = new wxChar[wxStrlen(tt.str) + 1]; - wxStrcpy(buf, tt.str); + size_t nRunning = 0; + while ( nRunning < WXSIZEOF(threads) ) + { + gs_cond.Wait(); - s = wxStrtok(buf, tt.delims, &last); - } - else - { - buf = NULL; - } + nRunning++; - // now show the tokens themselves - size_t count2 = 0; - while ( tkz.HasMoreTokens() ) - { - wxString token = tkz.GetNextToken(); + wxPrintf(_T("Main thread: %u already running\n"), nRunning); + fflush(stdout); + } - wxPrintf(_T("\ttoken %u: '%s'"), - ++count2, - MakePrintable(token).c_str()); + wxPuts(_T("Main thread: all threads started up.")); + fflush(stdout); - if ( buf ) - { - if ( token == s ) - { - wxPuts(_T(" (ok)")); - } - else - { - wxPrintf(_T(" (ERROR: should be %s)\n"), s); - } + wxThread::Sleep(500); - s = wxStrtok(NULL, tt.delims, &last); - } - else - { - // nothing to compare with - wxPuts(_T("")); - } - } +#if 1 + // now wake one of them up + wxPrintf(_T("Main thread: about to signal the condition.\n")); + fflush(stdout); + condition.Signal(); +#endif - if ( count2 != count ) - { - wxPuts(_T("\tERROR: token count mismatch")); - } + wxThread::Sleep(200); - delete [] buf; - } + // wake all the (remaining) threads up, so that they can exit + wxPrintf(_T("Main thread: about to broadcast the condition.\n")); + fflush(stdout); + condition.Broadcast(); - wxPuts(_T("")); + // give them time to terminate (dirty!) + wxThread::Sleep(500); } -static void TestStringReplace() -{ - wxPuts(_T("*** Testing wxString::replace ***")); +// semaphore tests +#include "wx/datetime.h" - static const struct StringReplaceTestData - { - const wxChar *original; // original test string - size_t start, len; // the part to replace - const wxChar *replacement; // the replacement string - const wxChar *result; // and the expected result - } stringReplaceTestData[] = +class MySemaphoreThread : public wxThread +{ +public: + MySemaphoreThread(int i, wxSemaphore *sem) + : wxThread(wxTHREAD_JOINABLE), + m_sem(sem), + m_i(i) { - { _T("012-AWORD-XYZ"), 4, 5, _T("BWORD"), _T("012-BWORD-XYZ") }, - { _T("increase"), 0, 2, _T("de"), _T("decrease") }, - { _T("wxWindow"), 8, 0, _T("s"), _T("wxWindows") }, - { _T("foobar"), 3, 0, _T("-"), _T("foo-bar") }, - { _T("barfoo"), 0, 6, _T("foobar"), _T("foobar") }, - }; + Create(); + } - for ( size_t n = 0; n < WXSIZEOF(stringReplaceTestData); n++ ) + virtual ExitCode Entry() { - const StringReplaceTestData data = stringReplaceTestData[n]; + wxPrintf(_T("%s: Thread #%d (%ld) starting to wait for semaphore...\n"), + wxDateTime::Now().FormatTime().c_str(), m_i, (long)GetId()); - wxString original = data.original; - original.replace(data.start, data.len, data.replacement); + m_sem->Wait(); - wxPrintf(_T("wxString(\"%s\").replace(%u, %u, %s) = %s "), - data.original, data.start, data.len, data.replacement, - original.c_str()); + wxPrintf(_T("%s: Thread #%d (%ld) acquired the semaphore.\n"), + wxDateTime::Now().FormatTime().c_str(), m_i, (long)GetId()); - if ( original == data.result ) - { - wxPuts(_T("(ok)")); - } - else - { - wxPrintf(_T("(ERROR: should be '%s')\n"), data.result); - } - } + Sleep(1000); - wxPuts(_T("")); -} + wxPrintf(_T("%s: Thread #%d (%ld) releasing the semaphore.\n"), + wxDateTime::Now().FormatTime().c_str(), m_i, (long)GetId()); -static void TestStringMatch() -{ - wxPuts(_T("*** Testing wxString::Matches() ***")); - - static const struct StringMatchTestData - { - const wxChar *text; - const wxChar *wildcard; - bool matches; - } stringMatchTestData[] = - { - { _T("foobar"), _T("foo*"), 1 }, - { _T("foobar"), _T("*oo*"), 1 }, - { _T("foobar"), _T("*bar"), 1 }, - { _T("foobar"), _T("??????"), 1 }, - { _T("foobar"), _T("f??b*"), 1 }, - { _T("foobar"), _T("f?b*"), 0 }, - { _T("foobar"), _T("*goo*"), 0 }, - { _T("foobar"), _T("*foo"), 0 }, - { _T("foobarfoo"), _T("*foo"), 1 }, - { _T(""), _T("*"), 1 }, - { _T(""), _T("?"), 0 }, - }; + m_sem->Post(); - for ( size_t n = 0; n < WXSIZEOF(stringMatchTestData); n++ ) - { - const StringMatchTestData& data = stringMatchTestData[n]; - bool matches = wxString(data.text).Matches(data.wildcard); - wxPrintf(_T("'%s' %s '%s' (%s)\n"), - data.wildcard, - matches ? _T("matches") : _T("doesn't match"), - data.text, - matches == data.matches ? _T("ok") : _T("ERROR")); + return 0; } - wxPuts(_T("")); -} +private: + wxSemaphore *m_sem; + int m_i; +}; -// Sigh, I want Test::Simple, Test::More and Test::Harness... -void ok(int line, bool ok, const wxString& msg = wxEmptyString) -{ - if( !ok ) - wxPuts(_T("NOT OK: (") + wxString::Format(_T("%d"), line) + - _T(") ") + msg); -} +WX_DEFINE_ARRAY_PTR(wxThread *, ArrayThreads); -void is(int line, const wxString& got, const wxString& expected, - const wxString& msg = wxEmptyString) +static void TestSemaphore() { - bool isOk = got == expected; - ok(line, isOk, msg); - if( !isOk ) + wxPuts(_T("*** Testing wxSemaphore class. ***")); + + static const int SEM_LIMIT = 3; + + wxSemaphore sem(SEM_LIMIT, SEM_LIMIT); + ArrayThreads threads; + + for ( int i = 0; i < 3*SEM_LIMIT; i++ ) { - wxPuts(_T("Got: ") + got); - wxPuts(_T("Expected: ") + expected); + threads.Add(new MySemaphoreThread(i, &sem)); + threads.Last()->Run(); } -} -void is(int line, const wxChar& got, const wxChar& expected, - const wxString& msg = wxEmptyString) -{ - bool isOk = got == expected; - ok(line, isOk, msg); - if( !isOk ) + for ( size_t n = 0; n < threads.GetCount(); n++ ) { - wxPuts("Got: " + got); - wxPuts("Expected: " + expected); + threads[n]->Wait(); + delete threads[n]; } } -void TestStdString() -{ - wxPuts(_T("*** Testing std::string operations ***\n")); - - // test ctors - wxString s1(_T("abcdefgh")), - s2(_T("abcdefghijklm"), 8), - s3(_T("abcdefghijklm")), - s4(8, _T('a')); - wxString s5(s1), - s6(s3, 0, 8), - s7(s3.begin(), s3.begin() + 8); - wxString s8(s1, 4, 8), s9, s10, s11; - - is( __LINE__, s1, _T("abcdefgh") ); - is( __LINE__, s2, s1 ); - is( __LINE__, s4, _T("aaaaaaaa") ); - is( __LINE__, s5, _T("abcdefgh") ); - is( __LINE__, s6, s1 ); - is( __LINE__, s7, s1 ); - is( __LINE__, s8, _T("efgh") ); - - // test append - s1 = s2 = s3 = s4 = s5 = s6 = s7 = s8 = _T("abc"); - s1.append(_T("def")); - s2.append(_T("defgh"), 3); - s3.append(wxString(_T("abcdef")), 3, 6); - s4.append(s1); - s5.append(3, _T('a')); - s6.append(s1.begin() + 3, s1.end()); - - is( __LINE__, s1, _T("abcdef") ); - is( __LINE__, s2, _T("abcdef") ); - is( __LINE__, s3, _T("abcdef") ); - is( __LINE__, s4, _T("abcabcdef") ); - is( __LINE__, s5, _T("abcaaa") ); - is( __LINE__, s6, _T("abcdef") ); - - // test assign - s1 = s2 = s3 = s4 = s5 = s6 = s7 = s8 = _T("abc"); - s1.assign(_T("def")); - s2.assign(_T("defgh"), 3); - s3.assign(wxString(_T("abcdef")), 3, 6); - s4.assign(s1); - s5.assign(3, _T('a')); - s6.assign(s1.begin() + 1, s1.end()); - - is( __LINE__, s1, _T("def") ); - is( __LINE__, s2, _T("def") ); - is( __LINE__, s3, _T("def") ); - is( __LINE__, s4, _T("def") ); - is( __LINE__, s5, _T("aaa") ); - is( __LINE__, s6, _T("ef") ); - - // test compare - s1 = _T("abcdefgh"); - s2 = _T("abcdefgh"); - s3 = _T("abc"); - s4 = _T("abcdefghi"); - s5 = _T("aaa"); - s6 = _T("zzz"); - s7 = _T("zabcdefg"); - - ok( __LINE__, s1.compare(s2) == 0 ); - ok( __LINE__, s1.compare(s3) > 0 ); - ok( __LINE__, s1.compare(s4) < 0 ); - ok( __LINE__, s1.compare(s5) > 0 ); - ok( __LINE__, s1.compare(s6) < 0 ); - ok( __LINE__, s1.compare(1, 12, s1) > 0); - ok( __LINE__, s1.compare(_T("abcdefgh")) == 0); - ok( __LINE__, s1.compare(1, 7, _T("bcdefgh")) == 0); - ok( __LINE__, s1.compare(1, 7, _T("bcdefgh"), 7) == 0); - - // test erase - s1.erase(1, 1); - s2.erase(4, 12); - wxString::iterator it = s3.erase(s3.begin() + 1); - wxString::iterator it2 = s4.erase(s4.begin() + 4, s4.begin() + 6); - wxString::iterator it3 = s7.erase(s7.begin() + 4, s7.begin() + 8); - - is( __LINE__, s1, _T("acdefgh") ); - is( __LINE__, s2, _T("abcd") ); - is( __LINE__, s3, _T("ac") ); - is( __LINE__, s4, _T("abcdghi") ); - is( __LINE__, s7, _T("zabc") ); - is( __LINE__, *it, _T('c') ); - is( __LINE__, *it2, _T('g') ); - ok( __LINE__, it3 == s7.end() ); - - // test insert - s1 = s2 = s3 = s4 = s5 = s6 = s7 = s8 = _T("aaaa"); - s9 = s10 = _T("cdefg"); - - s1.insert(1, _T("cc") ); - s2.insert(2, _T("cdef"), 3); - s3.insert(2, s10); - s4.insert(2, s10, 3, 7); - s5.insert(1, 2, _T('c')); - it = s6.insert(s6.begin() + 3, _T('X')); - s7.insert(s7.begin(), s9.begin(), s9.end() - 1); - s8.insert(s8.begin(), 2, _T('c')); - - is( __LINE__, s1, _T("accaaa") ); - is( __LINE__, s2, _T("aacdeaa") ); - is( __LINE__, s3, _T("aacdefgaa") ); - is( __LINE__, s4, _T("aafgaa") ); - is( __LINE__, s5, _T("accaaa") ); - is( __LINE__, s6, _T("aaaXa") ); - is( __LINE__, s7, _T("cdefaaaa") ); - is( __LINE__, s8, _T("ccaaaa") ); - - s1 = s2 = s3 = _T("aaaa"); - s1.insert(0, _T("ccc"), 2); - s2.insert(4, _T("ccc"), 2); - - is( __LINE__, s1, _T("ccaaaa") ); - is( __LINE__, s2, _T("aaaacc") ); - - // test replace - s1 = s2 = s3 = s4 = s5 = s6 = s7 = s8 = _T("QWERTYUIOP"); - s9 = s10 = _T("werty"); - - s1.replace(3, 4, _T("rtyu")); - s1.replace(8, 7, _T("opopop")); - s2.replace(10, 12, _T("WWWW")); - s3.replace(1, 5, s9); - s4.replace(1, 4, s9, 0, 4); - s5.replace(1, 2, s9, 1, 12); - s6.replace(0, 123, s9, 0, 123); - s7.replace(2, 7, s9); - - is( __LINE__, s1, _T("QWErtyuIopopop") ); - is( __LINE__, s2, _T("QWERTYUIOPWWWW") ); - is( __LINE__, s3, _T("QwertyUIOP") ); - is( __LINE__, s4, _T("QwertYUIOP") ); - is( __LINE__, s5, _T("QertyRTYUIOP") ); - is( __LINE__, s6, s9); - is( __LINE__, s7, _T("QWwertyP") ); - - wxPuts(_T("*** Testing std::string operations finished ***\n")); -} - -#endif // TEST_STRINGS +#endif // TEST_THREADS // ---------------------------------------------------------------------------- // entry point @@ -6589,12 +4223,30 @@ void TestStdString() int main(int argc, char **argv) { - wxApp::CheckBuildOptions(wxBuildOptions()); +#if wxUSE_UNICODE + wxChar **wxArgv = new wxChar *[argc + 1]; + + { + int n; + + for (n = 0; n < argc; n++ ) + { + wxMB2WXbuf warg = wxConvertMB2WX(argv[n]); + wxArgv[n] = wxStrdup(warg); + } + + wxArgv[n] = NULL; + } +#else // !wxUSE_UNICODE + #define wxArgv argv +#endif // wxUSE_UNICODE/!wxUSE_UNICODE + + wxApp::CheckBuildOptions(WX_BUILD_OPTIONS_SIGNATURE, "program"); wxInitializer initializer; if ( !initializer ) { - fprintf(stderr, "Failed to initialize the wxWindows library, aborting."); + fprintf(stderr, "Failed to initialize the wxWidgets library, aborting."); return -1; } @@ -6620,60 +4272,33 @@ int main(int argc, char **argv) } #endif // TEST_SNGLINST -#ifdef TEST_CHARSET - TestCharset(); -#endif // TEST_CHARSET - #ifdef TEST_CMDLINE TestCmdLineConvert(); #if wxUSE_CMDLINE_PARSER static const wxCmdLineEntryDesc cmdLineDesc[] = { - { wxCMD_LINE_SWITCH, _T("h"), _T("help"), _T("show this help message"), + { wxCMD_LINE_SWITCH, "h", "help", "show this help message", wxCMD_LINE_VAL_NONE, wxCMD_LINE_OPTION_HELP }, - { wxCMD_LINE_SWITCH, _T("v"), _T("verbose"), _T("be verbose") }, - { wxCMD_LINE_SWITCH, _T("q"), _T("quiet"), _T("be quiet") }, + { wxCMD_LINE_SWITCH, "v", "verbose", "be verbose" }, + { wxCMD_LINE_SWITCH, "q", "quiet", "be quiet" }, - { wxCMD_LINE_OPTION, _T("o"), _T("output"), _T("output file") }, - { wxCMD_LINE_OPTION, _T("i"), _T("input"), _T("input dir") }, - { wxCMD_LINE_OPTION, _T("s"), _T("size"), _T("output block size"), + { wxCMD_LINE_OPTION, "o", "output", "output file" }, + { wxCMD_LINE_OPTION, "i", "input", "input dir" }, + { wxCMD_LINE_OPTION, "s", "size", "output block size", wxCMD_LINE_VAL_NUMBER }, - { wxCMD_LINE_OPTION, _T("d"), _T("date"), _T("output file date"), + { wxCMD_LINE_OPTION, "d", "date", "output file date", wxCMD_LINE_VAL_DATE }, + { wxCMD_LINE_OPTION, "f", "double", "output double", + wxCMD_LINE_VAL_DOUBLE }, - { wxCMD_LINE_PARAM, NULL, NULL, _T("input file"), + { wxCMD_LINE_PARAM, NULL, NULL, "input file", wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_MULTIPLE }, { wxCMD_LINE_NONE } }; -#if wxUSE_UNICODE - wxChar **wargv = new wxChar *[argc + 1]; - - { - for ( int n = 0; n < argc; n++ ) - { - wxMB2WXbuf warg = wxConvertMB2WX(argv[n]); - wargv[n] = wxStrdup(warg); - } - - wargv[n] = NULL; - } - - #define argv wargv -#endif // wxUSE_UNICODE - - wxCmdLineParser parser(cmdLineDesc, argc, argv); - -#if wxUSE_UNICODE - { - for ( int n = 0; n < argc; n++ ) - free(wargv[n]); - - delete [] wargv; - } -#endif // wxUSE_UNICODE + wxCmdLineParser parser(cmdLineDesc, argc, wxArgv); parser.AddOption(_T("project_name"), _T(""), _T("full path to project file"), wxCMD_LINE_VAL_STRING, @@ -6697,102 +4322,18 @@ int main(int argc, char **argv) #endif // TEST_CMDLINE -#ifdef TEST_STRINGS - if ( TEST_ALL ) - { - TestPChar(); - TestString(); - TestStringSub(); - TestStringConstruction(); - TestStringFormat(); - TestStringFind(); - TestStringTokenizer(); - TestStringReplace(); - } - else - { - TestStringMatch(); - } - - TestStdString(); -#endif // TEST_STRINGS - -#ifdef TEST_ARRAYS - if ( 1 || TEST_ALL ) - { - wxArrayString a1; - a1.Add(_T("tiger")); - a1.Add(_T("cat")); - a1.Add(_T("lion"), 3); - a1.Add(_T("dog")); - a1.Add(_T("human")); - a1.Add(_T("ape")); - - wxPuts(_T("*** Initially:")); - - PrintArray(_T("a1"), a1); - - wxArrayString a2(a1); - PrintArray(_T("a2"), a2); - -#if !wxUSE_STL - wxSortedArrayString a3(a1); -#else - wxSortedArrayString a3; - for (wxArrayString::iterator it = a1.begin(), en = a1.end(); - it != en; ++it) - a3.Add(*it); -#endif - PrintArray(_T("a3"), a3); - - wxPuts(_T("*** After deleting three strings from a1")); - a1.RemoveAt(2,3); - - PrintArray(_T("a1"), a1); - PrintArray(_T("a2"), a2); - PrintArray(_T("a3"), a3); - -#if !wxUSE_STL - wxPuts(_T("*** After reassigning a1 to a2 and a3")); - a3 = a2 = a1; - PrintArray(_T("a2"), a2); - PrintArray(_T("a3"), a3); -#endif - - wxPuts(_T("*** After sorting a1")); - a1.Sort(wxStringCompareAscending); - PrintArray(_T("a1"), a1); - - wxPuts(_T("*** After sorting a1 in reverse order")); - a1.Sort(wxStringCompareDescending); - PrintArray(_T("a1"), a1); - -#if !wxUSE_STL - wxPuts(_T("*** After sorting a1 by the string length")); - a1.Sort(&StringLenCompare); - PrintArray(_T("a1"), a1); -#endif - - TestArrayOfObjects(); - TestArrayOfUShorts(); - } - - TestArrayOfInts(); - TestStlArray(); -#endif // TEST_ARRAYS - #ifdef TEST_DIR - if ( TEST_ALL ) - { + #if TEST_ALL TestDirExists(); TestDirEnum(); - } + #endif TestDirTraverse(); #endif // TEST_DIR -#ifdef TEST_DLLLOADER +#ifdef TEST_DYNLIB TestDllLoad(); -#endif // TEST_DLLLOADER + TestDllListLoaded(); +#endif // TEST_DYNLIB #ifdef TEST_ENVIRON TestEnvironment(); @@ -6806,11 +4347,6 @@ int main(int argc, char **argv) TestFileConfRead(); #endif // TEST_FILECONF -#ifdef TEST_LIST - TestListCtor(); - TestList(); -#endif // TEST_LIST - #ifdef TEST_LOCALE TestDefaultLang(); #endif // TEST_LOCALE @@ -6840,147 +4376,91 @@ int main(int argc, char **argv) #endif // TEST_LOG #ifdef TEST_FILE - if ( TEST_ALL ) - { - TestFileRead(); - TestTextFileRead(); - TestFileCopy(); - } + TestFileRead(); + TestTextFileRead(); + TestFileCopy(); + TestTempFile(); #endif // TEST_FILE #ifdef TEST_FILENAME - if ( 0 ) - { - wxFileName fn; - fn.Assign(_T("c:\\foo"), _T("bar.baz")); - fn.Assign(_T("/u/os9-port/Viewer/tvision/WEI2HZ-3B3-14_05-04-00MSC1.asc")); - - DumpFileName(fn); - } - - TestFileNameConstruction(); - if ( TEST_ALL ) - { - TestFileNameConstruction(); - TestFileNameMakeRelative(); - TestFileNameMakeAbsolute(); - TestFileNameSplit(); - TestFileNameTemp(); - TestFileNameCwd(); - TestFileNameComparison(); - TestFileNameOperations(); - } + TestFileNameTemp(); + TestFileNameCwd(); + TestFileNameDirManip(); + TestFileNameComparison(); + TestFileNameOperations(); #endif // TEST_FILENAME #ifdef TEST_FILETIME TestFileGetTimes(); - if ( 0 ) + #if 0 TestFileSetTimes(); + #endif #endif // TEST_FILETIME #ifdef TEST_FTP wxLog::AddTraceMask(FTP_TRACE_MASK); + + // wxFTP cannot be a static variable as its ctor needs to access + // wxWidgets internals after it has been initialized + ftp = new wxFTP; + if ( TestFtpConnect() ) { - if ( TEST_ALL ) - { + #if TEST_ALL TestFtpList(); TestFtpDownload(); TestFtpMisc(); TestFtpFileSize(); TestFtpUpload(); - } + #endif // TEST_ALL - if ( TEST_INTERACTIVE ) - TestFtpInteractive(); + #if TEST_INTERACTIVE + //TestFtpInteractive(); + #endif } //else: connecting to the FTP server failed - if ( 0 ) - TestFtpWuFtpd(); + delete ftp; #endif // TEST_FTP -#ifdef TEST_LONGLONG - // seed pseudo random generator - srand((unsigned)time(NULL)); - - if ( 0 ) - { - TestSpeed(); - } - - if ( TEST_ALL ) - { - TestMultiplication(); - TestDivision(); - TestAddition(); - TestLongLongConversion(); - TestBitOperations(); - TestLongLongComparison(); - TestLongLongToString(); - TestLongLongPrintf(); - } -#endif // TEST_LONGLONG - -#ifdef TEST_HASH - TestHash(); -#endif // TEST_HASH - -#ifdef TEST_HASHMAP - TestHashMap(); -#endif // TEST_HASHMAP - #ifdef TEST_MIME - wxLog::AddTraceMask(_T("mime")); - if ( TEST_ALL ) - { - TestMimeEnum(); - TestMimeOverride(); - TestMimeAssociate(); - } + //wxLog::AddTraceMask(_T("mime")); + TestMimeEnum(); +#if 0 + TestMimeOverride(); + TestMimeAssociate(); +#endif TestMimeFilename(); #endif // TEST_MIME #ifdef TEST_INFO_FUNCTIONS - if ( TEST_ALL ) - { - TestOsInfo(); - TestUserInfo(); + TestOsInfo(); + TestPlatformInfo(); + TestUserInfo(); - if ( TEST_INTERACTIVE ) - TestDiskInfo(); - } + #if TEST_INTERACTIVE + TestDiskInfo(); + #endif #endif // TEST_INFO_FUNCTIONS #ifdef TEST_PATHLIST TestPathList(); #endif // TEST_PATHLIST -#ifdef TEST_ODBC - TestDbOpen(); -#endif // TEST_ODBC - #ifdef TEST_PRINTF TestPrintf(); #endif // TEST_PRINTF #ifdef TEST_REGCONF + #if 0 TestRegConfWrite(); + #endif + TestRegConfRead(); #endif // TEST_REGCONF -#ifdef TEST_REGEX - // TODO: write a real test using src/regex/tests file - if ( TEST_ALL ) - { - TestRegExCompile(); - TestRegExMatch(); - TestRegExSubmatch(); - TestRegExReplacement(); - - if ( TEST_INTERACTIVE ) - TestRegExInteractive(); - } -#endif // TEST_REGEX +#if defined TEST_REGEX && TEST_INTERACTIVE + TestRegExInteractive(); +#endif // defined TEST_REGEX && TEST_INTERACTIVE #ifdef TEST_REGISTRY TestRegistryRead(); @@ -6993,10 +4473,9 @@ int main(int argc, char **argv) #endif // TEST_SOCKETS #ifdef TEST_STREAMS - if ( TEST_ALL ) - { + #if TEST_ALL TestFileStream(); - } + #endif TestMemoryStream(); #endif // TEST_STREAMS @@ -7010,54 +4489,55 @@ int main(int argc, char **argv) if ( nCPUs != -1 ) wxThread::SetConcurrency(nCPUs); - TestDetachedThreads(); - if ( TEST_ALL ) - { TestJoinableThreads(); + + #if TEST_ALL + TestJoinableThreads(); + TestDetachedThreads(); TestThreadSuspend(); TestThreadDelete(); TestThreadConditions(); - TestThreadExec(); TestSemaphore(); - } + #endif #endif // TEST_THREADS #ifdef TEST_TIMER TestStopWatch(); + TestTimer(); #endif // TEST_TIMER #ifdef TEST_DATETIME - if ( TEST_ALL ) - { - TestTimeSet(); + #if TEST_ALL TestTimeStatic(); TestTimeRange(); TestTimeZones(); - TestTimeTicks(); - TestTimeJDN(); TestTimeDST(); - TestTimeWDays(); - TestTimeWNumber(); - TestTimeParse(); - TestTimeArithmetics(); TestTimeHolidays(); - TestTimeFormat(); TestTimeSpanFormat(); TestTimeMS(); TestTimeZoneBug(); - } - - TestTimeWNumber(); + #endif - if ( TEST_INTERACTIVE ) + #if TEST_INTERACTIVE TestDateTimeInteractive(); + #endif #endif // TEST_DATETIME #ifdef TEST_SCOPEGUARD TestScopeGuard(); #endif +#ifdef TEST_STACKWALKER +#if wxUSE_STACKWALKER + TestStackWalk(argv[0]); +#endif +#endif // TEST_STACKWALKER + +#ifdef TEST_STDPATHS + TestStandardPaths(); +#endif + #ifdef TEST_USLEEP wxPuts(_T("Sleeping for 3 seconds... z-z-z-z-z...")); wxUsleep(3000); @@ -7072,10 +4552,6 @@ int main(int argc, char **argv) TestFSVolume(); #endif // TEST_VOLUME -#ifdef TEST_UNICODE - TestUnicodeToFromAscii(); -#endif // TEST_UNICODE - #ifdef TEST_WCHAR TestUtf8(); TestEncodingConverter(); @@ -7086,11 +4562,16 @@ int main(int argc, char **argv) TestZipFileSystem(); #endif // TEST_ZIP -#ifdef TEST_ZLIB - TestZlibStreamWrite(); - TestZlibStreamRead(); -#endif // TEST_ZLIB +#if wxUSE_UNICODE + { + for ( int n = 0; n < argc; n++ ) + free(wxArgv[n]); + + delete [] wxArgv; + } +#endif // wxUSE_UNICODE + wxUnusedVar(argc); + wxUnusedVar(argv); return 0; } -