X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ba6ea19e4fb8d0b79772bf4eafb2cf67cd25e089..3b92f0e01438c3e00436b4c9efd314d3db9c54aa:/samples/console/console.cpp diff --git a/samples/console/console.cpp b/samples/console/console.cpp index 0bca4581a5..fd27e29a1b 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) progam using wxWidgets // Author: Vadim Zeitlin // Modified by: // Created: 04.10.99 @@ -19,15 +19,12 @@ #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/app.h" +#include "wx/log.h" // without this pragma, the stupid compiler precompiles #defines below so that // changing them doesn't "take place" later! @@ -41,17 +38,19 @@ /* 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 0 + + +#if TEST_ALL + #define TEST_CMDLINE #define TEST_DATETIME #define TEST_DIR @@ -62,54 +61,52 @@ #define TEST_FILECONF #define TEST_FILENAME #define TEST_FILETIME - #define TEST_FTP - #define TEST_HASH + // #define TEST_FTP --FIXME! (RN) #define TEST_HASHMAP + #define TEST_HASHSET #define TEST_INFO_FUNCTIONS #define TEST_LIST #define TEST_LOCALE #define TEST_LOG - #define TEST_LONGLONG #define TEST_MIME #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_STREAMS - #define TEST_STRINGS + #define TEST_TEXTSTREAM #define TEST_THREADS #define TEST_TIMER // #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_ARRAYS +#else // #if TEST_ALL + + #define TEST_DATETIME - static const bool TEST_ALL = FALSE; #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) +#if defined(TEST_LIST) class Bar // Foo is already taken in the hash test { @@ -120,7 +117,7 @@ public: static size_t GetNumber() { return ms_bars; } - const char *GetName() const { return m_name; } + const wxChar *GetName() const { return m_name; } private: wxString m_name; @@ -130,7 +127,7 @@ private: size_t Bar::ms_bars = 0; -#endif // defined(TEST_ARRAYS) || defined(TEST_LIST) +#endif // defined(TEST_LIST) // ============================================================================ // implementation @@ -140,7 +137,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) @@ -155,46 +152,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 // ---------------------------------------------------------------------------- @@ -208,7 +165,7 @@ static void TestCharset() static void ShowCmdLine(const wxCmdLineParser& parser) { - wxString s = "Input files: "; + wxString s = _T("Input files: "); size_t count = parser.GetParamCount(); for ( size_t param = 0; param < count; param++ ) @@ -217,22 +174,22 @@ static void ShowCmdLine(const wxCmdLineParser& parser) } s << '\n' - << "Verbose:\t" << (parser.Found("v") ? "yes" : "no") << '\n' - << "Quiet:\t" << (parser.Found("q") ? "yes" : "no") << '\n'; + << _T("Verbose:\t") << (parser.Found(_T("v")) ? _T("yes") : _T("no")) << '\n' + << _T("Quiet:\t") << (parser.Found(_T("q")) ? _T("yes") : _T("no")) << '\n'; wxString strVal; long lVal; wxDateTime dt; - if ( parser.Found("o", &strVal) ) - s << "Output file:\t" << strVal << '\n'; - if ( parser.Found("i", &strVal) ) - s << "Input dir:\t" << strVal << '\n'; - if ( parser.Found("s", &lVal) ) - s << "Size:\t" << lVal << '\n'; - if ( parser.Found("d", &dt) ) - s << "Date:\t" << dt.FormatISODate() << '\n'; - if ( parser.Found("project_name", &strVal) ) - s << "Project:\t" << strVal << '\n'; + if ( parser.Found(_T("o"), &strVal) ) + s << _T("Output file:\t") << strVal << '\n'; + if ( parser.Found(_T("i"), &strVal) ) + s << _T("Input dir:\t") << strVal << '\n'; + if ( parser.Found(_T("s"), &lVal) ) + s << _T("Size:\t") << lVal << '\n'; + if ( parser.Found(_T("d"), &dt) ) + s << _T("Date:\t") << dt.FormatISODate() << '\n'; + if ( parser.Found(_T("project_name"), &strVal) ) + s << _T("Project:\t") << strVal << '\n'; wxLogMessage(s); } @@ -241,24 +198,24 @@ static void ShowCmdLine(const wxCmdLineParser& parser) static void TestCmdLineConvert() { - static const char *cmdlines[] = + static const wxChar *cmdlines[] = { - "arg1 arg2", - "-a \"-bstring 1\" -c\"string 2\" \"string 3\"", - "literal \\\" and \"\"", + _T("arg1 arg2"), + _T("-a \"-bstring 1\" -c\"string 2\" \"string 3\""), + _T("literal \\\" and \"\""), }; for ( size_t n = 0; n < WXSIZEOF(cmdlines); n++ ) { - const char *cmdline = cmdlines[n]; - printf("Parsing: %s\n", cmdline); + const wxChar *cmdline = cmdlines[n]; + wxPrintf(_T("Parsing: %s\n"), cmdline); wxArrayString args = wxCmdLineParser::ConvertStringToArgs(cmdline); size_t count = args.GetCount(); - printf("\targc = %u\n", count); + wxPrintf(_T("\targc = %u\n"), count); for ( size_t arg = 0; arg < count; arg++ ) { - printf("\targv[%u] = %s\n", arg, args[arg].c_str()); + wxPrintf(_T("\targv[%u] = %s\n"), arg, args[arg].c_str()); } } } @@ -275,7 +232,7 @@ static void TestCmdLineConvert() #ifdef __UNIX__ static const wxChar *ROOTDIR = _T("/"); - static const wxChar *TESTDIR = _T("/usr"); + static const wxChar *TESTDIR = _T("/usr/local/share"); #elif defined(__WXMSW__) static const wxChar *ROOTDIR = _T("c:\\"); static const wxChar *TESTDIR = _T("d:\\"); @@ -295,61 +252,73 @@ static void TestDirEnumHelper(wxDir& dir, bool cont = dir.GetFirst(&filename, filespec, flags); while ( cont ) { - printf("\t%s\n", filename.c_str()); + wxPrintf(_T("\t%s\n"), filename.c_str()); cont = dir.GetNext(&filename); } - puts(""); + wxPuts(wxEmptyString); } static void TestDirEnum() { - puts("*** Testing wxDir::GetFirst/GetNext ***"); + wxPuts(_T("*** Testing wxDir::GetFirst/GetNext ***")); + + wxString cwd = wxGetCwd(); + if ( !wxDir::Exists(cwd) ) + { + wxPrintf(_T("ERROR: current directory '%s' doesn't exist?\n"), cwd.c_str()); + return; + } - wxDir dir(wxGetCwd()); + wxDir dir(cwd); + if ( !dir.IsOpened() ) + { + wxPrintf(_T("ERROR: failed to open current directory '%s'.\n"), cwd.c_str()); + return; + } - puts("Enumerating everything in current directory:"); + wxPuts(_T("Enumerating everything in current directory:")); TestDirEnumHelper(dir); - puts("Enumerating really everything in current directory:"); + wxPuts(_T("Enumerating really everything in current directory:")); TestDirEnumHelper(dir, wxDIR_DEFAULT | wxDIR_DOTDOT); - puts("Enumerating object files in current directory:"); - TestDirEnumHelper(dir, wxDIR_DEFAULT, "*.o"); + wxPuts(_T("Enumerating object files in current directory:")); + TestDirEnumHelper(dir, wxDIR_DEFAULT, _T("*.o*")); - puts("Enumerating directories in current directory:"); + wxPuts(_T("Enumerating directories in current directory:")); TestDirEnumHelper(dir, wxDIR_DIRS); - puts("Enumerating files in current directory:"); + wxPuts(_T("Enumerating files in current directory:")); TestDirEnumHelper(dir, wxDIR_FILES); - puts("Enumerating files including hidden in current directory:"); + wxPuts(_T("Enumerating files including hidden in current directory:")); TestDirEnumHelper(dir, wxDIR_FILES | wxDIR_HIDDEN); dir.Open(ROOTDIR); - puts("Enumerating everything in root directory:"); + wxPuts(_T("Enumerating everything in root directory:")); TestDirEnumHelper(dir, wxDIR_DEFAULT); - puts("Enumerating directories in root directory:"); + wxPuts(_T("Enumerating directories in root directory:")); TestDirEnumHelper(dir, wxDIR_DIRS); - puts("Enumerating files in root directory:"); + wxPuts(_T("Enumerating files in root directory:")); TestDirEnumHelper(dir, wxDIR_FILES); - puts("Enumerating files including hidden in root directory:"); + wxPuts(_T("Enumerating files including hidden in root directory:")); TestDirEnumHelper(dir, wxDIR_FILES | wxDIR_HIDDEN); - puts("Enumerating files in non existing directory:"); - wxDir dirNo("nosuchdir"); + wxPuts(_T("Enumerating files in non existing directory:")); + wxDir dirNo(_T("nosuchdir")); TestDirEnumHelper(dirNo); } class DirPrintTraverser : public wxDirTraverser { public: - virtual wxDirTraverseResult OnFile(const wxString& filename) + virtual wxDirTraverseResult OnFile(const wxString& WXUNUSED(filename)) { return wxDIR_CONTINUE; } @@ -369,7 +338,7 @@ public: indent += _T(" "); } - printf("%s%s\n", indent.c_str(), name.c_str()); + wxPrintf(_T("%s%s\n"), indent.c_str(), name.c_str()); return wxDIR_CONTINUE; } @@ -377,22 +346,56 @@ public: static void TestDirTraverse() { - puts("*** Testing wxDir::Traverse() ***"); + wxPuts(_T("*** Testing wxDir::Traverse() ***")); // enum all files wxArrayString files; size_t n = wxDir::GetAllFiles(TESTDIR, &files); - printf("There are %u files under '%s'\n", n, TESTDIR); + wxPrintf(_T("There are %u files under '%s'\n"), n, TESTDIR); if ( n > 1 ) { - printf("First one is '%s'\n", files[0u].c_str()); - printf(" last one is '%s'\n", files[n - 1].c_str()); + wxPrintf(_T("First one is '%s'\n"), files[0u].c_str()); + wxPrintf(_T(" last one is '%s'\n"), files[n - 1].c_str()); } // enum again with custom traverser + 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); +} + +static void TestDirExists() +{ + wxPuts(_T("*** Testing wxDir::Exists() ***")); + + static const wxChar *dirnames[] = + { + _T("."), +#if defined(__WXMSW__) + _T("c:"), + _T("c:\\"), + _T("\\\\share\\file"), + _T("c:\\dos"), + _T("c:\\dos\\"), + _T("c:\\dos\\\\"), + _T("c:\\autoexec.bat"), +#elif defined(__UNIX__) + _T("/"), + _T("//"), + _T("/usr/bin"), + _T("/usr//bin"), + _T("/usr///bin"), +#endif + }; + + for ( size_t n = 0; n < WXSIZEOF(dirnames); n++ ) + { + wxPrintf(_T("%-40s: %s\n"), + dirnames[n], + wxDir::Exists(dirnames[n]) ? _T("exists") + : _T("doesn't exist")); + } } #endif // TEST_DIR @@ -418,17 +421,17 @@ static void TestDllLoad() #error "don't know how to test wxDllLoader on this platform" #endif - puts("*** testing wxDllLoader ***\n"); + wxPuts(_T("*** testing wxDllLoader ***\n")); - wxDllType dllHandle = wxDllLoader::LoadLibrary(LIB_NAME); - if ( !dllHandle ) + wxDynamicLibrary lib(LIB_NAME); + if ( !lib.IsLoaded() ) { wxPrintf(_T("ERROR: failed to load '%s'.\n"), LIB_NAME); } else { - typedef int (*strlenType)(const char *); - strlenType pfnStrlen = (strlenType)wxDllLoader::GetSymbol(dllHandle, FUNC_NAME); + typedef int (*wxStrlenType)(const char *); + wxStrlenType pfnStrlen = (wxStrlenType)lib.GetSymbol(FUNC_NAME); if ( !pfnStrlen ) { wxPrintf(_T("ERROR: function '%s' wasn't found in '%s'.\n"), @@ -438,15 +441,13 @@ static void TestDllLoad() { if ( pfnStrlen("foo") != 3 ) { - wxPrintf(_T("ERROR: loaded function is not strlen()!\n")); + wxPrintf(_T("ERROR: loaded function is not wxStrlen()!\n")); } else { - puts("... ok"); + wxPuts(_T("... ok")); } } - - wxDllLoader::UnloadLibrary(dllHandle); } } @@ -475,16 +476,16 @@ static void TestEnvironment() { const wxChar *var = _T("wxTestVar"); - puts("*** testing environment access functions ***"); + wxPuts(_T("*** testing environment access functions ***")); - printf("Initially getenv(%s) = %s\n", var, MyGetEnv(var).c_str()); + wxPrintf(_T("Initially getenv(%s) = %s\n"), var, MyGetEnv(var).c_str()); wxSetEnv(var, _T("value for wxTestVar")); - printf("After wxSetEnv: getenv(%s) = %s\n", var, MyGetEnv(var).c_str()); + wxPrintf(_T("After wxSetEnv: getenv(%s) = %s\n"), var, MyGetEnv(var).c_str()); wxSetEnv(var, _T("another value")); - printf("After 2nd wxSetEnv: getenv(%s) = %s\n", var, MyGetEnv(var).c_str()); + wxPrintf(_T("After 2nd wxSetEnv: getenv(%s) = %s\n"), var, MyGetEnv(var).c_str()); wxUnsetEnv(var); - printf("After wxUnsetEnv: getenv(%s) = %s\n", var, MyGetEnv(var).c_str()); - printf("PATH = %s\n", MyGetEnv(_T("PATH")).c_str()); + wxPrintf(_T("After wxUnsetEnv: getenv(%s) = %s\n"), var, MyGetEnv(var).c_str()); + wxPrintf(_T("PATH = %s\n"), MyGetEnv(_T("PATH")).c_str()); } #endif // TEST_ENVIRON @@ -499,58 +500,58 @@ static void TestEnvironment() static void TestExecute() { - puts("*** testing wxExecute ***"); + wxPuts(_T("*** testing wxExecute ***")); #ifdef __UNIX__ #define COMMAND "cat -n ../../Makefile" // "echo hi" #define SHELL_COMMAND "echo hi from shell" #define REDIRECT_COMMAND COMMAND // "date" #elif defined(__WXMSW__) - #define COMMAND "command.com -c 'echo hi'" + #define COMMAND "command.com /c echo hi" #define SHELL_COMMAND "echo hi" #define REDIRECT_COMMAND COMMAND #else #error "no command to exec" #endif // OS - printf("Testing wxShell: "); + wxPrintf(_T("Testing wxShell: ")); fflush(stdout); - if ( wxShell(SHELL_COMMAND) ) - puts("Ok."); + if ( wxShell(_T(SHELL_COMMAND)) ) + wxPuts(_T("Ok.")); else - puts("ERROR."); + wxPuts(_T("ERROR.")); - printf("Testing wxExecute: "); + wxPrintf(_T("Testing wxExecute: ")); fflush(stdout); - if ( wxExecute(COMMAND, TRUE /* sync */) == 0 ) - puts("Ok."); + if ( wxExecute(_T(COMMAND), true /* sync */) == 0 ) + wxPuts(_T("Ok.")); else - puts("ERROR."); + wxPuts(_T("ERROR.")); #if 0 // no, it doesn't work (yet?) - printf("Testing async wxExecute: "); + wxPrintf(_T("Testing async wxExecute: ")); fflush(stdout); if ( wxExecute(COMMAND) != 0 ) - puts("Ok (command launched)."); + wxPuts(_T("Ok (command launched).")); else - puts("ERROR."); + wxPuts(_T("ERROR.")); #endif // 0 - printf("Testing wxExecute with redirection:\n"); + wxPrintf(_T("Testing wxExecute with redirection:\n")); wxArrayString output; - if ( wxExecute(REDIRECT_COMMAND, output) != 0 ) + if ( wxExecute(_T(REDIRECT_COMMAND), output) != 0 ) { - puts("ERROR."); + wxPuts(_T("ERROR.")); } else { size_t count = output.GetCount(); for ( size_t n = 0; n < count; n++ ) { - printf("\t%s\n", output[n].c_str()); + wxPrintf(_T("\t%s\n"), output[n].c_str()); } - puts("Ok."); + wxPuts(_T("Ok.")); } } @@ -568,23 +569,23 @@ static void TestExecute() static void TestFileRead() { - puts("*** wxFile read test ***"); + wxPuts(_T("*** wxFile read test ***")); wxFile file(_T("testdata.fc")); if ( file.IsOpened() ) { - printf("File length: %lu\n", file.Length()); + wxPrintf(_T("File length: %lu\n"), file.Length()); - puts("File dump:\n----------"); + wxPuts(_T("File dump:\n----------")); static const off_t len = 1024; - char buf[len]; + wxChar buf[len]; for ( ;; ) { off_t nRead = file.Read(buf, len); if ( nRead == wxInvalidOffset ) { - printf("Failed to read the file."); + wxPrintf(_T("Failed to read the file.")); break; } @@ -594,88 +595,88 @@ static void TestFileRead() break; } - puts("----------"); + wxPuts(_T("----------")); } else { - printf("ERROR: can't open test file.\n"); + wxPrintf(_T("ERROR: can't open test file.\n")); } - puts(""); + wxPuts(wxEmptyString); } static void TestTextFileRead() { - puts("*** wxTextFile read test ***"); + wxPuts(_T("*** wxTextFile read test ***")); wxTextFile file(_T("testdata.fc")); if ( file.Open() ) { - printf("Number of lines: %u\n", file.GetLineCount()); - printf("Last line: '%s'\n", file.GetLastLine().c_str()); + wxPrintf(_T("Number of lines: %u\n"), file.GetLineCount()); + wxPrintf(_T("Last line: '%s'\n"), file.GetLastLine().c_str()); wxString s; - puts("\nDumping the entire file:"); + wxPuts(_T("\nDumping the entire file:")); for ( s = file.GetFirstLine(); !file.Eof(); s = file.GetNextLine() ) { - printf("%6u: %s\n", file.GetCurrentLine() + 1, s.c_str()); + wxPrintf(_T("%6u: %s\n"), file.GetCurrentLine() + 1, s.c_str()); } - printf("%6u: %s\n", file.GetCurrentLine() + 1, s.c_str()); + wxPrintf(_T("%6u: %s\n"), file.GetCurrentLine() + 1, s.c_str()); - puts("\nAnd now backwards:"); + wxPuts(_T("\nAnd now backwards:")); for ( s = file.GetLastLine(); file.GetCurrentLine() != 0; s = file.GetPrevLine() ) { - printf("%6u: %s\n", file.GetCurrentLine() + 1, s.c_str()); + wxPrintf(_T("%6u: %s\n"), file.GetCurrentLine() + 1, s.c_str()); } - printf("%6u: %s\n", file.GetCurrentLine() + 1, s.c_str()); + wxPrintf(_T("%6u: %s\n"), file.GetCurrentLine() + 1, s.c_str()); } else { - printf("ERROR: can't open '%s'\n", file.GetName()); + wxPrintf(_T("ERROR: can't open '%s'\n"), file.GetName()); } - puts(""); + wxPuts(wxEmptyString); } static void TestFileCopy() { - puts("*** Testing wxCopyFile ***"); + wxPuts(_T("*** Testing wxCopyFile ***")); static const wxChar *filename1 = _T("testdata.fc"); static const wxChar *filename2 = _T("test2"); if ( !wxCopyFile(filename1, filename2) ) { - puts("ERROR: failed to copy file"); + wxPuts(_T("ERROR: failed to copy file")); } else { - wxFFile f1(filename1, "rb"), - f2(filename2, "rb"); + wxFFile f1(filename1, _T("rb")), + f2(filename2, _T("rb")); if ( !f1.IsOpened() || !f2.IsOpened() ) { - puts("ERROR: failed to open file(s)"); + wxPuts(_T("ERROR: failed to open file(s)")); } else { wxString s1, s2; if ( !f1.ReadAll(&s1) || !f2.ReadAll(&s2) ) { - puts("ERROR: failed to read file(s)"); + wxPuts(_T("ERROR: failed to read file(s)")); } else { if ( (s1.length() != s2.length()) || (memcmp(s1.c_str(), s2.c_str(), s1.length()) != 0) ) { - puts("ERROR: copy error!"); + wxPuts(_T("ERROR: copy error!")); } else { - puts("File was copied ok."); + wxPuts(_T("File was copied ok.")); } } } @@ -683,10 +684,10 @@ static void TestFileCopy() if ( !wxRemoveFile(filename2) ) { - puts("ERROR: failed to remove the file"); + wxPuts(_T("ERROR: failed to remove the file")); } - puts(""); + wxPuts(wxEmptyString); } #endif // TEST_FILE @@ -713,43 +714,49 @@ static const struct FileConfTestData static void TestFileConfRead() { - puts("*** testing wxFileConfig loading/reading ***"); + wxPuts(_T("*** testing wxFileConfig loading/reading ***")); wxFileConfig fileconf(_T("test"), wxEmptyString, _T("testdata.fc"), wxEmptyString, wxCONFIG_USE_RELATIVE_PATH); // test simple reading - puts("\nReading config file:"); + wxPuts(_T("\nReading config file:")); wxString defValue(_T("default")), value; for ( size_t n = 0; n < WXSIZEOF(fcTestData); n++ ) { const FileConfTestData& data = fcTestData[n]; value = fileconf.Read(data.name, defValue); - printf("\t%s = %s ", data.name, value.c_str()); + wxPrintf(_T("\t%s = %s "), data.name, value.c_str()); if ( value == data.value ) { - puts("(ok)"); + wxPuts(_T("(ok)")); } else { - printf("(ERROR: should be %s)\n", data.value); + wxPrintf(_T("(ERROR: should be %s)\n"), data.value); } } // test enumerating the entries - puts("\nEnumerating all root entries:"); + wxPuts(_T("\nEnumerating all root entries:")); long dummy; wxString name; bool cont = fileconf.GetFirstEntry(name, dummy); while ( cont ) { - printf("\t%s = %s\n", + wxPrintf(_T("\t%s = %s\n"), name.c_str(), fileconf.Read(name.c_str(), _T("ERROR")).c_str()); cont = fileconf.GetNextEntry(name, dummy); } + + static const wxChar *testEntry = _T("TestEntry"); + wxPrintf(_T("\nTesting deletion of newly created \"Test\" entry: ")); + fileconf.Write(testEntry, _T("A value")); + fileconf.DeleteEntry(testEntry); + wxPrintf(fileconf.HasEntry(testEntry) ? _T("ERROR\n") : _T("ok\n")); } #endif // TEST_FILECONF @@ -762,8 +769,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; @@ -792,6 +802,7 @@ static void DumpFileName(const wxFileName& fn) wxPrintf(_T("\t%u: %s\n"), n, dirs[n].c_str()); } } +#endif static struct FileNameInfo { @@ -805,43 +816,44 @@ static struct FileNameInfo } 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 }, + { _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("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 }, + { _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 }, + { _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() { - puts("*** testing wxFileName construction ***"); + wxPuts(_T("*** testing wxFileName construction ***")); for ( size_t n = 0; n < WXSIZEOF(filenames); n++ ) { @@ -852,31 +864,31 @@ static void TestFileNameConstruction() wxString fullname = fn.GetFullPath(fni.format); if ( fullname != fni.fullname ) { - printf("ERROR: fullname should be '%s'\n", fni.fullname); + wxPrintf(_T("ERROR: fullname should be '%s'\n"), fni.fullname); } bool isAbsolute = fn.IsAbsolute(fni.format); - printf("'%s' is %s (%s)\n\t", + 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) ) + if ( !fn.Normalize(wxPATH_NORM_ALL, wxEmptyString, fni.format) ) { - puts("ERROR (couldn't be normalized)"); + wxPuts(_T("ERROR (couldn't be normalized)")); } else { - printf("normalized: '%s'\n", fn.GetFullPath(fni.format).c_str()); + wxPrintf(_T("normalized: '%s'\n"), fn.GetFullPath(fni.format).c_str()); } } - puts(""); + wxPuts(wxEmptyString); } static void TestFileNameSplit() { - puts("*** testing wxFileName splitting ***"); + wxPuts(_T("*** testing wxFileName splitting ***")); for ( size_t n = 0; n < WXSIZEOF(filenames); n++ ) { @@ -885,36 +897,36 @@ static void TestFileNameSplit() wxFileName::SplitPath(fni.fullname, &volume, &path, &name, &ext, fni.format); - printf("%s -> volume = '%s', path = '%s', name = '%s', ext = '%s'", + 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 ) - printf(" (ERROR: volume = '%s')", fni.volume); + wxPrintf(_T(" (ERROR: volume = '%s')"), fni.volume); if ( path != fni.path ) - printf(" (ERROR: path = '%s')", fni.path); + wxPrintf(_T(" (ERROR: path = '%s')"), fni.path); if ( name != fni.name ) - printf(" (ERROR: name = '%s')", fni.name); + wxPrintf(_T(" (ERROR: name = '%s')"), fni.name); if ( ext != fni.ext ) - printf(" (ERROR: ext = '%s')", fni.ext); + wxPrintf(_T(" (ERROR: ext = '%s')"), fni.ext); - puts(""); + wxPuts(wxEmptyString); } } static void TestFileNameTemp() { - puts("*** testing wxFileName temp file creation ***"); + wxPuts(_T("*** testing wxFileName temp file creation ***")); - static const char *tmpprefixes[] = + static const wxChar *tmpprefixes[] = { - "", - "foo", - "..", - "../bar", + _T(""), + _T("foo"), + _T(".."), + _T("../bar"), #ifdef __UNIX__ - "/tmp/foo", - "/tmp/foo/bar", // this one must be an error + _T("/tmp/foo"), + _T("/tmp/foo/bar"), // this one must be an error #endif // __UNIX__ }; @@ -924,16 +936,17 @@ static void TestFileNameTemp() if ( path.empty() ) { // "error" is not in upper case because it may be ok - printf("Prefix '%s'\t-> error\n", tmpprefixes[n]); + wxPrintf(_T("Prefix '%s'\t-> error\n"), tmpprefixes[n]); } else { - printf("Prefix '%s'\t-> temp file '%s'\n", + wxPrintf(_T("Prefix '%s'\t-> temp file '%s'\n"), tmpprefixes[n], path.c_str()); if ( !wxRemoveFile(path) ) { - wxLogWarning("Failed to remove temp file '%s'", path.c_str()); + wxLogWarning(_T("Failed to remove temp file '%s'"), + path.c_str()); } } } @@ -941,7 +954,7 @@ static void TestFileNameTemp() static void TestFileNameMakeRelative() { - puts("*** testing wxFileName::MakeRelativeTo() ***"); + wxPuts(_T("*** testing wxFileName::MakeRelativeTo() ***")); for ( size_t n = 0; n < WXSIZEOF(filenames); n++ ) { @@ -954,11 +967,11 @@ static void TestFileNameMakeRelative() switch ( fni.format ) { case wxPATH_UNIX: - base = "/usr/bin/"; + base = _T("/usr/bin/"); break; case wxPATH_DOS: - base = "c:\\"; + base = _T("c:\\"); break; case wxPATH_MAC: @@ -968,23 +981,46 @@ static void TestFileNameMakeRelative() case wxPATH_NATIVE: // make gcc happy default: - wxFAIL_MSG( "unexpected path format" ); + wxFAIL_MSG( _T("unexpected path format") ); } - printf("'%s' relative to '%s': ", + wxPrintf(_T("'%s' relative to '%s': "), fn.GetFullPath(fni.format).c_str(), base.c_str()); if ( !fn.MakeRelativeTo(base, fni.format) ) { - puts("unchanged"); + wxPuts(_T("unchanged")); } else { - printf("'%s'\n", fn.GetFullPath(fni.format).c_str()); + wxPrintf(_T("'%s'\n"), fn.GetFullPath(fni.format).c_str()); } } } +static void TestFileNameMakeAbsolute() +{ + 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(wxEmptyString); +} + +static void TestFileNameDirManip() +{ + // TODO: test AppendDir(), RemoveDir(), ... +} + static void TestFileNameComparison() { // TODO! @@ -1031,6 +1067,7 @@ static void TestFileGetTimes() } } +#if 0 static void TestFileSetTimes() { wxFileName fn(_T("testdata.fc")); @@ -1040,95 +1077,10 @@ static void TestFileSetTimes() wxPrintf(_T("ERROR: Touch() failed.\n")); } } +#endif #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() -{ - puts("*** Testing wxHashTable ***\n"); - - { - wxHashFoos hash; - hash.DeleteContents(TRUE); - - printf("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)); - } - - printf("Hash filled: %u foos in hash, %u foos totally\n", - hash.GetCount(), Foo::count); - - puts("Hash access test:"); - for ( n = 0; n < WXSIZEOF(hashTestData); n++ ) - { - printf("\tGetting element with key %d, value %d: ", - hashTestData[n], n); - Foo *foo = hash.Get(hashTestData[n], n); - if ( !foo ) - { - printf("ERROR, not found.\n"); - } - else - { - printf("%d (%s)\n", foo->n, - (size_t)foo->n == n ? "ok" : "ERROR"); - } - } - - printf("\nTrying to get an element not in hash: "); - - if ( hash.Get(1234) || hash.Get(1, 0) ) - { - puts("ERROR: found!"); - } - else - { - puts("ok (not found)"); - } - } - - printf("Hash destroyed: %u foos left\n", Foo::count); -} - -#endif // TEST_HASH - // ---------------------------------------------------------------------------- // wxHashMap // ---------------------------------------------------------------------------- @@ -1160,7 +1112,7 @@ typedef myStringHashMap::iterator Itor; static void TestHashMap() { - puts("*** Testing wxHashMap ***\n"); + wxPuts(_T("*** Testing wxHashMap ***\n")); myStringHashMap sh(0); // as small as possible wxString buf; size_t i; @@ -1176,7 +1128,7 @@ static void TestHashMap() // test that insertion worked if( sh.size() != count ) { - printf("*** ERROR: %u ELEMENTS, SHOULD BE %u ***\n", sh.size(), count); + wxPrintf(_T("*** ERROR: %u ELEMENTS, SHOULD BE %u ***\n"), sh.size(), count); } for( i = 0; i < count; ++i ) @@ -1184,7 +1136,7 @@ static void TestHashMap() buf.Printf(wxT("%d"), i ); if( sh[buf] != wxT("A") + buf + wxT("C") ) { - printf("*** ERROR INSERTION BROKEN! STOPPING NOW! ***\n"); + wxPrintf(_T("*** ERROR INSERTION BROKEN! STOPPING NOW! ***\n")); return; } } @@ -1195,20 +1147,20 @@ static void TestHashMap() { if( i == count ) { - printf("*** ERROR ITERATORS DO NOT TERMINATE! STOPPING NOW! ***\n"); + wxPrintf(_T("*** ERROR ITERATORS DO NOT TERMINATE! STOPPING NOW! ***\n")); return; } if( it->second != sh[it->first] ) { - printf("*** ERROR ITERATORS BROKEN! STOPPING NOW! ***\n"); + wxPrintf(_T("*** ERROR ITERATORS BROKEN! STOPPING NOW! ***\n")); return; } } if( sh.size() != i ) { - printf("*** ERROR: %u ELEMENTS ITERATED, SHOULD BE %u ***\n", i, count); + wxPrintf(_T("*** ERROR: %u ELEMENTS ITERATED, SHOULD BE %u ***\n"), i, count); } // test copy ctor, assignment operator @@ -1219,12 +1171,12 @@ static void TestHashMap() { if( h1[it->first] != it->second ) { - printf("*** ERROR: COPY CTOR BROKEN %s ***\n", it->first.c_str()); + wxPrintf(_T("*** ERROR: COPY CTOR BROKEN %s ***\n"), it->first.c_str()); } if( h2[it->first] != it->second ) { - printf("*** ERROR: OPERATOR= BROKEN %s ***\n", it->first.c_str()); + wxPrintf(_T("*** ERROR: OPERATOR= BROKEN %s ***\n"), it->first.c_str()); } } @@ -1244,37 +1196,131 @@ static void TestHashMap() if( sh.find( buf ) != sh.end() ) { - printf("*** ERROR: FOUND DELETED ELEMENT %u ***\n", i); + wxPrintf(_T("*** ERROR: FOUND DELETED ELEMENT %u ***\n"), i); } } else - printf("*** ERROR: CANT FIND ELEMENT %u ***\n", i); + wxPrintf(_T("*** ERROR: CANT FIND ELEMENT %u ***\n"), i); } else // test erase(key) { size_t c = sh.erase( buf ); if( c != 1 ) - printf("*** ERROR: SHOULD RETURN 1 ***\n"); + wxPrintf(_T("*** ERROR: SHOULD RETURN 1 ***\n")); if( sh.find( buf ) != sh.end() ) { - printf("*** ERROR: FOUND DELETED ELEMENT %u ***\n", i); + wxPrintf(_T("*** ERROR: FOUND DELETED ELEMENT %u ***\n"), i); } } // count should decrease if( sh.size() != sz - 1 ) { - printf("*** ERROR: COUNT DID NOT DECREASE ***\n"); + wxPrintf(_T("*** ERROR: COUNT DID NOT DECREASE ***\n")); } } - printf("*** Finished testing wxHashMap ***\n"); + wxPrintf(_T("*** Finished testing wxHashMap ***\n")); } #endif // TEST_HASHMAP +// ---------------------------------------------------------------------------- +// wxHashSet +// ---------------------------------------------------------------------------- + +#ifdef TEST_HASHSET + +#include "wx/hashset.h" + +// test compilation of basic map types +WX_DECLARE_HASH_SET( int*, wxPointerHash, wxPointerEqual, myPtrHashSet ); +WX_DECLARE_HASH_SET( long, wxIntegerHash, wxIntegerEqual, myLongHashSet ); +WX_DECLARE_HASH_SET( unsigned long, wxIntegerHash, wxIntegerEqual, + myUnsignedHashSet ); +WX_DECLARE_HASH_SET( unsigned int, wxIntegerHash, wxIntegerEqual, + myTestHashSet1 ); +WX_DECLARE_HASH_SET( int, wxIntegerHash, wxIntegerEqual, + myTestHashSet2 ); +WX_DECLARE_HASH_SET( short, wxIntegerHash, wxIntegerEqual, + myTestHashSet3 ); +WX_DECLARE_HASH_SET( unsigned short, wxIntegerHash, wxIntegerEqual, + myTestHashSet4 ); +WX_DECLARE_HASH_SET( wxString, wxStringHash, wxStringEqual, + myTestHashSet5 ); + +struct MyStruct +{ + int* ptr; + wxString str; +}; + +class MyHash +{ +public: + unsigned long operator()(const MyStruct& s) const + { return m_dummy(s.ptr); } + MyHash& operator=(const MyHash&) { return *this; } +private: + wxPointerHash m_dummy; +}; + +class MyEqual +{ +public: + bool operator()(const MyStruct& s1, const MyStruct& s2) const + { return s1.ptr == s2.ptr; } + MyEqual& operator=(const MyEqual&) { return *this; } +}; + +WX_DECLARE_HASH_SET( MyStruct, MyHash, MyEqual, mySet ); + +typedef myTestHashSet5 wxStringHashSet; + +static void TestHashSet() +{ + wxPrintf(_T("*** Testing wxHashSet ***\n")); + + wxStringHashSet set1; + + set1.insert( _T("abc") ); + set1.insert( _T("bbc") ); + set1.insert( _T("cbc") ); + set1.insert( _T("abc") ); + + if( set1.size() != 3 ) + wxPrintf(_T("*** ERROR IN INSERT ***\n")); + + mySet set2; + int dummy; + MyStruct tmp; + + tmp.ptr = &dummy; tmp.str = _T("ABC"); + set2.insert( tmp ); + tmp.ptr = &dummy + 1; + set2.insert( tmp ); + tmp.ptr = &dummy; tmp.str = _T("CDE"); + set2.insert( tmp ); + + if( set2.size() != 2 ) + wxPrintf(_T("*** ERROR IN INSERT - 2 ***\n")); + + mySet::iterator it = set2.find( tmp ); + + if( it == set2.end() ) + wxPrintf(_T("*** ERROR IN FIND - 1 ***\n")); + if( it->ptr != &dummy ) + wxPrintf(_T("*** ERROR IN FIND - 2 ***\n")); + if( it->str != _T("ABC") ) + wxPrintf(_T("*** ERROR IN INSERT - 3 ***\n")); + + wxPrintf(_T("*** Finished testing wxHashSet ***\n")); +} + +#endif // TEST_HASHSET + // ---------------------------------------------------------------------------- // wxList // ---------------------------------------------------------------------------- @@ -1287,28 +1333,130 @@ 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() { - puts("*** Testing wxList construction ***\n"); + wxPuts(_T("*** Testing wxList construction ***\n")); { wxListBars list1; list1.Append(new Bar(_T("first"))); list1.Append(new Bar(_T("second"))); - printf("After 1st list creation: %u objects in the list, %u objects total.\n", + wxPrintf(_T("After 1st list creation: %u objects in the list, %u objects total.\n"), list1.GetCount(), Bar::GetNumber()); wxListBars list2; list2 = list1; - printf("After 2nd list creation: %u and %u objects in the lists, %u objects total.\n", + wxPrintf(_T("After 2nd list creation: %u and %u objects in the lists, %u objects total.\n"), list1.GetCount(), list2.GetCount(), Bar::GetNumber()); - list1.DeleteContents(TRUE); +#if !wxUSE_STL + list1.DeleteContents(true); +#else + WX_CLEAR_LIST(wxListBars, list1); +#endif } - printf("After list destruction: %u objects left.\n", Bar::GetNumber()); + wxPrintf(_T("After list destruction: %u objects left.\n"), Bar::GetNumber()); } #endif // TEST_LIST @@ -1325,251 +1473,251 @@ static void TestListCtor() static wxLocale gs_localeDefault(wxLANGUAGE_ENGLISH); // find the name of the language from its value -static const char *GetLangName(int lang) -{ - static const char *languageNames[] = - { - "DEFAULT", - "UNKNOWN", - "ABKHAZIAN", - "AFAR", - "AFRIKAANS", - "ALBANIAN", - "AMHARIC", - "ARABIC", - "ARABIC_ALGERIA", - "ARABIC_BAHRAIN", - "ARABIC_EGYPT", - "ARABIC_IRAQ", - "ARABIC_JORDAN", - "ARABIC_KUWAIT", - "ARABIC_LEBANON", - "ARABIC_LIBYA", - "ARABIC_MOROCCO", - "ARABIC_OMAN", - "ARABIC_QATAR", - "ARABIC_SAUDI_ARABIA", - "ARABIC_SUDAN", - "ARABIC_SYRIA", - "ARABIC_TUNISIA", - "ARABIC_UAE", - "ARABIC_YEMEN", - "ARMENIAN", - "ASSAMESE", - "AYMARA", - "AZERI", - "AZERI_CYRILLIC", - "AZERI_LATIN", - "BASHKIR", - "BASQUE", - "BELARUSIAN", - "BENGALI", - "BHUTANI", - "BIHARI", - "BISLAMA", - "BRETON", - "BULGARIAN", - "BURMESE", - "CAMBODIAN", - "CATALAN", - "CHINESE", - "CHINESE_SIMPLIFIED", - "CHINESE_TRADITIONAL", - "CHINESE_HONGKONG", - "CHINESE_MACAU", - "CHINESE_SINGAPORE", - "CHINESE_TAIWAN", - "CORSICAN", - "CROATIAN", - "CZECH", - "DANISH", - "DUTCH", - "DUTCH_BELGIAN", - "ENGLISH", - "ENGLISH_UK", - "ENGLISH_US", - "ENGLISH_AUSTRALIA", - "ENGLISH_BELIZE", - "ENGLISH_BOTSWANA", - "ENGLISH_CANADA", - "ENGLISH_CARIBBEAN", - "ENGLISH_DENMARK", - "ENGLISH_EIRE", - "ENGLISH_JAMAICA", - "ENGLISH_NEW_ZEALAND", - "ENGLISH_PHILIPPINES", - "ENGLISH_SOUTH_AFRICA", - "ENGLISH_TRINIDAD", - "ENGLISH_ZIMBABWE", - "ESPERANTO", - "ESTONIAN", - "FAEROESE", - "FARSI", - "FIJI", - "FINNISH", - "FRENCH", - "FRENCH_BELGIAN", - "FRENCH_CANADIAN", - "FRENCH_LUXEMBOURG", - "FRENCH_MONACO", - "FRENCH_SWISS", - "FRISIAN", - "GALICIAN", - "GEORGIAN", - "GERMAN", - "GERMAN_AUSTRIAN", - "GERMAN_BELGIUM", - "GERMAN_LIECHTENSTEIN", - "GERMAN_LUXEMBOURG", - "GERMAN_SWISS", - "GREEK", - "GREENLANDIC", - "GUARANI", - "GUJARATI", - "HAUSA", - "HEBREW", - "HINDI", - "HUNGARIAN", - "ICELANDIC", - "INDONESIAN", - "INTERLINGUA", - "INTERLINGUE", - "INUKTITUT", - "INUPIAK", - "IRISH", - "ITALIAN", - "ITALIAN_SWISS", - "JAPANESE", - "JAVANESE", - "KANNADA", - "KASHMIRI", - "KASHMIRI_INDIA", - "KAZAKH", - "KERNEWEK", - "KINYARWANDA", - "KIRGHIZ", - "KIRUNDI", - "KONKANI", - "KOREAN", - "KURDISH", - "LAOTHIAN", - "LATIN", - "LATVIAN", - "LINGALA", - "LITHUANIAN", - "MACEDONIAN", - "MALAGASY", - "MALAY", - "MALAYALAM", - "MALAY_BRUNEI_DARUSSALAM", - "MALAY_MALAYSIA", - "MALTESE", - "MANIPURI", - "MAORI", - "MARATHI", - "MOLDAVIAN", - "MONGOLIAN", - "NAURU", - "NEPALI", - "NEPALI_INDIA", - "NORWEGIAN_BOKMAL", - "NORWEGIAN_NYNORSK", - "OCCITAN", - "ORIYA", - "OROMO", - "PASHTO", - "POLISH", - "PORTUGUESE", - "PORTUGUESE_BRAZILIAN", - "PUNJABI", - "QUECHUA", - "RHAETO_ROMANCE", - "ROMANIAN", - "RUSSIAN", - "RUSSIAN_UKRAINE", - "SAMOAN", - "SANGHO", - "SANSKRIT", - "SCOTS_GAELIC", - "SERBIAN", - "SERBIAN_CYRILLIC", - "SERBIAN_LATIN", - "SERBO_CROATIAN", - "SESOTHO", - "SETSWANA", - "SHONA", - "SINDHI", - "SINHALESE", - "SISWATI", - "SLOVAK", - "SLOVENIAN", - "SOMALI", - "SPANISH", - "SPANISH_ARGENTINA", - "SPANISH_BOLIVIA", - "SPANISH_CHILE", - "SPANISH_COLOMBIA", - "SPANISH_COSTA_RICA", - "SPANISH_DOMINICAN_REPUBLIC", - "SPANISH_ECUADOR", - "SPANISH_EL_SALVADOR", - "SPANISH_GUATEMALA", - "SPANISH_HONDURAS", - "SPANISH_MEXICAN", - "SPANISH_MODERN", - "SPANISH_NICARAGUA", - "SPANISH_PANAMA", - "SPANISH_PARAGUAY", - "SPANISH_PERU", - "SPANISH_PUERTO_RICO", - "SPANISH_URUGUAY", - "SPANISH_US", - "SPANISH_VENEZUELA", - "SUNDANESE", - "SWAHILI", - "SWEDISH", - "SWEDISH_FINLAND", - "TAGALOG", - "TAJIK", - "TAMIL", - "TATAR", - "TELUGU", - "THAI", - "TIBETAN", - "TIGRINYA", - "TONGA", - "TSONGA", - "TURKISH", - "TURKMEN", - "TWI", - "UIGHUR", - "UKRAINIAN", - "URDU", - "URDU_INDIA", - "URDU_PAKISTAN", - "UZBEK", - "UZBEK_CYRILLIC", - "UZBEK_LATIN", - "VIETNAMESE", - "VOLAPUK", - "WELSH", - "WOLOF", - "XHOSA", - "YIDDISH", - "YORUBA", - "ZHUANG", - "ZULU", +static const wxChar *GetLangName(int lang) +{ + static const wxChar *languageNames[] = + { + _T("DEFAULT"), + _T("UNKNOWN"), + _T("ABKHAZIAN"), + _T("AFAR"), + _T("AFRIKAANS"), + _T("ALBANIAN"), + _T("AMHARIC"), + _T("ARABIC"), + _T("ARABIC_ALGERIA"), + _T("ARABIC_BAHRAIN"), + _T("ARABIC_EGYPT"), + _T("ARABIC_IRAQ"), + _T("ARABIC_JORDAN"), + _T("ARABIC_KUWAIT"), + _T("ARABIC_LEBANON"), + _T("ARABIC_LIBYA"), + _T("ARABIC_MOROCCO"), + _T("ARABIC_OMAN"), + _T("ARABIC_QATAR"), + _T("ARABIC_SAUDI_ARABIA"), + _T("ARABIC_SUDAN"), + _T("ARABIC_SYRIA"), + _T("ARABIC_TUNISIA"), + _T("ARABIC_UAE"), + _T("ARABIC_YEMEN"), + _T("ARMENIAN"), + _T("ASSAMESE"), + _T("AYMARA"), + _T("AZERI"), + _T("AZERI_CYRILLIC"), + _T("AZERI_LATIN"), + _T("BASHKIR"), + _T("BASQUE"), + _T("BELARUSIAN"), + _T("BENGALI"), + _T("BHUTANI"), + _T("BIHARI"), + _T("BISLAMA"), + _T("BRETON"), + _T("BULGARIAN"), + _T("BURMESE"), + _T("CAMBODIAN"), + _T("CATALAN"), + _T("CHINESE"), + _T("CHINESE_SIMPLIFIED"), + _T("CHINESE_TRADITIONAL"), + _T("CHINESE_HONGKONG"), + _T("CHINESE_MACAU"), + _T("CHINESE_SINGAPORE"), + _T("CHINESE_TAIWAN"), + _T("CORSICAN"), + _T("CROATIAN"), + _T("CZECH"), + _T("DANISH"), + _T("DUTCH"), + _T("DUTCH_BELGIAN"), + _T("ENGLISH"), + _T("ENGLISH_UK"), + _T("ENGLISH_US"), + _T("ENGLISH_AUSTRALIA"), + _T("ENGLISH_BELIZE"), + _T("ENGLISH_BOTSWANA"), + _T("ENGLISH_CANADA"), + _T("ENGLISH_CARIBBEAN"), + _T("ENGLISH_DENMARK"), + _T("ENGLISH_EIRE"), + _T("ENGLISH_JAMAICA"), + _T("ENGLISH_NEW_ZEALAND"), + _T("ENGLISH_PHILIPPINES"), + _T("ENGLISH_SOUTH_AFRICA"), + _T("ENGLISH_TRINIDAD"), + _T("ENGLISH_ZIMBABWE"), + _T("ESPERANTO"), + _T("ESTONIAN"), + _T("FAEROESE"), + _T("FARSI"), + _T("FIJI"), + _T("FINNISH"), + _T("FRENCH"), + _T("FRENCH_BELGIAN"), + _T("FRENCH_CANADIAN"), + _T("FRENCH_LUXEMBOURG"), + _T("FRENCH_MONACO"), + _T("FRENCH_SWISS"), + _T("FRISIAN"), + _T("GALICIAN"), + _T("GEORGIAN"), + _T("GERMAN"), + _T("GERMAN_AUSTRIAN"), + _T("GERMAN_BELGIUM"), + _T("GERMAN_LIECHTENSTEIN"), + _T("GERMAN_LUXEMBOURG"), + _T("GERMAN_SWISS"), + _T("GREEK"), + _T("GREENLANDIC"), + _T("GUARANI"), + _T("GUJARATI"), + _T("HAUSA"), + _T("HEBREW"), + _T("HINDI"), + _T("HUNGARIAN"), + _T("ICELANDIC"), + _T("INDONESIAN"), + _T("INTERLINGUA"), + _T("INTERLINGUE"), + _T("INUKTITUT"), + _T("INUPIAK"), + _T("IRISH"), + _T("ITALIAN"), + _T("ITALIAN_SWISS"), + _T("JAPANESE"), + _T("JAVANESE"), + _T("KANNADA"), + _T("KASHMIRI"), + _T("KASHMIRI_INDIA"), + _T("KAZAKH"), + _T("KERNEWEK"), + _T("KINYARWANDA"), + _T("KIRGHIZ"), + _T("KIRUNDI"), + _T("KONKANI"), + _T("KOREAN"), + _T("KURDISH"), + _T("LAOTHIAN"), + _T("LATIN"), + _T("LATVIAN"), + _T("LINGALA"), + _T("LITHUANIAN"), + _T("MACEDONIAN"), + _T("MALAGASY"), + _T("MALAY"), + _T("MALAYALAM"), + _T("MALAY_BRUNEI_DARUSSALAM"), + _T("MALAY_MALAYSIA"), + _T("MALTESE"), + _T("MANIPURI"), + _T("MAORI"), + _T("MARATHI"), + _T("MOLDAVIAN"), + _T("MONGOLIAN"), + _T("NAURU"), + _T("NEPALI"), + _T("NEPALI_INDIA"), + _T("NORWEGIAN_BOKMAL"), + _T("NORWEGIAN_NYNORSK"), + _T("OCCITAN"), + _T("ORIYA"), + _T("OROMO"), + _T("PASHTO"), + _T("POLISH"), + _T("PORTUGUESE"), + _T("PORTUGUESE_BRAZILIAN"), + _T("PUNJABI"), + _T("QUECHUA"), + _T("RHAETO_ROMANCE"), + _T("ROMANIAN"), + _T("RUSSIAN"), + _T("RUSSIAN_UKRAINE"), + _T("SAMOAN"), + _T("SANGHO"), + _T("SANSKRIT"), + _T("SCOTS_GAELIC"), + _T("SERBIAN"), + _T("SERBIAN_CYRILLIC"), + _T("SERBIAN_LATIN"), + _T("SERBO_CROATIAN"), + _T("SESOTHO"), + _T("SETSWANA"), + _T("SHONA"), + _T("SINDHI"), + _T("SINHALESE"), + _T("SISWATI"), + _T("SLOVAK"), + _T("SLOVENIAN"), + _T("SOMALI"), + _T("SPANISH"), + _T("SPANISH_ARGENTINA"), + _T("SPANISH_BOLIVIA"), + _T("SPANISH_CHILE"), + _T("SPANISH_COLOMBIA"), + _T("SPANISH_COSTA_RICA"), + _T("SPANISH_DOMINICAN_REPUBLIC"), + _T("SPANISH_ECUADOR"), + _T("SPANISH_EL_SALVADOR"), + _T("SPANISH_GUATEMALA"), + _T("SPANISH_HONDURAS"), + _T("SPANISH_MEXICAN"), + _T("SPANISH_MODERN"), + _T("SPANISH_NICARAGUA"), + _T("SPANISH_PANAMA"), + _T("SPANISH_PARAGUAY"), + _T("SPANISH_PERU"), + _T("SPANISH_PUERTO_RICO"), + _T("SPANISH_URUGUAY"), + _T("SPANISH_US"), + _T("SPANISH_VENEZUELA"), + _T("SUNDANESE"), + _T("SWAHILI"), + _T("SWEDISH"), + _T("SWEDISH_FINLAND"), + _T("TAGALOG"), + _T("TAJIK"), + _T("TAMIL"), + _T("TATAR"), + _T("TELUGU"), + _T("THAI"), + _T("TIBETAN"), + _T("TIGRINYA"), + _T("TONGA"), + _T("TSONGA"), + _T("TURKISH"), + _T("TURKMEN"), + _T("TWI"), + _T("UIGHUR"), + _T("UKRAINIAN"), + _T("URDU"), + _T("URDU_INDIA"), + _T("URDU_PAKISTAN"), + _T("UZBEK"), + _T("UZBEK_CYRILLIC"), + _T("UZBEK_LATIN"), + _T("VIETNAMESE"), + _T("VOLAPUK"), + _T("WELSH"), + _T("WOLOF"), + _T("XHOSA"), + _T("YIDDISH"), + _T("YORUBA"), + _T("ZHUANG"), + _T("ZULU"), }; if ( (size_t)lang < WXSIZEOF(languageNames) ) return languageNames[lang]; else - return "INVALID"; + return _T("INVALID"); } static void TestDefaultLang() { - puts("*** Testing wxLocale::GetSystemLanguage ***"); + wxPuts(_T("*** Testing wxLocale::GetSystemLanguage ***")); static const wxChar *langStrings[] = { @@ -1592,7 +1740,7 @@ static void TestDefaultLang() for ( size_t n = 0; n < WXSIZEOF(langStrings); n++ ) { - const char *langStr = langStrings[n]; + const wxChar *langStr = langStrings[n]; if ( langStr ) { // FIXME: this doesn't do anything at all under Windows, we need @@ -1601,8 +1749,8 @@ static void TestDefaultLang() } int lang = gs_localeDefault.GetSystemLanguage(); - printf("Locale for '%s' is %s.\n", - langStr ? langStr : "system default", GetLangName(lang)); + wxPrintf(_T("Locale for '%s' is %s.\n"), + langStr ? langStr : _T("system default"), GetLangName(lang)); } } @@ -1624,7 +1772,7 @@ static void TestMimeEnum() size_t count = wxTheMimeTypesManager->EnumAllFileTypes(mimetypes); - printf("*** All %u known filetypes: ***\n", count); + wxPrintf(_T("*** All %u known filetypes: ***\n"), count); wxArrayString exts; wxString desc; @@ -1635,7 +1783,7 @@ static void TestMimeEnum() wxTheMimeTypesManager->GetFileTypeFromMimeType(mimetypes[n]); if ( !filetype ) { - printf("nothing known about the filetype '%s'!\n", + wxPrintf(_T("nothing known about the filetype '%s'!\n"), mimetypes[n].c_str()); continue; } @@ -1653,11 +1801,11 @@ static void TestMimeEnum() extsAll += exts[e]; } - printf("\t%s: %s (%s)\n", + wxPrintf(_T("\t%s: %s (%s)\n"), mimetypes[n].c_str(), desc.c_str(), extsAll.c_str()); } - puts(""); + wxPuts(wxEmptyString); } static void TestMimeOverride() @@ -1683,7 +1831,7 @@ static void TestMimeOverride() wxPrintf(_T("WARN: mime.types file '%s' doesn't exist, not loaded.\n"), mimetypes); - puts(""); + wxPuts(wxEmptyString); } static void TestMimeFilename() @@ -1695,6 +1843,7 @@ static void TestMimeFilename() _T("readme.txt"), _T("document.pdf"), _T("image.gif"), + _T("picture.jpeg"), }; for ( size_t n = 0; n < WXSIZEOF(filenames); n++ ) @@ -1714,17 +1863,19 @@ 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('"'); - wxPrintf(_T("To open %s (%s) do '%s'.\n"), + wxPrintf(_T("To open %s (%s) do %s.\n"), fname.c_str(), desc.c_str(), cmd.c_str()); delete ft; } } - puts(""); + wxPuts(wxEmptyString); } static void TestMimeAssociate() @@ -1752,7 +1903,7 @@ static void TestMimeAssociate() delete ft; } - puts(""); + wxPuts(wxEmptyString); } #endif // TEST_MIME @@ -1767,17 +1918,17 @@ static void TestMimeAssociate() static void TestDiskInfo() { - puts("*** Testing wxGetDiskSpace() ***"); + wxPuts(_T("*** Testing wxGetDiskSpace() ***")); for ( ;; ) { - char pathname[128]; - printf("\nEnter a directory name: "); - if ( !fgets(pathname, WXSIZEOF(pathname), stdin) ) + wxChar pathname[128]; + wxPrintf(_T("\nEnter a directory name: ")); + if ( !wxFgets(pathname, WXSIZEOF(pathname), stdin) ) break; // kill the last '\n' - pathname[strlen(pathname) - 1] = 0; + pathname[wxStrlen(pathname) - 1] = 0; wxLongLong total, free; if ( !wxGetDiskSpace(pathname, &total, &free) ) @@ -1796,615 +1947,523 @@ static void TestDiskInfo() static void TestOsInfo() { - puts("*** Testing OS info functions ***\n"); + wxPuts(_T("*** Testing OS info functions ***\n")); int major, minor; wxGetOsVersion(&major, &minor); - printf("Running under: %s, version %d.%d\n", + wxPrintf(_T("Running under: %s, version %d.%d\n"), wxGetOsDescription().c_str(), major, minor); - printf("%ld free bytes of memory left.\n", wxGetFreeMemory()); + wxPrintf(_T("%ld free bytes of memory left.\n"), wxGetFreeMemory()); - printf("Host name is %s (%s).\n", + wxPrintf(_T("Host name is %s (%s).\n"), wxGetHostName().c_str(), wxGetFullHostName().c_str()); - puts(""); + wxPuts(wxEmptyString); } static void TestUserInfo() { - puts("*** Testing user info functions ***\n"); + wxPuts(_T("*** Testing user info functions ***\n")); - printf("User id is:\t%s\n", wxGetUserId().c_str()); - printf("User name is:\t%s\n", wxGetUserName().c_str()); - printf("Home dir is:\t%s\n", wxGetHomeDir().c_str()); - printf("Email address:\t%s\n", wxGetEmailAddress().c_str()); + wxPrintf(_T("User id is:\t%s\n"), wxGetUserId().c_str()); + wxPrintf(_T("User name is:\t%s\n"), wxGetUserName().c_str()); + wxPrintf(_T("Home dir is:\t%s\n"), wxGetHomeDir().c_str()); + wxPrintf(_T("Email address:\t%s\n"), wxGetEmailAddress().c_str()); - puts(""); + 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; - } - - printf("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; - } - - printf("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; +#endif // TEST_PATHLIST - wxLongLong l; - for ( n = 0; n < max; n++ ) - { - l += n; - } +// ---------------------------------------------------------------------------- +// regular expressions +// ---------------------------------------------------------------------------- - printf("Summing wxLongLongs took %ld milliseconds.\n", sw.Time()); - } -} +#ifdef TEST_REGEX -static void TestLongLongConversion() +#include "wx/regex.h" + +static void TestRegExInteractive() { - puts("*** Testing wxLongLong conversions ***\n"); + wxPuts(_T("*** Testing RE interactively ***")); - wxLongLong a; - size_t nTested = 0; - for ( size_t n = 0; n < 100000; n++ ) + for ( ;; ) { - a = RAND_LL(); - -#if wxUSE_LONGLONG_NATIVE - wxLongLongNative b(a.GetHi(), a.GetLo()); - - wxASSERT_MSG( a == b, "conversions failure" ); -#else - puts("Can't do it without native long long type, test skipped."); + wxChar pattern[128]; + wxPrintf(_T("\nEnter a pattern: ")); + if ( !wxFgets(pattern, WXSIZEOF(pattern), stdin) ) + break; - return; -#endif // wxUSE_LONGLONG_NATIVE + // kill the last '\n' + pattern[wxStrlen(pattern) - 1] = 0; - if ( !(nTested % 1000) ) + wxRegEx re; + if ( !re.Compile(pattern) ) { - putchar('.'); - fflush(stdout); + continue; } - nTested++; - } - - puts(" done!"); -} - -static void TestMultiplication() -{ - puts("*** 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(); + wxChar text[128]; + for ( ;; ) + { + wxPrintf(_T("Enter text to match: ")); + if ( !wxFgets(text, WXSIZEOF(text), stdin) ) + break; -#if wxUSE_LONGLONG_NATIVE - wxLongLongNative aa(a.GetHi(), a.GetLo()); - wxLongLongNative bb(b.GetHi(), b.GetLo()); + // kill the last '\n' + text[wxStrlen(text) - 1] = 0; - wxASSERT_MSG( a*b == aa*bb, "multiplication failure" ); -#else // !wxUSE_LONGLONG_NATIVE - puts("Can't do it without native long long type, test skipped."); + if ( !re.Matches(text) ) + { + wxPrintf(_T("No match.\n")); + } + else + { + wxPrintf(_T("Pattern matches at '%s'\n"), re.GetMatch(text).c_str()); - return; -#endif // wxUSE_LONGLONG_NATIVE + size_t start, len; + for ( size_t n = 1; ; n++ ) + { + if ( !re.GetMatch(&start, &len, n) ) + { + break; + } - if ( !(nTested % 1000) ) - { - putchar('.'); - fflush(stdout); + wxPrintf(_T("Subexpr %u matched '%s'\n"), + n, wxString(text + start, len).c_str()); + } + } } - - nTested++; } - - puts(" done!"); } -static void TestDivision() -{ - puts("*** 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()); +#endif // TEST_REGEX - 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 +// ---------------------------------------------------------------------------- +// database +// ---------------------------------------------------------------------------- - if ( !(nTested % 1000) ) - { - putchar('.'); - fflush(stdout); - } +#if !wxUSE_ODBC + #undef TEST_ODBC +#endif - nTested++; - } +#ifdef TEST_ODBC - puts(" done!"); -} +#include -static void TestAddition() +static void TestDbOpen() { - puts("*** 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++; - } - - puts(" done!"); + HENV henv; + wxDb db(henv); } -static void TestBitOperations() -{ - puts("*** 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 - puts("Can't do it without native long long type, test skipped."); +#endif // TEST_ODBC - return; -#endif // wxUSE_LONGLONG_NATIVE +// ---------------------------------------------------------------------------- +// printf() tests +// ---------------------------------------------------------------------------- - if ( !(nTested % 1000) ) - { - putchar('.'); - fflush(stdout); - } +/* + NB: this stuff was taken from the glibc test suite and modified to build + in wxWidgets: if I read the copyright below properly, this shouldn't + be a problem + */ - nTested++; - } +#ifdef TEST_PRINTF - puts(" done!"); -} +#ifdef wxTEST_PRINTF + // use our functions from wxchar.cpp + #undef wxPrintf + #undef wxSprintf -static void TestLongLongComparison() -{ -#if wxUSE_LONGLONG_WX - puts("*** Testing wxLongLong comparison ***\n"); + // NB: do _not_ use ATTRIBUTE_PRINTF here, we have some invalid formats + // in the tests below + int wxPrintf( const wxChar *format, ... ); + int wxSprintf( wxChar *str, const wxChar *format, ... ); +#endif - static const long ls[2] = - { - 0x1234, - -0x1234, - }; +#include "wx/longlong.h" - wxLongLongWx lls[2]; - lls[0] = ls[0]; - lls[1] = ls[1]; +#include - for ( size_t n = 0; n < WXSIZEOF(testLongs); n++ ) - { - bool res; +static void rfg1 (void); +static void rfg2 (void); - for ( size_t m = 0; m < WXSIZEOF(lls); m++ ) - { - res = lls[m] > testLongs[n]; - printf("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]; - printf("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]; - printf("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 TestLongLongPrint() +static void +fmtchk (const wxChar *fmt) { - wxPuts(_T("*** Testing wxLongLong printing ***\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()); + (void) wxPrintf(_T("%s:\t`"), fmt); + (void) wxPrintf(fmt, 0x12); + (void) wxPrintf(_T("'\n")); } -#undef MAKE_LL -#undef RAND_LL - -#endif // TEST_LONGLONG - -// ---------------------------------------------------------------------------- -// path list -// ---------------------------------------------------------------------------- - -#ifdef TEST_PATHLIST - -static void TestPathList() +static void +fmtst1chk (const wxChar *fmt) { - puts("*** Testing wxPathList ***\n"); - - wxPathList pathlist; - pathlist.AddEnvList("PATH"); - wxString path = pathlist.FindValidPath("ls"); - if ( path.empty() ) - { - printf("ERROR: command not found in the path.\n"); - } - else - { - printf("Command found in the path as '%s'.\n", path.c_str()); - } + (void) wxPrintf(_T("%s:\t`"), fmt); + (void) wxPrintf(fmt, 4, 0x12); + (void) wxPrintf(_T("'\n")); } -#endif // TEST_PATHLIST - -// ---------------------------------------------------------------------------- -// regular expressions -// ---------------------------------------------------------------------------- - -#ifdef TEST_REGEX - -#include "wx/regex.h" - -static void TestRegExCompile() +static void +fmtst2chk (const wxChar *fmt) { - 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")); - } + (void) wxPrintf(_T("%s:\t`"), fmt); + (void) wxPrintf(fmt, 4, 4, 0x12); + (void) wxPrintf(_T("'\n")); } -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")); - } -} +/* This page is covered by the following copyright: */ -static void TestRegExSubmatch() -{ - wxPuts(_T("*** Testing RE subexpressions ***\n")); +/* (C) Copyright C E Chew + * + * Feel free to copy, use and distribute this software provided: + * + * 1. you do not pretend that you wrote it + * 2. you leave this copyright notice intact. + */ - wxRegEx re(_T("([[:alpha:]]+) ([[:alpha:]]+) ([[:digit:]]+).*([[:digit:]]+)$")); - if ( !re.IsValid() ) - { - wxPuts(_T("ERROR: compilation failed.")); - return; - } +/* + * Extracted from exercise.c for glibc-1.05 bug report by Bruce Evans. + */ - wxString text = _T("Fri Jul 13 18:37:52 CEST 2001"); +#define DEC -123 +#define INT 255 +#define UNS (~0) - if ( !re.Matches(text) ) - { - wxPuts(_T("ERROR: match expected.")); - } - else - { - wxPrintf(_T("Entire match: %s\n"), re.GetMatch(text).c_str()); +/* Formatted Output Test + * + * This exercises the output formatting code. + */ - 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()); - } +wxChar *PointerNull = NULL; + +static void +fp_test (void) +{ + int i, j, k, l; + wxChar buf[7]; + wxChar *prefix = buf; + wxChar tp[20]; + + wxPuts(_T("\nFormatted output test")); + wxPrintf(_T("prefix 6d 6o 6x 6X 6u\n")); + wxStrcpy(prefix, _T("%")); + for (i = 0; i < 2; i++) { + for (j = 0; j < 2; j++) { + for (k = 0; k < 2; k++) { + for (l = 0; l < 2; l++) { + wxStrcpy(prefix, _T("%")); + if (i == 0) wxStrcat(prefix, _T("-")); + if (j == 0) wxStrcat(prefix, _T("+")); + if (k == 0) wxStrcat(prefix, _T("#")); + if (l == 0) wxStrcat(prefix, _T("0")); + wxPrintf(_T("%5s |"), prefix); + wxStrcpy(tp, prefix); + wxStrcat(tp, _T("6d |")); + wxPrintf(tp, DEC); + wxStrcpy(tp, prefix); + wxStrcat(tp, _T("6o |")); + wxPrintf(tp, INT); + wxStrcpy(tp, prefix); + wxStrcat(tp, _T("6x |")); + wxPrintf(tp, INT); + wxStrcpy(tp, prefix); + wxStrcat(tp, _T("6X |")); + wxPrintf(tp, INT); + wxStrcpy(tp, prefix); + wxStrcat(tp, _T("6u |")); + wxPrintf(tp, UNS); + wxPrintf(_T("\n")); + } + } + } + } + wxPrintf(_T("%10s\n"), PointerNull); + wxPrintf(_T("%-10s\n"), PointerNull); } -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]; +static void TestPrintf() +{ + static wxChar shortstr[] = _T("Hi, Z."); + 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")); + fmtchk(_T("%4.4x")); + fmtchk(_T("%04.4x")); + fmtchk(_T("%4.3x")); + fmtchk(_T("%04.3x")); + + fmtst1chk(_T("%.*x")); + fmtst1chk(_T("%0*x")); + fmtst2chk(_T("%*.*x")); + fmtst2chk(_T("%0*.*x")); + + 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); + wxPrintf(_T("octal negative:\t\"%o\"\n"), -2345); + wxPrintf(_T("hex negative:\t\"%x\"\n"), -2345); + wxPrintf(_T("long decimal number:\t\"%ld\"\n"), -123456L); + 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); + 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); + + 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"), PointerNull); + wxPrintf(_T("limited string:\t\"%.22s\"\n"), longstr); + + wxPrintf(_T("e-style >= 1:\t\"%e\"\n"), 12.34); + wxPrintf(_T("e-style >= .1:\t\"%e\"\n"), 0.1234); + wxPrintf(_T("e-style < .1:\t\"%e\"\n"), 0.001234); + wxPrintf(_T("e-style big:\t\"%.60e\"\n"), 1e20); + wxPrintf(_T("e-style == .1:\t\"%e\"\n"), 0.1); + wxPrintf(_T("f-style >= 1:\t\"%f\"\n"), 12.34); + wxPrintf(_T("f-style >= .1:\t\"%f\"\n"), 0.1234); + wxPrintf(_T("f-style < .1:\t\"%f\"\n"), 0.001234); + wxPrintf(_T("g-style >= 1:\t\"%g\"\n"), 12.34); + wxPrintf(_T("g-style >= .1:\t\"%g\"\n"), 0.1234); + wxPrintf(_T("g-style < .1:\t\"%g\"\n"), 0.001234); + wxPrintf(_T("g-style big:\t\"%.60g\"\n"), 1e20); + + wxPrintf (_T(" %6.5f\n"), .099999999860301614); + wxPrintf (_T(" %6.5f\n"), .1); + wxPrintf (_T("x%5.4fx\n"), .5); + + wxPrintf (_T("%#03x\n"), 1); + + //wxPrintf (_T("something really insane: %.10000f\n"), 1.0); + + { + double d = FLT_MIN; + int niter = 17; + + while (niter-- != 0) + wxPrintf (_T("%.17e\n"), d / 2); + 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 - wxString text = data.text; - size_t nRepl = re.Replace(&text, data.repl); +#define FORMAT _T("|%12.4f|%12.4e|%12.4g|\n") + wxPrintf (FORMAT, 0.0, 0.0, 0.0); + wxPrintf (FORMAT, 1.0, 1.0, 1.0); + wxPrintf (FORMAT, -1.0, -1.0, -1.0); + wxPrintf (FORMAT, 100.0, 100.0, 100.0); + wxPrintf (FORMAT, 1000.0, 1000.0, 1000.0); + wxPrintf (FORMAT, 10000.0, 10000.0, 10000.0); + wxPrintf (FORMAT, 12345.0, 12345.0, 12345.0); + wxPrintf (FORMAT, 100000.0, 100000.0, 100000.0); + wxPrintf (FORMAT, 123456.0, 123456.0, 123456.0); +#undef FORMAT + + { + wxChar buf[20]; + int rc = wxSnprintf (buf, WXSIZEOF(buf), _T("%30s"), _T("foo")); + + wxPrintf(_T("snprintf (\"%%30s\", \"foo\") == %d, \"%.*s\"\n"), + rc, WXSIZEOF(buf), buf); +#if 0 + wxChar buf2[512]; + wxPrintf ("snprintf (\"%%.999999u\", 10)\n", + wxSnprintf(buf2, WXSIZEOFbuf2), "%.999999u", 10)); +#endif + } - 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); - } - } -} + fp_test (); -static void TestRegExInteractive() -{ - wxPuts(_T("*** Testing RE interactively ***")); + wxPrintf (_T("%e should be 1.234568e+06\n"), 1234567.8); + wxPrintf (_T("%f should be 1234567.800000\n"), 1234567.8); + wxPrintf (_T("%g should be 1.23457e+06\n"), 1234567.8); + wxPrintf (_T("%g should be 123.456\n"), 123.456); + wxPrintf (_T("%g should be 1e+06\n"), 1000000.0); + wxPrintf (_T("%g should be 10\n"), 10.0); + wxPrintf (_T("%g should be 0.02\n"), 0.02); - for ( ;; ) - { - char pattern[128]; - printf("\nEnter a pattern: "); - if ( !fgets(pattern, WXSIZEOF(pattern), stdin) ) - break; + { + double x=1.0; + wxPrintf(_T("%.17f\n"),(1.0/x/10.0+1.0)*x-x); + } - // kill the last '\n' - pattern[strlen(pattern) - 1] = 0; + { + wxChar buf[200]; - wxRegEx re; - if ( !re.Compile(pattern) ) - { - continue; - } + wxSprintf(buf,_T("%*s%*s%*s"),-1,_T("one"),-20,_T("two"),-30,_T("three")); - char text[128]; - for ( ;; ) - { - printf("Enter text to match: "); - if ( !fgets(text, WXSIZEOF(text), stdin) ) - break; + result |= wxStrcmp (buf, + _T("onetwo three ")); - // kill the last '\n' - text[strlen(text) - 1] = 0; + wxPuts (result != 0 ? _T("Test failed!") : _T("Test ok.")); + } - if ( !re.Matches(text) ) - { - printf("No match.\n"); - } - else - { - printf("Pattern matches at '%s'\n", re.GetMatch(text).c_str()); +#ifdef wxLongLong_t + { + wxChar buf[200]; - size_t start, len; - for ( size_t n = 1; ; n++ ) - { - if ( !re.GetMatch(&start, &len, n) ) - { - break; - } + 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 - printf("Subexpr %u matched '%s'\n", - n, wxString(text + start, len).c_str()); - } - } - } - } -} + if (wxStrcmp (buf, _T("40000000000")) != 0) + { + result = 1; + wxPuts (_T("\tFAILED")); + } + wxUnusedVar(result); + wxPuts (wxEmptyString); + } +#endif // wxLongLong_t -#endif // TEST_REGEX + wxPrintf (_T("printf (\"%%hhu\", %u) = %hhu\n"), UCHAR_MAX + 2, UCHAR_MAX + 2); + wxPrintf (_T("printf (\"%%hu\", %u) = %hu\n"), USHRT_MAX + 2, USHRT_MAX + 2); -// ---------------------------------------------------------------------------- -// database -// ---------------------------------------------------------------------------- + wxPuts (_T("--- Should be no further output. ---")); + rfg1 (); + rfg2 (); -#if !wxUSE_ODBC - #undef TEST_ODBC +#if 0 + { + wxChar bytes[7]; + wxChar buf[20]; + + memset (bytes, '\xff', sizeof bytes); + wxSprintf (buf, _T("foo%hhn\n"), &bytes[3]); + if (bytes[0] != '\xff' || bytes[1] != '\xff' || bytes[2] != '\xff' + || bytes[4] != '\xff' || bytes[5] != '\xff' || bytes[6] != '\xff') + { + wxPuts (_T("%hhn overwrite more bytes")); + result = 1; + } + if (bytes[3] != 3) + { + wxPuts (_T("%hhn wrote incorrect value")); + result = 1; + } + } #endif +} -#ifdef TEST_ODBC - -#include +static void +rfg1 (void) +{ + wxChar buf[100]; + + wxSprintf (buf, _T("%5.s"), _T("xyz")); + if (wxStrcmp (buf, _T(" ")) != 0) + wxPrintf (_T("got: '%s', expected: '%s'\n"), buf, _T(" ")); + wxSprintf (buf, _T("%5.f"), 33.3); + if (wxStrcmp (buf, _T(" 33")) != 0) + wxPrintf (_T("got: '%s', expected: '%s'\n"), buf, _T(" 33")); + wxSprintf (buf, _T("%8.e"), 33.3e7); + if (wxStrcmp (buf, _T(" 3e+08")) != 0) + wxPrintf (_T("got: '%s', expected: '%s'\n"), buf, _T(" 3e+08")); + wxSprintf (buf, _T("%8.E"), 33.3e7); + if (wxStrcmp (buf, _T(" 3E+08")) != 0) + wxPrintf (_T("got: '%s', expected: '%s'\n"), buf, _T(" 3E+08")); + wxSprintf (buf, _T("%.g"), 33.3); + if (wxStrcmp (buf, _T("3e+01")) != 0) + wxPrintf (_T("got: '%s', expected: '%s'\n"), buf, _T("3e+01")); + wxSprintf (buf, _T("%.G"), 33.3); + if (wxStrcmp (buf, _T("3E+01")) != 0) + wxPrintf (_T("got: '%s', expected: '%s'\n"), buf, _T("3E+01")); +} -static void TestDbOpen() -{ - HENV henv; - wxDb db(henv); +static void +rfg2 (void) +{ + int prec; + wxChar buf[100]; + wxString test_format; + + prec = 0; + wxSprintf (buf, _T("%.*g"), prec, 3.3); + if (wxStrcmp (buf, _T("3")) != 0) + wxPrintf (_T("got: '%s', expected: '%s'\n"), buf, _T("3")); + prec = 0; + wxSprintf (buf, _T("%.*G"), prec, 3.3); + if (wxStrcmp (buf, _T("3")) != 0) + wxPrintf (_T("got: '%s', expected: '%s'\n"), buf, _T("3")); + prec = 0; + wxSprintf (buf, _T("%7.*G"), prec, 3.33); + if (wxStrcmp (buf, _T(" 3")) != 0) + wxPrintf (_T("got: '%s', expected: '%s'\n"), buf, _T(" 3")); + prec = 3; + 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; + 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; + 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; + 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")); } -#endif // TEST_ODBC +#endif // TEST_PRINTF // ---------------------------------------------------------------------------- // registry and related stuff @@ -2421,10 +2480,31 @@ static void TestDbOpen() #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() +{ + wxConfig *config = new wxConfig(_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 @@ -2440,13 +2520,13 @@ static const wxChar *TESTKEY = static void TestRegistryRead() { - puts("*** testing registry reading ***"); + wxPuts(_T("*** testing registry reading ***")); wxRegKey key(TESTKEY); - printf("The test key name is '%s'.\n", key.GetName().c_str()); + wxPrintf(_T("The test key name is '%s'.\n"), key.GetName().c_str()); if ( !key.Open() ) { - puts("ERROR: test key can't be opened, aborting test."); + wxPuts(_T("ERROR: test key can't be opened, aborting test.")); return; } @@ -2454,46 +2534,46 @@ static void TestRegistryRead() size_t nSubKeys, nValues; if ( key.GetKeyInfo(&nSubKeys, NULL, &nValues, NULL) ) { - printf("It has %u subkeys and %u values.\n", nSubKeys, nValues); + wxPrintf(_T("It has %u subkeys and %u values.\n"), nSubKeys, nValues); } - printf("Enumerating values:\n"); + wxPrintf(_T("Enumerating values:\n")); long dummy; wxString value; bool cont = key.GetFirstValue(value, dummy); while ( cont ) { - printf("Value '%s': type ", value.c_str()); + wxPrintf(_T("Value '%s': type "), value.c_str()); switch ( key.GetValueType(value) ) { - case wxRegKey::Type_None: printf("ERROR (none)"); break; - case wxRegKey::Type_String: printf("SZ"); break; - case wxRegKey::Type_Expand_String: printf("EXPAND_SZ"); break; - case wxRegKey::Type_Binary: printf("BINARY"); break; - case wxRegKey::Type_Dword: printf("DWORD"); break; - case wxRegKey::Type_Multi_String: printf("MULTI_SZ"); break; - default: printf("other (unknown)"); break; + case wxRegKey::Type_None: wxPrintf(_T("ERROR (none)")); break; + case wxRegKey::Type_String: wxPrintf(_T("SZ")); break; + case wxRegKey::Type_Expand_String: wxPrintf(_T("EXPAND_SZ")); break; + case wxRegKey::Type_Binary: wxPrintf(_T("BINARY")); break; + case wxRegKey::Type_Dword: wxPrintf(_T("DWORD")); break; + case wxRegKey::Type_Multi_String: wxPrintf(_T("MULTI_SZ")); break; + default: wxPrintf(_T("other (unknown)")); break; } - printf(", value = "); + wxPrintf(_T(", value = ")); if ( key.IsNumericValue(value) ) { long val; key.QueryValue(value, &val); - printf("%ld", val); + wxPrintf(_T("%ld"), val); } else // string { wxString val; key.QueryValue(value, val); - printf("'%s'", val.c_str()); + wxPrintf(_T("'%s'"), val.c_str()); key.QueryRawValue(value, val); - printf(" (raw value '%s')", val.c_str()); + wxPrintf(_T(" (raw value '%s')"), val.c_str()); } - putchar('\n'); + wxPutchar('\n'); cont = key.GetNextValue(value, dummy); } @@ -2509,31 +2589,67 @@ 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(); } #endif // TEST_REGISTRY +// ---------------------------------------------------------------------------- +// scope guard +// ---------------------------------------------------------------------------- + +#ifdef TEST_SCOPEGUARD + +#include "wx/scopeguard.h" + +static void function0() { puts("function0()"); } +static void function1(int n) { printf("function1(%d)\n", n); } +static void function2(double x, char c) { printf("function2(%g, %c)\n", x, c); } + +struct Object +{ + void method0() { printf("method0()\n"); } + void method1(int n) { printf("method1(%d)\n", n); } + void method2(double x, char c) { printf("method2(%g, %c)\n", x, c); } +}; + +static void TestScopeGuard() +{ + wxON_BLOCK_EXIT0(function0); + wxON_BLOCK_EXIT1(function1, 17); + wxON_BLOCK_EXIT2(function2, 3.14, 'p'); + + Object obj; + 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(); +} + +#endif + // ---------------------------------------------------------------------------- // sockets // ---------------------------------------------------------------------------- @@ -2546,7 +2662,7 @@ static void TestRegistryAssociation() static void TestSocketServer() { - puts("*** Testing wxSocketServer ***\n"); + wxPuts(_T("*** Testing wxSocketServer ***\n")); static const int PORT = 3000; @@ -2556,30 +2672,32 @@ static void TestSocketServer() wxSocketServer *server = new wxSocketServer(addr); if ( !server->Ok() ) { - puts("ERROR: failed to bind"); + wxPuts(_T("ERROR: failed to bind")); return; } - for ( ;; ) + bool quit = false; + while ( !quit ) { - printf("Server: waiting for connection on port %d...\n", PORT); + wxPrintf(_T("Server: waiting for connection on port %d...\n"), PORT); wxSocketBase *socket = server->Accept(); if ( !socket ) { - puts("ERROR: wxSocketServer::Accept() failed."); + wxPuts(_T("ERROR: wxSocketServer::Accept() failed.")); break; } - puts("Server: got a client."); + wxPuts(_T("Server: got a client.")); server->SetTimeout(60); // 1 min - while ( socket->IsConnected() ) + bool close = false; + while ( !close && socket->IsConnected() ) { wxString s; - char ch = '\0'; + wxChar ch = _T('\0'); for ( ;; ) { if ( socket->Read(&ch, sizeof(ch)).Error() ) @@ -2587,7 +2705,7 @@ static void TestSocketServer() // don't log error if the client just close the connection if ( socket->IsConnected() ) { - puts("ERROR: in wxSocket::Read."); + wxPuts(_T("ERROR: in wxSocket::Read.")); } break; @@ -2607,20 +2725,32 @@ static void TestSocketServer() break; } - printf("Server: got '%s'.\n", s.c_str()); - if ( s == _T("bye") ) + wxPrintf(_T("Server: got '%s'.\n"), s.c_str()); + if ( s == _T("close") ) { - delete socket; + wxPuts(_T("Closing connection")); - break; + close = true; } + else if ( s == _T("quit") ) + { + close = + quit = true; - socket->Write(s.MakeUpper().c_str(), s.length()); - socket->Write("\r\n", 2); - printf("Server: wrote '%s'.\n", s.c_str()); + wxPuts(_T("Shutting down the server")); + } + else // not a special command + { + socket->Write(s.MakeUpper().c_str(), s.length()); + socket->Write("\r\n", 2); + wxPrintf(_T("Server: wrote '%s'.\n"), s.c_str()); + } } - puts("Server: lost a client."); + if ( !close ) + { + wxPuts(_T("Server: lost a client unexpectedly.")); + } socket->Destroy(); } @@ -2631,36 +2761,36 @@ static void TestSocketServer() static void TestSocketClient() { - puts("*** Testing wxSocketClient ***\n"); + wxPuts(_T("*** Testing wxSocketClient ***\n")); - static const char *hostname = "www.wxwindows.org"; + static const wxChar *hostname = _T("www.wxwidgets.org"); wxIPV4address addr; addr.Hostname(hostname); addr.Service(80); - printf("--- Attempting to connect to %s:80...\n", hostname); + wxPrintf(_T("--- Attempting to connect to %s:80...\n"), hostname); wxSocketClient client; if ( !client.Connect(addr) ) { - printf("ERROR: failed to connect to %s\n", hostname); + wxPrintf(_T("ERROR: failed to connect to %s\n"), hostname); } else { - printf("--- Connected to %s:%u...\n", + wxPrintf(_T("--- Connected to %s:%u...\n"), addr.Hostname().c_str(), addr.Service()); - char buf[8192]; + wxChar buf[8192]; // could use simply "GET" here I suppose wxString cmdGet = - wxString::Format("GET http://%s/\r\n", hostname); + wxString::Format(_T("GET http://%s/\r\n"), hostname); client.Write(cmdGet, cmdGet.length()); - printf("--- Sent command '%s' to the server\n", + wxPrintf(_T("--- Sent command '%s' to the server\n"), MakePrintable(cmdGet).c_str()); client.Read(buf, WXSIZEOF(buf)); - printf("--- Server replied:\n%s", buf); + wxPrintf(_T("--- Server replied:\n%s"), buf); } } @@ -2679,83 +2809,83 @@ static wxFTP ftp; #define FTP_ANONYMOUS #ifdef FTP_ANONYMOUS - static const char *directory = "/pub"; - static const char *filename = "welcome.msg"; + static const wxChar *directory = _T("/pub"); + static const wxChar *filename = _T("welcome.msg"); #else - static const char *directory = "/etc"; - static const char *filename = "issue"; + static const wxChar *directory = _T("/etc"); + static const wxChar *filename = _T("issue"); #endif static bool TestFtpConnect() { - puts("*** Testing FTP connect ***"); + wxPuts(_T("*** Testing FTP connect ***")); #ifdef FTP_ANONYMOUS - static const char *hostname = "ftp.wxwindows.org"; + static const wxChar *hostname = _T("ftp.wxwidgets.org"); - printf("--- Attempting to connect to %s:21 anonymously...\n", hostname); + wxPrintf(_T("--- Attempting to connect to %s:21 anonymously...\n"), hostname); #else // !FTP_ANONYMOUS - static const char *hostname = "localhost"; + static const wxChar *hostname = "localhost"; - char user[256]; - fgets(user, WXSIZEOF(user), stdin); - user[strlen(user) - 1] = '\0'; // chop off '\n' + wxChar user[256]; + wxFgets(user, WXSIZEOF(user), stdin); + user[wxStrlen(user) - 1] = '\0'; // chop off '\n' ftp.SetUser(user); - char password[256]; - printf("Password for %s: ", password); - fgets(password, WXSIZEOF(password), stdin); - password[strlen(password) - 1] = '\0'; // chop off '\n' + 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); - printf("--- Attempting to connect to %s:21 as %s...\n", hostname, user); + wxPrintf(_T("--- Attempting to connect to %s:21 as %s...\n"), hostname, user); #endif // FTP_ANONYMOUS/!FTP_ANONYMOUS if ( !ftp.Connect(hostname) ) { - printf("ERROR: failed to connect to %s\n", hostname); + wxPrintf(_T("ERROR: failed to connect to %s\n"), hostname); - return FALSE; + return false; } else { - printf("--- Connected to %s, current directory is '%s'\n", + wxPrintf(_T("--- Connected to %s, current directory is '%s'\n"), hostname, ftp.Pwd().c_str()); } - return TRUE; + return true; } // test (fixed?) wxFTP bug with wu-ftpd >= 2.6.0? static void TestFtpWuFtpd() { wxFTP ftp; - static const char *hostname = "ftp.eudora.com"; + static const wxChar *hostname = _T("ftp.eudora.com"); if ( !ftp.Connect(hostname) ) { - printf("ERROR: failed to connect to %s\n", hostname); + wxPrintf(_T("ERROR: failed to connect to %s\n"), hostname); } else { - static const char *filename = "eudora/pubs/draft-gellens-submit-09.txt"; + static const wxChar *filename = _T("eudora/pubs/draft-gellens-submit-09.txt"); wxInputStream *in = ftp.GetInputStream(filename); if ( !in ) { - printf("ERROR: couldn't get input stream for %s\n", filename); + wxPrintf(_T("ERROR: couldn't get input stream for %s\n"), filename); } else { - size_t size = in->StreamSize(); - printf("Reading file %s (%u bytes)...", filename, size); + size_t size = in->GetSize(); + wxPrintf(_T("Reading file %s (%u bytes)..."), filename, size); - char *data = new char[size]; + wxChar *data = new wxChar[size]; if ( !in->Read(data, size) ) { - puts("ERROR: read error"); + wxPuts(_T("ERROR: read error")); } else { - printf("Successfully retrieved the file.\n"); + wxPrintf(_T("Successfully retrieved the file.\n")); } delete [] data; @@ -2766,80 +2896,80 @@ static void TestFtpWuFtpd() static void TestFtpList() { - puts("*** Testing wxFTP file listing ***\n"); + wxPuts(_T("*** Testing wxFTP file listing ***\n")); // test CWD if ( !ftp.ChDir(directory) ) { - printf("ERROR: failed to cd to %s\n", directory); + wxPrintf(_T("ERROR: failed to cd to %s\n"), directory); } - printf("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) ) { - puts("ERROR: failed to get NLIST of files"); + wxPuts(_T("ERROR: failed to get NLIST of files")); } else { - printf("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++ ) { - printf("\t%s\n", files[n].c_str()); + wxPrintf(_T("\t%s\n"), files[n].c_str()); } - puts("End of the file list"); + wxPuts(_T("End of the file list")); } if ( !ftp.GetDirList(files) ) { - puts("ERROR: failed to get LIST of files"); + wxPuts(_T("ERROR: failed to get LIST of files")); } else { - printf("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++ ) { - printf("\t%s\n", files[n].c_str()); + wxPrintf(_T("\t%s\n"), files[n].c_str()); } - puts("End of the file list"); + wxPuts(_T("End of the file list")); } if ( !ftp.ChDir(_T("..")) ) { - puts("ERROR: failed to cd to .."); + wxPuts(_T("ERROR: failed to cd to ..")); } - printf("Current directory is '%s'\n", ftp.Pwd().c_str()); + wxPrintf(_T("Current directory is '%s'\n"), ftp.Pwd().c_str()); } static void TestFtpDownload() { - puts("*** Testing wxFTP download ***\n"); + wxPuts(_T("*** Testing wxFTP download ***\n")); // test RETR wxInputStream *in = ftp.GetInputStream(filename); if ( !in ) { - printf("ERROR: couldn't get input stream for %s\n", filename); + wxPrintf(_T("ERROR: couldn't get input stream for %s\n"), filename); } else { - size_t size = in->StreamSize(); - printf("Reading file %s (%u bytes)...", filename, size); + size_t size = in->GetSize(); + wxPrintf(_T("Reading file %s (%u bytes)..."), filename, size); fflush(stdout); - char *data = new char[size]; + wxChar *data = new wxChar[size]; if ( !in->Read(data, size) ) { - puts("ERROR: read error"); + wxPuts(_T("ERROR: read error")); } else { - printf("\nContents of %s:\n%s\n", filename, data); + wxPrintf(_T("\nContents of %s:\n%s\n"), filename, data); } delete [] data; @@ -2849,140 +2979,140 @@ static void TestFtpDownload() static void TestFtpFileSize() { - puts("*** Testing FTP SIZE command ***"); + wxPuts(_T("*** Testing FTP SIZE command ***")); if ( !ftp.ChDir(directory) ) { - printf("ERROR: failed to cd to %s\n", directory); + wxPrintf(_T("ERROR: failed to cd to %s\n"), directory); } - printf("Current directory is '%s'\n", ftp.Pwd().c_str()); + wxPrintf(_T("Current directory is '%s'\n"), ftp.Pwd().c_str()); if ( ftp.FileExists(filename) ) { int size = ftp.GetFileSize(filename); if ( size == -1 ) - printf("ERROR: couldn't get size of '%s'\n", filename); + wxPrintf(_T("ERROR: couldn't get size of '%s'\n"), filename); else - printf("Size of '%s' is %d bytes.\n", filename, size); + wxPrintf(_T("Size of '%s' is %d bytes.\n"), filename, size); } else { - printf("ERROR: '%s' doesn't exist\n", filename); + wxPrintf(_T("ERROR: '%s' doesn't exist\n"), filename); } } static void TestFtpMisc() { - puts("*** Testing miscellaneous wxFTP functions ***"); + wxPuts(_T("*** Testing miscellaneous wxFTP functions ***")); - if ( ftp.SendCommand("STAT") != '2' ) + if ( ftp.SendCommand(_T("STAT")) != '2' ) { - puts("ERROR: STAT failed"); + wxPuts(_T("ERROR: STAT failed")); } else { - printf("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' ) { - puts("ERROR: HELP SITE failed"); + wxPuts(_T("ERROR: HELP SITE failed")); } else { - printf("The list of site-specific commands:\n\n%s\n", + wxPrintf(_T("The list of site-specific commands:\n\n%s\n"), ftp.GetLastResult().c_str()); } } static void TestFtpInteractive() { - puts("\n*** Interactive wxFTP test ***"); + wxPuts(_T("\n*** Interactive wxFTP test ***")); - char buf[128]; + wxChar buf[128]; for ( ;; ) { - printf("Enter FTP command: "); - if ( !fgets(buf, WXSIZEOF(buf), stdin) ) + wxPrintf(_T("Enter FTP command: ")); + if ( !wxFgets(buf, WXSIZEOF(buf), stdin) ) break; // kill the last '\n' - buf[strlen(buf) - 1] = 0; + buf[wxStrlen(buf) - 1] = 0; // 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 ( strlen(buf) > 4 ) + if ( wxStrlen(buf) > 4 ) wildcard = buf + 5; wxArrayString files; - if ( !ftp.GetList(files, wildcard, start == "LIST") ) + if ( !ftp.GetList(files, wildcard, start == _T("LIST")) ) { - printf("ERROR: failed to get %s of files\n", start.c_str()); + wxPrintf(_T("ERROR: failed to get %s of files\n"), start.c_str()); } else { - printf("--- %s of '%s' under '%s':\n", + wxPrintf(_T("--- %s of '%s' under '%s':\n"), start.c_str(), wildcard.c_str(), ftp.Pwd().c_str()); size_t count = files.GetCount(); for ( size_t n = 0; n < count; n++ ) { - printf("\t%s\n", files[n].c_str()); + wxPrintf(_T("\t%s\n"), files[n].c_str()); } - puts("--- End of the file list"); + wxPuts(_T("--- End of the file list")); } } else // !list { - char ch = ftp.SendCommand(buf); - printf("Command %s", ch ? "succeeded" : "failed"); + wxChar ch = ftp.SendCommand(buf); + wxPrintf(_T("Command %s"), ch ? _T("succeeded") : _T("failed")); if ( ch ) { - printf(" (return code %c)", ch); + wxPrintf(_T(" (return code %c)"), ch); } - printf(", server reply:\n%s\n\n", ftp.GetLastResult().c_str()); + wxPrintf(_T(", server reply:\n%s\n\n"), ftp.GetLastResult().c_str()); } } - puts("\n*** done ***"); + wxPuts(_T("\n*** done ***")); } static void TestFtpUpload() { - puts("*** Testing wxFTP uploading ***\n"); + wxPuts(_T("*** Testing wxFTP uploading ***\n")); // upload a file - static const char *file1 = "test1"; - static const char *file2 = "test2"; + static const wxChar *file1 = _T("test1"); + static const wxChar *file2 = _T("test2"); wxOutputStream *out = ftp.GetOutputStream(file1); if ( out ) { - printf("--- Uploading to %s ---\n", file1); + wxPrintf(_T("--- Uploading to %s ---\n"), file1); out->Write("First hello", 11); delete out; } // send a command to check the remote file - if ( ftp.SendCommand(wxString("STAT ") + file1) != '2' ) + if ( ftp.SendCommand(wxString(_T("STAT ")) + file1) != '2' ) { - printf("ERROR: STAT %s failed\n", file1); + wxPrintf(_T("ERROR: STAT %s failed\n"), file1); } else { - printf("STAT %s returned:\n\n%s\n", + wxPrintf(_T("STAT %s returned:\n\n%s\n"), file1, ftp.GetLastResult().c_str()); } out = ftp.GetOutputStream(file2); if ( out ) { - printf("--- Uploading to %s ---\n", file1); + wxPrintf(_T("--- Uploading to %s ---\n"), file1); out->Write("Second hello", 12); delete out; } @@ -3001,44 +3131,58 @@ static void TestFtpUpload() static void TestFileStream() { - puts("*** Testing wxFileInputStream ***"); + wxPuts(_T("*** Testing wxFileInputStream ***")); - static const wxChar *filename = _T("testdata.fs"); + static const wxString filename = _T("testdata.fs"); { wxFileOutputStream fsOut(filename); fsOut.Write("foo", 3); } wxFileInputStream fsIn(filename); - printf("File stream size: %u\n", fsIn.GetSize()); + wxPrintf(_T("File stream size: %u\n"), fsIn.GetSize()); while ( !fsIn.Eof() ) { - putchar(fsIn.GetC()); + wxPutchar(fsIn.GetC()); } if ( !wxRemoveFile(filename) ) { - printf("ERROR: failed to remove the file '%s'.\n", filename); + wxPrintf(_T("ERROR: failed to remove the file '%s'.\n"), filename.c_str()); } - puts("\n*** wxFileInputStream test done ***"); + wxPuts(_T("\n*** wxFileInputStream test done ***")); } static void TestMemoryStream() { - puts("*** Testing wxMemoryInputStream ***"); + wxPuts(_T("*** Testing wxMemoryOutputStream ***")); + + wxMemoryOutputStream memOutStream; + wxPrintf(_T("Initially out stream offset: %lu\n"), + (unsigned long)memOutStream.TellO()); + + for ( const wxChar *p = _T("Hello, stream!"); *p; p++ ) + { + memOutStream.PutC(*p); + } + + wxPrintf(_T("Final out stream offset: %lu\n"), + (unsigned long)memOutStream.TellO()); + + wxPuts(_T("*** Testing wxMemoryInputStream ***")); wxChar buf[1024]; - wxStrncpy(buf, _T("Hello, stream!"), WXSIZEOF(buf)); + size_t len = memOutStream.CopyTo(buf, WXSIZEOF(buf)); - wxMemoryInputStream memInpStream(buf, wxStrlen(buf)); - printf(_T("Memory stream size: %u\n"), memInpStream.GetSize()); + wxMemoryInputStream memInpStream(buf, len); + wxPrintf(_T("Memory stream size: %u\n"), memInpStream.GetSize()); while ( !memInpStream.Eof() ) { - putchar(memInpStream.GetC()); + wxPutchar(memInpStream.GetC()); } - puts("\n*** wxMemoryInputStream test done ***"); + wxPuts(_T("\n*** wxMemoryInputStream test done ***")); } #endif // TEST_STREAMS @@ -3054,35 +3198,35 @@ static void TestMemoryStream() static void TestStopWatch() { - puts("*** Testing wxStopWatch ***\n"); + wxPuts(_T("*** Testing wxStopWatch ***\n")); wxStopWatch sw; sw.Pause(); - printf("Initially paused, after 2 seconds time is..."); + wxPrintf(_T("Initially paused, after 2 seconds time is...")); fflush(stdout); wxSleep(2); - printf("\t%ldms\n", sw.Time()); + wxPrintf(_T("\t%ldms\n"), sw.Time()); - printf("Resuming stopwatch and sleeping 3 seconds..."); + wxPrintf(_T("Resuming stopwatch and sleeping 3 seconds...")); fflush(stdout); sw.Resume(); wxSleep(3); - printf("\telapsed time: %ldms\n", sw.Time()); + wxPrintf(_T("\telapsed time: %ldms\n"), sw.Time()); sw.Pause(); - printf("Pausing agan and sleeping 2 more seconds..."); + wxPrintf(_T("Pausing agan and sleeping 2 more seconds...")); fflush(stdout); wxSleep(2); - printf("\telapsed time: %ldms\n", sw.Time()); + wxPrintf(_T("\telapsed time: %ldms\n"), sw.Time()); sw.Resume(); - printf("Finally resuming and sleeping 2 more seconds..."); + wxPrintf(_T("Finally resuming and sleeping 2 more seconds...")); fflush(stdout); wxSleep(2); - printf("\telapsed time: %ldms\n", sw.Time()); + wxPrintf(_T("\telapsed time: %ldms\n"), sw.Time()); wxStopWatch sw2; - puts("\nChecking for 'backwards clock' bug..."); + wxPuts(_T("\nChecking for 'backwards clock' bug...")); for ( size_t n = 0; n < 70; n++ ) { sw2.Start(); @@ -3091,15 +3235,15 @@ static void TestStopWatch() { if ( sw.Time() < 0 || sw2.Time() < 0 ) { - puts("\ntime is negative - ERROR!"); + wxPuts(_T("\ntime is negative - ERROR!")); } } - putchar('.'); + wxPutchar('.'); fflush(stdout); } - puts(", ok."); + wxPuts(_T(", ok.")); } #endif // TEST_TIMER @@ -3118,7 +3262,7 @@ static void DumpVObject(size_t level, const wxVCardObject& vcard) wxVCardObject *vcObj = vcard.GetFirstProp(&cookie); while ( vcObj ) { - printf("%s%s", + wxPrintf(_T("%s%s"), wxString(_T('\t'), level).c_str(), vcObj->GetName().c_str()); @@ -3162,8 +3306,8 @@ static void DumpVObject(size_t level, const wxVCardObject& vcard) } if ( !!value ) - printf(" = %s", value.c_str()); - putchar('\n'); + wxPrintf(_T(" = %s"), value.c_str()); + wxPutchar('\n'); DumpVObject(level + 1, *vcObj); @@ -3174,7 +3318,7 @@ static void DumpVObject(size_t level, const wxVCardObject& vcard) static void DumpVCardAddresses(const wxVCard& vcard) { - puts("\nShowing all addresses from vCard:\n"); + wxPuts(_T("\nShowing all addresses from vCard:\n")); size_t nAdr = 0; void *cookie; @@ -3208,7 +3352,7 @@ static void DumpVCardAddresses(const wxVCard& vcard) flagsStr << _T("work "); } - printf("Address %u:\n" + wxPrintf(_T("Address %u:\n") "\tflags = %s\n" "\tvalue = %s;%s;%s;%s;%s;%s;%s\n", ++nAdr, @@ -3229,7 +3373,7 @@ static void DumpVCardAddresses(const wxVCard& vcard) static void DumpVCardPhoneNumbers(const wxVCard& vcard) { - puts("\nShowing all phone numbers from vCard:\n"); + wxPuts(_T("\nShowing all phone numbers from vCard:\n")); size_t nPhone = 0; void *cookie; @@ -3263,7 +3407,7 @@ static void DumpVCardPhoneNumbers(const wxVCard& vcard) flagsStr << _T("work "); } - printf("Phone number %u:\n" + wxPrintf(_T("Phone number %u:\n") "\tflags = %s\n" "\tvalue = %s\n", ++nPhone, @@ -3278,12 +3422,12 @@ static void DumpVCardPhoneNumbers(const wxVCard& vcard) static void TestVCardRead() { - puts("*** Testing wxVCard reading ***\n"); + wxPuts(_T("*** Testing wxVCard reading ***\n")); wxVCard vcard(_T("vcard.vcf")); if ( !vcard.IsOk() ) { - puts("ERROR: couldn't load vCard."); + wxPuts(_T("ERROR: couldn't load vCard.")); } else { @@ -3300,7 +3444,7 @@ static void TestVCardRead() value = _T(""); } - printf("Full name retrieved directly: %s\n", value.c_str()); + wxPrintf(_T("Full name retrieved directly: %s\n"), value.c_str()); if ( !vcard.GetFullName(&value) ) @@ -3308,14 +3452,14 @@ static void TestVCardRead() value = _T(""); } - printf("Full name from wxVCard API: %s\n", value.c_str()); + wxPrintf(_T("Full name from wxVCard API: %s\n"), value.c_str()); // now show how to deal with multiply occuring properties DumpVCardAddresses(vcard); DumpVCardPhoneNumbers(vcard); // and finally show all - puts("\nNow dumping the entire vCard:\n" + wxPuts(_T("\nNow dumping the entire vCard:\n") "-----------------------------\n"); DumpVObject(0, vcard); @@ -3324,23 +3468,23 @@ static void TestVCardRead() static void TestVCardWrite() { - puts("*** Testing wxVCard writing ***\n"); + wxPuts(_T("*** Testing wxVCard writing ***\n")); wxVCard vcard; if ( !vcard.IsOk() ) { - puts("ERROR: couldn't create vCard."); + wxPuts(_T("ERROR: couldn't create vCard.")); } else { // 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 - puts("Entire vCard follows:\n"); - puts(vcard.Write()); + wxPuts(_T("Entire vCard follows:\n")); + wxPuts(vcard.Write()); } } @@ -3406,7 +3550,7 @@ static void TestFSVolume() #endif // TEST_VOLUME // ---------------------------------------------------------------------------- -// wide char (Unicode) support +// wide char and Unicode support // ---------------------------------------------------------------------------- #ifdef TEST_WCHAR @@ -3416,7 +3560,7 @@ static void TestFSVolume() #include "wx/encconv.h" #include "wx/buffer.h" -static const char textInUtf8[] = +static const unsigned char utf8koi8r[] = { 208, 157, 208, 181, 209, 129, 208, 186, 208, 176, 208, 183, 208, 176, 208, 189, 208, 189, 208, 190, 32, 208, 191, 208, 190, 209, 128, 208, @@ -3427,39 +3571,73 @@ static const char textInUtf8[] = 178, 208, 190, 209, 129, 209, 130, 209, 140, 209, 142, 0 }; +static const unsigned char utf8iso8859_1[] = +{ + 0x53, 0x79, 0x73, 0x74, 0xc3, 0xa8, 0x6d, 0x65, 0x73, 0x20, 0x49, 0x6e, + 0x74, 0xc3, 0xa9, 0x67, 0x72, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x20, 0x65, + 0x6e, 0x20, 0x4d, 0xc3, 0xa9, 0x63, 0x61, 0x6e, 0x69, 0x71, 0x75, 0x65, + 0x20, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x69, 0x71, 0x75, 0x65, 0x20, 0x65, + 0x74, 0x20, 0x51, 0x75, 0x61, 0x6e, 0x74, 0x69, 0x71, 0x75, 0x65, 0 +}; + +static const unsigned char utf8Invalid[] = +{ + 0x3c, 0x64, 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79, 0x3e, 0x32, 0x30, 0x30, + 0x32, 0xe5, 0xb9, 0xb4, 0x30, 0x39, 0xe6, 0x9c, 0x88, 0x32, 0x35, 0xe6, + 0x97, 0xa5, 0x20, 0x30, 0x37, 0xe6, 0x99, 0x82, 0x33, 0x39, 0xe5, 0x88, + 0x86, 0x35, 0x37, 0xe7, 0xa7, 0x92, 0x3c, 0x2f, 0x64, 0x69, 0x73, 0x70, + 0x6c, 0x61, 0x79, 0 +}; + +static const struct Utf8Data +{ + const unsigned char *text; + size_t len; + const wxChar *charset; + wxFontEncoding encoding; +} utf8data[] = +{ + { utf8Invalid, WXSIZEOF(utf8Invalid), _T("iso8859-1"), wxFONTENCODING_ISO8859_1 }, + { utf8koi8r, WXSIZEOF(utf8koi8r), _T("koi8-r"), wxFONTENCODING_KOI8 }, + { utf8iso8859_1, WXSIZEOF(utf8iso8859_1), _T("iso8859-1"), wxFONTENCODING_ISO8859_1 }, +}; + static void TestUtf8() { - puts("*** Testing UTF8 support ***\n"); + wxPuts(_T("*** Testing UTF8 support ***\n")); char buf[1024]; wchar_t wbuf[1024]; - if ( wxConvUTF8.MB2WC(wbuf, textInUtf8, WXSIZEOF(textInUtf8)) <= 0 ) - { - puts("ERROR: UTF-8 decoding failed."); - } - else + + for ( size_t n = 0; n < WXSIZEOF(utf8data); n++ ) { - wxCSConv conv(_T("koi8-r")); - if ( conv.WC2MB(buf, wbuf, 0 /* not needed wcslen(wbuf) */) <= 0 ) + const Utf8Data& u8d = utf8data[n]; + if ( wxConvUTF8.MB2WC(wbuf, (const char *)u8d.text, + WXSIZEOF(wbuf)) == (size_t)-1 ) { - puts("ERROR: conversion to KOI8-R failed."); + wxPuts(_T("ERROR: UTF-8 decoding failed.")); } else { - printf("The resulting string (in KOI8-R): %s\n", buf); + wxCSConv conv(u8d.charset); + if ( conv.WC2MB(buf, wbuf, WXSIZEOF(buf)) == (size_t)-1 ) + { + wxPrintf(_T("ERROR: conversion to %s failed.\n"), u8d.charset); + } + else + { + wxPrintf(_T("String in %s: %s\n"), u8d.charset, buf); + } } - } - if ( wxConvUTF8.WC2MB(buf, L"à la", WXSIZEOF(buf)) <= 0 ) - { - puts("ERROR: conversion to UTF-8 failed."); - } - else - { - printf("The string in UTF-8: %s\n", buf); + 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()); + } - puts(""); + wxPuts(wxEmptyString); } static void TestEncodingConverter() @@ -3469,19 +3647,20 @@ static void TestEncodingConverter() // using wxEncodingConverter should give the same result as above char buf[1024]; wchar_t wbuf[1024]; - if ( wxConvUTF8.MB2WC(wbuf, textInUtf8, WXSIZEOF(textInUtf8)) <= 0 ) + if ( wxConvUTF8.MB2WC(wbuf, (const char *)utf8koi8r, + WXSIZEOF(utf8koi8r)) == (size_t)-1 ) { - puts("ERROR: UTF-8 decoding failed."); + wxPuts(_T("ERROR: UTF-8 decoding failed.")); } else { wxEncodingConverter ec; ec.Init(wxFONTENCODING_UNICODE, wxFONTENCODING_KOI8); ec.Convert(wbuf, buf); - printf("The same string obtained using wxEC: %s\n", buf); + wxPrintf(_T("The same KOI8-R string using wxEC: %s\n"), buf); } - puts(""); + wxPuts(wxEmptyString); } #endif // TEST_WCHAR @@ -3500,20 +3679,20 @@ static const wxChar *TESTFILE_ZIP = _T("testdata.zip"); static void TestZipStreamRead() { - puts("*** Testing ZIP reading ***\n"); + wxPuts(_T("*** Testing ZIP reading ***\n")); - static const wxChar *filename = _T("foo"); + static const wxString filename = _T("foo"); wxZipInputStream istr(TESTFILE_ZIP, filename); - printf("Archive size: %u\n", istr.GetSize()); + wxPrintf(_T("Archive size: %u\n"), istr.GetSize()); - printf("Dumping the file '%s':\n", filename); + wxPrintf(_T("Dumping the file '%s':\n"), filename.c_str()); while ( !istr.Eof() ) { - putchar(istr.GetC()); + wxPutchar(istr.GetC()); fflush(stdout); } - puts("\n----- done ------"); + wxPuts(_T("\n----- done ------")); } static void DumpZipDirectory(wxFileSystem& fs, @@ -3560,7 +3739,7 @@ static void DumpZipDirectory(wxFileSystem& fs, static void TestZipFileSystem() { - puts("*** Testing ZIP file system ***\n"); + wxPuts(_T("*** Testing ZIP file system ***\n")); wxFileSystem::AddHandler(new wxZipFSHandler); wxFileSystem fs; @@ -3572,992 +3751,179 @@ static void TestZipFileSystem() #endif // TEST_ZIP // ---------------------------------------------------------------------------- -// ZLIB stream +// date time // ---------------------------------------------------------------------------- -#ifdef TEST_ZLIB +#ifdef TEST_DATETIME -#include "wx/zstream.h" -#include "wx/wfstream.h" +#include -static const wxChar *FILENAME_GZ = _T("test.gz"); -static const char *TEST_DATA = "hello and hello again"; +#include "wx/datetime.h" -static void TestZlibStreamWrite() -{ - puts("*** Testing Zlib stream reading ***\n"); +// this test miscellaneous static wxDateTime functions - wxFileOutputStream fileOutStream(FILENAME_GZ); - wxZlibOutputStream ostr(fileOutStream, 0); - printf("Compressing the test string... "); - ostr.Write(TEST_DATA, sizeof(TEST_DATA)); - if ( !ostr ) - { - puts("(ERROR: failed)"); - } - else - { - puts("(ok)"); - } - - puts("\n----- done ------"); -} - -static void TestZlibStreamRead() -{ - puts("*** Testing Zlib stream reading ***\n"); - - wxFileInputStream fileInStream(FILENAME_GZ); - wxZlibInputStream istr(fileInStream); - printf("Archive size: %u\n", istr.GetSize()); - - puts("Dumping the file:"); - while ( !istr.Eof() ) - { - putchar(istr.GetC()); - fflush(stdout); - } - - puts("\n----- done ------"); -} - -#endif // TEST_ZLIB - -// ---------------------------------------------------------------------------- -// date time -// ---------------------------------------------------------------------------- - -#ifdef TEST_DATETIME - -#include - -#include "wx/date.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; - } +#if TEST_ALL - wxString Format() const - { - wxString s; - s.Printf("%02d:%02d:%02d %10s %02d, %4d%s", - hour, min, sec, - wxDateTime::GetMonthName(month).c_str(), - day, - abs(wxDateTime::ConvertYearToBC(year)), - year > 0 ? "AD" : "BC"); - return s; - } - - wxString FormatDate() const - { - wxString s; - s.Printf("%02d-%s-%4d%s", - day, - wxDateTime::GetMonthName(month, wxDateTime::Name_Abbr).c_str(), - abs(wxDateTime::ConvertYearToBC(year)), - year > 0 ? "AD" : "BC"); - return s; - } -}; - -static const Date testDates[] = -{ - { 1, wxDateTime::Jan, 1970, 00, 00, 00, 2440587.5, wxDateTime::Thu, 0, -3600 }, - { 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 }, -}; - -// this test miscellaneous static wxDateTime functions static void TestTimeStatic() { - puts("\n*** wxDateTime static methods test ***"); + wxPuts(_T("\n*** wxDateTime static methods test ***")); // some info about the current date int year = wxDateTime::GetCurrentYear(); - printf("Current year %d is %sa leap one and has %d days.\n", + wxPrintf(_T("Current year %d is %sa leap one and has %d days.\n"), year, wxDateTime::IsLeapYear(year) ? "" : "not ", wxDateTime::GetNumberOfDays(year)); wxDateTime::Month month = wxDateTime::GetCurrentMonth(); - printf("Current month is '%s' ('%s') and it has %d days\n", + wxPrintf(_T("Current month is '%s' ('%s') and it has %d days\n"), 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); - - printf("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() -{ - puts("\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(); - - printf("Date: %s == %s (%s)\n", - s1.c_str(), s2.c_str(), - s1 == s2 ? "ok" : "ERROR"); - } } // test time zones stuff static void TestTimeZones() { - puts("\n*** wxDateTime timezone test ***"); + wxPuts(_T("\n*** wxDateTime timezone test ***")); wxDateTime now = wxDateTime::Now(); - printf("Current GMT time:\t%s\n", now.Format("%c", wxDateTime::GMT0).c_str()); - printf("Unix epoch (GMT):\t%s\n", wxDateTime((time_t)0).Format("%c", wxDateTime::GMT0).c_str()); - printf("Unix epoch (EST):\t%s\n", wxDateTime((time_t)0).Format("%c", wxDateTime::EST).c_str()); - printf("Current time in Paris:\t%s\n", now.Format("%c", wxDateTime::CET).c_str()); - printf(" Moscow:\t%s\n", now.Format("%c", wxDateTime::MSK).c_str()); - printf(" New York:\t%s\n", now.Format("%c", wxDateTime::EST).c_str()); + wxPrintf(_T("Current GMT time:\t%s\n"), now.Format(_T("%c"), wxDateTime::GMT0).c_str()); + wxPrintf(_T("Unix epoch (GMT):\t%s\n"), wxDateTime((time_t)0).Format(_T("%c"), wxDateTime::GMT0).c_str()); + wxPrintf(_T("Unix epoch (EST):\t%s\n"), wxDateTime((time_t)0).Format(_T("%c"), wxDateTime::EST).c_str()); + wxPrintf(_T("Current time in Paris:\t%s\n"), now.Format(_T("%c"), wxDateTime::CET).c_str()); + 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 ) { - printf("ERROR: got %s instead of %s\n", - wxDateTime(tm).Format().c_str(), now.Format().c_str()); + wxPrintf(_T("ERROR: got %s instead of %s\n"), + wxDateTime(tm).Format().c_str(), now.Format().c_str()); } } // test some minimal support for the dates outside the standard range static void TestTimeRange() { - puts("\n*** wxDateTime out-of-standard-range dates test ***"); - - static const char *fmt = "%d-%b-%Y %H:%M:%S"; - - printf("Unix epoch:\t%s\n", - wxDateTime(2440587.5).Format(fmt).c_str()); - printf("Feb 29, 0: \t%s\n", - wxDateTime(29, wxDateTime::Feb, 0).Format(fmt).c_str()); - printf("JDN 0: \t%s\n", - wxDateTime(0.0).Format(fmt).c_str()); - printf("Jan 1, 1AD:\t%s\n", - wxDateTime(1, wxDateTime::Jan, 1).Format(fmt).c_str()); - printf("May 29, 2099:\t%s\n", - wxDateTime(29, wxDateTime::May, 2099).Format(fmt).c_str()); -} - -static void TestTimeTicks() -{ - puts("\n*** wxDateTime ticks test ***"); - - for ( size_t n = 0; n < WXSIZEOF(testDates); n++ ) - { - const Date& d = testDates[n]; - if ( d.ticks == -1 ) - continue; - - wxDateTime dt = d.DT(); - long ticks = (dt.GetValue() / 1000).ToLong(); - printf("Ticks of %s:\t% 10ld", d.Format().c_str(), ticks); - if ( ticks == d.ticks ) - { - puts(" (ok)"); - } - else - { - printf(" (ERROR: should be %ld, delta = %ld)\n", - (long)d.ticks, (long)(ticks - d.ticks)); - } - - dt = d.DT().ToTimezone(wxDateTime::GMT0); - ticks = (dt.GetValue() / 1000).ToLong(); - printf("GMtks of %s:\t% 10ld", d.Format().c_str(), ticks); - if ( ticks == d.gmticks ) - { - puts(" (ok)"); - } - else - { - printf(" (ERROR: should be %ld, delta = %ld)\n", - (long)d.gmticks, (long)(ticks - d.gmticks)); - } - } - - puts(""); -} - -// test conversions to JDN &c -static void TestTimeJDN() -{ - puts("\n*** wxDateTime to JDN test ***"); - - for ( size_t 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); - double jdn = dt.GetJulianDayNumber(); - - printf("JDN of %s is:\t% 15.6f", d.Format().c_str(), jdn); - if ( jdn == d.jdn ) - { - puts(" (ok)"); - } - else - { - printf(" (ERROR: should be %f, delta = %f)\n", - d.jdn, jdn - d.jdn); - } - } -} - -// test week days computation -static void TestTimeWDays() -{ - puts("\n*** wxDateTime weekday test ***"); - - // 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::WeekDay wday = dt.GetWeekDay(); - printf("%s is: %s", - d.Format().c_str(), - wxDateTime::GetWeekDayName(wday).c_str()); - if ( wday == d.wday ) - { - puts(" (ok)"); - } - else - { - printf(" (ERROR: should be %s)\n", - wxDateTime::GetWeekDayName(d.wday).c_str()); - } - } - - puts(""); - - // 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 + wxPuts(_T("\n*** wxDateTime out-of-standard-range dates test ***")); - wxString Format() const - { - wxString s, which; - switch ( nWeek < -1 ? -nWeek : nWeek ) - { - case 1: which = "first"; break; - case 2: which = "second"; break; - case 3: which = "third"; break; - case 4: which = "fourth"; break; - case 5: which = "fifth"; break; - - case -1: which = "last"; break; - } - - if ( nWeek < -1 ) - { - which += " from end"; - } - - s.Printf("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 * + static const wxChar *fmt = _T("%d-%b-%Y %H:%M:%S"); -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 - */ - - 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 }, - }; - - static const char *fmt = "%d-%b-%Y"; - - wxDateTime dt; - for ( n = 0; n < WXSIZEOF(weekDatesTestData); n++ ) - { - const WeekDateTestData& wd = weekDatesTestData[n]; - - dt.SetToWeekDay(wd.wday, wd.nWeek, wd.month, wd.year); - - printf("%s is %s", wd.Format().c_str(), dt.Format(fmt).c_str()); - - const Date& d = wd.date; - if ( d.SameDay(dt.GetTm()) ) - { - puts(" (ok)"); - } - else - { - dt.Set(d.day, d.month, d.year); - - printf(" (ERROR: should be %s)\n", dt.Format(fmt).c_str()); - } - } -} - -// test the computation of (ISO) week numbers -static void TestTimeWNumber() -{ - puts("\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(); - - printf("%s: the day number is %d", - d.FormatDate().c_str(), dnum); - if ( dnum == wn.dnum ) - { - printf(" (ok)"); - } - else - { - printf(" (ERROR: should be %d)", wn.dnum); - } - - printf(", week in month is %d", wmon); - if ( wmon == wn.wmon ) - { - printf(" (ok)"); - } - else - { - printf(" (ERROR: should be %d)", wn.wmon); - } - - printf(" or %d", wmon2); - if ( wmon2 == wn.wmon2 ) - { - printf(" (ok)"); - } - else - { - printf(" (ERROR: should be %d)", wn.wmon2); - } - - printf(", week in year is %d", week); - if ( week == wn.week ) - { - puts(" (ok)"); - } - else - { - printf(" (ERROR: should be %d)\n", wn.week); - } - } -} - -// test DST calculations -static void TestTimeDST() -{ - puts("\n*** wxDateTime DST test ***"); - - printf("DST is%s in effect now.\n\n", - wxDateTime::Now().IsDST() ? "" : " 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 }, - } - }; - - int year; - for ( year = 1990; year < 2005; year++ ) - { - wxDateTime dtBegin = wxDateTime::GetBeginDST(year, wxDateTime::USA), - dtEnd = wxDateTime::GetEndDST(year, wxDateTime::USA); - - printf("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]; - - if ( dBegin.SameDay(dtBegin.GetTm()) && dEnd.SameDay(dtEnd.GetTm()) ) - { - puts(" (ok)"); - } - else - { - printf(" (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); - } - } - - puts(""); - - for ( year = 1990; year < 2005; year++ ) - { - printf("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()); - } -} - -// test wxDateTime -> text conversion -static void TestTimeFormat() -{ - puts("\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 char *format; - } formatTestFormats[] = - { - { CompareBoth, "---> %c" }, - { CompareDate, "Date is %A, %d of %B, in year %Y" }, - { CompareBoth, "Date is %x, time is %X" }, - { CompareTime, "Time is %H:%M:%S or %I:%M:%S %p" }, - { CompareNone, "The day of year: %j, the week of year: %W" }, - { CompareDate, "ISO date without separators: %4Y%2m%2d" }, - }; - - static const Date formatTestDates[] = - { - { 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 - }; - - // an extra test (as it doesn't depend on date, don't do it in the loop) - printf("%s\n", wxDateTime::Now().Format("Our timezone is %Z").c_str()); - - for ( size_t d = 0; d < WXSIZEOF(formatTestDates) + 1; d++ ) - { - puts(""); - - 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); - printf("%s", s.c_str()); - - // what can we recover? - int kind = formatTestFormats[n].compareKind; - - // convert back - wxDateTime dt2; - const wxChar *result = dt2.ParseFormat(s, formatTestFormats[n].format); - if ( !result ) - { - // converion failed - should it have? - if ( kind == CompareNone ) - puts(" (ok)"); - else - puts(" (ERROR: conversion back failed)"); - } - else if ( *result ) - { - // should have parsed the entire string - puts(" (ERROR: conversion back stopped too soon)"); - } - else - { - bool equal = FALSE; // suppress compilaer warning - switch ( kind ) - { - case CompareBoth: - equal = dt2 == dt; - break; - - case CompareDate: - equal = dt.IsSameDate(dt2); - break; - - case CompareTime: - equal = dt.IsSameTime(dt2); - break; - } - - if ( !equal ) - { - printf(" (ERROR: got back '%s' instead of '%s')\n", - dt2.Format().c_str(), dt.Format().c_str()); - } - else - { - puts(" (ok)"); - } - } - } - } -} - -// test text -> wxDateTime conversion -static void TestTimeParse() -{ - puts("\n*** wxDateTime parse test ***"); - - struct ParseTestData - { - const char *format; - Date date; - bool good; - }; - - static const ParseTestData parseTestDates[] = - { - { "Sat, 18 Dec 1999 00:46:40 +0100", { 18, wxDateTime::Dec, 1999, 00, 46, 40 }, TRUE }, - { "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++ ) - { - const char *format = parseTestDates[n].format; - - printf("%s => ", format); - - wxDateTime dt; - if ( dt.ParseRfc822Date(format) ) - { - printf("%s ", dt.Format().c_str()); - - if ( parseTestDates[n].good ) - { - wxDateTime dtReal = parseTestDates[n].date.DT(); - if ( dt == dtReal ) - { - puts("(ok)"); - } - else - { - printf("(ERROR: should be %s)\n", dtReal.Format().c_str()); - } - } - else - { - puts("(ERROR: bad format)"); - } - } - else - { - printf("bad format (%s)\n", - parseTestDates[n].good ? "ERROR" : "ok"); - } + wxPrintf(_T("Unix epoch:\t%s\n"), + wxDateTime(2440587.5).Format(fmt).c_str()); + wxPrintf(_T("Feb 29, 0: \t%s\n"), + wxDateTime(29, wxDateTime::Feb, 0).Format(fmt).c_str()); + wxPrintf(_T("JDN 0: \t%s\n"), + wxDateTime(0.0).Format(fmt).c_str()); + wxPrintf(_T("Jan 1, 1AD:\t%s\n"), + wxDateTime(1, wxDateTime::Jan, 1).Format(fmt).c_str()); + wxPrintf(_T("May 29, 2099:\t%s\n"), + wxDateTime(29, wxDateTime::May, 2099).Format(fmt).c_str()); +} + +// test DST calculations +static void TestTimeDST() +{ + wxPuts(_T("\n*** wxDateTime DST test ***")); + + wxPrintf(_T("DST is%s in effect now.\n\n"), + wxDateTime::Now().IsDST() ? wxEmptyString : _T(" not")); + + 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()); } } +#endif // TEST_ALL + +#if TEST_INTERACTIVE + static void TestDateTimeInteractive() { - puts("\n*** interactive wxDateTime tests ***"); + wxPuts(_T("\n*** interactive wxDateTime tests ***")); - char buf[128]; + wxChar buf[128]; for ( ;; ) { - printf("Enter a date: "); - if ( !fgets(buf, WXSIZEOF(buf), stdin) ) + wxPrintf(_T("Enter a date: ")); + if ( !wxFgets(buf, WXSIZEOF(buf), stdin) ) break; // kill the last '\n' - buf[strlen(buf) - 1] = 0; + buf[wxStrlen(buf) - 1] = 0; wxDateTime dt; - const char *p = dt.ParseDate(buf); + const wxChar *p = dt.ParseDate(buf); if ( !p ) { - printf("ERROR: failed to parse the date '%s'.\n", buf); + wxPrintf(_T("ERROR: failed to parse the date '%s'.\n"), buf); continue; } else if ( *p ) { - printf("WARNING: parsed only first %u characters.\n", p - buf); + wxPrintf(_T("WARNING: parsed only first %u characters.\n"), p - buf); } - printf("%s: day %u, week of month %u/%u, week of year %u\n", - dt.Format("%b %d, %Y").c_str(), - dt.GetDayOfYear(), - dt.GetWeekOfMonth(wxDateTime::Monday_First), - dt.GetWeekOfMonth(wxDateTime::Sunday_First), - dt.GetWeekOfYear(wxDateTime::Monday_First)); + 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)); } - puts("\n*** done ***"); + wxPuts(_T("\n*** done ***")); } +#endif // TEST_INTERACTIVE + +#if TEST_ALL + static void TestTimeMS() { - puts("*** testing millisecond-resolution support in wxDateTime ***"); + wxPuts(_T("*** testing millisecond-resolution support in wxDateTime ***")); wxDateTime dt1 = wxDateTime::Now(), dt2 = wxDateTime::UNow(); - printf("Now = %s\n", dt1.Format("%H:%M:%S:%l").c_str()); - printf("UNow = %s\n", dt2.Format("%H:%M:%S:%l").c_str()); - printf("Dummy loop: "); + 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("%g", sqrt(i)); + s.Printf(_T("%g"), sqrt((float)i)); } if ( !(i % 100) ) - putchar('.'); + wxPutchar('.'); } - puts(", done"); + wxPuts(_T(", done")); dt1 = dt2; dt2 = wxDateTime::UNow(); - printf("UNow = %s\n", dt2.Format("%H:%M:%S:%l").c_str()); - - printf("Loop executed in %s ms\n", (dt2 - dt1).Format("%l").c_str()); - - puts("\n*** done ***"); -} - -static void TestTimeArithmetics() -{ - puts("\n*** testing arithmetic operations on wxDateTime ***"); - - static const struct ArithmData - { - ArithmData(const wxDateSpan& sp, const char *nam) - : span(sp), name(nam) { } - - wxDateSpan span; - const char *name; - } testArithmData[] = - { - ArithmData(wxDateSpan::Day(), "day"), - ArithmData(wxDateSpan::Week(), "week"), - ArithmData(wxDateSpan::Month(), "month"), - ArithmData(wxDateSpan::Year(), "year"), - ArithmData(wxDateSpan(1, 2, 3, 4), "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 char *name = testArithmData[n].name; - printf("%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()); - - printf("Going back: %s", (dt1 - span).FormatISODate().c_str()); - if ( dt1 - span == dt ) - { - puts(" (ok)"); - } - else - { - printf(" (ERROR: should be %s)\n", dt.FormatISODate().c_str()); - } + wxPrintf(_T("UNow = %s\n"), dt2.Format(_T("%H:%M:%S:%l")).c_str()); - printf("Going forward: %s", (dt2 + span).FormatISODate().c_str()); - if ( dt2 + span == dt ) - { - puts(" (ok)"); - } - else - { - printf(" (ERROR: should be %s)\n", dt.FormatISODate().c_str()); - } - - printf("Double increment: %s", (dt2 + 2*span).FormatISODate().c_str()); - if ( dt2 + 2*span == dt1 ) - { - puts(" (ok)"); - } - else - { - printf(" (ERROR: should be %s)\n", dt2.FormatISODate().c_str()); - } + wxPrintf(_T("Loop executed in %s ms\n"), (dt2 - dt1).Format(_T("%l")).c_str()); - puts(""); - } + wxPuts(_T("\n*** done ***")); } static void TestTimeHolidays() { - puts("\n*** testing wxDateTimeHolidayAuthority ***\n"); + wxPuts(_T("\n*** testing wxDateTimeHolidayAuthority ***\n")); wxDateTime::Tm tm = wxDateTime(29, wxDateTime::May, 2000).GetTm(); wxDateTime dtStart(1, tm.mon, tm.year), @@ -4566,42 +3932,42 @@ static void TestTimeHolidays() wxDateTimeArray hol; wxDateTimeHolidayAuthority::GetHolidaysInRange(dtStart, dtEnd, hol); - const wxChar *format = "%d-%b-%Y (%a)"; + const wxChar *format = _T("%d-%b-%Y (%a)"); - printf("All holidays between %s and %s:\n", + 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++ ) { - printf("\t%s\n", hol[n].Format(format).c_str()); + wxPrintf(_T("\t%s\n"), hol[n].Format(format).c_str()); } - puts(""); + wxPuts(wxEmptyString); } static void TestTimeZoneBug() { - puts("\n*** testing for DST/timezone bug ***\n"); + wxPuts(_T("\n*** testing for DST/timezone bug ***\n")); wxDateTime date = wxDateTime(1, wxDateTime::Mar, 2000); for ( int i = 0; i < 31; i++ ) { - printf("Date %s: week day %s.\n", + 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(); } - puts(""); + wxPuts(wxEmptyString); } static void TestTimeSpanFormat() { - puts("\n*** wxTimeSpan tests ***"); + wxPuts(_T("\n*** wxTimeSpan tests ***")); - static const char *formats[] = + static const wxChar *formats[] = { _T("(default) %H:%M:%S"), _T("%E weeks and %D days"), @@ -4616,47 +3982,57 @@ static void TestTimeSpanFormat() ts2(111, 222, 333); for ( size_t n = 0; n < WXSIZEOF(formats); n++ ) { - printf("ts1 = %s\tts2 = %s\n", + wxPrintf(_T("ts1 = %s\tts2 = %s\n"), ts1.Format(formats[n]).c_str(), ts2.Format(formats[n]).c_str()); } - puts(""); + wxPuts(wxEmptyString); } -#if 0 +#endif // TEST_ALL -// test compatibility with the old wxDate/wxTime classes -static void TestTimeCompatibility() -{ - puts("\n*** wxDateTime compatibility test ***"); +#endif // TEST_DATETIME + +// ---------------------------------------------------------------------------- +// wxTextInput/OutputStream +// ---------------------------------------------------------------------------- - printf("wxDate for JDN 0: %s\n", wxDate(0l).FormatDate().c_str()); - printf("wxDate for MJD 0: %s\n", wxDate(2400000).FormatDate().c_str()); +#ifdef TEST_TEXTSTREAM - double jdnNow = wxDateTime::Now().GetJDN(); - long jdnMidnight = (long)(jdnNow - 0.5); - printf("wxDate for today: %s\n", wxDate(jdnMidnight).FormatDate().c_str()); +#include "wx/txtstrm.h" +#include "wx/wfstream.h" - jdnMidnight = wxDate().Set().GetJulianDate(); - printf("wxDateTime for today: %s\n", - wxDateTime((double)(jdnMidnight + 0.5)).Format("%c", wxDateTime::GMT0).c_str()); +static void TestTextInputStream() +{ + wxPuts(_T("\n*** wxTextInputStream test ***")); - int flags = wxEUROPEAN;//wxFULL; - wxDate date; - date.Set(); - printf("Today is %s\n", date.FormatDate(flags).c_str()); - for ( int n = 0; n < 7; n++ ) + wxString filename = _T("testdata.fc"); + wxFileInputStream fsIn(filename); + if ( !fsIn.Ok() ) { - printf("Previous %s is %s\n", - wxDateTime::GetWeekDayName((wxDateTime::WeekDay)n), - date.Previous(n + 1).FormatDate(flags).c_str()); + wxPuts(_T("ERROR: couldn't open file.")); } -} + else + { + wxTextInputStream tis(fsIn); -#endif // 0 + size_t line = 1; + for ( ;; ) + { + const wxString s = tis.ReadLine(); -#endif // TEST_DATETIME + // 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 @@ -4700,11 +4076,11 @@ wxThread::ExitCode MyJoinableThread::Entry() class MyDetachedThread : public wxThread { public: - MyDetachedThread(size_t n, char ch) + MyDetachedThread(size_t n, wxChar ch) { m_n = n; m_ch = ch; - m_cancelled = FALSE; + m_cancelled = false; Create(); } @@ -4717,9 +4093,9 @@ public: private: size_t m_n; // number of characters to write - char m_ch; // character to write + wxChar m_ch; // character to write - bool m_cancelled; // FALSE if we exit normally + bool m_cancelled; // false if we exit normally }; wxThread::ExitCode MyDetachedThread::Entry() @@ -4736,12 +4112,12 @@ wxThread::ExitCode MyDetachedThread::Entry() { if ( TestDestroy() ) { - m_cancelled = TRUE; + m_cancelled = true; break; } - putchar(m_ch); + wxPutchar(m_ch); fflush(stdout); wxThread::Sleep(100); @@ -4752,7 +4128,7 @@ wxThread::ExitCode MyDetachedThread::Entry() void MyDetachedThread::OnExit() { - wxLogTrace("thread", "Thread %ld is in OnExit", GetId()); + wxLogTrace(_T("thread"), _T("Thread %ld is in OnExit"), GetId()); wxCriticalSectionLocker lock(gs_critsect); if ( !--gs_counter && !m_cancelled ) @@ -4761,7 +4137,7 @@ void MyDetachedThread::OnExit() static void TestDetachedThreads() { - puts("\n*** Testing detached threads ***"); + wxPuts(_T("\n*** Testing detached threads ***")); static const size_t nThreads = 3; MyDetachedThread *threads[nThreads]; @@ -4782,24 +4158,24 @@ static void TestDetachedThreads() // wait until all threads terminate gs_cond.Wait(); - puts(""); + wxPuts(wxEmptyString); } static void TestJoinableThreads() { - puts("\n*** Testing a joinable thread (a loooong calculation...) ***"); + wxPuts(_T("\n*** Testing a joinable thread (a loooong calculation...) ***")); // calc 10! in the background MyJoinableThread thread(10); thread.Run(); - printf("\nThread terminated with exit code %lu.\n", - (unsigned long)thread.Wait()); + wxPrintf(_T("\nThread terminated with exit code %lu.\n"), + (unsigned long)thread.Wait()); } static void TestThreadSuspend() { - puts("\n*** Testing thread suspend/resume functions ***"); + wxPuts(_T("\n*** Testing thread suspend/resume functions ***")); MyDetachedThread *thread = new MyDetachedThread(15, 'X'); @@ -4817,23 +4193,23 @@ static void TestThreadSuspend() { thread->Pause(); - puts("\nThread suspended"); + wxPuts(_T("\nThread suspended")); if ( n > 0 ) { // don't sleep but resume immediately the first time wxThread::Sleep(300); } - puts("Going to resume the thread"); + wxPuts(_T("Going to resume the thread")); thread->Resume(); } - puts("Waiting until it terminates now"); + wxPuts(_T("Waiting until it terminates now")); // wait until the thread terminates gs_cond.Wait(); - puts(""); + wxPuts(wxEmptyString); } static void TestThreadDelete() @@ -4843,13 +4219,13 @@ static void TestThreadDelete() // running when we delete it - deleting a detached thread which already // terminated will lead to a crash! - puts("\n*** Testing thread delete function ***"); + wxPuts(_T("\n*** Testing thread delete function ***")); MyDetachedThread *thread0 = new MyDetachedThread(30, 'W'); thread0->Delete(); - puts("\nDeleted a thread which didn't start to run yet."); + wxPuts(_T("\nDeleted a thread which didn't start to run yet.")); MyDetachedThread *thread1 = new MyDetachedThread(30, 'Y'); @@ -4859,7 +4235,7 @@ static void TestThreadDelete() thread1->Delete(); - puts("\nDeleted a running thread."); + wxPuts(_T("\nDeleted a running thread.")); MyDetachedThread *thread2 = new MyDetachedThread(30, 'Z'); @@ -4871,14 +4247,14 @@ static void TestThreadDelete() thread2->Delete(); - puts("\nDeleted a sleeping thread."); + wxPuts(_T("\nDeleted a sleeping thread.")); MyJoinableThread thread3(20); thread3.Run(); thread3.Delete(); - puts("\nDeleted a joinable thread."); + wxPuts(_T("\nDeleted a joinable thread.")); MyJoinableThread thread4(2); thread4.Run(); @@ -4887,9 +4263,9 @@ static void TestThreadDelete() thread4.Delete(); - puts("\nDeleted a joinable thread which already terminated."); + wxPuts(_T("\nDeleted a joinable thread which already terminated.")); - puts(""); + wxPuts(wxEmptyString); } class MyWaitingThread : public wxThread @@ -4905,19 +4281,19 @@ public: virtual ExitCode Entry() { - printf("Thread %lu has started running.\n", GetId()); + wxPrintf(_T("Thread %lu has started running.\n"), GetId()); fflush(stdout); gs_cond.Post(); - printf("Thread %lu starts to wait...\n", GetId()); + wxPrintf(_T("Thread %lu starts to wait...\n"), GetId()); fflush(stdout); m_mutex->Lock(); m_condition->Wait(); m_mutex->Unlock(); - printf("Thread %lu finished to wait, exiting.\n", GetId()); + wxPrintf(_T("Thread %lu finished to wait, exiting.\n"), GetId()); fflush(stdout); return 0; @@ -4930,702 +4306,163 @@ private: static void TestThreadConditions() { - wxMutex mutex; - wxCondition condition(mutex); - - // otherwise its difficult to understand which log messages pertain to - // which condition - //wxLogTrace("thread", "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 - puts("Main thread is waiting for the other threads to start"); - fflush(stdout); - - size_t nRunning = 0; - while ( nRunning < WXSIZEOF(threads) ) - { - gs_cond.Wait(); - - nRunning++; - - printf("Main thread: %u already running\n", nRunning); - fflush(stdout); - } - - puts("Main thread: all threads started up."); - fflush(stdout); - - wxThread::Sleep(500); - -#if 1 - // now wake one of them up - printf("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 - printf("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); - } - -private: - wxString m_command; -}; - -static void TestThreadExec() -{ - wxPuts(_T("*** Testing wxExecute interaction with threads ***\n")); - - MyExecThread thread(_T("true")); - thread.Run(); - - wxPrintf(_T("Main program exit code: %ld.\n"), - wxExecute(_T("false"), wxEXEC_SYNC)); - - wxPrintf(_T("Thread exit code: %ld.\n"), (long)thread.Wait()); -} - -// semaphore tests -#include "wx/datetime.h" - -class MySemaphoreThread : public wxThread -{ -public: - MySemaphoreThread(int i, wxSemaphore *sem) - : wxThread(wxTHREAD_JOINABLE), - m_sem(sem), - m_i(i) - { - Create(); - } - - virtual ExitCode Entry() - { - wxPrintf(_T("%s: Thread %d starting to wait for semaphore...\n"), - wxDateTime::Now().FormatTime().c_str(), m_i); - - m_sem->Wait(); - - wxPrintf(_T("%s: Thread %d acquired the semaphore.\n"), - wxDateTime::Now().FormatTime().c_str(), m_i); - - Sleep(1000); - - wxPrintf(_T("%s: Thread %d releasing the semaphore.\n"), - wxDateTime::Now().FormatTime().c_str(), m_i); - - m_sem->Post(); - - return 0; - } - -private: - wxSemaphore *m_sem; - int m_i; -}; - -WX_DEFINE_ARRAY(wxThread *, ArrayThreads); - -static void TestSemaphore() -{ - 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(); - } - - for ( size_t n = 0; n < threads.GetCount(); n++ ) - { - threads[n]->Wait(); - delete threads[n]; - } -} - -#endif // TEST_THREADS - -// ---------------------------------------------------------------------------- -// arrays -// ---------------------------------------------------------------------------- - -#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 char* name, const wxArrayString& array) -{ - printf("Dump of the array '%s'\n", name); - - size_t nCount = array.GetCount(); - for ( size_t n = 0; n < nCount; n++ ) - { - printf("\t%s[%u] = '%s'\n", name, n, array[n].c_str()); - } -} - -int wxCMPFUNC_CONV StringLenCompare(const wxString& first, - const wxString& second) -{ - return first.length() - second.length(); -} - -#define TestArrayOf(name) \ - \ -static void PrintArray(const char* name, const wxSortedArray##name & array) \ -{ \ - printf("Dump of the array '%s'\n", name); \ - \ - size_t nCount = array.GetCount(); \ - for ( size_t n = 0; n < nCount; n++ ) \ - { \ - printf("\t%s[%u] = %d\n", name, n, array[n]); \ - } \ -} \ - \ -static void PrintArray(const char* name, const wxArray##name & array) \ -{ \ - printf("Dump of the array '%s'\n", name); \ - \ - size_t nCount = array.GetCount(); \ - for ( size_t n = 0; n < nCount; n++ ) \ - { \ - printf("\t%s[%u] = %d\n", name, n, array[n]); \ - } \ -} \ - \ -static void TestArrayOf ## name ## s() \ -{ \ - printf("*** Testing wxArray%s ***\n", #name); \ - \ - wxArray##name a; \ - a.Add(1); \ - a.Add(17,2); \ - a.Add(5,3); \ - a.Add(3,4); \ - \ - puts("Initially:"); \ - PrintArray("a", a); \ - \ - puts("After sort:"); \ - a.Sort(name ## Compare); \ - PrintArray("a", a); \ - \ - puts("After reverse sort:"); \ - a.Sort(name ## RevCompare); \ - PrintArray("a", a); \ - \ - wxSortedArray##name b; \ - b.Add(1); \ - b.Add(17); \ - b.Add(5); \ - b.Add(3); \ - \ - puts("Sorted array initially:"); \ - PrintArray("b", b); \ -} - -TestArrayOf(UShort); -TestArrayOf(Int); - -static void TestArrayOfObjects() -{ - puts("*** Testing wxObjArray ***\n"); - - { - ArrayBars bars; - Bar bar("second bar (two copies!)"); - - printf("Initially: %u objects in the array, %u objects total.\n", - bars.GetCount(), Bar::GetNumber()); - - bars.Add(new Bar("first bar")); - bars.Add(bar,2); - - printf("Now: %u objects in the array, %u objects total.\n", - bars.GetCount(), Bar::GetNumber()); - - bars.RemoveAt(1, bars.GetCount() - 1); - - printf("After removing all but first element: %u objects in the " - "array, %u objects total.\n", - bars.GetCount(), Bar::GetNumber()); - - bars.Empty(); - - printf("After Empty(): %u objects in the array, %u objects total.\n", - bars.GetCount(), Bar::GetNumber()); - } - - printf("Finally: no more objects in the array, %u objects total.\n", - Bar::GetNumber()); -} - -#endif // TEST_ARRAYS - -// ---------------------------------------------------------------------------- -// strings -// ---------------------------------------------------------------------------- - -#ifdef TEST_STRINGS - -#include "wx/timer.h" -#include "wx/tokenzr.h" - -static void TestStringConstruction() -{ - puts("*** Testing wxString constructores ***"); - - #define TEST_CTOR(args, res) \ - { \ - wxString s args ; \ - printf("wxString%s = %s ", #args, s.c_str()); \ - if ( s == res ) \ - { \ - puts("(ok)"); \ - } \ - else \ - { \ - printf("(ERROR: should be %s)\n", res); \ - } \ - } - - 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 - - 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")); - - puts(""); -} - -static void TestString() -{ - wxStopWatch sw; + wxMutex mutex; + wxCondition condition(mutex); - wxString a, b, c; + // 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()); - a.reserve (128); - b.reserve (128); - c.reserve (128); + // create and launch threads + MyWaitingThread *threads[10]; - for (int i = 0; i < 1000000; ++i) + size_t n; + for ( n = 0; n < WXSIZEOF(threads); n++ ) { - a = "Hello"; - b = " world"; - c = "! How'ya doin'?"; - a += b; - a += c; - c = "Hello world! What's up?"; - if (c != a) - c = "Doh!"; + threads[n] = new MyWaitingThread( &mutex, &condition ); } - printf ("TestString elapsed time: %ld\n", sw.Time()); -} - -static void TestPChar() -{ - wxStopWatch sw; - - char a [128]; - char b [128]; - char c [128]; - - for (int i = 0; i < 1000000; ++i) + for ( n = 0; n < WXSIZEOF(threads); n++ ) { - strcpy (a, "Hello"); - strcpy (b, " world"); - strcpy (c, "! How'ya doin'?"); - strcat (a, b); - strcat (a, c); - strcpy (c, "Hello world! What's up?"); - if (strcmp (c, a) == 0) - strcpy (c, "Doh!"); + threads[n]->Run(); } - printf ("TestPChar elapsed time: %ld\n", sw.Time()); -} - -static void TestStringSub() -{ - wxString s("Hello, world!"); - - puts("*** Testing wxString substring extraction ***"); - - printf("String = '%s'\n", s.c_str()); - printf("Left(5) = '%s'\n", s.Left(5).c_str()); - printf("Right(6) = '%s'\n", s.Right(6).c_str()); - printf("Mid(3, 5) = '%s'\n", s(3, 5).c_str()); - printf("Mid(3) = '%s'\n", s.Mid(3).c_str()); - printf("substr(3, 5) = '%s'\n", s.substr(3, 5).c_str()); - printf("substr(3) = '%s'\n", s.substr(3).c_str()); + // wait until all threads run + wxPuts(_T("Main thread is waiting for the other threads to start")); + fflush(stdout); - static const wxChar *prefixes[] = + size_t nRunning = 0; + while ( nRunning < WXSIZEOF(threads) ) { - _T("Hello"), - _T("Hello, "), - _T("Hello, world!"), - _T("Hello, world!!!"), - _T(""), - _T("Goodbye"), - _T("Hi"), - }; + gs_cond.Wait(); - for ( size_t n = 0; n < WXSIZEOF(prefixes); n++ ) - { - wxString prefix = prefixes[n], rest; - bool rc = s.StartsWith(prefix, &rest); - printf("StartsWith('%s') = %s", prefix.c_str(), rc ? "TRUE" : "FALSE"); - if ( rc ) - { - printf(" (the rest is '%s')\n", rest.c_str()); - } - else - { - putchar('\n'); - } + nRunning++; + + wxPrintf(_T("Main thread: %u already running\n"), nRunning); + fflush(stdout); } - puts(""); -} + wxPuts(_T("Main thread: all threads started up.")); + fflush(stdout); -static void TestStringFormat() -{ - puts("*** Testing wxString formatting ***"); + wxThread::Sleep(500); - wxString s; - s.Printf("%03d", 18); +#if 1 + // now wake one of them up + wxPrintf(_T("Main thread: about to signal the condition.\n")); + fflush(stdout); + condition.Signal(); +#endif - printf("Number 18: %s\n", wxString::Format("%03d", 18).c_str()); - printf("Number 18: %s\n", s.c_str()); + wxThread::Sleep(200); - puts(""); -} + // 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(); -// 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; + // give them time to terminate (dirty!) + wxThread::Sleep(500); } -static void TestStringFind() -{ - puts("*** Testing wxString find() functions ***"); +#include "wx/utils.h" - static const wxChar *strToFind = _T("ell"); - static const struct StringFindTest - { - const wxChar *str; - size_t start, - result; // of searching "ell" in str - } findTestData[] = +class MyExecThread : public wxThread +{ +public: + MyExecThread(const wxString& command) : wxThread(wxTHREAD_JOINABLE), + m_command(command) { - { _T("Well, hello world"), 0, 1 }, - { _T("Well, hello world"), 6, 7 }, - { _T("Well, hello world"), 9, wxString::npos }, - }; + 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); - - printf(_T("Index of '%s' in '%s' starting from %u is %s "), - strToFind, ft.str, ft.start, PosToString(res).c_str()); - - size_t resTrue = ft.result; - if ( res == resTrue ) - { - puts(_T("(ok)")); - } - else - { - printf(_T("(ERROR: should be %s)\n"), - PosToString(resTrue).c_str()); - } + return (ExitCode)wxExecute(m_command, wxEXEC_SYNC); } - puts(""); -} +private: + wxString m_command; +}; -static void TestStringTokenizer() +static void TestThreadExec() { - puts("*** Testing wxStringTokenizer ***"); - - static const wxChar *modeNames[] = - { - _T("default"), - _T("return empty"), - _T("return all empty"), - _T("with delims"), - _T("like strtok"), - }; - - 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 }, - }; + wxPuts(_T("*** Testing wxExecute interaction with threads ***\n")); - for ( size_t n = 0; n < WXSIZEOF(tokenizerTestData); n++ ) - { - const StringTokenizerTest& tt = tokenizerTestData[n]; - wxStringTokenizer tkz(tt.str, tt.delims, tt.mode); + MyExecThread thread(_T("true")); + thread.Run(); - size_t count = tkz.CountTokens(); - printf(_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 ) - { - puts(_T("(ok)")); - } - else - { - printf(_T("(ERROR: should be %u)\n"), tt.count); + wxPrintf(_T("Main program exit code: %ld.\n"), + wxExecute(_T("false"), wxEXEC_SYNC)); - continue; - } + wxPrintf(_T("Thread exit code: %ld.\n"), (long)thread.Wait()); +} - // if we emulate strtok(), check that we do it correctly - wxChar *buf, *s = NULL, *last; +// semaphore tests +#include "wx/datetime.h" - if ( tkz.GetMode() == wxTOKEN_STRTOK ) - { - buf = new wxChar[wxStrlen(tt.str) + 1]; - wxStrcpy(buf, tt.str); +class MySemaphoreThread : public wxThread +{ +public: + MySemaphoreThread(int i, wxSemaphore *sem) + : wxThread(wxTHREAD_JOINABLE), + m_sem(sem), + m_i(i) + { + Create(); + } - s = wxStrtok(buf, tt.delims, &last); - } - else - { - buf = NULL; - } + virtual ExitCode Entry() + { + wxPrintf(_T("%s: Thread #%d (%ld) starting to wait for semaphore...\n"), + wxDateTime::Now().FormatTime().c_str(), m_i, (long)GetId()); - // now show the tokens themselves - size_t count2 = 0; - while ( tkz.HasMoreTokens() ) - { - wxString token = tkz.GetNextToken(); + m_sem->Wait(); - printf(_T("\ttoken %u: '%s'"), - ++count2, - MakePrintable(token).c_str()); + wxPrintf(_T("%s: Thread #%d (%ld) acquired the semaphore.\n"), + wxDateTime::Now().FormatTime().c_str(), m_i, (long)GetId()); - if ( buf ) - { - if ( token == s ) - { - puts(" (ok)"); - } - else - { - printf(" (ERROR: should be %s)\n", s); - } + Sleep(1000); - s = wxStrtok(NULL, tt.delims, &last); - } - else - { - // nothing to compare with - puts(""); - } - } + wxPrintf(_T("%s: Thread #%d (%ld) releasing the semaphore.\n"), + wxDateTime::Now().FormatTime().c_str(), m_i, (long)GetId()); - if ( count2 != count ) - { - puts(_T("\tERROR: token count mismatch")); - } + m_sem->Post(); - delete [] buf; + return 0; } - puts(""); -} - -static void TestStringReplace() -{ - puts("*** Testing wxString::replace ***"); +private: + wxSemaphore *m_sem; + int m_i; +}; - 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[] = - { - { _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") }, - }; +WX_DEFINE_ARRAY_PTR(wxThread *, ArrayThreads); - for ( size_t n = 0; n < WXSIZEOF(stringReplaceTestData); n++ ) - { - const StringReplaceTestData data = stringReplaceTestData[n]; +static void TestSemaphore() +{ + wxPuts(_T("*** Testing wxSemaphore class. ***")); - wxString original = data.original; - original.replace(data.start, data.len, data.replacement); + static const int SEM_LIMIT = 3; - wxPrintf(_T("wxString(\"%s\").replace(%u, %u, %s) = %s "), - data.original, data.start, data.len, data.replacement, - original.c_str()); + wxSemaphore sem(SEM_LIMIT, SEM_LIMIT); + ArrayThreads threads; - if ( original == data.result ) - { - puts("(ok)"); - } - else - { - wxPrintf(_T("(ERROR: should be '%s')\n"), data.result); - } + for ( int i = 0; i < 3*SEM_LIMIT; i++ ) + { + threads.Add(new MySemaphoreThread(i, &sem)); + threads.Last()->Run(); } - puts(""); -} - -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 }, - }; - - for ( size_t n = 0; n < WXSIZEOF(stringMatchTestData); n++ ) + for ( size_t n = 0; n < threads.GetCount(); 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")); + threads[n]->Wait(); + delete threads[n]; } - - wxPuts(_T("")); } -#endif // TEST_STRINGS +#endif // TEST_THREADS // ---------------------------------------------------------------------------- // entry point @@ -5637,12 +4474,12 @@ static void TestStringMatch() int main(int argc, char **argv) { - wxApp::CheckBuildOptions(wxBuildOptions()); + 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; } @@ -5668,44 +4505,67 @@ 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"), "show this help message", + { wxCMD_LINE_SWITCH, _T("h"), _T("help"), _T("show this help message"), wxCMD_LINE_VAL_NONE, wxCMD_LINE_OPTION_HELP }, - { wxCMD_LINE_SWITCH, "v", "verbose", "be verbose" }, - { wxCMD_LINE_SWITCH, "q", "quiet", "be quiet" }, + { wxCMD_LINE_SWITCH, _T("v"), _T("verbose"), _T("be verbose") }, + { wxCMD_LINE_SWITCH, _T("q"), _T("quiet"), _T("be quiet") }, - { wxCMD_LINE_OPTION, "o", "output", "output file" }, - { wxCMD_LINE_OPTION, "i", "input", "input dir" }, - { wxCMD_LINE_OPTION, "s", "size", "output block size", + { 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_VAL_NUMBER }, - { wxCMD_LINE_OPTION, "d", "date", "output file date", + { wxCMD_LINE_OPTION, _T("d"), _T("date"), _T("output file date"), wxCMD_LINE_VAL_DATE }, - { wxCMD_LINE_PARAM, NULL, NULL, "input file", + { wxCMD_LINE_PARAM, NULL, NULL, _T("input file"), wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_MULTIPLE }, { wxCMD_LINE_NONE } }; +#if wxUSE_UNICODE + wxChar **wargv = new wxChar *[argc + 1]; + + { + int n; + + for (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); - parser.AddOption("project_name", "", "full path to project file", +#if wxUSE_UNICODE + { + for ( int n = 0; n < argc; n++ ) + free(wargv[n]); + + delete [] wargv; + } +#endif // wxUSE_UNICODE + + parser.AddOption(_T("project_name"), _T(""), _T("full path to project file"), wxCMD_LINE_VAL_STRING, wxCMD_LINE_OPTION_MANDATORY | wxCMD_LINE_NEEDS_SEPARATOR); switch ( parser.Parse() ) { case -1: - wxLogMessage("Help was given, terminating."); + wxLogMessage(_T("Help was given, terminating.")); break; case 0: @@ -5713,89 +4573,19 @@ int main(int argc, char **argv) break; default: - wxLogMessage("Syntax error detected, aborting."); + wxLogMessage(_T("Syntax error detected, aborting.")); break; } #endif // wxUSE_CMDLINE_PARSER #endif // TEST_CMDLINE -#ifdef TEST_STRINGS - if ( TEST_ALL ) - { - TestPChar(); - TestString(); - TestStringSub(); - TestStringConstruction(); - TestStringFormat(); - TestStringFind(); - TestStringTokenizer(); - TestStringReplace(); - } - else - { - TestStringMatch(); - } -#endif // TEST_STRINGS - -#ifdef TEST_ARRAYS - if ( TEST_ALL ) - { - wxArrayString a1; - a1.Add("tiger"); - a1.Add("cat"); - a1.Add("lion", 3); - a1.Add("dog"); - a1.Add("human"); - a1.Add("ape"); - - puts("*** Initially:"); - - PrintArray("a1", a1); - - wxArrayString a2(a1); - PrintArray("a2", a2); - - wxSortedArrayString a3(a1); - PrintArray("a3", a3); - - puts("*** After deleting three strings from a1"); - a1.Remove(2,3); - - PrintArray("a1", a1); - PrintArray("a2", a2); - PrintArray("a3", a3); - - puts("*** After reassigning a1 to a2 and a3"); - a3 = a2 = a1; - PrintArray("a2", a2); - PrintArray("a3", a3); - - puts("*** After sorting a1"); - a1.Sort(); - PrintArray("a1", a1); - - puts("*** After sorting a1 in reverse order"); - a1.Sort(TRUE); - PrintArray("a1", a1); - - puts("*** After sorting a1 by the string length"); - a1.Sort(StringLenCompare); - PrintArray("a1", a1); - - TestArrayOfObjects(); - TestArrayOfUShorts(); - } - - TestArrayOfInts(); -#endif // TEST_ARRAYS - #ifdef TEST_DIR - if ( TEST_ALL ) - { + #if TEST_ALL + TestDirExists(); TestDirEnum(); - TestDirTraverse(); - } + #endif + TestDirTraverse(); #endif // TEST_DIR #ifdef TEST_DLLLOADER @@ -5816,6 +4606,7 @@ int main(int argc, char **argv) #ifdef TEST_LIST TestListCtor(); + TestList(); #endif // TEST_LIST #ifdef TEST_LOCALE @@ -5823,133 +4614,104 @@ int main(int argc, char **argv) #endif // TEST_LOCALE #ifdef TEST_LOG + wxPuts(_T("*** Testing wxLog ***")); + wxString s; for ( size_t n = 0; n < 8000; n++ ) { - s << (char)('A' + (n % 26)); + s << (wxChar)(_T('A') + (n % 26)); } + wxLogWarning(_T("The length of the string is %lu"), + (unsigned long)s.length()); + wxString msg; - msg.Printf("A very very long message: '%s', the end!\n", s.c_str()); + msg.Printf(_T("A very very long message: '%s', the end!\n"), s.c_str()); // this one shouldn't be truncated - printf(msg); + wxPrintf(msg); // but this one will because log functions use fixed size buffer // (note that it doesn't need '\n' at the end neither - will be added // by wxLog anyhow) - wxLogMessage("A very very long message 2: '%s', the end!", s.c_str()); + wxLogMessage(_T("A very very long message 2: '%s', the end!"), s.c_str()); #endif // TEST_LOG #ifdef TEST_FILE - if ( TEST_ALL ) - { - TestFileRead(); - TestTextFileRead(); - TestFileCopy(); - } + TestFileRead(); + TestTextFileRead(); + TestFileCopy(); #endif // TEST_FILE #ifdef TEST_FILENAME - if ( 1 ) - { - wxFileName fn; - fn.Assign("c:\\foo", "bar.baz"); - fn.Assign("/u/os9-port/Viewer/tvision/WEI2HZ-3B3-14_05-04-00MSC1.asc"); - - DumpFileName(fn); - } - - if ( TEST_ALL ) - { - TestFileNameConstruction(); - TestFileNameMakeRelative(); - TestFileNameSplit(); - TestFileNameTemp(); - TestFileNameCwd(); - TestFileNameComparison(); - TestFileNameOperations(); - } + TestFileNameConstruction(); + TestFileNameMakeRelative(); + TestFileNameMakeAbsolute(); + TestFileNameSplit(); + 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); if ( TestFtpConnect() ) { - if ( TEST_ALL ) - { + #if TEST_ALL TestFtpList(); TestFtpDownload(); TestFtpMisc(); TestFtpFileSize(); TestFtpUpload(); - } + #endif - if ( TEST_INTERACTIVE ) + #if TEST_INTERACTIVE TestFtpInteractive(); + #endif } //else: connecting to the FTP server failed - if ( 0 ) + #if 0 TestFtpWuFtpd(); + #endif #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(); - TestLongLongPrint(); - } -#endif // TEST_LONGLONG - -#ifdef TEST_HASH - TestHash(); -#endif // TEST_HASH - #ifdef TEST_HASHMAP TestHashMap(); #endif // TEST_HASHMAP +#ifdef TEST_HASHSET + TestHashSet(); +#endif // TEST_HASHSET + #ifdef TEST_MIME wxLog::AddTraceMask(_T("mime")); - if ( TEST_ALL ) - { + #if TEST_ALL TestMimeEnum(); TestMimeOverride(); - TestMimeFilename(); - } - - TestMimeAssociate(); + TestMimeAssociate(); + #endif + TestMimeFilename(); #endif // TEST_MIME #ifdef TEST_INFO_FUNCTIONS - if ( TEST_ALL ) - { + #if TEST_ALL TestOsInfo(); TestUserInfo(); - if ( TEST_INTERACTIVE ) + #if TEST_INTERACTIVE TestDiskInfo(); - } + #endif + #endif #endif // TEST_INFO_FUNCTIONS #ifdef TEST_PATHLIST @@ -5960,23 +4722,20 @@ int main(int argc, char **argv) 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(); @@ -5989,27 +4748,33 @@ int main(int argc, char **argv) #endif // TEST_SOCKETS #ifdef TEST_STREAMS - TestFileStream(); - TestMemoryStream(); + #if TEST_ALL + TestFileStream(); + #endif + TestMemoryStream(); #endif // TEST_STREAMS +#ifdef TEST_TEXTSTREAM + TestTextInputStream(); +#endif // TEST_TEXTSTREAM + #ifdef TEST_THREADS int nCPUs = wxThread::GetCPUCount(); - printf("This system has %d CPUs\n", nCPUs); + wxPrintf(_T("This system has %d CPUs\n"), nCPUs); if ( nCPUs != -1 ) wxThread::SetConcurrency(nCPUs); - if ( TEST_ALL ) - { - TestDetachedThreads(); TestJoinableThreads(); + + #if TEST_ALL + TestJoinableThreads(); + TestDetachedThreads(); TestThreadSuspend(); TestThreadDelete(); TestThreadConditions(); TestThreadExec(); - } - - TestSemaphore(); + TestSemaphore(); + #endif #endif // TEST_THREADS #ifdef TEST_TIMER @@ -6017,8 +4782,7 @@ int main(int argc, char **argv) #endif // TEST_TIMER #ifdef TEST_DATETIME - if ( TEST_ALL ) - { + #if TEST_ALL TestTimeSet(); TestTimeStatic(); TestTimeRange(); @@ -6031,19 +4795,23 @@ int main(int argc, char **argv) TestTimeParse(); TestTimeArithmetics(); TestTimeHolidays(); - TestTimeFormat(); TestTimeSpanFormat(); TestTimeMS(); TestTimeZoneBug(); - } + #endif - if ( TEST_INTERACTIVE ) + #if TEST_INTERACTIVE TestDateTimeInteractive(); + #endif #endif // TEST_DATETIME +#ifdef TEST_SCOPEGUARD + TestScopeGuard(); +#endif + #ifdef TEST_USLEEP - puts("Sleeping for 3 seconds... z-z-z-z-z..."); + wxPuts(_T("Sleeping for 3 seconds... z-z-z-z-z...")); wxUsleep(3000); #endif // TEST_USLEEP @@ -6066,11 +4834,8 @@ int main(int argc, char **argv) TestZipFileSystem(); #endif // TEST_ZIP -#ifdef TEST_ZLIB - TestZlibStreamWrite(); - TestZlibStreamRead(); -#endif // TEST_ZLIB - + wxUnusedVar(argc); + wxUnusedVar(argv); return 0; }